railties 3.2.14.rc2 → 3.2.14

data/CHANGELOG.md

@@ -1,9 +1,4 @@
-## Rails 3.2.14.rc2 (Jun 16, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.14.rc1 (Jul 12, 2013) ##
+## Rails 3.2.14 (Jul 22, 2013) ##
 
 *   Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
     `rails benchmarker`.

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: -1978025902
-  prerelease: 7
+  hash: 19
+  prerelease: 
   segments: 
   - 3
   - 2
   - 14
-  - rc
-  - 2
-  version: 3.2.14.rc2
+  version: 3.2.14
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-16 00:00:00 -03:00
+date: 2013-07-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,14 +94,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1978025902
+        hash: 19
         segments: 
         - 3
         - 2
         - 14
-        - rc
-        - 2
-        version: 3.2.14.rc2
+        version: 3.2.14
   type: :runtime
   name: activesupport
   version_requirements: *id005
@@ -114,14 +110,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1978025902
+        hash: 19
         segments: 
         - 3
         - 2
         - 14
-        - rc
-        - 2
-        version: 3.2.14.rc2
+        version: 3.2.14
   type: :runtime
   name: actionpack
   version_requirements: *id006
@@ -430,7 +424,6 @@ 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
@@ -550,7 +543,6 @@ 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
@@ -653,14 +645,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

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

@@ -1,300 +0,0 @@
-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/scaffold/scaffold_generator.rb.orig

@@ -1,30 +0,0 @@
-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