permissive 0.2.7.alpha → 0.2.8.alpha

data/VERSION

@@ -1 +1 @@
-0.2.7.alpha
+0.2.8.alpha

data/lib/permissive/has_permissions.rb

@@ -49,7 +49,6 @@ module Permissive
               permission.save!
             end
             permission
-            # raise 'set'
           end
 
           def can?(*args)
@@ -83,8 +82,9 @@ module Permissive
           def bits_for(scope, permissions)
             on = Permissive::PermissionDefinition.normalize_scope(proxy_owner.class, scope)
             permissions.flatten.map do |permission|
-              proxy_owner.class.permissions[on].try(:permissions).try(:[], permission.to_s.underscore.gsub('/', '_').to_sym) || raise(Permissive::InvalidPermissionError.new("#{proxy_owner.class.name} does not have a#{'n' if permission.to_s[0, 1].downcase =~ /[aeiou]/} #{permission} permission#{" on #{on}" if on}"))
-            end
+              permission = permission.to_s.underscore.gsub('/', '_').to_sym
+              proxy_owner.class.permissions[on].try(:permissions).try(:[], permission) || proxy_owner.class.permissions[:global].try(:permissions).try(:[], permission)# || raise(Permissive::InvalidPermissionError.new("#{proxy_owner.class.name} does not have a#{'n' if permission.to_s[0, 1].downcase =~ /[aeiou]/} #{permission} permission#{" on #{on}" if on}"))
+            end.compact
           end
           private :bits_for
         end
@@ -117,7 +117,8 @@ module Permissive
           scope = :global
         end
         permissions = permissions.split('_and_')
-        if permissions.all? {|permission| self.class.permissions[scope].permissions.has_key?(permission.downcase.to_sym) }
+        if permissions.all? {|permission| self.class.permissions[scope].permissions.has_key?(permission.downcase.to_sym) ||
+          self.class.permissions[:global].permissions.has_key?(permission.downcase.to_sym) }
           if revoke
             class_eval <<-end_eval
             def #{method}(scope = nil)

data/lib/permissive/permission.rb

@@ -3,8 +3,8 @@ module Permissive
   class Permission < ActiveRecord::Base
     belongs_to :permitted_object, :polymorphic => true
     belongs_to :scoped_object, :polymorphic => true
-    named_scope :granted, lambda {|permissions|
-      {:conditions => permissions.map{|bit| "(mask & #{bit}) > 0"}.join(' AND ')}
+    named_scope :granted, lambda {|*permissions|
+      {:conditions => permissions.flatten.map{|bit| "(mask & #{bit}) > 0"}.join(' AND ')}
     }
     named_scope :on, lambda {|scoped_object|
       case scoped_object
@@ -13,7 +13,6 @@ module Permissive
       when Class
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => scoped_object.name}}
       when String, Symbol
-        scope = 
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => scoped_object.to_s.classify}}
       else
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => nil}}

data/lib/permissive/permission_definition.rb

@@ -23,7 +23,7 @@ module Permissive
         model_module.pop
         model_module = model_module.join('::')
         if (model_module.blank? ? Object : Object.const_get(model_module)).const_defined?(attempted_scope)
-          [model_module, attempted_scope].join('::')
+          [model_module, attempted_scope].reject(&:blank?).join('::')
         else
           scope.to_s.classify
         end
@@ -149,4 +149,4 @@ module Permissive
       @roles ||= {}
     end
   end
-end
+end

data/spec/metaprogramming_spec.rb

@@ -12,7 +12,7 @@ describe Permissive, "automatic method creation" do
     end
 
     Permissive::User.has_permissions(:on => :organizations) do
-      to :punch, 0
+      to :manage_games, 0
     end
 
     @user = Permissive::User.create

data/spec/scoping_permissions_spec.rb

@@ -27,13 +27,13 @@ describe Permissive, "scoped permissions" do
       @user.can?(:manage_games, :on => @organization).should be_true
     end
 
-    it "should not respond to generic permissions on scoped permissions" do
-      @user.can!(:manage_games, :on => @organization)
-      lambda {
-        @user.can?(:manage_games).should be_false
-      }.should raise_error(Permissive::InvalidPermissionError)
-      @user.can?(:manage_games, :on => @organization).should be_true
-    end
+    # it "should not respond to generic permissions on scoped permissions" do
+    #   @user.can!(:manage_games, :on => @organization)
+    #   lambda {
+    #     @user.can?(:manage_games).should be_false
+    #   }.should raise_error(Permissive::InvalidPermissionError)
+    #   @user.can?(:manage_games, :on => @organization).should be_true
+    # end
 
     it "should revoke the correct permissions through the `revoke' method" do
       @user.can!(:manage_games, :control_rides, :on => @organization)

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
+  - 8
   - alpha
-  version: 0.2.7.alpha
+  version: 0.2.8.alpha
 platform: ruby
 authors: 
 - Flip Sasser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -04:00
+date: 2010-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: []