grant 2.0.1 → 2.0.2

data/lib/grant.rb

@@ -1,15 +1,12 @@
 require 'active_record'
 require 'grant/grantable'
+require 'grant/error'
 
 # TODO: Remove these two requires when backwards compatibility with grant 2.0.0
 # is no longer necessary
 require 'grant/integration'
 require 'grant/model_security'
 
-module Grant
-  class Error < StandardError; end
-end
-
 ActiveRecord::Base.send :include, Grant::Grantable
 
 if defined?(ActionController) and defined?(ActionController::Base)
@@ -17,8 +14,8 @@ if defined?(ActionController) and defined?(ActionController::Base)
   require 'grant/user'
 
   ActionController::Base.class_eval do
-    before_filter do
-      Grant::User.current_user = self.current_user if self.respond_to?(:current_user)
+    before_filter do |c|
+      Grant::User.current_user = c.send(:current_user) if c.respond_to?(:current_user)
     end
   end
 

data/lib/grant/error.rb

@@ -0,0 +1,22 @@
+module Grant
+  class Error < StandardError
+    attr_reader :user, :action, :model
+
+    def initialize(*args)
+      if args.size == 3
+        @user, @action, @model = args
+      else
+        @message = args[0]
+      end
+    end
+
+    def to_s
+      if @message
+        @message
+      else
+        user_str = user == nil ? 'Anonymous' : "#{user.class.name}:#{user.id}"
+        "#{action} permission not granted to #{user_str} for resource #{model.class.name}:#{model.id}"
+      end
+    end
+  end
+end

data/lib/grant/grantor.rb

@@ -1,4 +1,5 @@
 require 'grant/status'
+require 'grant/error'
 
 module Grant
   class Grantor
@@ -9,15 +10,8 @@ module Grant
     def initialize(action)
       self.class.send(:define_method, "#{action == :find ? 'after' : 'before'}_#{action}") do |model|
         user = Grant::User.current_user
-        error(user, action, self) unless grant_disabled? || (@callback != nil && @callback.call(user, model))
+        raise Grant::Error.new(user, action, model) unless grant_disabled? || (@callback != nil && @callback.call(user, model))
       end
     end
-
-    def error(user, action, model)
-      msg = ["#{action} permission",
-        "not granted to #{user.class.name}:#{user.id}",
-        "for resource #{model.class.name}:#{model.id}"]
-      raise Grant::Error.new(msg.join(' '))
-    end
   end
 end

data/lib/grant/version.rb

@@ -1,3 +1,3 @@
 module Grant
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/error_spec.rb

@@ -0,0 +1,33 @@
+require 'grant/error'
+
+describe Grant::Error do
+
+  it 'should make user, action, and model available as readers' do
+    user = OpenStruct.new(:id => 1)
+    model = OpenStruct.new(:id => 2)
+    action = :create
+    ex = Grant::Error.new(user, action, model)
+
+    ex.user.should == user
+    ex.action.should == action
+    ex.model.should == model
+  end
+
+  it 'should produce a nicely formatted message' do
+    user = OpenStruct.new(:id => 3)
+    model = OpenStruct.new(:id => 4)
+    action = :create
+    ex = Grant::Error.new(user, action, model)
+
+    ex.message.should include("#{user.class.name}:#{user.id}")
+    ex.message.should include("#{model.class.name}:#{model.id}")
+    ex.message.should include(action.to_s)
+  end
+
+  it 'should make the a string passed to the constructor available as the error message' do
+    ex = Grant::Error.new('message')
+    ex.message.should == 'message'
+    ex.to_s.should == 'message'
+  end
+
+end

data/spec/grantor_spec.rb

@@ -19,22 +19,4 @@ describe Grant::Grantor do
     end
   end
 
-  describe '#error' do
-    it 'should raise a nicely formatted error detailing the user and model objects' do
-      user = OpenStruct.new(:id => 1)
-      model = OpenStruct.new(:id => 2)
-      action = :create
-
-      begin
-        Grant::Grantor.new(:create).error(user, action, model)
-      rescue => ex
-        ex.message.should include("#{user.class.name}:#{user.id}")
-        ex.message.should include("#{model.class.name}:#{model.id}")
-        ex.message.should include(action.to_s)
-      else
-        fail "should have received an exception"
-      end
-    end
-  end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grant
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jeff Kunkle
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - init.rb
 - lib/grant.rb
 - lib/grant/config.rb
+- lib/grant/error.rb
 - lib/grant/grantable.rb
 - lib/grant/grantor.rb
 - lib/grant/integration.rb
@@ -96,6 +97,7 @@ files:
 - lib/grant/user.rb
 - lib/grant/version.rb
 - spec/config_spec.rb
+- spec/error_spec.rb
 - spec/grantable_spec.rb
 - spec/grantor_spec.rb
 - spec/spec_helper.rb
@@ -139,6 +141,7 @@ specification_version: 3
 summary: Conscious security constraints for your ActiveRecord model objects
 test_files: 
 - spec/config_spec.rb
+- spec/error_spec.rb
 - spec/grantable_spec.rb
 - spec/grantor_spec.rb
 - spec/spec_helper.rb