lockdown 1.6.0 → 1.6.1

data/.gitignore

@@ -4,4 +4,3 @@ pkg/**
 doc/**
 email.txt
 coverage/**
-lockdown.gemspec

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/lib/lockdown/errors.rb

@@ -6,4 +6,6 @@ module Lockdown
   class PermissionScopeCollision < StandardError; end
 
   class InvalidPermissionAssignment < StandardError; end
+
+  class GroupUndefinedError < StandardError; end
 end

data/lib/lockdown/rspec_helper.rb

@@ -1,5 +1,9 @@
 module Lockdown
   module RspecHelper
+    def self.included(mod)
+      Lockdown.maybe_parse_init
+    end
+
     def login_admin
       login_user(:admin)
     end
@@ -53,6 +57,7 @@ module Lockdown
       methods = controller.send :action_methods
 
       if excepts = hash.delete(:except)
+        excepts = Array.new(excepts)
         methods.reject!{|m| excepts.include?(m.to_sym)}
       end
 
@@ -86,11 +91,12 @@ module Lockdown
 
     # You may want to override this method
     def mock_user
-      mock  :user, 
-            :first_name => 'John',
-            :last_name  => 'Smith',
-            :password   => "mysecret",
-            :password_confirmation   => "mysecret"
+      mock_model  User,
+                  :user_groups => [],
+                  :first_name => 'John',
+                  :last_name  => 'Smith',
+                  :password   => "mysecret",
+                  :password_confirmation   => "mysecret"
     end
 
     def create_user_session

data/lib/lockdown/rules.rb

@@ -256,7 +256,11 @@ module Lockdown
       if has_user_group?(sym)
         permissions = user_groups[sym] || []
       else
-        permissions = ug.permissions
+        if ug.respond_to?(:permissions)
+          permissions = ug.permissions
+        else
+          raise GroupUndefinedError, "#{ug} not found in init.rb and does not respond to #permissions"
+        end
       end
 
 

data/spec/lockdown/rspec_helper_spec.rb

@@ -8,7 +8,6 @@ class TestAController
 end
 
 class RspecEnv
-  include Lockdown::RspecHelper
 end
 
 describe Lockdown::RspecHelper do
@@ -24,6 +23,8 @@ describe Lockdown::RspecHelper do
 
     usr_group = mock :usr_group
 
+    Lockdown.should_receive(:maybe_parse_init)
+    RspecEnv.send :include, Lockdown::RspecHelper
     @rspec_env = RspecEnv.new
     @rspec_env.stub!(:controller).and_return(@controller)
     @rspec_env.stub!(:mock_user).and_return(usr)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2009-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency