groonga-command 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd064a51b4d30a9e01f074b9a716cf38044e723a
-  data.tar.gz: 7ea59d11a39b99e03ac19649007605d6e6f36150
+  metadata.gz: 497f66a7936df08f194c0d8bd0c5bfc239609736
+  data.tar.gz: cd110b893efee85d64cf89e81accda9d9a75d49b
 SHA512:
-  metadata.gz: 246c7bbef1f92f27bfb8f0d9d66004b79d78120fd0ec75daa2c02d4fd2bd4ed7bb0dc6e68beed4e73dadc840dcb464750c2e3ca3ec3524d97ea5389a2f8bdf2b
-  data.tar.gz: 98ca09fb709fdafa3ded9025aee35f62bc71464c73b3b740845583c9053cfd367c1e3d06106aa0554f58b7e560f9eab40cb5561ac650da8220a1c0609a99747f
+  metadata.gz: 0390d8f45f28818a934096470b1163fad2c4d6ac629b4272ca0160dbef2ea74ad1665a7e6b0a2404477fc15741a7ab7238c089ee0cf7ff87b8769f449def2d2f
+  data.tar.gz: 9536d0946225108ff00c6792890e59250e1e4a68a4264da8578a658ec6f70adae063a4ffd8d26fc5e453b88457ac6a34ab77f52813ebc9a092137f0cff4f52d7

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.0.8: 2014-09-30
+
+### Improvements
+
+  * {Groonga::Command::Base#key?}: Added.
+  * Accepted nil value arguments on formatting to URI or command line.
+    Nil value arguments are ignored.
+
 ## 1.0.7: 2014-03-15
 
 ### Improvements

data/lib/groonga/command/base.rb

@@ -56,9 +56,10 @@ module Groonga
         @arguments[normalize_name(name)] = value
       end
 
-      def has_key?(name)
-        @arguments.has_key?(normalize_name(name))
+      def key?(name)
+        @arguments.key?(normalize_name(name))
       end
+      alias_method :has_key?, :key?
 
       def ==(other)
         other.is_a?(self.class) and
@@ -79,11 +80,11 @@ module Groonga
       end
 
       def to_uri_format
-        Format::URI.new(@name, @arguments).path
+        Format::URI.new(@name, normalized_arguments).path
       end
 
       def to_command_format
-        Format::Command.new(@name, @arguments).command_line
+        Format::Command.new(@name, normalized_arguments).command_line
       end
 
       private
@@ -110,6 +111,12 @@ module Groonga
         name = name.to_sym if name.is_a?(String)
         name
       end
+
+      def normalized_arguments
+        @arguments.reject do |_, value|
+          value.nil?
+        end
+      end
     end
   end
 end

data/lib/groonga/command/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  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
@@ -18,6 +18,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/test/command/test-base.rb

@@ -48,6 +48,15 @@ class BaseCommandTest < Test::Unit::TestCase
                    "keyword+%40+%22%E9%A4%8A%E6%AE%96%22&table=Users",
                    select.to_uri_format)
     end
+
+    def test_nil
+      select = Groonga::Command::Base.new("select",
+                                          :table => "Users",
+                                          :filter => nil,
+                                          :output_type => "json")
+      assert_equal("/d/select.json?table=Users",
+                   select.to_uri_format)
+    end
   end
 
   class CovnertToCommandFormatTest < self
@@ -81,6 +90,15 @@ class BaseCommandTest < Test::Unit::TestCase
                      "--output_type \"json\" --table \"Users\"",
                    select.to_command_format)
     end
+
+    def test_nil
+      select = Groonga::Command::Base.new("select",
+                                          :table => "Users",
+                                          :filter => nil,
+                                          :output_type => "json")
+      assert_equal("select --output_type \"json\" --table \"Users\"",
+                   select.to_command_format)
+    end
   end
 
   sub_test_case("#[]") do
@@ -98,6 +116,20 @@ class BaseCommandTest < Test::Unit::TestCase
     end
   end
 
+  sub_test_case("#key?") do
+    def setup
+      @select = Groonga::Command::Base.new("select", :table => "Users")
+    end
+
+    def test_symbol
+      assert_true(@select.key?(:table))
+    end
+
+    def test_string
+      assert_true(@select.key?("table"))
+    end
+  end
+
   sub_test_case("#has_key?") do
     def setup
       @select = Groonga::Command::Base.new("select", :table => "Users")

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   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: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -129,61 +129,61 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- Gemfile
 - README.md
 - Rakefile
-- Gemfile
+- doc/text/lgpl-2.1.txt
+- doc/text/news.md
 - groonga-command.gemspec
-- .yardopts
-- lib/groonga/command/table-remove.rb
-- lib/groonga/command/get.rb
+- lib/groonga/command.rb
+- lib/groonga/command/base.rb
+- lib/groonga/command/column-create.rb
+- lib/groonga/command/column-list.rb
 - lib/groonga/command/column-remove.rb
-- lib/groonga/command/select.rb
-- lib/groonga/command/table-create.rb
-- lib/groonga/command/ruby-load.rb
 - lib/groonga/command/column-rename.rb
-- lib/groonga/command/version.rb
+- lib/groonga/command/delete.rb
+- lib/groonga/command/dump.rb
 - lib/groonga/command/error.rb
-- lib/groonga/command/column-create.rb
+- lib/groonga/command/format/command.rb
+- lib/groonga/command/format/uri.rb
+- lib/groonga/command/get.rb
+- lib/groonga/command/load.rb
+- lib/groonga/command/normalize.rb
 - lib/groonga/command/register.rb
-- lib/groonga/command/suggest.rb
-- lib/groonga/command/column-list.rb
-- lib/groonga/command/truncate.rb
+- lib/groonga/command/ruby-eval.rb
+- lib/groonga/command/ruby-load.rb
+- lib/groonga/command/select.rb
 - lib/groonga/command/status.rb
-- lib/groonga/command/base.rb
+- lib/groonga/command/suggest.rb
+- lib/groonga/command/table-create.rb
+- lib/groonga/command/table-remove.rb
 - lib/groonga/command/table-rename.rb
-- lib/groonga/command/ruby-eval.rb
-- lib/groonga/command/format/uri.rb
-- lib/groonga/command/format/command.rb
-- lib/groonga/command/dump.rb
-- lib/groonga/command/normalize.rb
-- lib/groonga/command/delete.rb
 - lib/groonga/command/tokenize.rb
-- lib/groonga/command/load.rb
-- lib/groonga/command.rb
-- doc/text/news.md
-- doc/text/lgpl-2.1.txt
-- test/command/test-get.rb
-- test/command/test-ruby-eval.rb
-- test/command/test-register.rb
-- test/command/test-normalize.rb
-- test/command/test-column-list.rb
-- test/command/test-column-rename.rb
-- test/command/test-delete.rb
-- test/command/test-table-remove.rb
-- test/command/test-suggest.rb
-- test/command/test-status.rb
-- test/command/test-ruby-load.rb
-- test/command/test-truncate.rb
+- lib/groonga/command/truncate.rb
+- lib/groonga/command/version.rb
+- test/command/format/test-command.rb
 - test/command/test-base.rb
-- test/command/test-load.rb
 - test/command/test-column-create.rb
-- test/command/test-table-rename.rb
+- test/command/test-column-list.rb
 - test/command/test-column-remove.rb
+- test/command/test-column-rename.rb
+- test/command/test-delete.rb
 - test/command/test-dump.rb
+- test/command/test-get.rb
+- test/command/test-load.rb
+- test/command/test-normalize.rb
+- test/command/test-register.rb
+- test/command/test-ruby-eval.rb
+- test/command/test-ruby-load.rb
+- test/command/test-select.rb
+- test/command/test-status.rb
+- test/command/test-suggest.rb
 - test/command/test-table-create.rb
+- test/command/test-table-remove.rb
+- test/command/test-table-rename.rb
 - test/command/test-tokenize.rb
-- test/command/format/test-command.rb
-- test/command/test-select.rb
+- test/command/test-truncate.rb
 - test/groonga-command-test-utils.rb
 - test/run-test.rb
 homepage: https://github.com/groonga/groonga-command
@@ -196,44 +196,44 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.13
+rubygems_version: 2.2.2
 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/command/test-get.rb
-- test/command/test-ruby-eval.rb
-- test/command/test-register.rb
-- test/command/test-normalize.rb
-- test/command/test-column-list.rb
-- test/command/test-column-rename.rb
-- test/command/test-delete.rb
+- test/command/test-column-remove.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-suggest.rb
-- test/command/test-status.rb
-- test/command/test-ruby-load.rb
+- test/command/test-column-list.rb
+- test/command/test-load.rb
+- test/command/test-dump.rb
 - test/command/test-truncate.rb
+- test/command/test-delete.rb
+- test/command/test-ruby-load.rb
 - test/command/test-base.rb
-- test/command/test-load.rb
-- test/command/test-column-create.rb
 - test/command/test-table-rename.rb
-- test/command/test-column-remove.rb
-- test/command/test-dump.rb
-- test/command/test-table-create.rb
-- test/command/test-tokenize.rb
+- test/command/test-normalize.rb
+- test/command/test-get.rb
 - test/command/format/test-command.rb
-- test/command/test-select.rb
-- test/groonga-command-test-utils.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/groonga-command-test-utils.rb
 has_rdoc: