groonga-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6acb75bd146da352188103e7a1970a8a219200c5
-  data.tar.gz: f91de40970d46772c874b18558fa9ce8f5383c0c
+  metadata.gz: 525ea4e0715bed716fde7af9813a55e0d0b90fd6
+  data.tar.gz: ff541cecc8a018112201af5af4fc978f32578f8d
 SHA512:
-  metadata.gz: e153df284b448608874783c83582fdfada42e13c58d265eda16957cc853999c49128dd2f3e44325eb43befbbf78cb3df32d63613421da90899475429bf47074c
-  data.tar.gz: 06c18591b44b11e1ddcaaf0789dd0b23631797d8e7c4175a4022360954e4ca74cd332bc4bb6d73dde4762fd06fea5bf9e616d36dff81dd72c9f57898a9aef8ba
+  metadata.gz: 1b6db2d64ce83681ddb33181c9289944f5c79d13b2df9127bdbc3280d584ad4b7cf6afdede3ad20b45d85d31c4af9604a80496a400f481cfc8b05fc58f2a5ff1
+  data.tar.gz: c9e40baebc159097c8b3b0196f0964050d38e515cc7957a1f22f4d6f05f449e567d1d39656fb7822377873086505e4215e1c0fb3de9e54dd93c7ef2a4070f38d

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 0.2.2 - 2016-03-22
+
+### Improvements
+
+  * response: Supported `lock_clear` command.
+
+  * response: Supported `schema` command partially.
+
+### Fixes
+
+  * Fixed a bug that `Groonga::Command` isn't accepted.
+
 ## 0.2.1 - 2016-03-21
 
 ### Improvements

data/groonga-client.gemspec

@@ -46,6 +46,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
   spec.add_runtime_dependency("groonga-command", ">= 1.2.0")
+  spec.add_runtime_dependency("hashie")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/groonga/client.rb

@@ -165,7 +165,7 @@ module Groonga
     end
 
     def execute(command_or_name, parameters={}, &block)
-      if command_or_name.is_a?(Command)
+      if command_or_name.is_a?(Groonga::Command::Base)
         command = command_or_name
       else
         command_name = command_or_name

data/lib/groonga/client/response.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -17,25 +15,26 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "groonga/client/response/cache_limit"
+require "groonga/client/response/cache-limit"
 require "groonga/client/response/check"
-require "groonga/client/response/clearlock"
-require "groonga/client/response/column_create"
-require "groonga/client/response/column_list"
-require "groonga/client/response/column_remove"
-require "groonga/client/response/column_rename"
+require "groonga/client/response/column-create"
+require "groonga/client/response/column-list"
+require "groonga/client/response/column-remove"
+require "groonga/client/response/column-rename"
 require "groonga/client/response/defrag"
 require "groonga/client/response/delete"
 require "groonga/client/response/dump"
 require "groonga/client/response/error"
 require "groonga/client/response/load"
-require "groonga/client/response/log_level"
-require "groonga/client/response/log_put"
-require "groonga/client/response/log_reopen"
+require "groonga/client/response/lock-clear"
+require "groonga/client/response/log-level"
+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/schema"
 require "groonga/client/response/select"
 require "groonga/client/response/status"
-require "groonga/client/response/table_create"
-require "groonga/client/response/table_list"
-require "groonga/client/response/table_remove"
+require "groonga/client/response/table-create"
+require "groonga/client/response/table-list"
+require "groonga/client/response/table-remove"

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

@@ -18,9 +18,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "rexml/document"
-
 require "json"
 
+require "hashie"
+
 module Groonga
   class Client
     module Response

data/lib/groonga/client/response/{clearlock.rb → lock-clear.rb}

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,7 +20,9 @@ require "groonga/client/response/base"
 module Groonga
   class Client
     module Response
-      class ClearLock < Base
+      class LockClear < Base
+        Response.register("lock_clear", self)
+        # For backward compatibility
         Response.register("clearlock", self)
       end
     end

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

@@ -0,0 +1,151 @@
+# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "groonga/client/response/base"
+
+module Groonga
+  class Client
+    module Response
+      # The response class for `schema` command.
+      #
+      # @since 0.2.2
+      class Schema < Base
+        Response.register("schema", self)
+
+        # @return [Hash<String, Type>] Key is type name and
+        #   value is the definition of the type.
+        #
+        # @since 0.2.2
+        def types
+          @types ||= HashValueConverter.convert(@body["types"]) do |raw_type|
+            Type[raw_type]
+          end
+        end
+
+        # @return [Hash<String, Tokenizer>] Key is tokenizer name and
+        #   value is the definition of the tokenizer.
+        #
+        # @since 0.2.2
+        def tokenizers
+          @tokenizers ||= HashValueConverter.convert(@body["tokenizers"]) do |tokenizer|
+            Tokenizer[tokenizer]
+          end
+        end
+
+        # @return [Hash<String, Table>] Key is table name and value is the
+        #   definition of the table.
+        #
+        # @since 0.2.2
+        def tables
+          @tables ||= HashValueConverter.convert(@body["tables"]) do |raw_table|
+            table = Table.new(self)
+            raw_table.each do |key, value|
+              table[key] = value
+            end
+            table
+          end
+        end
+
+        module HashValueConverter
+          class << self
+            def convert(hash)
+              converted = {}
+              hash.each do |key, value|
+                converted[key] = yield(value)
+              end
+              converted
+            end
+          end
+        end
+
+        class Type < Hash
+          include Hashie::Extensions::MethodAccess
+        end
+
+        class Tokenizer < Hash
+          include Hashie::Extensions::MethodAccess
+        end
+
+        class KeyType < Hash
+          include Hashie::Extensions::MethodAccess
+        end
+
+        class ValueType < Hash
+          include Hashie::Extensions::MethodAccess
+        end
+
+        class Column < Hash
+          include Hashie::Extensions::MethodAccess
+
+          def initialize(schema, properties)
+            @schema = schema
+            super()
+            properties.each do |key, value|
+              self[key] = value
+            end
+          end
+        end
+
+        class Table < Hash
+          include Hashie::Extensions::MethodAccess
+
+          def initialize(schema)
+            @schema = schema
+            super()
+          end
+
+          def []=(key, value)
+            case key.to_sym
+            when :key_type
+              super(key, coerce_key_type(value))
+            when :tokenizer
+              super(key, coerce_tokenzer(value))
+            when :columns
+              super(key, coerce_columns(value))
+            else
+              super
+            end
+          end
+
+          private
+          def coerce_key_type(raw_key_type)
+            if raw_key_type.nil?
+              nil
+            elsif raw_key_type["type"] == "type"
+              @schema.types[raw_key_type["name"]]
+            else
+              @schema.tables[raw_key_type["name"]]
+            end
+          end
+
+          def coerce_tokenizer(raw_tokenizer)
+            if raw_tokenizer.nil?
+              nil
+            else
+              @schema.tokenizers[raw_tokenizer["name"]]
+            end
+          end
+
+          def coerce_columns(raw_columns)
+            HashValueConverter.convert(raw_columns) do |raw_column|
+              Column.new(@schema, raw_column)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/client/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/test/response/test-schema.rb

