groonga-command-parser 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6586a6d72a155715ad67c47652183969cf9a5255
+  data.tar.gz: a3879393e9c3d9f09718c8f253b2cdc86be05119
+SHA512:
+  metadata.gz: 7354d617dd59ffba8f795c914b73a439eee43a03916a6eea2bd7843aa02fcdaaa53c0a57dc756f308a49e77f1a90e1bd29c171c463bf2ca8972447738d1509ba
+  data.tar.gz: 9abeebb9d08f1af5866533f0599e7e09bde3ca2be723716863822d7a2a36a80db6f0f2832ecb183210456fb4f1e650a4350e07e5797732f7ab1b313fbec00913

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.0.2: 2014-10-02
+
+### Improvements
+
+  * Supported custom prefix URI such as `/groonga/db/select?table=Users`.
+
 ## 1.0.1: 2013-10-29
 
 ### Improvements

data/groonga-command-parser.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby; 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
@@ -52,7 +52,7 @@ Gem::Specification.new do |spec|
   spec.licenses = ["LGPLv2.1+"]
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("groonga-command")
+  spec.add_runtime_dependency("groonga-command", ">= 1.0.9")
   spec.add_runtime_dependency("yajl-ruby")
 
   spec.add_development_dependency("test-unit")

data/lib/groonga/command/parser.rb

@@ -16,6 +16,7 @@
 # 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 "English"
 require "shellwords"
 require "cgi"
 
@@ -342,15 +343,15 @@ module Groonga
       end
 
       def parse_command(input)
-        if input.start_with?("/d/")
+        if input.start_with?("/")
           parse_uri_path(input)
         else
           parse_command_line(input)
         end
       end
 
-      def parse_uri_path(path)
-        name, arguments_string = path.split(/\?/, 2)
+      def parse_uri_path(relative_uri)
+        path, arguments_string = relative_uri.split(/\?/, 2)
         arguments = {}
         if arguments_string
           arguments_string.split(/&/).each do |argument_string|
@@ -359,12 +360,19 @@ module Groonga
             arguments[key] = CGI.unescape(value)
           end
         end
-        name = name.gsub(/\A\/d\//, '')
+        if /\/([^\/]*)\z/=~ path
+          prefix = $PREMATCH
+          name = $1
+        else
+          prefix = ""
+          name = path
+        end
         name, output_type = name.split(/\./, 2)
         arguments["output_type"] = output_type if output_type
         command_class = Command.find(name)
         command = command_class.new(name, arguments)
         command.original_format = :uri
+        command.path_prefix = prefix
         command
       end
 

data/lib/groonga/command/parser/version.rb

@@ -19,7 +19,7 @@
 module Groonga
   module Command
     class Parser
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

data/test/test-parser.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-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
@@ -49,6 +49,18 @@ class ParserTest < Test::Unit::TestCase
       assert_equal({:table => "Users"}, command.arguments)
     end
 
+    def test_custom_prefix
+      path = "/db1/select?table=Users"
+      command = Groonga::Command::Parser.parse(path)
+      assert_equal("/db1", command.path_prefix)
+    end
+
+    def test_deep_custom_prefix
+      path = "/groonga/db1/select?table=Users"
+      command = Groonga::Command::Parser.parse(path)
+      assert_equal("/groonga/db1", command.path_prefix)
+    end
+
     class ParseTest < self
       include ParseTests
     end

metadata

@@ -1,158 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command-parser
 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: 2013-10-29 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.9
 - !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: ''
@@ -162,47 +143,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- Gemfile
 - README.md
 - Rakefile
-- Gemfile
+- doc/text/lgpl-2.1.txt
+- doc/text/news.md
 - groonga-command-parser.gemspec
-- .yardopts
 - lib/groonga/command/parser.rb
 - lib/groonga/command/parser/error.rb
 - lib/groonga/command/parser/version.rb
-- doc/text/news.md
-- doc/text/lgpl-2.1.txt
+- test/groonga-command-parser-test-utils.rb
 - test/run-test.rb
 - test/test-parser.rb
-- test/groonga-command-parser-test-utils.rb
 homepage: https://github.com/groonga/groonga-command-parser
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Groonga-command-parser is a Ruby library to parses [groonga](http://groonga.org/)'s
   command syntax. You can write a program to process groonga's command by using groonga-command-parser.
 test_files:
+- test/groonga-command-parser-test-utils.rb
 - test/run-test.rb
 - test/test-parser.rb
-- test/groonga-command-parser-test-utils.rb
 has_rdoc: