Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-05 | 2 | -5/+5 | |
|\ \ \ | ||||||
| * | | | Change one more place for JSON string to Hash | Robert Ross | 2011-10-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix as_json doc to say what it actually returns. | Robert Ross | 2011-10-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Class name specified in example is Person, not AttributePerson. | Uģis Ozols | 2011-09-29 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Provide read_attribute_for_serialization as the API to serialize attributes. | José Valim | 2011-09-30 | 2 | -5/+26 | |
| | | | | ||||||
* | | | | Fixing `as_json` method for ActiveRecord models. | Nicolás Hock Isaza | 2011-09-29 | 1 | -0/+10 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case. | |||||
* | | | Make serializable_hash take attr values directly from attributes hash. | Jon Leighton | 2011-09-26 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it would use send() to get the attribute. In Active Resource, this would rely on hitting method missing. If a method with the same name was defined further up the ancestor chain, that method would wrongly be called. This change fixes test_to_xml_with_private_method_name_as_attribute in activeresource/test/cases/base_test.rb, which was broken after 51bef9d8fb0b4da7a104425ab8545e9331387743, because that change made to_xml use serializable_hash. | |||||
* | | | Refactor AMo as_json. | José Valim | 2011-09-23 | 1 | -9/+5 | |
| | | | ||||||
* | | | fixed a bug with the json serialization when the class setting is set to not ↵ | Matt Aimonetti | 2011-09-22 | 2 | -12/+20 | |
| | | | | | | | | | | | | include the root, but an instance is serialized with the root option passed as true | |||||
* | | | to_xml should also rely on serializable hash. | José Valim | 2011-09-18 | 2 | -31/+32 | |
| | | | ||||||
* | | | update 3.1 release date in changelogs | Vijay Dev | 2011-09-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Generate attribute method unless it's already in the module. | Jon Leighton | 2011-09-14 | 2 | -1/+24 | |
| | | | | | | | | | | | | | | | | | | | | | There's no harm in generating a method name that's already defined on the host class, since we're generating the attribute methods in a module that gets included. In fact, this is desirable as it allows the host class to call super. | |||||
* | | | Add an attribute_missing method to ActiveModel::AttributeMethods. | Jon Leighton | 2011-09-13 | 2 | -8/+26 | |
| | | | | | | | | | | | | This can be overloaded by implementors if necessary. | |||||
* | | | Avoid double super call in some cases. | Jon Leighton | 2011-09-13 | 1 | -5/+4 | |
| | | | | | | | | | | | | | | | If super was false earlier, it is still going to be false, so we don't need to call it again at the end of the method. | |||||
* | | | Let Ruby deal with method visibility. | Jon Leighton | 2011-09-13 | 2 | -13/+47 | |
| | | | | | | | | | | | | | | | | | | Check respond_to_without_attributes? in method_missing. If there is any method that responds (even private), let super handle it and raise NoMethodError if necessary. | |||||
* | | | Add deprecation for doing `attribute_method_suffix ''` | Jon Leighton | 2011-09-13 | 2 | -6/+22 | |
| | | | ||||||
* | | | refactoring | Jon Leighton | 2011-09-13 | 1 | -19/+11 | |
| | | | ||||||
* | | | Use an empty AttributeMethodMatcher by default. | Jon Leighton | 2011-09-13 | 2 | -2/+26 | |
| | | | | | | | | | | | | | | | | | | This means that attribute methods which don't exist will get generated when define_attribute_methods is called, so we don't have to use hacks like `attribute_method_suffix ''`. | |||||
* | | | Added test for obj.errors.as_json | Lawrence Pit | 2011-09-09 | 1 | -0/+11 | |
| | | | ||||||
* | | | Add ability to get an individual full error message + test for full_messages. | Lawrence Pit | 2011-09-09 | 2 | -16/+35 | |
| |/ |/| | ||||||
* | | add has_key? to ActiveModel::Errors | Damien Mathieu | 2011-09-06 | 2 | -0/+7 | |
| | | ||||||
* | | Add comments about bcrypt-ruby gem to SecurePassword | Guillermo Iguaran | 2011-09-03 | 1 | -0/+6 | |
| | | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class ↵ | Josh Nesbitt | 2011-09-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | method, not attribute. | |||||
* | | | Remove hard dependency on bcrypt. | Guillermo Iguaran | 2011-09-02 | 2 | -3/+3 | |
|/ / | ||||||
* | | Merge pull request #2563 from bogdan/internal_validation | José Valim | 2011-08-25 | 13 | -6/+77 | |
|\ \ | | | | | | | Implemented strict validation concept | |||||
| * | | Typo fix | Bogdan Gusiev | 2011-08-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add change log entry on strict validation | Bogdan Gusiev | 2011-08-24 | 1 | -0/+2 | |
| | | | ||||||
| * | | Implemented strict validation concept | Bogdan Gusiev | 2011-08-17 | 12 | -6/+75 | |
| | | | | | | | | | | | | | | | | | | | | | In order to deliver debug information to dev team instead of display error message to end user Implemented strict validation concept that suppose to define validation that always raise exception when fails | |||||
* | | | bumping bcrypt-ruby requirement | Aaron Patterson | 2011-08-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2653 from luckydev/ser-wrap | Xavier Noria | 2011-08-23 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Missing require array/wrap in serialization | |||||
| * | | | added missing require array/wrap in serialization | Anand | 2011-08-23 | 1 | -0/+2 | |
| |/ / | ||||||
* / / | added more tests for only-include and except-include options in serialization | Anand | 2011-08-23 | 1 | -1/+14 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-16 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | fix misleading comment (originally made by Tate Johnson, we lost this commit ↵ | Vijay Dev | 2011-08-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | while porting to the rails repo) | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 2 | -2/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | |||||
| * | | Fixed typo | Tate Johnson | 2011-08-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | capitalize RubyGems properl | Waynn Lue | 2011-08-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-08-13 | 2 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception. | |||||
| * | | Rename new method to_path to to_partial_path to avoid conflicts with ↵ | José Valim | 2011-08-13 | 6 | -18/+18 | |
| | | | | | | | | | | | | File#to_path and similar. | |||||
| * | | Give attribution to Peter Jaros for the patch we paired on. | Grant Hutchins | 2011-08-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update CHANGELOG. | José Valim | 2011-08-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | Rename class method to_path to _to_path and make it explicit that it is an ↵ | José Valim | 2011-08-13 | 1 | -3/+5 | |
| | | | | | | | | | | | | internal method. | |||||
| * | | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-08-13 | 6 | -10/+62 | |
| | | | | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | |||||
| * | | Handle the empty array correctly. | thedarkone | 2011-08-13 | 2 | -1/+2 | |
| | | | ||||||
| * | | The trailing '/' isn't being picked up by Github anyway, and the link works ↵ | Rashmi Yadav | 2011-08-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | as is. | |||||
* | | | Allow ActiveRecord observers to be disabled. | Myron Marston | 2011-08-12 | 2 | -2/+14 | |
| | | | | | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on. | |||||
* | | | The trailing '/' isn't being picked up by Github anyway, and the link works ↵ | Rashmi Yadav | 2011-08-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | as is. | |||||
* | | | Merge pull request #2385 from bogdan/test_default_sanitizer2 | José Valim | 2011-08-01 | 2 | -1/+14 | |
|\ \ \ | | | | | | | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | |||||
| * | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-07-28 | 2 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception. |