Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4172 from nashby/refactor-tokenizer | José Valim | 2011-12-24 | 1 | -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 present | Vasiliy Ermolovich | 2011-12-24 | 1 | -4/+2 |
| | | |||||
* | | remove deprecated define_attr_method from ActiveModel::AttributeMethods | Sergey Nartimov | 2011-12-24 | 2 | -72/+0 |
|/ | |||||
* | use Range#min and Range#max to reduce extra statement | Vasiliy Ermolovich | 2011-12-24 | 1 | -2/+1 |
| | |||||
* | deprecate String#encoding_aware? and remove its usage | Sergey Nartimov | 2011-12-24 | 1 | -2/+0 |
| | |||||
* | AM::MAS.attr_protected: rework usage example. | Bogdan Gusiev | 2011-12-23 | 1 | -9/+9 |
| | |||||
* | Fixed AM::MasAsSec.attr_protected usage example. | Bogdan Gusiev | 2011-12-22 | 1 | -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 doc | Bogdan Gusiev | 2011-12-22 | 1 | -1/+1 |
| | |||||
* | Changed the require path for logger | Karunakar (Ruby) | 2011-12-21 | 1 | -1/+1 |
| | |||||
* | removed deprecated loggers | Karunakar (Ruby) | 2011-12-21 | 1 | -1/+1 |
| | |||||
* | added :other_than => :!= option to numericality validator | Jakub Kuźma | 2011-12-21 | 3 | -2/+11 |
| | |||||
* | Updated gemspec for ruby 1.9.3 | Rahul P. Chaudhari | 2011-12-21 | 1 | -1/+1 |
| | |||||
* | Remove dead code from AMo. | José Valim | 2011-12-20 | 2 | -59/+37 |
| | |||||
* | rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+ | David Heinemeier Hansson | 2011-12-20 | 1 | -3/+3 |
| | |||||
* | Remove i18n dependencies from AP and AMo since they are in AS. | José Valim | 2011-12-20 | 1 | -1/+0 |
| | |||||
* | Party like its R-C-UNO! | David Heinemeier Hansson | 2011-12-19 | 1 | -1/+1 |
| | |||||
* | Fixed test "ArgumentError: wrong number of arguments(1 for 0)" | Arun Agrawal | 2011-12-17 | 1 | -1/+1 |
| | |||||
* | Fixed bug when error message is an empty string. | Antonio Roberto | 2011-12-16 | 2 | -1/+8 |
| | |||||
* | Improve cache on route_key lookup. | José Valim | 2011-12-08 | 2 | -2/+31 |
| | |||||
* | Ensure length validator also works on 1.8.7. | José Valim | 2011-12-06 | 1 | -6/+17 |
| | |||||
* | Merge pull request #3872 from marcandre/i18n_key | José Valim | 2011-12-06 | 2 | -2/+22 |
|\ | | | | | ActiveModel::Name#i18n_key: Fix doc and add tests | ||||
| * | ActiveModel::Name#i18n_key: Fix doc and add tests | Marc-Andre Lafortune | 2011-12-05 | 2 | -2/+22 |
| | | |||||
* | | Merge pull request #3873 from iangreenleaf/no_default_tokenizer | José Valim | 2011-12-06 | 1 | -2/+1 |
|\ \ | |/ |/| | Don't tokenize string when counting characters | ||||
| * | Don't tokenize string when counting characters | Ian Young | 2011-12-04 | 1 | -2/+1 |
| | | |||||
* | | Namespaced attribute lookup now works as 'model/association.attribute'. | José Valim | 2011-12-05 | 2 | -11/+19 |
| | | |||||
* | | Merge pull request #3859 from kuroda/human_attribute_name | José Valim | 2011-12-05 | 2 | -2/+16 |
|\ \ | |/ |/| | Fix human_attribute_name to handle names with dots | ||||
| * | Fix human_attribute_name to handle names with dots | Tsutomu Kuroda | 2011-12-05 | 2 | -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 validation | Alexey Vakhov | 2011-12-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -4/+4 |
|\ \ | |||||
| * | | Cosmetic fixes in AM validatations docs | Alexey Vakhov | 2011-11-27 | 2 | -4/+4 |
| | | | |||||
* | | | Revert "Implement ArraySerializer and move old serialization API to a new ↵ | José Valim | 2011-11-30 | 12 | -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 activemodel | lest | 2011-11-30 | 2 | -1/+5 |
| | | | |||||
* | | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵ | José Valim | 2011-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | a before callback halts. | ||||
* | | | Deprecated `define_attr_method` in `ActiveModel::AttributeMethods` | Jon Leighton | 2011-11-29 | 3 | -42/+43 |
| | | | | | | | | | | | | | | | This only existed to support methods like `set_table_name` in Active Record, which are themselves being deprecated. | ||||
* | | | Warning removed unused variable | Arun Agrawal | 2011-11-26 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Small docs fix in Active Model callbacks module | Alexey Vakhov | 2011-11-19 | 1 | -1/+1 |
| | | | |||||
* | | | Revert the serializers API as other alternatives are now also under discussion | José Valim | 2011-11-25 | 4 | -448/+0 |
| | | | |||||
* | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 13 | -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é Valim | 2011-11-25 | 2 | -8/+84 |
| | | | | |||||
| * | | | Rename UserSerializer to DefaultUserSerializer in tests. | José Valim | 2011-11-23 | 1 | -15/+13 |
| | | | | |||||
| * | | | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 3 | -77/+17 |
| | | | | |||||
| * | | | Implement ArraySerializer and move old serialization API to a new namespace. | José Valim | 2011-11-23 | 12 | -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 serializers | José Valim | 2011-11-23 | 18 | -207/+322 |
| |\ \ \ | |||||
| * | | | | Remove 1.9 Hash syntax - tests passing on 1.8.7 | Jose and Yehuda | 2011-10-15 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Add initial support for embed API | Jose and Yehuda | 2011-10-15 | 2 | -7/+101 |
| | | | | | |||||
| * | | | | Add support for the root attribute | Jose and Yehuda | 2011-10-15 | 2 | -15/+74 |
| | | | | | |||||
| * | | | | Fix nil has_one association | Jose and Yehuda | 2011-10-15 | 2 | -2/+20 |
| | | | | | |||||
| * | | | | Add association_ids | Jose and Yehuda | 2011-10-15 | 2 | -2/+89 |
| | | | | | |||||
| * | | | | Add support for overriding associations, mostly used for authorization | Jose and Yehuda | 2011-10-15 | 2 | -1/+31 |
| | | | | |