[DRE-commits] [SCM] ruby-railties-3.2.git branch, master-experimental, updated. debian/3.2.6-3-10-g35e1069
Ondřej Surý
ondrej at sury.org
Tue Jan 15 22:18:42 UTC 2013
The following commit has been merged in the master-experimental branch:
commit 0cff21d0ab38645b790e3203c0bd210a528e6009
Author: Ondřej Surý <ondrej at sury.org>
Date: Sun Oct 14 12:51:27 2012 +0200
Imported Upstream version 3.2.8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbfd09..52494d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,21 @@
-## Rails 3.2.6 (Jun 12, 2012)
+## Rails 3.2.8 (Aug 9, 2012) ##
+
+* ERB scaffold generator use the `:data => { :confirm => "Text" }` syntax instead of `:confirm`.
+
+ *Rafael Mendonça França*
+
+
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+* Since Rails 3.2, use layout false to render no layout
+* Use strict_args_position! if available from Thor
+
+
+## Rails 3.2.6 (Jun 12, 2012) ##
* No changes.
+
## Rails 3.2.4 (May 31, 2012) ##
* Add hook for resource route's generator. *Santiago Pastorino*
diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
index f1f6c8f..505200c 100644
--- a/guides/source/contributing_to_ruby_on_rails.textile
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -307,16 +307,16 @@ h4. Follow the Coding Conventions
Rails follows a simple set of coding style conventions.
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Do not indent after private/protected. Private/protected should have the same indentation as the methods around.
+* Two spaces, no tabs (for indentation).
+* No trailing whitespace. Blank lines should not have any spaces.
+* Indent after private/protected.
* Prefer +&&+/+||+ over +and+/+or+.
-* Prefer class << self block over self.method for class methods.
-* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
+* Prefer class << self over self.method for class methods.
+* Use +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
+* Use a = b and not a=b.
+* Follow the conventions in the source you see used already.
-These are some guidelines and please use your best judgment in using them.
+The above are guidelines -- please use your best judgment in using them.
h4. Sanity Check
diff --git a/guides/source/layouts_and_rendering.textile b/guides/source/layouts_and_rendering.textile
index 7e91947..5627b13 100644
--- a/guides/source/layouts_and_rendering.textile
+++ b/guides/source/layouts_and_rendering.textile
@@ -445,7 +445,7 @@ end
<ruby>
class OldPostsController < SpecialPostsController
- layout nil
+ layout false
def show
@post = Post.find(params[:id])
diff --git a/lib/rails/application.rb b/lib/rails/application.rb
index d92117f..c0eb25a 100644
--- a/lib/rails/application.rb
+++ b/lib/rails/application.rb
@@ -157,9 +157,12 @@ module Rails
# Rails.application.env_config stores some of the Rails initial environment parameters.
# Currently stores:
#
- # * action_dispatch.parameter_filter" => config.filter_parameters,
- # * action_dispatch.secret_token" => config.secret_token,
- # * action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
+ # * "action_dispatch.parameter_filter" => config.filter_parameters,
+ # * "action_dispatch.secret_token" => config.secret_token,
+ # * "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
+ # * "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
+ # * "action_dispatch.logger" => Rails.logger,
+ # * "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner
#
# These parameters will be used by middlewares and engines to configure themselves.
#
diff --git a/lib/rails/generators/base.rb b/lib/rails/generators/base.rb
index addc979..0b4e568 100644
--- a/lib/rails/generators/base.rb
+++ b/lib/rails/generators/base.rb
@@ -20,6 +20,7 @@ module Rails
include Rails::Generators::Actions
add_runtime_options!
+ strict_args_position! if respond_to?(:strict_args_position!)
# Returns the source root for this generator using default_source_root as default.
def self.source_root(path=nil)
diff --git a/lib/rails/generators/rails/scaffold_controller/USAGE b/lib/rails/generators/rails/scaffold_controller/USAGE
index 673f69b..5cd51b6 100644
--- a/lib/rails/generators/rails/scaffold_controller/USAGE
+++ b/lib/rails/generators/rails/scaffold_controller/USAGE
@@ -1,8 +1,7 @@
Description:
- Stubs out a scaffolded controller and its views. Pass the model name,
- either CamelCased or under_scored, and a list of views as arguments.
- The controller name is retrieved as a pluralized version of the model
- name.
+ Stubs out a scaffolded controller, its seven RESTful actions and related
+ views. Pass the model name, either CamelCased or under_scored. The
+ controller name is retrieved as a pluralized version of the model name.
To create a controller within a module, specify the model name as a
path like 'parent_module/controller_name'.
diff --git a/lib/rails/test_help.rb b/lib/rails/test_help.rb
index 8d0d8ca..2efa25a 100644
--- a/lib/rails/test_help.rb
+++ b/lib/rails/test_help.rb
@@ -17,8 +17,8 @@ if defined?(MiniTest)
begin
require 'turn'
- if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
- MiniTest::Unit.use_natural_language_case_names = true
+ Turn.config do |c|
+ c.natural = true
end
rescue LoadError
end
diff --git a/lib/rails/version.rb b/lib/rails/version.rb
index 421c6e6..4565e13 100644
--- a/lib/rails/version.rb
+++ b/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 6
+ TINY = 8
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
diff --git a/metadata.yml b/metadata.yml
index 77d2a19..2452cef 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,133 +1,126 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
name: railties
-version: !ruby/object:Gem::Version
- hash: 3
+version: !ruby/object:Gem::Version
+ version: 3.2.8
prerelease:
- segments:
- - 3
- - 2
- - 6
- version: 3.2.6
platform: ruby
-authors:
+authors:
- David Heinemeier Hansson
autorequire:
bindir: bin
cert_chain: []
-
-date: 2012-06-12 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2012-08-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
name: rake
- prerelease: false
- requirement: &id001 !ruby/object:Gem::Requirement
+ requirement: !ruby/object:Gem::Requirement
none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 49
- segments:
- - 0
- - 8
- - 7
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
version: 0.8.7
type: :runtime
- version_requirements: *id001
-- !ruby/object:Gem::Dependency
- name: rack-ssl
prerelease: false
- requirement: &id002 !ruby/object:Gem::Requirement
+ version_requirements: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
+ version: 0.8.7
+- !ruby/object:Gem::Dependency
+ name: rack-ssl
+ requirement: !ruby/object:Gem::Requirement
none: false
- requirements:
+ requirements:
- - ~>
- - !ruby/object:Gem::Version
- hash: 31
- segments:
- - 1
- - 3
- - 2
+ - !ruby/object:Gem::Version
version: 1.3.2
type: :runtime
- version_requirements: *id002
-- !ruby/object:Gem::Dependency
- name: thor
prerelease: false
- requirement: &id003 !ruby/object:Gem::Requirement
+ version_requirements: !ruby/object:Gem::Requirement
none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 43
- segments:
- - 0
- - 14
- - 6
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: 1.3.2
+- !ruby/object:Gem::Dependency
+ name: thor
+ requirement: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
version: 0.14.6
- - <
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 2
- - 0
- version: "2.0"
+ - !ruby/object:Gem::Version
+ version: '2.0'
type: :runtime
- version_requirements: *id003
-- !ruby/object:Gem::Dependency
- name: rdoc
prerelease: false
- requirement: &id004 !ruby/object:Gem::Requirement
+ version_requirements: !ruby/object:Gem::Requirement
+ none: false
+ 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
none: false
- requirements:
+ requirements:
- - ~>
- - !ruby/object:Gem::Version
- hash: 15
- segments:
- - 3
- - 4
- version: "3.4"
+ - !ruby/object:Gem::Version
+ version: '3.4'
type: :runtime
- version_requirements: *id004
-- !ruby/object:Gem::Dependency
- name: activesupport
prerelease: false
- requirement: &id005 !ruby/object:Gem::Requirement
+ version_requirements: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+ version: '3.4'
+- !ruby/object:Gem::Dependency
+ name: activesupport
+ requirement: !ruby/object:Gem::Requirement
none: false
- requirements:
- - - "="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 3
- - 2
- - 6
- version: 3.2.6
+ requirements:
+ - - '='
+ - !ruby/object:Gem::Version
+ version: 3.2.8
type: :runtime
- version_requirements: *id005
-- !ruby/object:Gem::Dependency
- name: actionpack
prerelease: false
- requirement: &id006 !ruby/object:Gem::Requirement
+ version_requirements: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - '='
+ - !ruby/object:Gem::Version
+ version: 3.2.8
+- !ruby/object:Gem::Dependency
+ name: actionpack
+ requirement: !ruby/object:Gem::Requirement
none: false
- requirements:
- - - "="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
- - 3
- - 2
- - 6
- version: 3.2.6
+ requirements:
+ - - '='
+ - !ruby/object:Gem::Version
+ version: 3.2.8
type: :runtime
- version_requirements: *id006
-description: "Rails internals: application bootup, plugins, generators, and rake tasks."
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+ none: false
+ requirements:
+ - - '='
+ - !ruby/object:Gem::Version
+ version: 3.2.8
+description: ! 'Rails internals: application bootup, plugins, generators, and rake
+ tasks.'
email: david at loudthinking.com
-executables:
+executables:
- rails
extensions: []
-
extra_rdoc_files: []
-
-files:
+files:
- CHANGELOG.md
- README.rdoc
- bin/rails
@@ -623,39 +616,31 @@ files:
- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
homepage: http://www.rubyonrails.org
licenses: []
-
post_install_message:
-rdoc_options:
+rdoc_options:
- --exclude
- .
-require_paths:
+require_paths:
- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 57
- segments:
- - 1
- - 8
- - 7
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement
none: false
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- hash: 3
- segments:
+ requirements:
+ - - ! '>='
+ - !ruby/object:Gem::Version
+ version: '0'
+ segments:
- 0
- version: "0"
+ hash: 3497070782119272411
requirements: []
-
rubyforge_project:
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
signing_key:
specification_version: 3
summary: Tools for creating, working with, and running Rails applications.
test_files: []
-
--
ruby-railties-3.2.git
More information about the Pkg-ruby-extras-commits
mailing list