Commit Graph

66708 Commits

Author SHA1 Message Date
Rafael França 3c1a8ee7d7
Merge pull request #30956 from CJStadler/with-lock-changed-deprecation
Fix deprecation warnings from with_lock
2018-03-28 13:11:01 -04:00
Yuji Yaginuma fe37da4ebf Bump rack-test to 1.0.0 2018-03-28 07:24:49 +09:00
Guillermo Iguaran 7b668e2d42
Merge pull request #32299 from davidstosik/expose-fk-ignore-pattern
Expose foreign key name ignore pattern in configuration
2018-03-27 11:41:12 -05:00
George Claghorn 1518457a67
Merge pull request #32317 from dwightwatson/32247
Flip the order of the after_create callbacks
2018-03-26 22:34:20 -04:00
Dwight Watson 8e8f09fa18 Flip the order of the after_create callbacks
Addresses rails/rails#32247

Add test that checks identify and analyze work in correct order

Break out direct upload test helper

Review changes for direct-upload test helper
2018-03-27 12:58:19 +11:00
Rafael França 9a9ef9639e
Merge pull request #32185 from nholden/human_readable_date_time_comparisons
Add `before?` and `after?` methods to date and time classes
2018-03-26 18:33:03 -04:00
Eileen M. Uchitelle 93e6b5c27b
Merge pull request #32274 from eileencodes/part-1-add-rake-tasks-for-multi-db
Part 1 Easy Multi db in Rails: Add basic rake tasks for multi db setup
2018-03-26 16:37:21 -04:00
Richard Schneeman 2baf1aaeb1
Merge pull request #32342 from iorme1/master
Readability fix [ci skip]
2018-03-25 15:15:14 -05:00
Isaac Orme 2273f5228a Readability fix [ci skip] 2018-03-25 13:02:11 -07:00
Andrew White 9232ba7119 Make engine check more explicit
Not everything that responds to `routes` is a Rails engine - for example
a Grape API endpoint will have a `routes` method but can't be used with
`assert_recognizes` as it doesn't respond to `recognize_path_with_request`.

Fixes #32312.
2018-03-25 11:07:26 +01:00
yuuji.yaginuma 8881d84369 Remove unused `serialize` method 2018-03-25 09:42:22 +09:00
Andrew White ff6d498704
Merge pull request #32306 from danhuynhdev/feature/store-accessor-prefix
Add custom prefix to ActiveRecord::Store accessors
2018-03-24 11:51:01 +00:00
Ryuta Kamizono 6aa5cf03ea Fix that `touch(:updated_at)` causes multiple assignments on the column
The multiple assignments was caused by 37a1dfa due to lost the `to_s`
normalization for given names.

Fixes #32323.
2018-03-23 10:05:54 +09:00
Tan Huynh 3f297be72b Add custom prefix to ActiveRecord::Store accessors
Add a prefix option to ActiveRecord::Store.store_accessor and
ActiveRecord::Store.store. This option allows stores to have identical keys
with different accessors.
2018-03-23 08:01:46 +07:00
Rafael França 57e145387b
Merge pull request #32315 from huacnlee/fix/local-cache-read-multi-entry-return
Fix Cache `read_multi` with local_cache bug, should returns raw value, not `ActiveSupport::Cache::Entry` instance.
2018-03-22 19:09:21 -04:00
Rafael França e26424a740
Merge pull request #32316 from rails/fix-non-ascii-static-file-serving
Use ASCII-8BIT paths in ActionDispatch::Static
2018-03-22 17:44:38 -04:00
Rafael Mendonça França ba4bdc536b
Remove unused variable 2018-03-22 17:43:48 -04:00
Rafael França e0783cc9f1
Merge pull request #32319 from yahonda/no_monkeypatch_for_ruby260
Ruby 2.6 will not require monkey patched `URI#unescape`
2018-03-22 17:39:35 -04:00
Yasuo Honda b40a729698 Ruby 2.6 will not require monkey patched `URI#unescape`
since revision 62897 234a30459c
2018-03-22 11:48:58 +00:00
David Stosik f6e612b272 Move fk_ignore_pattern from config.active_record to SchemaDumper
This makes more sense, as the foreign key ignore pattern is only used by
the schema dumper.
2018-03-22 10:12:58 +00:00
Andrew White 2ef1458833 Use ASCII-8BIT paths in ActionDispatch::Static
The rack gem returns PATH_INFO as an ASCII-8BIT encoded string but it
was being converted to US-ASCII by the match? method because it was
calling Rack::Utils.escape_path. To prevent incompatibile encoding
warnings use ASCII-8BIT strings for the root path and let Ruby handle
any filename encoding conversion.

Fixes #32294, Closes #32314.
2018-03-22 04:23:49 +00:00
Ryuta Kamizono 4c9c3ffc2e Merge pull request #31869 from BKSpurgeon/patch-1
[ci skip] Update Action Mailer Documentation
2018-03-22 07:07:33 +09:00
eileencodes 4e663c1e8d Refactor configs_for and friends
Moves the configs_for and DatabaseConfig struct into it's own file. I
was considering doing this in a future refactoring but our set up forced
me to move it now. You see there are `mattr_accessor`'s on the Core
module that have default settings. For example the `schema_format`
defaults to Ruby. So if I call `configs_for` or any methods in the Core
module it will reset the `schema_format` to `:ruby`. By moving it to
it's own class we can keep the logic contained and avoid this
unfortunate issue.

The second change here does a double loop over the yaml files. Bear with
me...

Our tests dictate that we need to load an environment before our rake
tasks because we could have something in an environment that the
database.yml depends on. There are side-effects to this and I think
there's a deeper bug that needs to be fixed but that's for another
issue. The gist of the problem is when I was creating the dynamic rake
tasks if the yaml that that rake task is calling evaluates code (like
erb) that calls the environment configs the code will blow up because
the environment is not loaded yet.

To avoid this issue we added a new method that simply loads the yaml and
does not evaluate the erb or anything in it. We then use that yaml to
create the task name. Inside the task name we can then call
`load_config` and load the real config to actually call the code
internal to the task. I admit, this is gross, but refactoring can't all
be pretty all the time and I'm working hard with `@tenderlove` to
refactor much more of this code to get to a better place re connection
management and rake tasks.
2018-03-21 16:54:24 -04:00
Kasper Timm Hansen 242ae67ebe
Use try in tests that try to test try. 2018-03-21 21:02:36 +01:00
Ryuta Kamizono 958c5ad9e9 Fix `test_config_another_database` failure
Somehow `test_config_another_database` didn't fail on CI, but it will
fail locally.

https://travis-ci.org/rails/rails/jobs/356212950#L2474-L2482

