Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1109 from dlee/optimize_indifferent_access | José Valim | 2011-05-18 | 1 | -1/+2 |
|\ | | | | | Use dup to preserve previous behavior | ||||
| * | Test that HWIA.with_indifferent_access does not return self | David Lee | 2011-05-17 | 1 | -0/+1 |
| | | |||||
| * | Use dup to preserve previous behavior | David Lee | 2011-05-17 | 1 | -1/+1 |
| | | |||||
* | | Fix misspelling of 'lambda'. Closes #987 | Ben Orenstein | 2011-05-18 | 1 | -4/+4 |
|/ | |||||
* | Optimize parts of HashWithIndifferentAccess | David Lee | 2011-05-17 | 1 | -0/+5 |
| | |||||
* | Deprecate attr_accessor_with_default. | José Valim | 2011-05-16 | 1 | -4/+12 |
| | |||||
* | Add missing requires | Santiago Pastorino | 2011-05-11 | 1 | -0/+1 |
| | |||||
* | make sure log file is written in binary mode. fixes #497 | Aaron Patterson | 2011-05-10 | 1 | -0/+39 |
| | |||||
* | Lighthouse ticket # 6334; added tests to verify that spaces in key are ↵ | prakashmurthy | 2011-05-08 | 1 | -0/+10 |
| | | | | dasherized. | ||||
* | indifferent access should recurse Hash subclasses | David Lee | 2011-05-08 | 2 | -3/+17 |
| | | | | | | | | | | | | | | This commit makes Hash subclasses convert to HWIA by default for nested objects of subclasses of Hash, but allows certain subclasses to prevent nested conversion by introducing Hash#nested_under_indifferent_access that subclasses can overwrite. ActiveSupport::OrderedHash is one such subclass that overwrites +nested_under_indifferent_access+, since implicitly converting it to HWIA would remove the ordering of keys and values in Ruby 1.8. This change is necessary because commit ce9456e broke nested indifferent access conversion for all subclasses of Hash. | ||||
* | Rename duplicate tests. There is now one failing test that was failing ↵ | Mike Gehard | 2011-05-07 | 2 | -2/+2 |
| | | | | before the rename but was never getting run. | ||||
* | Revert "Merge pull request #275 from pk-amooma/master" | José Valim | 2011-05-07 | 1 | -12/+0 |
| | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed. | ||||
* | xml_mini_test.rb now runs. | José Valim | 2011-05-07 | 1 | -8/+0 |
| | |||||
* | ordinalize negative numbers patch | Jason | 2011-05-07 | 1 | -0/+30 |
| | | | | | | | Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com> | ||||
* | Merge pull request #286 from jasoncodes/marshal_subsec | José Valim | 2011-05-07 | 1 | -0/+7 |
|\ | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | ||||
| * | Fix marshal round-tripping of fractional seconds (Time#subsec). | Jason Weathered | 2011-04-17 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #275 from pk-amooma/master | José Valim | 2011-05-07 | 1 | -0/+12 |
|\ \ | | | | | | | properly escape "'" to "'" for XML | ||||
| * | | test "Escapes special HTML/XML characters" do ... | Philipp Kempgen | 2011-04-26 | 1 | -0/+12 |
| | | | |||||
* | | | Merge remote branch 'rolftimmermans/desc_tracker' | José Valim | 2011-05-07 | 6 | -27/+55 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into desc_tracker | Rolf Timmermans | 2011-03-27 | 1 | -4/+4 |
| |\ \ \ | |||||
| * | | | | Refactored AS::DescendantsTracker test cases so they can be tested without ↵ | Rolf Timmermans | 2011-03-13 | 3 | -27/+52 |
| | | | | | | | | | | | | | | | | | | | | AS::Dependencies. | ||||
| * | | | | Missing dependency in MultiByte test. | Rolf Timmermans | 2011-03-13 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add missing dependency string inflection test. | Rolf Timmermans | 2011-03-13 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Missing dependency for duration test. | Rolf Timmermans | 2011-03-13 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #248 from bigfix/enumerable_as_json | José Valim | 2011-05-07 | 1 | -9/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | Enumerable should pass encoding options to children in #as_json/#to_json | ||||
| * | | | | | Enumerable should pass encoding options to children in #as_json/#to_json. | John Firebaugh | 2011-04-01 | 1 | -9/+24 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #349 from bradley178/master | José Valim | 2011-05-07 | 1 | -2/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Hash.from_xml chokes on empty CDATA | ||||
| * | | | | | Fix bug with empty CDATA not being handled in Hash.from_xml | Bradley Harris | 2011-04-29 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Added test for empty CDATA bug in from_xml | Bradley Harris | 2011-04-29 | 1 | -2/+8 |
| | | | | | | |||||
* | | | | | | Move variables to underscore format, update protected instance variables list. | José Valim | 2011-05-06 | 1 | -0/+7 |
|/ / / / / | |||||
* | | | | | Merged pull request #219 from panthomakos/memcache. | José Valim | 2011-04-28 | 1 | -0/+38 |
|\ \ \ \ \ | | | | | | | | | | | | | Character encoding issues with MemCacheStore in 1.9.2 | ||||
| * | | | | | Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2. | Pan Thomakos | 2011-03-11 | 1 | -0/+38 |
| | | | | | | |||||
* | | | | | | Merged pull request #328 from MSNexploder/fix_clear_inflector. | José Valim | 2011-04-28 | 1 | -12/+30 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | proper reset all inflector scopes | ||||
| * | | | | | | proper reset all inflector scopes | Stefan Huber | 2011-04-25 | 1 | -12/+30 |
| | | | | | | | |||||
* | | | | | | | fixing Array#from to return consistent results | Jared McFarland | 2011-04-26 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | File watcher won't make the cut for 3.1. Maybe on 3.2. | José Valim | 2011-04-23 | 1 | -233/+0 |
| | | | | | | |||||
* | | | | | | AS Json parse_error makes a return for backwards compatibility, although it ↵ | Josh Kalderimis | 2011-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | will return MultiJson::DecodeError | ||||
* | | | | | | removed AS backends and instead rely on MultiJson for json decoding | Josh Kalderimis | 2011-04-18 | 1 | -7/+4 |
| | | | | | | |||||
* | | | | | | Add String#inquiry as a convenience method for turning a string into a ↵ | David Heinemeier Hansson | 2011-04-18 | 1 | -0/+5 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | StringInquirer object [DHH] | ||||
* | | | | | Only rescue a thrown NoMethodError, don't preemptively check for #include?; ↵ | Jared McFarland | 2011-04-15 | 1 | -0/+4 |
| |_|_|/ |/| | | | | | | | | | | | added tests | ||||
* | | | | attributes no longer disappear if a tag contains whitespace | Andre Arko | 2011-04-14 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>"\n"} new: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"} | ||||
* | | | | Add tests for InheritableOptions. | Ben Orenstein | 2011-04-13 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#6625 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`. | ||||
* | | | | Update test name to the corresponding method name | Sebastian Martinez | 2011-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | suggestion! | ||||
* | | | | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?. | ||||
* | | | | Add support for Object#in? and Object#either? in Active Support [#6321 ↵ | Prem Sichanugrist, Brian Morearty, John Reitano | 2011-04-11 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:committed] This will allow you to check if an object is included in another object or the list of objects or not. This patch is derived from patch by Brian Morearty and John Reitano on Lighthouse ticket. I've rewrite it and make sure that we support both 'another object' and 'list of objects' version, as it surely be useful to support both. | ||||
* | | | | added find_zone and find_zone! to AS timezones and changed the AS Railtie to ↵ | Josh Kalderimis | 2011-04-05 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | | Raise on invalid timezone | Marc-Andre Lafortune | 2011-04-05 | 1 | -5/+26 |
| |/ / |/| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | parse dates to yaml in json arrays | Diego Carrion | 2011-03-22 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> |