rails_apps_composer 2.2.17 → 2.2.18

data/recipes/controllers.rb

@@ -5,7 +5,8 @@ after_bundler do
   say_wizard "recipe running after 'bundle install'"
   ### APPLICATION_CONTROLLER ###
   if prefer :authentication, 'omniauth'
-    copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+    #copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+    copy_from_repo 'app/controllers/application_controller-omniauth.rb', :prefs => 'omniauth'
   end
   if prefer :authorization, 'cancan'
     inject_into_file 'app/controllers/application_controller.rb', :before => "\nend" do <<-RUBY

data/recipes/gems.rb

@@ -22,7 +22,7 @@ end
 
 ## Database Adapter
 gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
-gem 'mongoid', '>= 3.0.9' if prefer :orm, 'mongoid'
+gem 'mongoid', '>= 3.0.11' if prefer :orm, 'mongoid'
 gem 'pg', '>= 0.14.1' if prefer :database, 'postgresql'
 gem 'mysql2', '>= 0.3.11' if prefer :database, 'mysql'
 
@@ -32,7 +32,7 @@ if prefer :templates, 'haml'
   gem 'haml-rails', '>= 0.3.5', :group => :development
   # hpricot and ruby_parser are needed for conversion of HTML to Haml
   gem 'hpricot', '>= 0.8.6', :group => :development
-  gem 'ruby_parser', '>= 2.3.1', :group => :development
+  gem 'ruby_parser', '>= 3.0.1', :group => :development
 end
 if prefer :templates, 'slim'
   gem 'slim', '>= 1.3.3'
@@ -41,31 +41,29 @@ if prefer :templates, 'slim'
   gem 'haml', '>= 3.1.6', :group => :development
   gem 'haml-rails', '>= 0.3.5', :group => :development
   gem 'hpricot', '>= 0.8.6', :group => :development
-  gem 'ruby_parser', '>= 2.3.1', :group => :development
+  gem 'ruby_parser', '>= 3.0.1', :group => :development
 end
 
 ## Testing Framework
 if prefer :unit_test, 'rspec'
   gem 'rspec-rails', '>= 2.11.4', :group => [:development, :test]
-  gem 'capybara', '>= 1.1.2', :group => :test if prefer :integration, 'rspec-capybara'
+  gem 'capybara', '>= 1.1.3', :group => :test if prefer :integration, 'rspec-capybara'
+  gem 'database_cleaner', '>= 0.9.1', :group => :test
   if prefer :orm, 'mongoid'
-    # use the database_cleaner gem to reset the test database
-    gem 'database_cleaner', '>= 0.9.1', :group => :test
-    # include RSpec matchers from the mongoid-rspec gem
     gem 'mongoid-rspec', '>= 1.4.6', :group => :test
   end
-  gem 'email_spec', '>= 1.2.1', :group => :test
+  gem 'email_spec', '>= 1.4.0', :group => :test
 end
 if prefer :unit_test, 'minitest'
   gem 'minitest-spec-rails', '>= 3.0.7', :group => :test
   gem 'minitest-wscolor', '>= 0.0.3', :group => :test
-  gem 'capybara', '>= 1.1.2', :group => :test if prefer :integration, 'minitest-capybara'
+  gem 'capybara', '>= 1.1.3', :group => :test if prefer :integration, 'minitest-capybara'
 end
 if prefer :integration, 'cucumber'
   gem 'cucumber-rails', '>= 1.3.0', :group => :test, :require => false
-  gem 'database_cleaner', '>= 0.9.1', :group => :test unless prefer :orm, 'mongoid'
+  gem 'database_cleaner', '>= 0.9.1', :group => :test unless prefer :unit_test, 'rspec'
   gem 'launchy', '>= 2.1.2', :group => :test
-  gem 'capybara', '>= 1.1.2', :group => :test
+  gem 'capybara', '>= 1.1.3', :group => :test
 end
 gem 'turnip', '>= 1.0.0', :group => :test if prefer :integration, 'turnip'
 gem 'factory_girl_rails', '>= 4.1.0', :group => [:development, :test] if prefer :fixtures, 'factory_girl'
@@ -73,11 +71,12 @@ gem 'fabrication', '>= 2.3.0', :group => [:development, :test] if prefer :fixtur
 gem 'machinist', '>= 2.0', :group => :test if prefer :fixtures, 'machinist'
 
 ## Front-end Framework
-gem 'bootstrap-sass', '>= 2.1.0.1' if prefer :bootstrap, 'sass'
+gem 'bootstrap-sass', '>= 2.1.1.0' if prefer :bootstrap, 'sass'
 gem 'compass-rails', '>= 1.0.3', :group => :assets if prefer :frontend, 'foundation'
 gem 'zurb-foundation', '>= 3.2.0', :group => :assets if prefer :frontend, 'foundation'
 if prefer :bootstrap, 'less'
-  gem 'twitter-bootstrap-rails', '>= 2.1.4', :group => :assets
+  gem 'less-rails', '>= 2.2.6', :group => :assets
+  gem 'twitter-bootstrap-rails', '>= 2.1.6', :group => :assets
   # install gem 'therubyracer' to use Less
   gem 'therubyracer', '>= 0.10.2', :group => :assets, :platform => :ruby
 end
@@ -117,7 +116,7 @@ end
 ## Signup App 
 if prefer :railsapps, 'rails-prelaunch-signup'
   gem 'google_visualr', '>= 2.1.2'
-  gem 'jquery-datatables-rails', '>= 1.11.1'
+  gem 'jquery-datatables-rails', '>= 1.11.2'
 end
 
 ## Gems from a defaults file or added interactively

data/recipes/init.rb

@@ -6,7 +6,8 @@ after_everything do
   ### PREPARE SEED ###
   if prefer :authentication, 'devise'
     if (prefer :authorization, 'cancan') && !(prefer :railsapps, 'rails-prelaunch-signup')
-      append_file 'db/seeds.rb' do <<-FILE
+      unless prefer :orm, 'mongoid'
+        append_file 'db/seeds.rb' do <<-FILE
 puts 'CREATING ROLES'
 Role.create([
   { :name => 'admin' }, 
@@ -14,6 +15,17 @@ Role.create([
   { :name => 'VIP' }
 ], :without_protection => true)
 FILE
+        end
+      else
+        append_file 'db/seeds.rb' do <<-FILE
+puts 'CREATING ROLES'
+Role.mongo_session['roles'].insert([
+  { :name => 'admin' }, 
+  { :name => 'user' }, 
+  { :name => 'VIP' }
+])
+FILE
+        end
       end
     end    
     if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')

data/recipes/prelaunch.rb

@@ -89,6 +89,7 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     copy_from_repo 'app/views/user_mailer/welcome_email.html.erb', :repo => repo
     copy_from_repo 'app/views/user_mailer/welcome_email.text.erb', :repo => repo
     copy_from_repo 'app/views/users/index.html.erb', :repo => repo
+    remove_file 'app/views/users/_user.html.erb'
     copy_from_repo 'public/thankyou.html', :repo => repo
 
     # >-------------------------------[ Routes ]--------------------------------<

data/recipes/views.rb

@@ -23,9 +23,11 @@ after_bundler do
   if ['users_app','admin_app','subdomains_app'].include? prefs[:starter_app]
     ## INDEX
     if prefer :starter_app, 'admin_app'
-      copy_from_repo 'app/views/users/index.html.erb', :repo => 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
-      unless prefer :railsapps, 'rails-prelaunch-signup' 
-        copy_from_repo 'app/views/users/_user.html.erb', :repo => 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
+      copy_from_repo 'app/views/users/index-admin_app.html.erb', :prefs => 'admin_app'
+      unless prefer :form_builder, 'simple_form'
+        copy_from_repo 'app/views/users/_user.html.erb'
+      else
+        copy_from_repo 'app/views/users/_user-simple_form.html.erb', :prefs => 'simple_form'
       end
     else
       copy_from_repo 'app/views/users/index.html.erb'

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.17"
+  VERSION = "2.2.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.17
+  version: 2.2.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4210114770382273959
+      hash: -2188681930575705912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4210114770382273959
+      hash: -2188681930575705912
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24