self-control 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/self-control/action.rb

@@ -0,0 +1,46 @@
+module SelfControl
+  class Action
+    attr_accessor :name, :goto, :for, :options
+        
+    def initialize(name, options={})
+      @name = name
+      @goto = options.delete(:goto)
+      @hash = options.delete(:hash)
+      @arguments = options.delete(:the) || options.delete(:for) || options.delete(:with)
+    end
+    
+    def url_from(model, env)      
+      goto = in_context(@goto, model, env)
+      hash = in_context(@hash, model, env)
+      args = in_context(@arguments, model, env)
+      
+      url = if goto.is_a?(String) then goto
+      elsif goto.is_a?(Symbol)
+        env.send(goto, args)
+      else
+        env.send(:url_for, (goto || args))
+      end
+      
+      hash ? "#{url}##{hash}" : url
+    end
+    
+    def in_context(option, model, env)
+      case option
+      when String then option
+      when Symbol
+        if model.respond_to?(option) then model.send(option)
+        elsif option.to_s.starts_with?('@')
+          env.instance_variable_get(option)
+        else
+          option
+        end
+      when Array
+        option.map { |opt| in_context(opt, model, env) }
+      when Hash
+        Hash[option.map { |k,v| [k.to_sym, in_context(v, model, env)] }]
+      when Proc
+        option.call(*[model,env].take(option.arity >= 0 ? option.arity : 0))
+      end      
+    end    
+  end
+end

data/lib/self-control/builder.rb

@@ -0,0 +1,26 @@
+module SelfControl
+  class Builder
+    attr_accessor :klass, :actions, :flows, :state_column
+    
+    def initialize(klass, state_column=false, &block)
+      @state_column = (state_column ? state_column.to_sym : false)
+      @klass = klass
+      @actions = {}
+      @flows = {}
+      instance_eval(&block)
+    end
+    
+    private
+    
+    def to(action,options={})
+      action = action.to_sym
+      @actions[action] = SelfControl::Action.new(action, options)
+    end
+    
+    def steps(options={}, &block)
+      state = (options.delete(:when) || :default).to_sym
+      @flows[state] = SelfControl::FlowBuilder.new(state, &block)
+    end
+  end
+end
+

data/lib/self-control/{controller_additions.rb → controller_extensions.rb}

@@ -1,8 +1,9 @@
 module SelfControl
-  module ControllerAdditions
+  module ControllerExtensions
     extend ActiveSupport::Concern
     
-    module InstanceMethods      
+    module InstanceMethods
+            
       def steps_list
         @selfcontrol_steps = valid_selfcontrol? ? selfcontrol.steps_for(selfcontrol_actor) : []
         respond_with(@selfcontrol_steps)
@@ -75,8 +76,7 @@ module SelfControl
         unless allow_selfcontrol_step?
           raise SelfControl::AccessDenied.new(nil, selfcontrol_actor, params[:step], params[:choose])
         end
-      end
-        
+      end      
     end
   end
 end

data/lib/self-control/helper.rb

@@ -0,0 +1,11 @@
+module SelfControl
+  module Helper
+    def step_url_for(resource, action_name, options={})
+      return unless resource
+      return unless builder = resource.selfcontrol_builder
+      action_name = action_name.to_sym
+      action = builder.actions[action_name] || SelfControl::Action.new(action_name, options)
+      action.url_from(resource,self).html_safe
+    end 
+  end
+end

data/lib/self-control/railtie.rb

@@ -1,8 +1,15 @@
-require 'self-control/route_helpers'
-require 'self-control/controller_additions'
+require 'self-control/helper'
 require 'self-control/step_adapter'
+require 'self-control/route_helpers'
+require 'self-control/controller_extensions'
 
 module SelfControl
   class Railtie < Rails::Railtie
+    initializer 'selfcontrol.app_controller' do |app|
+      ActionController::Base.helper(SelfControl::Helper)
+      ActiveSupport.on_load(:application_controller) do
+        include SelfControl::ControllerExtensions
+      end
+    end
   end
 end

data/lib/self-control/step.rb

@@ -33,9 +33,17 @@ module SelfControl
       @builder.actor.to_sym
     end
     
+    def model_id
+      @model.id if @model.respond_to?(:id)
+    end
+    
     def model_name
       ActiveModel::Naming.singular(@model) if defined?(ActiveModel::Naming)
     end
+
+    def model_collection
+      ActiveModel::Naming.plural(@model) if defined?(ActiveModel::Naming)
+    end
     
     def actor
       return if actor_method.nil?

data/lib/self-control.rb

@@ -5,46 +5,41 @@ module SelfControl
   extend ActiveSupport::Concern
   
   module ClassMethods
-    attr_reader :selfcontrol_list
-    attr_writer :selfcontrol_column
+    attr_reader :selfcontrol_builder
     
-    def selfcontrol(state=nil, options={}, &block)
-      state = (state || options[:when]).to_sym
-      @selfcontrol_list ||= {}
-      @selfcontrol_list[state] = SelfControl::FlowBuilder.new(state, &block)
+    def selfcontrol(options={}, &block)
+      state_column = options.delete(:for)
+      @selfcontrol_builder = SelfControl::Builder.new(self, state_column, &block)
     end
     
-    alias :control_when :selfcontrol
-    
-    def selfcontrol_column
-      @selfcontrol_column ||= 'state'
-    end
+    alias :flowcontrol :selfcontrol    
   end
   
-  module InstanceMethods
-    def selfcontrol_list
-      self.class.selfcontrol_list
-    end
-    
-    def selfcontrol_column
-      self.class.selfcontrol_column
+  module InstanceMethods    
+    def selfcontrol_builder
+      self.class.selfcontrol_builder
     end
         
-    def current_selfcontrol_state
-      (self.respond_to?(selfcontrol_column) ? self.send(selfcontrol_column) : :default).to_sym
-    end
-    
-    def selfcontrol(state=current_selfcontrol_state)
-      return unless builder = self.selfcontrol_list[state]
+    def selfcontrol(state=nil)
+      return false unless selfcontrol_builder.is_a?(SelfControl::Builder)
+
+      state ||= :default unless state_column = selfcontrol_builder.state_column
+      state ||= (self.respond_to?(state_column) ? self.send(state_column) : :default).to_sym
+
       @selfcontrol_flows ||= {}
-      @selfcontrol_flows[state] ||= SelfControl::Flow.new(builder,self)
-    end
+      return @selfcontrol_flows[state] if @selfcontrol_flows[state].is_a?(SelfControl::Flow)
+
+      return false unless builder = selfcontrol_builder.flows[state]
+      @selfcontrol_flows[state] = SelfControl::Flow.new(builder, self)
+    end    
   end
   
+  autoload :Builder, 'self-control/builder'
   autoload :FlowBuilder, 'self-control/flow_builder'
   autoload :StepBuilder, 'self-control/step_builder'
   autoload :Flow, 'self-control/flow'
   autoload :Step, 'self-control/step'
+  autoload :Action, 'self-control/action'
 end
 
 require 'self-control/railtie' if defined?(Rails)

data/self-control.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{self-control}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hexorx"]
-  s.date = %q{2011-06-20}
+  s.date = %q{2011-06-22}
   s.description = %q{State machines are awesome but sometimes you need a little more. Like who should do what in order for it to move on? How many steps are left? How can I restfully trigger the next event? Self Control adds route helpers, controller actions and a dsl to turn your existing state machines into full workflows. It is designed to use rails 3 with ActiveModel and should work with any state machine with just a few extra methods.}
   s.email = %q{hexorx@gmail.com}
   s.extra_rdoc_files = [
@@ -23,10 +23,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/self-control.rb",
-    "lib/self-control/controller_additions.rb",
+    "lib/self-control/action.rb",
+    "lib/self-control/builder.rb",
+    "lib/self-control/controller_extensions.rb",
     "lib/self-control/exceptions.rb",
     "lib/self-control/flow.rb",
     "lib/self-control/flow_builder.rb",
+    "lib/self-control/helper.rb",
     "lib/self-control/railtie.rb",
     "lib/self-control/route_helpers.rb",
     "lib/self-control/step.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: self-control
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - hexorx
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -06:00
+date: 2011-06-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,10 +62,13 @@ files:
 - Rakefile
 - VERSION
 - lib/self-control.rb
-- lib/self-control/controller_additions.rb
+- lib/self-control/action.rb
+- lib/self-control/builder.rb
+- lib/self-control/controller_extensions.rb
 - lib/self-control/exceptions.rb
 - lib/self-control/flow.rb
 - lib/self-control/flow_builder.rb
+- lib/self-control/helper.rb
 - lib/self-control/railtie.rb
 - lib/self-control/route_helpers.rb
 - lib/self-control/step.rb