zuul 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 38e3e0b42d2a30e697537fc0047a9c6b8a374b83
+  data.tar.gz: 7869d5ed786b1c1f8e65f4b97775ebc2d819b031
+SHA512:
+  metadata.gz: 17e68b9709f5840e6a4087a078a93a42005c0a1ca49428916fe3ca28836110257680fee3232bf6a2be8c10437b950a1e203fadd180eb2f925f2a2082cd127ac3
+  data.tar.gz: 50fd987ea89c7444d83a71cd7275bf3955e265e55a0564aec01c1d0cee939403bce89a12a10bee4d8f38edf320598438b384cbcb1707c8549f03c4a9d31e5513

data/lib/zuul.rb

@@ -8,6 +8,22 @@ module Zuul
   def self.configure(&block)
     @@configuration.configure &block
   end
+  
+  def self.should_whitelist?
+    active_record3? or active_record4? && protected_attribtues?
+  end
+  
+  def self.active_record3?
+    ::ActiveRecord::VERSION::MAJOR == 3
+  end
+  
+  def self.active_record4?
+    ::ActiveRecord::VERSION::MAJOR == 4
+  end
+
+  def self.protected_attribtues?
+    defined? ::ProtectedAttributes
+  end
 end
 
 require 'zuul/context'

data/lib/zuul/active_record.rb

@@ -338,7 +338,8 @@ module Zuul
     # to provide easy access to the context for that object.
     module ContextMethods
       def self.included(base)
-        base.send :attr_accessible, :context
+        base.send :attr_accessible, :context if ::Zuul
+.should_whitelist?
       end
 
       # Return a Zuul::Context object representing the context for the role

data/lib/zuul/active_record/permission.rb

@@ -9,7 +9,8 @@ module Zuul
 
       module ClassMethods
         def self.extended(base)
-          base.send :attr_accessible, :context, :context_id, :context_type, :slug
+          base.send :attr_accessible, :context, :context_id, :context_type, :slug if ::Zuul
+.should_whitelist?
           add_validations base
           add_associations base
         end
@@ -21,10 +22,10 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :has_many, base.auth_scope.permission_roles_table_name.to_sym, :dependent => :destroy
-          base.send :has_many, base.auth_scope.roles_table_name.to_sym, :through => base.auth_scope.permission_roles_table_name.to_sym
-          base.send :has_many, base.auth_scope.permission_subjects_table_name.to_sym, :dependent => :destroy
-          base.send :has_many, base.auth_scope.subjects_table_name.to_sym, :through => base.auth_scope.permission_subjects_table_name.to_sym
+          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
         end
       end
 
@@ -37,14 +38,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_roles_table_name.to_sym).group(:context_type, :context_id).map(&:context)
+            send(permission_role_class_name.pluralize.underscore.to_sym).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_subjects_table_name.to_sym).group(:context_type, :context_id).map(&:context)
+            send(permission_subject_class_name.pluralize.underscore.to_sym).group(:context_type, :context_id).map(&:context)
           end
         end
       end

data/lib/zuul/active_record/permission_role.rb

@@ -8,7 +8,8 @@ module Zuul
 
       module ClassMethods
         def self.extended(base)
-          base.send :attr_accessible, :context, :context_id, :context_type, base.auth_scope.permission_foreign_key.to_sym, base.auth_scope.role_foreign_key.to_sym
+          base.send :attr_accessible, :context, :context_id, :context_type, base.auth_scope.permission_foreign_key.to_sym, base.auth_scope.role_foreign_key.to_sym if ::Zuul
+.should_whitelist?
           add_validations base
           add_associations base
         end
@@ -20,8 +21,8 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :belongs_to, base.auth_scope.permission_class_name.underscore.to_sym
-          base.send :belongs_to, base.auth_scope.role_class_name.underscore.to_sym
+          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
         end
       end
     end

data/lib/zuul/active_record/permission_subject.rb

@@ -8,7 +8,8 @@ module Zuul
 
       module ClassMethods
         def self.extended(base)
-          base.send :attr_accessible, :context, :context_id, :context_type, base.auth_scope.permission_foreign_key.to_sym, base.auth_scope.subject_foreign_key.to_sym
+          base.send :attr_accessible, :context, :context_id, :context_type, base.auth_scope.permission_foreign_key.to_sym, base.auth_scope.subject_foreign_key.to_sym if ::Zuul
+.should_whitelist?
           add_validations base
           add_associations base
         end
@@ -20,8 +21,8 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :belongs_to, base.auth_scope.permission_class_name.underscore.to_sym
-          base.send :belongs_to, base.auth_scope.subject_class_name.underscore.to_sym
+          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
         end
       end
     end

data/lib/zuul/active_record/role.rb

@@ -10,7 +10,8 @@ module Zuul
 
       module ClassMethods
         def self.extended(base)
-          base.send :attr_accessible, :context_id, :context_type, :level, :slug
+          base.send :attr_accessible, :context_id, :context_type, :level, :slug if ::Zuul
+.should_whitelist?
           add_validations base
           add_associations base
         end
@@ -24,11 +25,11 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :has_many, base.auth_scope.role_subjects_table_name.to_sym, :dependent => :destroy
-          base.send :has_many, base.auth_scope.subjects_table_name.to_sym, :through => base.auth_scope.role_subjects_table_name.to_sym
+          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
           if base.auth_scope.config.with_permissions
-            base.send :has_many, base.auth_scope.permission_roles_table_name.to_sym, :dependent => :destroy
-            base.send :has_many, base.auth_scope.permissions_table_name.to_sym, :through => base.auth_scope.permission_roles_table_name.to_sym
+            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
           end
         end
       end
@@ -37,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_subjects_table_name.to_sym).group(:context_type, :context_id).map(&:context)
+            send(role_subject_class_name.pluralize.underscore.to_sym).group(:context_type, :context_id).map(&:context)
           end
         end
       end
@@ -110,7 +111,7 @@ module Zuul
             force_context ||= config.force_context
             context = Zuul::Context.parse(context)
             if force_context
-              return permission_class.joins(permission_roles_table_name.to_sym).where(permission_roles_table_name.to_sym => {role_foreign_key.to_sym => id, :context_type => context.class_name, :context_id => context.id})
+              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})
             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

@@ -8,7 +8,8 @@ module Zuul
 
       module ClassMethods
         def self.extended(base)
-          base.send :attr_accessible, :context, :context_id, :context_type, base.auth_scope.role_foreign_key.to_sym, base.auth_scope.subject_foreign_key.to_sym
+          base.send :attr_accessible, :context, :context_id, :context_type, base.auth_scope.role_foreign_key.to_sym, base.auth_scope.subject_foreign_key.to_sym if ::Zuul
+.should_whitelist?
           add_validations base
           add_associations base
         end
@@ -20,8 +21,8 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :belongs_to, base.auth_scope.role_class_name.underscore.to_sym
-          base.send :belongs_to, base.auth_scope.subject_class_name.underscore.to_sym
+          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
         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_table_name.to_sym, :dependent => :destroy
-            base.send :has_many, base.auth_scope.roles_table_name.to_sym, :through => base.auth_scope.role_subjects_table_name.to_sym
+            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
           end
         end
 
@@ -113,9 +113,9 @@ module Zuul
               force_context ||= config.force_context
               context = Zuul::Context.parse(context)
               if force_context
-                return role_class.joins(role_subjects_table_name.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_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)
               else
-                return role_class.joins(role_subjects_table_name.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_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)
               end
             end
           end
@@ -137,8 +137,8 @@ module Zuul
 
         module ClassMethods
           def self.extended(base)
-            base.send :has_many, base.auth_scope.permission_subjects_table_name.to_sym, :dependent => :destroy
-            base.send :has_many, base.auth_scope.permissions_table_name.to_sym, :through => base.auth_scope.permission_subjects_table_name.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.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
           end
         end
 

data/lib/zuul/version.rb

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

data/spec/support/models.rb

@@ -1,17 +1,20 @@
 # Default Subject, Role, Permission and Context models
 Object.send(:remove_const, :User) if defined?(User) # we do this to undefine the model and start fresh, without any of the authorization stuff applied by tests
 class User < ActiveRecord::Base
-  attr_accessible :name
+  attr_accessible :name if ::Zuul
+.should_whitelist?
 end
 
 Object.send(:remove_const, :Role) if defined?(Role)
 class Role < ActiveRecord::Base
-  attr_accessible :name, :slug, :level, :context_type, :context_id
+  attr_accessible :name, :slug, :level, :context_type, :context_id if ::Zuul
+.should_whitelist?
 end
 
 Object.send(:remove_const, :Permission) if defined?(Permission)
 class Permission < ActiveRecord::Base
-  attr_accessible :name, :slug, :context_type, :context_id
+  attr_accessible :name, :slug, :context_type, :context_id if ::Zuul
+.should_whitelist?
 end
 
 Object.send(:remove_const, :Context) if defined?(Context)
@@ -81,17 +84,20 @@ end
 # Custom named Subject, Role, Permission and Context models
 Object.send(:remove_const, :Soldier) if defined?(Soldier)
 class Soldier < ActiveRecord::Base
-  attr_accessible :name
+  attr_accessible :name if ::Zuul
+.should_whitelist?
 end
 
 Object.send(:remove_const, :Rank) if defined?(Rank)
 class Rank < ActiveRecord::Base
-  attr_accessible :name, :slug, :level, :context_type, :context_id
+  attr_accessible :name, :slug, :level, :context_type, :context_id if ::Zuul
+.should_whitelist?
 end
 
 Object.send(:remove_const, :Skill) if defined?(Skill)
 class Skill < ActiveRecord::Base
-  attr_accessible :name, :slug, :context_type, :context_id
+  attr_accessible :name, :slug, :context_type, :context_id if ::Zuul
+.should_whitelist?
 end
 
 Object.send(:remove_const, :Weapon) if defined?(Weapon)
@@ -130,17 +136,20 @@ module ZuulModels
 
   send(:remove_const, :User) if defined?(ZuulModels::User)
   class User < ActiveRecord::Base
-    attr_accessible :name
+    attr_accessible :name if ::Zuul
+.should_whitelist?
   end
 
   send(:remove_const, :Role) if defined?(ZuulModels::Role)
   class Role < ActiveRecord::Base
-    attr_accessible :name, :slug, :level, :context_type, :context_id
+    attr_accessible :name, :slug, :level, :context_type, :context_id if ::Zuul
+.should_whitelist?
   end
 
   send(:remove_const, :Permission) if defined?(ZuulModels::Permission)
   class Permission < ActiveRecord::Base
-    attr_accessible :name, :slug, :context_type, :context_id
+    attr_accessible :name, :slug, :context_type, :context_id if ::Zuul
+.should_whitelist?
   end
 
   send(:remove_const, :Context) if defined?(ZuulModels::Context)

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: zuul
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Flexible, configurable authorization system for ActiveRecord and an access
@@ -157,27 +146,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/markrebec/zuul
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Authorizaion and ACL for Activerecord and ActionController.
 test_files:
 - spec/db/schema.rb