```
% bundle exec ruby -w -Itest test/generators/app_generator_test.rb -n test_config_another_database
Run options: -n test_config_another_database --seed 7260

# Running:

F

Failure:
AppGeneratorTest#test_config_another_database [test/generators/app_generator_test.rb:417]:
Expected /^\s*gem\s+["']mysql2["'], '~> 0.4.4'$*/ to match "source 'https://rubygems.org'\ngit_source(:github) { |repo| \"https://github.com/\#{repo}.git\" }\n\nruby '2.5.0'\n\n# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'\ngem 'rails', '~> 6.0.0.alpha'\n# Use mysql as the database for Active Record\ngem 'mysql2', '>= 0.4.4', '< 0.6.0'\n# Use Puma as the app server\ngem 'puma', '~> 3.11'\n# Use SCSS for stylesheets\ngem 'sass-rails', '~> 5.0'\n# Use Uglifier as compressor for JavaScript assets\ngem 'uglifier', '>= 1.3.0'\n# See https://github.com/rails/execjs#readme for more supported runtimes\n# gem 'mini_racer', platforms: :ruby\n\n# Use CoffeeScript for .coffee assets and views\ngem 'coffee-rails', '~> 4.2'\n# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks\ngem 'turbolinks', '~> 5'\n# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder\ngem 'jbuilder', '~> 2.5'\n# Use Redis adapter to run Action Cable in production\n# gem 'redis', '~> 4.0'\n# Use ActiveModel has_secure_password\n# gem 'bcrypt', '~> 3.1.7'\n\n# Use ActiveStorage variant\n# gem 'mini_magick', '~> 4.8'\n\n# Use Capistrano for deployment\n# gem 'capistrano-rails', group: :development\n\n# Reduces boot times through caching; required in config/boot.rb\ngem 'bootsnap', '>= 1.1.0', require: false\n\ngroup :development, :test do\n  # Call 'byebug' anywhere in the code to stop execution and get a debugger console\n  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]\nend\n\ngroup :development do\n  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.\n  gem 'web-console', '>= 3.3.0'\n  gem 'listen', '>= 3.0.5', '< 3.2'\n  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring\n  gem 'spring'\n  gem 'spring-watcher-listen', '~> 2.0.0'\nend\n\ngroup :test do\n  # Adds support for Capybara system testing and selenium driver\n  gem 'capybara', '>= 2.15', '< 4.0'\n  gem 'selenium-webdriver'\n  # Easy installation and use of chromedriver to run system tests with Chrome\n  gem 'chromedriver-helper'\nend\n\n# Windows does not include zoneinfo files, so bundle the tzinfo-data gem\ngem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]\n".

bin/rails test test/generators/app_generator_test.rb:411

Finished in 0.174681s, 5.7247 runs/s, 34.3483 assertions/s.
1 runs, 6 assertions, 1 failures, 0 errors, 0 skips
```
2018-03-22 03:20:04 +09:00
Ryuta Kamizono a481603480 Add `QueryingMethodsDelegationTest` to cover query methods delegation
It makes to ease to detect a future regression as long as the methods
are covered by this test.
2018-03-22 03:12:03 +09:00
Ryuta Kamizono 57996716d7
Merge pull request #32221 from composerinteralia/batch-predicate-builder
Use PredicateBuilder for bind params in Relation::Batches
2018-03-22 03:09:46 +09:00
Ryuta Kamizono 98224f8219
Merge pull request #32253 from zwass/before_action_docs
Add cancellation info to before filter docs

[ci skip]
2018-03-22 03:03:23 +09:00
eileencodes bb9e5540c8 Add tests for new rake tasks 2018-03-21 14:00:58 -04:00
eileencodes 0f0aa6a275 Update schema/structure dump tasks for multi db
Adds the ability to dump the schema or structure files for mulitple
databases. Loops through the configs for a given env and sets a filename
based on the format, then establishes a connection for that config and
dumps into the file.
2018-03-21 14:00:58 -04:00
eileencodes 5eb4488d02 Add ability to create/drop/migrate all dbs for a given env
`each_current_configuration` is used by create, drop, and other methods
to find the configs for a given environment and returning those to the
method calling them.

The change here allows for the database commands to operate on all the
configs in the environment. Previously we couldn't slice the hashes and
iterate over them becasue they could be two tier or could be three
tier. By using the database config structs we don't need to care whether
we're dealing with a three tier or two tier, we can just parse all the
configs based on the environment.

This makes it possible for us to run `bin/rails db:create` and it will
create all the configs for the dev and test environment ust like it does
for a two tier - it creates the db for dev and test. Now `db:create`
will create `primary` for dev and test, and `animals` for dev and test
if our database.yml looks like:

```
development:
  primary:
    etc
  animals:
    etc

test:
  primary:
    etc
  animals:
    etc
```

This means that `bin/rails db:create`, `bin/rails db:drop`, and
`bin/rails db:migrate` will operate on the dev and test env for both
primary and animals ds.
2018-03-21 14:00:58 -04:00
Ryuta Kamizono 7e06d9cb2c
Merge pull request #32310 from sodabrew/mysql2-0.4-0.5
Support mysql2 0.4.x and 0.5.x
2018-03-22 02:58:57 +09:00
eileencodes d79d6867a2 Add create/drop/migrate db tasks for each database in the environment
If we have a three-tier yaml file like this:

