declarative_authorization 0.5 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,4 @@
+** RELEASE 0.5.1 (Sep 12, 2010) **
 
 ** RELEASE 0.5 (July 21, 2010) **
 

data/app/views/authorization_rules/_show_graph.erb

@@ -1,4 +1,11 @@
 <% javascript_tag do %>
+    if (typeof Prototype != 'object') {
+       //load up prototype... it's needed here
+       var s = document.createElement('script');
+       s.setAttribute('src','http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.3/prototype.js');
+       document.getElementsByTagName('body')[0].appendChild(s);
+    }
+
     function show_graph (privilege, context, user_ids) {
         var params = {
           privilege_hierarchy: 1,

data/app/views/authorization_rules/graph.html.erb

@@ -3,6 +3,13 @@
 <p><%= navigation %></p>
 
 <% javascript_tag do %>
+    if (typeof Prototype != 'object') {
+       //load up prototype... it's needed here
+       var s = document.createElement('script');
+       s.setAttribute('src','http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.3/prototype.js');
+       document.getElementsByTagName('body')[0].appendChild(s);
+     }
+
     function update_graph (form) {
         base_url = "<%= url_for :format => 'svg' %>";
         $('graph').data = base_url + '?' + form.serialize();

data/lib/declarative_authorization/authorization.rb

@@ -20,7 +20,7 @@ module Authorization
   # The exception is raised to ensure that the entire rule is invalidated.
   class NilAttributeValueError < AuthorizationError; end
   
-  AUTH_DSL_FILES = [(Rails.root || Pathname.new('')).join("config", "authorization_rules.rb").to_s] unless defined? AUTH_DSL_FILES
+  AUTH_DSL_FILES = [Pathname.new(Rails.root || '').join("config", "authorization_rules.rb").to_s] unless defined? AUTH_DSL_FILES
   
   # Controller-independent method for retrieving the current user.
   # Needed for model security where the current controller is not available.

data/lib/declarative_authorization/maintenance.rb

@@ -148,24 +148,38 @@ module Authorization
       end
     end
 
-    # Test helper to test authorization rules.  E.g.
+    # Test helper to test authorization rules.
     #   with_user a_normal_user do
     #     should_not_be_allowed_to :update, :conferences
     #     should_not_be_allowed_to :read, an_unpublished_conference
     #     should_be_allowed_to :read, a_published_conference
     #   end
-    def should_be_allowed_to (privilege, object_or_context)
+    #
+    # If the objects class name does not match the controller name, you can set the object and context manually
+    #   should_be_allowed_to :create, :object => car, :context => :vehicles
+    #
+    # If you use specify the object and context manually, you can also specify the user manually, skipping the with_user block:
+    #   should_be_allowed_to :create, :object => car, :context => :vehicles, :user => a_normal_user
+    def should_be_allowed_to (privilege, *args)
       options = {}
-      options[object_or_context.is_a?(Symbol) ? :context : :object] = object_or_context
+      if(args.first.class == Hash)
+        options = args.extract_options!
+      else
+        options[args[0].is_a?(Symbol) ? :context : :object] = args[0]
+      end
       assert_nothing_raised do
         Authorization::Engine.instance.permit!(privilege, options)
       end
     end
 
     # See should_be_allowed_to
-    def should_not_be_allowed_to (privilege, object_or_context)
+    def should_not_be_allowed_to (privilege, *args)
       options = {}
-      options[object_or_context.is_a?(Symbol) ? :context : :object] = object_or_context
+      if(args.first.class == Hash)
+        options = args.extract_options!
+      else
+        options[args[0].is_a?(Symbol) ? :context : :object] = args[0]
+      end
       assert !Authorization::Engine.instance.permit?(privilege, options)
     end
     

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  version: "0.5"
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Steffen Bartsch
@@ -13,23 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-09-12 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: 
 email: sbartsch@tzi.org
 executables: []