permissive 0.2.0.alpha → 0.2.1.alpha

data/VERSION

@@ -1 +1 @@
-0.2.0.alpha
+0.2.1.alpha

data/lib/permissive/permission_definition.rb

@@ -40,12 +40,14 @@ module Permissive
       end
     end
 
-    def can(name, value = nil)
-      if value
-        to(name, value)
+    def can(*args)
+      # if value
+      #   to(name, value)
+      # end
+      args.each do |name|
+        name = name.to_s.downcase.to_sym
+        roles[@role].push(name) unless roles[@role].include?(name)
       end
-      name = name.to_s.downcase.to_sym
-      roles[@role].push(name) unless roles[@role].include?(name)
     end
 
     def initialize(model, options = {})
@@ -74,10 +76,12 @@ module Permissive
       @permissions ||= {}
     end
 
-    def role(name, &block)
-      @role = name.to_s.to_sym
-      roles[@role] ||= []
-      instance_eval(&block)
+    def role(*names, &block)
+      names.each do |name|
+        @role = name.to_s.to_sym
+        roles[@role] ||= []
+        instance_eval(&block)
+      end
       unless model.instance_methods.include?('role=')
         model.class_eval do
           def role=(role_name)

data/spec/has_permissions_spec.rb

@@ -312,6 +312,21 @@ describe Permissive::Permission do
       Permissive::User.permissions[:global].roles[:rides].should == [:control_rides]
     end
 
+    it "should accept multiple roles" do
+      Permissive::User.has_permissions do
+        to :fight, 0
+        to :flee, 1
+        to :urinate, 2
+
+        role(:normie, :hero) { can :fight }
+        role(:coward, :normie) { can :flee, :urinate }
+      end
+
+      Permissive::User.permissions[:global].roles[:normie].should == [:fight, :flee, :urinate]
+      Permissive::User.permissions[:global].roles[:hero].should == [:fight]
+      Permissive::User.permissions[:global].roles[:coward].should == [:flee, :urinate]
+    end
+
     it "should allow me to assign a role" do
       @james = Permissive::User.create!
       @james.should respond_to(:role=)

metadata

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