active_nomad 0.2.3 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.3.0 2010-12-28
+
+ * Handle Rollback exceptions in Base class.
+
 == 0.2.3 2010-10-12
 
  * #inspect no longer requires a database connection.

data/lib/active_nomad.rb

@@ -164,10 +164,17 @@ module ActiveNomad
       #
       # Override to provide custom transaction semantics.
       #
-      # The default #transaction simply yields to the given block.
+      # The default #transaction simply yields to the given
+      # block.
+      #
+      # ActiveRecord::Rollback exceptions are also swallowed, as
+      # ActiveRecord raises these internally if the save returns
+      # false. If you need to provide custom rollback behavior, this
+      # is the place to implement it.
       #
       def transaction
         yield
+      rescue ActiveRecord::Rollback
       end
 
       def inspect

data/lib/active_nomad/version.rb

@@ -1,5 +1,5 @@
 module ActiveNomad
-  VERSION = [0, 2, 3]
+  VERSION = [0, 3, 0]
 
   class << VERSION
     include Comparable

data/spec/unit/active_nomad_spec.rb

@@ -437,26 +437,49 @@ describe ActiveNomad::Base do
   end
 
   describe ".transaction" do
-    before do
-      @class = Class.new(ActiveNomad::Base) do
-        cattr_accessor :transaction_called
-        def self.transaction
-          self.transaction_called = true
-        end
+    describe "when #transaction is not overridden" do
+      before do
+        @class = Class.new(ActiveNomad::Base)
+      end
+
+      it "should run the given block by default" do
+        instance = @class.new
+        block_called = false
+        instance.transaction { block_called = true }
+        block_called.should be_true
       end
-    end
 
-    it "should be overridable to provide custom transaction semantics" do
-      instance = @class.new
-      instance.transaction{}
-      instance.transaction_called.should be_true
+      it "should swallow rollbacks by default" do
+        instance = @class.new
+        instance.to_save { raise ActiveRecord::Rollback }
+        lambda do
+          instance.transaction { instance.save }
+        end.should_not raise_error(ActiveRecord::Rollback)
+      end
     end
 
-    it "should be called by #save" do
-      instance = @class.new
-      instance.transaction_called.should be_false
-      instance.save
-      instance.transaction_called.should be_true
+    describe "when #transaction is overridden" do
+      before do
+        @class = Class.new(ActiveNomad::Base) do
+          cattr_accessor :transaction_called
+          def self.transaction
+            self.transaction_called = true
+          end
+        end
+      end
+
+      it "should exhibit the custom semantics" do
+        instance = @class.new
+        instance.transaction{}
+        instance.transaction_called.should be_true
+      end
+
+      it "should be called by #save" do
+        instance = @class.new
+        instance.transaction_called.should be_false
+        instance.save
+        instance.transaction_called.should be_true
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_nomad
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - George Ogata
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -04:00
+date: 2010-12-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency