simple_states 1.1.0.pre → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 441bc5305dd74b7fcf14cd4cd9c65bdfdf1b2a57
-  data.tar.gz: 398464da79ae54350d267a57cfc42a1bfd567fbb
+  metadata.gz: b5b7613b006ee2d3b1565ac8f479f43c72800b2a
+  data.tar.gz: 671f5cad5f1dee2af5757047410a944160f2a950
 SHA512:
-  metadata.gz: 79e01af136e6dc890c3cc94ea9971d78f34fd8ba4332a3afb6a62a333a956b835cc87c463d9ae1065f47961403ccd14964448e50a3dd79a88846175a02887d7a
-  data.tar.gz: 87d6031b6fd68f2e6c8c010fadf7d9130af544661e2ecb3df9eb6051cfa1c26a9f675fca4589b6737e21138f6935c070d470bb5fa9b7fe62163ea9ffcf8235c2
+  metadata.gz: 2cdd779536244575b4e77f88e6a9261b7a44f04dc6f8454980a011aa40167cf922239235779f60710df4bb05873d51a0851d3225340eaf0e3df5158e41e3a4d2
+  data.tar.gz: a101a8a07aee3e7a1b59f91014481f88b6a6226fa46ec15cfd89c24bb064184ddf6a8253ef7b4c1e2047cb20a4c3d81ae31400aee9e9a0d324c78cb44c2ad285

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_states (1.0.1)
+    simple_states (1.1.0.pre)
       activesupport
       hashr (~> 0.0.10)
 
@@ -17,7 +17,6 @@ GEM
     hashr (0.0.22)
     i18n (0.7.0)
     json (1.8.3)
-    json (1.8.3-java)
     metaclass (0.0.1)
     minitest (5.8.0)
     mocha (0.14.0)
@@ -25,7 +24,6 @@ GEM
     rake (0.9.6)
     test_declarative (0.0.5)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -39,3 +37,6 @@ DEPENDENCIES
   rake (~> 0.9.2)
   simple_states!
   test_declarative
+
+BUNDLED WITH
+   1.10.6

data/LICENSE

@@ -1,6 +1,6 @@
 MIT LICENSE
 
-Copyright (c)  Sven Fuchs <svenfuchs@artweb-design.de>
+Copyright (c)  Sven Fuchs <me@svenfuchs.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -117,3 +117,24 @@ foo.finished_at      # Time.now
 foo.was_created?     # true
 foo.was_started?     # true
 ```
+
+In order to treat states as "ordered", the option `ordered: true` can be
+passed.  Events will still behave the same, callbacks be called, etc. However,
+the `state` attribute will never be set back to a previous state.
+
+For example:
+
+```
+class Foo
+  include SimpleStates
+
+  states :created, :started, :finished, ordered: true
+end
+
+foo = Foo.new
+foo.finish
+foo.start
+
+p foo.state
+# => :finished
+```

data/lib/simple_states/event.rb

@@ -14,35 +14,26 @@ module SimpleStates
       end
     end
 
-    def saving
-      @saving = true
-      yield
-    ensure
-      @saving = false
-    end
-
     def call(object, *args)
       return if skip?(object, args)
 
       raise_invalid_transition(object) unless can_transition?(object)
       run_callbacks(object, :before, args)
-      set_state(object)
+      set_state(object, args)
 
       yield.tap do
-        run_callbacks(object, :after, args)
         raise_unknown_target_state(object) unless known_target_state?(object)
-        object.save! if @saving
-      end
-    end
-
-    def merge(other, append = true)
-      other.options.each do |key, value|
-        options[key] = [options[key]].send(append ? :push : :unshift, value).compact.flatten
+        run_callbacks(object, :after, args)
+        object.save! if save?
       end
     end
 
     protected
 
+      def save?
+        options[:save]
+      end
+
       def skip?(object, args)
         result = false
         result ||= !send_methods(object, options.if, args) if options.if?
@@ -55,12 +46,12 @@ module SimpleStates
       end
 
       def run_callbacks(object, type, args)
-        object.save! if @saving
+        object.save! if save?
         send_methods(object, options.send(type), args)
       end
 
-      def set_state(object)
-        state = target_state
+      def set_state(object, args)
+        state = target_state(args)
         object.past_states << object.state if object.state
         object.state = state.to_sym if set_state?(object, state)
         object.send(:"#{state}_at=", now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
@@ -69,11 +60,13 @@ module SimpleStates
       def set_state?(object, state)
         return true unless object.class.state_options[:ordered]
         states = object.class.state_names
-        states.index(object.state.try(:to_sym)) < states.index(state)
+        lft, rgt = states.index(object.state.try(:to_sym)), states.index(state)
+        lft && rgt && lft < rgt
       end
 
-      def target_state
-        options.to || :"#{name}ed"
+      def target_state(args)
+        state = args.last[:state].try(:to_sym) if args.last.is_a?(Hash)
+        state || options.to || "#{name}ed".sub(/eed$/, 'ed').to_sym
       end
 
       def send_methods(object, methods, args)

data/lib/simple_states/states.rb

@@ -27,17 +27,14 @@ module SimpleStates
         end
       end
 
-      def define_event(const, event)
-        const.send(:define_method, event.name) do |*args|
-          event.send(:call, self, *args) do
-            super(*args) if defined?(super)
-          end
+      def define_event(const, (name, options))
+        const.send(:define_method, name) do |*args|
+          event = args.first.is_a?(Event) ? args.shift : Event.new(name, options)
+          event.call(self, *args) { super(*args) if defined?(super) }
         end
 
-        const.send(:define_method, :"#{event.name}!") do |*args|
-          event.saving do
-            send(event.name, *args)
-          end
+        const.send(:define_method, :"#{name}!") do |*args|
+          send(name, Event.new(name, options.merge(save: true)), *args)
         end
       end
 
@@ -52,14 +49,17 @@ module SimpleStates
       end
 
       def merge_events(events)
-        if merge_ix = events.index { |event| event.name == :all }
-          merge = events.slice!(merge_ix)
-          events.each_with_index do |event, ix|
-            event.merge(merge, ix < merge_ix)
-          end
-          merge_events(events)
-        else
-          events
+        return events unless other_ix = events.index { |event| event.first == :all }
+        other = events.slice!(other_ix)
+        events.each_with_index do |event, ix|
+          merge_event(event, other, ix < other_ix)
+        end
+        merge_events(events)
+      end
+
+      def merge_event(event, other, append = true)
+        other.last.each do |key, value|
+          event.last[key] = [event.last[key]].send(append ? :push : :unshift, value).compact.flatten
         end
       end
     end

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '1.1.0.pre'
+  VERSION = '1.1.0.rc1'
 end

data/lib/simple_states.rb

@@ -49,7 +49,7 @@ module SimpleStates
 
     def event(name, options = {})
       add_states(options[:to], *options[:from])
-      self.events += [Event.new(name, options)]
+      self.events << [name, options]
     end
 
     def states_module

data/simple_states.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.authors      = ["Sven Fuchs"]
   s.email        = "svenfuchs@artweb-design.de"
   s.homepage     = "https://github.com/svenfuchs/simple_states"
+  s.licenses     = ['MIT']
   s.summary      = "[summary]"
   s.description  = "[description]"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,7 +98,8 @@ files:
 - lib/simple_states/version.rb
 - simple_states.gemspec
 homepage: https://github.com/svenfuchs/simple_states
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []