simple_states 0.1.1 → 1.0.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    simple_states (0.1.0.pre3)
+    simple_states (0.1.1)
       activesupport
       hashr (~> 0.0.10)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    hashr (0.0.21)
-    i18n (0.6.0)
+    hashr (0.0.22)
+    i18n (0.6.1)
     metaclass (0.0.1)
-    mocha (0.11.3)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.4)
-    rake (0.9.2.2)
+    multi_json (1.7.3)
+    rake (0.9.6)
     test_declarative (0.0.5)
 
 PLATFORMS

data/lib/simple_states/event.rb

@@ -24,10 +24,11 @@ module SimpleStates
 
       raise_invalid_transition(object) unless can_transition?(object)
       run_callbacks(object, :before, args)
+      set_state(object)
 
       yield.tap do
-        set_state(object)
         run_callbacks(object, :after, args)
+        raise_unknown_target_state(object) unless known_target_state?(object)
         object.save! if @saving
       end
     end
@@ -48,26 +49,23 @@ module SimpleStates
       end
 
       def can_transition?(object)
-        !options.from || object.state && Array(options.from).include?(object.state)
+        !options.from || object.state && Array(options.from).include?(object.state.to_sym)
       end
 
       def run_callbacks(object, type, args)
+        object.save! if @saving
         send_methods(object, options.send(type), args)
       end
 
       def set_state(object)
-        if state = target_state(object)
-          object.past_states << object.state if object.state
-          object.state = state.to_sym
-          object.send(:"#{state}_at=", now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
-          object.save! if @saving
-        end
+        state = target_state
+        object.past_states << object.state if object.state
+        object.state = state.to_sym
+        object.send(:"#{state}_at=", now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
       end
 
-      def target_state(object)
-        options.to || :"#{name}ed".tap do |state|
-          raise_unknown_target_state(object) unless object.class.states.include?(state)
-        end
+      def target_state
+        options.to || :"#{name}ed"
       end
 
       def send_methods(object, methods, args)
@@ -88,12 +86,16 @@ module SimpleStates
         Time.respond_to?(:zone) && Time.zone ? Time.zone.now : Time.now.utc
       end
 
+      def known_target_state?(object)
+        object.state && object.class.states.include?(object.state.to_sym)
+      end
+
       def raise_invalid_transition(object)
         raise TransitionException, "#{object.inspect} can not receive event #{name.inspect} while in state #{object.state.inspect}."
       end
 
       def raise_unknown_target_state(object)
-        raise TransitionException, "can not find target state for #{object.inspect} for event #{name.inspect}."
+        raise TransitionException, "unknown target state #{object.state.inspect} for #{object.inspect} for event #{name.inspect}. known states are #{object.class.states.inspect}"
       end
   end
 end

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '0.1.1'
+  VERSION = '1.0.0'
 end

data/lib/simple_states.rb

@@ -1,6 +1,3 @@
-require 'active_support/concern'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/object/try'
 
 module SimpleStates
@@ -9,16 +6,21 @@ module SimpleStates
   autoload :Event,  'simple_states/event'
   autoload :States, 'simple_states/states'
 
-  extend ActiveSupport::Concern
-
-  included do
-    class_attribute :state_names, :initial_state, :events
-    after_initialize :init_state if respond_to?(:after_initialize)
-    self.initial_state = :created
-    self.events = []
+  def self.included(base)
+    base.extend SimpleStates::ClassMethods
+    # Add class level attribute accessors
+    added_class_accessors = [ :state_names, :initial_state, :events ]
+    base.singleton_class.send :attr_accessor, *added_class_accessors
+    base.public_class_method *added_class_accessors
+    base.public_class_method *added_class_accessors.map{|att| "#{att}=".to_sym }
+    # default states
+    base.after_initialize :init_state if base.respond_to?(:after_initialize)
+    base.initial_state = :created
+    base.events = []
   end
 
   module ClassMethods
+
     def new(*)
       super.tap { |object| States.init(object) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70324948858120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324948858120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70324948857460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70324948857460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70324948856640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70324948856640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &70324948855800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324948855800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70324948854880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324948854880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! '[description]'
 email: svenfuchs@artweb-design.de
 executables: []
@@ -102,8 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! '[summary]'
 test_files: []
+has_rdoc: