querybuilder 1.2.2 → 1.2.3

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.3 2013-11-04
+
+* Major enhancement
+  * Fixed ruby dynamic string escaping.
+
 == 1.2.2 2013-05-07
 
 * Major enhancement

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/lib/query_builder/processor.rb

@@ -495,15 +495,13 @@ module QueryBuilder
         content.first == :or ? process(content) : "(#{process(content)})"
       end
 
-      def process_string(string)
-        quote(string)
-      end
-
       def process_dstring(string)
         raise QueryBuilder::SyntaxError.new("Cannot parse rubyless (missing binding context).") unless helper = @rubyless_helper
         res = RubyLess.translate_string(helper, string)
         res.literal ? quote(res.literal) : insert_bind(res)
       end
+      
+      alias process_string process_dstring
 
       def process_rubyless(string)
         # compile RubyLess...
@@ -697,7 +695,7 @@ module QueryBuilder
 
       def change_processor(processor, opts = {})
         if @this
-          @this.change_processor(processor)
+          @this.change_processor(processor, opts)
         else
           if processor.kind_of?(String)
             processor = QueryBuilder.resolve_const(processor)
@@ -706,7 +704,7 @@ module QueryBuilder
           if processor.kind_of?(Processor)
             # instance of processor
           elsif processor <= Processor
-            processor = processor.new(this, opts)
+            processor = processor.new(this, {:rubyless_helper => @rubyless_helper}.merge(opts))
           else
             raise QueryBuilder::SyntaxError.new("Cannot use #{processor} as Query compiler (not a QueryBuilder::Processor).")
           end
@@ -714,6 +712,7 @@ module QueryBuilder
           @query.processor_class = processor.class
           @query.main_class = processor.resolve_main_class(processor.class.main_class)
           update_processor(processor)
+          
         end
       end
 

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-05-07}
+  s.date = %q{2013-11-04}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 

data/test/querybuilder/filters.yml

@@ -180,6 +180,9 @@ filter_quote_string:
   src: "objects where name = \"l'avion\""
   sql: "SELECT objects.* FROM objects WHERE objects.name = 'l''avion' AND objects.parent_id = 123"
 
+filter_quote_ruby_in_string:
+  src: "objects where name = '#{hop}'"
+  res: "/unknown method 'hop/"
 
 field_with_digits:
   src: "objects where idx_foo1 is not null"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-07 00:00:00 +02:00
+date: 2013-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency