transitions 0.0.16 → 0.0.17

data/.gitignore

@@ -2,3 +2,5 @@ pkg
 *.gem
 .bundle
 .idea/
+Gemfile.lock
+*.swp

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3@transitions --create
+rvm 1.9.2-p290@transitions --create

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.17 (2012-05-02):
+
+* (zmillman) Add write_state_without_persistence.
+
 # 0.0.16 (2012-04-18):
 
 * (mperham) Remove backports, fix Ruby 1.8 support.

data/README.rdoc

@@ -4,7 +4,7 @@
 
 = Synopsis
 
-`transitions` is a ruby state machine implementation.
+<tt>transitions</tt> is a ruby state machine implementation.
 
 = Installation
 
@@ -51,13 +51,12 @@ This goes into your Gemfile:
 == Events
 
 When you declare an event, say <tt>discontinue</tt>, two methods are declared for
-you: <tt>discontinue</tt> and <tt>discontinue!</tt>. Both events will call
-<tt>write_state_without_persistence</tt> on successful transition, but only the
-bang(!)-version will call <tt>write_state</tt>.
+you: <tt>discontinue</tt> and <tt>discontinue!</tt>. Both events will modify the <tt>state</tt> attribute on successful transition,
+but only the bang(!)-version will call <tt>save!</tt>.
 
 == Automatic scope generation
 
-`transitions` will automatically generate scopes for you if you are using ActiveRecord and tell it to do so via the `auto_scopes` option:
+<tt>transitions</tt> will automatically generate scopes for you if you are using ActiveRecord and tell it to do so via the <tt>auto_scopes</tt> option:
 
 Given a model like this:
 
@@ -78,7 +77,7 @@ you can use this feature a la:
   >> Order.pick_line_items
   => [#<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">]
 
-== Using `on_transition`
+== Using <tt>on_transition</tt>
 
 Each event definition takes an optional "on_transition" argument, which allows you to execute methods on transition.
 You can pass in a Symbol, a String, a Proc or an Array containing method names as Symbol or String like this:
@@ -87,9 +86,9 @@ You can pass in a Symbol, a String, a Proc or an Array containing method names a
     transitions :to => :discontinued, :from => [:available, :out_of_stock], :on_transition => [:do_discontinue, :notify_clerk]
   end
 
-== Using `success`
+== Using <tt>success</tt>
 
-In case you need to trigger a method call after a successful transition you can use `success`:
+In case you need to trigger a method call after a successful transition you can use <tt>success</tt>:
 
   event :discontinue, :success => :notfiy_admin do
     transitions :to => :discontinued, :from => [:available, :out_of_stock]
@@ -124,7 +123,7 @@ the name of the timestamp column.
 
 You can easily get a listing of all available states:
 
-  Order.available_states # Uses the `default` state machine
+  Order.available_states # Uses the <tt>default</tt> state machine
   # => [:pick_line_items, :picking_line_items]
 
 In case you have multiple state machines you can also pass the state machine name:

data/lib/active_model/transitions.rb

@@ -45,16 +45,19 @@ module ActiveModel
     protected
 
     def write_state(state_machine, state)
-      ivar = state_machine.current_state_variable
       prev_state = current_state(state_machine.name)
-      instance_variable_set(ivar, state)
-      self.state = state.to_s
+      write_state_without_persistence(state_machine, state)
       save!
     rescue ActiveRecord::RecordInvalid
-      self.state = prev_state.to_s
-      instance_variable_set(ivar, prev_state)
+      write_state_without_persistence(state_machine, prev_state)
       raise
     end
+    
+    def write_state_without_persistence(state_machine, state)
+      ivar = state_machine.current_state_variable
+      instance_variable_set(ivar, state)
+      self.state = state.to_s
+    end
 
     def read_state(state_machine)
       self.state && self.state.to_sym

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/test/test_active_record.rb

@@ -164,6 +164,14 @@ class TestActiveRecord < Test::Unit::TestCase
     @light.update_attribute(:state, 'green')
     assert @light.reload.green?, "reloaded state should come from database, not instance variable"
   end
+  
+  test "calling non-bang event updates state attribute" do
+    @light.reset!
+    assert @light.red?
+    @light.green_on
+    assert_equal "green", @light.state
+    assert_equal "red", @light.reload.state
+  end
 
 end
 

data/test/test_event_being_fired.rb

@@ -10,7 +10,7 @@ class TestEventBeingFired < Test::Unit::TestCase
     exception = assert_raise Transitions::InvalidTransition do
       event.fire(obj)
     end
-    assert_match /No transitions present for `TestEventBeingFired::AnotherDummy` with current state `running`/, exception.message
+    assert_match /Cannot transition to default from running for `TestEventBeingFired::AnotherDummy/, exception.message
   end
 
   test "should return the state of the first matching transition it finds" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75905730 !ruby/object:Gem::Requirement
+  requirement: &80694140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *75905730
+  version_requirements: *80694140
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &75904950 !ruby/object:Gem::Requirement
+  requirement: &80692960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *75904950
+  version_requirements: *80692960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &75904680 !ruby/object:Gem::Requirement
+  requirement: &80692570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75904680
+  version_requirements: *80692570
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75886600 !ruby/object:Gem::Requirement
+  requirement: &80682540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75886600
+  version_requirements: *80682540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &75886220 !ruby/object:Gem::Requirement
+  requirement: &80681530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75886220
+  version_requirements: *80681530
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75885690 !ruby/object:Gem::Requirement
+  requirement: &80680830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *75885690
+  version_requirements: *80680830
 description: Lightweight state machine extracted from ActiveModel
 email: timo.roessner@googlemail.com
 executables: []
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -702570801
+      hash: -1021171215
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: