aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-061-44/+44
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Update `include_root_in_json` default value to false for default value to false for `ActiveModel::Serializers::JSON`. * Remove unnecessary change to include_root_in_json option in wrap_parameters template. * Update `as_json` documentation. * Fix JSONSerialization tests. Problem: It's confusing that AM serializers behave differently from AR, even when AR objects include AM serializers module. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"person"=>{"name"=>"Francesco", "age"=>22}} # root is included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => true # different default values for include_root_in_json Proposal: Change the default value of AM serializers to false, update the misleading documentation and remove unnecessary change to false of include_root_in_json option with AR objects. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"name"=>"Francesco", "age"=>22} # root is not included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => false # same behaviour, more consistent Fixes #6578.
* update ActiveModel::Dirty documentationFrancesco Rodriguez2012-05-311-24/+35
|
* Merge pull request #5843 from ↵José Valim2012-05-291-2/+2
|\ | | | | | | | | kuroda/translation_of_deeply_nested_model_attributes Fix human attribute_name to handle deeply nested attributes
| * Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When a model nests another model that also nests yet another model using accepts_nested_attributes_for method, its Errors object can have an attribute name with "contacts.addresses.street" style. In this case, the dots within the namespace should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person/contacts/addresses.street" key. This commit is related to #3859.
* | Don't enable validations when passing false hash values to ActiveModel.validatesSteve Purcell2012-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing a falsey option value for a validator currently causes that validator to be enabled, just like "true": ActiveModel.validates :foo, :presence => false This is rather counterintuitive, and makes it inconvenient to wrap `validates` in methods which may conditionally enable different validators. As an example, one is currently forced to write: def has_slug(source_field, options={:unique => true}) slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? } before_validation slugger validations = { :presence => true, :slug => true } if options[:unique] validations[:uniqueness] = true end validates :slug, validations end because the following reasonable-looking alternative fails to work as expected: def has_slug(source_field, options={:unique => true}) slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? } before_validation slugger validates :slug, :presence => true, :slug => true, :uniqueness => options[:unique] end (This commit includes a test, and all activemodel and activerecord tests pass as before.)
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-2/+2
|\ \
| * | Add comment for attr_accessible/attr_protected :as option. [ci skip]Edward Tsech2012-05-251-2/+2
| | |
* | | Merge pull request #4785 from ↵José Valim2012-05-251-4/+4
|\ \ \ | |/ / |/| | | | | | | | ayamomiji/add-self-to-allow-method-name-using-ruby-keyword add `self.` to allow method name using ruby keyword
| * | fix `alias_attribute` will raise a syntax error if make an alias on aayaya2012-05-141-4/+4
| | | | | | | | | | | | column that named as a ruby keyword
* | | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog
* | | Fix the buildSantiago Pastorino2012-05-221-1/+0
| | |
* | | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
| | |
* | | Revert "Merge pull request #5702 from oscardelben/patch-4"Piotr Sarnacki2012-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit cae1ca7d1be9c79c7ef012a1f62aef9d3bb815f8, reversing changes made to da97cf016a8ffd1f54f804cd881f393e5d6efc18. These changes break the build, it needs more investigation.
* | | Merge pull request #5702 from oscardelben/patch-4Piotr Sarnacki2012-05-191-3/+1
|\ \ \ | | | | | | | | Call undefine_attribute_methods only when defining new attributes
| * | | Call undefine_attribute_methods only when defining new attributesOscar Del Ben2012-05-181-3/+1
| | | |
* | | | Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ \ \ \ | |/ / / |/| | | Remove sort on attributes.keys
| * | | Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
| | | |
* | | | Merge pull request #6215 from erichmenge/fix_has_secure_passwordAaron Patterson2012-05-171-5/+10
|\ \ \ \ | | | | | | | | | | Fix has secure password
| * | | | has_secure_password shouldn't validate password_digest. It should also take ↵Erich Menge2012-05-081-5/+10
| | | | | | | | | | | | | | | | | | | | options to turn validations off.
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-179-101/+154
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | | | fixing removed empty lines and examplesFrancesco Rodriguez2012-05-168-6/+11
| | | | | |
| * | | | | fixing validates_with docsFrancesco Rodriguez2012-05-161-6/+4
| | | | | |
| * | | | | better format and fixes to validators docsFrancesco Rodriguez2012-05-168-104/+154
| | | | | |
| * | | | | better example format in validates_exclusion_of docsFrancesco Rodriguez2012-05-161-2/+2
| | | | | |
* | | | | | Improve logging of ActiveModel::MassAssignmentSecurity::SanitizerNaoto Takai2012-05-172-10/+23
| |_|_|_|/ |/| | | |
* | | | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-151-2/+2
| | | | |
* | | | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-151-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | clean the erros if an object that includes validation is duped.
| * | | | clean the erros if an object that includes validations errors is duped. ↵Angelo Capilleri2012-05-131-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes #5953
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | | | Missed colonAlexey Vakhov2012-05-141-1/+1
| |/ / / /
* | | | | updating define_attribute_methods documentationFrancesco Rodriguez2012-05-141-1/+1
| | | | |
* | | | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-141-7/+7
| | | | |
* | | | | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | Use the more idiomatic tap method
| * | | | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
| | | | |
* | | | | Remove useless load path modificationsSantiago Pastorino2012-05-111-2/+0
| | | | |
* | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
| | | | |
* | | | | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect ↵Jon Leighton2012-05-112-3/+5
| |/ / / |/| | | | | | | | | | | collection-thing.
* | | | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
| | | |
* | | | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-011-0/+1
|\ \ \
| * | | Add line which gives a little bit more information how *_will_change! works.Edward Tsech2012-05-011-0/+1
| | | |
* | | | notify_observers should be publicMarc-Andre Lafortune2012-04-301-19/+18
| | | |
* | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-301-9/+17
|\ \ \ \ | | | | | | | | | | Allow extra arguments for Observers
| * | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-301-9/+17
| | | | |
* | | | | Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Observer by acting on singleton class. Fixes #3505.
| * | | | | Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | Also [issue #1034] [pull #6068]
* | | | | Merge pull request #5942 from ↵Aaron Patterson2012-04-292-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute
| * | | | | Support i18n attributes for confirmationBrian Cardarella2012-04-241-1/+2
| | | | | |
| * | | | | confirmation validation error attributeBrian Cardarella2012-04-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will render the error message on :#{attribute}_confirmation instead of on attribute itself. When rendering confirmation errors inline on the form with form builders such as SimpleForm and Formtastic it is confusing to the ender user to see the confirmation error message on the attribute element. Instead it makes more sense to have this validation error render on the confirmation field instead. The i18n message has been updated for the confirmation validator error message to include the original attribute name.
* | | | | | Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-291-2/+3
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 09:46:28 +0000