stateful 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ae4d99568569f667a41d4b1959cc511f300dea
-  data.tar.gz: af2c257fdfcedf21ea5b760537c9d32c004ac74e
+  metadata.gz: 9261a6a19bbd004baeacff1e9d6b3d33e3096a8c
+  data.tar.gz: 7c4edb733fb8d48880f3cc89538b200c84a69d8c
 SHA512:
-  metadata.gz: 8b714fc19974ee231d8baf208c655f835a6c002fa12c984740f0a14a29449a8b3595b7e7297ecf203dc318f077ec49f7ad8c0be396b818d3b915502f5db59255
-  data.tar.gz: 1b6d4c06b40dad7123e6a6f6c946596ca0f1a1665cff1b0e4fd9f7e68012703def03a97c36417584ccfb8e1ac221f48a84233809907e146a6b49dd966bb1d801
+  metadata.gz: 1a2144835b0991988cc9935bdf70891662552774cda5f9f3d124e4ef6887aabee2d542dbee377f871fb76a500241b546e773b62b1a112b74f47da46623f03130
+  data.tar.gz: 13aaa3bcbe79a07d9d8ceae4eaf58c4e789351ce981e9c9fe639d119489deffa20fd906fdaa137334545930014351d2cd0d97d2e365090342976e10a010f02a2

data/README.md

@@ -40,7 +40,7 @@ class Project
                 active: {
                     new: :published,
                     published: {
-                        needs_approval: [:approved, :duplicate],
+                        needs_approval: [:approved, :duplicate, :new],
                         approved: :closed
                     }
                 },

data/lib/stateful/version.rb

@@ -1,3 +1,3 @@
 module Stateful
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/stateful.rb

@@ -8,6 +8,7 @@ module Stateful
   included do
     if defined?(Mongoid)
       require 'mongoid/document'
+      require 'stateful/mongoid'
       include Stateful::Mongoid if included_modules.include?(::Mongoid::Document)
     end
   end
@@ -35,25 +36,18 @@ module Stateful
       define_method 'change_state' do |new_state, options = {}, &block|
         return false if new_state == state
         return false unless state_info.can_transition_to?(new_state)
-
-        # convert shortcut event name to options hash
-        options = {event: options} if options.is_a? Symbol
-        options[:persist_methods] = [:persist_state, :save]
-
-        _change_state(new_state, options, &block)
+        _change_state(new_state, options, [:persist_state, :save], &block)
       end
 
       define_method 'change_state!' do |new_state, options = {}, &block|
-        return false if new_state == state
         raise "transition from #{state} to #{new_state} not allowed" unless state_info.can_transition_to?(new_state)
+        _change_state(new_state, options, [:persist_state!, :save!], &block)
+      end
 
+      define_method '_change_state' do |new_state, options, persist_methods, &block|
         # convert shortcut event name to options hash
         options = {event: options} if options.is_a? Symbol
-        options[:persist_methods] = [:persist_state!, :save!]
-        _change_state(new_state, options, &block)
-      end
 
-      define_method '_change_state' do |new_state, options, &block|
         # do a little magic and infer the event name from the method name used to call change_state
         # TODO: decide if this is too magical, for now it has been commented out.
         #unless options[:event]
@@ -68,20 +62,23 @@ module Stateful
           callbacks << options[:event] if options[:event]
           run_callbacks *callbacks do
             self.state = new_state
-            if options[:persist_methods]
-              method = options[:persist_methods].find {|m| respond_to?(m)}
+
+            ## if a specific persist method value was provided
+            #if options.has_key?(:persist_method)
+            #  # call the method if one was provided
+            #  __send__(options[:persist_method]) if options[:persist_method]
+            ## if no persist method option was provided than use the defaults
+            #else
+              method = persist_methods.find {|m| respond_to?(m)}
               __send__(method) if method
-            end
-            if respond_to?(:persist_state)
-              persist_state
-            elsif respond_to?(:save!)
-              save!
-            end
+            #end
           end
           true
         end
       end
 
+      protected :change_state
+      protected :change_state!
       private :_change_state
 
       define_method 'can_transition_to?' do |new_state|

data/spec/mongoid_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require './lib/stateful'
 require 'mongoid'
+require 'mongoid/document'
 
 
 class Kata
@@ -33,7 +34,7 @@ describe Stateful::Mongoid do
   end
 
   it 'should support can_transition_to?' do
-    kata.can_transition_to?(:beta).should be_true
+    kata.can_transition_to?(:needs_testing).should be_true
     kata.can_transition_to?(:retired).should be_false
   end
 

data/spec/stateful_spec.rb

@@ -91,15 +91,15 @@ describe Kata do
 
   context 'change_state' do
     it 'should raise error when an invalid transition state is provided' do
-      expect{kata.change_state(:retired)}.to raise_error
+      expect{kata.send(:change_state!, :retired)}.to raise_error
     end
 
     it 'should raise error when a group state is provided' do
-      expect{kata.change_state(:beta)}.to raise_error
+      expect{kata.send(:change_state!, :beta)}.to raise_error
     end
 
     it 'should return false when state is the same' do
-      kata.change_state(:draft).should be_false
+      kata.send(:change_state, :draft).should be_false
     end
 
     it 'should support state_valid?' do
@@ -107,14 +107,14 @@ describe Kata do
     end
 
     it 'should change the state when a proper state is provided' do
-      kata.change_state(:needs_feedback).should be_true
+      kata.send(:change_state, :needs_feedback).should be_true
       kata.state.should == :needs_feedback
-      kata.change_state(:needs_approval).should be_true
+      kata.send(:change_state, :needs_approval).should be_true
       kata.state.should == :needs_approval
-      kata.change_state(:draft).should be_true
+      kata.send(:change_state, :draft).should be_true
       kata.state.should == :draft
-      kata.change_state(:needs_approval).should be_true
-      kata.change_state(:approved).should be_true
+      kata.send(:change_state, :needs_approval).should be_true
+      kata.send(:change_state, :approved).should be_true
       kata.state.should == :approved
     end
 
@@ -151,8 +151,6 @@ describe Kata do
       Kata.state_infos[:needs_approval].to_transitions.should == [:draft, :approved]
 
       Kata.state_infos[:retired].to_transitions.should be_empty
-
-      p Kata.instance_methods
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stateful
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - jake hoffner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport