simple_states 0.1.0.pre1 → 0.1.0.pre2

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    simple_states (0.0.10)
+    simple_states (0.1.0.pre2)
       activesupport
       hashr (~> 0.0.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
-    hashr (0.0.16)
+    hashr (0.0.18)
     mocha (0.9.12)
     multi_json (1.0.3)
     rake (0.9.2.2)

data/lib/simple_states/event.rb

@@ -59,7 +59,7 @@ module SimpleStates
         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.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
       end
@@ -84,6 +84,10 @@ module SimpleStates
         object.class.instance_method(method).arity rescue 0
       end
 
+      def now
+        Time.respond_to?(:zone) && Time.zone ? Time.zone.now : Time.now.utc
+      end
+
       def raise_invalid_transition(object)
         raise TransitionException, "#{object.inspect} can not receive event #{name.inspect} while in state #{object.state.inspect}."
       end

data/lib/simple_states/states.rb

@@ -46,8 +46,6 @@ module SimpleStates
         if merge_ix = events.index { |event| event.name == :all }
           merge = events.slice!(merge_ix)
           events.each_with_index do |event, ix|
-            # method =  ? :append : :prepend
-
             event.merge(merge, ix < merge_ix)
           end
           merge_events(events)

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '0.1.0.pre1'
+  VERSION = '0.1.0.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre1
+  version: 0.1.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70253625773880 !ruby/object:Gem::Requirement
+  requirement: &70191004044960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253625773880
+  version_requirements: *70191004044960
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70253625773380 !ruby/object:Gem::Requirement
+  requirement: &70191004043800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70253625773380
+  version_requirements: *70191004043800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70253625772880 !ruby/object:Gem::Requirement
+  requirement: &70191004042340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70253625772880
+  version_requirements: *70191004042340
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &70253625772480 !ruby/object:Gem::Requirement
+  requirement: &70191004041700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253625772480
+  version_requirements: *70191004041700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70253625771980 !ruby/object:Gem::Requirement
+  requirement: &70191004041140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253625771980
+  version_requirements: *70191004041140
 description: ! '[description]'
 email: svenfuchs@artweb-design.de
 executables: []
@@ -75,7 +75,6 @@ files:
 - lib/simple_states/event.rb
 - lib/simple_states/states.rb
 - lib/simple_states/version.rb
-- lib/simple_states/version.rb.orig
 - lib/simple_states.rb
 - Gemfile
 - Gemfile.lock
@@ -108,3 +107,4 @@ signing_key:
 specification_version: 3
 summary: ! '[summary]'
 test_files: []
+has_rdoc: 

data/lib/simple_states/version.rb.orig

@@ -1,7 +0,0 @@
-module SimpleStates
-<<<<<<< HEAD
-  VERSION = '0.0.12'
-=======
-  VERSION = '0.1.0.pre1'
->>>>>>> b2d770121d822721e1f16e339717c2385eba4d8d
-end