gotime-cassandra_object 2.13.0 → 3.0.0

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -36,13 +36,14 @@ module CassandraObject
     include Persistence
     include Batches
     include AttributeMethods
+    include Validations
     include AttributeMethods::Dirty
     include AttributeMethods::PrimaryKey
     include AttributeMethods::Typecasting
     include BelongsTo
-    include Validations
     include Callbacks, ActiveModel::Observing
     include Timestamps
+    include Transactions
 
     include Serialization
     include Migrations

data/lib/cassandra_object/callbacks.rb

@@ -14,7 +14,7 @@ module CassandraObject
     end
 
     private
-      def create_or_update #:nodoc:
+      def write #:nodoc:
         _run_save_callbacks { super }
       end
 

data/lib/cassandra_object/persistence.rb

@@ -70,15 +70,7 @@ module CassandraObject
     end
 
     def save(*)
-      begin
-        create_or_update
-      rescue CassandraObject::RecordInvalid
-        false
-      end
-    end
-
-    def save!
-      create_or_update || raise(RecordNotSaved)
+      new_record? ? create : update
     end
 
     def destroy
@@ -90,7 +82,7 @@ module CassandraObject
     def update_attribute(name, value)
       name = name.to_s
       send("#{name}=", value)
-      save(:validate => false)
+      save(validate: false)
     end
 
     def update_attributes(attributes)
@@ -108,18 +100,12 @@ module CassandraObject
     end
 
     private
-      def create_or_update
-        result = new_record? ? create : update
-        result != false
+      def update
+        write
       end
 
       def create
-        write
         @new_record = false
-        id
-      end
-    
-      def update
         write
       end
 

data/lib/cassandra_object/transactions.rb

@@ -0,0 +1,77 @@
+module CassandraObject
+  module Transactions
+    class State
+      attr_accessor :action, :record, :original_attributes
+      def initialize(action, record)
+        @action = action
+        @record = record
+        @original_attributes = record.changed_attributes.deep_dup
+      end
+
+      def rollback!
+        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)
+        end
+      end
+    end
+
+    class Savepoint
+      attr_accessor :states
+      def initialize
+        self.states = []
+      end
+
+      def add_state(action, record)
+        states << State.new(action, record)
+      end
+
+      def rollback!
+        states.reverse_each(&:rollback!)
+      end
+    end
+
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :savepoints
+      self.savepoints = []
+    end
+
+    module ClassMethods
+      def transaction
+        self.savepoints.push Savepoint.new
+        yield
+        savepoints.pop
+      rescue => e
+        savepoints.pop.rollback!
+      end
+
+      def add_savepoint_state(action, record)
+        unless savepoints.empty?
+          savepoints.last.add_state(action, record)
+        end
+      end
+    end
+
+    def destroy
+      self.class.add_savepoint_state(:destroy, self)
+      super
+    end
+
+    private
+      def create
+        self.class.add_savepoint_state(:create, self)
+        super
+      end
+
+      def update
+        self.class.add_savepoint_state(:update, self)
+        super        
+      end
+  end
+end

data/lib/cassandra_object/validations.rb

@@ -24,7 +24,12 @@ module CassandraObject
     end
 
     def save(options={})
-      perform_validations(options) ?  super : false
+      if perform_validations(options)
+        super
+        true
+      else
+        false
+      end
     end
     
     def save!

data/lib/gotime-cassandra_object.rb

@@ -21,6 +21,7 @@ module CassandraObject
   autoload :Batches
   autoload :FinderMethods
   autoload :Timestamps
+  autoload :Transactions
   autoload :Type
   autoload :Schema
 

data/test/support/issue.rb

@@ -1,3 +1,4 @@
 class Issue < CassandraObject::Base
   string :description
+  before_save { self.description ||= 'funny' }
 end

data/test/test_helper.rb

@@ -14,6 +14,8 @@ module CassandraObject
     def temp_object(&block)
       Class.new(CassandraObject::Base) do
         self.column_family = 'Issues'
+        string :force_save
+        before_save { self.force_save = 'junk' }
 
         def self.name
           'Issue'

data/test/unit/base_test.rb

@@ -29,8 +29,8 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
   end
 
   test 'equality' do
-    first_issue = Issue.create
-    second_issue = Issue.create
+    first_issue = Issue.create description: 'poop'
+    second_issue = Issue.create description: 'poop'
 
     assert_equal first_issue, first_issue
     assert_equal first_issue, Issue.find(first_issue.id)

data/test/unit/callbacks_test.rb

@@ -23,7 +23,7 @@ class CassandraObject::CallbacksTest < CassandraObject::TestCase
   test 'create' do
     issue = TestIssue.create
 
-    assert_equal ['before_validation', 'after_validation', 'after_create', 'after_save'], issue.callback_history
+    assert_equal ['before_validation', 'after_validation', 'after_save', 'after_create'], issue.callback_history
   end
 
   test 'update' do
@@ -32,7 +32,7 @@ class CassandraObject::CallbacksTest < CassandraObject::TestCase
 
     issue.update_attribute :description, 'foo'
 
-    assert_equal ['after_update', 'after_save'], issue.callback_history
+    assert_equal ['after_save', 'after_update'], issue.callback_history
   end
 
   test 'destroy' do

data/test/unit/persistence_test.rb

@@ -99,7 +99,6 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     fresh_issue = Issue.find(persisted_issue.id)
     fresh_issue.update_attribute(:description, 'say what')
 
-    assert_nil persisted_issue.description
     persisted_issue.reload
     assert_equal 'say what', persisted_issue.description
   end

data/test/unit/transactions_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class CassandraObject::TransactionsTest < CassandraObject::TestCase
+  test 'rollback create' do
+    Issue.transaction do
+      issue = Issue.create description: 'foo'
+      raise 'lol'
+    end
+    
+    assert_nil Issue.first
+  end
+  
+  
+  test 'rollback update' do
+    issue = Issue.create description: 'foo'
+  
+    Issue.transaction do
+      issue.update_attributes description: 'bar'
+      raise 'lol'
+    end
+    
+    issue = Issue.find issue.id
+    assert_equal 'foo', issue.description
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70153896808960 !ruby/object:Gem::Requirement
+  requirement: &70172804588920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70153896808960
+  version_requirements: *70172804588920
 - !ruby/object:Gem::Dependency
   name: mcmire-cassandra
-  requirement: &70153896808500 !ruby/object:Gem::Requirement
+  requirement: &70172804588460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.3
   type: :runtime
   prerelease: false
-  version_requirements: *70153896808500
+  version_requirements: *70172804588460
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &70153896808040 !ruby/object:Gem::Requirement
+  requirement: &70172804588000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70153896808040
+  version_requirements: *70172804588000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70153896807660 !ruby/object:Gem::Requirement
+  requirement: &70172804587620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153896807660
+  version_requirements: *70172804587620
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -108,6 +108,7 @@ 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
@@ -144,6 +145,7 @@ files:
 - test/unit/persistence_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