zuul 0.1.0 → 0.1.1

data/README.rdoc

@@ -4,15 +4,17 @@ Zuul provides a simple role-based authorization framework for Rails apps.
 
 ==Quick Start
 
-Add a +role+ to your +users+ table
+Zuul expects that you have a +current_user+ method available.
+
+Add a +role+ to your +users+ table.
 
    add_column :users, :role, :string
 
-In your +User+ model, specify the valid roles
+In your +User+ model, specify the valid roles.
 
   valid_roles :guest, :member, :admin
 
-In your +ApplicationController+, enable access restrictions
+In your +ApplicationController+, enable access restrictions.
 
   include Zuul::RestrictAccess
   restrict_access
@@ -45,6 +47,9 @@ You can pass +require_user+ a list of roles and also indicate which actions to a
 
   <code>require_no_user :only => :edit, :update</code>
 
+== Credits
+
+Thanks to {Les Hill}[http://github.com/leshill] for help testing the +ApplicationController+ mixins.
 
 == Note on Patches/Pull Requests
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/zuul/restrict_access.rb

@@ -53,54 +53,52 @@ module Zuul
         self.access_denied_message = options[:access_denied_message] || "You must be logged in to access this page"
         self.require_no_user_message = options[:require_no_user_message] || "You must be logged out to access this page"
         self.unauthorized_redirect_path = options[:unauthorized_redirect_path] || :unauthorized_path
-        include ApplicationController::InstanceMethods
+        include InstanceMethods
       end
     end
 
-    module ApplicationController
-      module InstanceMethods
-        def require_user(*roles)
-          roles.flatten!
-          return true if current_user && roles.empty?
-          deny_access unless roles.any? do |role|
-            method = (role.to_s + "?").to_sym
-            if current_user && current_user.respond_to?(method)
-              current_user.send(method)
-            else
-              false
-            end
-          end
-        end
-        private :require_user
-
-        def require_no_user
-          if current_user
-            store_location
-            flash[:notice] = self.class.require_no_user_message
-            redirect_to send(self.class.unauthorized_redirect_path)
-            return false
+    module InstanceMethods
+      def require_user(*roles)
+        roles.flatten!
+        return true if current_user && roles.empty?
+        deny_access unless roles.any? do |role|
+          method = (role.to_s + "?").to_sym
+          if current_user && current_user.respond_to?(method)
+            current_user.send(method)
+          else
+            false
           end
         end
-        private :require_no_user
+      end
+      private :require_user
 
-        def deny_access
+      def require_no_user
+        if current_user
           store_location
-          flash[:notice] = self.class.access_denied_message
+          flash[:notice] = self.class.require_no_user_message
           redirect_to send(self.class.unauthorized_redirect_path)
           return false
         end
-        private :deny_access
+      end
+      private :require_no_user
 
-        def store_location
-          session[:return_to] = request.request_uri
-        end
-        private :store_location
+      def deny_access
+        store_location
+        flash[:notice] = self.class.access_denied_message
+        redirect_to send(self.class.unauthorized_redirect_path)
+        return false
+      end
+      private :deny_access
 
-        def unauthorized_path
-          "/"
-        end
-        private :unauthorized_path
+      def store_location
+        session[:return_to] = request.request_uri
+      end
+      private :store_location
+
+      def unauthorized_path
+        "/"
       end
+      private :unauthorized_path
     end
   end
 end

data/spec/rails_root/log/test.log

@@ -5201,4 +5201,188 @@ Processing StockController3#index (for 0.0.0.0 at 2009-11-01 06:15:03) [GET]
 Redirected to http://test.host/
 Filter chain halted as [#<Proc:0x024fc3b8@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:32>] rendered_or_redirected.
 Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller3]
+WARNING: Can't mass-assign these protected attributes: role
+  SQL (0.7ms)   select sqlite_version(*)
+  SQL (0.9ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (2.2ms)   DROP TABLE "users"
+  SQL (2.4ms)   CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255), "username" varchar(255), "role" varchar(255)) 
+
+
+Processing Stock1Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 6) | 302 Found [http://test.host/stock1]
+
+
+Processing Stock1Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Completed in 14ms (View: 1, DB: 0) | 200 OK [http://test.host/stock1]
+
+
+Processing Stock1Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 0) | 302 Found [http://test.host/stock1]
+
+
+Processing Stock1Controller#show (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 0) | 302 Found [http://test.host/stock1]
+
+
+Processing Stock2Controller#show (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 0) | 302 Found [http://test.host/stock2/show]
+
+
+Processing Stock2Controller#show (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Completed in 15ms (View: 1, DB: 0) | 200 OK [http://test.host/stock2/show]
+
+
+Processing Stock2Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Completed in 2ms (View: 1, DB: 0) | 200 OK [http://test.host/stock2]
+
+
+Processing Stock3Controller#show (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock3/show]
+
+
+Processing Stock3Controller#show (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Completed in 13ms (View: 1, DB: 0) | 200 OK [http://test.host/stock3/show]
+
+
+Processing Stock3Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Completed in 2ms (View: 1, DB: 0) | 200 OK [http://test.host/stock3]
+
+
+Processing Stock4Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock4]
+
+
+Processing Stock4Controller#show (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Completed in 13ms (View: 1, DB: 0) | 200 OK [http://test.host/stock4/show]
+
+
+Processing Stock5Controller#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc3b8@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:32>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock5]
+
+
+Processing StockController1#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller1]
+
+
+Processing StockController2#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/signup
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller2]
+
+
+Processing StockController3#index (for 0.0.0.0 at 2009-11-04 15:47:33) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc3b8@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:32>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller3]
+WARNING: Can't mass-assign these protected attributes: role
+  SQL (0.6ms)   select sqlite_version(*)
+  SQL (0.8ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (3.8ms)   DROP TABLE "users"
+  SQL (2.6ms)   CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255), "username" varchar(255), "role" varchar(255)) 
+
+
+Processing Stock1Controller#index (for 0.0.0.0 at 2009-11-04 15:51:43) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 8) | 302 Found [http://test.host/stock1]
+
+
+Processing Stock1Controller#index (for 0.0.0.0 at 2009-11-04 15:51:43) [GET]
+Completed in 14ms (View: 1, DB: 0) | 200 OK [http://test.host/stock1]
+
+
+Processing Stock1Controller#index (for 0.0.0.0 at 2009-11-04 15:51:43) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 3ms (DB: 0) | 302 Found [http://test.host/stock1]
+
+
+Processing Stock1Controller#show (for 0.0.0.0 at 2009-11-04 15:51:43) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 0) | 302 Found [http://test.host/stock1]
+
+
+Processing Stock2Controller#show (for 0.0.0.0 at 2009-11-04 15:51:43) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 0) | 302 Found [http://test.host/stock2/show]
+
+
+Processing Stock2Controller#show (for 0.0.0.0 at 2009-11-04 15:51:43) [GET]
+Completed in 15ms (View: 1, DB: 0) | 200 OK [http://test.host/stock2/show]
+
+
+Processing Stock2Controller#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Completed in 2ms (View: 1, DB: 0) | 200 OK [http://test.host/stock2]
+
+
+Processing Stock3Controller#show (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock3/show]
+
+
+Processing Stock3Controller#show (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Completed in 14ms (View: 1, DB: 0) | 200 OK [http://test.host/stock3/show]
+
+
+Processing Stock3Controller#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Completed in 2ms (View: 1, DB: 0) | 200 OK [http://test.host/stock3]
+
+
+Processing Stock4Controller#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 2ms (DB: 0) | 302 Found [http://test.host/stock4]
+
+
+Processing Stock4Controller#show (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Completed in 13ms (View: 1, DB: 0) | 200 OK [http://test.host/stock4/show]
+
+
+Processing Stock5Controller#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc3b8@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:32>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock5]
+
+
+Processing StockController1#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller1]
+
+
+Processing StockController2#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Redirected to http://test.host/signup
+Filter chain halted as [#<Proc:0x024fc69c@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:22>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller2]
+
+
+Processing StockController3#index (for 0.0.0.0 at 2009-11-04 15:51:44) [GET]
+Redirected to http://test.host/
+Filter chain halted as [#<Proc:0x024fc3b8@/Users/wes/Projects/zuul/lib/zuul/restrict_access.rb:32>] rendered_or_redirected.
+Completed in 1ms (DB: 0) | 302 Found [http://test.host/stock_controller3]
 WARNING: Can't mass-assign these protected attributes: role

data/zuul.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zuul}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wes Gibbs"]
-  s.date = %q{2009-11-01}
+  s.date = %q{2009-11-04}
   s.description = %q{A simple authorization solution for Rails apps.}
   s.email = %q{wes@hashrocket.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zuul
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Wes Gibbs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -04:00
+date: 2009-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency