sewell 0.0.2 → 0.0.3

data/README.md

@@ -25,6 +25,8 @@ Or install it yourself as:
   Sewell.generate({sena: 'airi OR huro', nuko: 'trape'}, 'AND') #=> ( sena:@airi OR sena:@huro ) AND ( nuko:@trape )
   Sewell.generate({sena: 'airi OR huro', nuko: 'trape'}, 'OR') #=> ( sena:@airi OR sena:@huro ) OR ( nuko:@trape )
 
+  Sewell.generate({mashiro: '-inui airi'}) #=> ( mashiro:!inui AND mashiro:@airi )
+  Sewell.generate('-inui airi', ['mashiro']) #=> ( mashiro:!inui AND mashiro:@airi )
 ```
 
 ## Contributing

data/lib/sewell/version.rb

@@ -1,3 +1,3 @@
 module Sewell
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/sewell.rb

@@ -19,13 +19,18 @@ module Sewell
 
   def self.from_hash hash, sep
     hash.map{|k,v| 
-      '( ' + v.split(' ').map{|x|
+      '( ' + build(v.split(' ').map{|x|
         if x == 'OR' or x == 'AND'
           x
         else
-          "#{k}:@#{sanitize x, /#{k}\:/}"
+          if x.split('').first == '-'
+            x.sub!(/^-/, '')
+            "#{k}:!#{sanitize x, /#{k}\:/}"
+          else
+            "#{k}:@#{sanitize x, /#{k}\:/}"
+          end
         end
-      }.join(' ') + ' )'
+      }) + ' )'
     }.join " #{sep} "
   end
 
@@ -37,12 +42,38 @@ module Sewell
       if x.scan(/:/).count == 1
         table = x.split(':').first
         word = x.split(':').last
-        q << "( #{table}:@#{sanitize word, /#{table}\:/} )"
+        if word.split('').first == '-'
+          q << "( #{table}:!#{sanitize word, /#{table}\:/} )"
+        else
+          q << "( #{table}:@#{sanitize word, /#{table}\:/} )"
+        end
+      else
+        if x.split('').first == '-'
+          x.sub!(/^-/, '')
+          q << '( ' + tables.map{|t| "#{t}:!#{sanitize(x)}"}.join(' AND ') + ' )'
+        else
+          q << '( ' + tables.map{|t| "#{t}:@#{sanitize(x)}"}.join(' OR ') + ' )'
+        end
+      end
+    }
+    build q
+  end
+
+  def self.build q
+    query = ''
+    q.each_with_index{|x,i|
+      next if x == 'OR' or x == 'AND'
+      if q[i+1] == 'OR' or q[i+1] == 'AND'
+        query += "#{x} #{q[i+1]} "
+      elsif q[i+1] != nil
+        query += "#{x} AND "
       else
-        q << '( ' + tables.map{|t| "#{t}:@#{sanitize(x)}"}.join(' OR ') + ' )'
+        if x != 'AND' and x != 'OR'
+          query += x
+        end
       end
     }
-    q.join ' '
+    query
   end
 
   def self.sanitize query, *ex

data/spec/sewell/sewell_spec.rb

@@ -8,9 +8,11 @@ describe Sewell do
 
   it 'can generate from string' do
     Sewell.generate('sena:airi OR mashiro AND nuko:buta', %w{sena uryu nuko}).should == '( sena:@airi ) OR ( sena:@mashiro OR uryu:@mashiro OR nuko:@mashiro ) AND ( nuko:@buta )'
+    Sewell.generate('-inui airi', ['mashiro']).should == '( mashiro:!inui ) AND ( mashiro:@airi )'
   end
 
   it 'can generate from hash' do
     Sewell.generate({sena: 'airi OR huro', nuko: 'trape'}, 'AND').should == '( sena:@airi OR sena:@huro ) AND ( nuko:@trape )'
+    Sewell.generate({mashiro: '-inui airi'}, 'AND').should == '( mashiro:!inui AND mashiro:@airi )'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sewell
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: