end_state 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae3d305a090f889c3ec8c4f8cd9aa7746195e047
-  data.tar.gz: 51e2c2b4850c6a6831785999720073b336e03d15
+  metadata.gz: c199657701bb9dec215e09e17d5e3e27d1d95d3e
+  data.tar.gz: 240681ba88cc834317071327063867828e994af0
 SHA512:
-  metadata.gz: 0438d6dd04ca45c009d0087ace06af294ce87db794fcbc1b44691d36f1f760343cd8ace467013663d509a7cc2330a8c28ad2c8781699d473c264667733e58380
-  data.tar.gz: a0b3c8565c86b8894acc121c2c9412a45ef299a7e2749e3d9e8d3f335b58197dadf364e7980fdc2d3187c5d349ffbe6e873b40268265c7519597ef3768f5f196
+  metadata.gz: 0728b393e7550ad3aa5833854b36c0c84089556c9e798c3ef9c9ac627989d48f4064225c9eedf8770bbdcc818f5991f37646ba3eaa4e784378cb0acebe37dd27
+  data.tar.gz: 5b4b5f3fd214558f7a1529015f23cea0ca12de44dc5c4c23663013d6cce49582c86c907dd5afda5816251a03430fc6861d78be36daf117e72fa743cca6042dd5

data/lib/end_state/state_machine.rb

@@ -80,12 +80,11 @@ module EndState
 
     def method_missing(method, *args, &block)
       check_state = method.to_s[0..-2].to_sym
+      return current_state?(check_state) if method.to_s.end_with?('?')
       check_state = state_for_event(check_state) || check_state
       return false if check_state == :__invalid_event__
       return super unless self.class.states.include?(check_state)
-      if method.to_s.end_with?('?')
-        state.to_sym == check_state
-      elsif method.to_s.end_with?('!')
+      if method.to_s.end_with?('!')
         transition check_state, args[0]
       else
         super
@@ -94,6 +93,10 @@ module EndState
 
     private
 
+    def current_state?(check_state)
+      state.to_sym == check_state
+    end
+
     def state_for_event(event)
       transitions = self.class.events[event]
       return false unless transitions

data/lib/end_state/version.rb

@@ -1,3 +1,3 @@
 module EndState
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/end_state/state_machine_spec.rb

@@ -130,6 +130,16 @@ module EndState
         specify { expect(machine.b?).to be_true }
         specify { expect(machine.a?).to be_false }
       end
+
+      context 'when the state shares a name with an event' do
+        before { StateMachine.transition start: :stop, as: :stop }
+
+        context 'and the object, in that state, cannot transition on the event' do
+          let(:object) { OpenStruct.new(state: :stop) }
+
+          specify { expect(machine.stop?).to be_true }
+        end
+      end
     end
 
     describe '#{state}!' do
@@ -261,7 +271,7 @@ module EndState
             it 'sends the guard the params' do
               machine.transition :b, params, :soft
               expect(guard).to have_received(:new).with(machine, :b, params)
-            end  
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: end_state
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - alexpeachey