simple_states 1.0.2 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af301cceac699e1a5316adefc530a637427e231f
-  data.tar.gz: 6c332396fce2c5c567d0a80d2983997cec2e3c5a
+  metadata.gz: 441bc5305dd74b7fcf14cd4cd9c65bdfdf1b2a57
+  data.tar.gz: 398464da79ae54350d267a57cfc42a1bfd567fbb
 SHA512:
-  metadata.gz: 6c86dc1eedb47699e3376f0197d2685b3e114ae5cd256352c3ed90b884d90280d2946b9ff0e0b9c11e4e11f5ecf215d9241d2229d1e2837065785f4aba0d1a19
-  data.tar.gz: d6e6a16d345cc618996421dc56930f91b0826351826788924d860df2ba340a283f166e4dc1cae4e97688747a2e3b9447659716ae46d22fb833228ad2b10954df
+  metadata.gz: 79e01af136e6dc890c3cc94ea9971d78f34fd8ba4332a3afb6a62a333a956b835cc87c463d9ae1065f47961403ccd14964448e50a3dd79a88846175a02887d7a
+  data.tar.gz: 87d6031b6fd68f2e6c8c010fadf7d9130af544661e2ecb3df9eb6051cfa1c26a9f675fca4589b6737e21138f6935c070d470bb5fa9b7fe62163ea9ffcf8235c2

data/Gemfile

@@ -2,13 +2,6 @@ source 'https://rubygems.org'
 
 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
+  gem 'minitest'
+end

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    simple_states (1.0.2)
+    simple_states (1.0.1)
       activesupport
+      hashr (~> 0.0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (4.2.4)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
-    i18n (0.8.1)
-    metaclass (0.0.4)
-    minitest (5.10.1)
-    mocha (1.2.1)
+    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)
       metaclass (~> 0.0.1)
-    power_assert (1.0.1)
     rake (0.9.6)
-    test-unit (3.2.3)
-      power_assert
     test_declarative (0.0.5)
-    thread_safe (0.3.6)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  minitest
   mocha
   rake (~> 0.9.2)
   simple_states!
-  test-unit
   test_declarative
-
-BUNDLED WITH
-   1.14.5

data/lib/simple_states.rb

@@ -6,21 +6,28 @@ module SimpleStates
   autoload :Event,  'simple_states/event'
   autoload :States, 'simple_states/states'
 
-  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 = []
+  class << self
+    def included(base)
+      base.extend(SimpleStates::ClassMethods)
+      define_accessors(base, :state_names, :state_options, :initial_state, :events)
+      set_defaults(base)
+    end
+
+    def define_accessors(base, *names)
+      base.singleton_class.send(:attr_accessor, *names)
+      base.public_class_method(*names + names.map { |name| "#{name}=".to_sym })
+    end
+
+    def set_defaults(base)
+      base.after_initialize(:init_state) if base.respond_to?(:after_initialize)
+      base.initial_state = :created
+      base.state_names = []
+      base.state_options = {}
+      base.events = []
+    end
   end
 
   module ClassMethods
-
     def new(*)
       super.tap { |object| States.init(object) }
     end
@@ -30,23 +37,24 @@ module SimpleStates
     end
 
     def states(*args)
-      if args.empty?
-        self.state_names ||= add_states(self.initial_state)
-      else
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        self.initial_state = options[:initial].to_sym if options.key?(:initial)
-        add_states(*[self.initial_state].concat(args))
-      end
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      self.initial_state = options.delete(:initial).to_sym if options.key?(:initial)
+      self.state_options = options
+      add_states(*[self.initial_state].concat(args))
     end
 
-    def add_states(*states)
-      self.state_names = (self.state_names || []).concat(states.compact.map(&:to_sym)).uniq
+    def add_states(*names)
+      self.state_names = self.state_names.concat(names.compact.map(&:to_sym)).uniq
     end
 
     def event(name, options = {})
       add_states(options[:to], *options[:from])
       self.events += [Event.new(name, options)]
     end
+
+    def states_module
+      const_defined?(*args) ? self::StatesProxy : const_set(:StatesProxy, Module.new)
+    end
   end
 
   attr_reader :past_states
@@ -66,13 +74,4 @@ module SimpleStates
   def was_state?(state)
     past_states.concat([self.state.try(:to_sym)]).compact.include?(state.to_sym)
   end
-
-  def respond_to?(method, include_private = false)
-    method.to_s =~ /(was_|^)(#{self.class.states.join('|')})\?$/ && self.class.state_names.include?($2.to_sym) || super
-  end
-
-  def method_missing(method, *args, &block)
-    method.to_s =~ /(was_|^)(#{self.class.states.join('|')})\?$/ ? send(:"#{$1}state?", $2, *args) : super
-  end
 end
-

data/lib/simple_states/event.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/module/delegation'
+require 'hashr'
 
 module SimpleStates
   class Event
@@ -6,7 +7,11 @@ module SimpleStates
 
     def initialize(name, options = {})
       @name    = name
-      @options = options
+      @options = Hashr.new(options) do
+        def except
+          self[:except]
+        end
+      end
     end
 
     def saving
@@ -40,29 +45,35 @@ module SimpleStates
 
       def skip?(object, args)
         result = false
-        result ||= !send_methods(object, options[:if], args) if options.key?(:if)
-        result ||= send_methods(object, options[:unless], args) if options.key?(:unless)
+        result ||= !send_methods(object, options.if, args) if options.if?
+        result ||= send_methods(object, options.unless, args) if options.unless?
         result
       end
 
       def can_transition?(object)
-        !options[:from] || object.state && Array(options[:from]).include?(object.state.to_sym)
+        !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[type.to_sym], args)
+        send_methods(object, options.send(type), args)
       end
 
       def set_state(object)
         state = target_state
         object.past_states << object.state if object.state
-        object.state = state.to_sym
+        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?
       end
 
+      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)
+      end
+
       def target_state
-        options[:to] || :"#{name}ed"
+        options.to || :"#{name}ed"
       end
 
       def send_methods(object, methods, args)
@@ -84,7 +95,7 @@ module SimpleStates
       end
 
       def known_target_state?(object)
-        object.state && object.class.states.include?(object.state.to_sym)
+        object.state && object.class.state_names.include?(object.state.to_sym)
       end
 
       def raise_invalid_transition(object)

data/lib/simple_states/states.rb

@@ -2,46 +2,55 @@ module SimpleStates
   class States < Module
     class << self
       def init(object)
-        object.singleton_class.send(:include, proxy_for(object.class))
+        object.class.state_names = [object.class.initial_state] if object.class.state_names.empty?
+        respond_to?(:prepend) ? prepend_module(object.class) : include_module(object)
         object.init_state unless object.singleton_class.respond_to?(:after_initialize)
       end
 
-      def proxy_for(klass)
-        args = [:StatesProxy].concat(klass.method(:const_defined?).arity != 1 ? [false] : [])
-        klass.const_defined?(*args) ? klass::StatesProxy : klass.const_set(:StatesProxy, new(klass.events))
+      def prepend_module(const)
+        const.prepend(module_for(const)) unless const.const_defined?(:StatesProxy)
       end
-    end
-
-    attr_reader :events
 
-    def initialize(events)
-      @events = merge_events(events)
-      setup
-    end
+      def include_module(object)
+        object.singleton_class.send(:include, module_for(object.class))
+      end
 
-    protected
+      def module_for(const)
+        args = [:StatesProxy].concat(const.method(:const_defined?).arity != 1 ? [false] : [])
+        const.const_defined?(*args) ? const::StatesProxy : const.const_set(:StatesProxy, create_module(const))
+      end
 
-      def setup
-        events.each do |event|
-          define_event(event)
+      def create_module(const)
+        new.tap do |mod|
+          merge_events(const.events).each { |event| define_event(mod, event) }
+          const.state_names.each { |name| define_state(mod, name) }
         end
       end
 
-
-      def define_event(event)
-        define_method(event.name) do |*args|
+      def define_event(const, event)
+        const.send(:define_method, event.name) do |*args|
           event.send(:call, self, *args) do
-            super(*args) if self.class.method_defined?(event.name)
+            super(*args) if defined?(super)
           end
         end
 
-        define_method(:"#{event.name}!") do |*args|
+        const.send(:define_method, :"#{event.name}!") do |*args|
           event.saving do
             send(event.name, *args)
           end
         end
       end
 
+      def define_state(const, state)
+        const.send(:define_method, :"#{state}?") do |*args|
+          defined?(super) ? super() : state?(state, *args)
+        end
+
+        const.send(:define_method, :"was_#{state}?") do |*args|
+          defined?(super) ? super() : was_state?(state, *args)
+        end
+      end
+
       def merge_events(events)
         if merge_ix = events.index { |event| event.name == :all }
           merge = events.slice!(merge_ix)
@@ -53,5 +62,6 @@ module SimpleStates
           events
         end
       end
+    end
   end
 end

data/lib/simple_states/version.rb

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

data/simple_states.gemspec

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'simple_states/version'
+
+Gem::Specification.new do |s|
+  s.name         = "simple_states"
+  s.version      = SimpleStates::VERSION
+  s.authors      = ["Sven Fuchs"]
+  s.email        = "svenfuchs@artweb-design.de"
+  s.homepage     = "https://github.com/svenfuchs/simple_states"
+  s.summary      = "[summary]"
+  s.description  = "[description]"
+
+  s.files        = Dir.glob("{lib/**/*,[A-Z]*}")
+  s.platform     = Gem::Platform::RUBY
+  s.require_path = 'lib'
+  s.rubyforge_project = '[none]'
+
+  s.add_dependency 'activesupport'
+  s.add_dependency 'hashr', '~> 0.0.10'
+
+  s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'test_declarative'
+  s.add_development_dependency 'mocha'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: hashr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
+        version: 0.0.10
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: test_declarative
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - lib/simple_states/event.rb
 - lib/simple_states/states.rb
 - lib/simple_states/version.rb
+- simple_states.gemspec
 homepage: https://github.com/svenfuchs/simple_states
 licenses: []
 metadata: {}
@@ -110,13 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: "[summary]"
 test_files: []
+has_rdoc: