aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #8740 from amatsuda/missing_source_fileRafael Mendonça França2015-01-022-26/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace use of MissingSourceFile with LoadError Conflicts: activesupport/test/core_ext/load_error_test.rb
| * | | | replace use of MissingSourceFile with LoadErrorAkira Matsuda2013-01-042-18/+3
| | | | |
* | | | | Remove thread variables backportRafael Mendonça França2015-01-022-161/+0
| | | | | | | | | | | | | | | | | | | | They are already present on Ruby 2.2
* | | | | Merge pull request #16749 from robin850/rbx-name-errorRafael Mendonça França2015-01-021-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Rely on NameError#name instead of its error message
| * | | | | Skip an error message related assertion on RubiniusRobin Dupret2014-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius' error messages don't call `#inspect` on the concerned object while the assertion is here to address a wrong inspection on MRI with time zones so let's keep this test for now on Rubinius.
* | | | | | Do not check only for the Rails constantRafael Mendonça França2015-01-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This constant may be define for auxiliar gems like rails-html-sanitizer and these methods call will fail.
* | | | | | Remove conversion code for old Rails cache entryRafael Mendonça França2015-01-012-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was there just to convert entries generated in Rails 4.0.0.beta1 applications to a supported format. It is almost unlikely that any existent application have this cache entry format in their caches at the point that Rails 5 will be released so we don't need this code anymore.
* | | | | | Check by @v before converting the entry on expired?Rafael Mendonça França2015-01-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should convert when @v is defined not @value. The test was calling value first that already converts the entry so we are not catching this bug.
* | | | | | Merge pull request #18271 from arunagw/change-copyright-yearRobin Dupret2015-01-012-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update copyright notices to 2015 [ci skip]
| * | | | | | Update copyright notices to 2015 [ci skip]Arun Agrawal2014-12-312-2/+2
| | | | | | |
* | | | | | | Changelog edits [ci skip]Robin Dupret2014-12-311-4/+10
|/ / / / / /
* | | | | | Merge pull request #18219 from jaroslawr/masterAaron Patterson2014-12-301-74/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | Flatten the call stacks ActiveSupport::Callbacks produces, fix #18011.
| * | | | | | Flatten the call stacks ActiveSupport::Callbacks produces, fix #18011.Jaroslaw Rzeszotko2014-12-271-74/+116
| | | | | | |
* | | | | | | Fix comment typo in debugger.rbmntj2014-12-301-1/+1
| | | | | | |
* | | | | | | Removed Object#itself as it's implemented in ruby 2.2Cristian Bica2014-12-293-25/+0
| | | | | | |
* | | | | | | Just check if the buffer exists before changing itRafael Mendonça França2014-12-292-6/+4
| | | | | | |
* | | | | | | When trying to access a character on a string buffer object via `:[]`, if ↵Vipul A M2014-12-292-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the object being accessed currently returns `html_safe?` as true, we used to set `@html_safe` variable as true on new object created. When doing something like x = 'Hello'.html_safe x[/a/, 1] would throw an error on ruby 2.2, since when nothign gets matched nil is returned by the code and it tries to set `@html_safe` value to true, which would error since starting 2.2 nil is frozen. This change adds a safety net to avoid setting `@html_safe = true` on frozen objects. Fixes #18235
* | | | | | | Require Ruby 2.2 for Rails 5.0claudiob2014-12-261-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final
* | | | | | cleanup CHANGELOGs. [ci skip]Yves Senn2014-12-231-1/+1
| | | | | |
* | | | | | Fix syntax error with RDoc directive,Zachary Scott2014-12-201-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | this should be `:nodoc:` in order to be parsed.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-208-7/+72
|\ \ \ \ \
| * | | | | Add docs for Numeric time-related methodsclaudiob2014-12-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `minutes`, `hours`, `days`, `weeks` and `fortnights`. Fix docs for `in_milliseconds`. [ci skip]
| * | | | | Replace `#=>` with `# =>` [ci skip]claudiob2014-12-177-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @rafaelfranca suggested in f7c7bcd9 that code examples should display the result after `# =>` and not after `#=>`. This commit replaces *all* the occurrences of `#=>` in the code documentation (mostly added by me :sob:) with the suggested `# =>`.
| * | | | | Add docs for Numeric#*_bytes methodsclaudiob2014-12-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `kilobytes`, `megabytes`, `gigabytes`, `terabytes`, `petabytes` and `exabytes`. Fix docs for `bytes`. [ci skip]
| * | | | | Add docs for Time#find_zoneclaudiob2014-12-171-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improves docs for `Time#find_zone!` [ci skip]
| * | | | | Fix docs for AS::Notifications::Event#durationclaudiob2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from comments by @zzak on e07f3dd: * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015634 * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015639 [ci skip]
| * | | | | Add docs for AS::Notifications::Event#durationclaudiob2014-12-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Use released I18n 0.7.0Carlos Antonio da Silva2014-12-191-1/+1
| |_|_|_|/ |/| | | |
* | | | | Add docs for AS::TestCase::test_orderclaudiob2014-12-182-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document `test_order` and `test_order=` from `ActiveSupport::TestCase`. [ci skip]
* | | | | Merge pull request #18063 from claudiob/remove-as-time-with-zone-sinceRafael Mendonça França2014-12-171-10/+1
|\ \ \ \ \ | | | | | | | | | | | | Replace AS::TimeWithZone#since with alias to +
| * | | | | Replace AS::TimeWithZone#since with alias to +claudiob2014-12-161-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from [Google group discussion](https://groups.google.com/forum/#!topic/rubyonrails-core/jSPbP-TNLb0). Currently `AS::TimeWithZone` has two methods to add an interval to a time: `+(other)` and `since(other)` ([docs](http://edgeapi.rubyonrails.org/classes/ActiveSupport/TimeWithZone.html)). The two methods are "pretty much" equivalent in every case: 1. When adding any interval to an `AS::TimeWithZone` representing a `Time`: ```ruby t = Time.now.in_time_zone #=> Thu, 04 Dec 2014 18:56:28 EST -05:00 t + 1 == t.since(1) #=> true t + 1.day == t.since(1.day) #=> true t + 1.month == t.since(1.month) #=> true ``` 2. When adding any interval to an `AS::TimeWithZone` representing a `Date`: ```ruby d = Date.today.in_time_zone #=> Thu, 04 Dec 2014 00:00:00 EST -05:00 d + 1 == d.since(1) #=> true d + 1.day == d.since(1.day) #=> true d + 1.month == d.since(1.month) #=> true ``` 3. When adding any interval to an `AS::TimeWithZone` representing a `DateTime`: ```ruby dt = DateTime.now.in_time_zone #=> Thu, 04 Dec 2014 18:57:28 EST -05:00 dt + 1 == dt.since(1) #=> true dt + 1.day == dt.since(1.day) #=> true dt + 1.month == dt.since(1.month) #=> false ``` As you can see, the only case in which they differ is when the interval added to a `DateTime` is in a format like `1.month`. However, this usage of "since" is explicitly discouraged by the [documentation of `DateTime#since`](https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/date_time/calculations.rb#L86L88): > Returns a new DateTime representing the time a number of seconds since the instance time. > Do not use this method in combination with x.months, use months_since instead! And indeed, following this recommendation the correct result is returned: ```ruby dt + 1.month == dt.months_since 1 #=> true ``` Therefore, my proposal is to remove the method definition of `TimeWithZone#since` and instead replace it with a simple `alias_method :since, :+`. The rationale is that the only case where they differ is a case that is explicitly discouraged as "wrong". In my opinion, having two methods named `since` and `+` and having to figure out exactly what the difference is makes the codebase more confusing. However, I understand this PR is "subjective", so if you feel like it's better to ignore this, feel free to close the PR. Thanks!
* | | | | | Merge pull request #18072 from exAspArk/thread_safe_gem_versionRafael Mendonça França2014-12-171-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Use thread_safe gem version greater or equal to 0.3.4
| * | | | | use thread_safe gem version greater or equal to 0.3.4Evgeny Li2014-12-171-1/+1
|/ / / / /
* | | | | Merge pull request #17980 from gsamokovarov/rescuable-case-operatorRafael Mendonça França2014-12-163-4/+45
|\ \ \ \ \ | | | | | | | | | | | | Add class level case operator support for error dispatching in Rescuable
| * | | | | Add class level case operator support for error dispatching in RescuableGenadi Samokovarov2014-12-103-4/+45
| | | | | |
* | | | | | Merge pull request #18031 from claudiob/better-tests-for-callbacks-terminatorRafael Mendonça França2014-12-162-19/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add test for `:skip_after_callbacks_if_terminated`
| * | | | | Add test for `:skip_after_callbacks_if_terminated`claudiob2014-12-142-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `define_callbacks` from `ActiveSupport::Callbacks` accepts the `:skip_after_callbacks_if_terminated` option since #4866 but the option is not tested anywhere. This commit adds tests and fixes documentation for the option, making it clear that halting a callback chain only stops following `before_` and `around_` callbacks by default.
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-152-5/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Better doc for AS::DateTime#seconds_since_midnightclaudiob2014-12-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds examples and keeps coherent with the documentation of the similar method `seconds_until_end_of_day`. [ci skip]
| * | | | | Add docs for AS::TimeWithZone + and -claudiob2014-12-041-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was taken from the commit message 676d6a6. [ci skip]
* | | | | | English fix [ci skip]George Millo2014-12-121-1/+1
| | | | | |
* | | | | | [ci skip] fix typo in MessageVerifier#verify docsyuuji.yaginuma2014-12-101-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #17913 from claudiob/add-docs-to-time-with-zoneRafael Mendonça França2014-12-041-2/+23
|\ \ \ \ \ | | | | | | | | | | | | Add documentation to six AS::TimeWithZone methods [ci skip]
| * | | | | Add documentation to six AS::TimeWithZone methodsclaudiob2014-12-041-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Fix MessageVerifier's #verified in CHANGELOGclaudiob2014-12-041-4/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] As confirmed by @lleger (the author of `verified`) [in this comment](https://github.com/rails/rails/pull/17727#issuecomment-65488743): > Actually, it no longer returns false explicitly (bc8cc56), so I guess the CHANGELOG isn't totally accurate. It returns nil instead (but the functionality isn't practically different).
* | | | | Copy-edit the MessageVerifier documentation [ci skip]Rafael Mendonça França2014-12-041-7/+6
| | | | |
* | | | | Merge pull request #17905 from claudiob/add-doc-to-message-verifierRafael Mendonça França2014-12-041-4/+50
|\ \ \ \ \ | | | | | | | | | | | | Add documentation to MessageVerifier
| * | | | | Add documentation to MessageVerifierclaudiob2014-12-031-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Complements #17727 and closes ee73d9ff8. @lleger How do you feel about this?
* | | | | | Remove "rescue" clause around "require 'openssl'"claudiob2014-12-032-22/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some `require 'openssl'` statements were surrounded by `rescue` blocks to deal with Ruby versions that did not support `OpenSSL::Digest::SHA1` or `OpenSSL::PKCS5`. [As @jeremy explains](https://github.com/rails/rails/commit/a6a0904fcb12b876469c48b1c885aadafe9188cf#commitcomment-8826666) in the original commit: > If jruby didn't have jruby-openssl gem, the require wouldn't work. Not sure whether either of these are still relevant today. According to the [release notes for JRuby 1.7.13](http://www.jruby.org/2014/06/24/jruby-1-7-13.html): > jruby-openssl 0.9.5 bundled which means the above `rescue` block is not needed anymore. All the Ruby versions supported by the current version of Rails provide those OpenSSL libraries, so Travis CI should also be happy by removing the `rescue` blocks. --- Just to confirm, with JRuby: $ ruby --version #=> jruby 1.7.16.1 (1.9.3p392) 2014-10-28 4e93f31 on Java HotSpot(TM) 64-Bit Server VM 1.8.0_20-b26 +jit [darwin-x86_64] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 # => OpenSSL::PKCS5 And with Ruby 2.1: $ ruby --version #=> ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-darwin13.0] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 #=> OpenSSL::PKCS5
* | | | | Add some FIXME notes about documentation [ci skip]Rafael Mendonça França2014-12-021-0/+4
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 11:54:06 +0000