groonga-command 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4f78fab492909add50d825ad9e8545fec6e3c23fa552946ed8f4a15ef49e7a
-  data.tar.gz: 462abef327588d8440b41ac634714ad0cc7209ba46efd96b1c32f79b9f7ee7d3
+  metadata.gz: b257586fb0c409ff09c4fa8a91d72be705be0392345a2ab85828031eb1174af6
+  data.tar.gz: 7b944f40cfa45ed828bf476d85773c89b61a49313ca41c04d671ee217850d4e8
 SHA512:
-  metadata.gz: 8abeea1c3ccde4309240e67b0f6853211911ca0a6093c4e1314d08a58a23a051515935db318875c6bab0591bd432e98db082cf4ffcc86094a1492f1ccac72012
-  data.tar.gz: ba24c65f52dd84208e0afcd4d96b5aa22b63feae8efda2e449cec94167b251aeb4d41fe0014f4e46d71e108e7b45cef2d4af72338310474d83921772700623d4
+  metadata.gz: 3b8f6a8ab4915ca9671f080d1bee34a5662ad4fa809790d2c4556a5cc72b18399e7d2163e79b13f27bf10e9e88cddf1d67a22fd0d4e2e6d0b1802232879accb8
+  data.tar.gz: 83437442ed05805fede250bfb8f01263d4cefdbf3991e3fe6c74a9f41ce6fa79bff708f9a227710306fe4c4d9e0d458671fc7f0f9c43e36d10d483027a139b5d

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.3.6: 2018-08-16
+
+### Improvements
+
+  * {Groonga::Command::RangeFilter#conditions}: Added.
+
+  * {Groonga::Command::LogicalSelect#conditions}: Added.
+
+  * {Groonga::Command::LogicalRangeFilter#conditions}: Added.
+
 ## 1.3.5: 2018-05-21
 
 ### Improvements

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

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2015  Hiroshi Hatake <hatake@clear-code.com>
+# Copyright (C) 2018  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
@@ -17,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/base"
+require "groonga/command/searchable"
 
 module Groonga
   module Command
@@ -24,6 +24,8 @@ module Groonga
     #
     # @since 1.1.1
     class LogicalRangeFilter < Base
+      include Searchable
+
       class << self
         def command_name
           "logical_range_filter"

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2018  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
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/base"
+require "groonga/command/searchable"
 
 module Groonga
   module Command
@@ -22,6 +23,8 @@ module Groonga
     #
     # @since 1.1.3
     class LogicalSelect < Base
+      include Searchable
+
       class << self
         def command_name
           "logical_select"

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2018  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
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/base"
+require "groonga/command/searchable"
 
 module Groonga
   module Command
@@ -22,6 +23,8 @@ module Groonga
     #
     # @since 1.1.0
     class RangeFilter < Base
+      include Searchable
+
       class << self
         def command_name
           "range_filter"

data/lib/groonga/command/searchable.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2012-2018  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
+
+module Groonga
+  module Command
+    module Searchable
+      def conditions
+        @conditions ||= split_filter_conditions
+      end
+
+      private
+      def split_filter_conditions
+        (filter || "").split(/(?:&&|&!|\|\|)/).collect do |condition|
+          condition = condition.strip
+          condition = condition.gsub(/\A[\s\(]*/, '')
+          condition = condition.gsub(/[\s\)]*\z/, '') unless /\(/ =~ condition
+          condition
+        end
+      end
+    end
+  end
+end

data/lib/groonga/command/select.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -16,10 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/base"
+require "groonga/command/searchable"
 
 module Groonga
   module Command
     class Select < Base
+      include Searchable
+
       class << self
         def command_name
           "select"
@@ -85,10 +88,6 @@ module Groonga
         self[:filter]
       end
 
-      def conditions
-        @conditions ||= split_filter_conditions
-      end
-
       def drilldowns
         @drilldowns ||= array_value(:drilldown)
       end
@@ -130,15 +129,6 @@ module Groonga
       end
 
       private
-      def split_filter_conditions
-        (filter || "").split(/(?:&&|&!|\|\|)/).collect do |condition|
-          condition = condition.strip
-          condition = condition.gsub(/\A[\s\(]*/, '')
-          condition = condition.gsub(/[\s\)]*\z/, '') unless /\(/ =~ condition
-          condition
-        end
-      end
-
       def parse_labeled_drilldowns
         raw_labeled_drilldowns = {}
         @arguments.each do |name, value|

data/lib/groonga/command/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  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
@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.3.5"
+    VERSION = "1.3.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -179,6 +179,7 @@ files:
 - lib/groonga/command/ruby-eval.rb
 - lib/groonga/command/ruby-load.rb
 - lib/groonga/command/schema.rb
+- lib/groonga/command/searchable.rb
 - lib/groonga/command/select.rb
 - lib/groonga/command/shutdown.rb
 - lib/groonga/command/status.rb
@@ -268,64 +269,64 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.0.beta1
 signing_key: 
 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/groonga-command-test-utils.rb
-- test/command/test-query-log-flags-set.rb
-- test/command/test-config-delete.rb
+- test/command/test-schema.rb
+- test/command/test-column-remove.rb
+- test/command/test-range-filter.rb
+- test/command/test-object-inspect.rb
+- test/command/test-column-copy.rb
+- test/command/test-io-flush.rb
+- test/command/test-log-put.rb
+- test/command/test-plugin-unregister.rb
+- test/command/test-table-remove.rb
+- test/command/test-column-rename.rb
+- test/command/test-column-create.rb
+- test/command/test-query-log-flags-get.rb
+- test/command/test-select.rb
+- test/command/test-shutdown.rb
 - test/command/test-object-remove.rb
+- test/command/test-logical-select.rb
 - test/command/test-table-tokenize.rb
-- test/command/test-reindex.rb
-- test/command/test-plugin-unregister.rb
-- test/command/test-io-flush.rb
-- test/command/test-base.rb
+- test/command/test-query-log-flags-remove.rb
+- test/command/test-logical-shard-list.rb
+- test/command/test-object-exist.rb
+- test/command/test-suggest.rb
+- test/command/test-request-cancel.rb
+- test/command/test-query-expand.rb
 - test/command/test-query-log-flags-add.rb
-- test/command/test-logical-count.rb
-- test/command/test-table-rename.rb
-- test/command/test-column-rename.rb
+- test/command/test-log-level.rb
+- test/command/test-table-list.rb
+- test/command/test-column-list.rb
+- test/command/test-load.rb
 - test/command/test-dump.rb
-- test/command/test-normalize.rb
-- test/command/test-config-get.rb
-- test/command/test-query-log-flags-remove.rb
-- test/command/test-register.rb
-- test/command/test-shutdown.rb
+- test/command/test-query-log-flags-set.rb
+- test/command/test-truncate.rb
 - test/command/test-delete.rb
-- test/command/test-column-copy.rb
-- test/command/test-tokenize.rb
-- test/command/test-log-put.rb
-- test/command/test-load.rb
-- test/command/test-column-list.rb
+- test/command/test-ruby-load.rb
 - test/command/test-plugin-register.rb
-- test/command/test-request-cancel.rb
-- test/command/test-column-create.rb
-- test/command/test-query-log-flags-get.rb
-- test/command/test-config-set.rb
+- test/command/test-base.rb
+- test/command/test-table-rename.rb
+- test/command/test-config-get.rb
+- test/command/test-logical-count.rb
+- test/command/test-normalize.rb
+- test/command/test-table-copy.rb
+- test/command/test-get.rb
 - test/command/test-logical-range-filter.rb
-- test/command/test-object-inspect.rb
+- test/command/test-config-delete.rb
+- test/command/test-logical-table-remove.rb
 - test/command/format/test-command.rb
-- test/command/test-logical-select.rb
-- test/command/test-get.rb
+- test/command/test-reindex.rb
 - test/command/test-thread-limit.rb
-- test/command/test-table-list.rb
-- test/command/test-object-exist.rb
-- test/command/test-log-level.rb
-- test/command/test-range-filter.rb
-- test/command/test-status.rb
-- test/command/test-logical-shard-list.rb
-- test/command/test-schema.rb
-- test/command/test-suggest.rb
-- test/command/test-select.rb
-- test/command/test-column-remove.rb
+- test/command/test-config-set.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/command/test-table-remove.rb
-- test/command/test-ruby-load.rb
-- test/command/test-table-copy.rb
-- test/command/test-query-expand.rb
-- test/command/test-truncate.rb
-- test/command/test-logical-table-remove.rb
 - test/run-test.rb
+- test/groonga-command-test-utils.rb