progressive 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965939ad3863d6a0c31c7d6531e4dcd5304f25ca
-  data.tar.gz: c00604acf1b260e35675ee60910a7c34e7c7847c
+  metadata.gz: 64289288aa2a2161424c2f7e917358fb6ecbd49e
+  data.tar.gz: ad002250254baacb97690247cd5ee6fc89348e0a
 SHA512:
-  metadata.gz: 0ef9acd62d8ca2c14313fd128d4c4c101d34a9e078563848fdac1cdc28d12f165dda937046c1b94823a7c399ad2e8d90dd02219dc10fbdc8f518e3df15e4d86f
-  data.tar.gz: ad5c52c3fa5e2fd20b3f449ead496beba076cd0110c8577c05af5fb6a96463706be776a37f7d32bd238ba356a3e86774f1bbca89ec69b29f0f5f116bc2bba623
+  metadata.gz: a2dcc8a2730c54a7af80ecb691b7a3a5bff4fbf0c38c51545ee9af1f49e1c4b67c0236972462dd95b39bfe0daa9db0880aeb4176e586e8f83b7d6b14a83eb6d4
+  data.tar.gz: f23dd3192472187b93046ee3191d2ae94fff61160d0770feaa399f8305860e41e8bcc43c04aef7b749406ca146ec7c064d4a491acedac61e56d6627284c765e0

data/lib/progressive/specification.rb

@@ -4,7 +4,7 @@ module Progressive
       attr_reader :events
 
       def initialize(&block)
-        @events = {}
+        @events = ActiveSupport::HashWithIndifferentAccess.new
         return unless block.present?
         instance_eval(&block)
       end
@@ -25,7 +25,7 @@ module Progressive
       #
       # Returns true if event exists, false if not.
       def event?(state)
-        @events.key?(state.to_sym)
+        @events.key?(state)
       end
     end
 
@@ -54,7 +54,7 @@ module Progressive
       raise MissingConfiguration if block.nil?
 
       @options = options
-      @states = {}
+      @states = ActiveSupport::HashWithIndifferentAccess.new
 
       instance_eval(&block)
     end
@@ -65,7 +65,7 @@ module Progressive
     #
     # Returns true if exists, false if not.
     def event?(event)
-      event_names.include?(event.to_sym)
+      event_names.include?(event.to_s)
     end
 
     # Public: All possible events that can be applied to the subject. Doesn't
@@ -95,7 +95,7 @@ module Progressive
     #
     # Returns true if defined, false if not.
     def state?(state)
-      @states.key?(state.to_sym)
+      @states.key?(state)
     end
 
     # Public: Returns the default state for the specification.
@@ -104,7 +104,7 @@ module Progressive
     def default_state
       @default_state ||=
         if options.key?(:default)
-          options[:default]
+          options[:default].to_s
         elsif states.any?
           states.keys.first
         end

data/lib/progressive/state.rb

@@ -1,39 +1,72 @@
 module Progressive
   class State < ActiveRecord::Base
     belongs_to :subject, polymorphic: true
-
-    validates :subject_type, presence: true
-    validates :subject_id, presence: true, uniqueness: { scope: [:subject_type] }
     validates :state, presence: true
 
+    after_initialize :set_default_state, :if => :specification?
+    before_validation :set_default_state, :on => :create
+
     def specification
-      @specification ||= subject.specification
+      Progressive.specifications[subject_type]
+    end
+
+    def specification?
+      return false unless loaded?
+      specification.present?
+    end
+
+    # If we try to access subject_type before it's present, method_missing goes
+    # nuts.
+    #
+    # Returns true if loaded, false if not.
+    def loaded?
+      !read_attribute(:subject_type).nil?
     end
 
     def method_missing(method_sym, *args, &block)
-      if specification.state?(method_sym)
+      return super unless loaded?
+
+      if specification.event?(method_sym)
         to(method_sym, *args)
-      elsif method_sym.to_s[-1] == '?'
+      elsif method_sym.to_s[-1] == '?' && specification.state?(method_sym.to_s[0..-2])
         predicate = method_sym.to_s[0..-2]
-        state == predicate
+        state.to_sym == predicate.to_sym
       else
         super
       end
     end
 
+    # This will be available for all callbacks to get better context around event
+    # changes.
+    #
+    # Returns Hash.
+    def default_event_context
+      {}
+    end
+
     # Public: Transition from the current state to a new state.
     #
     # state - The event
     #
     # Returns nothing.
-    def to(state, options = {})
-      return false unless current_state.event?(state)
+    def to(event, options = {})
+      return false unless current_state.event?(event)
+
+      current_event = current_state.events[event]
+
+      previous_event_context = subject.event_context
+      subject.event_context = default_event_context.merge(options).merge({
+        from: state.to_sym,
+        to: current_event.to
+      })
 
       subject.run_callbacks(:progress) do
-        subject.run_callbacks(state) do
-          update_attribute(:state, state)
+        subject.run_callbacks(current_event.name) do
+          update_attribute(:state, current_event.to)
         end
       end
+    ensure
+      subject.event_context = previous_event_context
     end
 
     def current_state
@@ -43,6 +76,16 @@ module Progressive
     def to_s
       state
     end
-    delegate :humanize, to: :to_s
+
+    def to_param
+      state
+    end
+
+    private
+
+    def set_default_state
+      return unless specification?
+      self.state ||= specification.default_state
+    end
   end
 end

data/lib/progressive/subject.rb

@@ -7,9 +7,9 @@ module Progressive
     include ActiveModel::Callbacks
 
     included do
-      class_attribute :specification
-
       define_model_callbacks :progress, only: [:before, :after]
+
+      attr_accessor :event_context
     end
 
     module ClassMethods
@@ -25,22 +25,18 @@ module Progressive
         self.specification = Specification.new(options, &block)
         define_model_callbacks(*specification.event_names, only: [:before, :after])
       end
-    end
 
-    def method_missing(method_sym, *args, &block)
-      if method_sym.to_s[-1] == '?' && specification.state?(method_sym.to_s[0..-2])
-        specification.send(method_sym)
-      else
-        super
+      def specification=(specification)
+        Progressive.specifications[name] = specification
+      end
+
+      def specification
+        Progressive.specifications[name]
       end
     end
 
     def specification
       self.class.specification
     end
-
-    def human_state
-      state.humanize
-    end
   end
 end

data/lib/progressive/version.rb

@@ -1,3 +1,3 @@
 module Progressive
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/lib/progressive.rb

@@ -1,7 +1,12 @@
 require 'progressive/version'
 
 module Progressive
-  # Your code goes here...
+  class InvalidProgress < StandardError; end
+  class MissingConfiguration < StandardError; end
+
+  # Direct mapping of service names to their service object.
+  mattr_accessor :specifications
+  @@specifications = {}
 end
 
 require 'progressive/specification'

data/progressive.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel', '>= 3.0.0'
+  spec.add_dependency 'activemodel', '>= 5.0.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progressive
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - dewski
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement