sql_query_executor 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 885c973bd56f42cacc7f5a2ec53399c6004aa487
-  data.tar.gz: a5591b1baddeb58afd77ac9279f82b8eca4f3213
+  metadata.gz: 3b41537dd11ea282bce2972c2cb2016fa5de5d43
+  data.tar.gz: b260c9d62dc105fb7a9fab1c1a6bacff6d8a50fa
 SHA512:
-  metadata.gz: 59120a2dc4c1468f86b4bef599daf7b2601c8e30164cfb427397559656320163a1bc80a0b29c3e6d96f4649047e3e4823c5c49d2b356a2304c322f45484acb3f
-  data.tar.gz: 32a3793e8c462c62719c37ebf5900ecae59130831f33216c36bc8e4165a5e45439c146c2569181febcac63c7afcce50d5b90ed6ac115a15c631d2d318c34b22a
+  metadata.gz: 6dc13927e1330a1a56d7e07d60cf67b24b3ab59aaf9bb83628f50bac83d0902464b044e3dad8a23e1fd07c64844aa8ee681adda085cefb1521cf9812be0ef158
+  data.tar.gz: e444ed8beaad6bc844dd4c0a0cbf7022c7a55c0ded9f4d52dca02ca7a93b0e3f9f187824a146b7cfbf12ecb56f65e73ae4e8ebfc2c40615dd50177f2e332899e

data/lib/sql_query_executor/query/normalizers/query_normalizer.rb

@@ -31,7 +31,8 @@ module SqlQueryExecutor
         end
 
         def self.remove_placeholders(query)
-          query.gsub(Base::QUERY_SPACE, ' ').gsub(Base::STRING_SPACE, ' ').gsub(Base::TEMP_SPACE, ' ')
+          new_query = query.gsub(Base::QUERY_SPACE, ' ').gsub(Base::STRING_SPACE, ' ').gsub(Base::TEMP_SPACE, ' ')
+          new_query.gsub('"null"', 'null').gsub("'null'", 'null')
         end
 
         def self.clean_query_attribute(query)
@@ -50,6 +51,7 @@ module SqlQueryExecutor
         def self.interpolate_query(args)
           args.flatten!
           return args.first if args.size == 1 && args.first.is_a?(String)
+          return interpolate_hash(args) if args[1].is_a?(Hash)
 
           query = args.first
           param = args.delete_at(1)
@@ -61,6 +63,12 @@ module SqlQueryExecutor
           interpolate_query(args)
         end
 
+        def self.interpolate_hash(args)
+          hash = args[1]
+
+          args.first.gsub(/:(\S+)/) { |match| convert_param(hash[match.gsub(":", '').to_sym]) }
+        end
+
         # Removes all accents and other non default characters
         def self.sanitize(query)
           new_query = replace_on_query(query, /(["|'].*?["|'])/, " ", Base::STRING_SPACE)

data/lib/sql_query_executor/version.rb

@@ -1,3 +1,3 @@
 module SqlQueryExecutor
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/sql_query_executor/base_spec.rb

@@ -81,12 +81,19 @@ describe SqlQueryExecutor::Base do
     end
 
     context 'to_sql' do
-      let(:query)    { "name = 'Brazil'" }
-      let(:selector) { {name: 'Brazil'} }
-
       it 'converts selector' do
+        query = "name = 'Brazil'"
+        selector = {name: 'Brazil'}
+
         expect(described_class.new([], selector).to_sql).to eq query
       end
+
+      it 'removes quotes from null' do
+        wrong_query = "id is not 'null'"
+        right_query = 'id is not null'
+
+        expect(described_class.new([], wrong_query).to_sql).to eq right_query
+      end
     end
   end
 end

data/sql_query_executor.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |gem|
   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')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query_executor
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to run SQL like queries on array of hashes or similar objects
 email:
 - efreesen@gmail.com