allowance 0.0.2 → 0.0.3

data/lib/allowance/permissions.rb

@@ -1,17 +1,16 @@
 module Allowance
   class Permissions
-    def initialize(context = nil, &blk)
+    def initialize
       @permissions = {}
-      @context = context
-      instance_exec(context, &blk)
+      yield(self) if block_given?
     end
 
-    def can?(verb, object = nil)
+    def allowed?(verb, object = nil)
       return true if @permissions[[verb, object]]
 
       # If object is a resource instance, try its class
       if object.class.respond_to?(:find)
-        if can?(verb, object.class)
+        if allowed?(verb, object.class)
           # See if the object is part of the defined scope
           return !scoped_model(verb, object.class).
             find(:first, :conditions => { :id => object.id }).nil?
@@ -21,7 +20,7 @@ module Allowance
       false
     end
 
-    def can(verbs, objects = nil, scope = true, &blk)
+    def allow!(verbs, objects = nil, scope = true, &blk)
       expand_permissions(verbs).each do |verb|
         [objects].flatten.each do |object|
           @permissions[[verb, object]] = scope  # TODO: add blk, too
@@ -29,6 +28,16 @@ module Allowance
       end
     end
 
+    def method_missing(name, *args, &blk)
+      if name.to_s =~ /(.+)!$/
+        allow!($1.to_sym, *args, &blk)
+      elsif name.to_s =~ /(.+)\?$/
+        allowed?($1.to_sym, *args, &blk)
+      else
+        super
+      end
+    end
+
     def scoped_model(verb, model)
       if p = @permissions[[verb, model]]
         if p.is_a?(Hash)

data/lib/allowance/version.rb

@@ -1,3 +1,3 @@
 module Allowance
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/permissions_spec.rb

@@ -6,42 +6,35 @@ module Allowance
     SomeOtherClass = Class.new
 
     it "should allow simple permissions to be specified" do
-      p = Permissions.new do
-        can :moo
-      end
+      subject.moo!
 
-      insist p.can?(:moo)
-      refuse p.can?(:quack)
+      insist subject.moo?
+      refuse subject.quack?
     end
 
-    it "should allow verbs and objects" do
-      p = Permissions.new do
-        can :update, SomeClass
+    it "should support a block-style initialization" do
+      p = Permissions.new do |can|
+        can.sing!
       end
 
-      insist p.can?(:update, SomeClass)
-      refuse p.can?(:destroy, SomeClass)
-      refuse p.can?(:update, SomeOtherClass)
+      insist p.allowed? :sing
+      insist p.sing?
     end
 
-    it "should run the permission definition block against the provided context" do
-      skills = mock(:singing => :good)
-
-      p = Permissions.new(skills) do |skills|
-        can :sing if skills.singing == :good
-      end
+    it "should allow verbs and objects" do
+      subject.update! SomeClass
 
-      insist p.can? :sing
+      insist subject.update? SomeClass
+      refuse subject.destroy? SomeClass
+      refuse subject.update? SomeOtherClass
     end
 
     it "should expand :view to include :index and :show" do
-      p = Permissions.new do
-        can :view, SomeClass
-      end
+      subject.view! SomeClass
 
-      insist p.can?(:view, SomeClass)
-      insist p.can?(:index, SomeClass)
-      insist p.can?(:show, SomeClass)
+      insist subject.view? SomeClass
+      insist subject.index? SomeClass
+      insist subject.show? SomeClass
     end
 
     it "should verify permissions against model instances" do
@@ -53,11 +46,9 @@ module Allowance
 
       model_class.should_receive(:find).and_return(model_instance)
 
-      p = Permissions.new do
-        can :view, model_class, lambda { some_scope }
-      end
+      subject.view! model_class, lambda { some_scope }
 
-      insist p.can?(:view, model_instance)
+      insist subject.view? model_instance
     end
 
     describe "#scoped_model" do
@@ -65,22 +56,17 @@ module Allowance
         model = mock
         model.should_receive(:some_scope).and_return(scoped_model = mock)
 
-        p = Permissions.new do
-          can :view, model, lambda { some_scope }
-        end
-
-        p.scoped_model(:view, model).should == scoped_model
+        subject.view! model, lambda { some_scope }
+        subject.scoped_model(:view, model).should == scoped_model
       end
 
       it "should allow scopes to be defined through where conditions" do
         model = mock
         model.should_receive(:where).with(:awesome => true).and_return(scoped_model = mock)
 
-        p = Permissions.new do
-          can :view, model, :awesome => true
-        end
+        subject.view! model, :awesome => true
 
-        p.scoped_model(:view, model).should == scoped_model
+        subject.scoped_model(:view, model).should == scoped_model
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allowance
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70146150823900 !ruby/object:Gem::Requirement
+  requirement: &70251993567840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146150823900
+  version_requirements: *70251993567840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70146150819460 !ruby/object:Gem::Requirement
+  requirement: &70251993566520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146150819460
+  version_requirements: *70251993566520
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70146150838720 !ruby/object:Gem::Requirement
+  requirement: &70251993563400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146150838720
+  version_requirements: *70251993563400
 description: A generic, but decidedly awesome authorization control layer.
 email:
 - hendrik@mans.de