aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* Revert "just call the class method since we know the callbacks are stored at ↵Aaron Patterson2013-05-161-2/+1
| | | | | | the" This reverts commit 55975c71ec9c2c18b67020484959ff5c69d4d3fb.
* Merge pull request #10652 from md5/concern-multiple-includedRafael Mendonça França2013-05-163-0/+28
|\ | | | | Raise an error when multiple included blocks are defined for a Concern
| * Raise when multiple included blocks are definedMike Dillon2013-05-163-0/+28
| |
* | Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-167-129/+32
|\ \ | |/ |/| Squishy minitest5
| * oops. I should have only required minitest, not minitets/autorun. muscle memory.Ryan Davis2013-05-091-1/+1
| |
| * tweak dependenciesRyan Davis2013-05-081-1/+1
| |
| * Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-066-128/+31
| | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences.
* | Revert "Merge pull request #10600 from aditya-kapoor/code_refactor"Rafael Mendonça França2013-05-151-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ce3c1e5dde9fb180813e4d89324db03da110b13, reversing changes made to f93da579ce7f77dbd58b9a2165861aee265b8c93. Reason: It slow down the running time. require "diffbench" load 'output_safety.rb' N = 10000 b = ActiveSupport::SafeBuffer.new("hello world") DiffBench.bm do report "capitalize in safe buffer" do N.times do b.capitalize end end end > git checkout 069ea45; diffbench bench.rb; diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb; Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009733) Before patch: 0.010000 0.000000 0.010000 ( 0.007702) Improvement: -26% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009768) Before patch: 0.010000 0.000000 0.010000 ( 0.007896) Improvement: -24% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009938) Before patch: 0.010000 0.000000 0.010000 ( 0.007768) Improvement: -28% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.010001) Before patch: 0.010000 0.000000 0.010000 ( 0.007873) Improvement: -27% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009670) Before patch: 0.010000 0.000000 0.010000 ( 0.007800) Improvement: -24% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009949) Before patch: 0.010000 0.000000 0.010000 ( 0.007752) Improvement: -28%
* | just call the class method since we know the callbacks are stored at theAaron Patterson2013-05-151-1/+2
| | | | | | | | class level
* | this variable is used, so we don't have to use double assignmentsAaron Patterson2013-05-151-1/+1
| |
* | remove dead codeAaron Patterson2013-05-151-23/+4
| |
* | remove deprecation noticesAaron Patterson2013-05-152-26/+0
| |
* | stop keeping a reference to the options hashAaron Patterson2013-05-151-12/+7
| |
* | conditions are guaranteed to be arrays by initializeAaron Patterson2013-05-151-2/+2
| |
* | simplify the condions lambda generationAaron Patterson2013-05-151-12/+2
| |
* | use unless instead of if!Aaron Patterson2013-05-151-3/+3
| |
* | Fix HWIA#to_hash behavior with array of hashes.kennyj2013-05-162-2/+7
| |
* | only dup the options once, the Callback object does not mutate themAaron Patterson2013-05-141-2/+2
| |
* | make the compile method thread safeAaron Patterson2013-05-141-5/+7
| |
* | use inject rather than multiple assignmentsAaron Patterson2013-05-141-4/+2
| |
* | deprecating string based terminatorsAaron Patterson2013-05-142-5/+12
| |
* | halting lambda must be instance execedAaron Patterson2013-05-141-2/+2
| |
* | fixing arity2 testAaron Patterson2013-05-141-3/+8
| |
* | Merge pull request #10266 from vipulnsward/fix_HIA_to_hashRafael Mendonça França2013-05-142-3/+11
|\ \ | | | | | | fix HashWithIndifferentAccess#to_hash behaviour
| * | fix HashWithIndifferentAccess#to_hash behaviourVipul A M2013-04-192-3/+11
| | |
* | | Merge branch 'polymorphic'Aaron Patterson2013-05-142-228/+362
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * polymorphic: (41 commits) fix shadowed variable warnings polymorphic around callbacks polymorphic after filter rename terminal to halting, try to keep naming consistent push the before filter lambdas to factory methods polymorphic before callbacks use a singleton end node Revert "we never pass blocks, so remove this" if there is nothing to compile, then do not bother compiling Arrays are no longer supported we never pass blocks, so remove this raise an argument error if the filter arity is greater than 1 pass the actual filter, not a string do not keep a reference to the chain in the callback objects fix deprecation test push merge code to the callback itself dup the callback and set the chain remove klass because it is not used rename instance variables push duplicates? logic to the instance ...
| * | | fix shadowed variable warningsAaron Patterson2013-05-141-5/+5
| | | |
| * | | polymorphic around callbacksAaron Patterson2013-05-141-15/+79
| | | |
| * | | polymorphic after filterAaron Patterson2013-05-141-25/+70
| | | |
| * | | rename terminal to halting, try to keep naming consistentAaron Patterson2013-05-141-4/+4
| | | |
| * | | push the before filter lambdas to factory methodsAaron Patterson2013-05-141-40/+58
| | | |
| * | | polymorphic before callbacksAaron Patterson2013-05-141-16/+54
| | | |
| * | | Merge branch 'master' into normalizecbAaron Patterson2013-05-141-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * master: private callback methods should work Update mail to minimum version 2.5.4
| * | | | use a singleton end nodeAaron Patterson2013-05-131-5/+10
| | | | |
| * | | | Revert "we never pass blocks, so remove this"Aaron Patterson2013-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 9caf0cf9c8c7b42737ae78c470a5dd2f583ada75.
| * | | | if there is nothing to compile, then do not bother compilingAaron Patterson2013-05-131-3/+8
| | | | |
| * | | | Arrays are no longer supportedAaron Patterson2013-05-131-4/+0
| | | | |
| * | | | we never pass blocks, so remove thisAaron Patterson2013-05-131-1/+1
| | | | |
| * | | | raise an argument error if the filter arity is greater than 1Aaron Patterson2013-05-131-12/+6
| | | | |
| * | | | Merge branch 'master' into normalizecbAaron Patterson2013-05-131-0/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * master: adding more callback type coverage
| * \ \ \ \ Merge branch 'master' into normalizecbAaron Patterson2013-05-131-20/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: extract getting an setting callbacks to methods call extracted method from callback manipulation methods extract callback param munging no reason to make these defaulted, we always pass values in Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | | | pass the actual filter, not a stringAaron Patterson2013-05-132-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into normalizecbAaron Patterson2013-05-1312-51/+97
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (61 commits) add tests for reset_calbacks Fixing build broken by this change Extract variable out of loop Updated comment to Rails 4 Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext better error message when app name is not passed in `rails new` Code cleanup for ActionDispatch::Flash#call Fix typo: require -> requires Add CHANGELOG entry for #10576 Merge pull request #10556 from Empact/deprecate-schema-statements-distinct Some editorial changes on the documentation. respond_to -> respond to in a message from AM::Lint specify that dom_(id|class) are deprecated in controllers, views are fine copy edits [ci skip] Fix class and method name typos Replace multi_json with json ruby -> Ruby Adding documentation to the automatic inverse_of finder. Improve CHANGELOG entry [ci kip] Call assume_migrated_upto_version on connection ... Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | | | | do not keep a reference to the chain in the callback objectsAaron Patterson2013-05-101-12/+10
| | | | | | | |
| * | | | | | | fix deprecation testAaron Patterson2013-05-101-0/+2
| | | | | | | |
| * | | | | | | push merge code to the callback itselfAaron Patterson2013-05-101-18/+10
| | | | | | | |
| * | | | | | | dup the callback and set the chainAaron Patterson2013-05-101-8/+8
| | | | | | | |
| * | | | | | | remove klass because it is not usedAaron Patterson2013-05-101-9/+7
| | | | | | | |
| * | | | | | | rename instance variablesAaron Patterson2013-05-101-12/+14
| | | | | | | |
| * | | | | | | push duplicates? logic to the instanceAaron Patterson2013-05-101-16/+7
| | | | | | | |