Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | private callback methods should work | Aaron Patterson | 2013-05-14 | 1 | -1/+2 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | adding more callback type coverage | Aaron Patterson | 2013-05-13 | 1 | -0/+40 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | extract getting an setting callbacks to methods | Aaron Patterson | 2013-05-13 | 1 | -15/+22 | |
| | | | | | ||||||
* | | | | | call extracted method from callback manipulation methods | Aaron Patterson | 2013-05-13 | 1 | -6/+8 | |
| | | | | | ||||||
* | | | | | extract callback param munging | Aaron Patterson | 2013-05-13 | 1 | -3/+8 | |
| | | | | | ||||||
* | | | | | no reason to make these defaulted, we always pass values in | Aaron Patterson | 2013-05-13 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | add tests for reset_calbacks | Aaron Patterson | 2013-05-13 | 1 | -0/+40 | |
| | | | | ||||||
* | | | | Fixes NoMethodError: `alias_method_chain` when requiring just ↵ | Andy Lindeman | 2013-05-12 | 2 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | active_support/core_ext * Each file that uses `alias_method_chain` brings it in explicitly | |||||
* | | | | Fix typo: require -> requires | Rafael Mendonça França | 2013-05-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Add CHANGELOG entry for #10576 | Rafael Mendonça França | 2013-05-12 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-12 | 4 | -2/+11 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | |||||
| * | | | | added docs for InheritedOptions class [ci skip] | Anton Kalyaev | 2013-05-11 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | changed rails -> Rails at two places | aditya-kapoor | 2013-05-09 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Changed spelling of Busines to Business | aditya-kapoor | 2013-05-08 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | replace apostrophe with backquote for matching [ci skip] | Anton Kalyaev | 2013-05-03 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | document String#to_time exception | Vipul A M | 2013-05-02 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Replace multi_json with json | Erik Michaels-Ober | 2013-05-11 | 3 | -45/+18 | |
| | | | | | ||||||
* | | | | | Give credits to all the envolved people [ci skip] | Rafael Mendonça França | 2013-05-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #10534 from cmaruz/master | Rafael Mendonça França | 2013-05-10 | 3 | -3/+12 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape of U+2028 and U+2029 in the JSON Encoder Conflicts: activesupport/lib/active_support/json/encoding.rb | |||||
| * | | | | | Added escaping of U+2028 and U+2029 inside the json encoder. | Mario Caropreso | 2013-05-09 | 3 | -5/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U+2028 and U+2029 are allowed inside strings in JSON (as all literal Unicode characters) but JavaScript defines them as newline seperators. Because no literal newlines are allowed in a string, this causes a ParseError in the browser. We work around this issue by replacing them with the escaped version. The resulting JSON is still valid and can be parsed in the browser. This commit has been coauthored with Viktor Kelemen @yikulju | |||||
* | | | | | | Fix syntax error on Ruby 2.0 | Rafael Mendonça França | 2013-05-10 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Ruby 2.0 is UTF-8 by default we need to explictly say that the encoding of this file is US-ASCII | |||||
* | | | | | | Merge pull request #10057 from zackham/patch-1 | Rafael Mendonça França | 2013-05-10 | 1 | -2/+4 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | Escape multibyte line terminators in JSON encoding | |||||
| * | | | | | Escape multibyte line terminators in JSON encoding | zackham | 2013-04-02 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, json/encoding respects the JSON spec (as it should) which disallows \n and \r inside strings, escaping them as expected. Unfortunately, ECMA-262 (Javascript) disallows not only \n and \r in strings, but "Line Terminators" which includes U+2028 and U+2029. See here: http://bclary.com/2004/11/07/#a-7.3 This pull request adds U+2028 and U+2029 to be escaped. # Why? It's very common to see something like this in a Rails template: <script type="text/javascript"> var posts = <%= @posts.to_json %>; </script> If U+2028 or U+2029 are part of any attributes output in the to_json call, you will end up with an exception. In Chrome: Uncaught SyntaxError: Unexpected token ILLEGAL # Why not? This is JSON encoding, and the JSON spec is specific about how to encode strings. U+2028 and U+2029 don't get special treatment. Just trying to start a discussion... what do you do in your apps to deal with this? Is there a convention I'm missing? | |||||
* | | | | | | Merge pull request #10535 from vipulnsward/remove_var | Carlos Antonio da Silva | 2013-05-09 | 1 | -1/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove redundant var | |||||
| * | | | | | | remove redundant var | Vipul A M | 2013-05-09 | 1 | -1/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #10531 from waseem/refactor_require | Carlos Antonio da Silva | 2013-05-09 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Require different core extensions correctly. | |||||
| * | | | | | | | Require different core extensions correctly. | Waseem Ahmad | 2013-05-09 | 1 | -4/+4 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The begin rescue block is specifically to catch LoadError while loading i18n gem. Other core extensions, under active support, should be required outside of the begin rescue block. | |||||
* / / / / / / | rails -> Rails [ci skip] | Prathamesh Sonpatki | 2013-05-09 | 2 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | use public send on the scope parameters | Aaron Patterson | 2013-05-08 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | add test for object conditional with scope | Aaron Patterson | 2013-05-08 | 1 | -0/+19 | |
| | | | | | | ||||||
* | | | | | | using strings as scopes is not used anywhere, so remove it | Aaron Patterson | 2013-05-08 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | adding a class conditional test | Aaron Patterson | 2013-05-08 | 1 | -0/+12 | |
| | | | | | | ||||||
* | | | | | | adding tests for lambdas as conditions | Aaron Patterson | 2013-05-08 | 2 | -1/+41 | |
| |/ / / / |/| | | | | ||||||
* | | | | | separate identification computation | Aaron Patterson | 2013-05-08 | 1 | -24/+18 | |
| | | | | | ||||||
* | | | | | separate filters from source code | Aaron Patterson | 2013-05-08 | 1 | -20/+31 | |
| | | | | | ||||||
* | | | | | if the callbacks are not the same class, they cannot be duplicates | Aaron Patterson | 2013-05-08 | 1 | -2/+6 | |
| | | | | | ||||||
* | | | | | fix object comparison case | Aaron Patterson | 2013-05-08 | 1 | -1/+5 | |
| | | | | | ||||||
* | | | | | polymorphic comparison operator | Aaron Patterson | 2013-05-08 | 1 | -11/+24 | |
| | | | | | ||||||
* | | | | | we need to indicate the type of callback | Aaron Patterson | 2013-05-08 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #10355 from burke/master | Jeremy Kemper | 2013-05-08 | 1 | -39/+19 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use Ruby's native Encoding functionality to implement `tidy_bytes` | |||||
| * | | | | | Use ruby's Encoding support for tidy_bytes | Burke Libbey | 2013-05-08 | 1 | -39/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was quite slow. This leverages some of the transcoding abilities built into Ruby 1.9 instead. It is roughly 96% faster. The roundtrip through UTF_8_MAC here is because ruby won't let you transcode from UTF_8 to UTF_8. I chose the closest encoding I could find as an intermediate. | |||||
* | | | | | | adding more tests around callback inconsistencies | Aaron Patterson | 2013-05-08 | 1 | -5/+47 | |
| | | | | | | ||||||
* | | | | | | refactor tests for more points | Aaron Patterson | 2013-05-08 | 1 | -4/+5 | |
| | | | | | | ||||||
* | | | | | | adding test to demonstrate inconsistencies in the AS::Callbacks api | Aaron Patterson | 2013-05-08 | 1 | -0/+41 | |
|/ / / / / | ||||||
* | | | | | dependency ActiveSupport::Deprecation | Tomohiko Himura | 2013-05-09 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Fix Typo existant -> existent [ci skip] | Prathamesh Sonpatki | 2013-05-08 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | add changelog entry for fix-10502-skip-object-filter | Sean Walbran | 2013-05-07 | 1 | -0/+5 | |
| | | | | | ||||||
* | | | | | fix issue #10502, do not recompute method name for already-stringified ↵ | Sean Walbran | 2013-05-07 | 2 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | object filter | |||||
* | | | | | Merge pull request #10234 from dasch/dasch/fetch-multi | Rafael Mendonça França | 2013-05-06 | 3 | -1/+61 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Allow fetching multiple values from the cache at once | |||||
| * | | | | Allow fetching multiple values from the cache at once | Daniel Schierbeck | 2013-05-06 | 3 | -1/+61 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a simple API for fetching a list of entries from the cache, where any missing entries are computed by a supplied block. |