aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #12200 from dchelimsky/simplify-duration-inspect-even-moreRafael Mendonça França2013-09-112-6/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Reduce Duration#inspect to a single series of transformations
| * | | | | Reduce Duration#inspect to a single series of transformationsDavid Chelimsky2013-09-112-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminates need for temp Hash Also added a couple of examples to DurationTest to specify: * duration can be defined with units out of order e.g. 1.month + 1.year + 1.second + 1.day * equality with a Fixnum works regardless of which operand is on which side of the operator
* | | | | | Be sure to restore the default I18n.locale after changed its value in a testAkira Matsuda2013-09-101-3/+3
| | | | | |
* | | | | | Fixes typo in Object#try!Jay Hayes2013-09-101-1/+1
| | | | | |
* | | | | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commitGuillermo Iguaran2013-09-101-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert fixes
| * | | | | | Fix order dependent testArun Agrawal2013-09-091-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | see c48cbb02d7e6f585e31b404c0c363f0d6b586811
* | | | | | | Removed unused modules and classesAnupam Choudhury2013-09-101-7/+0
| | | | | | |
* | | | | | | Removed unnecessary requireAnupam Choudhury2013-09-101-1/+0
|/ / / / / /
* | | | | | Fix typo in set_callback docs. [ci skip]Gilad Zohari2013-09-061-1/+1
| | | | | |
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-311-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix doc for singularize - `pluralized` => `singularized`Vipul A M2013-08-271-1/+1
| | | | | |
* | | | | | Remove gist link from the codeRafael Mendonça França2013-08-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not good to include links in the code. These links can be in the future outdated and nobody will upgrade they. [ci skip]
* | | | | | Ensure all-caps nested consts marked as autoloadedSimon Coffey2013-08-274-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, an autoloaded constant `HTML::SomeClass` would not be marked as autoloaded by AS::Dependencies. This is because the `#loadable_constants_for_path` method uses `String#camelize` on the inferred file path, which in turn means that, unless otherwise directed, AS::Dependencies watches for loaded constants in the `Html` namespace. By passing the original qualified constant name to `#load_or_require`, this inference step is avoided, and the new constant is picked up in the correct namespace.
* | | | | | Changing deprecation_horizon to be Rails 4.2wangjohn2013-08-241-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | Also, +ActiveRecord::Migrator.proper_table_name+ should actually have a deprecation horizon of Rails 4.2 (not 4.1).
* | | | | Merge pull request #11932 from gaurish/skip-encoding-convertorRafael Mendonça França2013-08-212-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [JRuby] Skip few of the ActiveSupport's inflector test cases Conflicts: activesupport/test/abstract_unit.rb
| * | | | | Define jruby_skip to skip test on JRubyGaurish Sharma2013-08-211-0/+5
| | | | | |
| * | | | | Skip few of the ActiveSupport'sinflector test on JRubyGaurish Sharma2013-08-211-0/+10
| | | | | |
* | | | | | Merge pull request #11850 from razielgn/mod-delegation-backtraceRafael Mendonça França2013-08-211-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Generalize backtrace check on DelegationError.
| * | | | | | Rely on NoMethodError#name when deciding to raise DelegationError.Federico Ravasio2013-08-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different Ruby implementations present backtraces differently, as it should be an information consumed by humans. A better implementation should use data from the error, in this case returned by NoMethodError#name. Fixes issues with Rubinius, which presents backtraces differently from MRI.
* | | | | | | Skip tests involving $SAFE, it's not supported on Rubinius.Federico Ravasio2013-08-211-0/+2
| | | | | | |
* | | | | | | Added method to skip tests on Rubinius to AS/abstract_unit.Federico Ravasio2013-08-211-0/+4
| | | | | | |
* | | | | | | ensure freeze on Thread freezes localsNick Howard2013-08-192-0/+14
| | | | | | |
* | | | | | | oops, I missed this in 7193f75Guillermo Iguaran2013-08-181-1/+1
| |/ / / / / |/| | | | |
* | | | | | duration is called multiple times in dev, so lets cache itAaron Patterson2013-08-181-1/+2
| | | | | |
* | | | | | Rename @locals to @_locals in Thread to avoid conflict with Rubinius. Closes ↵Guillermo Iguaran2013-08-181-7/+7
| |/ / / / |/| | | | | | | | | | | | | | #11831
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-175-15/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
| * | | | | Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-175-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
| * | | | | Revert "Removing obsolete html tags in favor of markdown code block"Avner Cohen2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e.
| * | | | | Removing obsolete html tags in favor of markdown code block.Avner Cohen2013-08-061-1/+1
| | | | | |
* | | | | | Fixed grammar error in ordered_options documention.Dustin Lam2013-08-171-1/+1
| | | | | |
* | | | | | Typo Fix[ci skip]Rashmi Yadav2013-08-141-3/+3
| | | | | |
* | | | | | Add String#remove(pattern) as a short-hand for the common pattern of ↵David Heinemeier Hansson2013-08-133-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | String#gsub(pattern, '')
* | | | | | renames the :abort deprecation behaviour to :raiseXavier Noria2013-08-133-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | That is a better name, thanks @jeremy.
* | | | | | fixes typo in CHANGELOGXavier Noria2013-08-131-1/+1
| | | | | |
* | | | | | defines a new :abort deprecation behaviour that raisesXavier Noria2013-08-133-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | See the CHANGELONG message in the patch for further details.
* | | | | | Refactor Duration#inspectDavid Chelimsky2013-08-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparing https://github.com/rails/rails/pull/11855, it took me a minute to understand what was going on due to naming (parts refers first to an attr_accessor, then to a local, and is then reassigned), but also because the iterator conditionally builds nulls and then removes them. I refactored to something much more functional-looking that I find easier to read, but you may or may not. If you do, great! Enjoy! If not, oh well, I tried. Can't win 'em all :) Rationale: * no name conflict between local var and attr_accessor * no reassignment of local var * algorithm spelled out in steps * unused items in initial list filtered out early * empty-list case handled early instead of reassigning local var * no duplication of formatting strings ("0 seconds") Benchmarks (after PR #11855 merged): 10000.times do 1.second.inspect end original #inspect 0.350000 0.000000 0.350000 ( 0.354709) 0.330000 0.000000 0.330000 ( 0.331885) 0.330000 0.000000 0.330000 ( 0.334441) refactored #inspect 0.340000 0.000000 0.340000 ( 0.340080) 0.340000 0.010000 0.350000 ( 0.345069) 0.330000 0.000000 0.330000 ( 0.335873) 10000.times do (1.day + 1.month + 2.minutes + 1.day).inspect end original #inspect 0.400000 0.000000 0.400000 ( 0.403027) 0.400000 0.000000 0.400000 ( 0.403781) 0.390000 0.000000 0.390000 ( 0.387596) refactored #inspect 0.400000 0.010000 0.410000 ( 0.399792) 0.400000 0.000000 0.400000 ( 0.404145) 0.400000 0.000000 0.400000 ( 0.403820)
* | | | | | Use chop instead of singularize in Duration#inspectDavid Chelimsky2013-08-121-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though singularize tells a better story, chop is more than 50% faster and is all that is necessary in the case of Duration#inspect, in which all of the candidates for chopping appear in the same method and are all singularized by removing the final 's'. Benchmarks: 10000.times do 1.second.inspect end original #inspect 0.740000 0.000000 0.740000 ( 0.739065) 0.740000 0.000000 0.740000 ( 0.741458) 0.740000 0.010000 0.750000 ( 0.744011) refactored #inspect 0.330000 0.000000 0.330000 ( 0.333390) 0.330000 0.000000 0.330000 ( 0.331013) 0.320000 0.000000 0.320000 ( 0.330103) 10000.times do (1.day + 1.month + 2.minutes + 1.day).inspect end original #inspect 0.790000 0.000000 0.790000 ( 0.794624) 0.770000 0.000000 0.770000 ( 0.774577) 0.770000 0.010000 0.780000 ( 0.771295) refactored #inspect 0.390000 0.000000 0.390000 ( 0.392921) 0.400000 0.000000 0.400000 ( 0.397412) 0.370000 0.000000 0.370000 ( 0.379660)
* | | | | Avoid defining multibyte method names in JSON decoding test for JRuby CompatGaurish Sharma2013-08-071-3/+4
| | | | | | | | | | | | | | | | | | | | This change is similar to #11736 & in same way switched with fixed string & the index of the hash for method name. the index was added because otherwise, ruby will raise Error.
* | | | | No need to use blocks hereAndrew White2013-08-041-11/+9
| | | | |
* | | | | Fix unused variable warningAndrew White2013-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to call `in_time_zone` to test that it isn't modifying the receiver but since the variable isn't used it raises a warning so add an assertion to make Ruby think it's being used.
* | | | | Avoid calling define_method with non-english chars in InflectorTestGaurish Sharma2013-08-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we call define_method with non-english chars like ¿por qué? it errors out on JRuby as of 1.7.4 & would leave out the following error invalid byte sequence in US-ASCII To work around this issue, I have switched to define_test method call define method with fixed string & the index of the hash. the index was added because otherwise, ruby will raise method redefined warning. As far as I can see there are no side-effect of this change for other implementations. For readbility I have added a message to asssert_equal informing for which word/phase the test has passed. Before this Change: JRuby: Tests terminated suddenly with an error. no reported of Failues or errors MRI: All Green. After this Change, JRuby: the `ActiveSupport` TestsSuite gracefully fails with report at the end which test failed & why. MRI: All Green(no change)
* | | | | Fix jruby warning when capture calls unlink on an open tempfileAlex Tambellini2013-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | Jruby cannot unlink a tempfile unless it is closed first.
* | | | | Fix ActiveSupport::Testing::Isolation on jrubyAlex Tambellini2013-08-021-48/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully the first of many related to #11700. With these changes the railties tests wont 100% pass but at least they will run and show the errors. The first problem was the @method_name variable was never set. This was causing ENV["ISOLATION_TEST"] to always be nil which would cause the test output to never be written to the tempfile. The second problem was that an invalid -t option was being passed to minitest and minitest was erroring out. The third problem was the run method needs to always return an instance of the test class it is trying to isolate. We were returning a ProxyTestResult instead.
* | | | | Refactor Date, Time, DateTime timezone methodsGilad Zohari2013-08-015-59/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar implementations of #in_time_zone exists for Date, Time and DateTime so method is extracted into its own module. Also some logic is extracted into private method.
* | | | | Remove duplication from date_time calculationsGilad Zohari2013-07-311-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods: :past? and :future? are already defined identically in date_and_time/calculations.rb which is included in Date. Because DateTime is a subclass of Date, it can call them.
* | | | | Don't mutate the original inflections instance in the testsAndrew White2013-07-302-20/+22
| | | | |
* | | | | Add CHANGELOG entry for inflection removalAndrew White2013-07-301-0/+4
| | | | |
* | | | | Don't have a cow, man!Andrew White2013-07-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cow => kine from default inflections but leave the test case in place to prevent regression of the [old Trac ticket 4929][1]. [1]: http://web.archive.org/web/20090314050915/http://dev.rubyonrails.org/ticket/4929
* | | | | Merge pull request #10879 from makaroni4/masterAndrew White2013-07-296-0/+50
|\ \ \ \ \ | | | | | | | | | | | | Added Time#middle_of_day method
| * | | | | Added Time#middle_of_dayAnatoli Makarevich2013-07-286-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | Added middle_of_day method to Date and DateTime
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:45:58 +0000