aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-251-1/+3
|\
| * Finished implementation of MIT license linking.Kristian Freeman2011-12-231-1/+3
| |
* | Merge pull request #4172 from nashby/refactor-tokenizerJosé Valim2011-12-241-4/+2
|\ \ | | | | | | don't call an extra method if options[:tokenizer] is not present
| * | don't call an extra method if options[:tokenizer] is not presentVasiliy Ermolovich2011-12-241-4/+2
| | |
* | | remove deprecated define_attr_method from ActiveModel::AttributeMethodsSergey Nartimov2011-12-242-72/+0
|/ /
* | use Range#min and Range#max to reduce extra statementVasiliy Ermolovich2011-12-241-2/+1
| |
* | deprecate String#encoding_aware? and remove its usageSergey Nartimov2011-12-241-2/+0
|/
* AM::MAS.attr_protected: rework usage example.Bogdan Gusiev2011-12-231-9/+9
|
* Fixed AM::MasAsSec.attr_protected usage example. Bogdan Gusiev2011-12-221-15/+16
| | | | | | | | Problems with current example: * DOESN'T WORK ** attr_protected :last_login, :as => :admin # doesn't make it accessible for admin * Uses ActiveSupport Fixnum extension
* Fix AM::MassAssignementSecurity docBogdan Gusiev2011-12-221-1/+1
|
* Changed the require path for loggerKarunakar (Ruby)2011-12-211-1/+1
|
* removed deprecated loggersKarunakar (Ruby)2011-12-211-1/+1
|
* added :other_than => :!= option to numericality validatorJakub Kuźma2011-12-213-2/+11
|
* Updated gemspec for ruby 1.9.3Rahul P. Chaudhari2011-12-211-1/+1
|
* Remove dead code from AMo.José Valim2011-12-202-59/+37
|
* rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+David Heinemeier Hansson2011-12-201-3/+3
|
* Remove i18n dependencies from AP and AMo since they are in AS.José Valim2011-12-201-1/+0
|
* Party like its R-C-UNO!David Heinemeier Hansson2011-12-191-1/+1
|
* Fixed test "ArgumentError: wrong number of arguments(1 for 0)"Arun Agrawal2011-12-171-1/+1
|
* Fixed bug when error message is an empty string.Antonio Roberto2011-12-162-1/+8
|
* Improve cache on route_key lookup.José Valim2011-12-082-2/+31
|
* Ensure length validator also works on 1.8.7.José Valim2011-12-061-6/+17
|
* Merge pull request #3872 from marcandre/i18n_keyJosé Valim2011-12-062-2/+22
|\ | | | | ActiveModel::Name#i18n_key: Fix doc and add tests
| * ActiveModel::Name#i18n_key: Fix doc and add testsMarc-Andre Lafortune2011-12-052-2/+22
| |
* | Merge pull request #3873 from iangreenleaf/no_default_tokenizerJosé Valim2011-12-061-2/+1
|\ \ | |/ |/| Don't tokenize string when counting characters
| * Don't tokenize string when counting charactersIan Young2011-12-041-2/+1
| |
* | Namespaced attribute lookup now works as 'model/association.attribute'.José Valim2011-12-052-11/+19
| |
* | Merge pull request #3859 from kuroda/human_attribute_nameJosé Valim2011-12-052-2/+16
|\ \ | |/ |/| Fix human_attribute_name to handle names with dots
| * Fix human_attribute_name to handle names with dotsTsutomu Kuroda2011-12-052-2/+16
| | | | | | | | | | | | | | | | Nested I18n namespace lookup under activerecord.models is deprecated now (c19bd4f). But when a model uses accepts_nested_attributes_for, its Errors object can have an attribute name with "addresses.street" style. In this case, the dots should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person.addresses/street" key.
* | Fix argument error message for length validationAlexey Vakhov2011-12-011-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-302-4/+4
|\ \
| * | Cosmetic fixes in AM validatations docsAlexey Vakhov2011-11-272-4/+4
| | |
* | | Revert "Implement ArraySerializer and move old serialization API to a new ↵José Valim2011-11-3012-727/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace." This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb
* | | fix method redefined warning in activemodellest2011-11-302-1/+5
| | |
* | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵José Valim2011-11-301-1/+1
| | | | | | | | | | | | a before callback halts.
* | | Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`Jon Leighton2011-11-293-42/+43
| | | | | | | | | | | | | | | This only existed to support methods like `set_table_name` in Active Record, which are themselves being deprecated.
* | | Warning removed unused variableArun Agrawal2011-11-261-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-261-1/+1
|\ \
| * | Small docs fix in Active Model callbacks moduleAlexey Vakhov2011-11-191-1/+1
| | |
* | | Revert the serializers API as other alternatives are now also under discussionJosé Valim2011-11-254-448/+0
| | |
* | | Merge branch 'serializers'José Valim2011-11-2513-425/+1178
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md
| * | | Add docs to serializers. Update CHANGELOGs.José Valim2011-11-252-8/+84
| | | |
| * | | Rename UserSerializer to DefaultUserSerializer in tests.José Valim2011-11-231-15/+13
| | | |
| * | | Rely solely on active_model_serializer and remove the fancy constant lookup.José Valim2011-11-233-77/+17
| | | |
| * | | Implement ArraySerializer and move old serialization API to a new namespace.José Valim2011-11-2312-428/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following constants were renamed: ActiveModel::Serialization => ActiveModel::Serializable ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON ActiveModel::Serializers::Xml => ActiveModel::Serializable::XML The main motivation for such a change is that `ActiveModel::Serializers::JSON` was not actually a serializer, but a module that when included allows the target to be serializable to JSON. With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.
| * | | Merge branch 'master' into serializersJosé Valim2011-11-2318-207/+322
| |\ \ \
| * | | | Remove 1.9 Hash syntax - tests passing on 1.8.7Jose and Yehuda2011-10-151-3/+3
| | | | |
| * | | | Add initial support for embed APIJose and Yehuda2011-10-152-7/+101
| | | | |
| * | | | Add support for the root attributeJose and Yehuda2011-10-152-15/+74
| | | | |
| * | | | Fix nil has_one associationJose and Yehuda2011-10-152-2/+20
| | | | |