replace recipes 'model, view, controller' with recipes 'devise, omniauth, pundit'

Author: DanielKehoe

CHANGELOG.textile

@@ -2,6 +2,7 @@ h1. CHANGELOG
 
 h3. 3.0.0 unreleased
 
+* replace recipes 'model, view, controller' with recipes 'devise, omniauth, pundit'
 * remove 'starter_app' option (to be replaced by rails_apps_pages generated pages)
 * remove 'testing' recipe (partly replaced by 'tests4' recipe)
 * remove options for Rails 3.2 example applications

lib/rails_wizard/diagnostics.rb

@@ -15,17 +15,18 @@ module Diagnostics
     @@recipes << %w(gems git setup)
     @@recipes << %w(gems git readme setup)
     @@recipes << %w(extras gems git readme setup)
-    @@recipes << %w(controllers email extras frontend gems git init models railsapps readme routes setup testing views)
-    @@recipes << %w(controllers core email extras frontend gems git init models railsapps readme routes setup testing views)
-    @@recipes << %w(controllers core email extras frontend gems git init models prelaunch railsapps readme routes setup testing views)
-    @@recipes << %w(controllers core email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
-    @@recipes << %w(controllers email example extras frontend gems git init models railsapps readme routes setup testing views)
-    @@recipes << %w(controllers email example extras frontend gems git init models prelaunch railsapps readme routes setup testing views)
-    @@recipes << %w(controllers email example extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
-    @@recipes << %w(apps4 controllers core email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
-    @@recipes << %w(apps4 controllers core email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing tests4 views)
-    @@recipes << %w(apps4 controllers core deployment email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
-    @@recipes << %w(apps4 controllers core deployment email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing tests4 views)
+    @@recipes << %w(email extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(core email extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(core email extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(core email extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(email example extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(email example extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(email example extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(apps4 core email extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(apps4 core email extras frontend gems git init railsapps readme setup tests4)
+    @@recipes << %w(apps4 core deployment email extras frontend gems git init railsapps readme setup testing)
+    @@recipes << %w(apps4 core deployment email extras frontend gems git init railsapps readme setup tests4)
+    @@recipes << %w(apps4 core deployment devise email extras frontend gems git init omniauth pundit railsapps readme setup tests4)
 
     ### collections of preferences that are known to work together
 

recipes/controllers.rb

@@ -21,7 +21,7 @@
   setup, readme, gems,
   tests4,
   email,
-  models, controllers, views,
+  devise, omniauth, pundit,
   frontend,
   init, extras, deployment]
 category: collections

recipes/core.rb

@@ -0,0 +1,32 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/devise.rb
+
+after_bundler do
+  say_wizard "recipe running after 'bundle install'"
+  if prefer :authentication, 'devise'
+    # prevent logging of password_confirmation
+    gsub_file 'config/initializers/filter_parameter_logging.rb', /:password/, ':password, :password_confirmation'
+    generate 'devise:install'
+    generate 'devise_invitable:install' if prefer :devise_modules, 'invitable'
+    generate 'devise user' # create the User model
+    generate 'migration AddNameToUsers name:string'
+    if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
+      gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
+      generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
+    end
+    run 'bundle exec rake db:migrate'
+  end
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: devise"' if prefer :git, true
+end
+
+__END__
+
+name: devise
+description: "Add Devise for authentication"
+author: RailsApps
+
+requires: [setup, gems]
+run_after: [setup, gems]
+category: mvc

recipes/devise.rb

@@ -182,6 +182,6 @@
 description: "Set up and initialize database."
 author: RailsApps
 
-requires: [setup, gems, models]
-run_after: [setup, gems, models]
+requires: [setup, gems, devise, omniauth]
+run_after: [setup, gems, devise, omniauth]
 category: initialize

recipes/init.rb

@@ -0,0 +1,32 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/omniauth.rb
+
+after_bundler do
+  say_wizard "recipe running after 'bundle install'"
+  if prefer :authentication, 'omniauth'
+    repo = 'https://raw.githubusercontent.com/RailsApps/rails-omniauth/master/'
+    copy_from_repo 'config/initializers/omniauth.rb', :repo => repo
+    gsub_file 'config/initializers/omniauth.rb', /twitter/, prefs[:omniauth_provider] unless prefer :omniauth_provider, 'twitter'
+    generate 'model User name:string email:string provider:string uid:string'
+    run 'bundle exec rake db:migrate'
+    copy_from_repo 'app/models/user.rb', :repo => 'https://raw.githubusercontent.com/RailsApps/rails-omniauth/master/'
+    copy_from_repo 'app/controllers/application_controller.rb', :repo => repo
+    filename = 'app/controllers/sessions_controller.rb'
+    copy_from_repo filename, :repo => repo
+    gsub_file filename, /twitter/, prefs[:omniauth_provider] unless prefer :omniauth_provider, 'twitter'
+    copy_from_repo 'config/routes.rb', :repo => repo
+  end
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: omniauth"' if prefer :git, true
+end
+
+__END__
+
+name: omniauth
+description: "Add OmniAuth for authentication"
+author: RailsApps
+
+requires: [setup, gems]
+run_after: [setup, gems]
+category: mvc

recipes/models.rb

@@ -0,0 +1,33 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/pundit.rb
+
+after_bundler do
+  say_wizard "recipe running after 'bundle install'"
+  if prefer :authorization, 'pundit'
+    generate 'migration AddRoleToUsers role:integer'
+    if prefer :authentication, 'devise'
+      copy_from_repo 'app/models/user.rb', :repo => 'https://raw.githubusercontent.com/RailsApps/rails-devise-pundit/master/'
+      if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
+        gsub_file 'app/models/user.rb', /:registerable,/, ":registerable, :confirmable,"
+        generate 'migration AddConfirmableToUsers confirmation_token:string confirmed_at:datetime confirmation_sent_at:datetime unconfirmed_email:string'
+      end
+    end
+    if prefer :authentication, 'omniauth'
+      # TODO
+    end
+    copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.githubusercontent.com/RailsApps/rails-devise-pundit/master/'
+  end
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: pundit"' if prefer :git, true
+end
+
+__END__
+
+name: pundit
+description: "Add Pundit for authorization"
+author: RailsApps
+
+requires: [setup, gems, devise]
+run_after: [setup, gems, devise]
+category: mvc

recipes/omniauth.rb

@@ -2,7 +2,6 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/rails_omniauth.rb
 
 if prefer :apps4, 'rails-omniauth'
-
   prefs[:authentication] = 'omniauth'
   prefs[:authorization] = 'none'
   prefs[:better_errors] = true
@@ -13,21 +12,11 @@
   prefs[:pry] = false
   prefs[:quiet_assets] = true
   add_gem 'high_voltage'
-
   after_everything do
     generate 'pages:users -f'
     generate 'pages:about -f'
     generate 'layout:navigation -f'
     repo = 'https://raw.githubusercontent.com/RailsApps/rails-omniauth/master/'
-
-    # >-------------------------------[ Models ]--------------------------------<
-
-    copy_from_repo 'app/models/user.rb', :repo => repo
-
-    # >-------------------------------[ Routes ]--------------------------------<
-
-    copy_from_repo 'config/routes.rb', :repo => repo
-
   end
 end
 

recipes/pundit.rb

@@ -75,7 +75,7 @@
 end
 
 ## Authentication and Authorization
-if recipes.include? 'models'
+if (recipes.include? 'devise') || (recipes.include? 'omniauth')
   prefs[:authentication] = multiple_choice "Authentication?", [["None", "none"], ["Devise", "devise"], ["OmniAuth", "omniauth"]] unless prefs.has_key? :authentication
   case prefs[:authentication]
     when 'devise'
@@ -85,12 +85,8 @@
       prefs[:omniauth_provider] = multiple_choice "OmniAuth provider?", [["Facebook", "facebook"], ["Twitter", "twitter"], ["GitHub", "github"],
         ["LinkedIn", "linkedin"], ["Google-Oauth-2", "google_oauth2"], ["Tumblr", "tumblr"]] unless prefs.has_key? :omniauth_provider
   end
-  unless prefs.has_key? :authorization
-    if rails_4_1?
-      prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["Pundit", "pundit"]]
-    else
-      prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["CanCan with Rolify", "cancan"]]
-    end
+  unless prefer :authentication, 'omniauth' # TODO -- implement pundit for omniauth
+    prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["Pundit", "pundit"]] unless prefs.has_key? :authorization
   end
 end