permissive 0.2.1.alpha → 0.2.2.alpha

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.gemspec
 coverage/
 pkg/
 **/*.log

data/VERSION

@@ -1 +1 @@
-0.2.1.alpha
+0.2.2.alpha

data/lib/permissive/has_permissions.rb

@@ -85,10 +85,11 @@ module Permissive
         permission_setter = options[:on].nil? || options[:on] == :global ? 'permissions=' : "#{options[:on].to_s.singularize}_permissions="
         class_eval <<-eoc
           def #{permission_setter}(values)
+            values ||= []
             if values.all? {|value| value.is_a?(String) || value.is_a?(Symbol)}
               can!(values, :reset => true, :on => #{options[:on].inspect})
             else
-              super
+              super(values)
             end
           end
         eoc
@@ -125,7 +126,7 @@ module Permissive
               revoke(#{[permissions, args].flatten.join(', ').inspect}, :on => scope)
             end
             end_eval
-            return can!(*[permissions, options].flatten)
+            return revoke(*[permissions, options].flatten)
           elsif setter
             class_eval <<-end_eval
             def #{method}(scope = nil)

data/lib/permissive/permission_definition.rb

@@ -29,14 +29,15 @@ module Permissive
       end
 
       def normalize_scope(model, scope)
-        case scope
+        scope = case scope
         when Class
           scope.name.tableize
         when String, Symbol
           interpolate_scope(model, scope).to_s.tableize
         else
           :global
-        end.to_s.gsub('/', '_').to_sym
+        end
+        scope.to_s.gsub('/', '_').to_sym
       end
     end
 
@@ -80,7 +81,7 @@ module Permissive
       names.each do |name|
         @role = name.to_s.to_sym
         roles[@role] ||= []
-        instance_eval(&block)
+        instance_eval(&block) if block_given?
       end
       unless model.instance_methods.include?('role=')
         model.class_eval do

data/spec/has_permissions_spec.rb

@@ -287,6 +287,13 @@ describe Permissive::Permission do
         @user.can_manage_games_in?(@organization).should be_true
       end
     end
+
+    it "should support revoking, too" do
+      @user.can_manage_games!
+      @user.can_manage_games?.should be_true
+      @user.cannot_manage_games!
+      @user.can_manage_games?.should be_false
+    end
   end
 
   describe "roles" do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
+  - 2
   - alpha
-  version: 0.2.1.alpha
+  version: 0.2.2.alpha
 platform: ruby
 authors: 
 - Flip Sasser