sessionm-cassandra_object 2.2.44 → 2.2.45

data/lib/cassandra_object/attributes.rb

@@ -28,6 +28,8 @@ module CassandraObject
       def attribute(name, options)
         if model_attributes.empty?
           self.model_attributes = {}.with_indifferent_access
+        elsif (model_attributes.size == 2) && model_attributes.include?(:created_at) && model_attributes.include?(:updated_at)
+          self.model_attributes = self.model_attributes.dup
         end
 
         if type_mapping = CassandraObject::Type.get_mapping(options[:type])

data/lib/cassandra_object/base.rb

@@ -30,9 +30,7 @@ module CassandraObject
     include ActiveModel::Conversion
     extend ActiveSupport::DescendantsTracker
     
-    #TODO: make the connection type configurable
-    include AsyncConnection
-    #include Connection
+    include Fiber.respond_to?(:current) ? AsyncConnection : Connection
     include Consistency
     include RowTTL
     include Identity

data/lib/cassandra_object/dirty.rb

@@ -8,6 +8,7 @@ module CassandraObject
       if status = super
         @previously_changed = changes
         @changed_attributes.clear
+        @original_attribute_values = nil
       end
       status
     end
@@ -17,12 +18,18 @@ module CassandraObject
       super.tap do
         @previously_changed = changes
         @changed_attributes.clear
+        @original_attribute_values = nil
       end
     end
 
     def write_attribute(name, value)
       name = name.to_s
-      unless attribute_changed?(name)
+
+      # handle orig -> new -> orig
+      if attribute_changed?(name)
+        orig = changed_attributes[name]
+        changed_attributes.delete(name) if orig == value
+      else
         old = read_attribute(name)
         changed_attributes[name] = old if old != value
       end

data/sessionm-cassandra_object.gemspec

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

data/test/attributes_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class CassandraObject::AttributesTest < CassandraObject::TestCase
+
+  class A < CassandraObject::Base
+    attribute :a, :type => :integer
+  end
+
+  class B < CassandraObject::Base
+    attribute :b, :type => :integer
+  end
+
+  test 'model_attributes' do
+    assert_equal %W[created_at updated_at a], A.model_attributes.keys
+    assert_equal %W[created_at updated_at b], B.model_attributes.keys
+  end
+
+end

metadata

@@ -1,74 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 44
-  version: 2.2.44
+version: !ruby/object:Gem::Version
+  version: 2.2.45
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Koziarski
 - gotime
 - sessionm
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-02 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &70235547209040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cassandra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
-        - 3
+  version_requirements: *70235547209040
+- !ruby/object:Gem::Dependency
+  name: cassandra
+  requirement: &70235547208560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.11.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70235547208560
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70235547208100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70235547208100
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -134,6 +118,7 @@ files:
 - lib/cassandra_object/validations.rb
 - sessionm-cassandra_object.gemspec
 - test/active_model_test.rb
+- test/attributes_test.rb
 - test/base_test.rb
 - test/batches_test.rb
 - test/connection_test.rb
@@ -155,42 +140,33 @@ files:
 - test/types/time_type_test.rb
 - test/types/utf8_string_type_test.rb
 - test/validations_test.rb
-has_rdoc: true
 homepage: http://github.com/sessionm/cassandra_object
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
+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 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
-test_files: 
+test_files:
 - test/active_model_test.rb
+- test/attributes_test.rb
 - test/base_test.rb
 - test/batches_test.rb
 - test/connection_test.rb