roled 0.0.3 → 0.0.4

data/lib/generators/roled/install_generator.rb

@@ -17,6 +17,10 @@ module Roled
       def copy_migrations
         migration_template "migration.rb", "db/migrate/install_roled.rb"
       end
+      
+      def copy_initializer
+      	copy_file "roled.rb", "config/initializers/roled.rb"
+      end
     end
   end
  end

data/lib/generators/roled/templates/roled.rb

@@ -0,0 +1,3 @@
+Roled::Core.user = :current_user
+#want to make sure that a module gets skipped?
+#Roled::Core.skip_module = [:devise]

data/lib/roled.rb

@@ -2,6 +2,7 @@ require 'roled/rake'
 require 'roled/models/aco'
 require 'roled/models/aro'
 require 'roled/models/acos_aro'
+require 'roled/exceptions'
 require 'roled/acts_as'
 require 'roled/core'
 

data/lib/roled/acts_as.rb

@@ -6,29 +6,21 @@ module Roled
     end
     
     def permission?(controller, action)
-      return has_permission_to?(controller,action)
+      has_permission_to?(controller,action)
     end
     
     def has_permission_to?(controller, action)
-      if !controller || !action
-        return false
-      end
-      
+      return false if !controller || !action
       options = self.class.global_options
-      groups = []
-      if !options.blank? 
+      if !options.blank?
+        groups = [] 
         options.each do |key,name|
-          if key == :belongs_to
-            if(defined?(self.send(name)))
-              groups << self.send(name)
-            end
-          end
+          groups << self.send(name) if key == :belongs_to && defined?(self.send(name))
         end
       end
-
       parent = "#{controller}_controller"
       if !Aco.where(:parent => parent, :action => action).exists?
-        return false
+        raise UnknownAro, "Action is undefined, run rake acos:generate"
       end
       
       ids = Aco.where("parent IN (?) AND action is NULL OR parent = ? AND action = ?", [parent,"all"], parent, action).order('action desc')

data/lib/roled/core.rb

@@ -5,24 +5,36 @@ module Roled
     included do
     end
     
-    def authorize_user!(user, options = {})
-      if defined?(options[:skip_module])
-        if params[:controller] =~ /#{options[:skip_module]}\/\.*/
+    def authorize_user!
+      if defined?(@@modules)
+        current = params[:controller].split('/', 2)[0]
+        if @@modules.include?(current.to_sym)
           return
         end
       end
+      
       if(!user.blank?)
-        action = params[:action]
-        if(!action)
-          action = "index"
-        end
+        action = params[:action] || "index"
         request = user.has_permission_to? params[:controller], action
         if(request != nil && request)
         else
-          redirect_to root_url, :flash => {:error => "Unauthorized"}
+          raise Unauthorized
         end
       end
     end
     
+    def self.user=(user)
+    	@@user = user
+    end
+    
+    def self.skip_module=(modules)
+    	@@modules = modules
+    end
+    
+    def user
+    	send(@@user)
+    end
+   
+    
   end
 end

data/lib/roled/exceptions.rb

@@ -0,0 +1,23 @@
+module Roled
+
+  class Error < StandardError; end
+
+  class UnknownAro < Error; end
+
+  class Unauthorized < Error
+    attr_reader :action, :subject
+    attr_writer :default_message
+
+    def initialize(message = nil, action = nil, subject = nil)
+      @message = message
+      @action = action
+      @subject = subject
+      @default_message = I18n.t(:"unauthorized.default", :default => "You are not authorized to access this page.")
+    end
+
+    def to_s
+      @message || @default_message
+    end
+  end
+  
+end

data/lib/roled/version.rb

@@ -1,3 +1,3 @@
 module Roled
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roled
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,8 +53,10 @@ extra_rdoc_files: []
 files:
 - lib/generators/roled/install_generator.rb
 - lib/generators/roled/templates/migration.rb
+- lib/generators/roled/templates/roled.rb
 - lib/roled/acts_as.rb
 - lib/roled/core.rb
+- lib/roled/exceptions.rb
 - lib/roled/models/aco.rb
 - lib/roled/models/acos_aro.rb
 - lib/roled/models/aro.rb