big_machine 1.1.0 → 1.1.1

data/lib/big_machine/active_record.rb

@@ -1,32 +1,32 @@
-module BigMachine
-  module ActiveRecord
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :state_attribute
-      after_initialize :set_current_state_from_db
-    end
-
-    module ClassMethods
-      def big_machine(options = {})
-        super options
-        self.state_attribute = options[:state_attribute] || 'state'
-      end
-    end
-
-    def set_current_state_from_db
-      attribute = send state_attribute
-      if attribute
-        set_current_state(attribute.constantize)
-      else
-        self.class.set_initial_state_class
-      end
-    end
-
-    def set_current_state(new_state_class)
-      super(new_state_class)
-      send "#{state_attribute}=", new_state_class.name
-    end
-
-  end
-end
+module BigMachine
+  module ActiveRecord
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :state_attribute
+      after_initialize :set_current_state_from_db
+    end
+
+    module ClassMethods
+      def big_machine(options = {})
+        super options
+        self.state_attribute = options[:state_attribute] || 'state'
+      end
+    end
+
+    def set_current_state_from_db
+      return unless self.class.initial_state_class
+
+      attribute = send state_attribute
+
+      state_class = attribute ? attribute.constantize : self.class.initial_state_class
+      set_current_state(state_class)
+    end
+
+    def set_current_state(new_state_class)
+      super(new_state_class)
+      send "#{state_attribute}=", new_state_class.name
+    end
+
+  end
+end

data/lib/big_machine/lock.rb

@@ -1,26 +1,32 @@
-module BigMachine
-  module Lock
-    extend ActiveSupport::Concern
-
-    included do
-    end
-
-    def locked?
-      @locked
-    end
-
-    def enter
-      @locked = true
-    end
-
-    def unlock
-      @locked = false
-    end
-
-    def transition_to(state_class)
-      return if @locked
-
-      super
-    end
-  end
-end
+module BigMachine
+  module Lock
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+      def transition_methods
+        public_instance_methods - State.public_instance_methods - [:unlock, :locked?]
+      end
+    end
+
+    def locked?
+      @locked
+    end
+
+    def enter(*args)
+      @locked = true
+    end
+
+    def unlock(*args)
+      @locked = false
+    end
+
+    def transition_to(state_class, *args, &block)
+      return if @locked
+
+      super(state_class, *args, &block)
+    end
+  end
+end

data/lib/big_machine/state.rb

@@ -11,6 +11,14 @@ module BigMachine
       public_instance_methods - State.public_instance_methods
     end
 
+    def self.human_name
+      self.to_s.split('::').last.underscore
+    end
+
+    def human_name
+      self.class.human_name
+    end
+
     def transition_to(state_class, *args, &block)
       @stateful.transition_to(state_class, *args, &block)
     end

data/lib/big_machine/version.rb

@@ -1,3 +1,3 @@
 module BigMachine
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/big_machine_test.rb

@@ -130,11 +130,11 @@ class BigMachineTest < ActiveSupport::TestCase
 
   test "big machine can lock state" do
     @dummy.lock
-    assert @dummy.locked?
+    assert @dummy.current_state.locked?
     @dummy.back_to_draft
     assert_equal 'LockState', @dummy.current_state.class.name
     assert @dummy.current_state.locked?
-    @dummy.unlock
+    @dummy.current_state.unlock
     assert !@dummy.current_state.locked?
     assert_equal 'LockState', @dummy.current_state.class.name
     @dummy.back_to_draft

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_machine
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: