Fixed some issue to accept multi-byte search query

uetchy · uetchy · commit f30e5d03890d · 2013-12-05T20:51:16.000+09:00
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'plist'
+gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    plist (3.1.0)
-    rake (0.9.6)
+    rake (10.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  plist
   rake
diff --git a/README.md b/README.md
@@ -4,17 +4,17 @@
 
 ## Installation
 
-Double-click `Qiita.alfredworkflow` to install workflow.
+Double-click `Qiita.alfredworkflow` to install Alfred workflow.
 
-## Development installation
+## Development Installation
 
 ```
-$ bundle install --path vendor/bundle --binstubs=.bundle/bin
+$ bundle install
 $ bundle exec rake link
 ```
 
-If you using Alfred with Dropbox Sync folder, you should type `rake install` instead of `rake link`.
+If you using Alfred with Dropbox Sync folder, you should type `rake link_dropbox` instead of `rake link`.
 
 ## Thanks
 
-- [Alfred 2 Ruby Template](https://github.com/zhaocai/alfred2-ruby-template)
+- [Alfred 2 Ruby Template](https://github.com/zhaocai/alfred2-ruby-template)
diff --git a/Rakefile b/Rakefile
@@ -1,42 +1,25 @@
-require 'yaml'
-require 'plist'
+BUNDLE_ID    = "co.randompaper.qiita.alfred"
+PACKAGE_FILE = "info.plist"
 
-config_file = 'config.yml'
-workflow_home = File.expand_path('~/Library/Application Support/Alfred 2/Alfred.alfredpreferences/workflows')
-
-$config = YAML.load_file config_file
-$config['bundleid'] = "#{$config['domain']}.#{$config['id']}"
-$config['package_file'] = File.join($config['path'], 'info.plist')
-$config['dbx_workflow_path'] = File.join(File.expand_path($config['dropbox']), '/Alfred.alfredpreferences/workflows')
-
-desc "Generate a plist file for Alfred from config.yml"
-task :configure do
-  package = Plist::parse_xml $config['package_file']
-
-  unless package['bundleid'].eql?($config["bundleid"])
-    package['bundleid'] = $config['bundleid']
-    File.open($config['package_file'], 'wb') do |f|
-      f.write package.to_plist
-    end
-  end
-end
+workflow_home     = File.expand_path('~/Library/Application Support/Alfred 2/Alfred.alfredpreferences/workflows')
+dbx_workflow_path = File.expand_path('~/Dropbox/アプリ/Alfred.alfredpreferences/workflows')
 
 desc "Link to Alfred"
 task :link => [:configure] do
-  ln_sf File.expand_path($config["path"]), File.join(workflow_home, $config["bundleid"])
+  ln_sf File.expand_path('../', __FILE__), File.join(workflow_home, BUNDLE_ID)
 end
 
 desc "Unlink from Alfred"
 task :unlink => [:configure] do
-  rm File.join(workflow_home, $config["bundleid"])
+  rm File.join(workflow_home, BUNDLE_ID)
 end
 
 desc "Install to Alfred Sync folder on Dropbox"
-task :install => [:configure] do
-  ln_sf File.expand_path($config["path"]), File.join($config["dbx_workflow_path"], $config["bundleid"])
+task :link_dropbox => [:configure] do
+  ln_sf File.expand_path('../', __FILE__), File.join(dbx_workflow_path, BUNDLE_ID)
 end
 
 desc "Unlink from Alfred Sync folder on Dropbox"
-task :uninstall => [:configure] do
-  rm File.join($config["dbx_workflow_path"], $config["bundleid"])
+task :unlink_dropbox => [:configure] do
+  rm File.join(dbx_workflow_path, BUNDLE_ID)
 end
diff --git a/commands/qiita.rb b/commands/qiita.rb
@@ -0,0 +1,16 @@
+QUERY = ARGV[0].to_s.strip
+
+require_relative "../lib/qiita"
+
+data = Qiita::API.search(QUERY)
+
+results = []
+data.each do |q|
+  arg = q['url']
+  subtitle = "Stocks: " + q['stock_count'].to_s + "    LGTM:" + q['lgtm_count'].to_s + "   Comments:" + q['comment_count'].to_s + "   Create At:" + q['created_at']
+
+  item = { uid: q['id'], arg: arg, title: q['title'], subtitle: subtitle, icon: 'icon.png'}
+  results << item
+end
+
+puts Qiita::Alfred.to_alfred(results)
diff --git a/config.yml b/config.yml
diff --git a/icon.png b/icon.png
diff --git a/info.plist b/info.plist
@@ -34,13 +34,13 @@
 				<key>argumenttype</key>
 				<integer>0</integer>
 				<key>escaping</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>keyword</key>
 				<string>qiita</string>
 				<key>runningsubtext</key>
 				<string>Searching...</string>
 				<key>script</key>
-				<string>python ./main.py "{query}"</string>
+				<string>ruby ./commands/qiita.rb "{query}"</string>
 				<key>title</key>
 				<string>Qiita</string>
 				<key>type</key>
diff --git a/lib/qiita.rb b/lib/qiita.rb
@@ -0,0 +1,12 @@
+module Qiita
+  BUNDLE_ID = 'co.randompaper.qiita.alfred'
+
+  CONFIG_FILE = File.expand_path("~/Library/Application Support/Alfred 2/Workflow Data/#{BUNDLE_ID}/config.json")
+  CACHE_DIR   = File.expand_path("~/Library/Caches/com.runningwithcrayons.Alfred-2/Workflow Data/#{BUNDLE_ID}")
+end
+
+require_relative 'qiita/version.rb'
+require_relative 'qiita/object.rb'
+require_relative 'qiita/config.rb'
+require_relative 'qiita/api.rb' 
+require_relative 'qiita/alfred.rb'
diff --git a/lib/qiita/alfred.rb b/lib/qiita/alfred.rb
@@ -0,0 +1,25 @@
+require 'rexml/document'
+
+module Qiita::Alfred
+  def self.to_alfred(array)
+    raise "Argument must be an Array" unless array.kind_of? Array
+    
+    doc = REXML::Document.new
+    root = doc.add_element("items")
+
+    array.each do |entry|
+      item = root.add_element("item")
+
+      entry.each do |key, value|
+        if [:uid, :arg, :valid, :autocomplete].include?(key)
+          item.attributes[key.to_s] = value.to_s
+        else
+          element = item.add_element(key.to_s)
+          element.text = value ? value.to_s : ""
+        end
+      end
+    end
+
+    doc.to_s
+  end 
+end
diff --git a/lib/qiita/api.rb b/lib/qiita/api.rb
@@ -0,0 +1,29 @@
+require 'net/https'
+require 'uri'
+require 'json'
+
+module Qiita::API
+  def self.search(query)
+    uri = URI('https://qiita.com/api/v1/search')
+    params = {q: query}
+    uri.query = URI.encode_www_form(params)
+    res = fetch(uri)
+    JSON(res.body)
+  end
+
+  def self.fetch(uri, limit = 10)
+    raise ArgumentError, 'too many HTTP redirects' if limit == 0
+
+    response = Net::HTTP.get_response(uri)
+
+    case response
+    when Net::HTTPSuccess then
+      response
+    when Net::HTTPRedirection then
+      location = response['location']
+      fetch(location, limit - 1)
+    else
+      response.value
+    end
+  end
+end
diff --git a/lib/qiita/config.rb b/lib/qiita/config.rb
@@ -0,0 +1,29 @@
+require 'json'
+require 'fileutils'
+
+class Qiita::Config < Qiita::Object
+  def initialize(attributes={})
+    attributes.empty? ? self.load! : self.update!(attributes)
+  end
+
+  def load!(file_path="")
+    file_path = Qiita::CONFIG_FILE if file_path.empty?
+
+    begin
+      File.open(file_path, 'r') {|f| self.update!(JSON(f.read))}
+    rescue Errno::ENOENT, IOError
+      raise Qiita::ConfigFileMissingError, "Run Qiita command format: qiita <QUERY>"
+    end
+  end
+
+  def save(file_path="")
+    file_path = Qiita::CONFIG_FILE if file_path.empty?
+
+    FileUtils.mkpath(File.dirname(file_path))
+    File.open(file_path, 'w') {|f| f.puts self.to_json }
+  end
+
+  def update!(attributes={})
+    attributes_with!(attributes)
+  end
+end
diff --git a/lib/qiita/object.rb b/lib/qiita/object.rb
@@ -0,0 +1,11 @@
+class Qiita::Object
+  def initialize(attributes={})
+    self.attributes_with!(attributes)
+  end
+
+  def attributes_with!(attributes={})
+    attributes.each do |key, value|
+      self.send(key.to_s+"=", value) if self.respond_to?(key.to_s+"=")
+    end
+  end
+end
diff --git a/lib/qiita/version.rb b/lib/qiita/version.rb
@@ -0,0 +1,3 @@
+module Qiita
+  VERSION = '1.0'
+end
diff --git a/workflow/alfred.py b/workflow/alfred.py
diff --git a/workflow/alfred.pyc b/workflow/alfred.pyc
diff --git a/workflow/main.py b/workflow/main.py
