mushikago-sdk 0.3.7 → 0.4.0

data/lib/mushikago/hotaru/word_get_request.rb

@@ -0,0 +1,16 @@
+# -*- coding : utf-8 -*-
+module Mushikago
+  module Hotaru
+    class WordGetRequest < Mushikago::Http::GetRequest
+      def path; '/1/hotaru/word/get' end
+      request_parameter :domain_name
+      request_parameter :word
+
+      def initialize domain_name, word, options={}
+        super(options)
+        self.domain_name = domain_name
+        self.word = word
+      end
+    end
+  end
+end

data/lib/mushikago/hotaru/word_list_request.rb

@@ -0,0 +1,20 @@
+# -*- coding : utf-8 -*-
+module Mushikago
+  module Hotaru
+    class WordListRequest < Mushikago::Http::GetRequest
+      def path; '/1/hotaru/word/list' end
+      request_parameter :domain_name
+      request_parameter :limit do |v| v.to_i.to_s end
+      request_parameter :offset do |v| v.to_i.to_s end
+      request_parameter :filter
+
+      def initialize domain_name, options={}
+        super(options)
+        self.domain_name = domain_name
+        self.limit = options[:limit] if options.has_key?(:limit)
+        self.offset = options[:offset] if options.has_key?(:offset)
+        self.filter = options[:filter] if options.has_key?(:filter)
+      end
+    end
+  end
+end

data/lib/mushikago/http/client.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'net/http'
+require 'net/https'
 require 'json'
 module Mushikago
   module Http
@@ -32,7 +33,10 @@ module Mushikago
         request.add_signature!(signer)
 
         # send request
-        Net::HTTP.start(request.host, request.port, :use_ssl => use_ssl) do |http|
+        session = Net::HTTP.new(request.host, request.port)
+        session.use_ssl = use_ssl
+        session.verify_mode = OpenSSL::SSL::VERIFY_NONE if use_ssl
+        session.start do |http|
           http_request = request.to_http_request
           http_response = http.request(http_request)
           return Mushikago::Http::Response.new(JSON.parse(http_response.body))

data/lib/mushikago/http/request.rb

@@ -81,6 +81,11 @@ module Mushikago
         Net::HTTP::Post.new(request_path)
       end
 
+      private
+      def new_http_put_request(request_path)
+        Net::HTTP::Put.new(request_path)
+      end
+
       private
       def new_http_delete_request(request_path)
         Net::HTTP::Delete.new(request_path)

data/lib/mushikago/http/response.rb

@@ -49,6 +49,13 @@ module Mushikago
       def []= key, value
         response[key] = value
       end
+
+      def to_s
+        {
+          '@meta' => meta,
+          '@response' => response
+        }.to_json
+      end
     end
   end
 end

data/lib/mushikago/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 module Mushikago
   # Mushikago SDK for Ruby のバージョン
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

data/spec/mushikago/auth/signature_spec.rb

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-class TestRequest < Mushikago::Http::Request
+class TestRequest < Mushikago::Http::GetRequest
   include Mushikago::Auth::Signature
 end
 
 describe Mushikago::Auth::Signature do
   before do
     @request = TestRequest.new
-    @request.http_method = 'GET'
     @request.host = 'mushikago.org'
     @request.path = '/1/someapi.json'
     @request['api_key'] = 'api_key'

data/spec/mushikago/http/client_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-class TestRequest < Mushikago::Http::Request
+class TestRequest < Mushikago::Http::GetRequest
   include Mushikago::Auth::Signature
 end
 
@@ -33,7 +33,8 @@ describe Mushikago::Http::Client do
     before :all do
       request = TestRequest.new
       request.host = 'api.mushikago.org'
-      request.path = '/1/tombo/info'
+      request.port = 443
+      request.path = '/1/health/check'
       client = Mushikago::Http::Client.new
       @response = client.send_request(request)
     end

data/spec/mushikago/http/request_spec.rb

@@ -20,7 +20,6 @@ describe Mushikago::Http::Request do
 
   subject{ @request }
   
-  it{ should respond_to(:http_method) }
   it{ should respond_to(:host, :host=) }
   it{ should respond_to(:port, :port=) }
   it{ should respond_to(:path, :path=) }
@@ -29,9 +28,8 @@ describe Mushikago::Http::Request do
   it{ should respond_to(:[]=) }
   it{ should respond_to(:[]) }
 
-  its(:http_method){ should == 'GET' }
   its(:host){ should == 'tombo.ap-northeast-1.mushikago.org' }
