declarative_authorization-dta 0.1.1 → 0.1.3

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/config/routes.rb

@@ -1,10 +1,20 @@
-# Rails 3 depreciates ActionController::Routing::Routes 
-routes = (Rails.respond_to?(:application) ? Rails.application.routes : ActionController::Routing::Routes)
-
-routes.draw do |map|
-  if Authorization::activate_authorization_rules_browser?
-    map.resources :authorization_rules, :only => [:index],
-        :collection => {:graph => :get, :change => :get, :suggest_change => :get}
-    map.resources :authorization_usages, :only => :index
+if Authorization::activate_authorization_rules_browser?
+  if Rails.respond_to?(:application)
+    Rails.application.routes.draw do
+      resources :authorization_rules, :only => [:index] do
+          collection do
+            get :graph
+            get :change
+            get :suggest_change
+          end
+      end
+      resources :authorization_usages, :only => :index
+    end
+  else
+    ActionController::Routing::Routes.draw do |map|
+      map.resources :authorization_rules, :only => [:index],
+          :collection => {:graph => :get, :change => :get, :suggest_change => :get}
+      map.resources :authorization_usages, :only => :index
+    end
   end
-end
+end

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/in_model.rb

@@ -5,8 +5,6 @@ require File.dirname(__FILE__) + '/obligation_scope.rb'
 module Authorization
   
   module AuthorizationInModel
-    ReadAllPrivilege = :read
-    WriteAllPrivilege = :write
 
     # If the user meets the given privilege, permitted_to? returns true
     # and yields to the optional block.
@@ -51,7 +49,7 @@ module Authorization
       return false unless [:read, :write].include?(mode)
       
       # Variables needed to make checks
-      access_all_columns_sym = (mode == :read) ? ReadAllPrivilege : WriteAllPrivilege
+      access_all_columns_sym = (mode == :read) ? self.class.read_all_privilege.to_sym : self.class.write_all_privilege.to_sym
       whitelist_sym = (mode == :read) ? attribute.to_sym : (attribute + '=').to_sym
       acl_sym = (mode == :read) ? ('read_' + attribute).to_sym : ('write_' + attribute).to_sym
       
@@ -236,11 +234,11 @@ module Authorization
               instance_eval <<-EOV
                
                 def #{method_name}
-                   permitted_to!(:read_#{method_name}) unless permitted_to?(:#{ReadAllPrivilege})
+                   permitted_to!(:read_#{method_name}) unless permitted_to?(:#{read_all_privilege})
                    return no_acl_#{method_name}
                 end
                 def #{method_name}=(value)
-                   permitted_to!(:write_#{method_name}) unless permitted_to?(:#{WriteAllPrivilege})
+                   permitted_to!(:write_#{method_name}) unless permitted_to?(:#{write_all_privilege})
                    return no_acl_#{method_name}=(value)
                 end
               EOV
@@ -276,7 +274,23 @@ module Authorization
               
               # Create helper methods, that can be called from within our code to access
               # variables that are set up during initilization
-               class_eval <<-EOV
+              instance_eval <<-EOV
+                #
+                # Determine what privilege to use for read all
+                #
+                def read_all_privilege
+                  '#{options[:include_attributes][0][:read_all_privilege].blank? ? 'read' : options[:include_attributes][0][:read_all_privilege]}'
+                end            
+
+                #
+                # Determine what privilege to use for write all
+                #
+                def write_all_privilege
+                  '#{options[:include_attributes][0][:write_all_privilege].blank? ? 'write' : options[:include_attributes][0][:write_all_privilege]}'
+                end
+              EOV
+              
+              class_eval <<-EOV
                 #
                 # Method to return the white list
                 #
@@ -298,7 +312,7 @@ module Authorization
                   class_eval "begin; alias_method :no_acl_#{name}, :#{name};rescue;end #Alias-Methods - put acl stuff into method-chain
                   begin; alias_method :no_acl_#{name}=, :#{name}=; rescue; end
                   def #{name} #Define getters / setter with ACL-Checks
-                    permitted_to!(:read_#{name}) if !permitted_to?(:#{ReadAllPrivilege}); 
+                    permitted_to!(:read_#{name}) if !permitted_to?(:#{read_all_privilege}); 
                     if(respond_to? 'no_acl_#{name}')
                       return no_acl_#{name}
                     else
@@ -306,7 +320,7 @@ module Authorization
                     end
                   end" unless name.to_s == self.primary_key.to_s || whitelist.include?(name.to_sym) || application_default_attributes.include?(name.to_sym) || !options[:include_read] # Do not do reads, unless told so
                   class_eval %{def #{name}=(n)
-                    permitted_to!(:write_#{name}) if !permitted_to?(:#{WriteAllPrivilege});
+                    permitted_to!(:write_#{name}) if !permitted_to?(:#{write_all_privilege});
                     if(respond_to? 'no_acl_#{name}=')
                       return no_acl_#{name}=(n)
                     else
@@ -365,7 +379,7 @@ module Authorization
               # Returns a hash of key, value paris that are readable
               #
               def readable_attributes 
-                return attributes if permitted_to?(ReadAllPrivilege)
+                return attributes if permitted_to?(self.class.read_all_privilege.to_sym)
                 attributes.reject do |k,v|
                   !allowed?(:read, k)
                 end
@@ -375,7 +389,7 @@ module Authorization
               # Returns a hash of key, value paris that are showable, excluding application_default_attributes
               #
               def showable_attributes
-                return attributes if permitted_to?(ReadAllPrivilege)
+                return attributes if permitted_to?(self.class.read_all_privilege.to_sym)
                 attributes.reject do |k,v|
                   !allowed?(:read, k, true)
                 end
@@ -385,7 +399,7 @@ module Authorization
               # Returns a hash of key, value paris that are writable
               #
               def writable_attributes
-                return attributes if permitted_to?(WriteAllPrivilege)
+                return attributes if permitted_to?(self.class.write_all_privilege.to_sym)
                 attributes.reject do |k,v|
                   !allowed?(:write, k)
                 end

data/test/test_helper.rb

@@ -14,7 +14,7 @@ unless defined?(ActiveRecord)
     require File.join(RAILS_ROOT, 'config', 'environment.rb')
   else
     # simply use installed gems if available
-    version_requirement = ENV['RAILS_VERSION'] ? "= #{ENV['RAILS_VERSION']}" : "> 2.1.0"
+    version_requirement = ENV['RAILS_VERSION'] ? "= #{ENV['RAILS_VERSION']}" : "~> 2.3.0"
     puts "Using Rails from RubyGems (#{version_requirement || "default"})"
     require 'rubygems'
     %w{actionpack activerecord activesupport rails}.each do |gem_name|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: declarative_authorization-dta
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jan Luehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 2
-        - 1
+        - 3
         - 0
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   version_requirements: *id001
 description: