aquel 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb46cbd8f0d7f2f1f69b1621c633f4e8a5dec9a
-  data.tar.gz: 363185ab282a158a3c7cb8e33ace18562d28a24a
+  metadata.gz: 1236cbde36dfec9820fad7685dbecb610d6d5a83
+  data.tar.gz: d1912cfcec42567a72f9a9eba7388af5b10bdf2f
 SHA512:
-  metadata.gz: cd0b27fe23bdfb2b6301b37bdbb9375253fea21c2d15ccecff4a486b8902096d99ecd4e9d2901aefa50dedc33f2dcb41f2cba663d5479713222dde5a3d53da08
-  data.tar.gz: 04213723470351bbff63269c721fc194cfff1eee00510dd9ee08920196e6c79cc93d6cedc7ec9e2a70d37e1e08c98c2fcb2625e0e4114fff8538767d2916e9bf
+  metadata.gz: 0e4227298993b13b88673e96f5684920382884b2b7e02ab1febe60467bc324d0de4a3443e577586b5027d8eebe2f00b13e3e2c2f1f46e29b3f1abc1a78bffa19
+  data.tar.gz: e6b08b20f10bcb1c29386248ed1ff6092a50c1409e826b48cdbd8690fc10276be4d828d52baae5838d4978d61ba4a89147ee9b8537695c73a681c9a857a76cb0

data/README.md

@@ -1,4 +1,4 @@
-# aquel
+# aquel [![Build Status](https://travis-ci.org/youpy/aquel.svg)](https://travis-ci.org/youpy/aquel)
 
 **a**(nything) **que**(ry) **l**(anguage)
 

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :spec

data/aquel.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["youpy"]
   spec.email         = ["youpy@buycheapviagraonlinenow.com"]
   spec.summary       = %q{a(nything) que(ry) l(anguage)}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/youpy/aquel"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/aquel.rb

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

data/lib/aquel/attribute.rb

@@ -0,0 +1,21 @@
+module Aquel
+  class Attribute
+    attr_reader :name, :value
+
+    def initialize(options)
+      @name = options[:name]
+      @value = options[:value]
+    end
+
+    def operate(target)
+      case name
+      when '='
+        target == value
+      when '<>'
+        target != value
+      else
+        false
+      end
+    end
+  end
+end

data/lib/aquel/attributes.rb

@@ -3,10 +3,10 @@ module Aquel
     def equal_values
       self.class[
         *(self.find_all do |k, v|
-          v[:name] == '='
-        end.map do |k, v|
-          [k, v[:value]]
-        end.flatten)
+            v.name == '='
+          end.map do |k, v|
+            [k, v.value]
+          end.flatten)
       ]
     end
   end

data/lib/aquel/context.rb

@@ -5,10 +5,48 @@ module Aquel
     def initialize(block)
       @block = block
       @find_by_block = {}
+      @header = false
     end
 
-    def execute!
+    def execute(attributes)
       instance_eval(&@block)
+
+      items = []
+      document = document_block.call(attributes.equal_values)
+
+      if items_block
+        items_block.call(document).each do |item|
+          value = split_block.call(item)
+          items << (value.kind_of?(Array) ? value : [value])
+        end
+      elsif find_by_block.size > 0
+        find_by_block.each do |k, v|
+          v.call(attributes.equal_values[k], document).each do |item|
+            value = split_block.call(item)
+            items << (value.kind_of?(Array) ? value : [value])
+          end
+        end
+      else
+        while item = item_block.call(document)
+          items << split_block.call(item)
+        end
+      end
+
+      if @header
+        header = items.shift.map(&:downcase)
+      else
+        header = (1..(items.first.size)).to_a
+      end
+
+      items.map do |itm|
+        item = {}
+        itm.each_with_index { |v, i| item[header[i]] = v }
+        item
+      end
+    ensure
+      if document.respond_to?(:close)
+        document.close
+      end
     end
 
     def document(&block)
@@ -30,5 +68,9 @@ module Aquel
     def find_by(name, &block)
       @find_by_block[name] = block
     end
+
+    def has_header
+      @header = true
+    end
   end
 end

data/lib/aquel/executor.rb

@@ -18,45 +18,29 @@ module Aquel
       ast = parser.parse(sql).parsetree.first
       type = ast['SELECT']['fromClause'][0]['RANGEVAR']['relname']
 
-      context = @contexts[type]
-      context.execute!
-
       items = []
       attributes = Attributes.new
 
       walk(ast['SELECT']['whereClause'], attributes)
-      document = context.document_block.call(attributes.equal_values)
-
-      if context.items_block
-        context.items_block.call(document).each do |item|
-          value = context.split_block.call(item)
-          items << (value.kind_of?(Array) ? value : [value])
-        end
-      elsif context.find_by_block.size > 0
-        context.find_by_block.each do |k, v|
-          v.call(attributes.equal_values[k], document).each do |item|
-            value = context.split_block.call(item)
-            items << (value.kind_of?(Array) ? value : [value])
-          end
-        end
-      else
-        while item = context.item_block.call(document)
-          items << context.split_block.call(item)
-        end
-      end
-
+      context = @contexts[type]
+      items = context.execute(attributes)
       items = filter(items, attributes)
       items = colum_filter(items, ast['SELECT']['targetList'])
     end
 
     def filter(items, attributes)
       attributes.each do |k, v|
-        if k.kind_of?(Fixnum)
+        case k
+        when Fixnum
+          items = items.find_all do |item|
+            v.operate(item[k])
+          end
+        when String
           items = items.find_all do |item|
-            if v[:name] == '='
-              item[k-1] == v[:value]
-            elsif v[:name] == '<>'
-              item[k-1] != v[:value]
+            if item[k]
+              v.operate(item[k])
+            else
+              true
             end
           end
         end
@@ -67,7 +51,7 @@ module Aquel
 
     def colum_filter(items, target_list)
       items.map do |item|
-        result = []
+        result = {}
 
         target_list.each do |target|
           val = expr_value(target['RESTARGET']['val'])
@@ -76,7 +60,9 @@ module Aquel
           when {"A_STAR"=>{}}
             result = item
           when Fixnum
-            result << item[val-1]
+            result[val] = item[val]
+          when String
+            result[val] = item[val]
           end
         end
 
@@ -88,7 +74,7 @@ module Aquel
       if aexpr = node['AEXPR']
         k = expr_value(aexpr['lexpr'])
         v = expr_value(aexpr['rexpr'])
-        attributes[k] = { :value => v, :name => aexpr['name'][0] }
+        attributes[k] = Attribute.new(:value => v, :name => aexpr['name'][0])
       elsif aexpr = node['AEXPR AND']
         walk(aexpr['lexpr'], attributes)
         walk(aexpr['rexpr'], attributes)

data/lib/aquel/version.rb

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

data/spec/aquel_spec.rb

@@ -10,6 +10,8 @@ describe Aquel do
 
     let(:aquel) {
       Aquel.define 'tsv' do
+        has_header
+
         document do |attributes|
           open(attributes['path'])
         end
@@ -30,32 +32,32 @@ describe Aquel do
         items = aquel.execute("select * from tsv where path = '#{tsv_path}'")
 
         expect(items.size).to eql(2)
-        expect(items.first).to eql(%w/foo1 bar1 baz1/)
+        expect(items.first).to eql({"col1"=>"foo1", "col2"=>"bar1", "col3"=>"baz1"})
 
-        items = aquel.execute("select 1,3 from tsv where path = '#{tsv_path}'")
+        items = aquel.execute("select COL1,col3 from tsv where path = '#{tsv_path}'")
 
         expect(items.size).to eql(2)
-        expect(items.first).to eql(%w/foo1 baz1/)
+        expect(items.first).to eql({"col1"=>"foo1", "col3"=>"baz1"})
       end
     end
 
     context 'filter query' do
       it 'finds matching line' do
         # TODO: support prepared statement
-        items = aquel.execute("select * from tsv where path = '#{tsv_path}' and 1 = 'foo2'")
+        items = aquel.execute("select * from tsv where path = '#{tsv_path}' and col1 = 'foo2'")
 
         expect(items.size).to eql(1)
-        expect(items.first).to eql(%w/foo2 bar2 baz2/)
+        expect(items.first).to eql({"col1"=>"foo2", "col2"=>"bar2", "col3"=>"baz2"})
 
-        items = aquel.execute("select 1,3 from tsv where path = '#{tsv_path}' and 1 = 'foo1'")
+        items = aquel.execute("select col1,col3 from tsv where path = '#{tsv_path}' and col1 = 'foo1'")
 
         expect(items.size).to eql(1)
-        expect(items.first).to eql(%w/foo1 baz1/)
+        expect(items.first).to eql({"col1"=>"foo1", "col3"=>"baz1"})
 
-        items = aquel.execute("select 1,3 from tsv where path = '#{tsv_path}' and 1 != 'foo1'")
+        items = aquel.execute("select col1,COL3 from tsv where path = '#{tsv_path}' and col1 != 'foo1'")
 
         expect(items.size).to eql(1)
-        expect(items.first).to eql(%w/foo2 baz2/)
+        expect(items.first).to eql({"col1"=>"foo2", "col3"=>"baz2"})
       end
     end
   end
@@ -87,7 +89,7 @@ describe Aquel do
           items = aquel.execute("select * from html where path = '#{html_path}'")
 
           expect(items.size).to eql(2)
-          expect(items.first).to eql(['a'])
+          expect(items.first).to eql({1 => 'a'})
         end
       end
     end
@@ -114,7 +116,7 @@ describe Aquel do
           items = aquel.execute("select * from html where path = '#{html_path}' and css = 'div.foo'")
 
           expect(items.size).to eql(2)
-          expect(items.first).to eql(['a'])
+          expect(items.first).to eql({1 => 'a'})
         end
       end
     end

data/spec/test.tsv

@@ -1,2 +1,3 @@
+COL1	COL2	COL3
 foo1	bar1	baz1
 foo2	bar2	baz2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aquel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
 email:
 - youpy@buycheapviagraonlinenow.com
@@ -81,6 +95,7 @@ files:
 - Rakefile
 - aquel.gemspec
 - lib/aquel.rb
+- lib/aquel/attribute.rb
 - lib/aquel/attributes.rb
 - lib/aquel/context.rb
 - lib/aquel/executor.rb
@@ -89,7 +104,7 @@ files:
 - spec/spec_helper.rb
 - spec/test.html
 - spec/test.tsv
-homepage: ''
+homepage: https://github.com/youpy/aquel
 licenses:
 - MIT
 metadata: {}