gotime-cassandra_object 3.0.0 → 3.0.1

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -43,7 +43,7 @@ module CassandraObject
     include BelongsTo
     include Callbacks, ActiveModel::Observing
     include Timestamps
-    include Transactions
+    include Savepoints
 
     include Serialization
     include Migrations

data/lib/cassandra_object/belongs_to.rb

@@ -24,7 +24,7 @@ module CassandraObject
 
       def generated_belongs_to_methods
         @generated_belongs_to_methods ||= begin
-          mod = const_set(:GeneratedSearchesManyMethods, Module.new)
+          mod = const_set(:GeneratedBelongsToMethods, Module.new)
           include mod
           mod
         end

data/lib/cassandra_object/{transactions.rb → savepoints.rb}

@@ -1,37 +1,39 @@
 module CassandraObject
-  module Transactions
-    class State
-      attr_accessor :action, :record, :original_attributes
+  module Savepoints
+    class Rollback
+      attr_accessor :action, :record, :rollback_attributes
       def initialize(action, record)
         @action = action
         @record = record
-        @original_attributes = record.changed_attributes.deep_dup
+        if action == :update
+          @rollback_attributes = record.changed_attributes.deep_dup
+        elsif action == :create
+          @rollback_attributes = record.attributes.deep_dup
+        end
       end
 
-      def rollback!
+      def run!
         case action
-        when :create
-          record.class.remove(record.id)
-        when :update
-          record.class.write(record.id, original_attributes)
         when :destroy
-          record.class.write(record.id, original_attributes)
+          record.class.remove(record.id)
+        when :create, :update
+          record.class.write(record.id, rollback_attributes)
         end
       end
     end
 
     class Savepoint
-      attr_accessor :states
+      attr_accessor :rollbacks
       def initialize
-        self.states = []
+        self.rollbacks = []
       end
 
-      def add_state(action, record)
-        states << State.new(action, record)
+      def add_rollback(action, record)
+        states << Rollback.new(action, record)
       end
 
       def rollback!
-        states.reverse_each(&:rollback!)
+        rollbacks.reverse_each(&:run!)
       end
     end
 
@@ -43,7 +45,7 @@ module CassandraObject
     end
 
     module ClassMethods
-      def transaction
+      def savepoint
         self.savepoints.push Savepoint.new
         yield
         savepoints.pop
@@ -51,21 +53,21 @@ module CassandraObject
         savepoints.pop.rollback!
       end
 
-      def add_savepoint_state(action, record)
+      def add_savepoint_rollback(action, record)
         unless savepoints.empty?
-          savepoints.last.add_state(action, record)
+          savepoints.last.add_rollback(action, record)
         end
       end
     end
 
     def destroy
-      self.class.add_savepoint_state(:destroy, self)
+      self.class.add_savepoint_rollback(:create, self)
       super
     end
 
     private
       def create
-        self.class.add_savepoint_state(:create, self)
+        self.class.add_savepoint_rollback(:destroy, self)
         super
       end
 

data/lib/gotime-cassandra_object.rb

@@ -20,8 +20,8 @@ module CassandraObject
   autoload :Mocking
   autoload :Batches
   autoload :FinderMethods
+  autoload :Savepoints
   autoload :Timestamps
-  autoload :Transactions
   autoload :Type
   autoload :Schema
 

data/test/unit/{transactions_test.rb → savepoints_test.rb}

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class CassandraObject::TransactionsTest < CassandraObject::TestCase
+class CassandraObject::SavepointsTest < CassandraObject::TestCase
   test 'rollback create' do
-    Issue.transaction do
+    Issue.savepoint do
       issue = Issue.create description: 'foo'
       raise 'lol'
     end
@@ -10,11 +10,10 @@ class CassandraObject::TransactionsTest < CassandraObject::TestCase
     assert_nil Issue.first
   end
   
-  
   test 'rollback update' do
     issue = Issue.create description: 'foo'
   
-    Issue.transaction do
+    Issue.savepoint do
       issue.update_attributes description: 'bar'
       raise 'lol'
     end
@@ -22,4 +21,15 @@ class CassandraObject::TransactionsTest < CassandraObject::TestCase
     issue = Issue.find issue.id
     assert_equal 'foo', issue.description
   end
+
+  test 'rollback destroy' do
+    issue = Issue.create description: 'foo'
+  
+    Issue.savepoint do
+      issue.destroy
+      raise 'lol'
+    end
+    
+    assert_nothing_raised { Issue.find issue.id }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70172804588920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172804588920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mcmire-cassandra
-  requirement: &70172804588460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 0.12.3
   type: :runtime
   prerelease: false
-  version_requirements: *70172804588460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &70172804588000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70172804588000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70172804587620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +70,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172804587620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -99,6 +119,7 @@ files:
 - lib/cassandra_object/mocking.rb
 - lib/cassandra_object/persistence.rb
 - lib/cassandra_object/railtie.rb
+- lib/cassandra_object/savepoints.rb
 - lib/cassandra_object/schema.rb
 - lib/cassandra_object/schema/migration.rb
 - lib/cassandra_object/schema/migration_proxy.rb
@@ -108,7 +129,6 @@ files:
 - lib/cassandra_object/tasks/keyspace.rb
 - lib/cassandra_object/tasks/ks.rake
 - lib/cassandra_object/timestamps.rb
-- lib/cassandra_object/transactions.rb
 - lib/cassandra_object/type.rb
 - lib/cassandra_object/types.rb
 - lib/cassandra_object/types/array_type.rb
@@ -143,9 +163,9 @@ files:
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
 - test/unit/persistence_test.rb
+- test/unit/savepoints_test.rb
 - test/unit/tasks/column_family_test.rb
 - test/unit/timestamps_test.rb
-- test/unit/transactions_test.rb
 - test/unit/types/array_type_test.rb
 - test/unit/types/base_type_test.rb
 - test/unit/types/boolean_type_test.rb
@@ -176,9 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
 test_files: []
-has_rdoc: