sql_query_executor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35ed6525f34f2fa2b89077179627bb398e60569
-  data.tar.gz: d7f5b1378fe6932180ed501143f8282620b36ee1
+  metadata.gz: 5ffa9b8c4f66f8c73e4accab049add69370287f2
+  data.tar.gz: e127e07ab476cf8e6286e20cda3c02605a2f5f18
 SHA512:
-  metadata.gz: 17f7149a30b187f41262d8dfe826cf3a100400764aea984b5783cb440f9874b356038574ee5a16e9dd0e7f87d24c40e2085dad37ead3fe0f23db9f23fe8971b5
-  data.tar.gz: 407df8d2c2a114b9979b17f7249bfcf9698a04b317087a59b3199e9cda64bcb2fa58e74657069c76190954bc80b6cba1cc2f97a2e6e8f9e23047629724358ece
+  metadata.gz: 8fdb2800683d3cc07b58ca3f311ad47f4606179fb87a1b2f70d42e5a1d44c8e28c9f40024d3fb42481b376df671fedd8595166ca3b15b3cb1d1b2ed8319f2c5a
+  data.tar.gz: 58fbe23d4bebfd7dc6ddcf8ad3d01efc32df3aa3938b5a9edb41204ef74c269664da482d8effa6a703f656934c6183582f1c0503efe46788f6e247a0a2c7d55a

data/lib/sql_query_executor/base.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'sql_query_executor/query/base'
+require 'sql_query_executor/query/sub_query'
 
 # Simulates a SQL where clause to filter objects from the database
 module SqlQueryExecutor #:nodoc:
@@ -17,6 +18,12 @@ 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)
+      raise ArgumentError.new(message) if message
+
       query = SqlQueryExecutor::Query::Base.new(query, @collection)
       query.execute!
     end
@@ -33,5 +40,11 @@ module SqlQueryExecutor #:nodoc:
     def conforming_collection?(collection)
       collection.first.respond_to?(:attributes)
     end
+
+    def check_query(query)
+      if query.is_a?(Array) && !query.first.is_a?(String)
+        "First element from array must be a String. eg: [\"name = ?\", \"John\"]"
+      end
+    end
   end
 end

data/lib/sql_query_executor/query/base.rb

@@ -4,9 +4,9 @@ module SqlQueryExecutor
       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$"
+      STRING_SPACE    = "$SS$"
+      QUERY_SPACE     = "$QS$"
+      TEMP_SPACE      = "$TS$"
 
       def initialize(query, collection)
         query = clean_query_attribute(query)
@@ -50,33 +50,34 @@ module SqlQueryExecutor
 
       # Removes all accents and other non default characters
       def sanitize(query)
-        cruft = /\'|\"|\(|\)/
+        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(/(["|'].*?["|'])/).flatten.compact
+
+        params = new_query.scan(regexp).flatten.compact
 
         params.each do |param|
           new_param = param.dup
 
-          new_param = new_param.gsub(" ", STRING_SPACE)
+          new_param = new_param.gsub(pattern, replacement)
 
           new_query = new_query.gsub(param, new_param)
         end
 
-        
-        params = new_query.scan(/(\(.*?\))/).flatten.compact
-
-        params.each do |param|
-          new_param = param.dup
-
-          new_param = new_param.gsub(" ", QUERY_SPACE)
+        new_query
+      end
 
-          new_query = new_query.gsub(param, new_param)
+      def prepare_query(query)
+        SubQuery::BINDING_OPERATORS.keys.each do |operator|
+          query.gsub!(" #{operator} ", "#{TEMP_SPACE}#{operator}#{QUERY_SPACE}")
         end
 
-        query = new_query.gsub(" and ", "#{TEMP_SPACE}and#{QUERY_SPACE}").gsub(" or ", "#{TEMP_SPACE}or#{QUERY_SPACE}").gsub(" ", QUERY_SPACE).gsub(TEMP_SPACE, " ")
-
-        remove_spaces(query)
+        query.gsub(" ", QUERY_SPACE).gsub(TEMP_SPACE, " ")
       end
 
       def remove_spaces(query)

data/lib/sql_query_executor/query/sentence.rb

@@ -6,7 +6,7 @@ require 'sql_query_executor/operators/in'
 module SqlQueryExecutor
   module Query
     class Sentence
-      attr_reader :query, :binding_operator, :operator
+      attr_reader :query, :operator
 
       OPERATORS = {
         "between" => SqlQueryExecutor::Operators::Between,
@@ -23,28 +23,18 @@ module SqlQueryExecutor
         "exists"  => SqlQueryExecutor::Operators::Default,#Exists
       }
 
-      BINDING_OPERATORS = {
-        "and" => "&",
-        "or"  => "+"
-      }
-
       def initialize(query, collection)
         @query    = query
         @collection = collection
         @array = query.split(' ')
 
-        set_binding_operator
         set_operator
       end
 
       def execute!(data)
         return [] unless @operator
 
-        result = @operator.execute!(data)
-
-        result = data.send(@binding_operator, result) if @binding_operator && (data && !data.empty?)
-
-        result
+        @operator.execute!(data)
       end
 
     private
@@ -54,12 +44,6 @@ module SqlQueryExecutor
         @operator = operator ? operator.new(@query, @collection) : nil
       end
 
-      def set_binding_operator
-        @binding_operator = BINDING_OPERATORS[@array.first]
-
-        fix_query if @binding_operator
-      end
-
       def fix_query
         @array.delete_at(0) 
 

data/lib/sql_query_executor/query/sub_query.rb

@@ -1,3 +1,5 @@
+require 'sql_query_executor/query/sentence'
+
 module SqlQueryExecutor
   module Query
     class SubQuery

data/lib/sql_query_executor/version.rb

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

data/spec/sql_query_executor/base_spec.rb

@@ -16,6 +16,14 @@ describe SqlQueryExecutor, "Base" do
   subject { SqlQueryExecutor::Base.new(@data) }
 
   describe ".where" do
+    context "when invalid query is passed" do
+      it "raises an ArgumentError" do
+        query = [{name: "John"}]
+
+        expect { subject.where(query) }.to raise_error(ArgumentError, "First element from array must be a String. eg: [\"name = ?\", \"John\"]")
+      end
+    end
+
     describe "=" do
       context "when attribute is string" do
         it "matches a record" do

metadata

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