sewell 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 440265a1625ef9efb9062be096819e79b8d60a54
-  data.tar.gz: e69abbe115631b8b748ef8bd92b75d01f9b13195
+  metadata.gz: 358b5a20e3f8dc39abca06e1e662453f7d4528ac
+  data.tar.gz: 191fb1bf2b737c1b9e8bd5df1be4ab43b1ac4c24
 SHA512:
-  metadata.gz: 4d40efdf12b6413fda0a4233a9a9b13cf4dfc1309c9290865516deb9e24ede92910c27de631665990989e2053ad74ff44ac9ec173bb6b15a4e840ba756eb6ee1
-  data.tar.gz: 52a4c4d7802f50b236f671a3508ed6e8fb66565d244804e7bdc03f410d24db8fb3b0fa6f6c6d39e17a764ff92170e2a164f4ff8b970c1f47983fa2b373903b77
+  metadata.gz: c33e4631231346e36a459c5a9acb861bd5233ca268b1a9a5afb95a73b3e9201fe6284d087575827264ecf08a89b768d9874def9698a943c01bb833922be7e303
+  data.tar.gz: a3c26999e6bf16d1df44c46b6aecc39b7796b9120522917c0f563a007cc4965011bf5786a6fba71a6877f6682492345ada7e2ade0591f83a0182023e18da6a46

data/lib/sewell/version.rb

@@ -1,3 +1,3 @@
 module Sewell
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/sewell.rb

@@ -51,7 +51,26 @@ module Sewell
     str.gsub!(/　|^:/, ' ')
     str = escape_groonga(str)
     q = []
-    str.split(' ').map{|x| 
+    ary = str.split(' ')
+    ary.each_with_index{|x,i| 
+      next if x.nil?
+      if x =~ /^\"/
+        original_x = x.dup
+        i = i + 1
+        is = []
+        while n = ary[i]
+          x = x + " #{n}"
+          is << i
+          break if ary[i] =~ /\"$/
+          i = i + 1
+        end
+        unless x =~ /\"$/
+          x = original_x.gsub('"', '')
+        else
+          is.each{|index| ary[index] = nil }
+        end
+      end
+      
       q << x and next if x == 'OR' or x == 'AND'
       if x.scan(/:/).count == 1
         table = x.split(':').first

data/spec/sewell/sewell_spec.rb

@@ -19,4 +19,9 @@ describe Sewell do
   it 'can generate with "-"' do
     Sewell.generate('ビジュメニア - Single', ['buta']).should == "( buta:@ビジュメニア ) + ( buta:@Single )"
   end
+
+  it 'can use "" with OR' do
+    Sewell.generate('"Rainy veil" OR あなたの愛した世界', ['buta']).should == "( buta:@\"Rainy veil\" ) OR ( buta:@あなたの愛した世界 )"
+    Sewell.generate('あなたの愛した世界 OR "Rainy veil"', ['buta']).should == "( buta:@あなたの愛した世界 ) OR ( buta:@\"Rainy veil\" )"
+  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: sewell
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - ssig33
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 description: Generator for Groonga's query
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -66,17 +66,17 @@ 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.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generator for Groonga's query