groonga-client 0.5.4 → 0.5.5

data/test/command-line/test-index-check.rb

@@ -0,0 +1,292 @@
+# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017  Kentaro Hayashi <hayashi@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_relative "helper"
+
+require "groonga/client/command-line/groonga-client-index-check"
+
+class TestCommandLineIndexCheck < Test::Unit::TestCase
+  include Groonga::Client::TestHelper
+  include CommandLineTestHelper
+
+  def index_check(*arguments)
+    command_line = Groonga::Client::CommandLine::GroongaClientIndexCheck.new
+    capture_outputs do
+      command_line.run(["--url", groonga_url, *arguments])
+    end
+  end
+
+  def test_source
+    restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos
+    COMMANDS
+
+    error_output = <<-OUTPUT
+Source is missing: <Terms.memos_content>
+    OUTPUT
+
+    assert_equal([false, "", error_output],
+                 index_check("--method=source"))
+  end
+
+  sub_test_case("content") do
+    def test_valid
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table Memos
+[
+["_key", "content"],
+["groonga", "Groonga is fast"]
+]
+      COMMANDS
+
+      assert_equal([true, "", ""],
+                   index_check("--method=content"))
+    end
+
+    def test_all
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content1 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content2 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table Memos
+[
+["_key", "content"],
+["groonga", "Groonga is fast"]
+]
+
+delete --table Terms --key is
+      COMMANDS
+
+      assert_equal([
+                     false,
+                     "",
+                     "Broken: Terms.memos_content1: <is>\n" +
+                     "Broken: Terms.memos_content2: <is>\n",
+                   ],
+                   index_check("--method=content"))
+    end
+
+    def test_table
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms1 TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms1 memos_content1 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms1 memos_content2 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+table_create Terms2 TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms2 memos_content \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table Memos
+[
+["_key", "content"],
+["groonga", "Groonga is fast"]
+]
+
+delete --table Terms1 --key is
+delete --table Terms2 --key is
+      COMMANDS
+
+      assert_equal([
+                     false,
+                     "",
+                     "Broken: Terms1.memos_content1: <is>\n" +
+                     "Broken: Terms1.memos_content2: <is>\n",
+                   ],
+                   index_check("--method=content", "Terms1"))
+    end
+
+    def test_index_column
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content1 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content2 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table Memos
+[
+["_key", "content"],
+["groonga", "Groonga is fast"]
+]
+
+delete --table Terms --key is
+      COMMANDS
+
+      assert_equal([
+                     false,
+                     "",
+                     "Broken: Terms.memos_content1: <is>\n",
+                   ],
+                   index_check("--method=content", "Terms.memos_content1"))
+    end
+
+    def test_index_columns
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_content1 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content2 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+column_create Terms memos_content3 \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos content
+
+load --table Memos
+[
+["_key", "content"],
+["groonga", "Groonga is fast"]
+]
+
+delete --table Terms --key is
+      COMMANDS
+
+      assert_equal([
+                     false,
+                     "",
+                     "Broken: Terms.memos_content1: <is>\n" +
+                     "Broken: Terms.memos_content2: <is>\n",
+                   ],
+                   index_check("--method=content",
+                               "Terms.memos_content1",
+                               "Terms.memos_content2"))
+    end
+
+    def test_key
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos_key \
+  COLUMN_INDEX|WITH_POSITION \
+  Memos _key
+
+load --table Memos
+[
+{"_key": "groonga"}
+]
+
+delete Terms --key groonga
+      COMMANDS
+
+      assert_equal([false, "", "Broken: Terms.memos_key: <groonga>\n"],
+                   index_check("--method=content"))
+    end
+
+    def test_multiple_column
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --normalizer NormalizerAuto \
+  --default_tokenizer TokenBigram
+column_create Terms memos \
+  COLUMN_INDEX|WITH_SECTION|WITH_POSITION \
+  Memos _key,content
+
+load --table Memos
+[
+{"_key": "groonga", "content": "Groonga is fast"}
+]
+
+delete Terms --key is
+      COMMANDS
+
+      assert_equal([false, "", "Broken: Terms.memos: <is>\n"],
+                   index_check("--method=content"))
+    end
+
+    def test_number
+      restore(<<-COMMANDS)
+table_create Memos TABLE_HASH_KEY ShortText
+column_create Memos score COLUMN_SCALAR Int32
+
+table_create Scores TABLE_PAT_KEY Int32
+column_create Scores memos_score \
+  COLUMN_INDEX \
+  Memos score
+
+load --table Memos
+[
+{"_key": "groonga", "score": 10},
+{"_key": "mroonga", "score": 9}
+]
+
+delete Scores --key 9
+      COMMANDS
+
+      assert_equal([false, "", "Broken: Scores.memos_score: <9>\n"],
+                   index_check("--method=content"))
+    end
+  end
+end

data/test/command-line/test-index-recreate.rb

@@ -16,82 +16,23 @@
 
 require "time"
 
-require "groonga/command/parser"
+require_relative "helper"
 
-require "groonga/client"
-require "groonga/client/test-helper"
 require "groonga/client/command-line/groonga-client-index-recreate"
 
 class TestCommandLineIndexRecreate < Test::Unit::TestCase
   include Groonga::Client::TestHelper
+  include CommandLineTestHelper
 
   def setup
     @now = Time.parse("2017-10-25T17:22:00+0900")
     stub(Time).now {@now}
   end
 
-  def groonga_url
-    @groonga_server_runner.url.to_s
-  end
-
-  def open_client
-    Groonga::Client.open(:url => groonga_url) do |client|
-      yield(client)
-    end
-  end
-
-  def restore(commands)
-    open_client do |client|
-      values = nil
-      Groonga::Command::Parser.parse(commands) do |event, *args|
-        case event
-        when :on_command
-          command, = args
-          response = client.execute(command)
-          unless response.success?
-            raise Groonga::Client::Request::ErrorResponse.new(response)
-          end
-        when :on_load_start
-          command, = args
-          values = []
-        when :on_load_columns
-          command, columns = args
-          command[:columns] ||= columns.join(",")
-        when :on_load_value
-          command, value = args
-          values << value
-        when :on_load_complete
-          command, = args
-          command[:values] ||= JSON.generate(values)
-          response = client.execute(command)
-          unless response.success?
-            raise Groonga::Client::Request::ErrorResponse.new(response)
-          end
-        else
-          p [:unhandled_event, event, *args]
-        end
-      end
-    end
-  end
-
-  def dump
-    open_client do |client|
-      client.dump.body
-    end
-  end
-
   def index_recreate(*arguments)
     command_line = Groonga::Client::CommandLine::GroongaClientIndexRecreate.new
-    begin
-      stdout, $stdout = $stdout, StringIO.new
-      stderr, $stderr = $stderr, StringIO.new
-      [
-        command_line.run(["--url", groonga_url, *arguments]),
-        $stdout.string,
-        $stderr.string,
-      ]
-    ensure
-      $stdout, $stderr = stdout, stderr
+    capture_outputs do
+      command_line.run(["--url", groonga_url, *arguments])
     end
   end
 

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

@@ -93,6 +93,30 @@ class TestResponseColumnList < Test::Unit::TestCase
       Groonga::Client::Response::ColumnList.new(@command, header, body)
     end
 
+    class TestFullName < self
+      def create_response(domain, name)
+        columns = [
+          [
+            256,
+            name,
+            "/tmp/test.db.0000100",
+            "var",
+            "COLUMN_SCALAR|PERSISTENT",
+            domain,
+            "ShortText",
+            [],
+          ]
+        ]
+        super(columns)
+      end
+
+      def test_full_name
+        response = create_response("Memos", "content")
+        assert_equal("Memos.content",
+                     response[0].full_name)
+      end
+    end
+
     class TestFlags < self
       def create_response(flags)
         columns = [
@@ -137,6 +161,36 @@ class TestResponseColumnList < Test::Unit::TestCase
         end
       end
     end
+
+    class TestSource < self
+      def create_response(sources)
+        columns = [
+          [
+            256,
+            "content",
+            "/tmp/test.db.0000100",
+            "var",
+            "COLUMN_INDEX|WITH_POSITION|PERSISTENT",
+            "Memos",
+            "ShortText",
+            sources,
+          ]
+        ]
+        super(columns)
+      end
+
+      def test_source
+        sources = ["Memos.title", "Memos.content"]
+        response = create_response(sources)
+        assert_equal(sources, response[0].source)
+      end
+
+      def test_sources
+        sources = ["Memos.title", "Memos.content"]
+        response = create_response(sources)
+        assert_equal(sources, response[0].sources)
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ email:
 - tfortress58@gmail.com
 executables:
 - groonga-client
+- groonga-client-index-check
 - groonga-client-index-recreate
 extensions: []
 extra_rdoc_files: []
@@ -171,13 +172,17 @@ files:
 - README.md
 - Rakefile
 - bin/groonga-client
+- bin/groonga-client-index-check
 - bin/groonga-client-index-recreate
 - doc/text/lgpl-2.1.txt
 - doc/text/news.md
 - groonga-client.gemspec
 - lib/groonga/client.rb
+- lib/groonga/client/command-line/groonga-client-index-check.rb
 - lib/groonga/client/command-line/groonga-client-index-recreate.rb
 - lib/groonga/client/command-line/groonga-client.rb
+- lib/groonga/client/command-line/parser.rb
+- lib/groonga/client/command-line/runner.rb
 - lib/groonga/client/command.rb
 - lib/groonga/client/default.rb
 - lib/groonga/client/empty-request.rb
@@ -224,6 +229,8 @@ files:
 - lib/groonga/client/test/fixture.rb
 - lib/groonga/client/test/groonga-server-runner.rb
 - lib/groonga/client/version.rb
+- test/command-line/helper.rb
+- test/command-line/test-index-check.rb
 - test/command-line/test-index-recreate.rb
 - test/protocol/test-gqtp.rb
 - test/protocol/test-http.rb
@@ -274,39 +281,41 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Groonga-client is a client for Groonga (http://groonga.org/) implemented
   with pure Ruby. You can use it without Groonga.
 test_files:
-- test/results/test-table-list.rb
-- test/response/test-column-list.rb
-- test/response/test-table-remove.rb
-- test/response/test-status.rb
-- test/response/test-schema.rb
-- test/response/helper.rb
-- test/response/test-select-xml.rb
-- test/response/test-table-create.rb
-- test/response/test-select-command-version3.rb
-- test/response/test-base.rb
-- test/response/test-load.rb
-- test/response/test-select-command-version1.rb
-- test/response/test-error.rb
-- test/response/test-table-list.rb
 - test/run-test.rb
-- test/protocol/test-gqtp.rb
-- test/protocol/test-http.rb
-- test/test-script-syntax.rb
-- test/request/test-generic.rb
-- test/request/test-select.rb
+- test/request/select/test-filter.rb
+- test/request/select/test-sort-keys-parameter.rb
 - test/request/select/test-values-parameter.rb
 - test/request/select/test-scorer.rb
-- test/request/select/test-sort-keys-parameter.rb
-- test/request/select/test-filter.rb
-- test/request/select/test-backward-compatible-sort-keys-parameter.rb
 - test/request/select/test-output-columns-parameter.rb
+- test/request/select/test-backward-compatible-sort-keys-parameter.rb
 - test/request/test-merger.rb
+- test/request/test-select.rb
+- test/request/test-generic.rb
+- test/test-script-syntax.rb
+- test/response/helper.rb
+- test/response/test-table-list.rb
+- test/response/test-status.rb
+- test/response/test-load.rb
+- test/response/test-select-command-version1.rb
+- test/response/test-base.rb
+- test/response/test-table-remove.rb
+- test/response/test-schema.rb
+- test/response/test-column-list.rb
+- test/response/test-table-create.rb
+- test/response/test-select-command-version3.rb
+- test/response/test-select-xml.rb
+- test/response/test-error.rb
+- test/command-line/test-index-check.rb
+- test/command-line/helper.rb
 - test/command-line/test-index-recreate.rb
-- test/test-client.rb
 - test/test-command.rb
+- test/results/test-table-list.rb
+- test/protocol/test-http.rb
+- test/protocol/test-gqtp.rb
+- test/test-client.rb