@@ -0,0 +1,83 @@
+# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "response/helper"
+
+class TestResponseSchema < Test::Unit::TestCase
+  class TestParseRawResponse < self
+    include TestResponseHelper
+
+    def test_select
+      header = [0, 1372430096.70991, 0.000522851943969727]
+      body = {}
+      raw_response = [header, body].to_json
+
+      response = parse_raw_response("schema", raw_response)
+      assert_equal(Groonga::Client::Response::Schema, response.class)
+    end
+  end
+
+  class TestBody < self
+    def setup
+      @command = Groonga::Command::Base.new("schema", {})
+    end
+
+    def create_response(body)
+      header = [0, 1372430096.70991, 0.000522851943969727]
+      Groonga::Client::Response::Schema.new(@command, header, body)
+    end
+
+    class TestTables < self
+      def test_key_type
+        body = {
+          "types" => {
+            "ShortText" => {
+              "name" => "ShortText",
+            },
+          },
+          "tables" => {
+            "Users" => {
+              "key_type" => {
+                "name" => "ShortText",
+                "type" => "type",
+              },
+            }
+          }
+        }
+        response = create_response(body)
+        assert_equal("ShortText",
+                     response.tables["Users"].key_type.name)
+      end
+
+      def test_columns
+        body = {
+          "tables" => {
+            "Users" => {
+              "columns" => {
+                "age" => {
+                  "name" => "age",
+                }
+              }
+            }
+          }
+        }
+        response = create_response(body)
+        assert_equal("age",
+                     response.tables["Users"].columns["age"].name)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -40,6 +40,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -186,28 +200,29 @@ files:
 - lib/groonga/client/protocol/http/thread.rb
 - lib/groonga/client/response.rb
 - lib/groonga/client/response/base.rb
-- lib/groonga/client/response/cache_limit.rb
+- lib/groonga/client/response/cache-limit.rb
 - lib/groonga/client/response/check.rb
-- lib/groonga/client/response/clearlock.rb
-- lib/groonga/client/response/column_create.rb
-- lib/groonga/client/response/column_list.rb
-- lib/groonga/client/response/column_remove.rb
-- lib/groonga/client/response/column_rename.rb
+- lib/groonga/client/response/column-create.rb
+- lib/groonga/client/response/column-list.rb
+- lib/groonga/client/response/column-remove.rb
+- lib/groonga/client/response/column-rename.rb
 - lib/groonga/client/response/defrag.rb
 - lib/groonga/client/response/delete.rb
 - lib/groonga/client/response/dump.rb
 - lib/groonga/client/response/error.rb
 - lib/groonga/client/response/load.rb
-- lib/groonga/client/response/log_level.rb
-- lib/groonga/client/response/log_put.rb
-- lib/groonga/client/response/log_reopen.rb
+- lib/groonga/client/response/lock-clear.rb
+- lib/groonga/client/response/log-level.rb
+- lib/groonga/client/response/log-put.rb
+- lib/groonga/client/response/log-reopen.rb
 - lib/groonga/client/response/quit.rb
 - lib/groonga/client/response/register.rb
+- lib/groonga/client/response/schema.rb
 - lib/groonga/client/response/select.rb
 - lib/groonga/client/response/status.rb
-- lib/groonga/client/response/table_create.rb
-- lib/groonga/client/response/table_list.rb
-- lib/groonga/client/response/table_remove.rb
+- lib/groonga/client/response/table-create.rb
+- lib/groonga/client/response/table-list.rb
+- lib/groonga/client/response/table-remove.rb
 - lib/groonga/client/script-syntax.rb
 - lib/groonga/client/version.rb
 - test/protocol/test-gqtp.rb
@@ -216,6 +231,7 @@ files:
 - test/response/test-base.rb
 - test/response/test-column-list.rb
 - test/response/test-error.rb
+- test/response/test-schema.rb
 - test/response/test-select.rb
 - test/response/test-status.rb
 - test/response/test-table-create.rb
@@ -265,6 +281,7 @@ test_files:
 - test/response/test-error.rb
 - test/response/test-table-list.rb
 - test/response/test-status.rb
+- test/response/test-schema.rb
 - test/response/test-select.rb
 - test/response/test-table-create.rb
 - test/response/test-table-remove.rb