aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'master' into unlock-minitestRafael Mendonça França2017-06-024-6/+48
|\| | | |
| * | | | Add next occur and previous occurred day of week API (#26600)Shota Iguchi2017-05-303-0/+42
| | | | |
| * | | | Fix indentation + remove blank lineJon Moss2017-05-291-4/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add backticksJon Moss2017-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add missing "not" in the doc for `assert_no_changes` [ci skip]Ryuta Kamizono2017-05-301-1/+1
| | | | |
* | | | | Reset time zone to previous valueyuuji.yaginuma2017-05-301-1/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `CurrentAttributesTest` changed the global time zone, it is necessary to restore the original value after changing the test. The reproduction step: ``` ./bin/test -w --seed 5549 test/current_attributes_test.rb test/core_ext/date_ext_test.rb ```
* | | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-296-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
* | | | Merge pull request #26628 from mjhoy/fix-number-to-human-25742Eileen M. Uchitelle2017-05-295-30/+79
|\ \ \ \ | | | | | | | | | | round before calculating exponent in number_to_human_converter
| * | | | number_to_human_converter: round before calculating exponentMichael Hoy2017-03-162-4/+8
| | | | | | | | | | | | | | | | | | | | fixes #25664
| * | | | number_to_rounded_converter: extract rounding logicMichael Hoy2017-03-163-26/+71
| | | | |
* | | | | Merge pull request #29074 from ↵Kasper Timm Hansen2017-05-281-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_returning_true_in_internal_callbacks Remove returning true in internal callbacks
| * | | | | Remove returning true in internal callbacksRyuta Kamizono2017-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `display_deprecation_warning_for_false_terminator` was removed since 3a25cdc.
* | | | | | Merge pull request #29097 from ↵Matthew Draper2017-05-283-6/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EilisHamilton/fix_uncountable_pluralization_locale Fix pluralization of uncountables when given a locale
| * | | | | | Fix pluralization of uncountables when given a localeEilis Hamilton2017-05-193-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously apply_inflections would only use the :en uncountables rather then the ones for the locale that was passed to pluralize or singularize. This changes apply_inflections to take a locale which it will use to find the uncountables.
* | | | | | | Clear all current instances before a reload.Kasper Timm Hansen2017-05-282-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If users added an attribute or otherwise changed a CurrentAttributes subclass they'd see exceptions on the next page load. Because `ActiveSupport::CurrentAttributes.current_instances` would keep references to the old instances from the previous request. We can fix this by clearing out the `current_attributes` before we unload constants. Then any change to the model can be autoloaded again since its slot isn't taken by an old instance. We'll still have to call reset before we clear so external collaborators, like Time.zone, won't linger with their current value throughout other code.
* | | | | | | Remove double Thread.current storage.Kasper Timm Hansen2017-05-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're generating a key through the class name we can combine the two Thread.current calls into a single hash version.
* | | | | | | Use non-raising finder.Kasper Timm Hansen2017-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find` raises when it can't find a record, so we'll never reach the else. Switch to `find_by` which returns nil when no record can be found.
* | | | | | | [ci skip] Fix spelling that's a bit of an overreach.Kasper Timm Hansen2017-05-271-1/+1
| | | | | | |
* | | | | | | ActiveSupport::CurrentAttributes provides a thread-isolated attributes ↵David Heinemeier Hansson2017-05-265-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singleton (#29180) * Add ActiveSupport::CurrentAttributes to provide a thread-isolated attributes singleton * Need to require first * Move stubs into test namespace. Thus they won't conflict with other Current and Person stubs. * End of the line for you, whitespace! * Support super in attribute methods. Define instance level accessors in an included module such that `super` in an overriden accessor works, akin to Active Model. * Spare users the manual require. Follow the example of concerns, autoload in the top level Active Support file. * Add bidelegation support * Rename #expose to #set. Simpler, clearer * Automatically reset every instance. Skips the need for users to actively embed something that resets their CurrentAttributes instances. * Fix test name; add tangible name value when blank. * Try to ensure we run after a request as well. * Delegate all missing methods to the instance This allows regular `delegate` to serve, so we don't need bidelegate. * Properly test resetting after execution cycle. Also remove the stale puts debugging. * Update documentation to match new autoreset
* | | | | | | Merge pull request #29234 from y-yagi/remove_unused_test_classGuillermo Iguaran2017-05-261-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused test class
| * | | | | | | Remove unused test classyuuji.yaginuma2017-05-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AlsoDoingNothingTest` was added in cf9be89. It seems that it added to confirm that the test works in the child class of `ActiveSupport::TestCase`. But now basically use `ActiveSupport::TestCase` in test, so I think it is unnecessary.
* | | | | | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2610-20/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Define path with __dir__
| * | | | | | | Define path with __dir__bogdanvlviv2017-05-2310-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f
* | | | | | | | Fix a RuboCop offences using `rubocop -a`Koichi ITO2017-05-241-2/+0
|/ / / / / / /
* | | | | | | Merge pull request #29163 from rails/fix-scalar-duration-calculationAndrew White2017-05-213-6/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix implicit calculations with scalars and durations
| * | | | | | | Fix implicit calculations with scalars and durationsAndrew White2017-05-203-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously calculations where the scalar is first would be converted to a duration of seconds but this causes issues with dates being converted to times, e.g: Time.zone = "Beijing" # => Asia/Shanghai date = Date.civil(2017, 5, 20) # => Mon, 20 May 2017 2 * 1.day # => 172800 seconds date + 2 * 1.day # => Mon, 22 May 2017 00:00:00 CST +08:00 Now the `ActiveSupport::Duration::Scalar` calculation methods will try to maintain the part structure of the duration where possible, e.g: Time.zone = "Beijing" # => Asia/Shanghai date = Date.civil(2017, 5, 20) # => Mon, 20 May 2017 2 * 1.day # => 2 days date + 2 * 1.day # => Mon, 22 May 2017 Fixes #29160, #28970.
* | | | | | | | Remove unused mismatch payload attributeDavid Heinemeier Hansson2017-05-201-5/+1
|/ / / / / / /
* / / / / / / Add cache_key_with_version and use it in ActiveSupport::Cache.expand_cache_keyDavid Heinemeier Hansson2017-05-191-4/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This retains the existing behavior of ActiveSupport::Cache.expand_cache_key (as used by etaging) where the cache key includes the version.
* | | / / / Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-05-191-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | * Fix indentation. * Add backticks.
* | | | | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-184-18/+164
| | | | |
* | | | | Merge pull request #29086 from mikeycgto/message-encryptor-auth-tag-checkKasper Timm Hansen2017-05-152-8/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Message encryptor auth tag check Fixes MessageEncryptor when used in AEAD mode. Specifically, we need to check if the `auth_tag` is nil. This may arise when an AEAD encryptor is used to decrypt a ciphertext generated from a different mode, such as CBC-HMAC. Basically, the number of double dashes will differ and `auth_tag` may be nil in this case.
| * | | | | Updates to MessageEncryptor AEAD testsMichael Coyne2017-05-151-10/+14
| | | | | |
| * | | | | Fix for AEAD auth_tag check in MessageEncryptorMichael Coyne2017-05-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MessageEncryptor tries to +decrypt_and_verify+ ciphertexts generated in a different mode (such CBC-HMAC), the +auth_tag+ may be +nil+ and must explicitly check for it. See the discussion here: https://github.com/rails/rails/pull/28132#discussion_r116388462
* | | | | | Don't cache locally if unless_exist was passedEugene Kenny2017-05-142-1/+14
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some cache backends support the `unless_exist` option, which tells them not to overwrite an existing entry. The local cache currently always stores the new value, even though the backend may have rejected it. Since we can't tell which value will end up in the backend cache, we should delete the key from the local cache, so that the next read for that key will go to the backend and pick up the correct value.
* | | | | Merge pull request #29034 from peterjm/handle_loops_in_exception_handlingRafael França2017-05-112-3/+41
|\ \ \ \ \ | | | | | | | | | | | | Handle loops in the cause chain in Rescuable#rescue_with_handler
| * | | | | handle loops in the cause chain in Rescuable#rescue_with_handlerPeter McCracken2017-05-102-3/+41
| | | | | |
* | | | | | Should escape meta characters in regexpRyuta Kamizono2017-05-072-3/+3
|/ / / / /
* | | | | Update test names to match method nameT.J. Schuck2017-05-041-6/+6
| | | | | | | | | | | | | | | The method is named `delegate_missing_to`, not `delegate_to_missing`
* | | | | Assorted delegate_missing_to doc fixesT.J. Schuck2017-05-041-22/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix rdoc code formatting — `tt`, not backticks * Fix/simplify sentence grammar — should at least just be “and the like”, not “likes”, but this is just general tightening up. * Add note that delegated methods must be public. Tested here: https://github.com/rails/rails/blob/7ff5ccae94ce2aff76b5f8a31a28e305a047d642/activesupport/test/core_ext/module_test.rb#L359-L365 * Simplify example code for delegate_missing_to. The example had complexity that wasn’t necessary for demonstrating `delegate_missing_to`. This gets rid of a bunch of cruft so the example is more obvious about what’s going on regarding the feature itself. [ci skip]
* | | | | Merge pull request #28930 from kamipo/use_flat_mapRafael França2017-05-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use `flat_map` rather than `map(&:...).flatten`
| * | | | | Use `flat_map` rather than `map(&:...).flatten`Ryuta Kamizono2017-04-291-2/+2
| | | | | |
* | | | | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-301-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Remove trailing spaces. * Add backticks around method and command. * Fix indentation.
* | | | | Add missing require for `remove_possible_method`Eugene Kenny2017-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/505537082849d912e8e29819655b80a573e93c0c added a call to `remove_possible_method`, but didn't require the file that defines it.
* | | | | Merge pull request #28831 from kamipo/respond_to_missing_should_be_privateRafael França2017-04-251-5/+5
|\ \ \ \ \ | | | | | | | | | | | | `respond_to_missing?` should be private
| * | | | | `respond_to_missing?` should be privateRyuta Kamizono2017-04-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of 03d3f036. Some of `respond_to?` were replaced to `respond_to_missing?` in 03d3f036. But the visibility is still public. It should be private.
* | | | | | Remove checks for Enumerator#size methodEugene Kenny2017-04-251-4/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Enumerator#size method was introduced in Ruby 2.0. These tests were added when Rails 4.1 was current, and Ruby 1.9.3 was still supported. Since Rails 5 only Ruby >= 2.2.2 is supported, so the checks are no longer necessary.
* | | | | Add commaJon Moss2017-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #28582 from sbull/activejob-error-loggingRafael França2017-04-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add error logging to Active Job
| * | | | | Add error logging to Active JobSteven Bull2017-03-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Job logging instrumentation is changed to log errors (with backtrace) when a job raises an exception in #perform. This improves debugging during development and test with the default configuration. Prior to Rails 5, the default development configuration ran jobs with InlineAdapter, which would raise exceptions to the caller and be shown in the development log. In Rails 5, the default adapter was changed to AsyncAdapter, which would silently swallow exceptions and log a "Performed SomeJob from Async..." info message. This could be confusing to a developer, as it would seem that the job was performed successfully. This patch removes the "Performed..." info message from the log and adds an error-level "Error performing SomeJob..." log message which includes the exception backtrace for jobs that raise an exception within the #perform method. It provides this behavior for all adapters.
* | | | | | Fixes Hash.from_xml with frozen strings for all backendsJosh Nussbaum2017-04-205-13/+9
| | | | | |