Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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> | ||||
* | | | test json decoding with time parsing disabled with all backends and respect ↵ | Diego Carrion | 2011-03-22 | 1 | -4/+2 |
| |/ |/| | | | | | | | | | ActiveSupport.parse_json_times when converting to yaml Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Prevent callbacks in child classes from being executed more than once. | Rolf Timmermans | 2011-03-13 | 1 | -0/+30 |
|/ | |||||
* | Add better test scenario for around callback return results | Aaron Pfeifer | 2011-03-08 | 1 | -0/+10 |
| | |||||
* | Allow access to a callback event's return result from around callbacks | Aaron Pfeifer | 2011-03-08 | 1 | -0/+24 |
| | |||||
* | removing stubs. 1.9.3 implements Date.today in C so mocking the return value ↵ | Aaron Patterson | 2011-03-07 | 1 | -9/+4 |
| | | | | of Time.now does nothing | ||||
* | do not test explicit equality of predicate methods, they should be allowed ↵ | Aaron Patterson | 2011-03-07 | 1 | -3/+3 |
| | | | | to return truthy or falsey objects | ||||
* | Report the correct value of nil.id in the exception message | Andrew White | 2011-03-06 | 1 | -0/+2 |
| | | | | | | | as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. [#6444 state:resolved] | ||||
* | reverted tests deleted by 080345baca1076a9788d, refactored implementations ↵ | Diego Carrion | 2011-03-04 | 1 | -3/+13 |
| | | | | | | should not invalidate the validations Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | adding deprecation noticies to deprecated class cache methods | Aaron Patterson | 2011-03-02 | 2 | -7/+28 |
| | |||||
* | adding backwards compat for class cache references. <3<3 | Aaron Patterson | 2011-03-02 | 2 | -7/+13 |
| | |||||
* | refactor Reference to a ClassCache object, fix lazy lookup in Middleware so ↵ | Aaron Patterson | 2011-03-01 | 2 | -3/+84 |
| | | | | that anonymous classes are supported | ||||
* | fixing test case test on 1.9.3dev | Aaron Patterson | 2011-03-01 | 1 | -0/+4 |
| | |||||
* | Remove warnings about redefined test methods | Sam Elliott | 2011-03-01 | 1 | -4/+4 |
| | | | | | | [#6490 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | updated Time, Date and DateTime current methods in AS to use Time.zone and ↵ | Josh Kalderimis | 2011-02-28 | 5 | -37/+38 |
| | | | | | | not Time.zone_default. [#6410 state:committed] | ||||
* | Make ActiveSupport::Configurable work with modules | Oriol Gual and Josep M. Bach | 2011-02-28 | 1 | -1/+7 |
| | | | | | | [#6486 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fix tests on 1.8. | José Valim | 2011-02-22 | 2 | -27/+8 |
| |