stonewall 0.2.0 → 0.3.1

data/Rakefile

@@ -10,10 +10,10 @@ begin
     gem.email = "dbock@codesherpas.com"
     gem.homepage = "http://github.com/bokmann/stonewall"
     gem.authors = ["bokmann"]
-    gem.add_dependency('activerecord','>= 2.0.0')
+    gem.add_dependency('activerecord', '>= 2.0.0', '< 2.4.0')
     gem.add_dependency('sentient_user','>= 0.1.0')
     
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 2.11.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/rails/active_record.rb

@@ -3,7 +3,16 @@ ActiveRecord::Base.class_eval do
   def method_missing_with_stonewall(symb, *args)
     method_name = symb.to_s
     if method_name =~ /^may_(.+?)[\!\?]$/
-      args.first.class.stonewall.actions[$1.to_sym].call(args.first, self)
+      guard = $1
+      if guard.ends_with?("_any")
+        guard = guard.gsub("_any", "")
+        args.first.any?{ |o| o.class.stonewall.actions[guard.to_sym].call(o, self) }
+      elsif guard.ends_with?("_all")
+        guard = guard.gsub("_all", "")
+        args.first.all?{ |o| o.class.stonewall.actions[guard.to_sym].call(o, self) }
+      else
+        args.first.class.stonewall.actions[guard.to_sym].call(args.first, self)
+      end
     else
       method_missing_without_stonewall(symb, *args)
     end
@@ -15,6 +24,15 @@ ActiveRecord::Base.class_eval do
   # need to fix the update_attributes, read_attribute, and write_attribute problem here.
   
   def update_attributes_with_stonewall(*args)
+    if respond_to?(:stonewall)
+      args[0].keys.each do |attribute|
+        attribute = attribute.to_sym unless attribute.class == Symbol
+      
+        if stonewall.guarded_attributes.include?(attribute)
+           raise Stonewall::AccessViolationException.new " \n User id: #{User.current.id}\n User role info: #{User.current.stonewall_role_info}\n Number of Roles for User: #{User.current.stonewall_role_info.length}\n Class: #{self.class.name}\n Object id: #{self.id}\n Method: #{attribute}=" unless allowed?((attribute.to_s + "=").to_sym)
+        end
+      end
+    end
     update_attributes_without_stonewall(*args)
   end
   alias_method_chain :update_attributes, :stonewall
@@ -23,4 +41,6 @@ ActiveRecord::Base.class_eval do
   # it is intentional that we are not blocking read_attribute and write_attribute methods.
   # These are rare in real world rails apps, and where they are being used, permissions
   # would generally be a hinderance.
+  
+  
 end

data/lib/stonewall/access_violation_exception.rb

@@ -0,0 +1,5 @@
+module Stonewall
+  class AccessViolationException < StandardError
+
+  end
+end

data/lib/stonewall/helpers.rb

@@ -54,7 +54,7 @@ module StoneWall
         if stonewall.allowed?(self, User.current, m)
           self.send(unchecked_method, *args)
         else
-          raise "Access Violation"
+          raise Stonewall::AccessViolationException.new " \n User id: #{User.current.id}\n User Role Info: #{User.current.stonewall_role_info}\n Number of Roles for User: #{User.current.stonewall_role_info.length}\n Class: #{self.class.name}\n Object id: #{self.id}\n Method: #{checked_method}"
         end
       end
       # -------------- end of bizzaro meta-juju

data/lib/stonewall/parser.rb

@@ -12,7 +12,7 @@ module StoneWall
             @parent.stonewall.add_grant(@role, @variant, m)
           end
         else
-          @parent.stonewall.add_grant(@role, @variant, m)
+          @parent.stonewall.add_grant(@role, @variant, allowed)
         end
       end
     end    
@@ -28,7 +28,17 @@ module StoneWall
     def action(action_name, &guard)
       @parent.stonewall.actions[action_name] = guard 
     end
-
+    
+    def guard_aasm_events
+      @parent.aasm_events.keys.each do |event|
+        @parent.stonewall.actions[event] = Proc.new { |object, user|          
+          User.do_as(user) {
+            object.send(("may_" + event.to_s + "?").to_sym)
+          }
+        }
+      end
+    end
+    
     def role(role_name)
       yield Parser.new(@parent, role_name)
     end

data/lib/stonewall/stonewall.rb

@@ -12,7 +12,15 @@ module StoneWall
                   "/user_extensions.rb"
         cattr_accessor :stonewall
         self.stonewall = StoneWall::AccessController.new(self)
-        yield StoneWall::Parser.new(self)
+        parser = StoneWall::Parser.new(self)
+        yield parser
+        
+        # if we are being used with acts_as_state_machine (at least, our patched
+        # version), then we also want the on_transition guards to function as
+        # action guards in stonewall.
+        if self.respond_to?(:aasm_events)
+          parser.guard_aasm_events
+        end
       end
 
       # --------------
@@ -23,9 +31,9 @@ module StoneWall
         define_attribute_methods_without_stonewall
         StoneWall::Helpers.fix_aliases_for(self) # if a stonewall enhanced class?
       end
-
-      class << self
-        unless respond_to?(:define_attribute_methods_without_stonewall)
+      
+      unless respond_to?(:define_attribute_methods_without_stonewall)
+        class << self
           alias_method_chain :define_attribute_methods, :stonewall
         end
       end

data/lib/stonewall.rb

@@ -3,5 +3,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require File.expand_path(File.dirname(__FILE__)) + "/stonewall/stonewall.rb"
+require File.expand_path(File.dirname(__FILE__)) + "/stonewall/access_violation_exception.rb"
 require File.expand_path(File.dirname(__FILE__)) + "/stonewall/user_extensions.rb"
 require 'rails/active_record'

data/test/helper.rb

@@ -10,3 +10,33 @@ require 'stonewall'
 
 class Test::Unit::TestCase
 end
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sqlite3",
+  :database => ":memory:"
+)
+
+class Doodad < ActiveRecord::Base
+  include StoneWall
+  stonewall do |s|
+    s.action :pop do
+      true
+    end
+    s.action :whiz do
+      false
+    end
+  end
+end
+class User < ActiveRecord::Base; end
+
+class CreateDoodads < ActiveRecord::Migration
+  def self.up
+    create_table :doodads do |t|
+      t.string :thingy
+    end
+    create_table :users do |t|
+      t.string :name
+    end
+  end
+end
+catch_output = CreateDoodads.up

data/test/test_active_record_extensions.rb

@@ -9,6 +9,35 @@ class TestActiveRecordExtensions < Test::Unit::TestCase
   should "define a method_missing_with_stonewall"
   
   should "call a stored action when we call a non-existent 'may_' method"
-  
+    
   should "chain method_missing"
+  
+  context 'may_ methods' do
+      should 'call the stonewall action' do
+        assert User.new.may_pop?(Doodad.new)
+      end
+      should 'raise an error if the given action does not exist' do
+        assert_raise(NoMethodError){
+          User.new.may_be_awesome?(Doodad.new)
+        }
+      end
+    context "ending in '_any?'" do
+      should 'call the stonewall action' do
+        doodads = Array.new
+        doodads << Doodad.new
+        doodads << Doodad.new
+        assert User.new.may_pop_any?(doodads)
+      end
+    end
+    
+    context "ending in '_all?'" do
+      should 'call the stonewall action' do
+        doodads = Array.new
+        doodads << Doodad.new
+        doodads << Doodad.new
+        assert User.new.may_pop_all?(doodads)
+      end
+    end
+         
+  end
 end

data/test/test_guarded_collection.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+class TestGuardedCollection < Test::Unit::TestCase
+  
+  should "return true just to be a bad boy until my testing is in place" do
+    assert true
+  end
+  
+  context "with a homogenous collection of guarded objects" do
+    context "where all allow a particular action" do
+      should "return true with may_schpoo_any?"
+      should "return true with may_schpoo_all?"
+    end
+    context "where only one allows a particular action" do
+      should "return true with may_schpoo_any?"
+      should "return false with may_schpoo_all?"
+    end
+    context "where none allows a particular action" do
+      should "return false with may_schpoo_any?"
+      should "return false with may_schpoo_all?"
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 0
-  version: 0.2.0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - bokmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,6 +29,13 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,15 +53,17 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
   version_requirements: *id003
 description: The acl from StoneWall, now as a shiny new gem!
@@ -68,7 +77,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -77,6 +85,7 @@ files:
 - lib/rails/active_record.rb
 - lib/stonewall.rb
 - lib/stonewall/access_controller.rb
+- lib/stonewall/access_violation_exception.rb
 - lib/stonewall/helpers.rb
 - lib/stonewall/parser.rb
 - lib/stonewall/stonewall.rb
@@ -85,6 +94,7 @@ files:
 - test/test_access_controller.rb
 - test/test_active_record_extensions.rb
 - test/test_guarded_class.rb
+- test/test_guarded_collection.rb
 - test/test_helpers.rb
 - test/test_parser.rb
 - test/test_stonewall.rb
@@ -94,8 +104,8 @@ homepage: http://github.com/bokmann/stonewall
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -124,6 +134,7 @@ test_files:
 - test/test_access_controller.rb
 - test/test_active_record_extensions.rb
 - test/test_guarded_class.rb
+- test/test_guarded_collection.rb
 - test/test_helpers.rb
 - test/test_parser.rb
 - test/test_stonewall.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC