aquel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cab421bf60cbe9a1db710ef05330cdb68efc011
-  data.tar.gz: 61ac189a192ef2199e02953b734c9104035e152e
+  metadata.gz: feb46cbd8f0d7f2f1f69b1621c633f4e8a5dec9a
+  data.tar.gz: 363185ab282a158a3c7cb8e33ace18562d28a24a
 SHA512:
-  metadata.gz: 48cacbfc062b88aa76ad03796d44d1d00ff1ef78be30c4ff31640a3f951ce8b90b063b002b9e337699f2f17e3b9f6699d30d5d58e9dff3fa477627b25860a484
-  data.tar.gz: 101ffd59ef8bdb6b772993b6ce3dd02d6e87bffb3f3fca752d316d2c7e39b4a2ca85ed59c6b6816bd8ac34b42a8a1a024bdf47147c439bc5b371e5b7536ede38
+  metadata.gz: cd0b27fe23bdfb2b6301b37bdbb9375253fea21c2d15ccecff4a486b8902096d99ecd4e9d2901aefa50dedc33f2dcb41f2cba663d5479713222dde5a3d53da08
+  data.tar.gz: 04213723470351bbff63269c721fc194cfff1eee00510dd9ee08920196e6c79cc93d6cedc7ec9e2a70d37e1e08c98c2fcb2625e0e4114fff8538767d2916e9bf

data/README.md

@@ -1,6 +1,6 @@
 # aquel
 
-a(nything) que(ry) l(anguage)
+**a**(nything) **que**(ry) **l**(anguage)
 
 ## Installation
 

data/aquel.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Aquel::VERSION
   spec.authors       = ["youpy"]
   spec.email         = ["youpy@buycheapviagraonlinenow.com"]
-  spec.summary       = %q{A(nything) Q(uery) L(anguage)}
+  spec.summary       = %q{a(nything) que(ry) l(anguage)}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/aquel.rb

@@ -1,3 +1,4 @@
+require "aquel/attributes"
 require "aquel/context"
 require "aquel/executor"
 require "aquel/version"

data/lib/aquel/attributes.rb

@@ -0,0 +1,13 @@
+module Aquel
+  class Attributes < Hash
+    def equal_values
+      self.class[
+        *(self.find_all do |k, v|
+          v[:name] == '='
+        end.map do |k, v|
+          [k, v[:value]]
+        end.flatten)
+      ]
+    end
+  end
+end

data/lib/aquel/executor.rb

@@ -22,10 +22,10 @@ module Aquel
       context.execute!
 
       items = []
-      attributes = {}
+      attributes = Attributes.new
 
       walk(ast['SELECT']['whereClause'], attributes)
-      document = context.document_block.call(attributes)
+      document = context.document_block.call(attributes.equal_values)
 
       if context.items_block
         context.items_block.call(document).each do |item|
@@ -34,7 +34,7 @@ module Aquel
         end
       elsif context.find_by_block.size > 0
         context.find_by_block.each do |k, v|
-          v.call(attributes[k], document).each do |item|
+          v.call(attributes.equal_values[k], document).each do |item|
             value = context.split_block.call(item)
             items << (value.kind_of?(Array) ? value : [value])
           end
@@ -53,7 +53,11 @@ module Aquel
       attributes.each do |k, v|
         if k.kind_of?(Fixnum)
           items = items.find_all do |item|
-            item[k-1] == v
+            if v[:name] == '='
+              item[k-1] == v[:value]
+            elsif v[:name] == '<>'
+              item[k-1] != v[:value]
+            end
           end
         end
       end
@@ -80,14 +84,14 @@ module Aquel
       end
     end
 
-    def walk(aexpr, attributes)
-      if aexpr['AEXPR']
-        k = expr_value(aexpr['AEXPR']['lexpr'])
-        v = expr_value(aexpr['AEXPR']['rexpr'])
-        attributes[k] = v
-      elsif aexpr['AEXPR AND']
-        walk(aexpr['AEXPR AND']['lexpr'], attributes)
-        walk(aexpr['AEXPR AND']['rexpr'], attributes)
+    def walk(node, attributes)
+      if aexpr = node['AEXPR']
+        k = expr_value(aexpr['lexpr'])
+        v = expr_value(aexpr['rexpr'])
+        attributes[k] = { :value => v, :name => aexpr['name'][0] }
+      elsif aexpr = node['AEXPR AND']
+        walk(aexpr['lexpr'], attributes)
+        walk(aexpr['rexpr'], attributes)
       elsif aexpr['AEXPR OR']
         raise 'OR clauses are not supported yet'
       end

data/lib/aquel/version.rb

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

data/spec/aquel_spec.rb

@@ -51,6 +51,11 @@ describe Aquel do
 
         expect(items.size).to eql(1)
         expect(items.first).to eql(%w/foo1 baz1/)
+
+        items = aquel.execute("select 1,3 from tsv where path = '#{tsv_path}' and 1 != 'foo1'")
+
+        expect(items.size).to eql(1)
+        expect(items.first).to eql(%w/foo2 baz2/)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aquel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - youpy
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - aquel.gemspec
 - lib/aquel.rb
+- lib/aquel/attributes.rb
 - lib/aquel/context.rb
 - lib/aquel/executor.rb
 - lib/aquel/version.rb
@@ -111,7 +112,7 @@ rubyforge_project:
 rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
-summary: A(nything) Q(uery) L(anguage)
+summary: a(nything) que(ry) l(anguage)
 test_files:
 - spec/aquel_spec.rb
 - spec/spec_helper.rb