sessionm-cassandra_object 4.0.18 → 4.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f7695ab50cc8f809469eae9e85df59aa5e8167
-  data.tar.gz: c366e423d4218302c58b9470fabdce04fbddc5e2
+  metadata.gz: 32924130490af3ac836dfc59d0c17814e0879928
+  data.tar.gz: 58f04eefe80bd07d77082945521c48acf43944c5
 SHA512:
-  metadata.gz: 65b1137b9b00dfdcd4dabc4c1c6d4112b2d98b9a9cb039e11a11d5308c56cdd41007638b4b6210a1fdb42a649cacf50d2b3d57f05cefb48b17345038f83bdabd
-  data.tar.gz: 828a23a774fe4d56a085c376dc7673910391ef8d6a441ea440f1f6319edab25200792714486eb801ba1f32a25cf61ab51279b1526a6918f0d862e45524aa23e1
+  metadata.gz: c382c6fd5f4c0f4f31c7954c76f1c015c19c4630e56346478d2a41a2667ea6e578164292e3da233166e15657ec610d09400175727d43a595997c60d545388732
+  data.tar.gz: 63d6cb50a2bf1951a02ffb3e80213c0faf35ed289998e473dcc7f6316aa216220f5181c0bc4dc53ada42b5c1a785f4b19c85339b347bed7d216c059d30758acc

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -41,11 +41,9 @@ module CassandraObject
           :port => 9042,
           :connect_timeout => config[:thrift].try(:[], :connect_timeout) || 10,
           :timeout => config[:thrift].try(:[], :timeout) || 10,
-          :logger => (defined?(Rails) && Rails.logger) || Logger.new(STDOUT),
-          :heartbeat_interval => nil,
-          :idle_timeout => nil
+          :logger => config[:logger] || (defined?(Rails) && Rails.logger) || Logger.new(STDOUT)
         ).merge(
-          :consistency => (config[:consistency] || {})[:write_default].try(:to_sym) || :one,
+          :consistency => (config[:consistency] || {})[:write_default].try(:to_sym) || :one
         )
       end
 
@@ -85,11 +83,10 @@ module CassandraObject
           async = opts.try(:[], :async)
 
           insert_into_options = ttl ? " USING TTL #{ttl}" : ''
-          key = "textAsBlob('#{key}')"
 
           query = "BEGIN BATCH\n"
           query << values.map do |name, value|
-            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{key}, #{escape(name, name_type(column_family))}, #{escape(value, value_type(column_family))})#{insert_into_options}"
+            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{escape(key, key_type(column_family))}, #{escape(name, name_type(column_family))}, #{escape(value, value_type(column_family))})#{insert_into_options}"
           end.join("\n")
           query << "\nAPPLY BATCH;"
 
@@ -102,13 +99,11 @@ module CassandraObject
 
           columns = columns_options.flatten.compact
 
-          key = "textAsBlob('#{key}')"
-
           query =
             if columns.size == 1
-              "SELECT #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{columns.first}'"
+              "SELECT #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(columns.first, name_type(column_family))}"
             else
-              "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key}"
+              "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
             end
 
           result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
@@ -125,11 +120,9 @@ module CassandraObject
         def get_columns(column_family, key, columns, opts)
           async = opts.try(:[], :async)
 
-          key = "textAsBlob('#{key}')"
-
-          name_fields = columns.map { |c| "'#{c}'" }.join(', ')
+          name_fields = columns.map { |c| escape(c, name_type(column_family)) }.join(', ')
 
-          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{KEY_FIELD} = #{key}"
+          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
 
           result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           return result if async
@@ -143,11 +136,9 @@ module CassandraObject
         def get_columns_as_hash(column_family, key, columns, opts)
           async = opts.try(:[], :async)
 
-          key = "textAsBlob('#{key}')"
-
           name_fields = columns.map { |c| "'#{c}'" }.join(', ')
 
-          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{KEY_FIELD} = #{key}"
+          query = "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{NAME_FIELD} IN(#{name_fields}) AND #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
 
           result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           return result if async
@@ -163,10 +154,9 @@ module CassandraObject
         def add(column_family, key, by, fields, opts=nil)
           async = opts.try(:[], :async)
           fields = [fields] unless fields.is_a?(Array)
-          key = "textAsBlob('#{key}')"
 
           fields.each do |field|
-            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{field}';"
+            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(field, name_type(column_family))};"
             async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
           end
         end
@@ -174,13 +164,12 @@ module CassandraObject
         def remove(column_family, key, *args)
           opts = args.pop if args.last.is_a?(Hash)
           async = opts.try(:[], :async)
-          key = "textAsBlob('#{key}')"
 
           query =
             if args.first.nil? || args.first.is_a?(Hash)
-              "DELETE FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key};"
+              "DELETE FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))};"
             else
-              "DELETE \"#{column_family}\" WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{args.first}';"
+              "DELETE \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))} AND #{NAME_FIELD} = #{escape(args.first, name_type(column_family))};"
             end
 
           async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
@@ -195,7 +184,7 @@ module CassandraObject
 
         def multi_get(column_family, keys, *args)
           opts = args.pop if args.last.is_a?(Hash)
-          keys = keys.map { |key| "textAsBlob('#{key}')" }.join(',')
+          keys = keys.map { |key| escape(key, key_type(column_family)) }.join(',')
           results = {}
           query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} IN(#{keys})"
           self.execute(query, execute_options(opts)).each do |row|
@@ -208,9 +197,7 @@ module CassandraObject
         def get_slice(column_family, key, column, start, finish, count, reversed, consistency, opts={})
           opts[:consistency] = consistency
 
-          key = "textAsBlob('#{key}')"
-
-          query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key}"
+          query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{escape(key, key_type(column_family))}"
           query << " AND #{NAME_FIELD} = #{escape(column, name_type(column_family))}" if column
           query << " AND #{NAME_FIELD} >= #{escape(start, name_type(column_family))}" unless start.empty?
           query << " AND #{NAME_FIELD} <= #{escape(finish, name_type(column_family))}" unless finish.empty?
@@ -291,6 +278,10 @@ CQL
           self.column_families[column_family.name.to_s] = column_family
         end
 
+        def key_type(column_family)
+          self.cluster.keyspace(keyspace).table(column_family).column(KEY_FIELD).type.kind
+        end
+
         def name_type(column_family)
           self.cluster.keyspace(keyspace).table(column_family).column(NAME_FIELD).type.kind
         end

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.18'
+  s.version = '4.0.20'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.18
+  version: 4.0.20
 platform: ruby
 authors:
 - Doug Youch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel