sql_query_executor 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3687167aeee2a4c5247df316603b0395d041b26b
-  data.tar.gz: f2709f263731b76b601a6a158c36fb64a00d1932
+  metadata.gz: c42f0a76b148c57bbe10c04654bbd6380cab657b
+  data.tar.gz: c653b58ffc9a847922c2b8b1e3d88463b9b46e84
 SHA512:
-  metadata.gz: 97c5d6546a812e34a7b6fc4246f55e92b454f59f1f3b58dae49dba2aca0d24d22145002b8feb81d8e548fc0720efe8b52168ee07d430d4a94dd52f13c0c336fd
-  data.tar.gz: 4644918b41c5aec118c84a26a5cca0a4d6a8bfbe102ef009a171854a1bebd86ca2aeda6f7194f6cce10c606824a2a7c8d3b317e61b4e40e6173646a4bac42705
+  metadata.gz: 48ef44419b5509ff76af6e617370350dbb7167892f0f85283d1cbd465b8349bff384319aced176870d8fbc4e42fa38ca83e8a5dc2568e2739d9170e150cd218a
+  data.tar.gz: 2000259b6d0931d496a8757c0f4619f185609f64d741a99d44d7451cc4a41f094a06bd2fe81334bf5cc73ec807ce79d1aedfc51e0fa07f15bb032f1ac5165089

data/lib/sql_query_executor/base.rb

@@ -18,7 +18,6 @@ module SqlQueryExecutor #:nodoc:
     # Recursive method that divides the query in sub queries, executes each part individually
     # and finally relates its results as specified in the query.
     def where(*query)
-      raise ArgumentError.new("must pass at least one argument") if query.empty?
       query = query.first if query.respond_to?(:size) && query.size == 1
 
       message = check_query(query)
@@ -42,6 +41,8 @@ module SqlQueryExecutor #:nodoc:
     end
 
     def check_query(query)
+      return "must pass at least one argument" 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

@@ -10,13 +10,17 @@ module SqlQueryExecutor
         @value      = get_value
       end
 
+      def selector
+        { @field => @value }
+      end
+
     protected
       def get_field
         @array.first
       end
 
       def get_value
-        value = @array.last.gsub(::SqlQueryExecutor::Query::Base::STRING_SPACE, ' ')
+        value = @array.last.gsub(SqlQueryExecutor::Query::Base::STRING_SPACE, ' ')
 
         convert_value(value)
       end

data/lib/sql_query_executor/operators/between.rb

@@ -18,6 +18,10 @@ module SqlQueryExecutor
         end
       end
 
+      def selector
+        { @field => { "$gte" => @value.first, "$lte" => @value.last }}
+      end
+
     private
       def get_value
         value = []

data/lib/sql_query_executor/operators/default.rb

@@ -3,6 +3,15 @@ require 'sql_query_executor/operators/base'
 module SqlQueryExecutor
   module Operators
     class Default < SqlQueryExecutor::Operators::Base
+      SELECTORS = {
+        "=="      => nil,
+        ">"       => "$gt",
+        "<"       => "$lt",
+        ">="      => "$gte",
+        "<="      => "$lte",
+        "!="      => "$ne"
+      }
+
       def initialize(query, collection)
         super
         convert_operator
@@ -16,6 +25,12 @@ module SqlQueryExecutor
         end
       end
 
+      def selector
+        operator = SELECTORS[@operator]
+
+        { @field.to_sym => operator ? {operator => @value} : @value}
+      end
+
     private
       def convert_operator
         @operator = @operator == "="  ? "==" : @operator

data/lib/sql_query_executor/operators/in.rb

@@ -11,6 +11,10 @@ module SqlQueryExecutor
         end
       end
 
+      def selector
+        { @field => { "$in" => @value }}
+      end
+
     private
       def get_value
         value = super

data/lib/sql_query_executor/query/base.rb

@@ -3,8 +3,6 @@ require 'sql_query_executor/query/query_normalizer'
 module SqlQueryExecutor
   module Query
     class Base
-      attr_reader :query
-
       STRING_SPACE    = "$SS$"
       QUERY_SPACE     = "$QS$"
       TEMP_SPACE      = "$TS$"
@@ -18,100 +16,12 @@ module SqlQueryExecutor
         @query.execute!
       end
 
-    private
-      def clean_query_attribute(query)
-        return query unless query.is_a?(Array)
-
-        query = query.flatten
-
-        query.size == 1 ? query.first : query
-      end
-
-      def get_query(query)
-        query
-      end
-
-      # Prepares query by replacing all ? by it's real values in #args
-      def interpolate_query(args)
-        args.flatten!
-        return args.first if args.size == 1 && args.first.is_a?(String)
-
-        query = args.first
-        param = args.delete_at(1)
-
-        param = convert_param(param)
-
-        args[0] = query.sub("?", param.is_a?(Numeric) ? param : "#{param}")
-
-        interpolate_query(args)
-      end
-
-      # Removes all accents and other non default characters
-      def sanitize(query)
-        new_query = replace_on_query(query, /(["|'].*?["|'])/, " ", STRING_SPACE)
-        new_query = replace_on_query(new_query, /(\(.*?\))/, " ", QUERY_SPACE)
-
-        remove_spaces(prepare_query(new_query))
-      end
-
-      def replace_on_query(query, regexp, pattern, replacement)
-        new_query = query ? query.dup : query
-
-        params = new_query.scan(regexp).flatten.compact
-
-        params.each do |param|
-          new_param = param.dup
-
-          new_param = new_param.gsub(pattern, replacement)
-
-          new_query = new_query.gsub(param, new_param)
-        end
-
-        new_query
+      def to_sql
+        @query.to_sql
       end
 
-      def prepare_query(query)
-        SubQuery::BINDING_OPERATORS.keys.each do |operator|
-          query.gsub!(" #{operator} ", "#{TEMP_SPACE}#{operator}#{QUERY_SPACE}")
-        end
-
-        query.gsub(" ", QUERY_SPACE).gsub(TEMP_SPACE, " ")
-      end
-
-      def remove_spaces(query)
-        query.gsub!(/\[.*?\]/) { |substr| substr.gsub(' ', '') }
-        query
-      end
-
-      # Returns converted #param based on its Class, so it can be used on the query
-      def convert_param(param)
-        case param.class.name
-        when "String"
-          param = "'#{param}'"
-        when "Date"
-          param = "'#{param.strftime("%Y-%m-%d")}'"
-        when "Time"
-          param = "'#{param.strftime("%Y-%m-%d %H:%M:%S %z")}'"
-        else
-          param = param.to_s
-        end
-      end
-
-      def concatenate_hash(query)
-        return "" unless query.is_a?(Hash)
-        query_array = []
-
-        query.each do |key, value|
-          if value.is_a?(Array)
-            value = value.first.is_a?(Numeric) ? value : value.map{ |v| "'#{v}'" }
-            query_array << "#{key} in (#{value.join(',')})"
-          else
-            value = value.is_a?(Numeric) ? value : "'#{value}'"
-            query_array << "#{key} = #{value}"
-          end
-        end
-
-        query_array.join(" and ")
+      def selector
+        @query.selector
       end
     end
   end

data/lib/sql_query_executor/query/query_normalizer.rb

@@ -2,7 +2,7 @@ require 'sql_query_executor'
 
 module SqlQueryExecutor
   module Query
-    class SqlQueryExecutor::Query::QueryNormalizer
+    class QueryNormalizer
       class << self
         CONVERT_METHODS = {"String" => ["get_query", ""], "Array" => ["interpolate_query", "query.flatten"], "Hash" => ["concatenate_hash", "query"]}
 
@@ -92,7 +92,7 @@ module SqlQueryExecutor
         def convert_param(param)
           case param.class.name
           when "String"
-            param = "'#{param}'"
+            param = "'#{param}'".gsub("''", "'").gsub('""', '"')
           when "Date"
             param = "'#{param.strftime("%Y-%m-%d")}'"
           when "Time"
@@ -105,14 +105,33 @@ module SqlQueryExecutor
         def concatenate_hash(query)
           return "" unless query.is_a?(Hash)
           query_array = []
+          operators   = {"$gt" => '>', "$lt" => '<', "$gte" => '>=', "$lte" => '<=', "$ne" => '!=', "$in" => 'in'}
 
           query.each do |key, value|
             if value.is_a?(Array)
-              value = value.first.is_a?(Numeric) ? value : value.map{ |v| "'#{v}'" }
-              query_array << "#{key} in (#{value.join(',')})"
+              if [:and, :or].include?(key)
+                queries = []
+
+                value.each do |hash|
+                  queries << concatenate_hash(hash)
+                end
+
+                query_array << queries.join(" #{key.to_s} ")
+              else
+                value = value.first.is_a?(Numeric) ? value : value.map{ |v| "'#{v}'" }
+                query_array << "#{key} in (#{value.join(',')})"
+              end
             else
-              value = value.is_a?(Numeric) ? value : "'#{value}'"
-              query_array << "#{key} = #{value}"
+              operator = '='
+
+              if value.is_a?(Hash)
+                operator = operators[value.keys.first] || operator
+
+                value = convert_param(value.values.first)
+              end
+
+              value = "#{convert_param(value)}"
+              query_array << "#{key} #{operator} #{value}"
             end
           end
 

data/lib/sql_query_executor/query/sentence.rb

@@ -37,18 +37,16 @@ module SqlQueryExecutor
         @operator.execute!(data)
       end
 
+      def selector
+        @operator.selector
+      end
+
     private
       def set_operator
         operator = OPERATORS[@query.split(' ')[1]]
 
         @operator = operator ? operator.new(@query, @collection) : nil
       end
-
-      def fix_query
-        @array.delete_at(0) 
-
-        @query = @array.join(' ')
-      end
     end
   end
 end

data/lib/sql_query_executor/query/sub_query.rb

@@ -4,7 +4,7 @@ module SqlQueryExecutor
   module Query
     class SubQuery
       BINDING_OPERATORS = { "or" => "+", "and" => "&" }
-      attr_reader :query, :children, :kind
+      attr_reader :children, :kind, :binding_operator
       ADD_CHILDREN_METHODS = { sentence: :add_sentence_children, sub_query: :add_sub_query_children }
       def initialize(query, collection)
         @collection = collection
@@ -29,6 +29,25 @@ module SqlQueryExecutor
         result.sort_by(&:id)
       end
 
+      def selector
+        hash = {}
+
+        @children.each do |child|
+          if child.respond_to?(:binding_operator) && child.binding_operator
+            operator = BINDING_OPERATORS.invert[child.binding_operator]
+            hash = {operator.to_sym => [hash,child.selector]}
+          else
+            hash.merge!(child.selector)
+          end
+        end
+
+        hash
+      end
+
+      def to_sql
+        QueryNormalizer.clean_query(@query)
+      end
+
     private
       def set_binding_operator
         @binding_operator = nil
@@ -77,31 +96,6 @@ module SqlQueryExecutor
         array.size <= 5
       end
 
-      def build_sub_query(query)
-        array = query.split(" ")
-
-        offset = is_binding_operator?(array.first) ? 1 : 0
-        operator = array[1+offset]
-
-        result = case operator
-        when "between"
-          array[0..4+offset]
-        when "is"
-          size = array[2+offset] == "not" ? 3 : 2
-          array[0..size+offset]
-        when "not"
-          array[0..3+offset]
-        else
-          array[0..2+offset]
-        end
-
-        result.join(' ')
-      end
-
-      def is_binding_operator?(operator)
-        BINDING_OPERATORS.include?(operator)
-      end
-
       def replace_parentheses(query)
         count = 1
         string = ""

data/lib/sql_query_executor/version.rb

@@ -1,3 +1,3 @@
 module SqlQueryExecutor
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/sql_query_executor/base_spec.rb

@@ -15,6 +15,42 @@ describe SqlQueryExecutor, "Base" do
 
   subject { SqlQueryExecutor::Base.new(@data) }
 
+  describe "initialize" do
+    before do
+      class Model
+        attr_reader :attributes
+
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def id
+          @attributes[:id]
+        end
+      end
+
+      class Collection
+        def initialize(collection)
+          @collection = []
+
+          collection.each do |hash|
+            @collection << Model.new(hash)
+          end
+        end
+
+        def all
+          @collection
+        end
+      end
+    end
+
+    subject { SqlQueryExecutor::Base.new(Collection.new(@data).all) }
+
+    it 'initializes with a conforming collection' do
+      expect(subject.where(id: 1).first.attributes).to eq (@data.first)
+    end
+  end
+
   describe ".where" do
     context "when invalid query is passed" do
       it "raises an ArgumentError" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query_executor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec