Rails 5 upgrade #5982

matthewd · 2015-12-23T18:52:01Z

No description provided.

miq-bot · 2015-12-23T19:07:07Z

<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush.

Fryguy · 2015-12-23T19:32:15Z

app/models/cim_base_storage_extent.rb

@@ -1,7 +1,7 @@
 class CimBaseStorageExtent < ActsAsArModel
  set_columns_hash(CimStorageExtent.columns_hash.keys.each_with_object({}) { |c, h| h[c.to_sym] = CimStorageExtent.columns_hash[c].type })

-  def self._virtual_colums_hash
+  def self._virtual_columns_hash


I guess this code isn't being used 😉

Fryguy · 2015-12-23T19:45:54Z

Awesome work @matthewd ! Can any of this be extracted and used ahead of time ni the Rails 4 code base? I'm looking at things like the helper changes in the helper specs as an example.

cc @tenderlove

matthewd · 2015-12-23T20:35:10Z

Can any of this be extracted and used ahead of time in the Rails 4 code base?

Yeah.. I'll plan to extract a couple (like the helpers) which seem conflict-prone to keep separate. For most, even if they're 4.2-compatible, it shouldn't matter once I tame VirtualColumn and get this green.

jrafanie · 2015-12-23T20:37:30Z

Gemfile

@@ -4,8 +4,9 @@ eval_gemfile(File.expand_path("gems/pending/Gemfile", __dir__))
 # VMDB specific gems
 #

-gem "activerecord-deprecated_finders", "~>1.0.4",  :require => "active_record/deprecated_finders"
-gem "rails",                           "~>4.2.5"
+gem "rails",                           :git => "git://github.com/matthewd/rails.git", :branch => "actioncontroller-hax"


😨 Seems like a legit branch name

@jrafanie rails/rails#22734 😰

jrafanie · 2015-12-23T20:40:44Z

Gemfile

@@ -4,8 +4,9 @@ eval_gemfile(File.expand_path("gems/pending/Gemfile", __dir__))
 # VMDB specific gems
 #

-gem "activerecord-deprecated_finders", "~>1.0.4",  :require => "active_record/deprecated_finders"


Please tell me this is gone for real. 😍

I'm not sure I want deprecated_finders gone yet.
Is there a way we can bring these in for automate?

Or do we have a different plan?

jrafanie · 2015-12-23T20:48:25Z

app/models/rbac.rb

-      end
-    scope.where(cond_for_count).includes(includes).references(includes).count
+    if conditions && extra_target_ids
+      scope = scope.where(conditions).or(scope.where(:id => extra_target_ids))


I'd love to kill it off and switch to nice relations everwhere, but we're just not close enough to pull that off at the moment: e.g., these values get stored in the session.

In passing, set fixture_path, so we can use relative paths.

.. but it's not released yet, so we have to pull all its parts from git.

In the process, instead of maintaining a direct dependency on our method, pass the sequence range to rubyrep via config.

I'll clean them up, but at the moment, they're just overwhelming.

.. and remove some things for now

miq-bot · 2016-02-15T16:41:40Z

<github_pr_commenter_batch />Some comments on commits matthewd/manageiq@005f257~...9629756

Gemfile changes detected. /cc @JPrause @simaishi

miq-bot · 2016-02-15T16:41:51Z

Checked commits matthewd/manageiq@005f257~...9629756 with ruby 2.2.3, rubocop 0.34.2, and haml-lint 0.13.0
61 files checked, 64 offenses detected

Gemfile

🔶 - Line 22, Col 48 - Style/ExtraSpacing - Unnecessary spacing detected.
🔶 - Line 26, Col 49 - Style/ExtraSpacing - Unnecessary spacing detected.
🔶 - Line 62, Col 1 - Style/LeadingCommentSpace - Missing space after #.
🔹 - Line 22, Col 121 - Metrics/LineLength - Line is too long. [189/120]
🔹 - Line 34, Col 121 - Metrics/LineLength - Line is too long. [138/120]
🔹 - Line 50, Col 121 - Metrics/LineLength - Line is too long. [189/120]
🔹 - Line 51, Col 121 - Metrics/LineLength - Line is too long. [186/120]
🔹 - Line 92, Col 121 - Metrics/LineLength - Line is too long. [182/120]

app/controllers/application_controller.rb

🔶 - Line 348, Col 84 - Style/ExtraSpacing - Unnecessary spacing detected.
🔹 - Line 348, Col 121 - Metrics/LineLength - Line is too long. [127/120]

app/controllers/container_controller.rb

🔶 - Line 133, Col 98 - Style/ExtraSpacing - Unnecessary spacing detected.
🔹 - Line 133, Col 121 - Metrics/LineLength - Line is too long. [133/120]

app/controllers/mixins/vm_show_mixin.rb

🔶 - Line 33, Col 98 - Style/ExtraSpacing - Unnecessary spacing detected.
🔹 - Line 33, Col 121 - Metrics/LineLength - Line is too long. [133/120]

app/controllers/provider_foreman_controller.rb

🔶 - Line 392, Col 98 - Style/ExtraSpacing - Unnecessary spacing detected.
🔹 - Line 392, Col 121 - Metrics/LineLength - Line is too long. [133/120]

app/controllers/service_controller.rb

🔶 - Line 96, Col 98 - Style/ExtraSpacing - Unnecessary spacing detected.
🔹 - Line 96, Col 121 - Metrics/LineLength - Line is too long. [133/120]

app/models/ems_refresh/save_inventory_helper.rb

🔴 Warn - Line 105, Col 29 - Lint/ShadowingOuterLocalVariable - Shadowing outer local variable - r.

app/models/miq_expression.rb

🔶 - Line 918, Col 71 - Style/ClassCheck - Prefer Object#kind_of? over Object#is_a?.
🔶 - Line 923, Col 55 - Style/BlockDelimiters - Avoid using {...} for multi-line blocks.

app/models/miq_report/generator.rb

🔹 - Line 111, Col 35 - Metrics/BlockNesting - Avoid more than 3 levels of block nesting.
🔹 - Line 111, Col 121 - Metrics/LineLength - Line is too long. [184/120]

app/models/mixins/reserved_mixin.rb

🔶 - Line 17, Col 35 - Style/DoubleNegation - Avoid the use of double negation (!!).

app/models/vim_usage.rb

🔶 - Line 47, Col 9 - Style/LeadingCommentSpace - Missing space after #.
🔶 - Line 51, Col 11 - Style/LeadingCommentSpace - Missing space after #.
🔶 - Line 54, Col 11 - Style/LeadingCommentSpace - Missing space after #.

app/presenters/explorer_presenter.rb

🔹 - Line 195, Col 121 - Metrics/LineLength - Line is too long. [135/120]

config/environments/test.rb

🔶 - Line 12, Col 3 - Style/LeadingCommentSpace - Missing space after #.

lib/acts_as_ar_model.rb

🔶 - Line 65, Col 11 - Style/PredicateName - Rename has_attribute? to attribute?.

lib/extensions/ar_adapter/ar_dba/postgresql.rb

🔴 Warn - Line 17, Col 9 - Lint/UselessAssignment - Useless assignment to variable - data.

lib/extensions/ar_virtual.rb

🔶 - Line 104, Col 17 - Style/ClassCheck - Prefer Object#kind_of? over Object#is_a?.
🔶 - Line 124, Col 1 - Style/EmptyLinesAroundModuleBody - Extra empty line detected at module body beginning.
🔶 - Line 205, Col 5 - Style/SingleLineMethods - Avoid single-line method definitions.
🔶 - Line 270, Col 15 - Style/NegatedIf - Favor unless over if for negative conditions.
🔹 - Line 223, Col 5 - Metrics/CyclomaticComplexity - Cyclomatic complexity for remove_virtual_fields is too high. [8/6]
🔹 - Line 233, Col 121 - Metrics/LineLength - Line is too long. [122/120]

spec/controllers/catalog_controller_spec.rb

🔹 - Line 159, Col 121 - Metrics/LineLength - Line is too long. [137/120]

spec/controllers/miq_policy_controller_spec.rb

🔹 - Line 99, Col 121 - Metrics/LineLength - Line is too long. [134/120]

spec/lib/extensions/ar_to_model_hash_spec.rb

spec/lib/extensions/ar_virtual_spec.rb

spec/models/vmdb_database_spec.rb

🔶 - Line 80, Col 23 - Style/WordArray - Use %w or %W for array of words.

kbrock · 2016-02-15T18:42:14Z

app/models/miq_expression.rb

+    klass.predicate_builder.build_from_hash(cond).map { |b|
+      klass.connection.visitor.compile b
+    }.join(' AND ')
+  end


this is a nice compromise. this will help for now.

Rails 5 upgrade

chrisarcand · 2016-02-16T16:26:17Z

🎉 🎉 🎉

👏 @matthewd

matthewd added wip rails5 labels Dec 23, 2015

matthewd self-assigned this Dec 23, 2015

matthewd force-pushed the rails5 branch from 0c50ad3 to a5c2699 Compare December 23, 2015 19:07

miq-bot added the dependencies label Dec 23, 2015

Fryguy reviewed Dec 23, 2015
View reviewed changes

matthewd force-pushed the rails5 branch 2 times, most recently from 69e2a19 to 8e4f313 Compare December 23, 2015 20:32

jrafanie reviewed Dec 23, 2015
View reviewed changes

matthewd force-pushed the rails5 branch from 8e4f313 to b09f5e5 Compare December 23, 2015 20:39

jrafanie reviewed Dec 23, 2015
View reviewed changes

matthewd force-pushed the rails5 branch from b09f5e5 to 7d27008 Compare December 23, 2015 20:45

jrafanie reviewed Dec 23, 2015
View reviewed changes

Matthew Draper added 2 commits February 16, 2016 00:20

Only skip if we called protect_from_forgery

232881b

Restore hash support in merge_where_clauses

a72d4fe

I'd love to kill it off and switch to nice relations everwhere, but we're just not close enough to pull that off at the moment: e.g., these values get stored in the session.

matthewd force-pushed the rails5 branch 2 times, most recently from ad98650 to 2623547 Compare February 15, 2016 14:10

Matthew Draper added 13 commits February 16, 2016 01:23

Rails knows about petabytes now

9ac1930

Attempt to get rubyrep working with Rails 5

b203817

Brakeman can't detect Rails 5 yet, so it needs manual help

2b44f72

Always use fixture_file_upload, rather than manually constructing it

ca4d12a

In passing, set fixture_path, so we can use relative paths.

We need rspec-rails 3.5 for Rails 5 support

95c9fa2

.. but it's not released yet, so we have to pull all its parts from git.

New AR-internal table for us to ignore

e595e3b

Bump replication connection timeout

f01b6c5

Move ArRegion to ApplicationRecord

f1465a3

In the process, instead of maintaining a direct dependency on our method, pass the sequence range to rubyrep via config.

power_state is private; set raw_power_state instead

075ba3a

Associate VM with an EMS: we can't migrate an orphan

0c663c4

Reimplement virtual columns (& reflections) in a more Rails 5-ish way

22153f4

Silence deprecations for now

c9b0c25

I'll clean them up, but at the moment, they're just overwhelming.

Mangle gemfiles to temporarily use rails5-compatible forks

9629756

.. and remove some things for now

matthewd force-pushed the rails5 branch from 2623547 to 9629756 Compare February 15, 2016 16:22

kbrock reviewed Feb 15, 2016
View reviewed changes

Fryguy added a commit that referenced this pull request Feb 16, 2016

Merge pull request #5982 from matthewd/rails5

9b0e373

Rails 5 upgrade

Fryguy merged commit 9b0e373 into ManageIQ:master Feb 16, 2016

Fryguy added the core label Feb 16, 2016

Fryguy added this to the Sprint 37 Ending Mar 8, 2016 milestone Feb 16, 2016

Fryguy added the enhancement label Feb 16, 2016

simon3z mentioned this pull request Feb 16, 2016

MiqAeServiceModelBase.ar_method raised: private method `clear_association_cache' called #6723

Closed

NickLaMuro mentioned this pull request Jun 27, 2017

Move rails-controller-testing to :test group #15449

Merged

Fryguy mentioned this pull request Feb 15, 2021

Remove Radar code as it's no longer used #21052

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rails 5 upgrade #5982

Rails 5 upgrade #5982

matthewd commented Dec 23, 2015

miq-bot commented Dec 23, 2015

Fryguy Dec 23, 2015

jrafanie Dec 23, 2015

Fryguy commented Dec 23, 2015

matthewd commented Dec 23, 2015

jrafanie Dec 23, 2015

matthewd Dec 23, 2015

jrafanie Dec 23, 2015

kbrock Jan 28, 2016

jrafanie Dec 23, 2015

miq-bot commented Feb 15, 2016

miq-bot commented Feb 15, 2016

kbrock Feb 15, 2016

chrisarcand commented Feb 16, 2016

Rails 5 upgrade #5982

Rails 5 upgrade #5982

Conversation

matthewd commented Dec 23, 2015

miq-bot commented Dec 23, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fryguy commented Dec 23, 2015

matthewd commented Dec 23, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miq-bot commented Feb 15, 2016

miq-bot commented Feb 15, 2016

Choose a reason for hiding this comment

chrisarcand commented Feb 16, 2016