aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move the CoC text to the Rails websiteGodfrey Chan2015-08-212-16/+6
|
* Remove unnecessary cachingeileencodes2015-08-211-5/+1
| | | | | | | `ActiveSupport::Dependencies.constantize(const_name)` calls `Reference.new` which is defined as `ActiveSupport::Dependencies.constantize(const_name)` meaning this call is already cached and we're doing caching that isn't necessary.
* pass a request object to the headers objectAaron Patterson2015-08-214-13/+19
|
* move header allocation to a helper methodAaron Patterson2015-08-211-5/+9
| | | | | I'm going to change the constructor, so it's easier to do it in one place.
* Merge pull request #21106 from amitsuroliya/fix_routing_testAndrew White2015-08-211-6/+0
|\ | | | | Remove duplicity in tests
| * Remove duplicity in testsamitkumarsuroliya2015-08-031-6/+0
| |
* | better docs for `disable_ddl_transaction!`. Closes #21044.Yves Senn2015-08-211-1/+4
| |
* | Merge pull request #21312 from piton4eg/patch-7Yves Senn2015-08-211-12/+6
|\ \ | | | | | | Small fixes [ci skip]
| * | Add bold to lists' titles [ci skip]Alexey Markov2015-08-211-6/+6
| | |
| * | Small fixes [ci skip]Alexey Markov2015-08-201-12/+6
| | |
* | | Merge pull request #21313 from reshleman/re-punctuationYves Senn2015-08-211-2/+2
|\ \ \ | | | | | | | | Fix Punctuation in `AutosaveAssociation` RDoc [ci skip]
| * | | Fix Punctuation in `AutosaveAssociation` RDocRobert Eshleman2015-08-201-2/+2
| | | | | | | | | | | | | | | | [ci skip]
* | | | set route precedence at allocation timeAaron Patterson2015-08-202-8/+6
| | | | | | | | | | | | | | | | This way we can make the Route object a read-only data structure.
* | | | argh!!!Aaron Patterson2015-08-203-0/+3
| | | |
* | | | smooth move aaron.... :bomb:Aaron Patterson2015-08-201-2/+2
| | | |
* | | | point at rack masterAaron Patterson2015-08-206-31/+34
|/ / /
* | | Merge pull request #21306 from ronakjangir47/remove_mocha_actionmailerKasper Timm Hansen2015-08-204-55/+100
|\ \ \ | |/ / |/| | Removed mocha from ActionMailer
| * | Removed mocha from ActionMailerRonak Jangir2015-08-204-55/+100
| | |
* | | Merge pull request #16245 from byroot/more-atomic-writeMatthew Draper2015-08-211-27/+29
|\ \ \ | | | | | | | | File renaming should be the last operation of an atomic write
| * | | File renaming should be the last operation of an atomic writeJean Boussier2015-08-201-27/+29
| | | |
* | | | Merge pull request #21310 from y-yagi/fix_file_pathYves Senn2015-08-201-1/+1
|\ \ \ \ | | | | | | | | | | fix path of annotations.rake [ci skip]
| * | | | fix path of annotations.rake [ci skip]yuuji.yaginuma2015-08-201-1/+1
|/ / / /
* | | | uniqueness validation raises error for persisted record without pk.Yves Senn2015-08-204-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21304. While we can validate uniqueness for record without primary key on creation, there is no way to exclude the current record when updating. (The update itself will need a primary key to work correctly).
* | | | Merge pull request #21300 from jonahb/cacheYves Senn2015-08-201-1/+1
|\ \ \ \ | |_|/ / |/| | | Correct cache store superclass in comment [ci skip]
| * | | Correct cache store superclass in commentJonah Burke2015-08-191-1/+1
| | | |
* | | | Merge pull request #21279 from ronakjangir47/test_cleanupKasper Timm Hansen2015-08-205-45/+30
|\ \ \ \ | | | | | | | | | | Cleaned up generators tests using internal assertion helper
| * | | | Cleaned up generators tests using internal assertion helperRonak Jangir2015-08-205-45/+30
| | | | |
* | | | | Merge pull request #21132 from Andreis13/sprockets-4Rafael Mendonça França2015-08-199-22/+85
|\ \ \ \ \ | |_|/ / / |/| | | | Migrate to Sprockets 4.
| * | | | Migrate to Sprockets 4.Andrei Istratii2015-08-199-22/+85
|/ / / /
* | | | Merge pull request #21294 from maclover7/codeofconductGuillermo Iguaran2015-08-193-0/+9
|\ \ \ \ | | | | | | | | | | Add code of conduct info to README.md and to contributing guide
| * | | | Add code of conduct to README.md and to contributing guide [ci skip]maclover72015-08-183-0/+9
| | | | |
* | | | | Merge pull request #21292 from CoralineAda/cocDavid Heinemeier Hansson2015-08-191-0/+22
|\ \ \ \ \ | | | | | | | | | | | | Adds a code of conduct
| * | | | | Adds a code of conductCoralineAda2015-08-181-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An easy way to begin addressing the problem of inclusivity is to be overt in our openness, welcoming all people to contribute, and pledging in return to value them as human beings and to foster an atmosphere of kindness, cooperation, and understanding. A code of conduct is one way to express these values. It lets us pledge our respect and appreciation for contributors and participants to the project.
* | | | | | Merge pull request #21282 from sjain1107/added_docsYves Senn2015-08-191-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added docs for TableDefinition #coloumns & #remove_column [ci skip]
| * | | | | | Added docs for TableDefinition #coloumns & #remove_column [ci skip]sjain11072015-08-181-0/+3
| | | | | | |
* | | | | | | make the routes reader privateAaron Patterson2015-08-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nobody should be touching the routes hash without going through the NamedRouteCollection object.
* | | | | | | don't touch internalsAaron Patterson2015-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't be messing with the NamedRouteCollection internals. Just ask the object if the named route is in there.
* | | | | | | drop array allocations when building pathsAaron Patterson2015-08-182-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set ObjectSpace::AllocationTracer.setup(%i{path line type}) result = ObjectSpace::AllocationTracer.trace do 500.times do routes.resources :foo end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>99009} {:T_DATA=>100088} {:T_HASH=>122015} {:T_STRING=>159637} {:T_IMEMO=>363134} {:T_ARRAY=>433056} After: {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>91009} {:T_DATA=>100088} {:T_HASH=>114013} {:T_STRING=>159637} {:T_ARRAY=>321056} {:T_IMEMO=>351133} ```
* | | | | | | symbols will always be constructed with strings. :bomb:Aaron Patterson2015-08-181-1/+1
| | | | | | |
* | | | | | | drop string allocations for each resourceAaron Patterson2015-08-181-0/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eagerly calculate and cache the name of Symbol objects in the path AST. This drops about 26 string allocations per resource: ```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set ObjectSpace::AllocationTracer.setup(%i{path line type}) result = ObjectSpace::AllocationTracer.trace do 500.times do routes.resources :foo end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>99009} {:T_DATA=>116084} {:T_HASH=>122015} {:T_STRING=>172647} {:T_IMEMO=>371132} {:T_ARRAY=>433056} After: {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>99009} {:T_DATA=>100088} {:T_HASH=>122015} {:T_STRING=>159637} {:T_IMEMO=>363134} {:T_ARRAY=>433056} ```
* | | | | | Merge pull request #21110 from kamipo/mysql_json_supportRafael Mendonça França2015-08-1811-50/+258
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add a native JSON data type support in MySQL
| * | | | | Add a native JSON data type support in MySQLRyuta Kamizono2015-08-1811-50/+258
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of MySQL 5.7.8, MySQL supports a native JSON data type. Example: create_table :json_data_type do |t| t.json :settings end
* | | | | Merge pull request #21283 from ravindrakumawat/add_docs_for_pending_migrationYves Senn2015-08-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add Docs for ActiveRecord #check_pending [ci skip]
| * | | | | Add Docs for ActiveRecord #check_pending [ci skip]ravindra kumar kumawat2015-08-181-0/+1
| | | | | |
* | | | | | Merge pull request #21284 from prakashlaxkar/argument_error_testsYves Senn2015-08-182-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Correct error message in Standard American english and add a test cas…
| * | | | | | Correct error message in Standard American english and add a test case for ↵prakash2015-08-182-1/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | the same.
* | | | | | Remove unreached default valueRafael Mendonça França2015-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | verb_matcher never returns nil.
* | | | | | Merge pull request #21278 from byroot/try-arity-checkRafael Mendonça França2015-08-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use == 0 instead of .zero? in #try
| * | | | | | Use == 0 instead of .zero? in #tryJean Boussier2015-08-171-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The perf gain is relatively minor but consistent: ``` Calculating ------------------------------------- 0.zero? 137.091k i/100ms 1.zero? 137.350k i/100ms 0 == 0 142.207k i/100ms 1 == 0 144.724k i/100ms ------------------------------------------------- 0.zero? 8.893M (± 6.5%) i/s - 44.280M 1.zero? 8.751M (± 6.4%) i/s - 43.677M 0 == 0 10.033M (± 7.0%) i/s - 49.915M 1 == 0 9.814M (± 8.0%) i/s - 48.772M ``` And try! is quite a big hotspot for us so every little gain is appreciable.
* | | | | | use the strategy pattern to match request verbsAaron Patterson2015-08-172-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than building a regexp for every route, lets use the strategy pattern to select among objects that can match HTTP verbs. This commit introduces strategy objects for each verb that has a predicate method on the request object like `get?`, `post?`, etc. When we build the route object, look up the strategy for the verbs the user specified. If we can't find it, fall back on string matching. Using a strategy / null object pattern (the `All` VerbMatcher is our "null" object in this case) we can: 1) Remove conditionals 2) Drop boot time allocations 2) Drop run time allocations 3) Improve runtime performance Here is our boot time allocation benchmark: ```ruby require 'action_pack' require 'action_dispatch' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set result = ObjectSpace::AllocationTracer.trace do 500.times do routes.resources :foo end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: $ be ruby -rallocation_tracer route_test.rb {:T_SYMBOL=>11} {:T_REGEXP=>4017} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>99009} {:T_HASH=>122015} {:T_STRING=>216652} {:T_IMEMO=>355137} {:T_ARRAY=>441057} After: $ be ruby -rallocation_tracer route_test.rb {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>99009} {:T_HASH=>122015} {:T_STRING=>172647} {:T_IMEMO=>355136} {:T_ARRAY=>433056} ``` This benchmark adds 500 resources. Each resource has 8 routes, so it adds 4000 routes. You can see from the results that this patch eliminates 4000 Regexp allocations, ~44000 String allocations, and ~8000 Array allocations. With that, we can figure out that the previous code would allocate 1 regexp, 11 strings, and 2 arrays per route *more* than this patch in order to handle verb matching. Next lets look at runtime allocations: ```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set routes.resources :foo route = route_set.routes.first request = ActionDispatch::Request.new("REQUEST_METHOD" => "GET") result = ObjectSpace::AllocationTracer.trace do 500.times do route.matches? request end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: $ be ruby -rallocation_tracer route_test.rb {:T_MATCH=>500} {:T_STRING=>501} {:T_IMEMO=>1501} After: $ be ruby -rallocation_tracer route_test.rb {:T_IMEMO=>1001} ``` This benchmark runs 500 calls against the `matches?` method on the route object. We check this method in the case that there are two methods that match the same path, but they are differentiated by the verb (or other conditionals). For example `POST /users` vs `GET /users`, same path, different action. Previously, we were using regexps to match against the verb. You can see that doing the regexp match would allocate 1 match object and 1 string object each time it was called. This patch eliminates those allocations. Next lets look at runtime performance. ```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set routes.resources :foo route = route_set.routes.first match = ActionDispatch::Request.new("REQUEST_METHOD" => "GET") no_match = ActionDispatch::Request.new("REQUEST_METHOD" => "POST") Benchmark.ips do |x| x.report("match") do route.matches? match end x.report("no match") do route.matches? no_match end end __END__ Before: $ be ruby -rallocation_tracer runtime.rb Calculating ------------------------------------- match 17.145k i/100ms no match 24.244k i/100ms ------------------------------------------------- match 259.708k (± 4.3%) i/s - 1.303M no match 453.376k (± 5.9%) i/s - 2.279M After: $ be ruby -rallocation_tracer runtime.rb Calculating ------------------------------------- match 23.958k i/100ms no match 29.402k i/100ms ------------------------------------------------- match 465.063k (± 3.8%) i/s - 2.324M no match 691.956k (± 4.5%) i/s - 3.469M ``` This tests tries to see how many times it can match a request per second. Switching to method calls and string comparison makes the successful match case about 79% faster, and the unsuccessful case about 52% faster. That was fun!