mushikago-sdk 2.0.0 → 2.1.0

data/README.md

@@ -2,11 +2,11 @@ Mushikago SDK for Ruby.
 =======================
 
 - **Homepage**:        [http://www.mushikago.org/](http://www.mushikago.org/)
-- **Author**:          Toru Matsuoka
+- **Author**:          MiningBrownie
 - **Copyright**:       2011
 - **License**:         Apache License, Version 2.0
-- **Latest Version**:  1.3-beta
-- **Release Date**:    January 27th 2012
+- **Latest Version**:  2.1.0
+- **Release Date**:    May 30th 2012
 
 
 概要
@@ -18,13 +18,14 @@ Mushikago SDK for Ruby.
 機能一覧
 --------
 
-**1.tomboを利用する**: [tombo](http://www.tombo.ne.jp/)は、APIを通してWebサイトのキャプチャ画像を取得するサービスです。
-キャプチャ画像にはタグをつけて管理することができます。
-キャプチャ画像は非同期で取得され、サーバの混雑具合によってリクエストから取得まで最大1時間の時間差があります。
-
-**2.mitsubachiを利用する**: [mitsubachi](http://www.mushikago.org/mitsubachi/)はウェブサイトをクローリングするためのクラウドプラットフォームサービスです。
+**1.mitsubachiを利用する**: [mitsubachi](http://www.mushikago.org/mitsubachi/)はウェブサイトをクローリングするためのクラウドプラットフォームサービスです。
 環境構築などの準備を一切必要とせず、ユーザーは簡易なスクリプトをmitsubachiサーバにアップロード するだけで、ウェブ上の欲しい情報を高速に収集し保存します。ユーザーは、少しの技術力とアイデアを持っていれば、新たなクローラビジネスを始める事ができます。
 
+**2.hotaruを利用する**: [hotaru](http://www.mushikago.org/hotaru/)とは、自然言語処理を行うSaaS型のサービスです。
+hotaruは日本語や英語など、多言語の解析に対応でき、それらの機能を初期費用が掛からず安価なコストから利用できます。また、同じmushikagoのサービスであるmitsubachiを使って、ウェブ上のレビューやブログなどの文章を取得してhotaruで解析するといった様に、 mushikago内のサービスと連携しやすいことも大きな利点です。
+
+**3.hanamgriを利用する**: [hanamgri](http://www.mushikago.org/hanamgri/)とは、さまざまなレイアウトのウェブページから特定のデータを抽出するサービスです。
+webサイトの構成やレイアウトを意識することなく「欲しい項目」「欲しい項目の周辺にありそうなキーワード」「欲しい情報がありそうなURL」をhanamgriに渡すだけで利用できます。 
 
 インストール方法
 ----------------
@@ -153,8 +154,10 @@ $ export MUSHIKAGO_SECRET_KEY=<シークレットキー>
 変更履歴
 --------
 
-- **May.23.12**: 1.3-beta release
-  - haanmgriのベータサポート
+- **May.30.12**: 2.1.0 release
+  - hanamgri(β)サポート
+- **May.23.12**: 2.0.0 release
+  - hanamgriのベータサポート
 - **Feb.20.12**: 0.4.2 release
   - tomboのcaptureオプション「delay_time」に対応
 - **Feb.20.12**: 0.4.0 release

data/lib/mushikago/hanamgri/client.rb

@@ -176,6 +176,7 @@ module Mushikago
       # @param [String] domain_name ドメイン名
       # @param [String] url_or_html 学習対象のURLもしくはHTML文字列
       # @param [Mushikago::Hanamgri::TrainingData] training_data 学習データ
+      # @option options [String] : :charset 学習対象URLもしくはHTML文字列の文字コード
       # @return [Mushikagp::Http::Response] リクエストの結果
       def train domain_name, url_or_html, training_data, options={}
         request = Hanamgri::TrainRequest.new(domain_name, url_or_html, training_data, options)
@@ -226,10 +227,11 @@ module Mushikago
       #   client.save_knowledge('ec', {:description => '学習データの説明'})
       #
       # @param [String] domain_name ドメイン名
+      # @param [String] field_name フィールド名
       # @param [Hash] options オプション
       # @option options [String] :description 学習データの説明
-      def save_knowledge domain_name, options={}
-        request = Hanamgri::SaveKnowledgeRequest.new(domain_name, options)
+      def save_knowledge domain_name, field_name, options={}
+        request = Hanamgri::SaveKnowledgeRequest.new(domain_name, field_name, options)
         send_request(request)
       end
 

data/lib/mushikago/hanamgri/delete_knowledge_request.rb

@@ -7,7 +7,6 @@ module Mushikago
       
       def initialize knowledge_name, options={}
         super(options)
-        raise 'Unsupported Operation.'
         self.knowledge_name = knowledge_name
       end
     end

data/lib/mushikago/hanamgri/field.rb

@@ -12,7 +12,7 @@ module Mushikago
       end
 
       def to_json *args
-        {:name => name.to_s, :required => required?, :type => type}.to_json(args)
+        {:name => name.to_s, :required => required?, :type => type, :knowledge_name => knowledge_name}.to_json(args)
       end
     end
   end

data/lib/mushikago/hanamgri/list_knowledges_request.rb

@@ -9,7 +9,6 @@ module Mushikago
 
       def initialize options={}
         super(options)
-        raise 'Unsupported Operation.'
         self.limit = options[:limit] if options.has_key?(:limit)
         self.offset = options[:offset] if options.has_key?(:offset)
         self.status = options[:status] if options.has_key?(:status)

data/lib/mushikago/hanamgri/save_knowledge_request.rb

@@ -4,12 +4,13 @@ module Mushikago
     class SaveKnowledgeRequest < Mushikago::Http::PutRequest
       def path; "/1/hanamgri/knowledge" end
       request_parameter :domain_name
+      request_parameter :field_name
       request_parameter :description
 
-      def initialize domain_name, options={}
+      def initialize domain_name, field_name, options={}
         super(options)
-        raise 'Unsupported Operation.'
         self.domain_name = domain_name
+        self.field_name = field_name
         self.description = options[:description] if options.has_key?(:description)
       end
     end

data/lib/mushikago/hanamgri/search_schema_request.rb

@@ -4,12 +4,11 @@ module Mushikago
     class SearchSchemaRequest < Mushikago::Http::GetRequest
       def path; "/1/hanamgri/domains/#{domain_name}/schema/search" end
       attr_accessor :domain_name
-      attr_accessor :query_key
-      attr_accessor :query_value
+      request_parameter :query_key
+      request_parameter :query_value
       
       def initialize domain_name, query_key, query_value, options={}
         super(options)
-        raise 'Unsupported Operation.'
         self.domain_name = domain_name
         self.query_key = query_key
         self.query_value = query_value

data/lib/mushikago/hanamgri/train_request.rb

@@ -6,6 +6,7 @@ module Mushikago
       attr_accessor :domain_name
       request_parameter :url_or_html
       request_parameter :training_data do |s| s.to_json end
+      request_parameter :charset
 
       def initialize domain_name, url_or_html, training_data, options={}
         super(options)
@@ -13,6 +14,7 @@ module Mushikago
         self.domain_name = domain_name
         self.url_or_html = url_or_html
         self.training_data = training_data
+        self.charset = options[:charset] if options.has_key?(:charset)
       end
     end
   end

data/lib/mushikago/version.rb

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

data/spec/mushikago/hanamgri/client_spec.rb

@@ -36,7 +36,7 @@ describe Mushikago::Hanamgri::Client do
     [:save_dictionary, Mushikago::Hanamgri::SaveDictionaryRequest, ['domain_name', {:description => '辞書の説明'}]],
     [:list_dictionaries, Mushikago::Hanamgri::ListDictionariesRequest, [{:limit => 3, :offset => 2}]],
     [:delete_dictionary, Mushikago::Hanamgri::DeleteDictionaryRequest, ['dictionary_name', {}]],
-    [:save_knowledge, Mushikago::Hanamgri::SaveKnowledgeRequest, ['domain_name', {:description => '学習データの説明'}]],
+    [:save_knowledge, Mushikago::Hanamgri::SaveKnowledgeRequest, ['domain_name', 'field_name', {:description => '学習データの説明'}]],
     [:list_knowledges, Mushikago::Hanamgri::ListKnowledgesRequest, [{:limit => 3, :offset => 2, :status => 'complete'}]],
     [:delete_knowledge, Mushikago::Hanamgri::DeleteKnowledgeRequest, ['knowledge_name', {}]],
   ].each do |method_name, clazz, args|

data/spec/mushikago/hanamgri/save_knowledge_request_spec.rb

@@ -2,20 +2,21 @@
 require 'spec_helper'
 
 describe Mushikago::Hanamgri::SaveKnowledgeRequest do
-  shared_examples_for 'a valid request instance for save_knowledge' do |n, o|
-    subject{ Mushikago::Hanamgri::SaveKnowledgeRequest.new(n, o) }
+  shared_examples_for 'a valid request instance for save_knowledge' do |n, f, o|
+    subject{ Mushikago::Hanamgri::SaveKnowledgeRequest.new(n, f, o) }
     it{ should be_kind_of(Mushikago::Http::PutRequest) }
     its(:path){ should == "/1/hanamgri/knowledge" }
     its(:domain_name){ should == n }
+    its(:field_name){ should == f }
     its(:description){ should == o[:description] }
   end
 
   test_parameters = [
-    ['domain_name', {}],
-    ['name', {:description => '学習データの説明'}],
-  ].each do |n, o|
-    context ".new(#{n}, #{o})" do
-      it_should_behave_like 'a valid request instance for save_knowledge', n, o
+    ['domain_name', 'field_name', {}],
+    ['name', 'field_name', {:description => '学習データの説明'}],
+  ].each do |n, f, o|
+    context ".new(#{n}, #{f}, #{o})" do
+      it_should_behave_like 'a valid request instance for save_knowledge', n, f, o
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushikago-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000Z
+date: 2012-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8333940 !ruby/object:Gem::Requirement
+  requirement: &9234520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8333940
+  version_requirements: *9234520
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &8333500 !ruby/object:Gem::Requirement
+  requirement: &9234080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8333500
+  version_requirements: *9234080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8333080 !ruby/object:Gem::Requirement
+  requirement: &9264640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8333080
+  version_requirements: *9264640
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &8332660 !ruby/object:Gem::Requirement
+  requirement: &9264220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8332660
+  version_requirements: *9264220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &8332240 !ruby/object:Gem::Requirement
+  requirement: &9263800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8332240
+  version_requirements: *9263800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8331740 !ruby/object:Gem::Requirement
+  requirement: &9263300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *8331740
+  version_requirements: *9263300
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &8331320 !ruby/object:Gem::Requirement
+  requirement: &9262880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8331320
+  version_requirements: *9262880
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &8330840 !ruby/object:Gem::Requirement
+  requirement: &9262420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8330840
+  version_requirements: *9262420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8330380 !ruby/object:Gem::Requirement
+  requirement: &9262000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8330380
+  version_requirements: *9262000
 description: A SDK for Mushikago Web Service.
 email:
 - t.matsuoka@miningbrownie.co.jp