```
development:
  primary:
    database: "development"
  animals:
    database: "development_animals"
    migrations_paths: "db/animals_migrate"
```

This will add db create/drop/and migrate tasks for each level of the
config under that environment.

```
bin/rails db:drop:primary
bin/rails db:drop:animals

bin/rails db:create:primary
bin/rails db:create:animals

bin/rails db:migrate:primary
bin/rails db:migrate:animals
```
2018-03-21 13:53:24 -04:00
eileencodes 1756094b22 Add DatabaseConfig Struct and associated methods
Passing around and parsing hashes is easy if you know that it's a two
tier config and each key will be named after the environment and each
value will be the config for that environment key.

This falls apart pretty quickly with three-tier configs. We have no idea
what the second tier will be named (we know the first is primary but we
don't know the second), we have no easy way of figuring out
how deep a hash we have without iterating over it, and we'd have to do
this a lot throughout the code since it breaks all of Active Record's
assumptions regarding configurations.

These methods allow us to pass around objects instead. This will allow
us to more easily parse the configs for the rake tasks. Evenually I'd
like to replace the Active Record connection management that passes
around config hashes to use these methods as well but that's much
farther down the road.

`walk_configs` takes an environment, specification name, and a config
and turns them into DatabaseConfig struct objects so we can ask the
configs questions like:

```
db_config.spec_name
=> animals

db_config.env_name
=> development

db_config.config
{ :adapter => mysql etc }
```

`db_configs` loops through all given configurations and returns an array
of DatabaseConfig structs for each config in the yaml file.

and lastly `configs_for` takes an environment and either returns the
spec name and config if a block is given or returns an array of
DatabaseConfig structs just for the given environment.
2018-03-21 13:53:24 -04:00
Andrew White 627ef06331 Update loofah to mitigate CVE-2018-8048
See flavorjones/loofah#144
2018-03-21 16:48:47 +00:00
Eileen M. Uchitelle 3791180d77
Merge pull request #32293 from dzirtusss/fix-system-tests-transactions
Fix system tests transactions not closed between examples
2018-03-21 09:38:52 -04:00
Andrew White 5368f25086 Cache url helpers module
The urls helpers module returned by Rails.application.routes.url_helpers
isn't cached so to prevent the cost of building the module cache it locally.
2018-03-21 10:22:14 +00:00
Aaron Stone 9f5477af93 Support mysql2 0.4.x and 0.5.x 2018-03-20 23:38:00 -07:00
Jason Lee 4e13a364a6 Fix Cache `read_multi` with local_cache return values.
It should returns raw value, not instance of `ActiveSupport::Cache::Entry`.
2018-03-21 14:16:00 +08:00
David Stosik 87194b736e Test config.active_record.fk_ignore_pattern 2018-03-20 19:12:36 +00:00
David Stosik 864e500817 Document config.active_record.fk_ignore_pattern 2018-03-20 18:08:11 +00:00
Rafael Mendonça França fab6ded8f2
Allow any version of dalli less them 2.7.7 2018-03-20 11:58:14 -04:00
Andrew White 09656debe6
Merge pull request #32305 from q-centrix/perf-improvement-translation-helper
Memoize the result of gsubbing @virtual_path
2018-03-20 15:42:31 +00:00
Dillon Welch 05eaa07627 Memoize the result of gsubbing @virtual_path
This gets called many times for each virtual_path, creating a new string
each time that `translate` is called. We can memoize this so that it
only happens once per virtual_path instead.
2018-03-20 07:26:14 -07:00
Andrew White c7cbc2e3a0
Merge pull request #32302 from q-centrix/perf-improvement-tag-name
Interpolate '' instead of nil when multiple is false.
2018-03-20 14:17:35 +00:00
Dillon Welch 8e095d699e Interpolate '' instead of nil when multiple is false.
"my string #{nil}" results in an additional '' string allocation, I'm
guessing because the nil has to be converted to a string.

"my string #{'[]' if multiple}" results in "my string #{nil}" if
multiple is false. Doing "my string #{''}" does not result in an extra
string allocation. I moved the if multiple logic into a method so I only
had to make the change once.

```ruby
begin
  require "bundler/inline"
rescue LoadError => e
  $stderr.puts "Bundler version 1.10 or later is required. Please update
                your Bundler"
  raise e
end

gemfile(true) do
  source "https://rubygems.org"

  gem "benchmark-ips"
  gem "rails"
end

def allocate_count
  GC.disable
  before = ObjectSpace.count_objects
  yield
  after = ObjectSpace.count_objects
  after.each { |k,v| after[k] = v - before[k] }
  after[:T_HASH] -= 1 # probe effect - we created the before hash.
  GC.enable
  result = after.reject { |k,v| v == 0 }
  GC.start
  result
end

@html_options = {}

def master_version(multiple=nil)
  "hi#{"[]" if multiple}"
end

def fast_version(multiple=nil)
  str = multiple ? "[]" : ''
  "hi#{str}"
end

def test
  puts "master_version"
  puts allocate_count { 1000.times { master_version } }
  puts "master_version with arg"
  puts allocate_count { 1000.times { master_version(' there') } }
  puts "fast_version"
  puts allocate_count { 1000.times { fast_version } }
  puts "fast_version with arg"
  puts allocate_count { 1000.times { fast_version(' there') } }

  Benchmark.ips do |x|
    x.report("master_version") { master_version }
    x.report("master_version with arg") { master_version(' there') }
    x.report("fast_version")     { fast_version }
    x.report("fast_version with arg")     { fast_version(' there') }
    x.compare!
  end
end

test
```

results:
```ruby
master_version
{:FREE=>-1981, :T_STRING=>2052}
master_version with arg
{:FREE=>-1001, :T_STRING=>1000}
fast_version
{:FREE=>-1001, :T_STRING=>1000}
fast_version with arg
{:FREE=>-1001, :T_STRING=>1000}
Warming up --------------------------------------
      master_version   138.851k i/100ms
master_version with arg
                       164.029k i/100ms
        fast_version   165.737k i/100ms
fast_version with arg
                       167.016k i/100ms
Calculating -------------------------------------
      master_version      2.464M (±14.7%) i/s -     11.941M in   5.023307s
master_version with arg
                          3.754M (± 8.5%) i/s -     18.699M in   5.021354s
        fast_version      3.449M (±11.7%) i/s -     17.071M in   5.033312s
fast_version with arg
                          3.636M (± 6.9%) i/s -     18.205M in   5.034792s

Comparison:
master_version with arg:  3753896.1 i/s
fast_version with arg:  3636094.5 i/s - same-ish: difference falls within error
        fast_version:  3448766.2 i/s - same-ish: difference falls within error
      master_version:  2463857.3 i/s - 1.52x  slower
```
2018-03-20 06:30:03 -07:00
Javan Makhmali 7f71a6a6e3
Merge pull request #32282 from javan/fix-digesting-mixed-formats
Fix digesting templates with mixed formats
2018-03-20 07:36:26 -04:00
Javan Makhmali f4eb2e23a8 Fix digesting templates with mixed formats 2018-03-20 06:33:20 -04:00
Rafael França 9d9f752661
Merge pull request #32300 from albertoalmagro/albertoalmagro/remove-outdated-todo
ActiveJob: Remove support for Qu gem.
2018-03-19 17:47:23 -04:00
Alberto Almagro 6ef720791d Remove support for Qu gem.
Reasons are that the Qu gem wasn't compatible since Rails 5.1,
gem development was stopped in 2014 and maintainers have
confirmed its demise. See issue #32273
2018-03-19 21:27:16 +01:00