sql_query_executor 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ffa9b8c4f66f8c73e4accab049add69370287f2
-  data.tar.gz: e127e07ab476cf8e6286e20cda3c02605a2f5f18
+  metadata.gz: 3687167aeee2a4c5247df316603b0395d041b26b
+  data.tar.gz: f2709f263731b76b601a6a158c36fb64a00d1932
 SHA512:
-  metadata.gz: 8fdb2800683d3cc07b58ca3f311ad47f4606179fb87a1b2f70d42e5a1d44c8e28c9f40024d3fb42481b376df671fedd8595166ca3b15b3cb1d1b2ed8319f2c5a
-  data.tar.gz: 58fbe23d4bebfd7dc6ddcf8ad3d01efc32df3aa3938b5a9edb41204ef74c269664da482d8effa6a703f656934c6183582f1c0503efe46788f6e247a0a2c7d55a
+  metadata.gz: 97c5d6546a812e34a7b6fc4246f55e92b454f59f1f3b58dae49dba2aca0d24d22145002b8feb81d8e548fc0720efe8b52168ee07d430d4a94dd52f13c0c336fd
+  data.tar.gz: 4644918b41c5aec118c84a26a5cca0a4d6a8bfbe102ef009a171854a1bebd86ca2aeda6f7194f6cce10c606824a2a7c8d3b317e61b4e40e6173646a4bac42705

data/lib/sql_query_executor/query/base.rb

@@ -1,18 +1,16 @@
+require 'sql_query_executor/query/query_normalizer'
+
 module SqlQueryExecutor
   module Query
     class Base
       attr_reader :query
 
-      CONVERT_METHODS = {"String" => ["get_query", ""], "Array" => ["interpolate_query", "query.flatten"], "Hash" => ["concatenate_hash", "query"]}
       STRING_SPACE    = "$SS$"
       QUERY_SPACE     = "$QS$"
       TEMP_SPACE      = "$TS$"
 
       def initialize(query, collection)
-        query = clean_query_attribute(query)
-        array = CONVERT_METHODS[query.class.name]
-
-        query = sanitize(send(array.first, query))
+        query = QueryNormalizer.execute(query)
         @query = SqlQueryExecutor::Query::SubQuery.new query, collection
       end
 

data/lib/sql_query_executor/query/query_normalizer.rb

@@ -0,0 +1,124 @@
+require 'sql_query_executor'
+
+module SqlQueryExecutor
+  module Query
+    class SqlQueryExecutor::Query::QueryNormalizer
+      class << self
+        CONVERT_METHODS = {"String" => ["get_query", ""], "Array" => ["interpolate_query", "query.flatten"], "Hash" => ["concatenate_hash", "query"]}
+
+        def execute(query)
+          query = clean_query_attribute(query)
+          array = CONVERT_METHODS[query.class.name]
+
+          query = sanitize(send(array.first, query))
+        end
+
+        def clean_query(query)
+          query = execute(query)
+
+          remove_placeholders(query)
+        end
+
+      private
+        def remove_placeholders(query)
+          query.gsub(Base::QUERY_SPACE, ' ').gsub(Base::STRING_SPACE, ' ').gsub(Base::TEMP_SPACE, ' ')
+        end
+
+        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, /(["|'].*?["|'])/, " ", Base::STRING_SPACE)
+          new_query = replace_on_query(new_query, /(\(.*?\))/, " ", Base::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
+        end
+
+        def prepare_query(query)
+          SubQuery::BINDING_OPERATORS.keys.each do |operator|
+            query.gsub!(" #{operator} ", "#{Base::TEMP_SPACE}#{operator}#{Base::QUERY_SPACE}")
+          end
+
+          query.gsub(" ", Base::QUERY_SPACE).gsub(Base::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 ")
+        end
+      end
+    end
+  end
+end

data/lib/sql_query_executor/query/sub_query.rb

@@ -24,7 +24,7 @@ module SqlQueryExecutor
           result = child.execute!(result)
         end
 
-        result = data.send(@binding_operator, result) if @binding_operator && (data && !data.empty?)
+        result = (data || []).send(@binding_operator, result) if @binding_operator
 
         result.sort_by(&:id)
       end

data/lib/sql_query_executor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query_executor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,6 +69,7 @@ files:
 - lib/sql_query_executor/operators/in.rb
 - lib/sql_query_executor/operators/is.rb
 - lib/sql_query_executor/query/base.rb
+- lib/sql_query_executor/query/query_normalizer.rb
 - lib/sql_query_executor/query/sentence.rb
 - lib/sql_query_executor/query/sub_query.rb
 - lib/sql_query_executor/version.rb