sql_query_executor 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b71902eb1b5e7adc42d527acac3fdaf40e22fee
-  data.tar.gz: 358c703da427d72bdfd3fdc0739311791124840b
+  metadata.gz: 2a88fb06f74901e2e2f0f1aa38bd63da77a0c062
+  data.tar.gz: 88c2390a87b8a152e7cf4101d2be0e2493a91060
 SHA512:
-  metadata.gz: d497c41d0cfc5a55c2108fe28624d34006a5be0cde82f95d99161a328f79ea5db7f4a47dccb6015d6694bc78d3f935abefbbf61dd7578819ee66f9b69caeeec3
-  data.tar.gz: 6a878452fa8648c31e45e8a4c340a362f5a8fa694ef5985895db6fb4e9cc1fa3d60d0afb6d0bf628349d8d1d33f937aba219ac5d03e239820244fbafd7b296dd
+  metadata.gz: de9a0a0c32c214245a021ffe62c561a975463048f1ad4c86e177e2e6704dc6541bcd490f1673f9fef00b0b4bd40cdddcaa3016715652034b621c6edcd84d6b52
+  data.tar.gz: db3638046c93c332ac3becfeff6695c6b99b7dab583efaeb4ee9206e71d521ffbc2eda22c51e43266077403120cdcab45b1b6c56ae444078ba72c78656cc4b00

data/lib/sql_query_executor/operators/base.rb

@@ -12,44 +12,66 @@ module SqlQueryExecutor
         { @field => @value }
       end
 
+      def logic
+        initialize_attributes(true)
+        "object.#{@field} #{@operator} #{@value || 'nil'}"
+      end
+
     protected
-      def initialize_attributes
+      def initialize_attributes(logic=false)
         return if @array
 
         @query      = SqlQueryExecutor::Query::Normalizers::QueryNormalizer.execute(@query).gsub(SqlQueryExecutor::Base::QUERY_SPACE, ' ')
         @array      = @query.split(' ')
-        @operator   = @query.split(' ')[1]
+        @operator   = convert_operator
         @field      = get_field
-        @value      = get_value
+        @value      = get_value(logic)
       end
 
       def get_field
         @array.first
       end
 
-      def get_value
+      def get_value(logic=false)
         value = @array.last.gsub(SqlQueryExecutor::Base::STRING_SPACE, ' ')
 
-        convert_value(value)
+        convert_value(value, logic)
       end
 
-      def convert_value(value)
+      def convert_value(value, logic=false)
         value.gsub!(/[\(\)\'\"]/, "")
         return value.to_i if is_a_number?(value)
+        return value.to_f if is_a_number?(value, true)
         return eval(value) if ['true', 'false'].include?(value)
 
         methods = {3 => "convert_date", 7 => "convert_time"}
 
         array = split(value)
 
-        value = (send(methods[array.size], array) || value) if methods.keys.include?(array.size)
+        if methods.keys.include?(array.size)
+          value = (send(methods[array.size], array, logic) || (logic ? "'#{value}'" : value))
+        elsif logic
+          value = "'#{value}'" if value.is_a?(String)
+        end
 
         value
       end
 
     private
-      def is_a_number?(value)
-        value.to_s == value.to_i.to_s
+      def is_a_number?(value, float=false)
+        if float
+          Float(value)
+        else
+          Integer(value)
+        end rescue false
+      end
+
+      def convert_operator
+        operators_to_convert = {'<>' => '!=', '=' => '=='}
+
+        operator = @array[1]
+        
+        operators_to_convert[operator] || operator
       end
 
       def split(value)
@@ -60,17 +82,26 @@ module SqlQueryExecutor
         array.flatten
       end
 
-      def convert_date(args)
+      def convert_date(args, logic=false)
         return if args.first.to_i < 1000
         
-        Date.new(args[0].to_i, args[1].to_i, args[2].to_i)
+        if logic
+          "Date.new(#{args[0].to_i}, #{args[1].to_i}, #{args[2].to_i})"
+        else
+          Date.new(args[0].to_i, args[1].to_i, args[2].to_i)
+        end
       end
 
-      def convert_time(args)
+      def convert_time(args, logic=false)
         return if args.first.to_i < 1000
         args[6] = args[6].gsub('00', ':00').gsub("+:", "+")
         
-        Time.new(*args)
+        if logic
+          timezone = args.delete(args.last)
+          "Time.new(#{args.join(',')},'#{timezone}')"
+        else
+          Time.new(*args)
+        end
       end
     end
   end

data/lib/sql_query_executor/operators/between.rb

@@ -3,33 +3,23 @@ require 'sql_query_executor/operators/base'
 module SqlQueryExecutor
   module Operators
     class Between < SqlQueryExecutor::Operators::Base
-      def execute!(collection)
-        initialize_attributes
-        collection.select do |record|
-          value = convert_value(record.send(@field).to_s)
-
-          if value.class != @value.first.class
-            false
-          else
-            greather_than = value.send('>=', @value.first)
-            smaller_than  = value.send('<=', @value.last)
-
-            greather_than && smaller_than
-          end
-        end
-      end
-
       def selector
         initialize_attributes
         { @field => { "$gte" => @value.first, "$lte" => @value.last }}
       end
 
+      def logic
+        initialize_attributes(true)
+
+        "object.#{@field} >= #{@value[0]} && object.#{@field} <= #{@value[1]}"
+      end
+
     private
-      def get_value
+      def get_value(logic=false)
         value = []
 
-        value << convert_value(@array[2].gsub(SqlQueryExecutor::Base::STRING_SPACE, ' '))
-        value << convert_value(@array[4].gsub(SqlQueryExecutor::Base::STRING_SPACE, ' '))
+        value << convert_value(@array[2].gsub(SqlQueryExecutor::Base::STRING_SPACE, ' '), logic)
+        value << convert_value(@array[4].gsub(SqlQueryExecutor::Base::STRING_SPACE, ' '), logic)
       end
     end
   end

data/lib/sql_query_executor/operators/default.rb

@@ -12,17 +12,6 @@ module SqlQueryExecutor
         "!="      => "$ne"
       }
 
-      def execute!(collection)
-        initialize_attributes
-        collection.select do |record|
-          value = record.send(@field.to_s)
-
-          value = convert_value(value) rescue value
-
-          value.send(@operator, @value) rescue false
-        end
-      end
-
       def selector
         initialize_attributes
 
@@ -32,15 +21,6 @@ module SqlQueryExecutor
       end
 
     private
-      def initialize_attributes
-        super
-        convert_operator
-      end
-
-      def convert_operator
-        @operator = @operator == "="  ? "==" : @operator
-        @operator = @operator == "<>" ? "!=" : @operator
-      end
     end
   end
 end

data/lib/sql_query_executor/operators/in.rb

@@ -3,25 +3,22 @@ require 'sql_query_executor/operators/base'
 module SqlQueryExecutor
   module Operators
     class In < SqlQueryExecutor::Operators::Base
-      def execute!(collection)
-        initialize_attributes
-        result = collection.select do |record|
-          value = record.send(@field)
-
-          @value.send('include?', value)
-        end
-      end
-
       def selector
         initialize_attributes
         { @field => { "$in" => @value }}
       end
 
+      def logic
+        initialize_attributes(true)
+
+        "[#{@value.join(', ')}].include?(object.#{@field})"
+      end
+
     private
-      def get_value
+      def get_value(logic=false)
         value = super
 
-        value.gsub(SqlQueryExecutor::Base::STRING_SPACE, '').split(',').map{ |v| convert_value(v) }
+        value.gsub(SqlQueryExecutor::Base::STRING_SPACE, '').split(',').map{ |v| convert_value(v, logic) }
       end
     end
   end

data/lib/sql_query_executor/operators/is.rb

@@ -3,16 +3,6 @@ require 'sql_query_executor/operators/base'
 module SqlQueryExecutor
   module Operators
     class Is < SqlQueryExecutor::Operators::Base
-      def execute!(collection)
-        initialize_attributes
-
-        collection.select do |record|
-          value = record.send(@field)
-
-          value.send(@operator, @value)
-        end
-      end
-
       def selector
         initialize_attributes
 
@@ -20,12 +10,13 @@ module SqlQueryExecutor
       end
 
     private
-      def initialize_attributes
+      def initialize_attributes(logic=false)
         super
         convert_operator
       end
-      def get_value
-        @array.include?('null') ? nil : convert_value(@array.last)
+
+      def get_value(logic=false)
+        @array.include?('null') ? nil : convert_value(@array.last, logic)
       end
 
       def convert_operator

data/lib/sql_query_executor/query/sentence.rb

@@ -30,17 +30,14 @@ module SqlQueryExecutor
         set_operator
       end
 
-      # The data parameter is only declared for SubQuery compatibility purposes
-      def execute!(collection, data=[])
-        return [] unless @operator
-
-        @operator.execute!(collection)
-      end
-
       def selector
         @operator.selector
       end
 
+      def logic
+        @operator.logic
+      end
+
     private
       def set_operator
         operator = OPERATORS[@query.split(' ')[1]]

data/lib/sql_query_executor/query/sub_query.rb

@@ -14,15 +14,7 @@ module SqlQueryExecutor
       end
 
       def execute!(collection, data=[])
-        return [] unless @children
-
-        result = []
-
-        @children.each do |child|
-          result = child.execute!(collection, result)
-        end
-
-        result = (data || []).send(@binding_operator, result) if @binding_operator
+        result = collection.select{ |object| eval(logic) }
 
         result.sort_by(&:id)
       end
@@ -46,6 +38,21 @@ module SqlQueryExecutor
         SqlQueryExecutor::Query::Normalizers::QueryNormalizer.clean_query(@query)
       end
 
+      def logic
+        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})"
+          else
+            string += child.logic
+          end
+        end
+
+        string
+      end
+
     private
       def initialize_attributes
         return if @kind

data/lib/sql_query_executor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query_executor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec