state_machines-activerecord 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d56ed7729d05b9e68f5f70804a28c087208062
-  data.tar.gz: b404daeed3fae75b6f75ea16be408995203d5cc1
+  metadata.gz: 05961f0c1b5b3ab64919dcde984de7b32760a238
+  data.tar.gz: d1ec7191b20c2a0bb489e07204a01ebdf6df5f8f
 SHA512:
-  metadata.gz: cae4bff0c7f3b4c647ede3e3a1fb6f81a0f4864ec03ac0032deefb9f4ac58eec8ed138603282505981c2352350a973dd6071ff9eaaa6346f6d63fa4def8494ca
-  data.tar.gz: 6110e0ce1e2f7f8b29b46a66e0c72b33083c054e3379154c86b9b9e30b29b355201859a2260ade7620616b81e8441855260f213945bdaa738a6877ad2fa24a2a
+  metadata.gz: 38056137768ae3c54e2ac920f88a87f0acf135f3aeaa2b00fb4d5288532a214574a1737dc93e2c598cccb24165491f27917224ef7eaa550d4484dd82b9eceb14
+  data.tar.gz: 9362187783fa4720309dc6a27043376a6792d6058aafb7b762cf058d01b73eb087a6009f53d12f2a87db573a72015d18c2c6f66798cce14fd44f546d08407f14

data/README.md

@@ -52,6 +52,15 @@ class Vehicle < ActiveRecord::Base
 end
 ```
 
+### Scopes
+Usage of the generated scopes (assuming default column `state`):
+
+```ruby
+Vehicle.with_state(:parked)                         # also plural #with_states
+Vehicle.without_states(:first_gear, :second_gear)   # also singular #without_state
+```
+
+
 Dependencies
 
 Active Record 4.1+

data/lib/state_machines/integrations/active_record.rb

@@ -418,7 +418,7 @@ module StateMachines
       include ActiveModel
 
       # The default options to use for state machines using this integration
-      @defaults = {:action => :save}
+      @defaults = {:action => :save, use_transactions: true}
       class << self
         # Classes that inherit from ActiveRecord::Base will automatically use
         # the ActiveRecord integration.
@@ -493,7 +493,8 @@ module StateMachines
               end
               
               def save!(*)
-                self.class.state_machine(#{name.inspect}).send(:around_save, self) { super } || raise(ActiveRecord::RecordInvalid.new(self))
+                result = self.class.state_machine(#{name.inspect}).send(:around_save, self) { super }
+                result || raise(ActiveRecord::RecordInvalid.new(self))
               end
               
               def changed_for_autosave?
@@ -507,9 +508,7 @@ module StateMachines
 
       # Runs state events around the machine's :save action
       def around_save(object)
-        transaction(object) do
-          object.class.state_machines.transitions(object, action).perform { yield }
-        end
+        object.class.state_machines.transitions(object, action).perform { yield }
       end
 
       # Creates a scope for finding records *with* a particular state or

data/lib/state_machines/integrations/active_record/version.rb

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

data/state_machines-activerecord.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |spec|
   spec.email         = %w(terminale@gmail.com aaron@pluginaweek.org)
   spec.summary       = %q(State machines Active Record Integration)
   spec.description   = %q(Adds support for creating state machines for attributes on ActiveRecord)
-  spec.homepage      = 'https://github.com/seuros/state_machines-activemodel'
+  spec.homepage      = 'https://github.com/seuros/state_machines-activerecord'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(/^test\//)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'state_machines-activemodel', '~> 0.1.0'
+  spec.add_dependency 'state_machines-activemodel', '>= 0.3.0'
   spec.add_dependency 'activerecord' , '~> 4.1'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'sqlite3', '~> 1.3'

data/test/integration_test.rb

@@ -20,7 +20,7 @@ class IntegrationTest < BaseTestCase
   end
 
   def test_should_have_defaults
-    assert_equal({:action => :save}, StateMachines::Integrations::ActiveRecord.defaults)
+    assert_equal({action: :save, use_transactions: true}, StateMachines::Integrations::ActiveRecord.defaults)
   end
 
   def test_should_have_a_locale_path

data/test/machine_with_event_attributes_on_save_test.rb

@@ -176,9 +176,69 @@ class MachineWithEventAttributesOnSaveTest < BaseTestCase
     assert_equal 'first_gear', @record.state
   end
 
-  def test_should_return_nil_on_manual_rollback
-    @machine.before_transition { raise ActiveRecord::Rollback }
+  def test_should_yield_one_model!
+    assert_equal true, @record.save!
+    assert_equal 1, @model.count
+  end
+
+  # explicit tests of #save and #save! to ensure expected behavior
+  def test_should_yield_two_models_with_before
+    @machine.before_transition { @model.create! }
+    assert_equal true, @record.save
+    assert_equal 2, @model.count
+  end
+
+  def test_should_yield_two_models_with_before!
+    @machine.before_transition { @model.create! }
+    assert_equal true, @record.save!
+    assert_equal 2, @model.count
+  end
+
+  def test_should_raise_on_around_transition_rollback!
+    @machine.before_transition { @model.create! }
+    @machine.around_transition { @model.create!; raise ActiveRecord::Rollback }
+
+    raised = false
+    begin
+      @record.save!
+    rescue Exception
+      raised = true
+    end
 
+    assert_equal true, raised
+    assert_equal 0, @model.count
+  end
+
+  def test_should_return_nil_on_around_transition_rollback
+    @machine.before_transition { @model.create! }
+    @machine.around_transition { @model.create!; raise ActiveRecord::Rollback }
+    assert_equal nil, @record.save
+    assert_equal 0, @model.count
+  end
+
+  def test_should_return_nil_on_before_transition_rollback
+    @machine.before_transition { raise ActiveRecord::Rollback }
     assert_equal nil, @record.save
+    assert_equal 0, @model.count
   end
+
+  #
+  # @rosskevin - This fails and I'm not sure why, it was existing behavior.
+  #   see: https://github.com/state-machines/state_machines-activerecord/pull/26#issuecomment-112911886
+  #
+  # def test_should_yield_three_models_with_before_and_around_save
+  #   @machine.before_transition { @model.create!; puts "before ran, now #{@model.count}" }
+  #   @machine.around_transition { @model.create!; puts "around ran, now #{@model.count}" }
+  #
+  #   assert_equal true, @record.save
+  #   assert_equal 3, @model.count
+  # end
+  #
+  # def test_should_yield_three_models_with_before_and_around_save!
+  #   @machine.before_transition { @model.create!; puts "before ran, now #{@model.count}" }
+  #   @machine.around_transition { @model.create!; puts "around ran, now #{@model.count}" }
+  #
+  #   assert_equal true, @record.save!
+  #   assert_equal 3, @model.count
+  # end
 end

data/test/machine_with_event_attributes_on_validation_test.rb

@@ -113,14 +113,31 @@ class MachineWithEventAttributesOnValidationTest < BaseTestCase
     refute ran_callback
   end
 
-  def test_should_not_run_before_transitions_within_transaction
-    @machine.before_transition { @model.create; raise ActiveRecord::Rollback }
+  def test_should_rollback_before_transitions_with_raise
+    @machine.before_transition {
+      @model.create;
+      raise ActiveRecord::Rollback
+    }
 
     begin
       @record.valid?
     rescue Exception
     end
 
-    assert_equal 1, @model.count
+    assert_equal 0, @model.count
+  end
+
+  def test_should_rollback_before_transitions_with_false
+    @machine.before_transition {
+      @model.create;
+      false
+    }
+
+    begin
+      @record.valid?
+    rescue Exception
+    end
+
+    assert_equal 0, @model.count
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ files:
 - test/machine_without_transactions_test.rb
 - test/model_test.rb
 - test/test_helper.rb
-homepage: https://github.com/seuros/state_machines-activemodel
+homepage: https://github.com/seuros/state_machines-activerecord
 licenses:
 - MIT
 metadata: {}
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: State machines Active Record Integration
@@ -259,4 +259,3 @@ test_files:
 - test/machine_without_transactions_test.rb
 - test/model_test.rb
 - test/test_helper.rb
-has_rdoc: