build using rails_apps_composer 2.4.3

RailsApps · Jul 11, 2013 · db46304 · db46304
1 parent 27500a6
commit db46304
Show file tree

Hide file tree

Showing 30 changed files with 350 additions and 151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,77 @@
+#----------------------------------------------------------------------------
+# Ignore these files when commiting to a git repository.
+#
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 #
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
+# The original version of this file is found here:
+# https://github.com/RailsApps/rails-composer/blob/master/files/gitignore.txt
+#
+# Corrections? Improvements? Create a GitHub issue:
+# http://github.com/RailsApps/rails-composer/issues
+#----------------------------------------------------------------------------
 
-# Ignore bundler config.
+# bundler state
 /.bundle
+/vendor/bundle/
+/vendor/ruby/
 
-# Ignore the default SQLite database.
+# minimal Rails specific artifacts
+db/*.sqlite3
+/log/*
+/tmp/*
+
+# various artifacts
+**.war
+*.rbc
+*.sassc
+.rspec
+.redcar/
+.sass-cache
+/config/config.yml
+/config/database.yml
+/coverage.data
+/coverage/
+/db/*.javadb/
 /db/*.sqlite3
-/db/*.sqlite3-journal
+/doc/api/
+/doc/app/
+/doc/features.html
+/doc/specs.html
+/public/cache
+/public/stylesheets/compiled
+/public/system/*
+/spec/tmp/*
+/cache
+/capybara*
+/capybara-*.html
+/gems
+/specifications
+rerun.txt
+pickle-email-*.html
+
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+#
+# Here are some files you may want to ignore globally:
+
+# scm revert files
+**.orig
+
+# Mac finder artifacts
+.DS_Store
+
+# Netbeans project directory
+/nbproject/
+
+# RubyMine project files
+.idea
+
+# Textmate project files
+/*.tmproj
 
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
+# vim artifacts
+**.swp
 
 # Ignore application configuration
 /config/application.yml
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.0.0-p0
+2.0.0
diff --git a/Gemfile b/Gemfile
@@ -1,29 +1,26 @@
 source 'https://rubygems.org'
 ruby '2.0.0'
-gem 'rails', '4.0.0.rc2'
-
-# Rails defaults
-gem 'sass-rails', '~> 4.0.0.rc2'
+gem 'rails', '4.0.0'
+gem 'sass-rails', '~> 4.0.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
 gem 'turbolinks'
-gem 'jbuilder', '~> 1.0.1'
-
-# learn-rails
+gem 'jbuilder', '~> 1.2'
 gem 'activerecord-tableless'
-gem 'figaro'
 gem 'bootstrap-sass'
-gem 'simple_form'
-gem 'high_voltage'
+gem 'figaro'
 gem 'gibbon'
+gem 'high_voltage'
+gem 'simple_form', '>= 3.0.0.rc'
 group :development do
-  gem 'sqlite3'
   gem 'better_errors'
+  gem 'binding_of_caller', :platforms=>[:mri_19, :rbx]
   gem 'quiet_assets'
+  gem 'sqlite3'
 end
 group :production do
   gem 'pg'
-  gem 'thin'
   gem 'rails_on_heroku'
+  gem 'thin'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,37 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0.rc2)
-      actionpack (= 4.0.0.rc2)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
       mail (~> 2.5.3)
-    actionpack (4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
       builder (~> 3.1.0)
-    activerecord (4.0.0.rc2)
-      activemodel (= 4.0.0.rc2)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0.rc2)
+      activesupport (= 4.0.0)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
     activerecord-tableless (1.2.0)
       activerecord (>= 2.3.0)
-    activesupport (4.0.0.rc2)
+    activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.0)
-    atomic (1.1.9)
+    atomic (1.1.10)
     better_errors (0.9.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     bootstrap-sass (2.3.2.0)
       sass (~> 3.2)
     builder (3.1.4)
@@ -42,13 +44,14 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     daemons (1.1.9)
+    debug_inspector (0.0.2)
     erubis (2.7.0)
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    figaro (0.6.4)
+    figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
     gibbon (0.4.6)
@@ -60,16 +63,17 @@ GEM
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.4)
-    jbuilder (1.0.2)
+    jbuilder (1.4.2)
       activesupport (>= 3.0.0)
-    jquery-rails (3.0.1)
+      multi_json (>= 1.2.0)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    minitest (4.7.4)
+    minitest (4.7.5)
     multi_json (1.7.7)
     multi_xml (0.5.4)
     pg (0.15.1)
@@ -79,31 +83,33 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0.rc2)
-      actionmailer (= 4.0.0.rc2)
-      actionpack (= 4.0.0.rc2)
-      activerecord (= 4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0.rc2)
+      railties (= 4.0.0)
       sprockets-rails (~> 2.0.0)
     rails_on_heroku (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.1)
     rails_stdout_logging (0.0.1)
-    railties (4.0.0.rc2)
-      actionpack (= 4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     sass (3.2.9)
-    sass-rails (4.0.0.rc2)
+    sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    simple_form (1.4.1)
+    simple_form (3.0.0.rc)
+      actionpack (>= 4.0.0.rc1, < 4.1)
+      activemodel (>= 4.0.0.rc1, < 4.1)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -125,7 +131,7 @@ GEM
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.2.0)
+    turbolinks (1.3.0)
       coffee-rails
     tzinfo (0.3.37)
     uglifier (2.1.1)
@@ -138,19 +144,20 @@ PLATFORMS
 DEPENDENCIES
   activerecord-tableless
   better_errors
+  binding_of_caller
   bootstrap-sass
   coffee-rails (~> 4.0.0)
   figaro
   gibbon
   high_voltage
-  jbuilder (~> 1.0.1)
+  jbuilder (~> 1.2)
   jquery-rails
   pg
   quiet_assets
-  rails (= 4.0.0.rc2)
+  rails (= 4.0.0)
   rails_on_heroku
-  sass-rails (~> 4.0.0.rc2)
-  simple_form
+  sass-rails (~> 4.0.0)
+  simple_form (>= 3.0.0.rc)
   sqlite3
   thin
   turbolinks

diff --git a/README b/README
@@ -0,0 +1,19 @@
+Learn Rails
+============================================
+
+This is an example Rails 4.0 application to accompany the "Learn Rails" book.
+
+See the "Learn Rails" book:
+http://learn-rails.com/
+
+________________________
+
+For more information, please see the updated README file on GitHub:
+
+https://github.com/railsapps/learn-rails
+
+________________________
+
+MIT License
+
+http://www.opensource.org/licenses/mit-license
diff --git a/config/application.example.yml b/config/application.example.yml
@@ -7,4 +7,4 @@ GMAIL_PASSWORD: Your_Password
 MAILCHIMP_API_KEY: Your_MailChimp_API_Key
 MAILCHIMP_LIST_ID: Your_List_ID
 DOMAIN_NAME: example.com
-OWNER_EMAIL: me@example.com
+OWNER_EMAIL: me@example.com
diff --git a/config/application.rb b/config/application.rb
@@ -1,11 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-# Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -16,8 +16,16 @@
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Send email in development mode.
-  config.action_mailer.perform_deliveries = true
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
   config.action_mailer.smtp_settings = {
     address: "smtp.gmail.com",
@@ -28,15 +36,7 @@
     user_name: ENV["GMAIL_USERNAME"],
     password: ENV["GMAIL_PASSWORD"]
   }
+  # Send email in development mode.
+  config.action_mailer.perform_deliveries = true
 
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
 end