Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:rails/rails

  • Loading branch information...
commit 6d30219c2734f2678d74a54b791a311748b3e64f 2 parents 4232495 + a2f2738
@dhh dhh authored
View
34 actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -10,26 +10,14 @@ module ActionController
# params = ActionController::Parameters.new(a: {})
# params.fetch(:b)
# # => ActionController::ParameterMissing: param not found: b
+ # params.require(:a)
+ # # => ActionController::ParameterMissing: param not found: a
class ParameterMissing < KeyError
attr_reader :param # :nodoc:
def initialize(param) # :nodoc:
@param = param
- super("param not found: #{param}")
- end
- end
-
- # Raised when a required parameter value is empty.
- #
- # params = ActionController::Parameters.new(a: {})
- # params.require(:a)
- # # => ActionController::EmptyParameter: value is empty for required key: a
- class EmptyParameter < IndexError
- attr_reader :param
-
- def initialize(param)
- @param = param
- super("value is empty for required key: #{param}")
+ super("param is missing or the value is empty: #{param}")
end
end
@@ -169,22 +157,20 @@ def permit!
self
end
- # Ensures that a parameter is present. If it's present and not empty,
- # returns the parameter at the given +key+, if it's empty raises
- # an <tt>ActionController::EmptyParameter</tt> error, otherwise
- # raises an <tt>ActionController::ParameterMissing</tt> error.
+ # Ensures that a parameter is present. If it's present, returns
+ # the parameter at the given +key+, otherwise raises an
+ # <tt>ActionController::ParameterMissing</tt> error.
#
# ActionController::Parameters.new(person: { name: 'Francesco' }).require(:person)
# # => {"name"=>"Francesco"}
#
- # ActionController::Parameters.new(person: {}).require(:person)
- # # => ActionController::EmptyParameter: value is empty for required key: person
+ # ActionController::Parameters.new(person: nil).require(:person)
+ # # => ActionController::ParameterMissing: param not found: person
#
- # ActionController::Parameters.new(name: {}).require(:person)
+ # ActionController::Parameters.new(person: {}).require(:person)
# # => ActionController::ParameterMissing: param not found: person
def require(key)
- raise(ActionController::ParameterMissing.new(key)) unless self.key?(key)
- self[key].presence || raise(ActionController::EmptyParameter.new(key))
+ self[key].presence || raise(ParameterMissing.new(key))
end
# Alias of #require.
View
3  actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -15,8 +15,7 @@ class ExceptionWrapper
'ActionController::InvalidAuthenticityToken' => :unprocessable_entity,
'ActionDispatch::ParamsParser::ParseError' => :bad_request,
'ActionController::BadRequest' => :bad_request,
- 'ActionController::ParameterMissing' => :bad_request,
- 'ActionController::EmptyParameter' => :bad_request
+ 'ActionController::ParameterMissing' => :bad_request
)
cattr_accessor :rescue_templates
View
8 actionpack/test/controller/parameters/parameters_require_test.rb
@@ -2,14 +2,8 @@
require 'action_controller/metal/strong_parameters'
class ParametersRequireTest < ActiveSupport::TestCase
- test "required parameters must be present" do
+ test "required parameters must be present not merely not nil" do
assert_raises(ActionController::ParameterMissing) do
- ActionController::Parameters.new(name: {}).require(:person)
- end
- end
-
- test "required parameters can't be blank" do
- assert_raises(ActionController::EmptyParameter) do
ActionController::Parameters.new(person: {}).require(:person)
end
end
View
19 actionpack/test/controller/required_params_test.rb
@@ -5,11 +5,6 @@ def create
params.require(:book).require(:name)
head :ok
end
-
- def update
- params.require(:book)
- head :ok
- end
end
class ActionControllerRequiredParamsTest < ActionController::TestCase
@@ -25,20 +20,6 @@ class ActionControllerRequiredParamsTest < ActionController::TestCase
end
end
- test "empty required parameters will raise an exception" do
- assert_raise ActionController::EmptyParameter do
- put :update, {book: {}}
- end
-
- assert_raise ActionController::EmptyParameter do
- put :update, {book: ''}
- end
-
- assert_raise ActionController::EmptyParameter do
- put :update, {book: nil}
- end
- end
-
test "required parameters that are present will not raise" do
post :create, { book: { name: "Mjallo!" } }
assert_response :ok
View
6 actionpack/test/dispatch/debug_exceptions_test.rb
@@ -43,8 +43,6 @@ def call(env)
raise ActionController::UrlGenerationError, "No route matches"
when "/parameter_missing"
raise ActionController::ParameterMissing, :missing_param_key
- when "/required_key_empty_value"
- raise ActionController::EmptyParameter, :empty_param_key
else
raise "puke!"
end
@@ -128,10 +126,6 @@ def setup
get "/parameter_missing", {}, {'action_dispatch.show_exceptions' => true}
assert_response 400
assert_match(/ActionController::ParameterMissing/, body)
-
- get "/required_key_empty_value", {}, {'action_dispatch.show_exceptions' => true}
- assert_response 400
- assert_match(/ActionController::EmptyParameter/, body)
end
test "rescue with text error for xhr request" do
View
48 activerecord/CHANGELOG.md
@@ -1,27 +1,27 @@
-* Added ActiveRecord::Base#enum for declaring enum attributes where the values map to integers in the database, but can be queried by name.
-
- Example:
- class Conversation < ActiveRecord::Base
- enum status: %i( active archived )
- end
-
- Conversation::STATUS # => { active: 0, archived: 1 }
-
- # conversation.update! status: 0
- conversation.active!
- conversation.active? # => true
- conversation.status # => :active
-
- # conversation.update! status: 1
- conversation.archived!
- conversation.archived? # => true
- conversation.status # => :archived
-
- # conversation.update! status: 1
- conversation.status = :archived
-
- *DHH*
+* Added ActiveRecord::Base#enum for declaring enum attributes where the values map to integers in the database, but can be queried by name.
+ Example:
+
+ class Conversation < ActiveRecord::Base
+ enum status: [:active, :archived]
+ end
+
+ Conversation::STATUS # => { active: 0, archived: 1 }
+
+ # conversation.update! status: 0
+ conversation.active!
+ conversation.active? # => true
+ conversation.status # => :active
+
+ # conversation.update! status: 1
+ conversation.archived!
+ conversation.archived? # => true
+ conversation.status # => :archived
+
+ # conversation.update! status: 1
+ conversation.status = :archived
+
+ *DHH*
* ActiveRecord::Base#attribute_for_inspect now truncates long arrays (more than 10 elements)
@@ -35,6 +35,7 @@
Fixed bug when providing `includes` in through association scope, and fetching targets.
Example:
+
class Vendor < ActiveRecord::Base
has_many :relationships, -> { includes(:user) }
has_many :users, through: :relationships
@@ -50,7 +51,6 @@
vendor.users.to_a # => No exception is raised
-
Fixes #12242, #9517, #10240.
*Paul Nikitochkin*
View
10 activerecord/lib/active_record/enum.rb
@@ -2,7 +2,7 @@ module ActiveRecord
# Declare an enum attribute where the values map to integers in the database, but can be queried by name. Example:
#
# class Conversation < ActiveRecord::Base
- # enum status: %i( active archived )
+ # enum status: [:active, :archived]
# end
#
# Conversation::STATUS # => { active: 0, archived: 1 }
@@ -11,21 +11,21 @@ module ActiveRecord
# conversation.active!
# conversation.active? # => true
# conversation.status # => :active
- #
+ #
# # conversation.update! status: 1
# conversation.archived!
# conversation.archived? # => true
# conversation.status # => :archived
- #
+ #
# # conversation.update! status: 1
# conversation.status = :archived
#
# You can set the default value from the database declaration, like:
#
- # create_table :conversation do
+ # create_table :conversations do |t|
# t.column :status, :integer, default: 0
# end
- #
+ #
# Good practice is to let the first declared status be the default.
module Enum
def enum(definitions)
View
8 activerecord/test/cases/enum_test.rb
@@ -5,7 +5,7 @@ class StoreTest < ActiveRecord::TestCase
fixtures :books
setup do
- @book = Book.create! name: 'REMOTE'
+ @book = books(:awdr)
end
test "query state by predicate" do
@@ -13,7 +13,7 @@ class StoreTest < ActiveRecord::TestCase
assert_not @book.written?
assert_not @book.published?
end
-
+
test "query state with symbol" do
assert_equal :proposed, @book.status
end
@@ -22,12 +22,12 @@ class StoreTest < ActiveRecord::TestCase
@book.written!
assert @book.written?
end
-
+
test "update by setter" do
@book.update! status: :written
assert @book.written?
end
-
+
test "constant" do
assert_equal 0, Book::STATUS[:proposed]
assert_equal 1, Book::STATUS[:written]
View
4 activerecord/test/models/book.rb
@@ -6,6 +6,6 @@ class Book < ActiveRecord::Base
has_many :subscriptions
has_many :subscribers, through: :subscriptions
-
- enum status: %i( proposed written published )
+
+ enum status: [:proposed, :written, :published]
end
View
2  guides/source/_welcome.html.erb
@@ -15,7 +15,7 @@
</p>
<% end %>
<p>
- The guides for Rails 3.2.x are available at <a href="http://guides.rubyonrails.org/v3.2.14/">http://guides.rubyonrails.org/v3.2.14/</a>.
+ The guides for Rails 3.2.x are available at <a href="http://guides.rubyonrails.org/v3.2.15/">http://guides.rubyonrails.org/v3.2.15/</a>.
</p>
<p>
The guides for Rails 2.3.x are available at <a href="http://guides.rubyonrails.org/v2.3.11/">http://guides.rubyonrails.org/v2.3.11/</a>.
Please sign in to comment.
Something went wrong with that request. Please try again.