groonga-command 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cfe3f7636980048811df9b36b3553cf2b868cf2c
+  data.tar.gz: 8d48249afba06e16dd6165091d4b016a6488e77e
+SHA512:
+  metadata.gz: 549c80ac84a5023436fae2fdb6ca1dc846658749ef2adec2db3e658573d1df13393c61e37e7a3b41ebef72caae763d9106d89d414b180aeeb31b156b903e7e96
+  data.tar.gz: 8f32bb87c46960b0623ed3501d0ad5ed6d432b8571dfdc6a464908dbc214dad4a16fad54c1ae0dd154e4abe8dc83ba8af8fc68d85ed3a40cfd71dc19a348eb0e

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.0.2: 2013-06-27
+
+### Improvements
+
+  * Supported "dump" command.
+  * Added {Groonga::Command::Base#output_type}.
+  * [http] Supported key only parameter.
+  * Supported {Groonga::Command::Select#conditions} without
+    filter parameter.
+
 ## 1.0.1: 2012-12-06
 
 It's bug fix release.

data/lib/groonga/command/base.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  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
@@ -74,6 +74,10 @@ module Groonga
         @original_format == :command
       end
 
+      def output_type
+        (self[:output_type] || :json).to_sym
+      end
+
       def to_uri_format
         path = "/d/#{@name}"
         arguments = @arguments.dup

data/lib/groonga/command/dump.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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/command/base"
+
+module Groonga
+  module Command
+    class Dump < Base
+      Command.register("dump", self)
+
+      def output_type
+        :none
+      end
+    end
+  end
+end

data/lib/groonga/command/parser.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2013  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
@@ -25,6 +25,7 @@ require "groonga/command/error"
 
 require "groonga/command/base"
 
+require "groonga/command/dump"
 require "groonga/command/get"
 require "groonga/command/select"
 require "groonga/command/suggest"
@@ -397,6 +398,7 @@ module Groonga
         if arguments_string
           arguments_string.split(/&/).each do |argument_string|
             key, value = argument_string.split(/\=/, 2)
+            next if value.nil?
             arguments[key] = CGI.unescape(value)
           end
         end

data/lib/groonga/command/select.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  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
@@ -49,12 +49,7 @@ module Groonga
       end
 
       def conditions
-        @conditions ||= filter.split(/(?:&&|&!|\|\|)/).collect do |condition|
-          condition = condition.strip
-          condition = condition.gsub(/\A[\s\(]*/, '')
-          condition = condition.gsub(/[\s\)]*\z/, '') unless /\(/ =~ condition
-          condition
-        end
+        @conditions ||= split_filter_conditions
       end
 
       def drilldowns
@@ -64,6 +59,16 @@ module Groonga
       def output_columns
         self[:output_columns]
       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/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/test/command/test-base.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2013  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
@@ -111,4 +111,17 @@ class BaseCommandTest < Test::Unit::TestCase
       assert_true(@select.has_key?("table"))
     end
   end
+
+  sub_test_case("#output_type") do
+    def test_default
+      command = Groonga::Command::Base.new("table_list", {})
+      assert_equal(:json, command.output_type)
+    end
+
+    def test_specified
+      command = Groonga::Command::Base.new("table_list",
+                                           :output_type => "xml")
+      assert_equal(:xml, command.output_type)
+    end
+  end
 end

data/test/command/test-dump.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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
+
+class DumpCommandTest < Test::Unit::TestCase
+  include GroongaCommandTestUtils::CommandLineCommandParser
+
+  def test_output_type
+    assert_equal(:none, command.output_type)
+  end
+
+  private
+  def command(arguments={})
+    Groonga::Command::Dump.new("dump", arguments)
+  end
+end

data/test/command/test-select.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2013  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
@@ -56,5 +56,12 @@ class SelectCommandTest < Test::Unit::TestCase
                      'keyword @ "養殖"'],
                    select.conditions)
     end
+
+    def test_omitted
+      select = command(:table => "Users",
+                       :filter => nil)
+      assert_equal([],
+                   select.conditions)
+    end
   end
 end

data/test/test-parser.rb

@@ -43,6 +43,12 @@ class ParserTest < Test::Unit::TestCase
       assert_not_predicate(command, :command_format?)
     end
 
+    def test_no_value
+      path = "/d/select?table=Users&key_only"
+      command = Groonga::Command::Parser.parse(path)
+      assert_equal({:table => "Users"}, command.arguments)
+    end
+
     class ParseTest < self
       include ParseTests
     end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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: 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: 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: 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: yard
   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: ''
@@ -151,91 +134,87 @@ files:
 - Gemfile
 - groonga-command.gemspec
 - .yardopts
-- lib/groonga/command/parser.rb
+- lib/groonga/command/register.rb
+- lib/groonga/command/version.rb
+- lib/groonga/command/column-rename.rb
+- lib/groonga/command/truncate.rb
 - lib/groonga/command/load.rb
+- lib/groonga/command/delete.rb
+- lib/groonga/command/error.rb
+- lib/groonga/command/column-create.rb
+- lib/groonga/command/suggest.rb
 - lib/groonga/command/table-remove.rb
-- lib/groonga/command/truncate.rb
-- lib/groonga/command/version.rb
 - lib/groonga/command/column-remove.rb
-- lib/groonga/command/column-create.rb
+- lib/groonga/command/table-create.rb
 - lib/groonga/command/get.rb
-- lib/groonga/command/suggest.rb
+- lib/groonga/command/base.rb
+- lib/groonga/command/dump.rb
 - lib/groonga/command/table-rename.rb
-- lib/groonga/command/register.rb
-- lib/groonga/command/column-rename.rb
-- lib/groonga/command/table-create.rb
-- lib/groonga/command/delete.rb
 - lib/groonga/command/select.rb
-- lib/groonga/command/base.rb
-- lib/groonga/command/error.rb
+- lib/groonga/command/parser.rb
 - lib/groonga/command.rb
-- doc/text/news.md
 - doc/text/lgpl-2.1.txt
-- test/run-test.rb
-- test/command/test-base.rb
-- test/command/test-truncate.rb
-- test/command/test-delete.rb
+- doc/text/news.md
+- test/command/test-column-remove.rb
+- test/command/test-table-rename.rb
 - test/command/test-table-create.rb
+- test/command/test-column-rename.rb
+- test/command/test-load.rb
+- test/command/test-suggest.rb
 - test/command/test-table-remove.rb
-- test/command/test-get.rb
+- test/command/test-delete.rb
+- test/command/test-base.rb
 - test/command/test-column-create.rb
-- test/command/test-suggest.rb
-- test/command/test-load.rb
-- test/command/test-column-remove.rb
-- test/command/test-column-rename.rb
-- test/command/test-table-rename.rb
 - test/command/test-register.rb
 - test/command/test-select.rb
-- test/groonga-command-test-utils.rb
+- test/command/test-truncate.rb
+- test/command/test-dump.rb
+- test/command/test-get.rb
 - test/test-parser.rb
+- test/run-test.rb
+- test/groonga-command-test-utils.rb
 homepage: https://github.com/groonga/groonga-command
 licenses:
 - LGPLv2.1+
+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'
-      segments:
-      - 0
-      hash: -126866082870084770
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -126866082870084770
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Groonga-command is a library to process [groonga](http://groonga.org/)'s
   command syntax. You can write a program to process groonga's command by using groonga-command.
 test_files:
-- test/run-test.rb
-- test/command/test-base.rb
-- test/command/test-truncate.rb
-- test/command/test-delete.rb
+- test/command/test-column-remove.rb
+- test/command/test-table-rename.rb
 - test/command/test-table-create.rb
+- test/command/test-column-rename.rb
+- test/command/test-load.rb
+- test/command/test-suggest.rb
 - test/command/test-table-remove.rb
-- test/command/test-get.rb
+- test/command/test-delete.rb
+- test/command/test-base.rb
 - test/command/test-column-create.rb
-- test/command/test-suggest.rb
-- test/command/test-load.rb
-- test/command/test-column-remove.rb
-- test/command/test-column-rename.rb
-- test/command/test-table-rename.rb
 - test/command/test-register.rb
 - test/command/test-select.rb
-- test/groonga-command-test-utils.rb
+- test/command/test-truncate.rb
+- test/command/test-dump.rb
+- test/command/test-get.rb
 - test/test-parser.rb
+- test/run-test.rb
+- test/groonga-command-test-utils.rb
 has_rdoc: