johnsbrn-has_permission 0.2.4 → 0.2.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 0
 :minor: 2

data/lib/has_permission.rb

@@ -1,6 +1,9 @@
 require 'active_record'
 require 'active_record/has/permission'
+require 'action_controller'
+require 'action_controller/has/permission'
 require 'permission/base'
 require 'permission_exception'
 
-ActiveRecord::Base.send :include, ActiveRecord::Has::Permission
+ActiveRecord::Base.send :include, ActiveRecord::Has::Permission
+ActionController::Base.send :include, ActionController::Has::Permission

data/test/has_permission_test.rb

@@ -89,6 +89,29 @@ class HasPermissionTest < Test::Unit::TestCase
     end
   end
   
+  context "controller permission" do
+    setup do
+      @controller = ModelController.new
+    end
+    
+    should "call access denied for index" do
+      @controller.expects(:access_denied).once
+      @controller.index
+    end
+    
+    context "with options" do
+      setup do
+        @controller2 = Model2Controller.new
+      end
+      
+      should "call no access for index" do
+        @controller2.expects(:no_access).once
+        @controller2.index
+      end
+      
+    end
+  end
+  
   should "use default namespace setting" do
     assert_equal Permission::ModelPermission, Model.permission_class
   end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'has_permission'
 
 # this doesn't seem like the best way to do this - maybe someone will suggest a better method
+
 class Model
 
   include ActiveRecord::Has::Permission
@@ -49,12 +50,27 @@ class ModelB
   has_permission :namespace => ''
 end
 
-class ModelBPermission
+class ModelBPermission < Permission::Base
+  def can_index?
+    false
+  end
+  
+  def can_show?
+    true
+  end
 end
 
 module Permission
   class ModelPermission < Permission::Base
   
+    def can_index?
+      false
+    end
+    
+    def can_show?
+      true
+    end
+    
     def can_read?(attr_name)
       case attr_name
         when :read_access : true
@@ -85,5 +101,49 @@ module Permission
   end
 end
 
+class ModelController
+  include ActionController::Has::Permission
+  
+  def controller_name
+    "model"
+  end
+  
+  def index
+    "index"
+  end
+  
+  def show
+    "show"
+  end
+  
+  def current_user
+    nil
+  end
+  
+  requires_permission :index, :show
+end
+
+class Model2Controller
+  include ActionController::Has::Permission
+  
+  def controller_name
+    "model"
+  end
+  
+  def index
+    "index"
+  end
+  
+  def show
+    "show"
+  end
+  
+  def current_user
+    nil
+  end
+  
+  requires_permission :index, :show, :access_denied => 'no_access', :class => ModelB
+end
+
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnsbrn-has_permission
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Brian Johnson
@@ -23,6 +23,9 @@ extra_rdoc_files: []
 
 files: 
 - VERSION.yml
+- lib/action_controller
+- lib/action_controller/has
+- lib/action_controller/has/permission.rb
 - lib/active_record
 - lib/active_record/has
 - lib/active_record/has/permission.rb