simple_states 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,23 +1,20 @@
 PATH
   remote: .
   specs:
-    simple_states (0.0.2)
+    simple_states (0.0.5)
       activesupport
       hashr (~> 0.0.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.9)
-    archive-tar-minitar (0.5.2)
+    activesupport (3.0.10)
     columnize (0.3.4)
-    hashr (0.0.10)
+    hashr (0.0.11)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     mocha (0.9.12)
-    rake (0.9.2)
+    rake (0.9.3.beta.1)
     rbx-require-relative (0.0.5)
     require_relative (1.0.2)
     ruby-debug (0.10.4)
@@ -25,16 +22,6 @@ GEM
       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)
     test_declarative (0.0.5)
 
 PLATFORMS
@@ -42,9 +29,8 @@ PLATFORMS
 
 DEPENDENCIES
   mocha
-  rake
+  rake (~> 0.9.3.beta.1)
   require_relative (~> 1.0.1)
   ruby-debug
-  ruby-debug19
   simple_states!
   test_declarative

data/lib/simple_states/event.rb

@@ -32,9 +32,9 @@ module SimpleStates
       end
     end
 
-    def merge(other)
+    def merge(other, append = true)
       other.options.each do |key, value|
-        options[key] = [options[key], value].compact unless key == :to
+        options[key] = [options[key]].send(append ? :push : :unshift, value).compact.flatten
       end
     end
 
@@ -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.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
@@ -75,11 +75,9 @@ module SimpleStates
       end
 
       def send_method(object, method, args)
-        object.send method, *case arity = self.arity(object, method)
-          when 0;  []
-          when -1; [name].concat(args)
-          else;    [name].concat(args).slice(0..arity - 1)
-        end
+        arity = self.arity(object, method)
+        args = [name].concat(args)
+        object.send method, *args.slice(0, arity < 0 ? args.size : arity)
       end
 
       def arity(object, method)

data/lib/simple_states/states.rb

@@ -16,14 +16,22 @@ module SimpleStates
       end
     end
 
+    attr_reader :events
+
     def initialize(events)
-      merge_events(events).each do |event|
-        define_event(event)
-      end
+      @events = merge_events(events)
+      setup
     end
 
     protected
 
+      def setup
+        events.each do |event|
+          define_event(event)
+        end
+      end
+
+
       def define_event(event)
         define_method(event.name) do |*args|
           event.send(:call, self, *args) do
@@ -39,8 +47,17 @@ module SimpleStates
       end
 
       def merge_events(events)
-        merges, events = *events.partition { |event| event.name == :all }
-        events.each { |event| merges.each { |merge| event.merge(merge) } }
+        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)
+        else
+          events
+        end
       end
   end
 end

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,103 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple_states
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70212808497680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hashr
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70212808497680
+- !ruby/object:Gem::Dependency
+  name: hashr
+  requirement: &70212808496780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 0
-        - 10
+      - !ruby/object:Gem::Version
         version: 0.0.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70212808496780
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70212808496020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.3.beta.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test_declarative
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70212808496020
+- !ruby/object:Gem::Dependency
+  name: test_declarative
+  requirement: &70212808511540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70212808511540
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70212808510720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: "[description]"
+  prerelease: false
+  version_requirements: *70212808510720
+description: ! '[description]'
 email: svenfuchs@artweb-design.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/simple_states/event.rb
 - lib/simple_states/states.rb
 - lib/simple_states/version.rb
@@ -110,36 +84,26 @@ files:
 - README.md
 homepage: https://github.com/svenfuchs/simple_states
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: "[none]"
+rubyforge_project: ! '[none]'
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: "[summary]"
+summary: ! '[summary]'
 test_files: []
-