credentials 2.2.0 → 2.2.1

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/credentials.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{credentials}
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Powell"]

data/spec/controllers/test_controller_spec.rb

@@ -1,99 +1,101 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class TestController < ActionController::Base
-  self.current_user_method = :logged_in_user
-  requires_permission_to :view, :stuff, :except => [ :public ]
-  requires_permission_to :break, :stuff, :only => [ :dangerous ]
+if defined?(ActionController)
+  class TestController < ActionController::Base
+    self.current_user_method = :logged_in_user
+    requires_permission_to :view, :stuff, :except => [ :public ]
+    requires_permission_to :break, :stuff, :only => [ :dangerous ]
   
-  def index; end
-  def public; end
-  def dangerous; end
+    def index; end
+    def public; end
+    def dangerous; end
   
-  def rescue_action(e)
-    raise e
+    def rescue_action(e)
+      raise e
+    end
   end
-end
 
-class TestUser
-  credentials do |user|
-    user.can :view, :stuff
-    user.can :break, :stuff, :if => :special?
+  class TestUser
+    credentials do |user|
+      user.can :view, :stuff
+      user.can :break, :stuff, :if => :special?
+    end
   end
-end
 
-describe TestController do
-  it "should know how to specify access credentials" do
-    controller.class.should respond_to :requires_permission_to
-  end
-  
-  it "should use the right method to look up the current user" do
-    controller.class.current_user_method.should == :logged_in_user
-  end
-  
-  it "should check credentials on each request" do
-    controller.should_receive(:check_credentials)
-    get :index
-  end
+  describe TestController do
+    it "should know how to specify access credentials" do
+      controller.class.should respond_to(:requires_permission_to)
+    end
   
-  describe "when logged in" do
-    before :each do
-      @user = TestUser.new
-      controller.should_receive(:logged_in_user).and_return(@user)
+    it "should use the right method to look up the current user" do
+      controller.class.current_user_method.should == :logged_in_user
     end
-    
-    it "should display stuff" do
-      lambda {
-        get :index
-        response.should be_success
-      }.should_not raise_error(Credentials::Errors::NotLoggedInError)
+  
+    it "should check credentials on each request" do
+      controller.should_receive(:check_credentials)
+      get :index
     end
-    
-    describe "as someone with permission to break stuff" do
-      before(:each) do
-        @user.stub!(:special?).and_return(true)
-        @user.should be_able_to(:view, :stuff)
-        @user.should be_able_to(:break, :stuff)
+  
+    describe "when logged in" do
+      before :each do
+        @user = TestUser.new
+        controller.should_receive(:logged_in_user).and_return(@user)
       end
-      
-      it "should have access to dangerous actions" do
+    
+      it "should display stuff" do
         lambda {
-          get :dangerous
+          get :index
           response.should be_success
-        }.should_not raise_error(Credentials::Errors::AccessDeniedError)
+        }.should_not raise_error(Credentials::Errors::NotLoggedInError)
       end
-    end
     
-    describe "as someone without permission to break stuff" do
-      before(:each) do
-        @user.stub!(:special?).and_return(false)
-        @user.should_not be_able_to(:break, :stuff)
+      describe "as someone with permission to break stuff" do
+        before(:each) do
+          @user.stub!(:special?).and_return(true)
+          @user.should be_able_to(:view, :stuff)
+          @user.should be_able_to(:break, :stuff)
+        end
+      
+        it "should have access to dangerous actions" do
+          lambda {
+            get :dangerous
+            response.should be_success
+          }.should_not raise_error(Credentials::Errors::AccessDeniedError)
+        end
       end
+    
+      describe "as someone without permission to break stuff" do
+        before(:each) do
+          @user.stub!(:special?).and_return(false)
+          @user.should_not be_able_to(:break, :stuff)
+        end
       
-      it "should not have access to dangerous actions" do
-        lambda {
-          get :dangerous
-          response.should_not be_success
-        }.should raise_error(Credentials::Errors::AccessDeniedError)
+        it "should not have access to dangerous actions" do
+          lambda {
+            get :dangerous
+            response.should_not be_success
+          }.should raise_error(Credentials::Errors::AccessDeniedError)
+        end
       end
     end
-  end
   
-  describe "when not logged in" do
-    before :each do
-      controller.should_receive(:logged_in_user).and_return(nil)
-    end
+    describe "when not logged in" do
+      before :each do
+        controller.should_receive(:logged_in_user).and_return(nil)
+      end
     
-    it "should not have access to stuff" do
-      lambda {
-        get :index
-      }.should raise_error(Credentials::Errors::NotLoggedInError)
-    end
+      it "should not have access to stuff" do
+        lambda {
+          get :index
+        }.should raise_error(Credentials::Errors::NotLoggedInError)
+      end
     
-    it "should have access to public stuff" do
-      lambda {
-        get :public
-        response.should be_success
-      }.should_not raise_error(Credentials::Errors::AccessDeniedError)
+      it "should have access to public stuff" do
+        lambda {
+          get :public
+          response.should be_success
+        }.should_not raise_error(Credentials::Errors::AccessDeniedError)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: credentials
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Matt Powell