stator 0.5.0 → 0.9.0.beta

data/lib/stator/transition.rb

@@ -1,44 +1,39 @@
+# frozen_string_literal: true
+
 module Stator
   class Transition
-
-    ANY = '__any__'
-
-    attr_reader :name
-    attr_reader :full_name
+    attr_reader :namespace, :name, :attr_name, :from_states, :to_state, :class_name, :callbacks
 
     def initialize(class_name, name, namespace = nil)
-      @class_name = class_name
-      @name       = name
-      @namespace  = namespace
-      @full_name  = [@namespace, @name].compact.join('_') if @name
-      @froms      = []
-      @to         = nil
-      @callbacks  = {}
+      @class_name  = class_name
+      @name        = name&.to_sym
+      @namespace   = namespace&.to_sym
+      @from_states = []
+      @to_state    = nil
+      @callbacks   = {}
     end
 
-    def from(*froms)
-      @froms |= froms.map{|f| f.try(:to_s) } # nils are ok
+    def attr_name
+      @attr_name ||= generate_attr_name
     end
 
-    def to(to)
-      @to = to.to_s
+    def from_states(*new_froms)
+      @from_states |= new_froms
     end
+    alias from from_states
 
-    def to_state
-      @to
-    end
-
-    def from_states
-      @froms
+    def to(new_to)
+      @to_state = new_to
     end
 
     def can?(current_state)
-      @froms.include?(current_state) || @froms.include?(ANY) || current_state == ANY
+      from_states.include?(current_state) || from_states.include?(Stator::ANY) || current_state == Stator::ANY
     end
 
-    def valid?(from, to)
-      can?(from) &&
-      (@to == to || @to == ANY || to == ANY)
+    def valid?(from_check, to_check)
+      from_check = from_check&.to_sym # coming from the database, i suspect
+
+      can?(from_check) && (to_check == to_state || to_check == ANY || to_state == ANY)
     end
 
     def conditional(options = {}, &block)
@@ -46,79 +41,85 @@ module Stator
     end
 
     def any
-      ANY
+      Stator::ANY
     end
 
     def evaluate
-      generate_methods unless @full_name.blank?
+      generate_methods if attr_name.present?
     end
 
-    protected
+    private
 
     def klass
-      @class_name.constantize
+      class_name.constantize
+    end
+
+    def generate_attr_name
+      if namespace == Stator.default_namespace
+        name
+      else
+        [namespace, name].compact.join('_').to_sym
+      end
     end
 
     def callbacks(kind)
-      @callbacks[kind] || []
+      callbacks[kind] || []
     end
 
     def conditional_block(options = {})
       options[:use_previous] ||= false
 
-      _namespace = @namespace
-      _froms     = @froms
-      _to        = @to
-
-      Proc.new do
-        (
-          self._stator(_namespace).integration(self).state_changed?(options[:use_previous])
-        ) && (
-          _froms.include?(self._stator(_namespace).integration(self).state_was(options[:use_previous])) ||
-          _froms.include?(::Stator::Transition::ANY)
-        ) && (
-          self._stator(_namespace).integration(self).state == _to ||
-          _to == ::Stator::Transition::ANY
-        )
+      _namespace = namespace
+      _froms     = from_states
+      _to        = to_state
+
+      proc do
+        integration = self.class._stator(_namespace).integration(self)
+
+        integration.state_changed?(options[:use_previous]) &&
+          _froms.include?(integration.state_was(options[:use_previous])) ||
+          _froms.include?(Stator::ANY) &&
+            integration.state == _to || _to == Stator::ANY
       end
     end
 
     def generate_methods
       klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-        def #{@full_name}(should_save = true)
-          integration = _integration(#{@namespace.to_s.inspect})
+        def #{attr_name}(should_save = true)
+          integration = _stator_integration(:#{namespace})
 
-          unless can_#{@full_name}?
-            integration.invalid_transition!(integration.state, #{@to.inspect}) if should_save
+          unless can_#{attr_name}?
+            integration.invalid_transition!(integration.state, :#{to_state}) if should_save
             return false
           end
 
-          integration.state = #{@to.inspect}
+          integration.state = :#{to_state}
+
           self.save if should_save
         end
 
-        def #{@full_name}!
-          integration = _integration(#{@namespace.to_s.inspect})
+        def #{attr_name}!
+          integration = _stator_integration(:#{namespace})
 
-          unless can_#{@full_name}?
-            integration.invalid_transition!(integration.state, #{@to.inspect})
+          unless can_#{attr_name}?
+            integration.invalid_transition!(integration.state, :#{to_state})
             raise ActiveRecord::RecordInvalid.new(self)
           end
 
-          integration.state = #{@to.inspect}
+          integration.state = :#{to_state}
           self.save!
         end
 
-        def can_#{@full_name}?
-          integration = _integration(#{@namespace.to_s.inspect})
+        def can_#{attr_name}?
+          integration = _stator_integration(:#{namespace})
           return true if integration.skip_validations
 
-          machine     = self._stator(#{@namespace.to_s.inspect})
-          transition  = machine.transitions.detect{|t| t.full_name.to_s == #{@full_name.inspect}.to_s }
+          machine     = self._stator(:#{namespace})
+          transition  = machine.transitions.detect { |t| t.attr_name == :#{attr_name} }
+
           transition.can?(integration.state)
         end
       EV
     end
-
   end
 end

data/lib/stator/version.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 module Stator
-
   MAJOR       = 0
-  MINOR       = 5
+  MINOR       = 9
   PATCH       = 0
-  PRERELEASE  = nil
-
-  VERSION = [MAJOR, MINOR, PATCH, PRERELEASE].compact.join(".")
+  PRERELEASE  = "beta"
 
+  VERSION = [MAJOR, MINOR, PATCH, PRERELEASE].compact.join('.')
 end

data/lib/stator.rb

@@ -1,6 +1,19 @@
+# frozen_string_literal: true
+
 require 'stator/version'
 require 'stator/alias'
 require 'stator/integration'
 require 'stator/machine'
 require 'stator/model'
 require 'stator/transition'
+
+require 'active_support/concern'
+require 'debug'
+
+module Stator
+  ANY = :__ANY__
+
+  def self.default_namespace
+    ENV.fetch('STATOR_NAMESPACE', :default).to_sym
+  end
+end