gotime-cassandra_object 4.0.0 → 4.0.1

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.0.0'
+  s.version = '4.0.1'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/base.rb

@@ -46,7 +46,6 @@ module CassandraObject
     include Savepoints
 
     include Serialization
-    include Mocking
 
     def initialize(attributes=nil)
       @new_record = true

data/lib/cassandra_object/connection.rb

@@ -1,3 +1,20 @@
+module CassandraCQL
+  class Statement
+    def self.sanitize(statement, bind_vars=[])
+      return statement if bind_vars.empty?
+
+      bind_vars = bind_vars.dup
+      expected_bind_vars = statement.count("?")
+
+      raise Error::InvalidBindVariable, "Wrong number of bound variables (statement expected #{expected_bind_vars}, was #{bind_vars.size})" if expected_bind_vars != bind_vars.size
+
+      statement.gsub(/\?/) do
+        quote(cast_to_cql(bind_vars.shift))
+      end
+    end
+  end
+end
+
 module CassandraObject
   module Connection
     extend ActiveSupport::Concern

data/lib/gotime-cassandra_object.rb

@@ -16,8 +16,6 @@ module CassandraObject
   autoload :Identity
   autoload :Inspect
   autoload :Serialization
-  autoload :Collection
-  autoload :Mocking
   autoload :Batches
   autoload :FinderMethods
   autoload :Savepoints

data/test/unit/connection_test.rb

@@ -4,6 +4,10 @@ class CassandraObject::ConnectionTest < CassandraObject::TestCase
   class TestObject < CassandraObject::Base
   end
 
+  test "sanitize supports question marks" do
+    assert_equal 'hello ?', CassandraCQL::Statement.sanitize('hello ?')
+  end
+
   test 'establish_connection' do
     # TestObject.establish_connection(
     #   keyspace: 'place_directory_development',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -120,7 +120,6 @@ files:
 - lib/cassandra_object/belongs_to/builder.rb
 - lib/cassandra_object/belongs_to/reflection.rb
 - lib/cassandra_object/callbacks.rb
-- lib/cassandra_object/collection.rb
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/consistency.rb
 - lib/cassandra_object/errors.rb
@@ -128,7 +127,6 @@ files:
 - lib/cassandra_object/identity.rb
 - lib/cassandra_object/inspect.rb
 - lib/cassandra_object/log_subscriber.rb
-- lib/cassandra_object/mocking.rb
 - lib/cassandra_object/persistence.rb
 - lib/cassandra_object/railtie.rb
 - lib/cassandra_object/savepoints.rb

data/lib/cassandra_object/collection.rb

@@ -1,8 +0,0 @@
-module CassandraObject
-  class Collection < Array
-    attr_accessor :last_column_name
-    def inspect
-      "<CassandraObject::Collection##{object_id} contents: #{super} last_column_name: #{last_column_name.inspect}>"
-    end
-  end
-end

data/lib/cassandra_object/mocking.rb

@@ -1,15 +0,0 @@
-require 'cassandra/mock'
-module CassandraObject
-  module Mocking
-    extend ActiveSupport::Concern
-    module ClassMethods
-      def use_mock!(really=true)
-        if really
-          self.connection_class = Cassandra::Mock
-        else
-          self.connection_class = Cassandra
-        end
-      end
-    end
-  end
-end