groonga-command 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591023da10e62aa8ae69838fa6d5a468d2d9b3a6
-  data.tar.gz: 42e6f65a25e722c3df64f4f66abe49d2396b8533
+  metadata.gz: 7df61061b1bec3f363ad91e8fe391ba8c2119e41
+  data.tar.gz: bf5030cc2ed788ee2593a7140b808ae48b5faba8
 SHA512:
-  metadata.gz: 1e1b13facf3a3c6bdb42f75a8cc1c0e1a0a361eafa4d942af624456a5759805f12c265003a56802b22b1ce23b167f9b5655e8c3b9b066df4ae94b67636cd586b
-  data.tar.gz: 16dc292d5de500fdcdbcfc6ecf7a037a43230afaceab436483cebf5ca855fd9e622fc61a27ee02e41cfd1fd3cfc0dc41ae3719665a6a7fc9dc37b251c0327a98
+  metadata.gz: 6c25e91c32c0acefe24985db88c555dc4387b4c7fe5cdc0dbb4e08cefe66d3903907b65a2d9f81e826977278473ef4b0a7010ea3bbf592bbeba7705df4937944
+  data.tar.gz: 436f36f09c4a028ccbfa691d40429f3226b1648d07751940b44f1d0c256d4f0268cf82112dba1eda728738bf6235e3fb18a2fe495180182936179ac94c0d55da

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 1.1.1: 2015-02-13
+
+### Improvements
+
+  * {Groonga::Command::LogicalRangeFilter}: Added.
+    [GitHub#4] [Patch by Hiroshi Hatake]
+  * {Groonga::Command::LogicalCount}: Added.
+    [GitHub#5] [Patch by Hiroshi Hatake]
+
+### Fixes
+
+  * Fixed return type in YARD doc.
+    [GitHub#7] [Patch by Hiroshi Hatake]
+
 ## 1.1.0: 2015-02-09
 
 ### Improvements

data/lib/groonga/command/logical-count.rb

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015  Hiroshi Hatake <hatake@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/command/base"
+
+module Groonga
+  module Command
+    # A command class that represents `logical_count` command.
+    #
+    # @since 1.1.1
+    class LogicalCount < Base
+      Command.register("logical_count", self)
+
+      class << self
+        def parameter_names
+          [
+            :logical_table,
+            :shard_key,
+            :min,
+            :min_border,
+            :max,
+            :max_border,
+            :filter,
+          ]
+        end
+      end
+
+      # @return [String] `logical_table` parameter value.
+      #
+      # @since 1.1.1
+      def logical_table
+        self[:logical_table]
+      end
+
+      # @return [String] `shard_key` parameter value.
+      #
+      # @since 1.1.1
+      def shard_key
+        self[:shard_key]
+      end
+
+      # @return [String] `min` parameter value.
+      #
+      # @since 1.1.1
+      def min
+        self[:min]
+      end
+
+      # @return [String] `min_border` parameter value.
+      #
+      # @since 1.1.1
+      def min_border
+        self[:min_border]
+      end
+
+      # @return [String] `max` parameter value.
+      #
+      # @since 1.1.1
+      def max
+        self[:max]
+      end
+
+      # @return [String] `max_border` parameter value.
+      #
+      # @since 1.1.1
+      def max_border
+        self[:max_border]
+      end
+
+      # @return [String] `filter` parameter value.
+      #
+      # @since 1.1.1
+      def filter
+        self[:filter]
+      end
+    end
+  end
+end

data/lib/groonga/command/logical-range-filter.rb

@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015  Hiroshi Hatake <hatake@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/command/base"
+
+module Groonga
+  module Command
+    # A command class that represents `logical_count` command.
+    #
+    # @since 1.1.1
+    class LogicalRangeFilter < Base
+      Command.register("logical_range_filter", self)
+
+      class << self
+        def parameter_names
+          [
+            :logical_table,
+            :shard_key,
+            :min,
+            :min_border,
+            :max,
+            :max_border,
+            :order,
+            :offset,
+            :limit,
+            :filter,
+            :output_columns,
+          ]
+        end
+      end
+
+      # @return [String] `logical_table` parameter value.
+      #
+      # @since 1.1.1
+      def logical_table
+        self[:logical_table]
+      end
+
+      # @return [String] `shard_key` parameter value.
+      #
+      # @since 1.1.1
+      def shard_key
+        self[:shard_key]
+      end
+
+      # @return [String] `min` parameter value.
+      #
+      # @since 1.1.1
+      def min
+        self[:min]
+      end
+
+      # @return [String] `min_border` parameter value.
+      #
+      # @since 1.1.1
+      def min_border
+        self[:min_border]
+      end
+
+      # @return [String] `max` parameter value.
+      #
+      # @since 1.1.1
+      def max
+        self[:max]
+      end
+
+      # @return [String] `max_border` parameter value.
+      #
+      # @since 1.1.1
+      def max_border
+        self[:max_border]
+      end
+
+      # @return [String] `order` parameter value.
+      #
+      # @since 1.1.1
+      def order
+        self[:order]
+      end
+
+      # @return [Integer] `offset` parameter value.
+      #
+      # @since 1.1.1
+      def offset
+        value = self[:offset]
+        value = value.to_i unless value.nil?
+        value
+      end
+
+      # @return [Integer] `limit` parameter value.
+      #
+      # @since 1.1.1
+      def limit
+        value = self[:limit]
+        value = value.to_i unless value.nil?
+        value
+      end
+
+      # @return [String] `filter` parameter value.
+      #
+      # @since 1.1.1
+      def filter
+        self[:filter]
+      end
+
+      # @return [String] `output_columns` parameter value.
+      #
+      # @since 1.1.1
+      def output_columns
+        self[:output_columns]
+      end
+    end
+  end
+end

data/lib/groonga/command/range-filter.rb

@@ -83,7 +83,7 @@ module Groonga
         self[:max_border]
       end
 
-      # @return [String] `offset` parameter value.
+      # @return [Integer] `offset` parameter value.
       #
       # @since 1.1.0
       def offset
@@ -92,7 +92,7 @@ module Groonga
         value
       end
 
-      # @return [String] `limit` parameter value.
+      # @return [Integer] `limit` parameter value.
       #
       # @since 1.1.0
       def limit

data/lib/groonga/command/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/groonga/command.rb

@@ -28,6 +28,8 @@ require "groonga/command/delete"
 require "groonga/command/dump"
 require "groonga/command/get"
 require "groonga/command/load"
+require "groonga/command/logical-count"
+require "groonga/command/logical-range-filter"
 require "groonga/command/normalize"
 require "groonga/command/range-filter"
 require "groonga/command/register"

data/test/command/test-logical-count.rb

@@ -0,0 +1,99 @@
+# Copyright (C) 2015  Hiroshi Hatake <hatake@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
+
+class LogicalCountCommandTest < Test::Unit::TestCase
+  private
+  def logical_count_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::LogicalCount.new("logical_count",
+                                       pair_arguments,
+                                       ordered_arguments)
+  end
+
+  class ConstructorTest < self
+    def test_ordered_arguments
+      logical_table  = "Logs"
+      shard_key      = "timestamp"
+      min            = "2015-02-12 00:00:00"
+      min_border     = "include"
+      max            = "2015-02-13 00:00:00"
+      max_border     = "exclude"
+      filter         = "message == \"Shutdown\""
+
+      ordered_arguments = [
+        logical_table,
+        shard_key,
+        min,
+        min_border,
+        max,
+        max_border,
+        filter,
+      ]
+      command = logical_count_command({}, ordered_arguments)
+      assert_equal({
+                     :logical_table  => logical_table,
+                     :shard_key      => shard_key,
+                     :min            => min,
+                     :min_border     => min_border,
+                     :max            => max,
+                     :max_border     => max_border,
+                     :filter         => filter,
+                   },
+                   command.arguments)
+    end
+  end
+
+  class LogicalTableTest < self
+    def test_reader
+      command = logical_count_command(:logical_table => "Logs")
+      assert_equal("Logs", command.logical_table)
+    end
+  end
+
+  class ShardKeyTest < self
+    def test_reader
+      command = logical_count_command(:shard_key => "timestamp")
+      assert_equal("timestamp", command.shard_key)
+    end
+  end
+
+  class MinTest < self
+    def test_reader
+      command = logical_count_command(:min => "2015-02-13 00:00:00")
+      assert_equal("2015-02-13 00:00:00", command.min)
+    end
+  end
+
+  class MinBorderTest < self
+    def test_reader
+      command = logical_count_command(:min_border => "include")
+      assert_equal("include", command.min_border)
+    end
+  end
+
+  class MaxTest < self
+    def test_reader
+      command = logical_count_command(:max => "2015-02-13 00:00:00")
+      assert_equal("2015-02-13 00:00:00", command.max)
+    end
+  end
+
+  class FilterTest < self
+    def test_reader
+      command = logical_count_command(:filter => "message == \"Shutdown\"")
+      assert_equal("message == \"Shutdown\"", command.filter)
+    end
+  end
+end

data/test/command/test-logical-range-filter.rb

@@ -0,0 +1,139 @@
+# Copyright (C) 2015  Hiroshi Hatake <hatake@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
+
+class LogicalRangeFilterCommandTest < Test::Unit::TestCase
+  private
+  def logical_range_filter_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::LogicalRangeFilter.new("logical_range_filter",
+                                             pair_arguments,
+                                             ordered_arguments)
+  end
+
+  class ConstructorTest < self
+    def test_ordered_arguments
+      logical_table  = "Logs"
+      shard_key      = "timestamp",
+      min            = "2015-02-12 00:00:00"
+      min_border     = "include"
+      max            = "2015-02-13 00:00:00"
+      max_border     = "exclude"
+      order          = "ascending"
+      offset         = "10"
+      limit          = "20"
+      filter         = "value == 10"
+      output_columns = "_key, timestamp"
+
+      ordered_arguments = [
+        logical_table,
+        shard_key,
+        min,
+        min_border,
+        max,
+        max_border,
+        order,
+        offset,
+        limit,
+        filter,
+        output_columns,
+      ]
+      command = logical_range_filter_command({}, ordered_arguments)
+      assert_equal({
+                     :logical_table  => logical_table,
+                     :shard_key      => shard_key,
+                     :min            => min,
+                     :min_border     => min_border,
+                     :max            => max,
+                     :max_border     => max_border,
+                     :order          => order,
+                     :offset         => offset,
+                     :limit          => limit,
+                     :filter         => filter,
+                     :output_columns => output_columns,
+                   },
+                   command.arguments)
+    end
+  end
+
+  class LogicalTableTest < self
+    def test_reader
+      command = logical_range_filter_command(:logical_table => "Logs")
+      assert_equal("Logs", command.logical_table)
+    end
+  end
+
+  class ShardKeyTest < self
+    def test_reader
+      command = logical_range_filter_command(:shard_key => "timestamp")
+      assert_equal("timestamp", command.shard_key)
+    end
+  end
+
+  class MinTest < self
+    def test_reader
+      command = logical_range_filter_command(:min => "2015-02-13 00:00:00")
+      assert_equal("2015-02-13 00:00:00", command.min)
+    end
+  end
+
+  class MaxTest < self
+    def test_reader
+      command = logical_range_filter_command(:max => "2015-01-26 00:00:00")
+      assert_equal("2015-01-26 00:00:00", command.max)
+    end
+  end
+
+  class MaxBorderTest < self
+    def test_reader
+      command = logical_range_filter_command(:max_border => "include")
+      assert_equal("include", command.max_border)
+    end
+  end
+
+  class OrderTest < self
+    def test_reader
+      command = logical_range_filter_command(:order => "descending")
+      assert_equal("descending", command.order)
+    end
+  end
+
+  class OffsetTest < self
+    def test_reader
+      command = logical_range_filter_command(:offset => "10")
+      assert_equal(10, command.offset)
+    end
+  end
+
+  class LimitTest < self
+    def test_reader
+      command = logical_range_filter_command(:limit => "20")
+      assert_equal(20, command.limit)
+    end
+  end
+
+  class FilterTest < self
+    def test_reader
+      command = logical_range_filter_command(:filter => "value == 10")
+      assert_equal("value == 10", command.filter)
+    end
+  end
+
+  class OutputColumnsTest < self
+    def test_reader
+      command = logical_range_filter_command(:output_columns => "_key, timestamp")
+      assert_equal("_key, timestamp", command.output_columns)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -149,6 +149,8 @@ files:
 - lib/groonga/command/format/uri.rb
 - lib/groonga/command/get.rb
 - lib/groonga/command/load.rb
+- lib/groonga/command/logical-count.rb
+- lib/groonga/command/logical-range-filter.rb
 - lib/groonga/command/normalize.rb
 - lib/groonga/command/range-filter.rb
 - lib/groonga/command/register.rb
@@ -175,6 +177,8 @@ files:
 - test/command/test-dump.rb
 - test/command/test-get.rb
 - test/command/test-load.rb
+- test/command/test-logical-count.rb
+- test/command/test-logical-range-filter.rb
 - test/command/test-normalize.rb
 - test/command/test-range-filter.rb
 - test/command/test-register.rb
@@ -218,31 +222,33 @@ specification_version: 4
 summary: Groonga-command is a library that represents [Groonga](http://groonga.org/)'s
   command. You can write a program that handle Groonga's command by using groonga-command.
 test_files:
+- test/run-test.rb
+- test/command/test-suggest.rb
+- test/command/test-base.rb
+- test/command/test-delete.rb
+- test/command/test-normalize.rb
 - test/command/test-column-remove.rb
-- test/command/test-range-filter.rb
-- test/command/test-table-remove.rb
-- test/command/test-column-rename.rb
-- test/command/test-column-create.rb
-- test/command/test-select.rb
 - test/command/test-table-tokenize.rb
-- test/command/test-suggest.rb
+- test/command/test-tokenize.rb
+- test/command/test-dump.rb
 - test/command/test-request-cancel.rb
+- test/command/test-column-rename.rb
+- test/command/test-table-remove.rb
+- test/command/test-get.rb
+- test/command/test-truncate.rb
+- test/command/test-logical-range-filter.rb
 - test/command/test-column-list.rb
+- test/command/test-range-filter.rb
 - test/command/test-load.rb
-- test/command/test-dump.rb
-- test/command/test-truncate.rb
-- test/command/test-delete.rb
+- test/command/test-table-create.rb
 - test/command/test-ruby-load.rb
-- test/command/test-base.rb
+- test/command/test-register.rb
 - test/command/test-table-rename.rb
-- test/command/test-normalize.rb
-- test/command/test-get.rb
-- test/command/format/test-command.rb
-- test/command/test-tokenize.rb
-- test/command/test-ruby-eval.rb
 - test/command/test-status.rb
-- test/command/test-register.rb
-- test/command/test-table-create.rb
-- test/run-test.rb
+- test/command/test-logical-count.rb
+- test/command/test-select.rb
+- test/command/test-ruby-eval.rb
+- test/command/format/test-command.rb
+- test/command/test-column-create.rb
 - test/groonga-command-test-utils.rb
 has_rdoc: