role_authorization 0.4.0 → 0.4.1

data/lib/role_authorization/controller.rb

@@ -47,7 +47,7 @@ module RoleAuthorization
 
       def authorized_action?(controller_klass, controller, action, id = nil)
         # by default admins see everything
-        return true if admin?
+        return true if current_user && current_user.admin?
 
         ruleset = self.class.ruleset[controller]
         groups = RoleAuthorization::AllowGroup.get(self.class.allowable_groups[controller])
@@ -82,30 +82,49 @@ module RoleAuthorization
 
       def authorized?(url, method = nil)
         return false unless url
-        return true if admin?
+        return true if current_user && current_user.admin?
 
-        method ||= (params[:method] || request.method)
-        url_parts = URI::split(url.strip)
-        path = url_parts[5]
+        unless url.is_a?(Hash)
+          method ||= (params[:method] || request.method)
+          url_parts = URI::split(url.strip)
+          path = url_parts[5]
+        end
 
         begin
-          hash = Rails.application.routes.recognize_path(path, :method => method)
-          return authorized_action?(self, hash[:controller], hash[:action].to_sym, hash[:id]) if hash
+          hash = if url.is_a?(Hash)
+                   url
+                 else
+                   Rails.application.routes.recognize_path(path, :method => method)
+                 end
+
+          if hash
+            controller_klass = if self.controller_name == hash[:controller]
+                                 self
+                               else
+                                 klass = (hash[:controller].camelize + "Controller").constantize.new
+                                 klass.params = hash
+                                 klass
+                               end
+
+            return authorized_action?(controller_klass, hash[:controller], hash[:action].to_sym, hash[:id])
+          end
         rescue Exception => e
           Rails.logger.error e.inspect
           e.backtrace.each {|line| Rails.logger.error line }
           # continue on
         end
 
-        # Mailto link
-        return true if url =~ /^mailto:/
+        unless url.is_a?(Hash)
+          # Mailto link
+          return true if url =~ /^mailto:/
 
-        # Public file
-        file = File.join(Rails.root, 'public', url)
-        return true if File.exists?(file)
+          # Public file
+          file = File.join(Rails.root, 'public', url)
+          return true if File.exists?(file)
 
-        # Passing in different domain
-        return remote_url?(url_parts[2])
+          # Passing in different domain
+          return remote_url?(url_parts[2])
+        end
       end
 
       def remote_url?(domain = nil)

data/lib/role_authorization/roles/manager.rb

@@ -72,7 +72,7 @@ module RoleAuthorization
 
           [global_roles, object_roles.values].flatten.map do |role_name|
             if persisted_roles.delete(role_name).nil?
-              klass.create(:name => role_name, :nickname => nicknames[role_name])
+              klass.create(:name => role_name.to_s, :nickname => nicknames[role_name].to_s)
             end
           end
 

data/lib/role_authorization/roles/role.rb

@@ -6,7 +6,9 @@ module RoleAuthorization
         base.send :include, InstanceMethods
         base.class_eval do
           validates_uniqueness_of :name
-          serialize :user_ids
+          if defined?(ActiveRecord::Base)
+            serialize :user_ids
+          end
         end
       end
 

data/lib/role_authorization/user.rb

@@ -4,8 +4,24 @@ module RoleAuthorization
       base.send :extend, ClassMethods
       base.send :include, InstanceMethods
 
-      base.class_eval do
-        serialize :serialized_roles
+      if defined?(ActiveRecord::Base)
+        base.class_eval do
+          serialize :serialized_roles
+        end
+      elsif defined?(Mongoid::Attributes)
+        base.class_eval do
+          set_callback(:save, :before) do |user|
+            write_attribute(:serialized_roles, YAML.dump(@serialized_roles || {}))
+          end
+
+          def serialized_roles
+            @serialized_roles ||= (YAML.load(read_attribute(:serialized_roles).to_s) || {})
+          end
+
+          def serialized_roles=(value)
+            @serialized_roles = value
+          end
+        end
       end
 
       RoleAuthorization::Roles::Manager.user_klass = base

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/role_authorization.rb

@@ -49,11 +49,9 @@ module RoleAuthorization
     end
 
     def enable_view_security
-      if RoleAuthorization.view_security
-        require 'role_authorization/view_security'
-        unless ActionView::Base.instance_methods.include? :link_to_or_show
-          ActionView::Base.class_eval { include RoleAuthorization::ViewSecurity }
-        end
+      require 'role_authorization/view_security'
+      unless ActionView::Base.instance_methods.include? :link_to_or_show
+        ActionView::Base.class_eval { include RoleAuthorization::ViewSecurity }
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: role_authorization
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - John 'asceth' Long
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
+date: 2011-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency