railties 3.2.13 → 3.2.14.rc1

data/CHANGELOG.md

@@ -1,9 +1,25 @@
-## unreleased ##
+## Rails 3.2.14.rc1 (Jul 8, 2013) ##
 
-*   No changes.
+*   Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
+    `rails benchmarker`.
+    Fixes #4938.
+    Backport rails/rails-perftest#2.
+
+    *Dmitry Vorotilin + Yves Senn*
+
+*   Add support for runner hook.
+
+    Backport #7695.
+
+    *Ben Holley*
+
+*   Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
+    Fixes #9525.
+
+    *Arun Agrawal*
 
 
-## Rails 3.2.13 (Feb 17, 2013) ##
+## Rails 3.2.13 (Mar 18, 2013) ##
 
 *   No changes.
 

data/guides/source/action_mailer_basics.textile

@@ -480,7 +480,7 @@ As Action Mailer now uses the Mail gem, this becomes as simple as adding to your
 <ruby>
 config.action_mailer.delivery_method = :smtp
 config.action_mailer.smtp_settings = {
-  :address              => "smtp.gmail.com",
+  :address              => 'smtp.gmail.com',
   :port                 => 587,
   :domain               => 'baci.lindsaar.net',
   :user_name            => '<username>',

data/guides/source/caching_with_rails.textile

@@ -86,9 +86,9 @@ Or, you can set custom gzip compression level (level names are taken from +Zlib+
 caches_page :image, :gzip => :best_speed
 </ruby>
 
-NOTE: Page caching ignores all parameters. For example +/products?page=1+ will be written out to the filesystem as +products.html+ with no reference to the +page+ parameter. Thus, if someone requests +/products?page=2+ later, they will get the cached first page. A workaround for this limitation is to include the parameters in the page's path, e.g. +/productions/page/1+.
+NOTE: Page caching ignores all parameters. For example +/products?page=1+ will be written out to the filesystem as +products.html+ with no reference to the +page+ parameter. Thus, if someone requests +/products?page=2+ later, they will get the cached first page. A workaround for this limitation is to include the parameters in the products's path, e.g. +/products/page/1+.
 
-INFO: Page caching runs in an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
+INFO: Page caching runs as an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
 
 h4. Action Caching
 
@@ -301,8 +301,6 @@ config.cache_store = :memory_store, :size => 64.megabytes
 
 If you're running multiple Ruby on Rails server processes (which is the case if you're using mongrel_cluster or Phusion Passenger), then your Rails server process instances won't be able to share cache data with each other. This cache store is not appropriate for large application deployments, but can work well for small, low traffic sites with only a couple of server processes or for development and test environments.
 
-This is the default cache store implementation.
-
 h4. ActiveSupport::Cache::FileStore
 
 This cache store uses the file system to store entries. The path to the directory where the store files will be stored must be specified when initializing the cache.
@@ -315,6 +313,8 @@ With this cache store, multiple server processes on the same host can share a ca
 
 Note that the cache will grow until the disk is full unless you periodically clear out old entries.
 
+This is the default cache store if config.cache_store is not defined and tmp/cache is writable.
+
 h4. ActiveSupport::Cache::MemCacheStore
 
 This cache store uses Danga's +memcached+ server to provide a centralized cache for your application. Rails uses the bundled +memcache-client+ gem by default. This is currently the most popular cache store for production websites. It can be used to provide a single, shared cache cluster with very a high performance and redundancy.
@@ -434,4 +434,4 @@ end
 
 h3. Further reading
 
-* "Scaling Rails Screencasts":http://railslab.newrelic.com/scaling-rails
+* "Scaling Rails Screencasts":https://www.youtube.com/playlist?list=PLuVcDOUVjW2ePvFapFSHBZ71ya2fLHZS5

data/guides/source/getting_started.textile

@@ -1153,6 +1153,7 @@ First, take a look at +comment.rb+:
 
 <ruby>
 class Comment < ActiveRecord::Base
+  attr_accesssible :body, :commenter, :post
   belongs_to :post
 end
 </ruby>
@@ -1215,6 +1216,7 @@ makes each comment belong to a Post:
 
 <ruby>
 class Comment < ActiveRecord::Base
+  attr_accessible :body, :commenter, :post
   belongs_to :post
 end
 </ruby>

data/guides/source/initialization.textile

@@ -383,7 +383,7 @@ ensure
 end
 </ruby>
 
-This is where the first output of the Rails initialization happens. This method creates a trap for +INT+ signals, so if you +CTRL+C+ the server, it will exit the process. As we can see from the code here, it will create the +tmp/cache+, +tmp/pids+, +tmp/sessions+ and +tmp/sockets+ directories if they don't already exist prior to calling +super+. The +super+ method will call +Rack::Server.start+ which begins its definition like this:
+This is where the first output of the Rails initialization happens. This method creates a trap for +INT+ signals, so if you <tt>CTRL+C</tt> the server, it will exit the process. As we can see from the code here, it will create the +tmp/cache+, +tmp/pids+, +tmp/sessions+ and +tmp/sockets+ directories if they don't already exist prior to calling +super+. The +super+ method will call +Rack::Server.start+ which begins its definition like this:
 
 <ruby>
 def start

data/guides/source/layout.html.erb

@@ -81,11 +81,11 @@
         </p>
         <p>
           If you see any typos or factual errors you are confident to
-          patch, please clone <%= link_to 'docrails', 'https://github.com/lifo/docrails' %>
-          and push the change yourself. That branch of Rails has public write access.
-          Commits are still reviewed, but that happens after you've submitted your
-          contribution. <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> is
-          cross-merged with master periodically.
+          patch, please clone the <%= link_to 'rails', 'https://github.com/rails/rails' %>
+          repository and open a new pull request. You can also ask for commit rights on
+          <%= link_to 'docrails', 'https://github.com/rails/docrails' %> if you plan to submit
+          several patches. Commits are reviewed, but that happens after you've submitted your
+          contribution. This repository is cross-merged with master periodically.
         </p>
         <p>
           You may also find incomplete content, or stuff that is not up to date.

data/lib/rails/application.rb

@@ -154,6 +154,14 @@ module Rails
       self
     end
 
+    # Load the application runner and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.runner</tt> for more info.
+    def load_runner(app=self)
+      initialize_runner
+      super
+      self
+    end
+
     # Rails.application.env_config stores some of the Rails initial environment parameters.
     # Currently stores:
     #
@@ -167,7 +175,7 @@ module Rails
     # These parameters will be used by middlewares and engines to configure themselves.
     #
     def env_config
-      @env_config ||= super.merge({
+      @app_env_config ||= super.merge({
         "action_dispatch.parameter_filter" => config.filter_parameters,
         "action_dispatch.secret_token" => config.secret_token,
         "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
@@ -305,6 +313,9 @@ module Rails
       require "rails/console/helpers"
     end
 
+    def initialize_runner #:nodoc:
+    end
+
     def build_original_fullpath(env)
       path_info    = env["PATH_INFO"]
       query_string = env["QUERY_STRING"]

data/lib/rails/commands/benchmarker.rb

@@ -2,9 +2,8 @@ require 'optparse'
 require 'rails/test_help'
 require 'rails/performance_test_help'
 
-ARGV.push('--benchmark') # HAX
+ENV["BENCHMARK_TESTS"] = '1'
 require 'active_support/testing/performance'
-ARGV.pop
 
 def options
   options = {}
@@ -31,4 +30,5 @@ class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc:
       end
     RUBY
   end
+  ARGV.clear
 end

data/lib/rails/commands/profiler.rb

@@ -29,4 +29,5 @@ class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc:
       end
     RUBY
   end
+  ARGV.clear
 end

data/lib/rails/commands/runner.rb

@@ -42,6 +42,7 @@ ENV["RAILS_ENV"] = options[:environment]
 
 require APP_PATH
 Rails.application.require_environment!
+ Rails.application.load_runner
 
 if code_or_file.nil?
   $stderr.puts "Run '#{$0} -h' for help."

data/lib/rails/engine.rb

@@ -430,6 +430,11 @@ module Rails
       super
     end
 
+    def load_runner(app=self)
+      railties.all { |r| r.load_runner(app) }
+      super
+    end
+
     def eager_load!
       railties.all(&:eager_load!)
 

data/lib/rails/generators/app_base.rb.orig

@@ -0,0 +1,300 @@
+require 'digest/md5'
+require 'securerandom'
+require 'active_support/core_ext/string/strip'
+require 'rails/version' unless defined?(Rails::VERSION)
+require 'rbconfig'
+require 'open-uri'
+require 'uri'
+
+module Rails
+  module Generators
+    class AppBase < Base # :nodoc:
+      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver )
+      JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
+      DATABASES.concat(JDBC_DATABASES)
+
+      attr_accessor :rails_template
+      add_shebang_option!
+
+      argument :app_path, type: :string
+
+      def self.add_shared_options_for(name)
+        class_option :template,           type: :string, aliases: '-m',
+                                          desc: "Path to some #{name} template (can be a filesystem path or URL)"
+
+        class_option :skip_gemfile,       type: :boolean, default: false,
+                                          desc: "Don't create a Gemfile"
+
+        class_option :skip_bundle,        type: :boolean, aliases: '-B', default: false,
+                                          desc: "Don't run bundle install"
+
+        class_option :skip_git,           type: :boolean, aliases: '-G', default: false,
+                                          desc: 'Skip .gitignore file'
+
+        class_option :skip_keeps,         type: :boolean, default: false,
+                                          desc: 'Skip source control .keep files'
+
+        class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
+                                          desc: 'Skip Active Record files'
+
+        class_option :skip_sprockets,     type: :boolean, aliases: '-S', default: false,
+                                          desc: 'Skip Sprockets files'
+
+        class_option :database,           type: :string, aliases: '-d', default: 'sqlite3',
+                                          desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+
+        class_option :javascript,         type: :string, aliases: '-j', default: 'jquery',
+                                          desc: 'Preconfigure for selected JavaScript library'
+
+        class_option :skip_javascript,    type: :boolean, aliases: '-J', default: false,
+                                          desc: 'Skip JavaScript files'
+
+        class_option :dev,                type: :boolean, default: false,
+                                          desc: "Setup the #{name} with Gemfile pointing to your Rails checkout"
+
+        class_option :edge,               type: :boolean, default: false,
+                                          desc: "Setup the #{name} with Gemfile pointing to Rails repository"
+
+        class_option :skip_test_unit,     type: :boolean, aliases: '-T', default: false,
+                                          desc: 'Skip Test::Unit files'
+
+        class_option :rc,                 type: :string, default: false,
+                                          desc: "Path to file containing extra configuration options for rails command"
+
+        class_option :no_rc,              type: :boolean, default: false,
+                                          desc: 'Skip loading of extra configuration options from .railsrc file'
+
+        class_option :help,               type: :boolean, aliases: '-h', group: :rails,
+                                          desc: 'Show this help message and quit'
+      end
+
+      def initialize(*args)
+        @original_wd = Dir.pwd
+        super
+        convert_database_option_for_jruby
+      end
+
+    protected
+
+      def builder
+        @builder ||= begin
+          builder_class = get_builder_class
+          builder_class.send(:include, ActionMethods)
+          builder_class.new(self)
+        end
+      end
+
+      def build(meth, *args)
+        builder.send(meth, *args) if builder.respond_to?(meth)
+      end
+
+      def create_root
+        self.destination_root = File.expand_path(app_path, destination_root)
+        valid_const?
+
+        empty_directory '.'
+        set_default_accessors!
+        FileUtils.cd(destination_root) unless options[:pretend]
+      end
+
+      def apply_rails_template
+        apply rails_template if rails_template
+      rescue Thor::Error, LoadError, Errno::ENOENT => e
+        raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
+      end
+
+      def set_default_accessors!
+        self.rails_template = case options[:template]
+          when /^https?:\/\//
+            options[:template]
+          when String
+            File.expand_path(options[:template], Dir.pwd)
+          else
+            options[:template]
+        end
+      end
+
+      def database_gemfile_entry
+        options[:skip_active_record] ? "" :
+          <<-GEMFILE.strip_heredoc.chomp
+            # Use #{options[:database]} as the database for ActiveRecord
+            gem '#{gem_for_database}'
+          GEMFILE
+      end
+
+      def include_all_railties?
+        !options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets]
+      end
+
+      def comment_if(value)
+        options[value] ? '# ' : ''
+      end
+
+      def rails_gemfile_entry
+        if options.dev?
+          <<-GEMFILE.strip_heredoc
+            gem 'rails',     path: '#{Rails::Generators::RAILS_DEV_PATH}'
+            gem 'arel',      github: 'rails/arel'
+          GEMFILE
+        elsif options.edge?
+          <<-GEMFILE.strip_heredoc
+            gem 'rails',     github: 'rails/rails'
+            gem 'arel',      github: 'rails/arel'
+          GEMFILE
+        else
+          <<-GEMFILE.strip_heredoc
+            # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+            gem 'rails', '#{Rails::VERSION::STRING}'
+          GEMFILE
+        end
+      end
+
+      def gem_for_database
+        # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
+        case options[:database]
+        when "oracle"         then "ruby-oci8"
+        when "postgresql"     then "pg"
+        when "frontbase"      then "ruby-frontbase"
+        when "mysql"          then "mysql2"
+        when "sqlserver"      then "activerecord-sqlserver-adapter"
+        when "jdbcmysql"      then "activerecord-jdbcmysql-adapter"
+        when "jdbcsqlite3"    then "activerecord-jdbcsqlite3-adapter"
+        when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter"
+        when "jdbc"           then "activerecord-jdbc-adapter"
+        else options[:database]
+        end
+      end
+
+      def convert_database_option_for_jruby
+        if defined?(JRUBY_VERSION)
+          case options[:database]
+          when "oracle"     then options[:database].replace "jdbc"
+          when "postgresql" then options[:database].replace "jdbcpostgresql"
+          when "mysql"      then options[:database].replace "jdbcmysql"
+          when "sqlite3"    then options[:database].replace "jdbcsqlite3"
+          end
+        end
+      end
+
+      def assets_gemfile_entry
+        return if options[:skip_sprockets]
+
+        gemfile = if options.dev? || options.edge?
+          <<-GEMFILE.strip_heredoc
+            # Use edge version of sprockets-rails
+            gem 'sprockets-rails', github: 'rails/sprockets-rails'
+
+            # Use SCSS for stylesheets
+            gem 'sass-rails', github: 'rails/sass-rails'
+
+<<<<<<< HEAD
+            # Use Uglifier as compressor for JavaScript assets
+            gem 'uglifier', '~> 1.3'
+=======
+            # To use Uglifier as compressor for JavaScript assets
+            gem 'uglifier', '>= 1.3.0'
+>>>>>>> parent of 5758387... sprockets 2.9.x doesn't work with uglifier 2.0 yet.
+          GEMFILE
+        else
+          <<-GEMFILE.strip_heredoc
+            # Use SCSS for stylesheets
+            gem 'sass-rails', '~> 4.0.0.beta1'
+
+<<<<<<< HEAD
+            # Use Uglifier as compressor for JavaScript assets
+            gem 'uglifier', '~> 1.3'
+=======
+            # To use Uglifier as compressor for JavaScript assets
+            gem 'uglifier', '>= 1.3.0'
+>>>>>>> parent of 5758387... sprockets 2.9.x doesn't work with uglifier 2.0 yet.
+          GEMFILE
+        end
+
+        if options[:skip_javascript]
+          gemfile += <<-GEMFILE
+            #{coffee_gemfile_entry}
+            #{javascript_runtime_gemfile_entry}
+          GEMFILE
+        end
+
+        gemfile.gsub(/^[ \t]+/, '')
+      end
+
+      def coffee_gemfile_entry
+        if options.dev? || options.edge?
+          <<-GEMFILE
+            # Use CoffeeScript for .js.coffee assets and views
+            gem 'coffee-rails', github: 'rails/coffee-rails'
+          GEMFILE
+        else
+          <<-GEMFILE
+            # Use CoffeeScript for .js.coffee assets and views
+            gem 'coffee-rails', '~> 4.0.0.beta1'
+          GEMFILE
+        end
+      end
+
+      def javascript_gemfile_entry
+        unless options[:skip_javascript]
+          <<-GEMFILE.gsub(/^[ \t]+/, '')
+            #{coffee_gemfile_entry}
+            #{javascript_runtime_gemfile_entry}
+            # Use #{options[:javascript]} as the JavaScript library
+            gem '#{options[:javascript]}-rails'
+
+            # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+            gem 'turbolinks'
+          GEMFILE
+        end
+      end
+
+      def javascript_runtime_gemfile_entry
+        runtime = if defined?(JRUBY_VERSION)
+          "gem 'therubyrhino'"
+        else
+          "# gem 'therubyracer', platforms: :ruby"
+        end
+        <<-GEMFILE
+          # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+          #{runtime}
+        GEMFILE
+      end
+
+      def bundle_command(command)
+        say_status :run, "bundle #{command}"
+
+        # We are going to shell out rather than invoking Bundler::CLI.new(command)
+        # because `rails new` loads the Thor gem and on the other hand bundler uses
+        # its own vendored Thor, which could be a different version. Running both
+        # things in the same process is a recipe for a night with paracetamol.
+        #
+        # We use backticks and #print here instead of vanilla #system because it
+        # is easier to silence stdout in the existing test suite this way. The
+        # end-user gets the bundler commands called anyway, so no big deal.
+        #
+        # We unset temporary bundler variables to load proper bundler and Gemfile.
+        #
+        # Thanks to James Tucker for the Gem tricks involved in this call.
+        _bundle_command = Gem.bin_path('bundler', 'bundle')
+
+        require 'bundler'
+        Bundler.with_clean_env do
+          print `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
+        end
+      end
+
+      def run_bundle
+        bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
+      end
+
+      def empty_directory_with_keep_file(destination, config = {})
+        empty_directory(destination, config)
+        keep_file(destination)
+      end
+
+      def keep_file(destination)
+        create_file("#{destination}/.keep") unless options[:skip_keeps]
+      end
+    end
+  end
+end

data/lib/rails/generators/rails/plugin_new/templates/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Declare your gem's dependencies in <%= name %>.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -8,6 +8,8 @@ module Rails
 
       class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
       class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
+      class_option :assets, :type => :boolean
+      class_option :resource_route, :type => :boolean
 
       hook_for :scaffold_controller, :required => true
 

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb.orig

@@ -0,0 +1,30 @@
+require 'rails/generators/rails/resource/resource_generator'
+
+module Rails
+  module Generators
+    class ScaffoldGenerator < ResourceGenerator #metagenerator
+      remove_hook_for :resource_controller
+      remove_class_option :actions
+
+<<<<<<< HEAD
+      class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
+      class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
+=======
+      class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
+      class_option :stylesheet_engine, desc: "Engine for Stylesheets"
+      class_option :assets, :type => :boolean
+      class_option :resource_route, :type => :boolean
+>>>>>>> d664409... Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master
+
+      hook_for :scaffold_controller, :required => true
+
+      hook_for :assets do |assets|
+        invoke assets, [controller_name]
+      end
+
+      hook_for :stylesheet_engine do |stylesheet_engine|
+        invoke stylesheet_engine, [controller_name] if options[:stylesheets] && behavior == :invoke
+      end
+    end
+  end
+end

data/lib/rails/railtie.rb

@@ -145,6 +145,12 @@ module Rails
         @load_console
       end
 
+      def runner(&blk)
+        @load_runner ||= []
+        @load_runner << blk if blk
+        @load_runner
+      end
+
       def generators(&blk)
         @generators ||= []
         @generators << blk if blk
@@ -179,6 +185,10 @@ module Rails
       self.class.console.each { |block| block.call(app) }
     end
 
+    def load_runner(app=self)
+      self.class.runner.each { |block| block.call(app) }
+    end
+
     def load_tasks(app=self)
       extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each { |block| self.instance_exec(app, &block) }

data/lib/rails/test_unit/testing.rake

@@ -123,10 +123,13 @@ namespace :test do
     t.pattern = 'test/integration/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t|
+  task 'test:benchmark_mode' do
+    ENV["BENCHMARK_TESTS"] = '1'
+  end
+
+  Rails::SubTestTask.new(:benchmark => ['test:prepare', 'test:benchmark_mode']) do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
-    t.options = '-- --benchmark'
   end
 
   Rails::SubTestTask.new(:profile => 'test:prepare') do |t|

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 13
-    PRE   = nil
+    TINY  = 14
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,112 +1,140 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: railties
-version: !ruby/object:Gem::Version
-  version: 3.2.13
+version: !ruby/object:Gem::Version 
+  hash: 3193552829
+  prerelease: 7
+  segments: 
+  - 3
+  - 2
+  - 14
+  - rc
+  - 1
+  version: 3.2.14.rc1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+
+date: 2013-07-12 00:00:00 -03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :runtime
+  name: rake
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: rack-ssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
+  name: rack-ssl
+  version_requirements: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
     - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
+  name: thor
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.6
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.4'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 4
+        version: "3.4"
   type: :runtime
+  name: rdoc
+  version_requirements: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3193552829
+        segments: 
+        - 3
+        - 2
+        - 14
+        - rc
+        - 1
+        version: 3.2.14.rc1
   type: :runtime
+  name: activesupport
+  version_requirements: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3193552829
+        segments: 
+        - 3
+        - 2
+        - 14
+        - rc
+        - 1
+        version: 3.2.14.rc1
   type: :runtime
+  name: actionpack
+  version_requirements: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
+description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
-executables:
+executables: 
 - rails
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG.md
 - README.rdoc
 - bin/rails
@@ -402,6 +430,7 @@ files:
 - lib/rails/generators/actions.rb
 - lib/rails/generators/active_model.rb
 - lib/rails/generators/app_base.rb
+- lib/rails/generators/app_base.rb.orig
 - lib/rails/generators/base.rb
 - lib/rails/generators/css/assets/assets_generator.rb
 - lib/rails/generators/css/assets/templates/stylesheet.css
@@ -521,6 +550,7 @@ files:
 - lib/rails/generators/rails/resource/USAGE
 - lib/rails/generators/rails/resource_route/resource_route_generator.rb
 - lib/rails/generators/rails/scaffold/scaffold_generator.rb
+- lib/rails/generators/rails/scaffold/scaffold_generator.rb.orig
 - lib/rails/generators/rails/scaffold/templates/scaffold.css
 - lib/rails/generators/rails/scaffold/USAGE
 - lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -589,29 +619,54 @@ files:
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails.rb
+- lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
+- lib/rails/generators/rails/app/templates/app/models/.empty_directory
+- lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory
+- lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory
+- lib/rails/generators/rails/app/templates/test/functional/.empty_directory
+- lib/rails/generators/rails/app/templates/test/integration/.empty_directory
+- lib/rails/generators/rails/app/templates/test/unit/.empty_directory
+- lib/rails/generators/rails/generator/templates/templates/.empty_directory
+- lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
+- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
+has_rdoc: true
 homepage: http://www.rubyonrails.org
-licenses: []
-metadata: {}
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --exclude
 - .
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 27669ce6f8d0d1fb81944bd7e2da44438a32110c
-  data.tar.gz: 42050e5bd14752da87d84cee611603dbb4ac205c
-SHA512:
-  metadata.gz: 56e217902b4c56d87b6531fb8310ea5bce2722b19c90cc1af61c3e8e672e792b4a99148be3db9272f5d22fee5ed0b9b2e79602aa9b84744fdcc31057ef849b1b
-  data.tar.gz: 692ab9f18abec5aed529b5f71267c7a2325b5e827eec485ba1a63f2f211312a78271e3a7106dd7b2a54039e82953349d4d47d926536f1bac821d3d634947180c