aasm 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a1f3168fccb10e8b1514ced2d81ec931c5c53a
-  data.tar.gz: 216b3cdd8404f5b2cd963c99a975946848a06e69
+  metadata.gz: bfaa647a858b7edb82248c4eb3fc9ccc8ad25c3a
+  data.tar.gz: ef830c2521b024474530bce0c814763cadfd7688
 SHA512:
-  metadata.gz: ea1641220521468b48b11ce9e8fb868a85d1e34d44ddc8256cb2a26ccc055f2cddcf3b557358a651239d2d6cc5d3bedf6f53e9baaf9122b6329c5d3cdd2ed25e
-  data.tar.gz: 2f4e51a87d973d04a16cd64692d0fbcf48df87ab7ee8d412411ca7cb742005b68f7a7ee2ae3d953b0ab01bd8f7956ffd98dd95ba6eda0e3e9b7a6b3533eaa0ea
+  metadata.gz: 0651274c41ba3dbc905b8cab1e47a812d18e422d8c4045344c705a956246112e36e4bbb255c7107fbd03b8992504d4498b6c60c224dddd4bd6dca75372bcdeee
+  data.tar.gz: c5ac9cc392993b3e416578d20fcacff1ddec041e48d4aebe37425e29475b7b882ed1fd5423f89d1f030c4bed53e816000ca189adc9a9f48b97373356552ae4f7

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
  * deprecated old aasm_* class methods (old-style DSL), in preparation for AASM v4.0.0
 
+## 3.3.3
+
+ * bugfix: support reloading development environment in Rails (see [issue #148](https://github.com/aasm/aasm/issues/148))
+
 ## 3.3.2
 
  * bugfix: avoid conflicts with `failed` and `fired` event names (see [issue #157](https://github.com/aasm/aasm/issues/157)), thanks to [@MichaelXavier](https://github.com/MichaelXavier)

data/aasm.gemspec

@@ -5,7 +5,7 @@ require "aasm/version"
 Gem::Specification.new do |s|
   s.name        = "aasm"
   s.version     = AASM::VERSION
-  s.authors     = ["Scott Barron", "Scott Petersen", "Travis Tilley", "Thorsten Boettger"]
+  s.authors     = ["Scott Barron", "Travis Tilley", "Thorsten Boettger"]
   s.email       = %q{scott@elitists.net, ttilley@gmail.com, aasm@mt7.de}
   s.homepage    = %q{https://github.com/aasm/aasm}
   s.summary     = %q{State machine mixin for Ruby objects}

data/lib/aasm/state_machine.rb

@@ -28,7 +28,11 @@ module AASM
 
     def add_state(name, klass, options)
       set_initial_state(name, options)
-      @states << AASM::State.new(name, klass, options) unless @states.include?(name)
+
+      # allow reloading, extending or redefining a state
+      @states.delete(name) if @states.include?(name)
+
+      @states << AASM::State.new(name, klass, options)
     end
 
     private

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

data/spec/models/double_definer.rb

@@ -0,0 +1,21 @@
+class DoubleDefiner
+  include AASM
+
+  aasm do
+    state :started
+    state :finished
+
+    event :finish do
+      transitions :from => :started, :to => :finished
+    end
+
+    # simulating a reload
+    state :finished, :enter => :do_enter
+    event :finish do
+      transitions :from => :started, :to => :finished, :on_transition => :do_on_transition
+    end
+  end
+
+  def do_enter; end
+  def do_on_transition; end
+end

data/spec/unit/reloading_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'callbacks for the new DSL' do
+  let(:definer) { DoubleDefiner.new }
+
+  it "allows extending states" do
+    expect(definer).to receive(:do_enter)
+    definer.finish
+  end
+
+  it "allows extending events" do
+    expect(definer).to receive(:do_on_transition)
+    definer.finish
+  end
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Scott Barron
-- Scott Petersen
 - Travis Tilley
 - Thorsten Boettger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,6 +143,7 @@ files:
 - spec/models/bar.rb
 - spec/models/callback_new_dsl.rb
 - spec/models/conversation.rb
+- spec/models/double_definer.rb
 - spec/models/father.rb
 - spec/models/foo.rb
 - spec/models/guardian.rb
@@ -177,6 +177,7 @@ files:
 - spec/unit/persistence/active_record_persistence_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
 - spec/unit/persistence/sequel_persistence_spec.rb
+- spec/unit/reloading_spec.rb
 - spec/unit/simple_example_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/subclassing_spec.rb
@@ -216,6 +217,7 @@ test_files:
 - spec/models/bar.rb
 - spec/models/callback_new_dsl.rb
 - spec/models/conversation.rb
+- spec/models/double_definer.rb
 - spec/models/father.rb
 - spec/models/foo.rb
 - spec/models/guardian.rb
@@ -249,6 +251,7 @@ test_files:
 - spec/unit/persistence/active_record_persistence_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
 - spec/unit/persistence/sequel_persistence_spec.rb
+- spec/unit/reloading_spec.rb
 - spec/unit/simple_example_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/subclassing_spec.rb