role_authorization 0.6.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8db6f0c4c6939b591b3637eb6d9fccf4c884460
-  data.tar.gz: 3e226410d3e5f0541d6f18d9daf9987ed4f0f52d
+  metadata.gz: 6751fa8bb50a5e8ecb396698c237e73ead87cc49
+  data.tar.gz: 56457bb779d95347cf63f9991867d398c74b7e0f
 SHA512:
-  metadata.gz: 26a375d03362845e31c40ea54d9eae12cd1f82d07a904c0f7014468bd377c7d78f7b515334569c746d80a39c188d1087cbe1ac9163665508747872d55b59dcd9
-  data.tar.gz: e0d5ceffb6636e3f5cff49d2b3e3fcf35c971a602e840d041b50914eb8b01699fc9237aaefef91140256a8288ae9a464da17df4477d4647efc5a637dc1dcf4ab
+  metadata.gz: 23fba514a9ba9e5de5590bd84b78cf7231284b9a5c880a3be57c9887320e665f03dd6c270e09a52386ea235e78c3fd8ae85dc910a6318146bc9480e0fe37eb16
+  data.tar.gz: b1ed662862fdd3f3ae6b5153ab3482d860260e496695cc272fcb5b549b568045443d84ff713309e9564088478180ac8d0ff0c15abd06667333219e8deed85b6c

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@gems
+rvm use 1.9.3@gems

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    role_authorization (0.1.5)
+    role_authorization (0.6.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/role_authorization/controller.rb

@@ -4,6 +4,8 @@ module RoleAuthorization
       base.class_eval do
         helper_method :authorized?
         helper_method :accessible?
+
+        before_filter :check_request_authorization
       end
       base.send :extend, RoleAuthorization::Ruleset::ClassMethods
       base.send :cattr_ruleset, :ruleset, :allowable_groups
@@ -15,18 +17,10 @@ module RoleAuthorization
     module ClassMethods
       def allow_group(*args)
         add_to_allowable_groups(self.controller_rule_name, args)
-        add_role_authorization_filter
       end
 
       def allow(options = {}, &block)
         add_to_ruleset(self.controller_rule_name, &block)
-        add_role_authorization_filter
-      end
-
-      def add_role_authorization_filter
-        callbacks = _process_action_callbacks
-        chain = callbacks.select {|cl| cl.klass.to_s.include?(name)}.collect(&:filter).select {|c| c.is_a?(Symbol)}
-        before_filter :check_request_authorization unless chain.include?(:check_request_authorization)
       end
 
       def controller_rule_name

data/lib/role_authorization/roles/manager.rb

@@ -19,6 +19,11 @@ module RoleAuthorization
       end
 
       module InstanceMethods
+        def role(role_name)
+          @_role ||= {}
+          @_role[role_name] ||= klass.find_by_name(role_name)
+        end
+
         def setup(klass)
           @klass = klass
           klass.send(:include, RoleAuthorization::Roles::Role)

data/lib/role_authorization/roles/role.rb

@@ -20,15 +20,16 @@ module RoleAuthorization
         end
 
         def users(scope = nil)
-          if user_ids.blank?
-            []
-          else
-            if scope.nil?
-              RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids.values.flatten.uniq).all
-            else
-              RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids[scope_with(scope)]).all
-            end
-          end
+          @users ||= {}
+          @users[scope] ||= if user_ids.blank?
+                              []
+                            else
+                              if scope.nil?
+                                RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids.values.flatten.uniq).all
+                              else
+                                RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids[scope_with(scope)]).all
+                              end
+                            end
         end
 
         def add_user(user_id, scope = nil)

data/lib/role_authorization/user.rb

@@ -94,7 +94,7 @@ module RoleAuthorization
         self.serialized_roles ||= Hash.new
 
         (self.serialized_roles[:global] || []).map do |role_name|
-          RoleAuthorization::Roles.manager.klass.find_by_name(role_name).remove_user(self.id)
+          RoleAuthorization::Roles.manager.role(role_name).remove_user(self.id)
         end
         self.serialized_roles[:global] = Array.new
 
@@ -123,7 +123,7 @@ module RoleAuthorization
         end
 
         if save(:validate => false)
-          RoleAuthorization::Roles.manager.klass.find_by_name(role_name).add_user(self.id, scope)
+          RoleAuthorization::Roles.manager.role(role_name).add_user(self.id, scope)
           true
         else
           false
@@ -151,7 +151,7 @@ module RoleAuthorization
         end
 
         if save(:validate => false)
-          RoleAuthorization::Roles.manager.klass.find_by_name(role_name).remove_user(self.id, scope)
+          RoleAuthorization::Roles.manager.role(role_name).remove_user(self.id, scope)
           true
         else
           false

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.6.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: role_authorization
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.9.0
 platform: ruby
 authors:
 - John 'asceth' Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for handling authorization in rails using roles
@@ -45,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gemtest"
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -84,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: role_authorization
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Role Authorization gem for Rails