simple_states 0.0.10 → 0.0.11

data/Gemfile

@@ -2,13 +2,13 @@ source :rubygems
 
 gemspec
 
-group :test do
-  platforms :mri_18 do
-    gem "require_relative", "~> 1.0.1"
-    gem 'ruby-debug'
-  end
-
-  platforms :mri_19 do
-    gem 'ruby-debug19', :platforms => :mri_19 unless RUBY_VERSION == '1.9.3'
-  end
-end
+# group :test do
+#   platforms :mri_18 do
+#     gem "require_relative", "~> 1.0.1"
+#     gem 'ruby-debug'
+#   end
+#
+#   platforms :mri_19 do
+#     gem 'ruby-debug19', :platforms => :mri_19 unless RUBY_VERSION == '1.9.3'
+#   end
+# end

data/Gemfile.lock

@@ -10,43 +10,18 @@ GEM
   specs:
     activesupport (3.1.1)
       multi_json (~> 1.0)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.4)
     hashr (0.0.16)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     mocha (0.9.12)
     multi_json (1.0.3)
-    rake (0.9.3.beta.1)
-    rbx-require-relative (0.0.5)
-    require_relative (1.0.2)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
+    rake (0.9.2.2)
     test_declarative (0.0.5)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   mocha
-  rake (~> 0.9.3.beta.1)
-  require_relative (~> 1.0.1)
-  ruby-debug
-  ruby-debug19
+  rake (~> 0.9.2)
   simple_states!
   test_declarative

data/lib/simple_states.rb

@@ -13,6 +13,7 @@ module SimpleStates
 
   included do
     class_attribute :state_names, :initial_state, :events
+    after_initialize :init_state if respond_to?(:after_initialize)
     self.initial_state = :created
     self.events = []
   end
@@ -48,6 +49,10 @@ module SimpleStates
 
   attr_reader :past_states
 
+  def init_state
+    self.state = self.class.initial_state
+  end
+
   def past_states
     @past_states ||= []
   end

data/lib/simple_states/event.rb

@@ -38,15 +38,6 @@ module SimpleStates
       end
     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=", Time.now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
-        object.save! if @saving
-      end
-    end
-
     protected
 
       def skip?(object, args)
@@ -64,6 +55,15 @@ module SimpleStates
         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=", Time.now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
+          object.save! if @saving
+        end
+      end
+
       def target_state(object)
         options.to || :"#{name}ed".tap do |state|
           raise_unknown_target_state(object) unless object.class.states.include?(state)

data/lib/simple_states/states.rb

@@ -3,13 +3,7 @@ module SimpleStates
     class << self
       def init(object)
         object.singleton_class.send(:include, proxy_for(object.class))
-        if object.singleton_class.respond_to?(:after_initialize)
-          object.singleton_class.after_initialize do
-            self.state = self.class.initial_state if attributes.keys.include?('state') && state.blank?
-          end
-        else
-          object.state = object.class.initial_state
-        end
+        object.init_state unless object.singleton_class.respond_to?(:after_initialize)
       end
 
       def proxy_for(klass)

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70310391704160 !ruby/object:Gem::Requirement
+  requirement: &70332126751680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310391704160
+  version_requirements: *70332126751680
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70310391703660 !ruby/object:Gem::Requirement
+  requirement: &70332126751180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70310391703660
+  version_requirements: *70332126751180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70310391703160 !ruby/object:Gem::Requirement
+  requirement: &70332126750660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3.beta.1
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70310391703160
+  version_requirements: *70332126750660
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &70310391702780 !ruby/object:Gem::Requirement
+  requirement: &70332126750260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310391702780
+  version_requirements: *70332126750260
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70310391702320 !ruby/object:Gem::Requirement
+  requirement: &70332126749760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310391702320
+  version_requirements: *70332126749760
 description: ! '[description]'
 email: svenfuchs@artweb-design.de
 executables: []