stonepath 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/stonepath/acl/controller.rb

@@ -24,7 +24,7 @@ module StonePath
         unchecked_method = unchecked_method_name(method)
 
         guarded_class.send(:define_method, checked_method) do |*args|
-          if acl.allowed?(aasm_current_state, current_user, method)
+          if acl.allowed?(self, current_user, method)
             self.send(unchecked_method, *args)
           elsif StonePath::Config.acl_failure_mode == :exception
             raise "Access Violation"
@@ -53,9 +53,11 @@ module StonePath
         yield @states[state_name]
       end
 
-      def allowed?(state, user, method)
-        puts "allowed called: #{state}, #{user}, #{method}"
-        return true
+      def allowed?(guarded_object, user, method)
+        return true if (guarded_object.nil? || user.nil? || method.nil?)
+        state = guarded_object.aasm_state
+        roles = user.respond_to?(:roles) ? user.roles : [user.role]
+        roles.each { |role| break [true] if states[state].roles[role].allowed?(guarded_object, method) }.uniq[0]
       end
 
       private

data/lib/stonepath/acl/role.rb

@@ -15,6 +15,17 @@ module StonePath
         @checked_methods = Hash.new
       end
 
+      def allowed?(guarded_object, method_name)
+        #first, we check to see if it is a checked method.  If it is, we return whatever the check method says
+        guard = checked_methods[method_name.to_s]
+        
+        return guard.call(guarded_object) if guard
+        
+        default_answer = !(Config.acl_default_access == :deny)
+        checklist = default_answer ? denied_methods : allowed_methods
+        checklist.include?(method_name.to_s) ? !default_answer : default_answer
+      end
+      
       def parent_acl
         @parent_state.parent_acl
       end

data/lib/stonepath/task.rb

@@ -1,38 +1,14 @@
 module StonePath
   module SPTask
-    def self.included(base)
-      base.instance_eval do
-        
-        def assigns_to(workbench)
-          belongs_to :assignee, :class_name => workbench.to_s.classify
-        end
-      
-        def task_for(workitem)
-          #belongs_to :workitem, :polymorphic => true
-          belongs_to :workitem, :class_name => workitem.to_s.classify
-        end
-      
-        def audits_transitions
-          puts "#{self.class} audits transitions"
-        end
-                
-        include AASM
-
-        #we must be attached to a workitem.
-        validates_presence_of :workitem
-        
-        # We can have unassigned tasks.
-        #validates_presence_of :assignee
-        
+    
+    def self.default_config_block
+      lambda {
         aasm_initial_state :active
-
-
         aasm_state :active, :after_enter => :notify_created
         aasm_state :completed, :before_enter => :timestamp_complete, :after_enter => :notify_closed
         aasm_state :expired, :after_enter => :notify_closed
         aasm_state :cancelled, :after_enter => :notify_closed
 
-
         aasm_event :complete do
           transitions :to => :completed, :from => :active
         end
@@ -45,32 +21,57 @@ module StonePath
           transitions :to => :expired, :from => :active
         end
 
-        named_scope :unassigned, lambda { { :conditions => ['assignee_id IS NULL'] } }
-        named_scope :active, lambda { { :conditions => ['aasm_state in (?)', ['active']] } }
+        named_scope :unassigned, { :conditions => ['assignee_id IS NULL'] }
+        named_scope :assigned, { :conditions => ['assignee_id IS NOT NULL'] }
+        named_scope :active, { :conditions => ['aasm_state in (?)', ['active']] }
+        named_scope :completed, { :conditions => ['aasm_state in (?)', ['completed']] }
+        named_scope :expired, { :conditions => ['aasm_state in (?)', ['expired']] }
+        named_scope :cancelled, { :conditions => ['aasm_state in (?)', ['cancelled']] }
         named_scope :overdue, lambda { { :conditions => ['aasm_state in (?) AND due_at < ?',  ['active'], Time.now] } }
-        
-        
-      end
+      }
     end
     
-        private
-        
-        def timestamp_complete
-          self.completed_at = Time.now
-        end
+    def self.included(base)
+      base.instance_eval do
+      
+        belongs_to :assignee, :polymorphic => true
         
-        def notify_created
-          if workitem.respond_to?(:task_created)
-            workitem.task_created(self)
-          end
+        def task_for(workitem, options={})
+          options.merge!(:class_name => workitem.to_s.classify)
+          belongs_to :workitem, options
         end
-        
-        def notify_closed
-         if workitem.respond_to?(:task_closed)
-            workitem.task_closed(self)
-          end
+      
+        def audits_transitions
+          puts "#{self.class} audits transitions"
         end
+                
+        include AASM
         
+      end
+    end
+    
+    def overdue?
+      return false if due_at.nil?
+      due_at < Time.now  
+    end
+    
+    private
+    
+    def timestamp_complete
+      self.completed_at = Time.now
+    end
+    
+    def notify_created
+      if workitem.respond_to?(:task_created)
+        workitem.task_created(self)
+      end
+    end
+    
+    def notify_closed
+     if workitem.respond_to?(:task_closed)
+        workitem.task_closed(self)
+      end
+    end
 
   end
 end

data/lib/stonepath/work_bench.rb

@@ -2,8 +2,10 @@ module StonePath
   module WorkBench
     def self.included(base)
       base.instance_eval do
-        def workbench_for(tasks)
-          has_many tasks, :foreign_key => :assignee_id
+        def workbench_for(tasks, options={})
+          #options.merge!(:foreign_key => :assignee_id)
+          #puts options
+          has_many tasks, :as => :assignee
         end
       end
     end

data/lib/stonepath/work_item.rb

@@ -4,12 +4,13 @@ module StonePath
       base.instance_eval do
         include AASM
         
-        def owned_by(owner)
-          belongs_to :owner, :class_name => owner.to_s.classify
+        def owned_by(owner, options={})
+          options.merge!(:class_name => owner.to_s.classify)
+          belongs_to :owner, options
         end
         
-        def subject_of(tasks)
-          has_many tasks
+        def subject_of(tasks, options={})
+          has_many tasks, options
         end
         
         def stonepath_acl()
@@ -24,7 +25,7 @@ module StonePath
         
         def self.define_attribute_methods_with_hook
           define_attribute_methods_without_hook
-          acl.fix_aliases
+          acl.fix_aliases if defined? self.acl
         end
         
         class << self

data/lib/stonepath/work_owner.rb

@@ -2,8 +2,8 @@ module StonePath
   module WorkOwner
     def self.included(base)
       base.instance_eval do
-        def workowner_for(work_items)
-          has_many work_items
+        def workowner_for(work_items, options={})
+          has_many work_items, options
         end
       end
     end

data/lib/stonepath.rb

@@ -12,9 +12,11 @@ module StonePath
         include StonePath::WorkItem
       end
     
-      def stonepath_task
+      def stonepath_task(&config_block)
         require File.expand_path(File.dirname(__FILE__)) + "/stonepath/task.rb"
         include StonePath::SPTask
+        config_block ||= StonePath::SPTask.default_config_block
+        instance_eval &config_block
       end
     
       def stonepath_workbench
@@ -42,7 +44,7 @@ module StonePath
 end
 
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 
 load File.expand_path( File.dirname(__FILE__)) + "/stonepath/extensions/activerecordbase.rb"
 require "stonepath/config"

data/stonepath.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stonepath}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Bock"]
-  s.date = %q{2009-12-17}
+  s.date = %q{2009-12-20}
   s.description = %q{Stateful workflow modeling for Rails}
   s.email = %q{dbock@codesherpas.com}
   s.extra_rdoc_files = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "test/app_root/app/controllers/application_controller.rb",
      "test/app_root/app/models/assignment.rb",
      "test/app_root/app/models/case.rb",
+     "test/app_root/app/models/custom_assignment.rb",
      "test/app_root/app/models/user.rb",
      "test/app_root/config/boot.rb",
      "test/app_root/config/database.yml",
@@ -62,10 +63,12 @@ Gem::Specification.new do |s|
      "test/app_root/lib/console_with_fixtures.rb",
      "test/app_root/log/.gitignore",
      "test/app_root/script/console",
+     "test/custom_task_test.rb",
      "test/fixtures/users.yml",
      "test/group_test.rb",
      "test/role_test.rb",
      "test/stonepath_test.rb",
+     "test/task_test.rb",
      "test/test_helper.rb",
      "test/workitem_test.rb",
      "test/workowner_test.rb"
@@ -80,6 +83,7 @@ Gem::Specification.new do |s|
      "test/app_root/app/controllers/application_controller.rb",
      "test/app_root/app/models/assignment.rb",
      "test/app_root/app/models/case.rb",
+     "test/app_root/app/models/custom_assignment.rb",
      "test/app_root/app/models/user.rb",
      "test/app_root/config/boot.rb",
      "test/app_root/config/environment.rb",
@@ -93,9 +97,11 @@ Gem::Specification.new do |s|
      "test/app_root/db/migrate/02_create_assignments.rb",
      "test/app_root/db/migrate/03_create_cases.rb",
      "test/app_root/lib/console_with_fixtures.rb",
+     "test/custom_task_test.rb",
      "test/group_test.rb",
      "test/role_test.rb",
      "test/stonepath_test.rb",
+     "test/task_test.rb",
      "test/test_helper.rb",
      "test/workitem_test.rb",
      "test/workowner_test.rb"

data/test/app_root/app/models/assignment.rb

@@ -4,7 +4,6 @@ class Assignment < ActiveRecord::Base
   stonepath_task
   
   task_for :case
-  assigns_to :user
   
   audits_transitions
   

data/test/app_root/app/models/case.rb

@@ -18,7 +18,7 @@ class Case < ActiveRecord::Base
   end
   
   owned_by :user
-  subject_of :assignment
+  subject_of :assignments
   
   
   

data/test/app_root/app/models/custom_assignment.rb

@@ -0,0 +1,22 @@
+class CustomAssignment < ActiveRecord::Base
+  set_table_name "assignments"
+  include StonePath
+  
+  stonepath_task do
+    aasm_initial_state :active
+    aasm_state :active, :after_enter => :notify_created
+    aasm_state :escalated
+    aasm_state :completed, :before_enter => :timestamp_complete, :after_enter => :notify_closed
+
+    aasm_event :complete do
+      transitions :to => :completed, :from => [:active, :escalated]
+    end
+
+    aasm_event :escalate do
+      transitions :to => :escalated, :from => :active
+    end
+  end
+  
+  task_for :case
+  
+end

data/test/app_root/config/environment.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
+  
+  config.gem "aasm"
+    
   config.cache_classes = false
   config.whiny_nils = true
   config.action_controller.session = { :key => "_myapp_session", :secret => "gwirofjweroijger8924rt2zfwehfuiwehb1378rifowenfoqwphf23" }

data/test/app_root/db/migrate/02_create_assignments.rb

@@ -2,6 +2,9 @@ class CreateAssignments < ActiveRecord::Migration
 
   def self.up
     create_table :assignments do |t|
+      t.string :aasm_state
+      t.integer :case_id
+      t.datetime :completed_at
       t.timestamps
     end
   end

data/test/app_root/db/migrate/03_create_cases.rb

@@ -4,6 +4,7 @@ class CreateCases < ActiveRecord::Migration
     create_table :cases do |t|
       t.string :name
       t.string :regarding
+      t.string :aasm_state
       t.timestamps
     end
   end

data/test/custom_task_test.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class CustomTaskTest < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  should "be able to create a custom assignment" do
+    ca = CustomAssignment.create
+    assert(ca.id != nil)
+  end
+  
+  should "be able to escalate a custom assignment" do
+    ca = CustomAssignment.create
+    ca.escalate!
+    assert_equal("escalated", ca.aasm_state)
+  end
+  
+  should "be able to complete a custom assignment" do
+    ca = CustomAssignment.create
+    ca.complete!
+    assert_equal("completed", ca.aasm_state)
+  end
+  
+end
+
+

data/test/task_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TaskTest < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  should "create an assignment associated with a case" do
+    c = Case.create
+    c.assignments.create
+    assert_equal(1, c.assignments.size, "Case should have 1 assignment")
+  end
+  
+  should "have an initial state of active" do
+    c = Case.create
+    a = c.assignments.create
+    assert_equal("active", a.aasm_state)
+  end
+  
+  should "be able to complete an assignment" do
+    c = Case.create
+    a = c.assignments.create
+    a.complete!
+    assert_equal("completed", a.aasm_state)
+  end
+  
+  should "be able to cancel an assignment" do
+    c = Case.create
+    a = c.assignments.create
+    a.cancel!
+    assert_equal("cancelled", a.aasm_state)
+  end
+  
+  should "be able to expire an assignment" do
+    c = Case.create
+    a = c.assignments.create
+    a.expire!
+    assert_equal("expired", a.aasm_state)
+  end
+  
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stonepath
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Bock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -05:00
+date: 2009-12-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - test/app_root/app/controllers/application_controller.rb
 - test/app_root/app/models/assignment.rb
 - test/app_root/app/models/case.rb
+- test/app_root/app/models/custom_assignment.rb
 - test/app_root/app/models/user.rb
 - test/app_root/config/boot.rb
 - test/app_root/config/database.yml
@@ -77,10 +78,12 @@ files:
 - test/app_root/lib/console_with_fixtures.rb
 - test/app_root/log/.gitignore
 - test/app_root/script/console
+- test/custom_task_test.rb
 - test/fixtures/users.yml
 - test/group_test.rb
 - test/role_test.rb
 - test/stonepath_test.rb
+- test/task_test.rb
 - test/test_helper.rb
 - test/workitem_test.rb
 - test/workowner_test.rb
@@ -117,6 +120,7 @@ test_files:
 - test/app_root/app/controllers/application_controller.rb
 - test/app_root/app/models/assignment.rb
 - test/app_root/app/models/case.rb
+- test/app_root/app/models/custom_assignment.rb
 - test/app_root/app/models/user.rb
 - test/app_root/config/boot.rb
 - test/app_root/config/environment.rb
@@ -130,9 +134,11 @@ test_files:
 - test/app_root/db/migrate/02_create_assignments.rb
 - test/app_root/db/migrate/03_create_cases.rb
 - test/app_root/lib/console_with_fixtures.rb
+- test/custom_task_test.rb
 - test/group_test.rb
 - test/role_test.rb
 - test/stonepath_test.rb
+- test/task_test.rb
 - test/test_helper.rb
 - test/workitem_test.rb
 - test/workowner_test.rb