datastax_rails 2.0.9 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b54cd8a075c5502c6475725ddafe54fb42e434d
-  data.tar.gz: fa5474a8918b6d8fe28fc256039712a196fa4ae7
+  metadata.gz: 98234dcb77c32791b630e27d4a9e4deb0be11068
+  data.tar.gz: 0faf451aa7dfb597651ef4195d0849731ac43b7e
 SHA512:
-  metadata.gz: 0236d32acbb3d99c2fa4363b7f6f0bdbbc36fe3ac76d264f086eef30348d91af0ae91f3417492c7c714a95e91f2588aa67173ec33c86b3a29380d3f432875022
-  data.tar.gz: 9540c51c831041f33e077adb933b0a0769cb49ef89f584f89191039df80050748eb5bf9a9272b7c41775879a1eb8b510b7b344e9e1f2177ac7436b14b7ddf59f
+  metadata.gz: 6b0ca26bcaedfe88407c54badf618eb8968aa2cdbda4aac273c7d0422be89d79ce2b806af36d0bdebb41e8ad40a67a86c806065bec014ceb3d39ecf7a9ade7bf
+  data.tar.gz: 9a502e20649c2e627bf4256e4e175860ef3004cd3fe6d418a0506c343ca2c8cb6eee8702a19aeef75d1cd10a7ed6b616f48e138bc933c24bbb002890cce95d78

data/lib/cql-rb_extensions.rb

@@ -1,3 +1,8 @@
+# By default, cql-rb grabs a random connection for each request. This is great for
+# keeping load distributed across the cluster. Unfortunately, it plays havoc with
+# the Solr integration where we often need to ensure that we're talking to the
+# Solr and Cassandra on the same node. For that reason, we cause the current
+# connection in use to stay fixed for 500 requests before rolling to the another.
 require 'cql'
 require 'cql/client/connection_manager'
 
@@ -18,7 +23,7 @@ Cql::Client::ConnectionManager.class_eval do
   end
 end
 
-require 'cql/client/synchronous_client'
+require 'cql/client/client'
 
 Cql::Client::SynchronousClient.class_eval do
   def current_connection

data/lib/datastax_rails/associations/collection_association.rb

@@ -18,13 +18,37 @@ module DatastaxRails
     class CollectionAssociation < Association #:nodoc:
       attr_reader :proxy
       
-      delegate :count, :size, :empty?, :any?, :many?, :first, :last, :to => :scoped
+      delegate :first, :last, :to => :scoped
       
       def initialize(owner, reflection)
         super
         @proxy = CollectionProxy.new(self)
       end
       
+      def size
+        if !find_target? || loaded?
+          target.size
+        elsif !loaded? && target.is_a?(Array)
+          unsaved_records = target.select { |r| r.new_record? }
+          unsaved_records.size + scoped.count
+        else
+          scoped.count
+        end
+      end
+      alias_method :count, :size
+      
+      def empty?
+        size == 0
+      end
+      
+      def any?
+        size > 0
+      end
+      
+      def many?
+        size > 1
+      end
+      
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
       def reader(force_reload = false)
         if force_reload || stale_target?

data/lib/datastax_rails/associations/has_many_association.rb

@@ -7,6 +7,7 @@ module DatastaxRails
     class HasManyAssociation < CollectionAssociation #:nodoc:
       def insert_record(record, validate = true, raise = false)
         set_owner_attributes(record)
+        set_inverse_instance(record)
 
         if raise
           record.save!(:validate => validate)

data/lib/datastax_rails/base.rb

@@ -491,10 +491,10 @@ module DatastaxRails #:nodoc:
     end
 
     def ==(comparison_object)
-      comparison_object.equal?(self) ||
-        (comparison_object.instance_of?(self.class) &&
-          comparison_object.id == self.id &&
-          !comparison_object.new_record?)
+      super ||
+        comparison_object.instance_of?(self.class) &&
+        id.present? &&
+        comparison_object.id.eql?(id)
     end
 
     def eql?(comparison_object)

data/lib/datastax_rails/column.rb

@@ -359,6 +359,7 @@ module DatastaxRails
     end
     
     private
+              
       def compute_cql_type(field_type, options)
         options[:cql_type] || case field_type.to_sym
         when :integer                            then 'int'

data/lib/datastax_rails/connection/statement_cache.rb

@@ -0,0 +1,17 @@
+module DatastaxRails
+  module StatementCache
+    extend ActiveSupport::Concern
+    
+    included do
+      class_attribute :statement_cache
+      self.statement_cache = {}
+    end
+    
+    module ClassMethods
+      def establish_connection(spec)
+        self.statement_cache = {}
+        super
+      end
+    end
+  end
+end

data/lib/datastax_rails/connection.rb

@@ -10,6 +10,7 @@ module DatastaxRails
     extend ActiveSupport::Concern
     
     included do
+      include DatastaxRails::StatementCache
       class_attribute :connection
       class_attribute :solr
     end

data/lib/datastax_rails/cql/base.rb

@@ -29,11 +29,12 @@ module DatastaxRails
         cql = self.to_cql
         puts cql if ENV['DEBUG_CQL'] == 'true'
         pp @values if ENV['DEBUG_CQL'] == 'true'
-        if(@values.present?)
-          stmt = DatastaxRails::Base.connection.prepare(cql)
+        digest = Digest::MD5.digest cql
+        stmt = DatastaxRails::Base.statement_cache[digest] ||= DatastaxRails::Base.connection.prepare(cql)
+        if @consistency
           stmt.execute(*@values, :consistency => @consistency)
         else
-          DatastaxRails::Base.connection.execute(cql, :consistency => @consistency)
+          stmt.execute(*@values)
         end
       end
     end

data/lib/datastax_rails/version.rb

@@ -1,3 +1,3 @@
 module DatastaxRails
-  VERSION = "2.0.9"
+  VERSION = "2.0.12"
 end

data/lib/datastax_rails.rb

@@ -16,6 +16,11 @@ module DatastaxRails
   autoload :Column
   autoload :Collection
   autoload :Connection
+  
+  autoload_under 'connection' do
+    autoload :StatementCache
+  end
+  
   autoload :Cql
   autoload :DynamicModel
   autoload :GroupedCollection

data/spec/datastax_rails/associations/collection_association_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe DatastaxRails::Base do
+  context 'associations' do
+    context 'collection' do
+      subject {Person.new(name: 'Matthew')}
+      
+      describe "#size" do
+        it "reports the total of persisted and non-persisted" do
+          subject.save
+          car1 = Car.create(:person_id => subject.id)
+          car2 = Car.new
+          subject.cars << car2
+          Car.commit_solr
+          expect(subject.cars.size).to be(2)
+        end
+      end
+      
+      describe "#empty?" do
+        it "returns false if a new record exists" do
+          subject.cars << Car.new
+          expect(subject.cars).not_to be_empty
+        end
+      end
+      
+      describe "#any?" do
+        it "returns true if a new record exists" do
+          subject.cars << Car.new
+          expect(subject.cars).to be_any
+        end
+      end
+      
+      describe "#many?" do
+        it "returns false if more than one new record exists" do
+          subject.cars << Car.new
+          subject.cars << Car.new
+          expect(subject.cars).to be_many
+        end
+      end
+    end
+  end
+end

data/spec/datastax_rails/connection/statement_cache_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe DatastaxRails::Base do
+  it "clears the statement cache when a new connection is established" do
+    DatastaxRails::Base.statement_cache[:a] = 12345
+    DatastaxRails::Base.establish_connection(DatastaxRails::Base.config)
+    expect(DatastaxRails::Base.statement_cache).to be_empty
+  end
+end

data/spec/datastax_rails/cql/base_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe DatastaxRails::Cql::Base do
+  it "caches prepared statements" do
+    DatastaxRails::Base.connection.should_receive(:prepare).once.and_return(double("statement", :execute => true))
+    cql = DatastaxRails::Cql::ColumnFamily.new(Person)
+    cql.select(['*']).conditions(:name => 'John').execute
+    cql.select(['*']).conditions(:name => 'John').execute
+  end
+end

data/spec/datastax_rails/cql/select_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 
 describe DatastaxRails::Cql::Select do
-  before(:each) do
-    @model_class = double("Model Class", :column_family => 'users', :default_consistency => DatastaxRails::Cql::Consistency::QUORUM)
-  end
+  let(:model_class) { double("Model Class", :column_family => 'users', :default_consistency => DatastaxRails::Cql::Consistency::QUORUM) }
   
   it "should generate valid CQL" do
-    cql = DatastaxRails::Cql::Select.new(@model_class, ["*"])
+    cql = DatastaxRails::Cql::Select.new(model_class, ["*"])
     cql.using(DatastaxRails::Cql::Consistency::QUORUM).conditions(:key => '12345').limit(1)
     cql.to_cql.should == "SELECT * FROM users WHERE \"key\" = ? LIMIT 1 "
   end

data/spec/datastax_rails/relation/finder_methods_spec.rb

@@ -13,6 +13,7 @@ describe DatastaxRails::Relation do
     context "with a single id" do
       context "as a scalar" do
         it "finds the object and returns it as an object" do
+          
           expect(Hobby.find(h.id)).to eq(h)
         end
         

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ RSpec.configure do |config|
   
   config.before(:each) do
     DatastaxRails::Base.recorded_classes = {}
+    DatastaxRails::Base.statement_cache.clear
   end
   
   config.after(:each) do

data/spec/support/default_consistency_shared_examples.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
 
 shared_examples_for 'default_consistency' do
+  let(:prepared_statement) {double("PreparedStatement")}
+  before { DatastaxRails::Base.connection.stub(:prepare => prepared_statement)}
+  
   it "should default to QUORUM" do
-    cql = DatastaxRails::Cql::Select.new(@model_class, ["*"])
-    DatastaxRails::Base.connection.should_receive(:execute).with(anything, :consistency => :quorum)
+    cql = DatastaxRails::Cql::Select.new(model_class, ["*"])
+    DatastaxRails::Base.connection.should_receive(:execute).with(prepared_statement, :consistency => :quorum)
     cql.execute
   end
   
   it "should default to level specified by model class" do
-    @model_class.stub(:default_consistency => 'LOCAL_QUORUM')
-    cql = DatastaxRails::Cql::Select.new(@model_class, ["*"])
-    DatastaxRails::Base.connection.should_receive(:execute).with(anything, :consistency => :local_quorum)
+    model_class.stub(:default_consistency => 'LOCAL_QUORUM')
+    cql = DatastaxRails::Cql::Select.new(model_class, ["*"])
+    DatastaxRails::Base.connection.should_receive(:execute).with(prepared_statement, :consistency => :local_quorum)
     cql.execute
   end
 end

data/spec/support/models.rb

@@ -68,6 +68,7 @@ class Boat < DatastaxRails::Base
   uuid :id
   string :name
   integer :registration
+  boolean :financed
   timestamps
   
   validates :name, :uniqueness => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.12
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,7 @@ files:
 - lib/datastax_rails/collection.rb
 - lib/datastax_rails/column.rb
 - lib/datastax_rails/connection.rb
+- lib/datastax_rails/connection/statement_cache.rb
 - lib/datastax_rails/cql.rb
 - lib/datastax_rails/cql/alter_column_family.rb
 - lib/datastax_rails/cql/base.rb
@@ -202,6 +203,7 @@ files:
 - lib/datastax_rails/errors.rb
 - lib/datastax_rails/grouped_collection.rb
 - lib/datastax_rails/inheritance.rb
+- lib/datastax_rails/log_subscriber.rb
 - lib/datastax_rails/payload_model.rb
 - lib/datastax_rails/persistence.rb
 - lib/datastax_rails/railtie.rb
@@ -239,12 +241,15 @@ files:
 - lib/datastax_rails/wide_storage_model.rb
 - lib/schema_migration.rb
 - spec/datastax_rails/associations/belongs_to_association_spec.rb
+- spec/datastax_rails/associations/collection_association_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/associations_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/base_spec.rb
 - spec/datastax_rails/callbacks_spec.rb
 - spec/datastax_rails/column_spec.rb
+- spec/datastax_rails/connection/statement_cache_spec.rb
+- spec/datastax_rails/cql/base_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/dynamic_model_spec.rb
@@ -342,6 +347,7 @@ test_files:
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/scoping/default_spec.rb
 - spec/datastax_rails/associations_spec.rb
+- spec/datastax_rails/connection/statement_cache_spec.rb
 - spec/datastax_rails/types/dynamic_list_spec.rb
 - spec/datastax_rails/types/dynamic_set_spec.rb
 - spec/datastax_rails/types/dynamic_map_spec.rb
@@ -350,6 +356,7 @@ test_files:
 - spec/datastax_rails/schema/solr_spec.rb
 - spec/datastax_rails/validations/uniqueness_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
+- spec/datastax_rails/cql/base_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
 - spec/datastax_rails/persistence_spec.rb
 - spec/datastax_rails/relation/spawn_methods_spec.rb
@@ -362,6 +369,7 @@ test_files:
 - spec/datastax_rails/base_spec.rb
 - spec/datastax_rails/inheritance_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
+- spec/datastax_rails/associations/collection_association_spec.rb
 - spec/datastax_rails/associations/belongs_to_association_spec.rb
 - spec/datastax_rails/callbacks_spec.rb
 - spec/feature/dynamic_fields_spec.rb