Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3767 from tadast/object_in | Yehuda Katz | 2011-11-26 | 2 | -7/+27 |
|\ | | | | | Object#in? also accepts multiple parameters | ||||
| * | Object#in? also accepts multiple parameters | Tadas Tamošauskas | 2011-11-26 | 2 | -7/+27 |
| | | |||||
* | | add more tests for monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+2 |
| | | |||||
* | | Tests added for monday and sunday | Arun Agrawal | 2011-11-26 | 1 | -0/+8 |
| | | | | | | | | | | Reference commits : a8f2860d0e7db86c61bb70935006100b04667ab1 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b | ||||
* | | Adds Time#sunday method | Vijay Dev | 2011-11-26 | 1 | -0/+6 |
| | | |||||
* | | Convert aliases monday and sunday to methods | Vijay Dev | 2011-11-26 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | A recent change to beginning_of_week and end_of_week added an argument that can be used to specify the week's starting day as a symbol. Now these methods were aliased as monday and sunday respectively which as a consequence of the argument addition, made calls like obj.monday(:sunday) possible. This commit makes them methods on their own. | ||||
* | | minor doc changes | Vijay Dev | 2011-11-26 | 1 | -3/+3 |
| | | |||||
* | | some tweaks to PR#3547. [Closes #3547] | Xavier Noria | 2011-11-25 | 2 | -7/+15 |
| | | |||||
* | | API docstrings updated with default value info | gregolsen | 2011-11-25 | 2 | -6/+6 |
| | | |||||
* | | beginning_of_week extended in both Time and Date so that to return week ↵ | gregolsen | 2011-11-25 | 4 | -16/+70 |
| | | | | | | | | start based on start day that is monday by default | ||||
* | | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 2 | -0/+6 |
| | | |||||
* | | Implement ArraySerializer and move old serialization API to a new namespace. | José Valim | 2011-11-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Add safe_constantize to ActiveSupport::Dependencies. | José Valim | 2011-11-23 | 2 | -28/+43 |
| | | |||||
* | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 40 | -1876/+2523 |
|\ \ | |||||
| * | | Optimize cache expansion by skipping rails cache id in nested keys. | José Valim | 2011-11-23 | 2 | -58/+64 |
| | | | |||||
| * | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations ↵ | Olek Janiszewski | 2011-11-23 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | (part 2) `nil` and `false` both expand to `""` (empty string), while `true` expands to `"true"`; `false` should expand to `"false"` | ||||
| * | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations | Olek Janiszewski | 2011-11-23 | 2 | -12/+14 |
| | | | | | | | | | | | | | | | `cache_key` method is never called when the argument is a 1-element array with something that responds to `cache_key` | ||||
| * | | Merge pull request #3725 from marcandre/twz_eql | Yehuda Katz | 2011-11-22 | 4 | -4/+30 |
| |\ \ | | | | | | | | | Fix inconsistencies with Time{WithZone}#{hash,eql?} | ||||
| | * | | Fix inconsistencies with Time{WithZone}#{hash,eql?} | Marc-Andre Lafortune | 2011-11-22 | 4 | -4/+30 |
| | | | | |||||
| * | | | remove nodoc on OrderedHash | Vijay Dev | 2011-11-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | tests predicates according to the boolean interpretation of their return ↵ | Xavier Noria | 2011-11-21 | 1 | -48/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | value, not expecting specifically true or false Respecting Genuine assert_equal false Edition | ||||
| * | | | Deprecate InstanceMethods namespace handling in ActiveSupport::Concern. | José Valim | 2011-11-21 | 2 | -15/+7 |
| | | | | | | | | | | | | | | | | This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions. | ||||
| * | | | Revert "tests predicates according to the boolean interpretation of their ↵ | Xavier Noria | 2011-11-21 | 2 | -51/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return value, not expecting specifically true or false" Reason: there were some genuine tests for false when reading values, going to revise those ones. This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743. | ||||
| * | | | tests predicates according to the boolean interpretation of their return ↵ | Xavier Noria | 2011-11-21 | 2 | -55/+51 |
| | | | | | | | | | | | | | | | | value, not expecting specifically true or false | ||||
| * | | | cache entry: options[:compressed] is a regular flag, no need for !! | Xavier Noria | 2011-11-21 | 2 | -4/+4 |
| | | | | |||||
| * | | | adds a comment to clarify an edge case | Xavier Noria | 2011-11-21 | 1 | -0/+3 |
| | | | | |||||
| * | | | a couple of spurious spaces I saw in passing | Xavier Noria | 2011-11-21 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Merge pull request #3668 from gregolsen/api_docstring_fix | Santiago Pastorino | 2011-11-19 | 2 | -4/+4 |
| |\ \ | | | | | | | | | updating API docstring so that user can infer default value | ||||
| | * | | updating API docstring so that user can infer default value | gregolsen | 2011-11-17 | 2 | -4/+4 |
| | | | | |||||
| * | | | Fixed typo: expect -> expected | Philip Arndt | 2011-11-18 | 1 | -1/+1 |
| |/ / | |||||
| * | | refactor test_multiple_of | Vijay Dev | 2011-11-16 | 1 | -4/+3 |
| | | | |||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-13 | 3 | -5/+5 |
| |\ \ | |||||
| | * | | Fix "in memory" where it should be "in-memory". | Cheah Chu Yeow | 2011-11-13 | 3 | -4/+4 |
| | | | | |||||
| | * | | Revert "Fix "in memory" where it should be "in-memory"." | Vijay Dev | 2011-11-11 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e34e4d43301618307f94123d3710f094297f91f3. Reason: code changes are not allowed in docrails. | ||||
| | * | | Update Memcached website to its new one at http://memcached.org/. | Cheah Chu Yeow | 2011-11-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix "in memory" where it should be "in-memory". | Cheah Chu Yeow | 2011-11-11 | 3 | -4/+4 |
| | | | | |||||
| * | | | AS::Callbacks::Callback#_compile_option refactored | Bogdan Gusiev | 2011-11-11 | 1 | -14/+12 |
| | | | | |||||
| * | | | AS::Callbacks.__run_keyed_callback: remove unused cache | Bogdan Gusiev | 2011-11-10 | 1 | -10/+6 |
| | | | | |||||
| * | | | self.class.name -> self.name (we are already inside a class). | José Valim | 2011-11-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3593 from bogdan/callbacks | José Valim | 2011-11-10 | 1 | -23/+22 |
| |\ \ \ | | | | | | | | | | | AS::Callbacks._define_runner better abstraction | ||||
| | * | | | AS::Callbacks#_define_runner refactored | Bogdan Gusiev | 2011-11-10 | 1 | -23/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Incapsulate the logic of keyed callback method definition and execution in the separated method. | ||||
| * | | | | Don't marshal dump twice when using encryptor. | José Valim | 2011-11-09 | 2 | -3/+13 |
| | | | | | |||||
| * | | | | Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. | José Valim | 2011-11-09 | 3 | -41/+70 |
| | |/ / | |/| | | |||||
| * | | | fix typo again (Thanks Phillip Oertel) | Vijay Dev | 2011-11-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3549 from luckydev/rmethod | Aaron Patterson | 2011-11-07 | 1 | -0/+29 |
| |\ \ \ | | | | | | | | | | | remove_method tests and changes | ||||
| | * | | | added remove_method core_ext tests | Anand | 2011-11-07 | 1 | -0/+29 |
| | | | | | |||||
| * | | | | Merge pull request #3541 from dvyjones/fix-datetime-warnings | Aaron Patterson | 2011-11-06 | 2 | -16/+16 |
| |\ \ \ \ | | | | | | | | | | | | | Removed argument throwing warnings when running tests | ||||
| | * | | | | Removed argument throwing warnings when running tests. | Henrik Hodne | 2011-11-06 | 2 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last argument to DateTime.new/civil is the Julian day number for when the calendar reform occured. DateTime ignores it if it's 0, and sets it to the default of DateTime::ITALY instead, so we could just leave it out. This also removes the warnings while running the ActiveSupport tests (there still are some for the setup though). | ||||
| * | | | | | fix typo | Vijay Dev | 2011-11-06 | 1 | -1/+1 |
| |/ / / / | |||||
| * / / / | Added the test case for #3537 | Pavan Kumar Sunkara | 2011-11-06 | 1 | -0/+1 |
| |/ / / |