rails_apps_composer 1.0.23 → 1.0.24

data/recipes/cucumber.rb

@@ -10,7 +10,7 @@ if config['cucumber']
     gem 'launchy', '0.4.0', :group => :test
   else
     # for Rails 3.1+, use optimistic versioning for gems
-    gem 'cucumber-rails', '>= 1.1.1', :group => :test
+    gem 'cucumber-rails', '>= 1.2.0', :group => :test
     gem 'capybara', '>= 1.1.1', :group => :test
     gem 'database_cleaner', '>= 0.6.7', :group => :test
     gem 'launchy', '>= 2.0.5', :group => :test

data/recipes/mongoid.rb

@@ -11,7 +11,7 @@ if config['mongoid']
   else
     # for Rails 3.1+, use optimistic versioning for gems
     gem 'bson_ext', '>= 1.3.1'
-    gem 'mongoid', '>= 2.2.3'
+    gem 'mongoid', '>= 2.3.3'
   end
 else
   recipes.delete('mongoid')

data/recipes/omniauth.rb

@@ -7,7 +7,20 @@ if config['omniauth']
     gem 'omniauth', '0.2.6'
   else
     # for Rails 3.1+, use optimistic versioning for gems
-    gem 'omniauth', '>= 0.3.2'
+    gem 'omniauth', '>= 1.0.0'
+    # for available gems, see https://github.com/intridea/omniauth/wiki/List-of-Strategies
+    case config['provider']
+      when 'twitter'
+        gem 'omniauth-twitter'
+      when 'facebook'
+        gem 'omniauth-facebook'
+      when 'github'
+       gem 'omniauth-github'
+      when 'linkedin'
+        gem 'omniauth-linkedin'
+      when 'provider'
+        say_wizard "IMPORTANT: you'll have to add a gem to your Gemfile for the provider you want"
+    end
   end
 else
   recipes.delete('omniauth')
@@ -49,13 +62,9 @@ RUBY
     create! do |user|
       user.provider = auth['provider']
       user.uid = auth['uid']
-      if auth['user_info']
-        user.name = auth['user_info']['name'] if auth['user_info']['name'] # Twitter, Google, Yahoo, GitHub
-        user.email = auth['user_info']['email'] if auth['user_info']['email'] # Google, Yahoo, GitHub
-      end
-      if auth['extra'] && auth['extra']['user_hash']
-        user.name = auth['extra']['user_hash']['name'] if auth['extra']['user_hash']['name'] # Facebook
-        user.email = auth['extra']['user_hash']['email'] if auth['extra']['user_hash']['email'] # Facebook
+      if auth['info']
+         user.name = auth['info']['name'] || ""
+         user.email = auth['info']['email'] || ""
       end
     end
   end
@@ -76,7 +85,7 @@ class SessionsController < ApplicationController
   end
 
   def destroy
-    session[:user_id] = nil
+    reset_session
     redirect_to root_url, :notice => 'Signed out!'
   end
 
@@ -151,4 +160,4 @@ config:
   - provider:
       type: multiple_choice
       prompt: "Which service provider will you use?"
-      choices: [["Twitter", twitter], ["Facebook", facebook], ["GitHub", github], ["LinkedIn", linked_in], ["Other", provider]]
+      choices: [["Twitter", twitter], ["Facebook", facebook], ["GitHub", github], ["LinkedIn", linkedin], ["Other", provider]]

data/recipes/rspec.rb

@@ -19,7 +19,7 @@ if config['rspec']
     end
   else
     # for Rails 3.1+, use optimistic versioning for gems
-    gem 'rspec-rails', '>= 2.7.0', :group => [:development, :test]
+    gem 'rspec-rails', '>= 2.8.0.rc1', :group => [:development, :test]
     if recipes.include? 'mongoid'
       # use the database_cleaner gem to reset the test database
       gem 'database_cleaner', '>= 0.6.7', :group => :test

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.0.23"
+  VERSION = "1.0.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2155376080 !ruby/object:Gem::Requirement
+  requirement: &2157192520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155376080
+  version_requirements: *2157192520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155375580 !ruby/object:Gem::Requirement
+  requirement: &2157191980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155375580
+  version_requirements: *2157191980
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2155375160 !ruby/object:Gem::Requirement
+  requirement: &2157191540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155375160
+  version_requirements: *2157191540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155374620 !ruby/object:Gem::Requirement
+  requirement: &2157191000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2155374620
+  version_requirements: *2157191000
 - !ruby/object:Gem::Dependency
   name: mg
-  requirement: &2155374200 !ruby/object:Gem::Requirement
+  requirement: &2157190540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155374200
+  version_requirements: *2157190540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155373660 !ruby/object:Gem::Requirement
+  requirement: &2157189980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2155373660
+  version_requirements: *2157189980
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2155373240 !ruby/object:Gem::Requirement
+  requirement: &2157189520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155373240
+  version_requirements: *2157189520
 description: A gem with recipes to create Rails application templates you can use
   to generate Rails starter apps.
 email:
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 367713650606990065
+      hash: 3137790853749023612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 367713650606990065
+      hash: 3137790853749023612
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.11