jeffleeismyhero-acl9 0.10.1 → 0.10.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 10

data/lib/acl9/model_extensions.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'model_extensions', 'subject')
+require File.join(File.dirname(__FILE__), 'model_extensions', 'acl9_subject')
 require File.join(File.dirname(__FILE__), 'model_extensions', 'object')
 
 module Acl9
@@ -26,9 +26,9 @@ module Acl9
       #   user.has_role!(...)
       #   user.has_no_role!(...)
       #
-      #   # other functions from Acl9::ModelExtensions::Subject are made available
+      #   # other functions from Acl9::ModelExtensions::Acl9_Subject are made available
       #
-      # @see Acl9::ModelExtensions::Subject
+      # @see Acl9::ModelExtensions::Acl9_Subject
       #
       def acts_as_authorization_subject(options = {})
         role = options[:role_class_name] || Acl9::config[:default_role_class_name]
@@ -40,7 +40,7 @@ module Acl9
         cattr_accessor :_auth_role_class_name
         self._auth_role_class_name = role
 
-        include Acl9::ModelExtensions::Subject
+        include Acl9::ModelExtensions::Acl9_Subject
       end
 
       # Add role query and set methods to the class (making it an auth object class).
@@ -65,9 +65,9 @@ module Acl9
       # @see Acl9::ModelExtensions::Object
       #
       def acts_as_authorization_object(options = {})
-        subject = options[:subject_class_name] || Acl9::config[:default_subject_class_name]
-        subj_table = subject.constantize.table_name
-        subj_col = subject.underscore
+        acl9_subject = options[:subject_class_name] || Acl9::config[:default_subject_class_name]
+        subj_table = acl9_subject.constantize.table_name
+        subj_col = acl9_subject.underscore
 
         role       = options[:role_class_name] || Acl9::config[:default_role_class_name]
         role_table = role.constantize.table_name
@@ -110,19 +110,19 @@ module Acl9
       #     acts_as_authorization_role
       #   end
       #
-      # @see Acl9::ModelExtensions::Subject#has_role!
-      # @see Acl9::ModelExtensions::Subject#has_role?
-      # @see Acl9::ModelExtensions::Subject#has_no_role!
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_role!
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_role?
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_no_role!
       # @see Acl9::ModelExtensions::Object#accepts_role!
       # @see Acl9::ModelExtensions::Object#accepts_role?
       # @see Acl9::ModelExtensions::Object#accepts_no_role!
       def acts_as_authorization_role(options = {})
-        subject = options[:subject_class_name] || Acl9::config[:default_subject_class_name]
+        acl9_subject = options[:subject_class_name] || Acl9::config[:default_subject_class_name]
         join_table = options[:join_table_name] || Acl9::config[:default_join_table_name] ||
-                     join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(subject))
+                     join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(acl9_subject))
 
-        has_and_belongs_to_many subject.demodulize.tableize.to_sym,
-          :class_name => subject,
+        has_and_belongs_to_many acl9_subject.demodulize.tableize.to_sym,
+          :class_name => acl9_subject,
           :join_table => join_table
 
         belongs_to :authorizable, :polymorphic => true

data/lib/acl9/model_extensions/{subject.rb → acl9_subject.rb}

@@ -1,6 +1,6 @@
 module Acl9
   module ModelExtensions
-    module Subject
+    module Acl9_Subject
       ##
       # Role check.
       #

data/lib/acl9/model_extensions/object.rb

@@ -8,9 +8,9 @@ module Acl9
       #
       # @param [Symbol,String] role_name Role name
       # @param [Subject] subject Subject to add role for
-      # @see Acl9::ModelExtensions::Subject#has_role?
-      def accepts_role?(role_name, subject)
-        subject.has_role? role_name, self
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_role?
+      def accepts_role?(role_name, acl9_subject)
+        acl9_subject.has_role? role_name, self
       end
 
       ##
@@ -18,9 +18,9 @@ module Acl9
       #
       # @param [Symbol,String] role_name Role name
       # @param [Subject] subject Subject to add role for
-      # @see Acl9::ModelExtensions::Subject#has_role!
-      def accepts_role!(role_name, subject)
-        subject.has_role! role_name, self
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_role!
+      def accepts_role!(role_name, acl9_subject)
+        acl9_subject.has_role! role_name, self
       end
 
       ##
@@ -28,9 +28,9 @@ module Acl9
       #
       # @param [Symbol,String] role_name Role name
       # @param [Subject] subject Subject to remove role from
-      # @see Acl9::ModelExtensions::Subject#has_no_role!
-      def accepts_no_role!(role_name, subject)
-        subject.has_no_role! role_name, self
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_no_role!
+      def accepts_no_role!(role_name, acl9_subject)
+        acl9_subject.has_no_role! role_name, self
       end
 
       ##
@@ -38,9 +38,9 @@ module Acl9
       #
       # @param [Subject] subject Subject to query roles
       # @return [Boolean] Returns true if +subject+ has any roles on this object.
-      # @see Acl9::ModelExtensions::Subject#has_roles_for?
-      def accepts_roles_by?(subject)
-        subject.has_roles_for? self
+      # @see Acl9::ModelExtensions::Acl9_Subject#has_roles_for?
+      def accepts_roles_by?(acl9_subject)
+        acl9_subject.has_roles_for? self
       end
 
       alias :accepts_role_by? :accepts_roles_by?
@@ -50,9 +50,9 @@ module Acl9
       #
       # @return [Array<Role>] Role instances, associated both with +subject+ and +object+
       # @param [Subject] subject Subject to query roles
-      # @see Acl9::ModelExtensions::Subject#roles_for
-      def accepted_roles_by(subject)
-        subject.roles_for self
+      # @see Acl9::ModelExtensions::Acl9_Subject#roles_for
+      def accepted_roles_by(acl9_subject)
+        acl9_subject.roles_for self
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeffleeismyhero-acl9
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - oleg dashevskii
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,8 +54,8 @@ files:
 - lib/acl9/controller_extensions/generators.rb
 - lib/acl9/helpers.rb
 - lib/acl9/model_extensions.rb
+- lib/acl9/model_extensions/acl9_subject.rb
 - lib/acl9/model_extensions/object.rb
-- lib/acl9/model_extensions/subject.rb
 - test/access_control_test.rb
 - test/dsl_base_test.rb
 - test/helpers_test.rb