rails_apps_composer 2.4.32 → 2.4.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fc331aeda41521005c16af92dc7583f30cdb23a
-  data.tar.gz: 79f48f7700b3ef71ca2619af6fca2cff8d2aecb0
+  metadata.gz: 95a1099a351713ee559ac3bf6a294c98961dc94f
+  data.tar.gz: 24ca5c5df3627bafff2ce469766b47cc9d590b6a
 SHA512:
-  metadata.gz: cb875131cad98f7a4e58bc95ab598641bc081c8dd628018c196185b88f291fbcaf971b428b032bafcc357fdba2854a0718b322a5088b9a5704dcee0e7944cd0f
-  data.tar.gz: 86fdf15bd8b9efc1e02c46b7b2606e5760448e13a0947ffaedfac56211be4a37355b0fca361dd7be0357dbcdc17ca2f09453a3beff50ba8f924927fb008d8f1c
+  metadata.gz: 420feab9e6a6c414b41d13b0dde8df6c467f561646d7f75d210e212ae0d6e88b30e7610d8137817864d21c59c7d08089270459158e1f268fde5a5b343f4cd9cf
+  data.tar.gz: 197d6dd465c103d0a99c9ef1b9eab35cc5135601ea436fa02ad794a0aaf386d120a61b19c11b7476934903f0af09f5501def60cdbcb7115569fb2e36cf8f020b

data/recipes/apps4.rb

@@ -204,6 +204,51 @@ if prefer :apps4, 'rails-devise'
   end # after_bundler
 end # rails-devise
 
+### RAILS-DEVISE-PUNDIT ####
+
+if prefer :apps4, 'rails-devise-pundit'
+
+  # >-------------------------------[ after_bundler ]--------------------------------<
+
+  after_bundler do
+    say_wizard "recipe running after 'bundle install'"
+    repo = 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
+
+    # >-------------------------------[ Controllers ]--------------------------------<
+
+    copy_from_repo 'app/controllers/home_controller.rb', :repo => repo
+
+    # >-------------------------------[ Views ]--------------------------------<
+
+    copy_from_repo 'app/views/home/index.html.erb', :repo => repo
+
+  end
+
+  # >-------------------------------[ after_everything ]--------------------------------<
+
+  after_everything do
+    say_wizard "recipe running after 'bundle install'"
+
+    # >-------------------------------[ Clean up starter app ]--------------------------------<
+
+    # remove commented lines and multiple blank lines from Gemfile
+    # thanks to https://github.com/perfectline/template-bucket/blob/master/cleanup.rb
+    gsub_file 'Gemfile', /#.*\n/, "\n"
+    gsub_file 'Gemfile', /\n^\s*\n/, "\n"
+    # remove commented lines and multiple blank lines from config/routes.rb
+    gsub_file 'config/routes.rb', /  #.*\n/, "\n"
+    gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"
+    # GIT
+    git :add => '-A' if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: clean up starter app"' if prefer :git, true
+
+    ### GIT ###
+    git :add => '-A' if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: learn-rails app"' if prefer :git, true
+
+  end # after_bundler
+end # rails-devise-pundit
+
 ### RAILS-OMNIAUTH ####
 
 if prefer :apps4, 'rails-omniauth'

data/recipes/controllers.rb

@@ -7,6 +7,9 @@ after_bundler do
   if prefer :authentication, 'omniauth'
     copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
   end
+  if prefer :authorization, 'pundit'
+    copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
+  end
   if prefer :authorization, 'cancan'
     inject_into_file 'app/controllers/application_controller.rb', :before => "\nend" do <<-RUBY
 \n
@@ -42,6 +45,10 @@ RUBY
           copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
         end
       end
+      if prefer :authorization, 'pundit'
+        copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
+        copy_from_repo 'app/policies/user_policy.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
+      end
     when 'subdomains_app'
       copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/'
   end

data/recipes/gems.rb

@@ -141,6 +141,7 @@ if prefer :authorization, 'cancan'
   add_gem 'cancan'
   add_gem 'rolify'
 end
+add_gem 'pundit' if prefer :authorization, 'pundit'
 
 ## Form Builder
 add_gem 'simple_form' if prefer :form_builder, 'simple_form'

data/recipes/init.rb

@@ -71,7 +71,12 @@ after_everything do
   ### DATABASE SEED ###
   if (prefer :authentication, 'devise') and (rails_4_1?)
     copy_from_repo 'db/seeds.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise/master/'
-    copy_from_repo 'app/services/create_admin_service.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise/master/'
+    unless prefer :authorization, 'pundit'
+      copy_from_repo 'app/services/create_admin_service.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise/master/'
+    end
+  end
+  if prefer :authorization, 'pundit'
+    copy_from_repo 'app/services/create_admin_service.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
   end
   if prefer :local_env_file, 'figaro'
     append_file 'db/seeds.rb' do <<-FILE

data/recipes/models.rb

@@ -71,6 +71,10 @@ RUBY
   ### SUBDOMAINS ###
   copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains_app'
   ### AUTHORIZATION ###
+  if prefer :authorization, 'pundit'
+    generate 'migration AddRoleToUsers role:integer'
+    copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
+  end
   if prefer :authorization, 'cancan'
     generate 'cancan:ability'
     if prefer :starter_app, 'admin_app'

data/recipes/railsapps.rb

@@ -29,8 +29,9 @@ when "4"
     when 'railsapps'
       if rails_4_1?
       prefs[:apps4] = multiple_choice "Starter apps for Rails 4.1. More to come.",
-        [["rails-devise", "rails-devise"],
-        ["rails-omniauth", "rails-omniauth"]]
+        [["rails-omniauth", "rails-omniauth"],
+        ["rails-devise", "rails-devise"],
+        ["rails-devise-pundit", "rails-devise-pundit"]]
       else
         prefs[:apps4] = multiple_choice "Starter apps for Rails 4.0. Use Rails 4.1 for more.",
           [["learn-rails", "learn-rails"],
@@ -124,6 +125,17 @@ case prefs[:apps4]
     prefs[:quiet_assets] = true
     prefs[:local_env_file] = false
     prefs[:better_errors] = true
+  when 'rails-devise-pundit'
+    prefs[:git] = true
+    prefs[:unit_test] = false
+    prefs[:integration] = false
+    prefs[:fixtures] = false
+    prefs[:authentication] = 'devise'
+    prefs[:authorization] = 'pundit'
+    prefs[:starter_app] = 'admin_app'
+    prefs[:quiet_assets] = true
+    prefs[:local_env_file] = false
+    prefs[:better_errors] = true
   when 'rails-omniauth'
     prefs[:git] = true
     prefs[:unit_test] = false

data/recipes/setup.rb

@@ -104,7 +104,13 @@ if recipes.include? 'models'
       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
-  prefs[:authorization] = multiple_choice "Authorization?", [["None", "none"], ["CanCan with Rolify", "cancan"]] unless prefs.has_key? :authorization
+  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
+  end
 end
 
 ## Form Builder
@@ -112,7 +118,7 @@ prefs[:form_builder] = multiple_choice "Use a form builder gem?", [["None", "non
 
 ## MVC
 if (recipes.include? 'models') && (recipes.include? 'controllers') && (recipes.include? 'views') && (recipes.include? 'routes')
-  if prefer :authorization, 'cancan'
+  if (prefer :authorization, 'cancan') or (prefer :authorization, 'pundit')
     prefs[:starter_app] = multiple_choice "Install a starter app?", [["None", "none"], ["Home Page", "home_app"],
       ["Home Page, User Accounts", "users_app"], ["Home Page, User Accounts, Admin Dashboard", "admin_app"]] unless prefs.has_key? :starter_app
   elsif prefer :authentication, 'devise'

data/recipes/views.rb

@@ -37,7 +37,15 @@ after_bundler do
     copy_from_repo 'app/views/users/show.html.erb'
     copy_from_repo 'app/views/users/show-subdomains_app.html.erb', :prefs => 'subdomains_app'
     ## EDIT
-    copy_from_repo 'app/views/users/edit.html.erb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
+    if prefer :authentication, 'omniauth'
+      copy_from_repo 'app/views/users/edit.html.erb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
+    end
+  end
+  if (prefer :authorization, 'pundit') and  (prefer :starter_app, 'admin_app')
+    repo = 'https://raw.github.com/RailsApps/rails-devise-pundit/master/'
+    copy_from_repo 'app/views/users/_user.html.erb', :repo => repo
+    copy_from_repo 'app/views/users/index.html.erb', :repo => repo
+    copy_from_repo 'app/views/users/show.html.erb', :repo => repo
   end
   ### PROFILES ###
   copy_from_repo 'app/views/profiles/show-subdomains_app.html.erb', :prefs => 'subdomains_app'

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.32"
+  VERSION = "2.4.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.32
+  version: 2.4.33
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n