Update test

Author: uetchy

.gitignore

@@ -1,11 +1,7 @@
 # Bundler
-Gemfile.lock
 /.bundle
 /vendor/bundle
 
 # OS Specific
 .DS_Store
 Thumbs.db
-
-# dotenv
-.env

.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--require spec_helper

Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'dotenv'
-  gem 'rspec', require: false
-end
+gem 'rake',  :require => false
+gem 'rspec', require: false
+gem 'webmock'

Gemfile.lock

@@ -0,0 +1,32 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.6)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    rake (10.1.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    safe_yaml (1.0.3)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec
+  webmock

Qiita.alfredworkflow

@@ -1,25 +1,18 @@
+require 'rspec/core/rake_task'
+
 BUNDLE_ID    = "co.randompaper.qiita.alfred"
 PACKAGE_FILE = "info.plist"
 
-workflow_home     = File.expand_path('~/Library/Application Support/Alfred 2/Alfred.alfredpreferences/workflows')
-dbx_workflow_path = File.expand_path('~/Dropbox/アプリ/Alfred.alfredpreferences/workflows')
+ALFRED_WORKFLOW_PATH = ENV['ALFRED_WORKFLOW_PATH'] || File.expand_path('~/Library/Application Support/Alfred 2/Alfred.alfredpreferences/workflows')
+
+task :default => [:spec]
 
 desc "Link to Alfred"
-task :link => [:configure] do
-  ln_sf File.expand_path('../', __FILE__), File.join(workflow_home, BUNDLE_ID)
+task :link do
+  ln_sf File.expand_path('../', __FILE__), File.join(ALFRED_WORKFLOW_PATH, BUNDLE_ID)
 end
 
 desc "Unlink from Alfred"
-task :unlink => [:configure] do
-  rm File.join(workflow_home, BUNDLE_ID)
+task :unlink do
+  rm File.join(ALFRED_WORKFLOW_PATH, BUNDLE_ID)
 end
-
-desc "Install to Alfred Sync folder on Dropbox"
-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 :unlink_dropbox => [:configure] do
-  rm File.join(dbx_workflow_path, BUNDLE_ID)
-end

Rakefile

@@ -5,8 +5,7 @@
 begin
   config = Qiita::Config.new
 rescue Qiita::FileMissingError
-  Qiita::Alfred.message "RUN: 'qiita setup' command first"
-  exit
+  config.save
 end
 
 unless config.token
@@ -31,4 +30,4 @@
   results << item
 end
 
-puts Qiita::Alfred.to_alfred(results)
+puts Qiita::Alfred.to_alfred(results)

commands/stocks.rb

@@ -1,14 +1,6 @@
-module Qiita
-  VERSION = '1.0'
-  BUNDLE_ID = 'co.randompaper.qiita.alfred'
+$LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
-  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}")
-
-  class FileMissingError < StandardError; end
-end
-
-require_relative 'qiita/object.rb'
-require_relative 'qiita/config.rb'
-require_relative 'qiita/api.rb' 
-require_relative 'qiita/alfred.rb'
+require 'qiita/config'
+require 'qiita/api'
+require 'qiita/alfred'
+require 'qiita/version'

lib/qiita.rb

@@ -1,29 +1,31 @@
 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")
+module Qiita
+  module Alfred
+    def self.to_alfred(array)
+      raise "Argument must be an Array" unless array.kind_of? Array
 
-    array.each do |entry|
-      item = root.add_element("item")
+      doc = REXML::Document.new
+      root = doc.add_element("items")
 
-      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 : ""
+      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
-    end
 
-    doc.to_s
-  end 
+      doc.to_s
+    end
 
-  def self.message(str)
-    puts Qiita::Alfred.to_alfred([{ uid: 0, arg: nil, title: str, subtitle: nil, icon: 'icon.png'}])
+    def self.message(str)
+      puts Qiita::Alfred.to_alfred([{ uid: 0, arg: nil, title: str, subtitle: nil, icon: 'icon.png'}])
+    end
   end
-end
+end

lib/qiita/alfred.rb

@@ -2,60 +2,65 @@
 require 'uri'
 require 'json'
 
-module Qiita::API
-  def self.auth(name: name, password: password)
-    uri = URI('https://qiita.com/api/v1/auth')
-    params = {url_name: name, password: password}
-    fetch uri, params, method: :post
-  end
+module Qiita
+  class API
 
-  def self.search(query, args={})
-    uri = URI('https://qiita.com/api/v1/search')
-    fetch uri, {q: query}.update(args)
-  end
+    ENDPOINT = "https://qiita.com/api/v1/"
 
-  def self.fetch(uri, params={}, *args)
-    defaults = { method: :get, limit: 10 }
-    opt = args.last.kind_of?(Hash)? defaults.update(args.pop) : defaults
-    raise ArgumentError, 'too many HTTP redirects' if opt[:limit] == 0
-
-    if opt[:method] == :get
-      uri.query = URI.encode_www_form(params) if params
-      request = Net::HTTP::Get.new(uri)   
-    else
-      request = Net::HTTP::Post.new(uri)
-      request.set_form_data(params)
+    def self.auth(name: name, password: password)
+      uri = URI.join(ENDPOINT, 'auth')
+      params = {url_name: name, password: password}
+      fetch uri, params, method: :post
     end
 
-    response = Net::HTTP.start(
-                 uri.host,
-                 uri.port, 
-                 :use_ssl => (uri.scheme == 'https'), 
-                 :verify_mode => OpenSSL::SSL::VERIFY_NONE
-               ) do |https|
-      https.request(request)
+    def self.search(query, args={})
+      uri = URI.join(ENDPOINT, 'search')
+      fetch uri, {q: query}.update(args)
     end
 
-    case response
-    when Net::HTTPSuccess
+    def self.fetch(uri, params={}, *args)
+      defaults = { method: :get, limit: 10 }
+      opt = args.last.kind_of?(Hash)? defaults.update(args.pop) : defaults
+      raise ArgumentError, 'too many HTTP redirects' if opt[:limit] == 0
+
+      if opt[:method] == :get
+        uri.query = URI.encode_www_form(params) if params
+        request = Net::HTTP::Get.new(uri)
+      else
+        request = Net::HTTP::Post.new(uri)
+        request.set_form_data(params)
+      end
+
+      response = Net::HTTP.start(
+                   uri.host,
+                   uri.port,
+                   :use_ssl => (uri.scheme == 'https'),
+                   :verify_mode => OpenSSL::SSL::VERIFY_NONE
+                 ) do |https|
+        https.request(request)
+      end
+
+      case response
+      when Net::HTTPSuccess
 
-      if(response.class.body_permitted?)
-        begin 
-          JSON(response.body)
-        rescue JSON::ParserError
+        if(response.class.body_permitted?)
+          begin
+            JSON(response.body)
+          rescue JSON::ParserError
+            false
+          end
+        else
           false
         end
-      else
+
+      when Net::HTTPRedirection
+        location = response['location']
+        fetch(location, limit - 1)
+      when Net::HTTPUnauthorized
         false
+      else
+        response.value
       end
-
-    when Net::HTTPRedirection
-      location = response['location']
-      fetch(location, limit - 1)
-    when Net::HTTPUnauthorized
-      false
-    else
-      response.value
     end
   end
-end
+end