aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Prefer object/nil over `true`/`false`Rafael Mendonça França2014-12-021-6/+4
| | | | | | | | | | | | | | | | | | | | | | This is the project guideline and the reasons are: * That follows standard Ruby semantics. * Allows the implementation to avoid artificial code like !! or something ? true : false * You do not need to rely on the exact type of 3rd party code. For example, if your method returns str.end_with?('foo') you do not need to make sure end_with? returns a singleton. Your predicate just propagates predicate semantics up regardless of what end_with? returns.
* | Add `#verified` and `#valid_message?` to MessageVerifierLogan Leger2014-12-013-22/+47
|/ | | | | | | | | | | This commit adds a `#verified` method to `ActiveSupport::MessageVerifier` which will return either `false` when it encounters an error or the message. `#verify` continues to raise an `InvalidSignature` exception on error. This commit also adds a convenience boolean method on `MessageVerifier` as a way to check if a message is valid without performing the decoding.
* Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-2917-28/+24
|
* Merge pull request #17816 from byroot/prevent-numeric-to-s-to-allocate-an-arrayRafael Mendonça França2014-11-292-16/+25
|\ | | | | Prevent Numeric#to_s from allocating an array
| * Prevent Numeric#to_s from allocating an arrayJean Boussier2014-11-282-16/+25
| |
* | Bump required Ruby version to 2.1.0claudiob2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files.
* | fixed indent of end in jdom.rbbigtone12842014-11-281-1/+1
| |
* | Start Rails 5 development :tada:Rafael Mendonça França2014-11-282-391/+4
|/ | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9.
* Document `String#html_safe` [ci skip]Sean Griffin2014-11-241-0/+5
| | | | | | It should be part of the documented public API, since we have an entire section of the guides dedicated to it. Documented in a way that addresses the concerns which kept it undocumented in the past.
* Update to Unicode 7.0.0Benjamin Fleischer2014-11-152-1/+1
| | | | | | | | 7.0.0 was released on June 16, 2014 http://unicode-inc.blogspot.com.ar/2014/10/unicode-version-70-complete-text-of.html ruby bin/generate_tables
* Abstract encoding strategy for ActiveSupport::MessageVerifierRyan Mohr2014-11-121-2/+10
|
* Merge pull request #17047 from betesh/masterRafael Mendonça França2014-11-111-0/+1
|\ | | | | Time includes DateAndTime::Zones acts_like(:time)
| * Time includes DateAndTime::Zones acts_like(:time)betesh2014-11-091-0/+1
| |
* | dependencies.rb: keep the decorated #load and #require private [closes #17553]Xavier Noria2014-11-103-13/+36
| |
* | added description for rails generators, and fixed sentence formation for ↵Rishi Jain2014-11-101-1/+1
|/ | | | active_support/notifications [ci skip]
* Merge pull request #17493 from petewest/duration-comparableAaron Patterson2014-11-072-0/+14
|\ | | | | Delegate comparison operator to value
| * Delegate comparison operator to valuePeter West2014-11-032-0/+14
| |
* | added example of hash#except, and removed extra whitespaces [ci skip]Rishi Jain2014-11-072-5/+11
| |
* | Fix grouped expression warning - `warning: (...) interpreted as grouped ↵Vipul A M2014-11-061-2/+2
| | | | | | | | expression`
* | Merge pull request #17526 from rishijain/update_docs_6Vijay Dev2014-11-062-0/+15
|\ \ | | | | | | Update docs 6
| * | added example of squish!, remove, test case for multiple occurrence ofRishi Jain2014-11-062-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | pattern removal added example for string#remove and test case for remove of multiple occurence of pattern removed extra whitespaces
* | | docs, synchronize 4.2. release notes. [ci skip]Yves Senn2014-11-061-3/+3
|/ / | | | | | | /cc @chancancode
* | Merge pull request #15956 from zuhao/refactor_activesupport_dependencies_testYves Senn2014-11-051-101/+124
|\ \ | | | | | | | | | Cleanup loaded features and constants after dependency tests.
| * | Cleanup loaded features and constants after dependency tests.Zuhao Wan2014-06-281-100/+116
| | |
* | | tests, add note about the usage of a specific timezone. Closes #17448.Yves Senn2014-11-051-1/+1
| | |
* | | Merge pull request #17515 from prathamesh-sonpatki/rm-requireYves Senn2014-11-052-2/+0
|\ \ \ | | | | | | | | Removed the unused require of proxy_object
| * | | Removed the unused require of proxy_object and test related to itPrathamesh Sonpatki2014-11-052-2/+0
| | | | | | | | | | | | | | | | | | | | - Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359 - Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574
* | | | Fix broken string_ext_test due to change in timezonePrathamesh Sonpatki2014-11-051-1/+1
|/ / / | | | | | | | | | | | | - Russian time was changed to UTC+3 from UTC+4 recently. This broke the string_to_ext test.
* | | fix typo [ci skip]Vijay Dev2014-11-041-1/+1
| | |