believer 0.2.18 → 0.2.19

data/lib/believer/cql_helper.rb

@@ -11,16 +11,12 @@ module Believer
     # @param value [Object] the value to convert
     def to_cql_literal(value)
       return 'NULL' if value.nil?
-      return "'#{value}'" if value.is_a?(String)
+      return "'#{escape_special_chars(value)}'" if value.is_a?(String)
       return "'#{value}'" if value.is_a?(Symbol)
       return "#{value}" if value.is_a?(Numeric)
       return "'#{value.strftime(CQL_TIMESTAMP_FORMAT)}'" if value.is_a?(Time) || value.is_a?(DateTime)
       #return "#{value.to_i * 1000}" if value.is_a?(Time) || value.is_a?(DateTime)
 
-      if value.is_a?(Counter)
-
-      end
-
       # Set
       if value.is_a?(Set)
         return "{#{value.map {|v| to_cql_literal(v)}.join(',')}}"
@@ -45,11 +41,12 @@ module Believer
         v = properties[k]
         v_s = nil
         if v.is_a?(Hash)
+          v.each {|k, val| v[k] = escape_special_chars(val) if val.is_a?(String)}
           v_s = v.to_json.gsub(/\"/) { |m| "'" }
         elsif v.is_a?(String)
-          v_s = "'#{v}'"
+          v_s = "'#{escape_special_chars(v)}'"
         else
-          v_s = v.to_s
+          v_s = escape_special_chars(v.to_s)
         end
         "#{k} = #{v_s}"
       }.join("\nAND ")
@@ -57,5 +54,9 @@ module Believer
       props_s
     end
 
+    def escape_special_chars(v)
+      v.gsub("'", "''")
+    end
+
   end
 end

data/lib/believer/environment/base_env.rb

@@ -94,7 +94,7 @@ module Believer
       def load_config_from_file(config_file)
         return nil if config_file.nil?
         cfg = HashWithIndifferentAccess.new(YAML::load(File.open(config_file.to_s)))
-        puts "Loaded config from file #{config_file.to_s}: #{cfg}"
+        #puts "Loaded config from file #{config_file.to_s}: #{cfg}"
         cfg
       end
 

data/lib/believer/version.rb

@@ -1,5 +1,5 @@
 module Believer
   module Version
-    VERSION = '0.2.18'
+    VERSION = '0.2.19'
   end
 end

data/spec/believer/query_spec.rb

@@ -24,6 +24,12 @@ describe Believer::Query do
 
   end
 
+  it 'should escape string literals' do
+    q = Believer::Query.new(:record_class => Test::Album)
+    q = q.select(:name).where(:name => "'quote!")
+    expect(q.to_cql).to eql "SELECT name FROM albums WHERE name = '''quote!'"
+  end
+
   it 'create simple statement' do
     q = Believer::Query.new(:record_class => Test::Album)
     q = q.select(:name).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: believer
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel