sql_query_executor 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a88fb06f74901e2e2f0f1aa38bd63da77a0c062
-  data.tar.gz: 88c2390a87b8a152e7cf4101d2be0e2493a91060
+  metadata.gz: 25f7708c09ade0472e649ff1dda4f6d3b42501a6
+  data.tar.gz: 85c07c4235dd569b5c5b3713ad4ae1523e392c7b
 SHA512:
-  metadata.gz: de9a0a0c32c214245a021ffe62c561a975463048f1ad4c86e177e2e6704dc6541bcd490f1673f9fef00b0b4bd40cdddcaa3016715652034b621c6edcd84d6b52
-  data.tar.gz: db3638046c93c332ac3becfeff6695c6b99b7dab583efaeb4ee9206e71d521ffbc2eda22c51e43266077403120cdcab45b1b6c56ae444078ba72c78656cc4b00
+  metadata.gz: b64b60611d73070e52eb98465afba8d414524637e6849a40a0007859810490ff02eeaf9c82bdf2755cbdeaf60fb0e38e3db11d59a33fbdf662ac4efeb218f72e
+  data.tar.gz: d7ef08257d169a250717d1e98a4b2e66e6cb5a38dc66afac2844b277845a437a8c35d850747fb12dc5653aac08a141c6ffd3eee9c62b32cec6921ec846a4853e

data/lib/sql_query_executor/base.rb

@@ -21,6 +21,7 @@ module SqlQueryExecutor #:nodoc:
     end
 
     def execute!(collection)
+      return [] if @query.empty?
       set_collection(collection)
 
       convert_query.execute!(@collection)
@@ -62,11 +63,9 @@ module SqlQueryExecutor #:nodoc:
     end
 
     def set_collection(collection)
-      if collection.any? && collection.first.is_a?(Hash)
-        convert_collection(collection)
-      else
-        @collection = conforming_collection?(collection) ? collection : []
-      end
+      return if @collection
+
+      @collection = collection
     end
 
     def convert_collection(collection=[])
@@ -83,6 +82,8 @@ module SqlQueryExecutor #:nodoc:
     end
 
     def check_query
+      return if @query.empty?
+
       if @query.is_a?(Array) && !@query.first.is_a?(String)
         "First element from array must be a String. eg: [\"name = ?\", \"John\"]"
       end

data/lib/sql_query_executor/operators/base.rb

@@ -12,12 +12,17 @@ module SqlQueryExecutor
         { @field => @value }
       end
 
-      def logic
+      def logic(is_hash=false)
         initialize_attributes(true)
-        "object.#{@field} #{@operator} #{@value || 'nil'}"
+
+        "#{field(is_hash)} #{@operator} #{@value || 'nil'}"
       end
 
     protected
+      def field(is_hash)
+        is_hash ? "self[:#{@field}]" : "#{@field}"
+      end
+
       def initialize_attributes(logic=false)
         return if @array
 

data/lib/sql_query_executor/operators/between.rb

@@ -8,10 +8,10 @@ module SqlQueryExecutor
         { @field => { "$gte" => @value.first, "$lte" => @value.last }}
       end
 
-      def logic
+      def logic(is_hash=false)
         initialize_attributes(true)
 
-        "object.#{@field} >= #{@value[0]} && object.#{@field} <= #{@value[1]}"
+        "#{field(is_hash)} >= #{@value[0]} && #{field(is_hash)} <= #{@value[1]}"
       end
 
     private

data/lib/sql_query_executor/operators/in.rb

@@ -8,10 +8,10 @@ module SqlQueryExecutor
         { @field => { "$in" => @value }}
       end
 
-      def logic
+      def logic(is_hash=false)
         initialize_attributes(true)
 
-        "[#{@value.join(', ')}].include?(object.#{@field})"
+        "[#{@value.join(', ')}].include?(#{field(is_hash)})"
       end
 
     private

data/lib/sql_query_executor/query/sentence.rb

@@ -34,8 +34,8 @@ module SqlQueryExecutor
         @operator.selector
       end
 
-      def logic
-        @operator.logic
+      def logic(is_hash=false)
+        @operator.logic(is_hash)
       end
 
     private

data/lib/sql_query_executor/query/sub_query.rb

@@ -14,9 +14,19 @@ module SqlQueryExecutor
       end
 
       def execute!(collection, data=[])
-        result = collection.select{ |object| eval(logic) }
+        is_hash = collection.first.is_a?(Hash)
+        method_eval = logic(is_hash)
+        klass = collection.first.class
 
-        result.sort_by(&:id)
+        klass.instance_eval do
+          eval("define_method(:this_method_will_be_removed_in_a_little_while) { #{method_eval} }")
+        end
+
+        result = collection.select{ |object| object.this_method_will_be_removed_in_a_little_while }
+
+        klass.class_eval { undef :this_method_will_be_removed_in_a_little_while }
+
+        is_hash ? result.sort_by{ |hash| hash[:id] } : result.sort_by(&:id)
       end
 
       def selector
@@ -38,15 +48,15 @@ module SqlQueryExecutor
         SqlQueryExecutor::Query::Normalizers::QueryNormalizer.clean_query(@query)
       end
 
-      def logic
+      def logic(is_hash=false)
         string = ''
 
         @children.each do |child|
           if child.respond_to?(:binding_operator) && child.binding_operator
             operator = BINDING_OPERATORS.invert[child.binding_operator]
-            string = "(#{string} #{operator} #{child.logic})"
+            string = "(#{string} #{operator} #{child.logic(is_hash)})"
           else
-            string += child.logic
+            string += child.logic(is_hash)
           end
         end
 

data/lib/sql_query_executor/version.rb

@@ -1,3 +1,3 @@
 module SqlQueryExecutor
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

data/spec/sql_query_executor/base_spec.rb

@@ -6,13 +6,21 @@ require 'sql_query_executor/base'
 describe SqlQueryExecutor::Base do
   describe ".where" do
     let(:data) do
-      [
-        {id: 1, name: "US",     language: 'English'},
-        {id: 2, name: "Canada", language: 'English', monarch: "The Crown of England"},
-        {id: 3, name: "Mexico", language: 'Spanish'},
-        {id: 4, name: "UK",     language: 'English', monarch: "The Crown of England"},
-        {id: 5, name: "Brazil", founded_at: Time.parse('1500-04-22 13:34:25')}
-      ]
+      array = [{id: 1, name: "US",     language: 'English'}]
+
+      500.times do |i|
+        array.push({id: i+2, name: "Name-#{i}", language: 'English'})
+      end
+
+      array
+    end
+
+    context 'when initialized with an empty string' do
+      subject { described_class.where('') }
+
+      it '' do
+        expect(subject).to be_empty
+      end
     end
 
     context 'conforming collection' do
@@ -45,7 +53,10 @@ describe SqlQueryExecutor::Base do
       end
 
       it 'initializes with a conforming collection' do
-        expect(described_class.where(Collection.new(data).all, id: 1).first.attributes).to eq (data.first)
+        data
+        result = described_class.where(Collection.new(data).all, id: 1)
+
+        expect(data.first).to eq (data.first)
       end
       
       context "when invalid query is passed" do
@@ -57,9 +68,12 @@ describe SqlQueryExecutor::Base do
       end
     end
 
-    context 'not conforming collection' do
-      it 'initializes with a conforming collection' do
-        expect(described_class.where(data, id: 1)).to eq([OpenStruct.new(data.first)])
+    context 'non conforming collection' do
+      it 'initializes with a non conforming collection' do
+        data
+        result = described_class.where(data, id: 1)
+
+        expect(described_class.where(data, id: 1)).to eq([data.first])
       end
       
       context "when invalid query is passed" do

data/sql_query_executor.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
     "spec/sql_query_executor/base_spec.rb"
   ]
 
-  gem.add_development_dependency(%q<rspec>, [">= 2.2.0"])
-  gem.add_development_dependency('rake', [">= 10.0.0"])
-  gem.add_development_dependency('coveralls')
-  gem.add_development_dependency('pry')
+  gem.add_development_dependency(%q<rspec>, ["~> 2.2", ">= 2.2.0"])
+  gem.add_development_dependency('rake', ["~> 10.0", ">= 10.0.0"])
+  gem.add_development_dependency('coveralls', ["~> 0.7", ">= 0.7.0"])
+  gem.add_development_dependency('pry', ["~> 0.9", ">= 0.9.12"])
 end

metadata

@@ -1,71 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: sql_query_executor
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 description: Gem to run SQL like queries on array of hashes or similar objects
 email:
 - efreesen@gmail.com
@@ -73,9 +97,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
-- sql_query_executor.gemspec
+- lib/sql_query_executor.rb
 - lib/sql_query_executor/base.rb
 - lib/sql_query_executor/operators/base.rb
 - lib/sql_query_executor/operators/between.rb
@@ -88,9 +113,8 @@ files:
 - lib/sql_query_executor/query/sentence.rb
 - lib/sql_query_executor/query/sub_query.rb
 - lib/sql_query_executor/version.rb
-- lib/sql_query_executor.rb
-- Gemfile
 - spec/sql_query_executor/base_spec.rb
+- sql_query_executor.gemspec
 homepage: http://github.com/efreesen/sql_query_executor
 licenses:
 - GPLv2
@@ -101,17 +125,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.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: With SqlQueryExecutor you can run SQL like queries on any array of hashes