aasm 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 442f7c145e97a545e9dd1cd5ecab268177b93deb0b258ab381107f1207fe9654
-  data.tar.gz: 1d32640b0bfab501acc40b10f7d21be342944ed133086d44ccb924f03485f3b8
+  metadata.gz: 7ec8cfc1d821c4acb9bd0ce3f3af83174f28314f4f9c91f511d2a77555faf731
+  data.tar.gz: 8ed85be2d9cee794e3738349ba567667946b5df80ded58a5bd009d864b99fc02
 SHA512:
-  metadata.gz: be33b17c558b289c012f25ccbed984cd3b2859e14a5120bf240020eb2d83c2645834784e5bc50dac0e5a3f161f13f3d85c2a29dcefcce694be395b604676ef32
-  data.tar.gz: 87668c8a48a9cf0335a4359970e868758a25398e2af8fb025ab9dd39db2a89147f0fad25fee9c11e1da9522fbeca6595f5363318b8baf2b7625ee1b88f3d8b80
+  metadata.gz: 19ecf2a0254280ecbcacee23b7f671d4a5fefc5cc0bf4eabffd5fc98e1bff648b35048a201d4f60e22b6ca989ca03dd958f8ff558ee8c62c2662b83d994b9692
+  data.tar.gz: afe81dea0198b16bfbac59293625b1ab7aa94a62f1250511a7e03957d71724f52b1a01e5c01d48d3bf04c53013578a5ffae8859b9134212137b1aadd4285b894

data/.github/workflows/build.yml

@@ -56,6 +56,8 @@ jobs:
           gemfile: rails_4.2_mongoid_5
         - ruby: truffleruby
           gemfile: rails_5.2
+        - ruby: truffleruby
+          gemfile: rails_6.1
         allow_failures:
           - false
     env:

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
 ## unreleased
+## 5.3.1
+* Fix fire! with string argument [#787](https://github.com/aasm/aasm/issues/787), in PR[#788](https://github.com/aasm/aasm/pull/788) thanks to [norman](https://github.com/norman)
+
+* Allow `fire` and `fire!` to accept a String or Symbol for the event name, and raise AASM::UndefinedEvent rather than AASM::UndefinedState
+  when an event can not be found, thanks to [norman](https://github.com/norman).
 
 ## 5.3.0
 

data/lib/aasm/errors.rb

@@ -17,5 +17,6 @@ module AASM
   end
 
   class UndefinedState < RuntimeError; end
+  class UndefinedEvent < UndefinedState; end
   class NoDirectAssignmentError < RuntimeError; end
 end

data/lib/aasm/instance_base.rb

@@ -134,10 +134,11 @@ module AASM
     private
 
     def event_exists?(event_name, bang = false)
-      event = @instance.class.aasm(@name).state_machine.events[event_name]
-      event_error = bang ? "#{event_name}!" : event_name
+      event = @instance.class.aasm(@name).state_machine.events[event_name.to_sym]
+      return true if event
 
-      raise AASM::UndefinedState, "State :#{event_error} doesn't exist" if event.nil?
+      event_error = bang ? "#{event_name}!" : event_name
+      raise AASM::UndefinedEvent, "Event :#{event_error} doesn't exist" if event.nil?
     end
   end
 end

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "5.3.0"
+  VERSION = "5.3.1"
 end

data/spec/spec_helpers/mongoid.rb

@@ -2,6 +2,7 @@
 
 begin
   require 'mongoid'
+  require 'rails'
   puts "mongoid #{Mongoid::VERSION} gem found, running mongoid specs \e[32m#{'✔'}\e[0m"
 
   if Mongoid::VERSION.to_f <= 5

data/spec/unit/callbacks_spec.rb

@@ -153,11 +153,11 @@ describe 'callbacks for the new DSL' do
 
     expect {
       callback.aasm.fire(:unknown)
-    }.to raise_error(AASM::UndefinedState, "State :unknown doesn't exist")
+    }.to raise_error(AASM::UndefinedEvent, "Event :unknown doesn't exist")
 
     expect {
       callback.aasm.fire!(:unknown)
-    }.to raise_error(AASM::UndefinedState, "State :unknown! doesn't exist")
+    }.to raise_error(AASM::UndefinedEvent, "Event :unknown! doesn't exist")
   end
 
   it "does not run any state callback if the event guard fails" do

data/spec/unit/complex_example_spec.rb

@@ -92,10 +92,10 @@ describe 'when being unsuspended' do
   end
 
   it "should raise AASM::UndefinedState when firing unknown events" do
-    expect { auth.aasm.fire(:unknown) }.to raise_error(AASM::UndefinedState, "State :unknown doesn't exist")
+    expect { auth.aasm.fire(:unknown) }.to raise_error(AASM::UndefinedEvent, "Event :unknown doesn't exist")
   end
 
   it "should raise AASM::UndefinedState when firing unknown bang events" do
-    expect { auth.aasm.fire!(:unknown) }.to raise_error(AASM::UndefinedState, "State :unknown! doesn't exist")
+    expect { auth.aasm.fire!(:unknown) }.to raise_error(AASM::UndefinedEvent, "Event :unknown! doesn't exist")
   end
 end

data/spec/unit/event_spec.rb

@@ -296,15 +296,32 @@ describe 'current event' do
   end
 
   describe "when calling events with fire/fire!" do
-    it "fire should populate aasm.current_event and transition (sleeping to showering)" do
-      pe.aasm.fire(:wakeup)
-      expect(pe.aasm.current_event).to eq :wakeup
-      expect(pe.aasm.current_state).to eq :showering
+    context "fire" do
+      it "should populate aasm.current_event and transition (sleeping to showering)" do
+        pe.aasm.fire(:wakeup)
+        expect(pe.aasm.current_event).to eq :wakeup
+        expect(pe.aasm.current_state).to eq :showering
+      end
+
+      it "should allow event names as strings" do
+        pe.aasm.fire("wakeup")
+        expect(pe.aasm.current_event).to eq :wakeup
+        expect(pe.aasm.current_state).to eq :showering
+      end
     end
-    it "fire! should populate aasm.current_event and transition (sleeping to showering)" do
-      pe.aasm.fire!(:wakeup)
-      expect(pe.aasm.current_event).to eq :wakeup!
-      expect(pe.aasm.current_state).to eq :showering
+
+    context "fire!" do
+      it "should populate aasm.current_event and transition (sleeping to showering)" do
+        pe.aasm.fire!(:wakeup)
+        expect(pe.aasm.current_event).to eq :wakeup!
+        expect(pe.aasm.current_state).to eq :showering
+      end
+
+      it "should allow event names as strings" do
+        pe.aasm.fire!("wakeup")
+        expect(pe.aasm.current_event).to eq :wakeup!
+        expect(pe.aasm.current_state).to eq :showering
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Thorsten Boettger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby