zuul 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e3e0b42d2a30e697537fc0047a9c6b8a374b83
-  data.tar.gz: 7869d5ed786b1c1f8e65f4b97775ebc2d819b031
+  metadata.gz: 58d203aaa4eca804ec402bbd10742127e45b0607
+  data.tar.gz: 53c92c3fd32d310492026b5012603cd57c7fd458
 SHA512:
-  metadata.gz: 17e68b9709f5840e6a4087a078a93a42005c0a1ca49428916fe3ca28836110257680fee3232bf6a2be8c10437b950a1e203fadd180eb2f925f2a2082cd127ac3
-  data.tar.gz: 50fd987ea89c7444d83a71cd7275bf3955e265e55a0564aec01c1d0cee939403bce89a12a10bee4d8f38edf320598438b384cbcb1707c8549f03c4a9d31e5513
+  metadata.gz: 4400d89b4ce82f09b6b1ac148febb141c1b98801b7784f4d395b0aa9b2fc788860cef0b935a91ea61c503fc6b095d91ca3c188c32fcc2222deb8afc4cabd6322
+  data.tar.gz: d24b6237c95fabf90e608a523b724e07b3c8d1acbd7ffa0d4b4ff37a7fe9752536d4bdb182940c72fa96b7767f08a59625e304becfed027b2f1ea16ba7edc056

data/lib/zuul/active_record.rb

@@ -22,10 +22,9 @@ module Zuul
       #
       # The args parameter is an optional hash of configuration options.
       def acts_as_authorization_model(args={}, &block)
-        include AuthorizationMethods
+        include AuthorizationMethods unless ancestors.include?(AuthorizationMethods)
         auth_config = Zuul.configuration.clone.configure(args, &block)
         @auth_scopes ||= {}
-        raise "Scope already in use: #{auth_config.scope}" if @auth_scopes.has_key?(auth_config.scope)
         @auth_scopes[auth_config.scope] = Scope.new(auth_config)
         @auth_scopes[:default] ||= @auth_scopes[auth_config.scope]
         @auth_scopes[auth_config.scope]

data/lib/zuul/active_record/permission.rb

@@ -22,10 +22,11 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :has_many, base.auth_scope.permission_role_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_role_class_name, :dependent => :destroy
-          base.send :has_many, base.auth_scope.role_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.role_class_name, :through => base.auth_scope.permission_role_class_name.pluralize.underscore.to_sym
-          base.send :has_many, base.auth_scope.permission_subject_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_subject_class_name, :dependent => :destroy
-          base.send :has_many, base.auth_scope.subject_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.subject_class_name, :through => base.auth_scope.permission_subject_class_name.pluralize.underscore.to_sym
+          base.send :has_many, base.auth_scope.permission_role_plural_key, :class_name => base.auth_scope.permission_role_class_name, :dependent => :destroy
+          base.send :has_many, base.auth_scope.role_plural_key, :class_name => base.auth_scope.role_class_name, :through => base.auth_scope.permission_role_plural_key
+
+          base.send :has_many, base.auth_scope.permission_subject_plural_key, :class_name => base.auth_scope.permission_subject_class_name, :dependent => :destroy
+          base.send :has_many, base.auth_scope.subject_plural_key, :class_name => base.auth_scope.subject_class_name, :through => base.auth_scope.permission_subject_plural_key
         end
       end
 
@@ -38,14 +39,14 @@ module Zuul
         # Returns a list of contexts within which the permission has been assigned to roles
         def role_contexts
           auth_scope do
-            send(permission_role_class_name.pluralize.underscore.to_sym).group(:context_type, :context_id).map(&:context)
+            send(permission_role_plural_key).group(:context_type, :context_id).map(&:context)
           end
         end
         
         # Returns a list of contexts within which the permission has been assigned to subjects
         def subject_contexts
           auth_scope do
-            send(permission_subject_class_name.pluralize.underscore.to_sym).group(:context_type, :context_id).map(&:context)
+            send(permission_subject_plural_key).group(:context_type, :context_id).map(&:context)
           end
         end
       end

data/lib/zuul/active_record/permission_role.rb

@@ -21,8 +21,8 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :belongs_to, base.auth_scope.permission_class_name.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_class_name
-          base.send :belongs_to, base.auth_scope.role_class_name.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.role_class_name
+          base.send :belongs_to, base.auth_scope.permission_singular_key, :class_name => base.auth_scope.permission_class_name
+          base.send :belongs_to, base.auth_scope.role_singular_key, :class_name => base.auth_scope.role_class_name
         end
       end
     end

data/lib/zuul/active_record/permission_subject.rb

@@ -21,8 +21,8 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :belongs_to, base.auth_scope.permission_class_name.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_class_name
-          base.send :belongs_to, base.auth_scope.subject_class_name.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.subject_class_name
+          base.send :belongs_to, base.auth_scope.permission_singular_key, :class_name => base.auth_scope.permission_class_name
+          base.send :belongs_to, base.auth_scope.subject_singular_key, :class_name => base.auth_scope.subject_class_name
         end
       end
     end

data/lib/zuul/active_record/role.rb

@@ -25,11 +25,11 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :has_many, base.auth_scope.role_subject_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.role_subject_class_name, :dependent => :destroy
-          base.send :has_many, base.auth_scope.subject_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.subject_class_name, :through => base.auth_scope.role_subject_class_name.pluralize.underscore.to_sym
+          base.send :has_many, base.auth_scope.role_subject_plural_key, :class_name => base.auth_scope.role_subject_class_name, :dependent => :destroy
+          base.send :has_many, base.auth_scope.subject_plural_key, :class_name => base.auth_scope.subject_class_name, :through => base.auth_scope.role_subject_plural_key
           if base.auth_scope.config.with_permissions
-            base.send :has_many, base.auth_scope.permission_role_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_role_class_name, :dependent => :destroy
-            base.send :has_many, base.auth_scope.permission_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_class_name, :through => base.auth_scope.permission_role_class_name.pluralize.underscore.to_sym
+            base.send :has_many, base.auth_scope.permission_role_plural_key, :class_name => base.auth_scope.permission_role_class_name, :dependent => :destroy
+            base.send :has_many, base.auth_scope.permission_plural_key, :class_name => base.auth_scope.permission_class_name, :through => base.auth_scope.permission_role_plural_key
           end
         end
       end
@@ -38,7 +38,7 @@ module Zuul
         # Returns a list of contexts within which the role has been assigned to subjects
         def assigned_contexts
           auth_scope do
-            send(role_subject_class_name.pluralize.underscore.to_sym).group(:context_type, :context_id).map(&:context)
+            send(role_subject_plural_key).group(:context_type, :context_id).map(&:context)
           end
         end
       end
@@ -111,7 +111,7 @@ module Zuul
             force_context ||= config.force_context
             context = Zuul::Context.parse(context)
             if force_context
-              return permission_class.joins(permission_role_class_name.pluralize.underscore.to_sym).where(permission_role_class_name.pluralize.underscore.to_sym => {role_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => context.id})
+              return permission_class.joins(permission_role_plural_key).where(permission_role_plural_key => {role_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => context.id})
             else
               return permission_class.joins("LEFT JOIN #{permission_roles_table_name} ON #{permission_roles_table_name}.#{permission_foreign_key} = #{permissions_table_name}.id").where("#{permission_roles_table_name}.#{role_foreign_key} = ? AND (#{permission_roles_table_name}.context_type #{sql_is_or_equal(context.class_name)} ? OR #{permission_roles_table_name}.context_type IS NULL) AND (#{permission_roles_table_name}.context_id #{sql_is_or_equal(context.id)} ? OR #{permission_roles_table_name}.context_id IS NULL)", id, context.class_name, context.id)
             end

data/lib/zuul/active_record/role_subject.rb

@@ -21,8 +21,8 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :belongs_to, base.auth_scope.role_class_name.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.role_class_name
-          base.send :belongs_to, base.auth_scope.subject_class_name.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.subject_class_name
+          base.send :belongs_to, base.auth_scope.role_singular_key, :class_name => base.auth_scope.role_class_name
+          base.send :belongs_to, base.auth_scope.subject_singular_key, :class_name => base.auth_scope.subject_class_name
         end
       end
     end

data/lib/zuul/active_record/scope.rb

@@ -14,10 +14,12 @@ module Zuul
 
       # Define dynamic reflection methods that reference the config to be used for subjects, roles, permissions and their associations.
       def define_reflection_methods
+
         # *_class_name, *_class, *_table_name methods for all classes
         @config.classes.to_h.each do |class_type,class_name|
           class_type_name = class_type.to_s.gsub(/_class$/,'').singularize
           class_eval do
+            
             # def CLASS_TYPE_class_name
             define_method "#{class_type_name}_class_name" do
               if @config.send(class_type).is_a?(Class)
@@ -39,13 +41,26 @@ module Zuul
               send("#{class_type_name}_class").table_name
             end
             alias_method "#{class_type_name.pluralize}_table_name", "#{class_type_name}_table_name"
+
+            # def CLASS_TYPE_singular_key (used primarily for associations)
+            define_method "#{class_type_name}_singular_key" do
+              send("#{class_type_name}_class_name").underscore.split("/").last.singularize.to_sym
+            end
+            alias_method "#{class_type_name.pluralize}_singular_key", "#{class_type_name}_singular_key"
+
+            # def CLASS_TYPE_plural_key (use primarily for associations)
+            define_method "#{class_type_name}_plural_key" do
+              send("#{class_type_name}_class_name").underscore.split("/").last.pluralize.to_sym
+            end
+            alias_method "#{class_type_name.pluralize}_plural_key", "#{class_type_name}_plural_key"
             
             unless class_type.to_s.underscore == "#{class_name.to_s.underscore}_class"
-              ["_class_name", "_class", "_table_name"].each do |suffix|
+              %w(_class_name _class _table_name _singular_key _plural_key).each do |suffix|
                 alias_method "#{class_name.to_s.underscore.singularize}#{suffix}", "#{class_type_name}#{suffix}"
                 alias_method "#{class_name.to_s.underscore.pluralize}#{suffix}", "#{class_name.to_s.underscore.singularize}#{suffix}"
               end
             end
+          
           end
         end
 

data/lib/zuul/active_record/subject.rb

@@ -14,8 +14,8 @@ module Zuul
 
         module ClassMethods
           def self.extended(base)
-            base.send :has_many, base.auth_scope.role_subjects_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.role_subjects_class_name, :dependent => :destroy
-            base.send :has_many, base.auth_scope.roles_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.role_class_name, :through => base.auth_scope.role_subjects_class_name.underscore.to_sym.to_s.split("/").last.to_sym
+            base.send :has_many, base.auth_scope.role_subject_plural_key, :class_name => base.auth_scope.role_subjects_class_name, :dependent => :destroy
+            base.send :has_many, base.auth_scope.role_plural_key, :class_name => base.auth_scope.role_class_name, :through => base.auth_scope.role_subject_plural_key
           end
         end
 
@@ -65,7 +65,7 @@ module Zuul
               target = target_role(role, context, force_context)
               return false if target.nil?
 
-              return true unless (context.id.nil? && !force_context) || role_subject_class.joins(role_class_name.underscore.to_sym).where(subject_foreign_key.to_sym => id, role_foreign_key.to_sym => target.id, :context_type => context.class_name, :context_id => context.id).first.nil?
+              return true unless (context.id.nil? && !force_context) || role_subject_class.joins(role_table_name.singularize.to_sym).where(subject_foreign_key.to_sym => id, role_foreign_key.to_sym => target.id, :context_type => context.class_name, :context_id => context.id).first.nil?
               return false if force_context
               return true unless context.class_name.nil? || role_subject_class.where(subject_foreign_key.to_sym => id, role_foreign_key.to_sym => target.id, :context_type => context.class_name, :context_id => nil).first.nil?
               return !role_subject_class.where(subject_foreign_key.to_sym => id, role_foreign_key.to_sym => target.id, :context_type => nil, :context_id => nil).first.nil?
@@ -89,9 +89,9 @@ module Zuul
               
               return true if has_role?(target, context, force_context)
               
-              return true unless context.id.nil? || role_subject_class.joins(role_class_name.underscore.to_sym).where(subject_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => context.id).where("#{roles_table_name}.level >= ? AND #{roles_table_name}.context_type #{sql_is_or_equal(target.context_type)} ? AND #{roles_table_name}.context_id #{sql_is_or_equal(target.context_id)} ?", target.level, target.context_type, target.context_id).first.nil?
-              return true unless context.class_name.nil? || role_subject_class.joins(role_class_name.underscore.to_sym).where(subject_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => nil).where("#{roles_table_name}.level >= ? AND #{roles_table_name}.context_type #{sql_is_or_equal(target.context_type)} ? AND #{roles_table_name}.context_id #{sql_is_or_equal(target.context_id)} ?", target.level, target.context_type, target.context_id).first.nil?
-              return !role_subject_class.joins(role_class_name.underscore.to_sym).where(subject_foreign_key.to_sym => id, :context_type => nil, :context_id => nil).where("#{roles_table_name}.level >= ? AND #{roles_table_name}.context_type #{sql_is_or_equal(target.context_type)} ? AND #{roles_table_name}.context_id #{sql_is_or_equal(target.context_id)} ?", target.level, target.context_type, target.context_id).first.nil?
+              return true unless context.id.nil? || role_subject_class.joins(role_table_name.singularize.to_sym).where(subject_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => context.id).where("#{roles_table_name}.level >= ? AND #{roles_table_name}.context_type #{sql_is_or_equal(target.context_type)} ? AND #{roles_table_name}.context_id #{sql_is_or_equal(target.context_id)} ?", target.level, target.context_type, target.context_id).first.nil?
+              return true unless context.class_name.nil? || role_subject_class.joins(role_table_name.singularize.to_sym).where(subject_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => nil).where("#{roles_table_name}.level >= ? AND #{roles_table_name}.context_type #{sql_is_or_equal(target.context_type)} ? AND #{roles_table_name}.context_id #{sql_is_or_equal(target.context_id)} ?", target.level, target.context_type, target.context_id).first.nil?
+              return !role_subject_class.joins(role_table_name.singularize.to_sym).where(subject_foreign_key.to_sym => id, :context_type => nil, :context_id => nil).where("#{roles_table_name}.level >= ? AND #{roles_table_name}.context_type #{sql_is_or_equal(target.context_type)} ? AND #{roles_table_name}.context_id #{sql_is_or_equal(target.context_id)} ?", target.level, target.context_type, target.context_id).first.nil?
             end
           end
           alias_method :role_or_higher?, :has_role_or_higher?
@@ -113,9 +113,9 @@ module Zuul
               force_context ||= config.force_context
               context = Zuul::Context.parse(context)
               if force_context
-                return role_class.joins(role_subject_class_name.pluralize.underscore.to_sym).where("#{role_subjects_table_name}.#{subject_foreign_key} = ? AND #{role_subjects_table_name}.context_type #{sql_is_or_equal(context.class_name)} ? AND #{role_subjects_table_name}.context_id #{sql_is_or_equal(context.id)} ?", id, context.class_name, context.id)
+                return role_class.joins(role_subject_plural_key).where("#{role_subjects_table_name}.#{subject_foreign_key} = ? AND #{role_subjects_table_name}.context_type #{sql_is_or_equal(context.class_name)} ? AND #{role_subjects_table_name}.context_id #{sql_is_or_equal(context.id)} ?", id, context.class_name, context.id)
               else
-                return role_class.joins(role_subject_class_name.pluralize.underscore.to_sym).where("#{role_subjects_table_name}.#{subject_foreign_key} = ? AND ((#{role_subjects_table_name}.context_type #{sql_is_or_equal(context.class_name)} ? OR #{role_subjects_table_name}.context_type IS NULL) AND (#{role_subjects_table_name}.context_id #{sql_is_or_equal(context.id)} ? OR #{role_subjects_table_name}.context_id IS NULL))", id, context.class_name, context.id)
+                return role_class.joins(role_subject_plural_key).where("#{role_subjects_table_name}.#{subject_foreign_key} = ? AND ((#{role_subjects_table_name}.context_type #{sql_is_or_equal(context.class_name)} ? OR #{role_subjects_table_name}.context_type IS NULL) AND (#{role_subjects_table_name}.context_id #{sql_is_or_equal(context.id)} ? OR #{role_subjects_table_name}.context_id IS NULL))", id, context.class_name, context.id)
               end
             end
           end
@@ -137,8 +137,8 @@ module Zuul
 
         module ClassMethods
           def self.extended(base)
-            base.send :has_many, base.auth_scope.permission_subject_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_subject_class_name, :dependent => :destroy
-            base.send :has_many, base.auth_scope.permission_class_name.pluralize.underscore.to_sym.to_s.split("/").last.to_sym, :class_name => base.auth_scope.permission_class_name, :through => base.auth_scope.permission_subject_class_name.pluralize.underscore.to_sym
+            base.send :has_many, base.auth_scope.permission_subject_plural_key, :class_name => base.auth_scope.permission_subject_class_name, :dependent => :destroy
+            base.send :has_many, base.auth_scope.permission_plural_key, :class_name => base.auth_scope.permission_class_name, :through => base.auth_scope.permission_subject_plural_key
           end
         end
 

data/lib/zuul/version.rb

@@ -1,3 +1,3 @@
 module Zuul
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/zuul/active_record/scope_spec.rb

@@ -30,6 +30,18 @@ describe "Zuul::ActiveRecord::Scope" do
         end
       end
 
+      it "should define *_singular_key methods for each of the class types" do
+        Zuul::Configuration::DEFAULT_AUTHORIZATION_CLASSES.keys.each do |class_type|
+          @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').singularize}_singular_key")
+        end
+      end
+
+      it "should define *_plural_key methods for each of the class types" do
+        Zuul::Configuration::DEFAULT_AUTHORIZATION_CLASSES.keys.each do |class_type|
+          @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').singularize}_plural_key")
+        end
+      end
+
       it "should define *_foreign_key methods for each of the primary class types" do
         Zuul::Configuration::PRIMARY_AUTHORIZATION_CLASSES.keys.each do |class_type|
           @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').singularize}_foreign_key")
@@ -41,6 +53,8 @@ describe "Zuul::ActiveRecord::Scope" do
           @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').pluralize}_class_name")
           @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').pluralize}_class")
           @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').pluralize}_table_name")
+          @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').pluralize}_singular_key")
+          @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').pluralize}_plural_key")
         end
         Zuul::Configuration::PRIMARY_AUTHORIZATION_CLASSES.keys.each do |class_type|
           @scope.should respond_to("#{class_type.to_s.gsub(/_class$/,'').pluralize}_foreign_key")
@@ -54,6 +68,8 @@ describe "Zuul::ActiveRecord::Scope" do
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.singularize}_class_name")
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.singularize}_class")
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.singularize}_table_name")
+          @scope.should respond_to("#{@scope.config.send(class_type).to_s.singularize}_singular_key")
+          @scope.should respond_to("#{@scope.config.send(class_type).to_s.singularize}_plural_key")
         end
         Zuul::Configuration::PRIMARY_AUTHORIZATION_CLASSES.keys.each do |class_type|
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.singularize}_foreign_key")
@@ -65,6 +81,8 @@ describe "Zuul::ActiveRecord::Scope" do
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.underscore.pluralize}_class_name")
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.underscore.pluralize}_class")
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.underscore.pluralize}_table_name")
+          @scope.should respond_to("#{@scope.config.send(class_type).to_s.underscore.pluralize}_singular_key")
+          @scope.should respond_to("#{@scope.config.send(class_type).to_s.underscore.pluralize}_plural_key")
         end
         Zuul::Configuration::PRIMARY_AUTHORIZATION_CLASSES.keys.each do |class_type|
           @scope.should respond_to("#{@scope.config.send(class_type).to_s.underscore.pluralize}_foreign_key")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuul
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,3 +184,4 @@ test_files:
 - spec/zuul/active_record/context_spec.rb
 - spec/zuul/active_record/scope_spec.rb
 - spec/spec_helper.rb
+has_rdoc: