groonga-client 0.0.1 → 0.0.2

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 0.0.2 - 2013-07-08
+
+### Improvements
+
+* Supported "select" command.
+* Supported Enumerable type interface in
+  Response::TableList and Response::ColumnList
+
 ## 0.0.1 - 2013-06-27
 
 Initial release!!!

data/groonga-client.gemspec

@@ -46,13 +46,14 @@ Gem::Specification.new do |spec|
   #   spec.executables = Dir.glob("*")
   # end
 
-  spec.add_runtime_dependency("gqtp")
-  spec.add_runtime_dependency("groonga-command", ">= 1.0.1")
+  spec.add_runtime_dependency("gqtp", ">= 1.0.4")
+  spec.add_runtime_dependency("groonga-command", ">= 1.0.2")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")
+  spec.add_development_dependency("test-unit-rr")
   spec.add_development_dependency("packnga")
   spec.add_development_dependency("redcarpet")
 end

data/lib/groonga/client.rb

@@ -117,6 +117,7 @@ module Groonga
     end
 
     def select(parameters)
+      execute_command("select", parameters)
     end
 
     def shutdown(parameters={})

data/lib/groonga/client/command.rb

@@ -32,8 +32,7 @@ module Groonga
 
         response = nil
         request = connection.send(@command) do |raw_response|
-          response_class = Groonga::Client::Response.find(@command.name)
-          response = response_class.parse(raw_response, @command.output_type)
+          response = parse_raw_response(raw_response)
           yield(response) if async
         end
 
@@ -44,6 +43,12 @@ module Groonga
           response
         end
       end
+
+      private
+      def parse_raw_response(raw_response)
+        response_class = Groonga::Client::Response.find(@command.name)
+        response_class.parse(raw_response, @command.output_type)
+      end
     end
   end
 end

data/lib/groonga/client/response.rb

@@ -32,5 +32,6 @@ require "groonga/client/response/log_put"
 require "groonga/client/response/log_reopen"
 require "groonga/client/response/quit"
 require "groonga/client/response/register"
+require "groonga/client/response/select"
 require "groonga/client/response/status"
 require "groonga/client/response/table_list"

data/lib/groonga/client/response/column_list.rb

@@ -23,16 +23,32 @@ module Groonga
   class Client
     module Response
       class ColumnList < Base
+        include Enumerable
+
         Response.register("column_list", self)
 
         def initialize(header, body)
           super(header, parse_body(body))
         end
 
+        def each
+          @columns.each do |column|
+            yield column
+          end
+        end
+
+        def size
+          @columns.size
+        end
+
+        def [](index)
+          @columns[index]
+        end
+
         def parse_body(body)
           properties = body.first
           infos = body[1..-1]
-          infos.collect do |info|
+          @columns = infos.collect do |info|
             column = Column.new
             properties.each_with_index do |(name, _), i|
               column.send("#{name}=", info[i])

data/lib/groonga/client/response/select.rb

@@ -0,0 +1,53 @@
+require "groonga/client/response/base"
+
+module Groonga
+  class Client
+    module Response
+      class Select < Base
+        Response.register("select", self)
+
+        attr_accessor :records, :n_records
+        attr_accessor :drilldowns
+
+        def initialize(header, body)
+          super(header, parse_body(body))
+        end
+
+        private
+        def parse_body(body)
+          @n_records, @records = parse_match_records(body.first)
+          @drilldowns = parse_drilldowns(body[1..-1])
+          body
+        end
+
+        def parse_result(raw_result)
+          n_items = raw_result.first.first
+          properties = raw_result[1]
+          infos = raw_result[2..-1]
+          items = infos.collect do |info|
+            item = {}
+            properties.each_with_index do |(name, _), i|
+              item[name] = info[i]
+            end
+            item
+          end if infos
+          [n_items, items]
+        end
+
+        def parse_match_records(raw_records)
+          parse_result(raw_records)
+        end
+
+        def parse_drilldowns(raw_drilldowns)
+          raw_drilldowns.collect do |raw_drilldown|
+            n_hits, items = parse_result(raw_drilldown)
+            Drilldown.new(n_hits, items)
+          end if raw_drilldowns
+        end
+
+        Drilldown = Struct.new(:n_hits, :items)
+      end
+    end
+  end
+end
+

data/lib/groonga/client/response/table_list.rb

@@ -23,17 +23,33 @@ module Groonga
   class Client
     module Response
       class TableList < Base
+        include Enumerable
+
         Response.register("table_list", self)
 
         def initialize(header, body)
           super(header, parse_body(body))
         end
 
+        def each
+          @tables.each do |table|
+            yield table
+          end
+        end
+
+        def size
+          @tables.size
+        end
+
+        def [](index)
+          @tables[index]
+        end
+
         private
         def parse_body(body)
           properties = body.first
           infos = body[1..-1]
-          infos.collect do |info|
+          @tables = infos.collect do |info|
             table = Table.new
             properties.each_with_index do |(name, _), i|
               table.send("#{name}=", info[i])

data/lib/groonga/client/version.rb

@@ -1,5 +1,5 @@
 module Groonga
   class Client
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/response/helper.rb

@@ -0,0 +1,7 @@
+module TestResponseHelper
+  def make_command(command_name, parameters = {})
+    command_class = Groonga::Command.find(command_name)
+    command = command_class.new(command_name, parameters)
+    Groonga::Client::Command.new(command)
+  end
+end

data/test/response/test-column-list.rb

@@ -0,0 +1,25 @@
+require "test/unit/rr"
+
+require "response/helper"
+
+class TestResponseColumnList < Test::Unit::TestCase
+  include TestResponseHelper
+
+  def test_column_list
+    header = [0,1372430096.70991,0.000522851943969727]
+    body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["type","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["source","ShortText"]],
+      [256,"Text","/tmp/test.db.0000100","var","COLUMN_SCALAR|PERSISTENT","TestTable","ShortText",[]]]
+
+    connection = Object.new
+    stub(connection).send.with_any_args.yields([header, body].to_json) do
+      request = Object.new
+      stub(request).wait do
+        true
+      end
+    end
+
+    response = make_command("column_list").execute(connection)
+    assert_equal(Groonga::Client::Response::ColumnList, response.class)
+  end
+end
+

data/test/response/test-select.rb

@@ -0,0 +1,23 @@
+require "test/unit/rr"
+
+require "response/helper"
+
+class TestResponseSelect < Test::Unit::TestCase
+  include TestResponseHelper
+
+  def test_select
+    header = [0,1372430096.70991,0.000522851943969727]
+    body = [[[1], [["_id", "UInt32"]], [1]]]
+
+    connection = Object.new
+    stub(connection).send.with_any_args.yields([header, body].to_json) do
+      request = Object.new
+      stub(request).wait do
+        true
+      end
+    end
+
+    response = make_command("select").execute(connection)
+    assert_equal(Groonga::Client::Response::Select, response.class)
+  end
+end

data/test/response/test-table-list.rb

@@ -0,0 +1,24 @@
+require "test/unit/rr"
+
+require "response/helper"
+
+class TestResponseTableList < Test::Unit::TestCase
+  include TestResponseHelper
+
+  def test_table_list
+    header = [0,1372430096.70991,0.000522851943969727]
+    body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],
+      [256,"Test","/tmp/test.db.0000100","TABLE_HASH_KEY|PERSISTENT",nil,nil,nil,nil]]
+
+    connection = Object.new
+    stub(connection).send.with_any_args.yields([header, body].to_json) do
+      request = Object.new
+      stub(request).wait do
+        true
+      end
+    end
+
+    response = make_command("table_list").execute(connection)
+    assert_equal(Groonga::Client::Response::TableList, response.class)
+  end
+end

data/test/results/test-column-list.rb

@@ -0,0 +1,63 @@
+require "test/unit/rr"
+
+class TestResultsColumnList < Test::Unit::TestCase
+  class TestResults < self
+    def setup
+      header = [0,1372430096.70991,0.000522851943969727]
+      body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["type","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["source","ShortText"]],
+        [259,"_key","","","COLUMN_SCALAR","Bigram","ShortText",[]],
+        [278,"comment_index","/tmp/db.db.0000116","index","COLUMN_INDEX|WITH_POSITION|PERSISTENT","Bigram","Comments",["Comments.comment"]],
+        [277,"users_index","/tmp/db.db.0000115","index","COLUMN_INDEX|WITH_SECTION|WITH_POSITION|PERSISTENT","Bigram","Users",["Users.name","Users.location_str","Users.description"]]]
+      @column_list = Groonga::Client::Response::ColumnList.new(header, body)
+    end
+
+    def test_column_list
+      assert_equal(
+        [
+          {
+            :id => 259,
+            :name => "_key",
+            :path => "",
+            :type => "",
+            :flags => "COLUMN_SCALAR",
+            :domain => "Bigram",
+            :range => "ShortText",
+            :source => [],
+          },
+          {
+            :id => 278,
+            :name => "comment_index",
+            :path => "/tmp/db.db.0000116",
+            :type => "index",
+            :flags => "COLUMN_INDEX|WITH_POSITION|PERSISTENT",
+            :domain => "Bigram",
+            :range => "Comments",
+            :source => ["Comments.comment"],
+          },
+          {
+            :id => 277,
+            :name => "users_index",
+            :path => "/tmp/db.db.0000115",
+            :type => "index",
+            :flags => "COLUMN_INDEX|WITH_SECTION|WITH_POSITION|PERSISTENT",
+            :domain => "Bigram",
+            :range => "Users",
+            :source => ["Users.name","Users.location_str", "Users.description"],
+          },
+        ],
+        @column_list.collect {|column|
+          {
+            :id => column.id,
+            :name => column.name,
+            :path => column.path,
+            :type => column.type,
+            :flags => column.flags,
+            :domain => column.domain,
+            :range => column.range,
+            :source => column.source,
+          }
+        }
+      )
+    end
+  end
+end

data/test/results/test-select.rb

@@ -0,0 +1,63 @@
+require "test/unit/rr"
+
+class TestResultsSelect < Test::Unit::TestCase
+  class TestResults < self
+    def setup
+      header = [0,1372430096.70991,0.000522851943969727]
+      body = [[[6],[["_id","UInt32"],["country","Country"],["domain","Domain"]],[1,"japan",".com"],[2,"brazil",".com"],[3,"japan",".org"],[4,"usa",".com"],[5,"japan",".org"],[6,"usa",".com"]],
+        [[3],[["_key","ShortText"],["_nsubrecs","Int32"]],["japan",3],["brazil",1],["usa",2]],
+        [[2],[["_key","ShortText"],["_nsubrecs","Int32"]],[".com",4],[".org",2]]]
+      @select = Groonga::Client::Response::Select.new(header, body)
+    end
+
+    def test_n_records
+      assert_equal(6, @select.n_records)
+    end
+
+    def test_records
+      expected_records = [
+        {"_id"=>1, "country"=>"japan", "domain"=>".com"},
+        {"_id"=>2, "country"=>"brazil", "domain"=>".com"},
+        {"_id"=>3, "country"=>"japan", "domain"=>".org"},
+        {"_id"=>4, "country"=>"usa", "domain"=>".com"},
+        {"_id"=>5, "country"=>"japan", "domain"=>".org"},
+        {"_id"=>6, "country"=>"usa", "domain"=>".com"},
+      ]
+      assert_equal(expected_records, @select.records)
+    end
+
+    def test_drilldowns
+      expected_drilldowns = [
+        Drilldown.new(3, [
+            {"_key"=>"japan", "_nsubrecs"=>3},
+            {"_key"=>"brazil", "_nsubrecs"=>1},
+            {"_key"=>"usa", "_nsubrecs"=>2},]),
+        Drilldown.new(2, [
+            {"_key"=>".com", "_nsubrecs"=>4},
+            {"_key"=>".org", "_nsubrecs"=>2}]),
+      ]
+      assert_equal(expected_drilldowns, @select.drilldowns.collect{|drilldown|
+          Drilldown.new(drilldown.n_hits, drilldown.items)
+        })
+    end
+  end
+
+  class TestNoRecordsBody < self
+    def setup
+      header = [0,1372430096.70991,0.000522851943969727]
+      body = [[[6],[["_id","UInt32"],["country","Country"]]]]
+      @select = Groonga::Client::Response::Select.new(header, body)
+    end
+
+    def test_n_records
+      assert_equal(6, @select.n_records)
+    end
+
+    def test_records
+      assert_equal([], @select.records)
+    end
+  end
+
+  Drilldown = Struct.new(:n_hits, :items)
+end
+

data/test/results/test-table-list.rb

@@ -0,0 +1,62 @@
+require "test/unit/rr"
+
+class TestResultsTableList < Test::Unit::TestCase
+  def setup
+    header = [0,1372430096.70991,0.000522851943969727]
+    body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],
+      [257,"Ages","/tmp/test.db.0000101","TABLE_DAT_KEY|PERSISTENT","UInt32",nil,nil,nil],
+      [256,"Lexicon","/tmp/test.db.0000100","TABLE_PAT_KEY|PERSISTENT","ShortText",nil,"TokenBigram","NormalizerAuto"],
+      [258,"Logs","/tmp/test.db.0000102","TABLE_NO_KEY|PERSISTENT",nil,nil,nil,nil]]
+    @table_list = Groonga::Client::Response::TableList.new(header, body)
+  end
+
+  def test_table_list
+    assert_equal(
+      [
+        {
+          :id => 257,
+          :name => "Ages",
+          :path => "/tmp/test.db.0000101",
+          :flags => "TABLE_DAT_KEY|PERSISTENT",
+          :domain => "UInt32",
+          :range => nil,
+          :default_tokenizer => nil,
+          :normalizer => nil,
+        },
+        {
+          :id => 256,
+          :name => "Lexicon",
+          :path => "/tmp/test.db.0000100",
+          :flags => "TABLE_PAT_KEY|PERSISTENT",
+          :domain => "ShortText",
+          :range => nil,
+          :default_tokenizer => "TokenBigram",
+          :normalizer => "NormalizerAuto"
+        },
+        {
+          :id => 258,
+          :name => "Logs",
+          :path => "/tmp/test.db.0000102",
+          :flags => "TABLE_NO_KEY|PERSISTENT",
+          :domain => nil,
+          :range => nil,
+          :default_tokenizer => nil,
+          :normalizer => nil
+        },
+      ],
+      @table_list.collect {|table|
+        {
+          :id => table.id,
+          :name => table.name,
+          :path => table.path,
+          :flags => table.flags,
+          :domain => table.domain,
+          :range => table.range,
+          :default_tokenizer => table.default_tokenizer,
+          :normalizer => table.normalizer,
+        }
+      }
+    )
+  end
+end
+

data/test/test-command.rb

@@ -0,0 +1,26 @@
+class TestCommand < Test::Unit::TestCase
+  def setup
+    @client = Groonga::Client.open(:protocol => :http)
+  end
+
+  def test_column_list
+    mock(@client).execute_command("column_list", :table => :Test) do
+      Object.new
+    end
+    @client.column_list(:table => :Test)
+  end
+
+  def test_select
+    mock(@client).execute_command("select", :table => :Test) do
+      Object.new
+    end
+    @client.select(:table => :Test)
+  end
+
+  def test_table_list
+    mock(@client).execute_command("table_list", {}) do
+      Object.new
+    end
+    @client.table_list
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,125 +11,161 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: groonga-command
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Groonga-client gem supports HTTP or
+description: ! 'Groonga-client gem supports HTTP or
+
   [GQTP (Groonga Query Transfer Protocol)](http://groonga.org/docs/spec/gqtp.html)
+
   as the protocol using a client. You can use it without groonga
+
   package.
+
+'
 email:
 - yshr04hrk@gmail.com
 - kou@clear-code.com
@@ -161,6 +198,7 @@ files:
 - lib/groonga/client/response/base.rb
 - lib/groonga/client/response/dump.rb
 - lib/groonga/client/response/table_list.rb
+- lib/groonga/client/response/select.rb
 - lib/groonga/client/response/log_put.rb
 - lib/groonga/client/response/clearlock.rb
 - lib/groonga/client/response/check.rb
@@ -168,34 +206,51 @@ files:
 - lib/groonga/client/response.rb
 - lib/groonga/client.rb
 - doc/text/news.md
+- test/response/test-table-list.rb
+- test/response/test-column-list.rb
+- test/response/helper.rb
+- test/response/test-select.rb
 - test/run-test.rb
+- test/results/test-table-list.rb
+- test/results/test-column-list.rb
+- test/results/test-select.rb
+- test/test-command.rb
 - test/test-client.rb
 homepage: https://github.com/ranguba/groonga-client
 licenses:
 - LGPLv2.1 or later
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Groonga-client is a client for groonga (http://groonga.org/) implemented
   with pure ruby.
 test_files:
+- test/response/test-table-list.rb
+- test/response/test-column-list.rb
+- test/response/helper.rb
+- test/response/test-select.rb
 - test/run-test.rb
+- test/results/test-table-list.rb
+- test/results/test-column-list.rb
+- test/results/test-select.rb
+- test/test-command.rb
 - test/test-client.rb
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 486d7005cfe3c244166bdc9227958043b53115ed
-  data.tar.gz: 08cf812cc95984efa717aa75319ccc2cb1521386
-SHA512:
-  metadata.gz: f9222918a4338736caa918355a77c964a74e0b0a6c861942d3c2314d6e189ac869c6200d751a5be3afe2a267e21aa40689594696a5095ecd558f61708a71cd4e
-  data.tar.gz: 299134381bc0235bba588869339d748c034025f306b50e49bd148246a97c79d9814cdad1a41a5d30ddd6adc35640dbca5090a6cf0300c6b793be3f1815bd5281