authcan_easyroller 0.1.2 → 0.1.3

data/.gitignore

@@ -1,3 +1,4 @@
 *.swp
 *.swo
+*.gem
 pkg/*

data/README.rdoc

@@ -1,16 +1,3 @@
-== Rails 3 Notes
-
-I wanted to put this at the top so that nobody misses it. There are currently some bugs due to
-Rails 3 still being in beta. As I come across these bugs, I will add them below and any workaround
-if available.
-
-* Bug #3928[https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/3928] - process_parameter_filter throws an exception on array parameters
-
-  [Status:] Resolved in source control, awaiting next beta release.
-  [Workaround:] The code to enable parameter filtering in `lib/authcan_easyroller.rb` has been commented out until the next beta release.
-
-
-
 == authcan_easyroller
 
 This is a basic Rails engine utilizing Authlogic[http://github.com/binarylogic/authlogic],
@@ -61,19 +48,17 @@ planned enhancements so you can get a feel of where this project will go.
 == Installation/Setup
 
 <b>Developers Note:</b><em>I have created an example&nbsp;project[http://github.com/topherfangio/authcan_easyroller-example]
-if you are just looking to play with it, or if you are having trouble getting your setup to work properly.</em>
+if you are just looking to play with it, or if you are having trouble getting your setup to work properly. It should
+have everything necessary to get up and running quickly.</em>
 
 Assuming you already have Rails 3 installed, installation is very simple; just install the gem and
-it's dependencies!
+it's dependencies will automatically be installed!
 
-  gem install authlogic cancan easy_roles authcan_easyroller
+  gem install authcan_easyroller
 
-Next, add the dependencies to your <tt>Gemfile</tt>:
+Next, add the dependency to your <tt>Gemfile</tt>:
 
-  gem "authlogic", :git => "git://github.com/binarylogic/authlogic.git"
-  gem "cancan"
-  gem "easy_roles"
-  gem "authcan_easyroller"
+  gem "authcan_easyroller", ">= 0.1.3"
 
 Next, create a migration for the users:
 
@@ -120,9 +105,9 @@ Next, copy the following files to their proper locations (feel free to edit them
 help get you started). The <tt>rails.js</tt> file at the bottom of the list is the official Rails jQuery file available
 at http://github.com/rails/jquery-ujs so make sure to remove the existing <tt>rails.js</tt> file from <tt>public/javascripts</tt>.
 
-* ability.rb[http://github.com/topherfangio/authcan_easyroller/raw/master/examples/ability.rb] -> <<APPLICATION>>/app/models/ability.rb
-* application.html.erb[http://github.com/topherfangio/authcan_easyroller/raw/master/examples/application.html.erb] -> <<APPLICATION>>/app/view/layouts/application.html.erb
-* main.css[http://github.com/topherfangio/authcan_easyroller/raw/master/examples/main.css] -> <<APPLICATION>/public/stylesheets/main.css
+* ability.rb[http://github.com/topherfangio/authcan_easyroller-example/raw/master/app/models/ability.rb] -> <<APPLICATION>>/app/models/ability.rb
+* application.html.erb[http://github.com/topherfangio/authcan_easyroller-example/raw/master/app/views/layouts/application.html.erb] -> <<APPLICATION>>/app/view/layouts/application.html.erb
+* main.css[http://github.com/topherfangio/authcan_easyroller-example/raw/master/public/stylesheets/main.css] -> <<APPLICATION>/public/stylesheets/main.css
 * rails.js[http://github.com/rails/jquery-ujs/raw/master/src/rails.js] -> <<APPLICATION>/public/javascripts/rails.js
 
 Finally, remove <tt>public/index.html</tt> and add the following to your <tt>config/routs.rb</tt> file so that your server will load properly.
@@ -185,9 +170,23 @@ defining the ability. I'll get in touch with the developer to see if this can be
 
   # ability.rb
 
-  # Moderator role abilities
-  if current_user.is_moderator?
-    can :visit_woot_all_day, :all
+  class Ability
+
+    # Include the ability class so you can have some defaults
+    include AuthcanEasyroller::Ability
+
+    def initialize(current_user)
+
+      # If you override initialize, make sure to call this
+      # method so that you have the defaults setup
+      ae_ability_defaults(current_user)
+
+      # Moderator role abilities
+      if current_user.is_moderator?
+        can :visit_woot_all_day, :all
+      end
+
+    end
   end
 
 

data/Rakefile

@@ -11,6 +11,10 @@ begin
     gem.homepage = "http://github.com/topherfangio/authcan_easyroller"
     gem.authors = ["Topher Fangio"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    
+    gem.add_dependency "authlogic", ">= 2.1.3"
+    gem.add_dependency "cancan", ">= 1.0.2"
+    gem.add_dependency "easy_roles", ">= 1.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/controllers/user_sessions_controller.rb

@@ -1,4 +1,4 @@
-class UserSessionsController < AuthcanEasyrollerController
+class UserSessionsController < ApplicationController
   before_filter :require_no_user, :only => [:new, :create]
   before_filter :require_user, :only => :destroy
 

data/app/controllers/users_controller.rb

@@ -1,4 +1,4 @@
-class UsersController < AuthcanEasyrollerController
+class UsersController < ApplicationController
 
   before_filter :load_correct_user, :only => [:show, :edit, :update]
   before_filter :require_user, :only => [:edit, :update]

data/app/models/user_session.rb

@@ -1,3 +1,9 @@
 class UserSession < Authlogic::Session::Base
+  include ActiveModel::Conversion
+
   logout_on_timeout true
+
+  def persisted?
+    false
+  end 
 end

data/app/views/user_sessions/new.html.erb

@@ -1,27 +1,37 @@
 <h1>Login</h1>
  
 <% form_for @user_session, :url => user_session_path do |f| %>
-  <%= f.error_messages %>
+  <% if @user_session.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@user_session.errors.count, "error") %> prohibited this nothing from being saved:</h2>
 
-  <p>
+      <ul>
+      <% @user_session.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
     <%= f.label :email %>
     <%= f.text_field :email %>
-  </p>
+  </div>
 
-  <p>
+  <div class="field">
     <%= f.label :password %>
     <%= f.password_field :password %>
-  </p>
+  </div>
 
-  <p>
+  <div class="field">
   <%= f.check_box :remember_me %><%= f.label :remember_me %>
-  </p>
+  </div>
 
-  <p>
+  <div class="actions">
     <%= f.submit "Login" %>
-  </p>
+  </div>
 
-  <p>
+  <div>
     Don't have an account yet? Why not <%= link_to "sign up", new_user_path %>!
-  </p>
+  </div>
 <% end %>

data/app/views/users/_form.html.erb

@@ -1,3 +1,15 @@
+<% if @user.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= pluralize(@user.errors.count, "error") %> prohibited this nothing from being saved:</h2>
+
+    <ul>
+    <% @user.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>
+
 <%= form.hidden_field :id unless form.object.new_record? %>
 
 <p>

data/app/views/users/edit.html.erb

@@ -1,8 +1,6 @@
 <h3>Edit My Account</h3>
 
 <% form_for @user do |f| %>
-  <%= f.error_messages %>
-
   <%= render :partial => "form", :object => f %>
 
   <p>

data/app/views/users/index.html.erb

@@ -4,25 +4,22 @@
   <tr>
     <th>Email</th>
     <th>Last Seen</th>
-    <th>Action</th>
+    <th></th>
   </tr>
 
 <% @users.each do |user| %>
   <tr>
-    <td><%= user.email %></td>
+    <td><%= link_to user.email, user %></td>
     <td><%= time_ago_in_words user.last_request_at %> ago</td>
 
     <td>
-      <%= link_to 'Show', user %>
-      
       <% if can? :update, user %> 
-        <%= link_separator %>
-        <%= link_to 'Edit', edit_user_path(user) %>
+        <%= link_to 'edit', edit_user_path(user) %>
       <% end %>
 
       <% if can? :destroy, user %> 
         <%= link_separator %>
-        <%= link_to 'Delete', user, :confirm => 'Are you sure?', :method => :delete %>
+        <%= link_to 'delete', user, :confirm => 'Are you sure?', :method => :delete %>
       <% end %>
     </td>
   </tr>
@@ -32,4 +29,8 @@
 
 <br />
 
-Not signed up? <%= link_to 'Register', new_user_path %> now!
+<% if current_user.nil?  %>
+  Not signed up? <%= link_to 'Register', new_user_path %> now!
+<% elsif can? :manage, User %>
+  <%= link_to 'New User', new_user_path %>
+<% end %>

data/app/views/users/new.html.erb

@@ -1,8 +1,6 @@
 <h3>Register New User</h3>
 
 <% form_for @user do |f| %>
-  <%= f.error_messages %>
-
   <%= render :partial => "form", :object => f %>
 
   <p>

data/app/views/users/show.html.erb

@@ -36,4 +36,6 @@
 </p>
 
 
-<%= link_to 'Edit', edit_user_path(@user) %> or <%= link_to 'return to list', users_path %>
+<%= link_to('Edit', edit_user_path(@user)) + " or " if can? :edit, @user %>
+
+<%= link_to 'return to list', users_path %>

data/authcan_easyroller.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authcan_easyroller}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Topher Fangio"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-08-16}
   s.description = %q{This is a basic Rails engine utilizing Authlogic, CanCan and Easy Roles to create a starting point for simple Rails-based applications that need authentication and authorization. }
   s.email = %q{fangiotophia@gmail.com}
   s.extra_rdoc_files = [
@@ -22,11 +22,8 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/controllers/authcan_easyroller_controller.rb",
      "app/controllers/user_sessions_controller.rb",
      "app/controllers/users_controller.rb",
-     "app/helpers/authcan_easyroller_helper.rb",
-     "app/models/ability.rb",
      "app/models/user.rb",
      "app/models/user_session.rb",
      "app/views/user_sessions/new.html.erb",
@@ -37,35 +34,43 @@ Gem::Specification.new do |s|
      "app/views/users/show.html.erb",
      "authcan_easyroller.gemspec",
      "config/routes.rb",
-     "examples/ability.rb",
-     "examples/application.html.erb",
-     "examples/main.css",
      "lib/authcan_easyroller.rb",
+     "lib/extensions/action_controller_base.rb",
+     "lib/extensions/cancan_ability.rb",
+     "lib/helpers/authcan_easyroller.rb",
      "test/helper.rb",
      "test/test_authcan_easyroller.rb"
   ]
   s.homepage = %q{http://github.com/topherfangio/authcan_easyroller}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails 3 engine for user authentication/authorization utilizing Authlogic, CanCan and EasyRoles}
   s.test_files = [
     "test/helper.rb",
-     "test/test_authcan_easyroller.rb",
-     "examples/ability.rb"
+     "test/test_authcan_easyroller.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<authlogic>, [">= 2.1.3"])
+      s.add_runtime_dependency(%q<cancan>, [">= 1.0.2"])
+      s.add_runtime_dependency(%q<easy_roles>, [">= 1.0.0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<authlogic>, [">= 2.1.3"])
+      s.add_dependency(%q<cancan>, [">= 1.0.2"])
+      s.add_dependency(%q<easy_roles>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<authlogic>, [">= 2.1.3"])
+    s.add_dependency(%q<cancan>, [">= 1.0.2"])
+    s.add_dependency(%q<easy_roles>, [">= 1.0.0"])
   end
 end
 

data/lib/authcan_easyroller.rb

@@ -1,6 +1,12 @@
-require 'authcan_easyroller'
 require 'rails'
 
+require 'cancan'
+require 'authlogic'
+require 'easy_roles'
+
+require 'extensions/action_controller_base'
+require 'extensions/cancan_ability'
+
 # AuthcanEasyroller
 module AuthcanEasyroller
   class Engine < Rails::Engine

data/{app/controllers/authcan_easyroller_controller.rb → lib/extensions/action_controller_base.rb}

@@ -1,19 +1,6 @@
-class AuthcanEasyrollerController < ApplicationController
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-
-  # Scrub sensitive parameters from your log
-  helper_method :current_user_session, :current_user
-
-  rescue_from CanCan::AccessDenied do |exception|
-    flash[:error] = exception.message
-    redirect_back_or_default(root_url)
-  end
-
-  # Ensure there is at least one user in the system before trying to do anything
-  before_filter :require_one_user
-  after_filter :store_location
+require 'action_controller'
 
+ActionController::Base.class_eval {
   private
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
@@ -76,4 +63,22 @@ class AuthcanEasyrollerController < ApplicationController
       redirect_to(session[:return_to] || default)
       session[:return_to] = nil
     end
-end
+}
+
+require 'helpers/authcan_easyroller'
+ActionView::Base.send :include, AuthcanEasyrollerHelper
+
+ActionController::Base.instance_eval {
+  # Scrub sensitive parameters from your log
+  helper_method :current_user_session, :current_user
+
+  rescue_from CanCan::AccessDenied do |exception|
+    flash[:error] = exception.message
+    redirect_back_or_default(root_url)
+  end
+
+  # Ensure there is at least one user in the system before trying to do anything
+  before_filter :require_one_user
+  after_filter :store_location
+}
+

data/lib/extensions/cancan_ability.rb

@@ -0,0 +1,52 @@
+module AuthcanEasyroller
+  module Ability
+
+    def ae_ability_defaults(current_user)
+      can :read, :all
+      can :manage, UserSession
+
+      if current_user
+        # Abilities for someone with an account (does not necessarily have a "user" role)
+        can [:edit], User do |user|
+          user == current_user
+        end
+
+        # User role abilities
+        if current_user.is_user?
+        end
+
+
+        # Moderator role abilities
+        if current_user.is_moderator?
+        end
+
+
+        # Admin role abilities
+        if current_user.is_admin?
+          can :manage, :all
+        end
+
+
+        # Developer role abilities
+        if current_user.is_developer?
+          can :manage, :all
+        end
+      else
+        can :create, User
+      end
+
+    end
+
+    def self.included(base)
+      base.send :include, CanCan::Ability
+
+      base.class_eval {
+        def initialize(current_user)
+          ae_ability_defaults(current_user)
+        end
+      }
+    end
+
+  end
+
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authcan_easyroller
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Topher Fangio
@@ -14,21 +15,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -05:00
+date: 2010-08-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: authlogic
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 1
+        - 3
+        version: 2.1.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cancan
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: easy_roles
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id004
 description: "This is a basic Rails engine utilizing Authlogic, CanCan and Easy Roles to create a starting point for simple Rails-based applications that need authentication and authorization. "
 email: fangiotophia@gmail.com
 executables: []
@@ -44,11 +95,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/controllers/authcan_easyroller_controller.rb
 - app/controllers/user_sessions_controller.rb
 - app/controllers/users_controller.rb
-- app/helpers/authcan_easyroller_helper.rb
-- app/models/ability.rb
 - app/models/user.rb
 - app/models/user_session.rb
 - app/views/user_sessions/new.html.erb
@@ -59,10 +107,10 @@ files:
 - app/views/users/show.html.erb
 - authcan_easyroller.gemspec
 - config/routes.rb
-- examples/ability.rb
-- examples/application.html.erb
-- examples/main.css
 - lib/authcan_easyroller.rb
+- lib/extensions/action_controller_base.rb
+- lib/extensions/cancan_ability.rb
+- lib/helpers/authcan_easyroller.rb
 - test/helper.rb
 - test/test_authcan_easyroller.rb
 has_rdoc: true
@@ -75,27 +123,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails 3 engine for user authentication/authorization utilizing Authlogic, CanCan and EasyRoles
 test_files: 
 - test/helper.rb
 - test/test_authcan_easyroller.rb
-- examples/ability.rb

data/app/models/ability.rb

@@ -1,41 +0,0 @@
-class Ability
-  include CanCan::Ability
-
-  def initialize(current_user)
-    can :read, :all
-    can :manage, UserSession
-
-    if current_user
-      # Abilities for someone with an account (does not necessarily have a "user" role)
-      can [:update, :destroy], User do |user|
-        user == current_user
-      end
-
-
-      # User role abilities
-      if current_user.is_user?
-      end
-
-
-      # Moderator role abilities
-      if current_user.is_moderator?
-      end
-
-
-      # Admin role abilities
-      if current_user.is_admin?
-        can :manage, :all
-      end
-
-
-      # Developer role abilities
-      if current_user.is_developer?
-        can :manage, :all
-      end
-    else
-      can :create, User
-    end
-
-  end
-
-end

data/examples/ability.rb

@@ -1,41 +0,0 @@
-class Ability
-  include CanCan::Ability
-
-  def initialize(current_user)
-    can :read, :all
-    can :manage, UserSession
-
-    if current_user
-      # Abilities for someone with an account (does not necessarily have a "user" role)
-      can [:update, :destroy], User do |user|
-        user == current_user
-      end
-
-
-      # User role abilities
-      if current_user.is_user?
-      end
-
-
-      # Moderator role abilities
-      if current_user.is_moderator?
-      end
-
-
-      # Admin role abilities
-      if current_user.is_admin?
-        can :manage, :all
-      end
-
-
-      # Developer role abilities
-      if current_user.is_developer?
-        can :manage, :all
-      end
-    else
-      can :create, User
-    end
-
-  end
-
-end

data/examples/application.html.erb

@@ -1,48 +0,0 @@
-<html>
-  <head>
-    <%= csrf_meta_tag %>
-    <script src="http://www.google.com/jsapi"></script>
-    <script>google.load("jquery", "1.4");</script>
-        
-    <%= stylesheet_link_tag 'main' %>
-    <%= yield :stylesheets %>
-  </head>
-        
-  <body> 
-    <div id='navigation'>
-      <%= link_to "Users", users_path %>
-    </div>
-    
-    <div id='userland'>
-      <% if current_user %>
-        Welcome <%= current_user.email %>!
-      
-        <%= link_to "My Account", user_path(current_user) %>
-        <%= link_separator %>
-        <%= link_to "Logout", user_session_path, :method => :delete %>
-      <% else %>
-        You are not currently
-        <%= link_to "logged in", new_user_session_path %>.
-      <% end %>
-    </div>
-    
-    <div id='flashes'>
-      <%= raw "<h5 class='flash error'>#{flash[:error]}</h5>" unless flash[:error].blank? %>
-      <%= raw "<h5 class='flash notice'>#{flash[:notice]}</h5>" unless flash[:notice].blank? %>
-    </div>
-       
-    <div id='content'>
-      <%= yield %>
-    </div>
-
-    <div id='copyright'>
-      Copyright &copy; 2010, MyCompany. All rights reserved.
-    </div>
-      
-    <script src="http://www.google.com/jsapi"></script>
-    <script>google.load("jquery", "1.4");</script>
-    <%= javascript_include_tag 'rails' %>
-    
-    <%= yield :javascript %>
-  </body>
-</html>

data/examples/main.css

@@ -1,41 +0,0 @@
-#navigation {
-  float: left;
-  margin-bottom: 10px;
-}
-
-#userland {
-  float: right;
-  margin-bottom: 10px;
-}
-
-#flashes {
-  clear: both;
-}
-
-#content {
-  margin: 10px;
-}
-
-#copyright {
-  text-align: center;
-}
-
-.flash {
-  border: 1px solid #000000;
-  padding: 10px;
-}
-
-.flash.error {
-}
-
-.flash.notice {
-}
-
-label {
-  font-weight: bold;
-}
-
-input[type=text],input[type=password],select,textarea {
-  clear: both;
-  display: block;
-}