rails_apps_composer 1.5.4 → 1.5.5

data/lib/rails_wizard/command.rb

@@ -98,18 +98,22 @@ module RailsWizard
         else
           file = Tempfile.new('template')
         end
-        template = RailsWizard::Template.new(recipes, defaults)
-        file.write template.compile
-        file.close
-        if name
-          system "rails new #{name} -m #{file.path} #{template.args.join(' ')}"
-        else
-          puts "install with the command:"
-          puts
-          puts "rails new <APP_NAME> -m #{file.path} #{template.args.join(' ')}"
+        begin
+          template = RailsWizard::Template.new(recipes, defaults)
+          file.write template.compile
+          file.close
+          if name
+            system "rails new #{name} -m #{file.path} #{template.args.join(' ')}"
+          else
+            puts "install with the command:"
+            puts
+            puts "rails new <APP_NAME> -m #{file.path} #{template.args.join(' ')}"
+          end
+        rescue RailsWizard::UnknownRecipeError
+          raise Thor::Error.new("> #{red}#{$!.message}.#{clear}")
+        ensure
+          file.unlink unless file_name
         end
-      ensure
-        file.unlink unless file_name
       end
     end
   end

data/lib/rails_wizard/recipe.rb

@@ -7,7 +7,7 @@ require 'erb'
 module RailsWizard
   class Recipe
     extend Comparable
-    
+
     def self.<=>(another)
       return -1 if another.run_after.include?(self.key) || self.run_before.include?(another.key)
       return 1 if another.run_before.include?(self.key) || self.run_after.include?(another.key)
@@ -37,8 +37,8 @@ module RailsWizard
       else
         template = template_or_file
       end
- 
-      recipe_class = Class.new(RailsWizard::Recipe) 
+
+      recipe_class = Class.new(RailsWizard::Recipe)
       recipe_class.attributes = attributes
       recipe_class.template = template
       recipe_class.key = key
@@ -95,12 +95,20 @@ module RailsWizard
     end
 
     def self.from_mongo(key)
-      return key if key.respond_to?(:superclass) && key.superclass == RailsWizard::Recipe
-      RailsWizard::Recipes[key]
+      return key if (key.respond_to?(:superclass) && key.superclass == RailsWizard::Recipe)
+      return RailsWizard::Recipes[key] if RailsWizard::Recipes[key]
+      raise(RailsWizard::UnknownRecipeError.new(key))
     end
 
     def self.get_binding
       binding
     end
   end
+
+  class UnknownRecipeError < StandardError
+    def initialize(key)
+      message = "No recipe found with name '#{key}'"
+      super(message)
+    end
+  end
 end

data/recipes/add_user.rb

@@ -43,14 +43,18 @@ RUBY
 
     # Add a 'name' attribute to the User model
     if recipes.include? 'mongoid'
+      # include timestamps to avoid special casing views for Mongoid
+      gsub_file 'app/models/user.rb',
+        /include Mongoid::Document$/,
+        "\\0\n  include Mongoid::Timestamps\n"
       # for mongoid
       gsub_file 'app/models/user.rb', /\bend\s*\Z/ do
   <<-RUBY
   # run 'rake db:mongoid:create_indexes' to create indexes
-  index :email, :unique => true
-  field :name
+  index({ email: 1 }, { unique: true, background: true })
+  field :name, :type => String
   validates_presence_of :name
-  attr_accessible :name, :email, :password, :password_confirmation, :remember_me
+  attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :created_at, :updated_at
 end
 RUBY
       end

data/recipes/html5.rb

@@ -5,7 +5,7 @@ case config['css_option']
 
   when 'foundation'
     # https://github.com/zurb/foundation-rails
-    gem 'zurb-foundation', '>= 3.0.2'
+    gem 'zurb-foundation', '>= 3.0.5'
 
   when 'bootstrap_less'
     # https://github.com/seyhunak/twitter-bootstrap-rails
@@ -124,7 +124,6 @@ RUBY
       get 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css', 'app/assets/stylesheets/base.css.scss'
       get 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css', 'app/assets/stylesheets/layout.css.scss'
       get 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css', 'app/assets/stylesheets/skeleton.css.scss'
-      get 'https://raw.github.com/dhgamache/Skeleton/master/javascripts/tabs.js', 'app/assets/javascripts/tabs.js'
 
     when 'normalize'
       say_wizard 'normalizing CSS for consistent styling'

data/recipes/mongoid.rb

@@ -4,8 +4,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.4'
-  gem 'mongoid', '>= 2.4.11'
+  gem 'mongoid', '>= 3.0.1'
 else
   recipes.delete('mongoid')
 end

data/recipes/omniauth.rb

@@ -13,8 +13,8 @@ if config['omniauth']
      gem 'omniauth-github'
     when 'linkedin'
       gem 'omniauth-linkedin'
-    when 'google'
-      gem 'omniauth-google'
+    when 'google-oauth2'
+      gem 'omniauth-google-oauth2'
     when 'tumblr'
       gem 'omniauth-tumblr'
   end
@@ -48,6 +48,8 @@ RUBY
       gsub_file 'app/models/user.rb', /\bend\s*\Z/ do
 <<-RUBY
   attr_accessible :provider, :uid, :name, :email
+  # run 'rake db:mongoid:create_indexes' to create indexes
+  index({ email: 1 }, { unique: true, background: true })
 end
 RUBY
       end
@@ -189,4 +191,4 @@ config:
   - provider:
       type: multiple_choice
       prompt: "Which service provider will you use?"
-      choices: [["Twitter", twitter], ["Facebook", facebook], ["GitHub", github], ["LinkedIn", linkedin], ["Google", google], ["Tumblr", tumblr]]
+      choices: [["Twitter", twitter], ["Facebook", facebook], ["GitHub", github], ["LinkedIn", linkedin], ["Google-Oauth-2",google-oauth2], ["Tumblr", tumblr]]

data/recipes/prelaunch_signup.rb

@@ -18,7 +18,7 @@ gem 'haml-rails', '>= 0.3.4', :group => :development
 
 # >---------------------------------[ RSpec ]---------------------------------<
 
-gem 'rspec-rails', '>= 2.10.1', :group => [:development, :test]
+gem 'rspec-rails', '>= 2.11.0', :group => [:development, :test]
 gem 'factory_girl_rails', '>= 3.5.0', :group => [:development, :test]
 # add a collection of RSpec matchers and Cucumber steps to make testing email easy
 gem 'email_spec', '>= 1.2.1', :group => :test

data/recipes/rspec.rb

@@ -2,12 +2,12 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/rspec.rb
 
 if config['rspec']
-  gem 'rspec-rails', '>= 2.10.1', :group => [:development, :test]
+  gem 'rspec-rails', '>= 2.11.0', :group => [:development, :test]
   if recipes.include? 'mongoid'
     # use the database_cleaner gem to reset the test database
     gem 'database_cleaner', '>= 0.8.0', :group => :test
-    # include RSpec matchers from the mongoid-rspec gem, 1.4.6 requires mongoid 3.0.0.rc making it impossible to resolve dependencies
-    gem 'mongoid-rspec', '1.4.5', :group => :test
+    # include RSpec matchers from the mongoid-rspec gem
+    gem 'mongoid-rspec', '1.4.6', :group => :test
   end
   case config['fixtures']
     when 'machinist'

data/recipes/seed_database.rb

@@ -3,13 +3,6 @@
 
 after_bundler do
   say_wizard "SeedDatabase recipe running 'after bundler'"
-  if recipes.include? 'mongoid'
-    append_file 'db/seeds.rb' do <<-FILE
-puts 'EMPTY THE MONGODB DATABASE'
-Mongoid.master.collections.reject { |c| c.name =~ /^system/}.each(&:drop)
-FILE
-    end
-  end
   if recipes.include? 'devise'
     if recipes.include? 'devise-confirmable'
       append_file 'db/seeds.rb' do <<-FILE

data/recipes/turnip.rb

@@ -0,0 +1,18 @@
+gem 'turnip', :group => [:test]
+
+after_bundler do
+  append_to_file '.rspec', '-r turnip/rspec'
+  create_file 'spec/acceptance/steps/.gitkeep'
+end
+
+__END__
+
+name: Turnip
+description: "Gherkin extension for RSpec"
+author: listrophy,mathias
+
+requires: [rspec]
+run_after: [rspec]
+exclusive: acceptance_testing 
+category: testing
+tags: [acceptance]

data/spec/rails_wizard/recipe_spec.rb

@@ -41,7 +41,7 @@ name: This is an Example
 description: You know it's an exmaple.
 RUBY
         recipe = RailsWizard::Recipe.generate('just_a_test', file)
-        recipe.template.should == '# this is an example'        
+        recipe.template.should == '# this is an example'
         recipe.category.should == 'example'
         recipe.name.should == 'This is an Example'
       end
@@ -69,11 +69,37 @@ RUBY
 
   it 'should set default attributes' do
     recipe = RailsWizard::Recipe.generate('abc','# test')
-    
+
     RailsWizard::Recipe::DEFAULT_ATTRIBUTES.each_pair do |k,v|
       recipe.send(k).should == v
     end
   end
+
+  describe ".from_mongo" do
+    context "when asked for a known recipe" do
+      let(:recipe_key) {'recipe_example'}
+      let(:recipe) { RailsWizard::Recipe.generate(recipe_key, "# this is a test", :category => 'example', :name => "RailsWizard Example") }
+      let(:recipe_klass) { Kernel.const_get("RailsWizard").const_get("Recipes").const_get("RecipeExample") }
+      before :all do
+        RailsWizard::Recipes.add(recipe)
+      end
+      context "by key" do
+        it "returns the recipe" do
+          RailsWizard::Recipe.from_mongo(recipe_key).should == recipe_klass
+        end
+      end
+      context "by class" do
+        it "returns the recipe" do
+          RailsWizard::Recipe.from_mongo(recipe_klass).should == recipe_klass
+        end
+      end
+    end
+    context "when asked for an unknown recipe" do
+      it "raises an UnknownRecipeError" do
+        expect { RailsWizard::Recipe.from_mongo("foo") }.to raise_error RailsWizard::UnknownRecipeError, "No recipe found with name 'foo'"
+      end
+    end
+  end
 end
 
 __END__

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -197,6 +197,7 @@ files:
 - recipes/slim.rb
 - recipes/static_page.rb
 - recipes/subdomains.rb
+- recipes/turnip.rb
 - recipes/unicorn.rb
 - recipes/users_page.rb
 - README.textile
@@ -227,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -215979203623829965
+      hash: 584023313180931500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -215979203623829965
+      hash: 584023313180931500
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24