aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14244 from arthurnn/orderd_hash_select_fixSantiago Pastorino2014-03-082-1/+8
|\ | | | | Fix OrderedHash.select to return self instance.
| * Fix OrderedHash.select to return self instance.Arthur Neves2014-03-072-1/+8
| | | | | | | | | | | | On ruby 2.1.1 the behavior of .select and .reject has changed. They will return a Hash new instance, so we need to override them to keep the instance object class.
* | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`.
* | Revert "Merge pull request #14269 from arthurnn/expanded_key_array"Godfrey Chan2014-03-043-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 475c96589ca65282e1a61350271c2f83f0d4044f, reversing changes made to 705915ab5cf24430892107764b0050c07e1df583. We decided that this is not worth busting everyone's cache as this seems like a very unlikely problem. The problem only occurs when the user is 1) not using a namespace, or 2) using the same namesapce for different *kinds* of cache items. The recommended "fix" is to put those cache items into their own namspace: id = 1 Rails.cache.fetch(id, namespace: "user"){ User.find(id) } ids = [1] Rails.cache.fetch(ids, namespace: "users"){ User.find(ids) } See the discussion on #14269 for details.
* | Cache key should be different when is Array.Arthur Neves2014-03-033-4/+14
| | | | | | | | | | | | | | | | `cache.fetch(['foo'])` and `cache.fetch('foo')` should generate different cache keys as they are not equivalents. [related #8615] [related #8614]
* | Add a comment to ensure that a test won't be removed [ci skip]Robin Dupret2014-03-031-1/+1
|/ | | | | | The 'cow' => 'kine' inflection has gone with c300dca9 but it should not be removed from the tested irregularities since it ensures that inflections work with words that do not begin with the same letters.
* Return a hash rather than array from fetch_multiParker Selbert2014-02-263-14/+19
| | | | | | | The current implementation of `fetch_multi` returns an array and has no means to easily backtrack which names yielded which results. By changing the return value to a Hash we retain the name information. Hash#values can be used on the response if only the values are needed.
* Fix concerning module reference [ci skip]Carlos Antonio da Silva2014-02-261-1/+1
|
* speed up `underscore` in cases that don't need to do anythingAaron Patterson2014-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark: Benchmark.ips do |x| x.report("home") { "home".underscore } x.report("Home") { "Home".underscore } x.report("homeBase") { "homeBase".underscore } x.report("home::base") { "home::base".underscore } end Before: Calculating ------------------------------------- home 2598 i/100ms Home 2463 i/100ms homeBase 2300 i/100ms home::base 2086 i/100ms ------------------------------------------------- home 28522.3 (±14.7%) i/s - 140292 in 5.065102s Home 29165.8 (±14.9%) i/s - 140391 in 5.000475s homeBase 26218.5 (±7.1%) i/s - 131100 in 5.030485s home::base 27712.3 (±5.9%) i/s - 139762 in 5.064077s After: Calculating ------------------------------------- home 23163 i/100ms Home 2432 i/100ms homeBase 2160 i/100ms home::base 2265 i/100ms ------------------------------------------------- home 1501614.8 (±10.2%) i/s - 7412160 in 5.009540s Home 28754.0 (±8.5%) i/s - 143488 in 5.033886s homeBase 25331.1 (±5.6%) i/s - 127440 in 5.047940s home::base 27089.9 (±5.5%) i/s - 135900 in 5.033516s
* Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-633/+1
| | | | Remove 4-1 related entries from master [ci skip]
* Go with #presence_in instead of #present_in -- it doesnt sound quite as ↵David Heinemeier Hansson2014-02-243-7/+7
| | | | good, but the closer relationship to #presence over #present is ultimately worth it
* Merge pull request #14171 from arthurnn/extract_middleware_cacheGuillermo Iguaran2014-02-232-32/+41
|\ | | | | Extract local cache middleware
| * Extract local cache middlewareArthur Neves2014-02-232-32/+41
| | | | | | | | | | Extract LocalCache Middleware, so it can requires rack dependencies, without adding rack dependencies to `AS::Cache::Strategy::LocalCache`.
* | Introduce Concern#class_methods and Kernel#concernJeremy Kemper2014-02-237-18/+113
|/
* update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
|
* Merge pull request #14102 from arthurnn/quietly_docXavier Noria2014-02-191-0/+4
|\ | | | | Add note to silence_stream and quietly. [skip ci]
| * Methods silence_stream/quietly are not thread-safe [skip ci]Arthur Neves2014-02-191-0/+4
| | | | | | | | | | | | State that on the doc. [fixes #11954]
* | Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * | Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
| | |
* | | Move changelog entry to the top, fix examples indent [ci skip]Carlos Antonio da Silva2014-02-181-10/+10
| | |
* | | Use assert_nil instead as its clearer about what the return is expected to beDavid Heinemeier Hansson2014-02-181-1/+1
| | |
* | | Added Object#present_in to simplify value whitelistingDavid Heinemeier Hansson2014-02-183-0/+29
| |/ |/|
* | travel_to travels back and re-raises if the block raisesXavier Noria2014-02-182-3/+18
| |
* | adds a missing travel backXavier Noria2014-02-181-4/+4
| |
* | time helpers honor the application time zone when passed a dateXavier Noria2014-02-183-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails applications are expected to be always aware of the application time zone. To be consistent with that contract, we have to assume that a bare date passed to time helpers is a date in the application time zone, not in the system time zone. The system time zone is irrelevant, we should totally ignore it. For example, travel_to user.birth_date + 40.years should make that user be 40th years old regardless of the system time zone. Without this patch that may not be true.
* | docs, hide inflector comment targeting only contributors. [ci skip]Yves Senn2014-02-111-1/+3
| | | | | | | | | | | | | | This is a follow up to: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e As suggested by @fxn this comment should not be visible in the API: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e#commitcomment-5331658
* | Fix tidy_bytes for JRubyJustin Coyne2014-02-102-3/+10
| | | | | | | | | | The previous implementation was broken because JRuby (1.7.10) doesn't have a code converter for UTF-8 to UTF8-MAC.
* | docs, mention that the current inflection rules are frozen. [ci skip]Yves Senn2014-02-101-0/+4
| | | | | | | | Closes #13993.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-092-2/+4
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md
| * | Specify what #starts_with? we're talking about. Also added a note whatZachary Scott2014-02-091-1/+2
| | | | | | | | | | | | kind of exception we should expect for this internal comment.
| * | Fix grammar of internal comment and modify it's locationZachary Scott2014-02-091-1/+2
| | |
* | | use feature detection to decide which implementation to useAaron Patterson2014-02-081-1/+1
| | | | | | | | | | | | Decouple the code from the particular Ruby version.
* | | Fixed an issue where reloading of removed dependencies would cause an ↵Noah Lindner2014-02-082-0/+20
| | | | | | | | | | | | unexpected circular dependency error
* | | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-061-2/+3
| | | | | | | | | | | | /cc @chancancode
* | | Fix to_query with empty arrays tooRafael Mendonça França2014-02-062-1/+8
| | |
* | | Add CHANGELOG entryRafael Mendonça França2014-02-051-0/+14
| | | | | | | | | | | | Closes #13909
* | | Refatoring the method to avoid shot-circuit returnRafael Mendonça França2014-02-052-4/+9
| | |
* | | Test with a blank valueRafael Mendonça França2014-02-051-2/+2
| | |
* | | Move test to the right fileRafael Mendonça França2014-02-052-11/+9
| | |
* | | Fixed "Hash#to_param confused by empty hash values #13892"Hincu Petru2014-02-052-0/+12
| | |
* | | fix interplay of humanize and html_escapeSean Walbran2014-02-052-1/+5
| | |
* | | Return sized enumerator from Enumerable#index_byMarc-Andre Lafortune2014-02-052-1/+5
| | |
* | | Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-051-1/+1
| | |
* | | Remove obsolete test (builtin group_by is now used)Marc-Andre Lafortune2014-02-051-20/+0
| | |
* | | Remove obsolete line (was needed for Ruby 1.8.7 support)Marc-Andre Lafortune2014-02-051-1/+0
| | |
* | | docs, be clear that `options` is a hash. Closes #11904. [ci skip].Yves Senn2014-02-031-1/+1
| | |
* | | Assert the file is deprecatedRafael Mendonça França2014-02-011-1/+1
| | |
* | | Fix isolated testsRafael Mendonça França2014-02-011-0/+1
| | |
* | | Merge pull request #13911 from davidcelis/remove-bigdecimal-serializationRafael Mendonça França2014-02-015-28/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deprecate custom BigDecimal serialization Conflicts: activesupport/CHANGELOG.md
| * | | Remove BigDecimal#to_dDavid Celis2014-02-012-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | This was backported for Ruby 1.8 support and is no longer needed. Signed-off-by: David Celis <me@davidcel.is>