-  its('port.to_i'){ should == 80 }
+  its(:port){ should be_nil }
   its(:path){ should == '/1/list.json' }
   its(:headers){ should be_a_kind_of(Hash) }
   it 'header["hoge"] should "fuga"' do subject.headers['hoge'].should == 'fuga' end

data/spec/mushikago/tombo/client_spec.rb

@@ -5,7 +5,8 @@ describe Mushikago::Tombo::Client do
   before :all do
     @client = Mushikago::Tombo::Client.new(
       :api_key => ENV['MUSHIKAGO_API_KEY'],
-      :secret_key => ENV['MUSHIKAGO_SECRET_KEY']
+      :secret_key => ENV['MUSHIKAGO_SECRET_KEY'],
+      :use_ssl => false
     )
   end
 
@@ -45,7 +46,7 @@ describe Mushikago::Tombo::Client do
         }
       }
       create_http_mock(response.to_json)
-      @response = @client.capture('http://www.tombo.ne.jp/', :thumbnail=>1)
+      @response = @client.capture('http://api.mushikago.org/', :thumbnail=>1)
     end
 
     subject{ @response }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushikago-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &5026580 !ruby/object:Gem::Requirement
+  requirement: &4772320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5026580
+  version_requirements: *4772320
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &5025320 !ruby/object:Gem::Requirement
+  requirement: &4769980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5025320
+  version_requirements: *4769980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5023960 !ruby/object:Gem::Requirement
+  requirement: &4765880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5023960
+  version_requirements: *4765880
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &5020940 !ruby/object:Gem::Requirement
+  requirement: &4763700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5020940
+  version_requirements: *4763700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &5020020 !ruby/object:Gem::Requirement
+  requirement: &4761760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5020020
+  version_requirements: *4761760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5017980 !ruby/object:Gem::Requirement
+  requirement: &4761020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *5017980
+  version_requirements: *4761020
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &5016460 !ruby/object:Gem::Requirement
+  requirement: &4754460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5016460
+  version_requirements: *4754460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &5015400 !ruby/object:Gem::Requirement
+  requirement: &4750100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5015400
+  version_requirements: *4750100
 description: A SDK for Mushikago Web Service.
 email:
 - t.matsuoka@miningbrownie.co.jp
@@ -110,7 +110,30 @@ files:
 - lib/mushikago.rb
 - lib/mushikago/tombo.rb
 - lib/mushikago/hotaru.rb
-- lib/mushikago/hotaru/request.rb
+- lib/mushikago/hotaru/dictionary_list_request.rb
+- lib/mushikago/hotaru/text_get_request.rb
+- lib/mushikago/hotaru/collocation_download_request.rb
+- lib/mushikago/hotaru/domain_delete_request.rb
+- lib/mushikago/hotaru/word_list_request.rb
+- lib/mushikago/hotaru/collocation_create_request.rb
+- lib/mushikago/hotaru/collocation_get_request.rb
+- lib/mushikago/hotaru/text_delete_request.rb
+- lib/mushikago/hotaru/text_list_request.rb
+- lib/mushikago/hotaru/tag_put_request.rb
+- lib/mushikago/hotaru/tag_delete_request.rb
+- lib/mushikago/hotaru/word_get_request.rb
+- lib/mushikago/hotaru/text_tagset_request.rb
+- lib/mushikago/hotaru/collocation_wordlist_request.rb
+- lib/mushikago/hotaru/tag_list_request.rb
+- lib/mushikago/hotaru/collocation_list_request.rb
+- lib/mushikago/hotaru/domain_create_request.rb
+- lib/mushikago/hotaru/classifier_judge_request.rb
+- lib/mushikago/hotaru/collocation_delete_request.rb
+- lib/mushikago/hotaru/dictionary_delete_request.rb
+- lib/mushikago/hotaru/text_put_request.rb
+- lib/mushikago/hotaru/dictionary_put_request.rb
+- lib/mushikago/hotaru/domain_info_request.rb
+- lib/mushikago/hotaru/domain_list_request.rb
 - lib/mushikago/hotaru/client.rb
 - lib/mushikago/auth/signer.rb
 - lib/mushikago/auth/signature.rb
@@ -175,7 +198,13 @@ files:
 - doc/Mushikago/Auth.html
 - doc/Mushikago/Http.html
 - doc/Mushikago/Tombo.html
+- doc/Mushikago/Http/GetRequest.html
+- doc/Mushikago/Http/MultipartPutRequest.html
 - doc/Mushikago/Http/Request.html
+- doc/Mushikago/Http/PostRequest.html
+- doc/Mushikago/Http/DeleteRequest.html
+- doc/Mushikago/Http/PutRequest.html
+- doc/Mushikago/Http/MultipartPostRequest.html
 - doc/Mushikago/Http/MultipartRequest.html
 - doc/Mushikago/Http/Client.html
 - doc/Mushikago/Http/Response.html
@@ -207,7 +236,31 @@ files:
 - doc/Mushikago/Mitsubachi/ScriptDeployRequest.html
 - doc/Mushikago/Mitsubachi.html
 - doc/Mushikago/Config.html
+- doc/Mushikago/Hotaru/TextDeleteRequest.html
+- doc/Mushikago/Hotaru/TextPutRequest.html
+- doc/Mushikago/Hotaru/DomainCreateRequest.html
+- doc/Mushikago/Hotaru/DomainInfoRequest.html
+- doc/Mushikago/Hotaru/CollocationListRequest.html
+- doc/Mushikago/Hotaru/TagDeleteRequest.html
+- doc/Mushikago/Hotaru/DictionaryListRequest.html
+- doc/Mushikago/Hotaru/DictionaryPutRequest.html
+- doc/Mushikago/Hotaru/TextTagsetRequest.html
 - doc/Mushikago/Hotaru/Request.html
+- doc/Mushikago/Hotaru/CollocationWordlistRequest.html
+- doc/Mushikago/Hotaru/CollocationDownloadRequest.html
+- doc/Mushikago/Hotaru/CollocationGetRequest.html
+- doc/Mushikago/Hotaru/DomainListRequest.html
+- doc/Mushikago/Hotaru/CollocationCreateRequest.html
+- doc/Mushikago/Hotaru/TextGetRequest.html
+- doc/Mushikago/Hotaru/WordGetRequest.html
+- doc/Mushikago/Hotaru/TextListRequest.html
+- doc/Mushikago/Hotaru/ClassifierJudgeRequest.html
+- doc/Mushikago/Hotaru/DomainDeleteRequest.html
+- doc/Mushikago/Hotaru/DictionaryDeleteRequest.html
+- doc/Mushikago/Hotaru/TagPutRequest.html
+- doc/Mushikago/Hotaru/CollocationDeleteRequest.html
+- doc/Mushikago/Hotaru/TagListRequest.html
+- doc/Mushikago/Hotaru/WordListRequest.html
 - doc/Mushikago/Hotaru/Client.html
 - doc/Mushikago/Auth/Signer.html
 - doc/Mushikago/Auth/Signature.html
@@ -228,7 +281,6 @@ files:
 - spec/mushikago/auth/signer_spec.rb
 - spec/mushikago/auth/signature_spec.rb
 - spec/mushikago/tombo/client_spec.rb
-- spec/mushikago/tombo/request_spec.rb
 - spec/mushikago/tombo/delete_request_spec.rb
 - spec/mushikago/tombo/captures_request_spec.rb
 - spec/mushikago/tombo/info_request_spec.rb
@@ -266,7 +318,6 @@ test_files:
 - spec/mushikago/auth/signer_spec.rb
 - spec/mushikago/auth/signature_spec.rb
 - spec/mushikago/tombo/client_spec.rb
-- spec/mushikago/tombo/request_spec.rb
 - spec/mushikago/tombo/delete_request_spec.rb
 - spec/mushikago/tombo/captures_request_spec.rb
 - spec/mushikago/tombo/info_request_spec.rb

data/lib/mushikago/hotaru/request.rb

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-module Mushikago
-  module Hotaru
-    # Hotaruのリクエストを表す抽象クラス
-    class Request < Mushikago::Http::Request
-      include Mushikago::Auth::Signature
-
-      # @param [Hash] options オプション
-      # @option options [String] :endpoint('hotaru.mushikago.org') Hotaruのエンドポイント
-      def initialize options={}
-        super()
-        endpoint = options[:endpoint] || Mushikago.config.hotaru_endpoint
-        host, port = endpoint.split(':')
-        @host = host
-        @port = port if port
-        @path = "/#{api_version}/#{method_name}"
-      end
-
-      # @private
-      private
-      def api_version
-        1
-      end
-
-      # @private
-      private
-      def method_name
-        ''
-      end
-    end
-  end
-end

data/spec/mushikago/tombo/request_spec.rb

@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-
-describe Mushikago::Tombo::Request do
-  before :all do
-    @request = Mushikago::Tombo::Request.new
-  end
-
-  subject{ @request }
-
-  its(:host){ should == Mushikago.config.endpoint }
-
-  context 'construct with options' do
-    before :all do
-      @request = Mushikago::Tombo::Request.new(:endpoint => 'localhost:18080')
-    end
-
-    subject{ @request }
-
-    its(:host){ should == 'localhost' }
-    its('port.to_i'){ should == 18080 }
-  end
-end