aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Added back the `encode_big_decimal_as_string` option with warningGodfrey Chan2013-12-023-0/+59
| | | | | | | | | | | | | | | Also added the missing CHANGELOG entry for #12183 @ 80e7552073 and 4d02296cfb.
* | | Avoid generating more strings while iterating to create methodsCarlos Antonio da Silva2013-12-021-1/+1
| | | | | | | | | | | | | | | Use the already existing strings instead of creating a new one each time just to test if it responds to the methods.
* | | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-022-2/+2
|\ \ \
| * | | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-032-2/+2
| | | |
* | | | :sicssors:Rafael Mendonça França2013-12-028-15/+2
| | | |
* | | | Options are not optionalRafael Mendonça França2013-12-021-2/+2
| | | |
* | | | Make execute priave APIRafael Mendonça França2013-12-027-12/+16
| | | |
* | | | Make load of NumberHelper thread safeRafael Mendonça França2013-12-029-26/+18
| | | |
* | | | Merge pull request #10996 from mattdbridges/number-helper-refactorRafael Mendonça França2013-12-0210-312/+533
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Refactor and clean up number helpers Conflicts: activesupport/lib/active_support/number_helper.rb
| * | | Extract ActiveSupport::NumberHelper methods to classesMatt Bridges2013-07-0110-314/+533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the overall complexity of each method individually as well as the global shared private module methods, this pulls each helper into it's own converter class inheriting from a generic `NumberBuilder` class. * The `NumberBuilder` class contains the private methods needed for each helper method an eliminates the need for special definition of specialized private module methods. * The `ActiveSupport::NumberHelper::DEFAULTS` constant has been moved into the `NumberBuilder` class because the `NumberBuilder` is the only class which needs access to it. * For each of the builders, the `#convert` method is broken down to smaller parts and extracted into private methods for clarity of purpose. * Most of the mutation that once was necessary has now been eliminated. * Several of the mathematical operations for percentage, delimited, and rounded have been moved into private methods to ease readability and clarity. * Internationalization is still a bit crufty, and definitely could be improved, but it is functional and a bit easier to follow. The following helpers were extracted into their respective classes. * `#number_to_percentage` -> `NumberToPercentageConverter` * `#number_to_delimited` -> `NumberToDelimitedConverter` * `#number_to_phone` -> `NumberToPhoneConverter` * `#number_to_currency` -> `NumberToCurrencyConverter` * `#number_to_rounded` -> `NumberToRoundedConverter` * `#number_to_human_size` -> `NumberToHumanSizeConverter` * `#number_to_human` -> `NumberToHumanConverter`
* | | | Merge pull request #11197 from gsamokovarov/unify-mattr-cattrGuillermo Iguaran2013-12-026-269/+194
|\ \ \ \ | | | | | | | | | | Unify cattr and mattr accessors declarations
| * | | | Unify cattr and mattr accessors declarationsGenadi Samokovarov2013-12-026-269/+194
| | | | |
* | | | | :scissors:Rafael Mendonça França2013-12-021-4/+4
|/ / / / | | | | | | | | | | | | [ci skip]
* | / / added missing requireDaniel Harrington2013-12-021-0/+1
| |/ / |/| | | | | we’re using .delegate and should require it.
* | | EscapedString is also private API [ci skip]Godfrey Chan2013-12-011-1/+1
| | |
* | | Merge pull request #11796 from thedarkone/time-zone-thread-safetyGuillermo Iguaran2013-11-301-13/+7
|\ \ \ | | | | | | | | AS::TimeZone's cache thread safety
| * | | Remove AS::TZ.lookup(name).thedarkone2013-08-071-5/+1
| | | | | | | | | | | | | | | | The method doesn't really make much sense (find_tzinfo will succeed for any imput provided).
| * | | Unify AS::TZ's lazy init maps.thedarkone2013-08-071-9/+5
| | | | | | | | | | | | | | | | There's no point in having 2 almost identical (@lazy_zones_map and @zones_map) lazy initialized TZ instance caches.
| * | | Use TS::Cache instead plain Hash in TimeZone.thedarkone2013-08-071-5/+7
| | | | | | | | | | | | | | | | Plain ruby Hashes are not thread safe.
* | | | Merge pull request #13055 from ↵Rafael Mendonça França2013-11-302-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/fix-segmentation-fault-it-ruby-2.0.0-p353 Fix segmentation fault in Ruby 2.0.0-p353.
| * | | | Fix segmentation fault in Ruby 2.0.0-p353.Dmitriy Kiriyenko2013-11-302-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.0.0-p353 there was a [commit](https://github.com/ruby/ruby/commit/66915c507777c5e3a978fa73de25db763efd9206) that switched case matching from actual sending `===` method to magic lookup, that does not see it in `method_missing`. It's hard to predict how exactly and when exactly this bug will be solved so here I suggest a solution of defining it in Duration directly. In Ruby 2.0.0-p353 without the added fix added test crashes to segmentation fault.
* | | | | Merge pull request #13111 from akshay-vishnoi/typoCarlos Antonio da Silva2013-11-301-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Typo fixes [ci skip]
| * | | | Typo fixes [ci skip]Akshay Vishnoi2013-11-301-2/+2
| | | | |
* | | | | Merge pull request #13092 from laurocaetano/improve_documentation_for_delegateRafael Mendonça França2013-11-291-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | Improve Module#delegate documentation.
| * | | | Improve Module#delegate documentation to tell that delegate don't work with ↵Lauro Caetano2013-11-291-0/+2
| | | | | | | | | | | | | | | | | | | | private or protected methods. [ci skip]
* | | | | Typo fixAkshay Vishnoi2013-11-291-1/+1
|/ / / /
* | | | Merge pull request #13084 from lihanli/series-singularize-fixYves Senn2013-11-282-4/+6
|\ \ \ \ | | | | | | | | | | Fix an activesupport inflector test changing the inflector but not reverting all its changes afterwards
| * | | | wrap test that changes inflections in with_dupLihan Li2013-11-282-4/+6
| | | | |
* | | | | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]Yves Senn2013-11-281-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract **notable changes**, **deprecations** and **removals** from each CHANGELOG. I tried to reference the commits and pull requests for new features and deprecations. In the process I also made some minor changes to the CHANGELOGS. The 4_1_release_notes guide is declared WIP.
* | | | | remove duplicate sentence from AS changelog. [ci skip].Yves Senn2013-11-281-2/+1
|/ / / /
* | | | Deprecate ActiveSupport::TestCase.describeMike Moore2013-11-271-5/+12
| | | | | | | | | | | | | | | | | | | | Provide message to define ActiveSupport::TestCase.name instead. Allow calling describe with a block, which Minitest::Spec does.
* | | | [ci skip] removed singulars section from classify docGreg Molnar2013-11-271-4/+0
| | | |
* | | | Merge branch 'deprecate_numeric_since_ago' of ↵Jeremy Kemper2013-11-274-31/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/chancancode/rails Conflicts: activesupport/CHANGELOG.md
| * | | | Deprecated Numeric#{ago,until,since,from_now}Godfrey Chan2013-11-264-31/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user is expected to explicitly convert the value into an AS::Duration, i.e. `5.ago` => `5.seconds.ago` This will help to catch subtle bugs like: def recent?(days = 3) self.created_at >= days.ago end The above code would check if the model is created within the last 3 **seconds**. In the future, `Numeric#{ago,until,since,from_now}` should be removed completely, or throw some sort of errors to indicate there are no implicit conversion from `Numeric` to `AS::Duration`. Also fixed & refactor the test cases for Numeric#{ago,since} and AS::Duration#{ago,since}. The original test case had the assertion flipped and the purpose of the test wasn't very clear.
* | | | | Requires JSON gem version 1.7.7 or above as it contains an importantGodfrey Chan2013-11-262-2/+6
|/ / / / | | | | | | | | | | | | security fix.
* | | | Be explicit and use the actual unicode sequenceGodfrey Chan2013-11-261-1/+1
| | | |
* | | | Process::Status should get a :nodoc: [ci skip]Godfrey Chan2013-11-261-1/+1
| | | |
* | | | Make the JSON encoder pluggableGodfrey Chan2013-11-261-2/+8
| | | |
* | | | Removed the Ruby encoder and switched to using the JSON gemGodfrey Chan2013-11-263-82/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Got all the tests passing again. Support for `encode_json` has been removed (and consequently the ability to encode `BigDecimal`s as numbers, as mentioned in the previous commit). Install the `activesupport-json_encoder` gem to get it back.
* | | | Removed support for encoding BigDecimal as a JSON numberGodfrey Chan2013-11-263-25/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because the new encoder will no longer support encode_json. Therefore our only choice is to return `to_i` or `to_s` in `BigDecimal#as_json`. Since casting a BigDecimal to an integer is most likely a lossy operation, we chose to encode it as a string. Support for encoding BigDecimal as a string will return via the `activesupport-json_encoder` gem.
* | | | Expanded coverage on JSON encodingGodfrey Chan2013-11-261-2/+12
| | | |
* | | | Added some failing tests where the JSON encoder is not resolving as_json ↵Godfrey Chan2013-11-261-2/+12
| | | | | | | | | | | | | | | | correctly
* | | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2412-76/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | | | The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| | | | |
| * | | | Change syntax format for example returned valuesPrem Sichanugrist2013-11-1112-79/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* | | | | When Array#as_json and Hash#as_json are called without options, theyGodfrey Chan2013-11-222-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | should also call #as_json on the children without options (instead of nil)
* | | | | doc `travel` and `travel_to` stubs are removed in teardown. [ci skip]Yves Senn2013-11-211-4/+4
| | | | |
* | | | | Expand double-negative in String#blank? regexAman Gupta2013-11-201-1/+1
| | | | |
* | | | | Add `#travel` and `#travel_to` to AS::TestCasePrem Sichanugrist2013-11-204-2/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `ActiveSupport::Testing::TimeHelpers#travel` and `#travel_to`. These methods change current time to the given time or time difference by stubbing `Time.now` and `Date.today` to return the time or date after the difference calculation, or the time or date that got passed into the method respectively. These methods also accept a block, which will return current time back to its original state at the end of the block. Example for `#travel`: Time.now # => 2013-11-09 15:34:49 -05:00 travel 1.day Time.now # => 2013-11-10 15:34:49 -05:00 Date.today # => Sun, 10 Nov 2013 Example for `#travel_to`: Time.now # => 2013-11-09 15:34:49 -05:00 travel_to Time.new(2004, 11, 24, 01, 04, 44) Time.now # => 2004-11-24 01:04:44 -05:00 Date.today # => Wed, 24 Nov 2004 Both of these methods also accept a block, which will return the current time back to its original state at the end of the block: Time.now # => 2013-11-09 15:34:49 -05:00 travel 1.day do User.create.created_at # => Sun, 10 Nov 2013 15:34:49 EST -05:00 end travel_to Time.new(2004, 11, 24, 01, 04, 44) do User.create.created_at # => Wed, 24 Nov 2004 01:04:44 EST -05:00 end Time.now # => 2013-11-09 15:34:49 -05:00 This module is included in `ActiveSupport::TestCase` automatically.
* | | | | rm minitest monkey patchAaron Patterson2013-11-161-17/+0
| | | | |