rails_apps_composer 1.4.5 → 1.4.6

data/recipes/add_user.rb

@@ -19,6 +19,20 @@ RUBY
 
     # Generate models and routes for a User
     generate 'devise user'
+    
+    if recipes.include? 'authorization'
+      # create'app/models/ability.rb'
+      generate 'cancan:ability'
+      # create 'app/models/role.rb'
+      # create 'config/initializers/rolify.rb'
+      # create 'db/migrate/...rolify_create_roles.rb'
+      # insert 'rolify' method in 'app/models/users.rb'
+      if recipes.include? 'mongoid'
+        generate 'rolify:role Role User mongoid'
+      else
+        generate 'rolify:role Role User'
+      end
+    end
 
     # Add a 'name' attribute to the User model
     if recipes.include? 'mongoid'
@@ -58,13 +72,6 @@ RUBY
         gsub_file 'app/models/user.rb', /# field :unconfirmed_email/, "field :unconfirmed_email"
       end
     end
-    
-    if recipes.include? 'canard'
-      say_wizard "modifying User class to add an admin role"
-      inject_into_file 'app/models/user.rb', :after => 'ActiveRecord::Base' do
-        "\n  acts_as_user :roles => :admin\n"
-      end
-    end
 
     unless recipes.include? 'haml'
 

data/recipes/devise.rb

@@ -20,9 +20,10 @@ case config['devise']
     say_wizard "Devise recipe skipped."
 end
 
-if config['canard']
-  gem 'cancan', '>= 0.2.7'
-  recipes << 'canard'
+if config['authorization']
+  gem 'cancan', '>= 1.6.7'
+  gem 'rolify', '>= 3.1.0'
+  recipes << 'authorization'
 end
 
 if recipes.include? 'devise'
@@ -51,7 +52,16 @@ if recipes.include? 'devise'
       # (see https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3)
       gsub_file 'config/initializers/devise.rb', 'config.sign_out_via = :delete', 'config.sign_out_via = Rails.env.test? ? :get : :delete'
     end
-
+    
+    if config['authorization']
+      inject_into_file 'app/controllers/application_controller.rb', :before => 'end' do <<-RUBY
+  rescue_from CanCan::AccessDenied do |exception|
+    redirect_to root_path, :error => exception.message
+  end
+RUBY
+      end
+    end
+    
   end
 
   after_everything do
@@ -99,6 +109,6 @@ config:
       type: multiple_choice
       prompt: Would you like to use Devise for authentication?
       choices: [["No", no], ["Devise with default modules", standard], ["Devise with Confirmable module", confirmable], ["Devise with Confirmable and Invitable modules", invitable]]
-  - canard:
+  - authorization:
       type: boolean
-      prompt: Would you like to manage authorization with CanCan, RoleModel, and Canard?
+      prompt: Would you like to manage authorization with CanCan & Rolify?

data/recipes/extras.rb

@@ -2,24 +2,26 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/extras.rb
 
 if config['footnotes']
-  say_wizard "Extras recipe running 'after bundler'"
+  say_wizard "Adding 'rails-footnotes'"
   gem 'rails-footnotes', '>= 3.7', :group => :development
   after_bundler do
     generate 'rails_footnotes:install'
   end
-else
-  recipes.delete('footnotes')
 end
 
 if config['ban_spiders']
-  say_wizard "BanSpiders recipe running 'after bundler'"
+  say_wizard "Banning spiders by modifying 'public/robots.txt'"
   after_bundler do
     # ban spiders from your site by changing robots.txt
     gsub_file 'public/robots.txt', /# User-Agent/, 'User-Agent'
     gsub_file 'public/robots.txt', /# Disallow/, 'Disallow'
   end
-else
-  recipes.delete('ban_spiders')
+end
+
+if config['paginate']
+  say_wizard "Adding 'will_paginate'"
+  gem 'will_paginate', '>= 3.0.3'
+  recipes << 'paginate'
 end
 
 __END__
@@ -38,3 +40,6 @@ config:
   - ban_spiders:
       type: boolean
       prompt: Would you like to set a robots.txt file to ban spiders?
+  - paginate:
+      type: boolean
+      prompt: Would you like to add 'will_paginate' for pagination?

data/recipes/html5.rb

@@ -52,7 +52,11 @@ after_bundler do
   # get an appropriate navigation partial
   if recipes.include? 'haml'
     if recipes.include? 'devise'
-      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
+      if recipes.include? 'authorization'
+        get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/authorization/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
+      else
+        get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'        
+      end
     elsif recipes.include? 'omniauth'
       get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/omniauth/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
     elsif recipes.include? 'subdomains'
@@ -62,7 +66,11 @@ after_bundler do
     end
   else
     if recipes.include? 'devise'
-      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
+      if recipes.include? 'authorization'
+        get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/authorization/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
+      else
+        get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'        
+      end
     elsif recipes.include? 'omniauth'
       get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/omniauth/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
     elsif recipes.include? 'subdomains'

data/recipes/mongoid.rb

@@ -5,7 +5,7 @@ if config['mongoid']
   say_wizard "REMINDER: When creating a Rails app using Mongoid..."
   say_wizard "you should add the '-O' flag to 'rails new'"
   gem 'bson_ext', '>= 1.6.2'
-  gem 'mongoid', '>= 2.4.7'
+  gem 'mongoid', '>= 2.4.8'
 else
   recipes.delete('mongoid')
 end

data/recipes/seed_database.rb

@@ -32,6 +32,8 @@ FILE
 puts 'SETTING UP DEFAULT USER LOGIN'
 user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please', :confirmed_at => Time.now.utc
 puts 'New user created: ' << user.name
+user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please', :confirmed_at => Time.now.utc
+puts 'New user created: ' << user2.name
 FILE
       end
     else
@@ -39,19 +41,28 @@ FILE
 puts 'SETTING UP DEFAULT USER LOGIN'
 user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
 puts 'New user created: ' << user.name
+user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please'
+puts 'New user created: ' << user2.name
 FILE
       end
     end
-    if recipes.include? 'canard'
+    if recipes.include? 'authorization'
       append_file 'db/seeds.rb' do <<-FILE
-user.roles = [:admin]
+user.add_role :admin
 FILE
       end
     end
   end
   
-  run 'bundle exec rake db:seed'
+
   
+end
+
+after_everything do
+  
+  say_wizard "seeding the database"
+  run 'bundle exec rake db:seed'
+
 end
 
 __END__

data/recipes/users_page.rb

@@ -8,14 +8,41 @@ after_bundler do
     #----------------------------------------------------------------------------
     # Create a users controller
     #----------------------------------------------------------------------------
-    generate(:controller, "users show")
-    gsub_file 'app/controllers/users_controller.rb', /def show/ do
-    <<-RUBY
-before_filter :authenticate_user!
+    generate(:controller, "users show index")
+    remove_file 'app/controllers/users_controller.rb'
+    create_file 'app/controllers/users_controller.rb' do <<-RUBY
+class UsersController < ApplicationController
+  before_filter :authenticate_user!
+
+  def index
+    @users = User.all
+  end
 
   def show
     @user = User.find(params[:id])
+  end
+
+end
+RUBY
+    end
+    if recipes.include? 'authorization'
+      inject_into_file 'app/controllers/users_controller.rb', "    authorize! :index, @user, :message => 'Not authorized as an administrator.'\n", :after => "def index\n"
+    end
+    if recipes.include? 'paginate'
+      gsub_file 'app/controllers/users_controller.rb', /@users = User.all/, '@users = User.paginate(:page => params[:page])'
+    end
+
+    #----------------------------------------------------------------------------
+    # Limit access to the users#index page
+    #----------------------------------------------------------------------------
+    if recipes.include? 'authorization'
+      inject_into_file 'app/models/ability.rb', :after => "def initialize(user)\n" do <<-RUBY
+    user ||= User.new # guest user (not logged in)
+    if user.has_role? :admin
+      can :manage, :all
+    end
 RUBY
+      end
     end
 
     #----------------------------------------------------------------------------
@@ -23,13 +50,47 @@ RUBY
     #----------------------------------------------------------------------------
     # @devise_for :users@ route must be placed above @resources :users, :only => :show@.
     gsub_file 'config/routes.rb', /get \"users\/show\"/, ''
+    gsub_file 'config/routes.rb', /get \"users\/index\"/, ''
     gsub_file 'config/routes.rb', /devise_for :users/ do
     <<-RUBY
 devise_for :users
-  resources :users, :only => :show
+  resources :users, :only => [:show, :index]
 RUBY
     end
 
+    #----------------------------------------------------------------------------
+    # Create a users index page
+    #----------------------------------------------------------------------------
+    if recipes.include? 'haml'
+      remove_file 'app/views/users/index.html.haml'
+      # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
+      # We have to use single-quote-style-heredoc to avoid interpolation.
+      create_file 'app/views/users/index.html.haml' do <<-'HAML'
+%h2 Users
+- @users.each do |user|
+  %br/
+  #{link_to user.email, user} signed up #{user.created_at.to_date}
+HAML
+      end
+      if recipes.include? 'paginate'
+        append_file 'app/views/users/index.html.haml', "\n= will_paginate\n"
+      end
+    else
+      append_file 'app/views/users/index.html.erb' do <<-ERB
+<ul class="users">
+  <% @users.each do |user| %>
+    <li>
+      <%= link_to user.name, user %> signed up <%= user.created_at.to_date %>
+    </li>
+  <% end %>
+</ul>
+ERB
+      end
+      if recipes.include? 'paginate'
+        append_file 'app/views/users/index.html.erb', "\n<%= will_paginate %>\n"
+      end
+    end
+
     #----------------------------------------------------------------------------
     # Create a users show page
     #----------------------------------------------------------------------------

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.4.5"
-end
+  VERSION = "1.4.6"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157713800 !ruby/object:Gem::Requirement
+  requirement: &2153133360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157713800
+  version_requirements: *2153133360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157713300 !ruby/object:Gem::Requirement
+  requirement: &2153132800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157713300
+  version_requirements: *2153132800
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2157712800 !ruby/object:Gem::Requirement
+  requirement: &2153132340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157712800
+  version_requirements: *2153132340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157712260 !ruby/object:Gem::Requirement
+  requirement: &2153131860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157712260
+  version_requirements: *2153131860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157711700 !ruby/object:Gem::Requirement
+  requirement: &2153131120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2157711700
+  version_requirements: *2153131120
 - !ruby/object:Gem::Dependency
   name: mg
-  requirement: &2157711240 !ruby/object:Gem::Requirement
+  requirement: &2153130600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157711240
+  version_requirements: *2153130600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157710700 !ruby/object:Gem::Requirement
+  requirement: &2153129680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157710700
+  version_requirements: *2153129680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157710280 !ruby/object:Gem::Requirement
+  requirement: &2153129020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157710280
+  version_requirements: *2153129020
 description: A gem with recipes to create Rails application templates you can use
   to generate Rails starter apps.
 email:
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 378750494196992519
+      hash: -1960849393898634811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 378750494196992519
+      hash: -1960849393898634811
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.16