joshuaclayton-sentinel 0.1.3 → 0.1.4

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'echoe'
 require 'rake/rdoctask'
 
-Echoe.new("sentinel", "0.1.3") do |p|
+Echoe.new("sentinel", "0.1.4") do |p|
   p.description = "Simple authorization for Rails"
   p.url = "http://github.com/joshuaclayton/sentinel"
   p.author = "Joshua Clayton"

data/lib/sentinel/controller.rb

@@ -2,6 +2,9 @@ module Sentinel
   module Controller
     
     def self.included(base)
+      base.class_inheritable_writer :sentinel, :instance_writer => false
+      base.class_inheritable_accessor :access_denied, :access_granted
+      
       base.send :include, InstanceMethods
       base.extend ClassMethods
       
@@ -9,8 +12,6 @@ module Sentinel
         helper_method :sentinel
       end
       
-      base.class_inheritable_accessor :sentinel, :access_denied, :access_granted
-      
       base.on_denied_with do
         respond_to do |format|
           format.html { render :text => "You do not have the proper privileges to access this page.", :status => :unauthorized }
@@ -34,6 +35,10 @@ module Sentinel
         self.sentinel = block
       end
       
+      def sentinel
+        read_inheritable_attribute(:sentinel)
+      end
+      
       def on_denied_with(name = :default, &block)
         self.access_denied ||= {}
         self.access_denied[name] = block

data/sentinel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sentinel}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]
-  s.date = %q{2009-04-10}
+  s.date = %q{2009-05-05}
   s.description = %q{Simple authorization for Rails}
   s.email = %q{joshua.clayton@gmail.com}
   s.extra_rdoc_files = ["lib/sentinel/controller.rb", "lib/sentinel/sentinel.rb", "lib/sentinel.rb", "README.textile"]
@@ -16,23 +16,23 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sentinel", "--main", "README.textile"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{sentinel}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Simple authorization for Rails}
   s.test_files = ["test/functional/sentinel_controller_test.rb", "test/test_helper.rb", "test/unit/sentinel_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<actionpack>, [">= 0", "= 2.1.0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0", "= 2.1.0"])
+      s.add_development_dependency(%q<actionpack>, [">= 0", ">= 2.1.0"])
+      s.add_development_dependency(%q<activesupport>, [">= 0", ">= 2.1.0"])
     else
-      s.add_dependency(%q<actionpack>, [">= 0", "= 2.1.0"])
-      s.add_dependency(%q<activesupport>, [">= 0", "= 2.1.0"])
+      s.add_dependency(%q<actionpack>, [">= 0", ">= 2.1.0"])
+      s.add_dependency(%q<activesupport>, [">= 0", ">= 2.1.0"])
     end
   else
-    s.add_dependency(%q<actionpack>, [">= 0", "= 2.1.0"])
-    s.add_dependency(%q<activesupport>, [">= 0", "= 2.1.0"])
+    s.add_dependency(%q<actionpack>, [">= 0", ">= 2.1.0"])
+    s.add_dependency(%q<activesupport>, [">= 0", ">= 2.1.0"])
   end
 end

data/shoulda_macros/sentinel.rb

@@ -5,7 +5,7 @@ module Sentinel
       context "When sentinel is set up to #{options.inspect}" do
         setup do
           options.keys.each do |key|
-            @controller.sentinel.stubs(key).returns(options[key])
+            @controller.sentinel.class.any_instance.stubs(key).returns(options[key])
           end
           options.keys.each do |key|
             assert_equal options[key], @controller.sentinel.send(key)

data/test/partial_rails/controllers/application_controller.rb

@@ -1,2 +1,5 @@
 class ApplicationController < ActionController::Base
+  def current_user
+    {}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshuaclayton-sentinel
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-10 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.1.0
     version: 
@@ -34,7 +34,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.1.0
     version: 
@@ -95,7 +95,7 @@ requirements: []
 rubyforge_project: sentinel
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Simple authorization for Rails
 test_files: 
 - test/functional/sentinel_controller_test.rb