gotime-cassandra_object 4.7.1 → 4.7.2

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -2,7 +2,6 @@ require 'set'
 
 require 'cassandra_object/log_subscriber'
 require 'cassandra_object/types'
-require 'cassandra_object/errors'
 
 module CassandraObject
   class Base
@@ -16,11 +15,7 @@ module CassandraObject
       end
 
       def base_class
-        klass = self
-        while klass.superclass != Base
-          klass = klass.superclass
-        end
-        klass
+        class_of_active_record_descendant(self)
       end
 
       def config=(config)
@@ -30,6 +25,20 @@ module CassandraObject
       def config
         @@config
       end
+
+      private
+
+        # Returns the class descending directly from ActiveRecord::Base or an
+        # abstract class, if any, in the inheritance hierarchy.
+        def class_of_active_record_descendant(klass)
+          if klass == Base || klass.superclass == Base
+            klass
+          elsif klass.superclass.nil?
+            raise "#{name} doesn't belong in a hierarchy descending from CassandraObject"
+          else
+            class_of_active_record_descendant(klass.superclass)
+          end
+        end
     end
 
     extend ActiveModel::Naming

data/lib/cassandra_object/belongs_to.rb

@@ -44,6 +44,10 @@ module CassandraObject
     end
 
     private
+      def clear_belongs_to_cache
+        belongs_to_cache.clear if persisted?
+      end
+
       def belongs_to_cache
         @belongs_to_cache ||= {}
       end

data/lib/cassandra_object/belongs_to/association.rb

@@ -2,6 +2,7 @@ module CassandraObject
   module BelongsTo
     class Association
       attr_reader :owner, :reflection
+      attr_accessor :record_variable
       delegate :options, to: :reflection
 
       def initialize(owner, reflection)
@@ -16,6 +17,7 @@ module CassandraObject
           else
             self.record_variable = nil
           end
+          @loaded = true
         end
 
         record_variable
@@ -23,6 +25,7 @@ module CassandraObject
 
       def writer(record)
         self.record_variable = record
+        @loaded = true
         owner.send("#{reflection.foreign_key}=", record.try(:id))
         if reflection.polymorphic?
           owner.send("#{reflection.polymorphic_column}=", record.class.name)
@@ -37,16 +40,8 @@ module CassandraObject
         reflection.polymorphic? ? owner.send(reflection.polymorphic_column) : reflection.class_name
       end
 
-      def record_variable
-        owner.instance_variable_get(reflection.instance_variable_name)
-      end
-
-      def record_variable=(record)
-        owner.instance_variable_set(reflection.instance_variable_name, record)
-      end
-
       def loaded?
-        owner.instance_variable_defined?(reflection.instance_variable_name)
+        @loaded
       end
     end
   end

data/lib/cassandra_object/persistence.rb

@@ -29,39 +29,16 @@ module CassandraObject
         end
       end
 
-      def batch_start
-        @batch = []
-      end
-
-      def batch_statement
-        return nil unless @batch.any?
-
-        [
-          "BEGIN BATCH#{write_option_string(true)}",
-          @batch * "\n",
-          'APPLY BATCH'
-        ] * "\n"
-      end
-
-      def batch_end
-        if @batch.any?
-          execute_cql batch_statement
-        end
-      ensure
-        @batch = nil
-      end
-
       def batching?
         !@batch.nil?
       end
 
       def batch
-        batch_start
-
+        @batch = []
         yield
-
+        execute_cql(batch_statement) if @batch.any?
       ensure
-        batch_end
+        @batch = nil
       end
 
       def instantiate(id, attributes)
@@ -89,6 +66,16 @@ module CassandraObject
           column_names.map { |name| "'#{name}'" }
         end
 
+        def batch_statement
+          return nil unless @batch.any?
+
+          [
+            "BEGIN BATCH#{write_option_string(true)}",
+            @batch * "\n",
+            'APPLY BATCH'
+          ] * "\n"
+        end
+
         def execute_batchable_cql(cql_string, *bind_vars)
           if @batch
             @batch << CassandraCQL::Statement.sanitize(cql_string, bind_vars)
@@ -156,6 +143,7 @@ module CassandraObject
     end
 
     def reload
+      clear_belongs_to_cache
       @attributes.update(self.class.find(id).instance_variable_get('@attributes'))
       self
     end

data/lib/cassandra_object/schema.rb

@@ -51,7 +51,7 @@ module CassandraObject
 
           stmt
         end
-      
+
         def execute(cql)
           CassandraObject::Base.execute_cql cql
         end

data/lib/gotime-cassandra_object.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 require 'active_model'
 require 'cassandra-cql'
+require 'cassandra_object/errors'
 
 module CassandraObject
   extend ActiveSupport::Autoload

data/test/unit/base_test.rb

@@ -8,6 +8,7 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
   end
 
   test 'base_class' do
+    assert_equal CassandraObject::Base, CassandraObject::Base
     assert_equal Son, Son.base_class
     assert_equal Son, Grandson.base_class
   end

data/test/unit/belongs_to_test.rb

@@ -49,4 +49,14 @@ class CassandraObject::BelongsToTest < CassandraObject::TestCase
     record = TestObject.find(record.id)
     assert_equal issue, record.target
   end
+
+  test 'belongs_to clear cache after reload' do
+    issue = Issue.create
+    record = TestObject.create(issue: issue)
+    issue.destroy
+
+    assert_not_nil record.issue
+    assert_nil TestObject.find(record.id).issue
+    assert_nil record.reload.issue
+  end
 end

data/test/unit/config_test.rb

@@ -14,7 +14,7 @@ class CassandraObject::ConfigTest < CassandraObject::TestCase
     assert_equal 10, config.thrift_options[:timeout]
     assert_equal 'NetworkTopologyStrategy', config.keyspace_options[:placement_strategy]
   end
-  
+
   test 'defaults' do
     config = CassandraObject::Config.new(keyspace: 'widget_factory')
 

data/test/unit/persistence_test.rb

@@ -26,6 +26,8 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     first_issue = second_issue = nil
 
     Issue.batch do
+      assert Issue.batching?
+
       first_issue = Issue.create
       second_issue = Issue.create
 
@@ -33,26 +35,9 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
       assert_raise(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
     end
 
-    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(first_issue.id) }
-    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
-  end
-
-  test "batch state" do
-    first_issue = Issue.create
-
     assert !Issue.batching?
-    Issue.batch_start
-
-    second_issue = Issue.create
-    assert Issue.batching?
-
     assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(first_issue.id) }
-    assert_raise(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
-
-    Issue.batch_end
-
     assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
-
   end
 
   test 'persistance inquiries' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,72 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: thrift_client
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: bundler
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -184,17 +184,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24