Merge pull request #1360 from tvdeyen/rails-5-2-deprecations

Get rid of Rails 5.2 deprecations

app/models/alchemy/attachment.rb

@@ -18,7 +18,7 @@
 #
 
 module Alchemy
-  class Attachment < ActiveRecord::Base
+  class Attachment < BaseRecord
     include Alchemy::Filetypes
     include Alchemy::NameConversions
     include Alchemy::Touching

app/models/alchemy/base_record.rb

@@ -0,0 +1,13 @@
+module Alchemy
+  def self.table_name_prefix
+    'alchemy_'
+  end
+
+  class BaseRecord < ActiveRecord::Base
+    self.abstract_class = true
+
+    def active_record_5_1?
+      ActiveRecord.gem_version >= Gem::Version.new('5.1.0')
+    end
+  end
+end

app/models/alchemy/cell.rb

@@ -24,7 +24,7 @@
 # Views for cells are inside the +app/views/cells+ folder in your project.
 #
 module Alchemy
-  class Cell < ActiveRecord::Base
+  class Cell < BaseRecord
     include Alchemy::Logger
 
     belongs_to :page, required: true

app/models/alchemy/content.rb

@@ -17,7 +17,7 @@
 #
 
 module Alchemy
-  class Content < ActiveRecord::Base
+  class Content < BaseRecord
     include Alchemy::Logger
     include Alchemy::Touching
     include Alchemy::Hints

app/models/alchemy/element.rb

@@ -21,7 +21,7 @@
 #
 
 module Alchemy
-  class Element < ActiveRecord::Base
+  class Element < BaseRecord
     include Alchemy::Logger
     include Alchemy::Touching
     include Alchemy::Hints

app/models/alchemy/essence_boolean.rb

@@ -15,7 +15,7 @@
 # Stores boolean values.
 # Provides a checkbox in the editor views.
 module Alchemy
-  class EssenceBoolean < ActiveRecord::Base
+  class EssenceBoolean < BaseRecord
     acts_as_essence ingredient_column: 'value'
   end
 end

app/models/alchemy/essence_date.rb

@@ -13,7 +13,7 @@
 #
 
 module Alchemy
-  class EssenceDate < ActiveRecord::Base
+  class EssenceDate < BaseRecord
     acts_as_essence ingredient_column: 'date'
 
     # Returns self.date for the Element#preview_text method.

app/models/alchemy/essence_file.rb

@@ -16,7 +16,7 @@
 #
 
 module Alchemy
-  class EssenceFile < ActiveRecord::Base
+  class EssenceFile < BaseRecord
     belongs_to :attachment, required: false
     acts_as_essence ingredient_column: 'attachment'
 

app/models/alchemy/essence_html.rb

@@ -13,7 +13,7 @@
 #
 
 module Alchemy
-  class EssenceHtml < ActiveRecord::Base
+  class EssenceHtml < BaseRecord
     acts_as_essence ingredient_column: 'source'
 
     # Returns the first x (default = 30) (HTML escaped) characters from self.source for the Element#preview_text method.

app/models/alchemy/essence_link.rb

@@ -16,7 +16,7 @@
 #
 
 module Alchemy
-  class EssenceLink < ActiveRecord::Base
+  class EssenceLink < BaseRecord
     acts_as_essence ingredient_column: 'link'
   end
 end

app/models/alchemy/essence_picture.rb

@@ -24,7 +24,7 @@
 #
 
 module Alchemy
-  class EssencePicture < ActiveRecord::Base
+  class EssencePicture < BaseRecord
     acts_as_essence ingredient_column: 'picture'
 
     belongs_to :picture, required: false

app/models/alchemy/essence_richtext.rb

@@ -15,7 +15,7 @@
 #
 
 module Alchemy
-  class EssenceRichtext < ActiveRecord::Base
+  class EssenceRichtext < BaseRecord
     acts_as_essence preview_text_column: 'stripped_body'
 
     before_save :strip_content

app/models/alchemy/essence_select.rb

@@ -14,7 +14,7 @@
 
 # Provides a select box that stores string values.
 module Alchemy
-  class EssenceSelect < ActiveRecord::Base
+  class EssenceSelect < BaseRecord
     acts_as_essence ingredient_column: 'value'
   end
 end

app/models/alchemy/essence_text.rb

@@ -18,7 +18,7 @@
 #
 
 module Alchemy
-  class EssenceText < ActiveRecord::Base
+  class EssenceText < BaseRecord
     acts_as_essence
   end
 end

app/models/alchemy/folded_page.rb

@@ -11,7 +11,7 @@
 #
 
 module Alchemy
-  class FoldedPage < ActiveRecord::Base
+  class FoldedPage < BaseRecord
     belongs_to :page, required: true
     belongs_to :user, required: true,
       class_name: Alchemy.user_class_name

app/models/alchemy/language.rb

@@ -21,7 +21,7 @@
 #
 
 module Alchemy
-  class Language < ActiveRecord::Base
+  class Language < BaseRecord
     belongs_to :site, required: true
     has_many :pages
 
@@ -47,10 +47,10 @@ class Language < ActiveRecord::Base
       if: -> { default_changed? && self != Language.default }
 
     after_update :set_pages_language,
-      if: -> { language_code_changed? || country_code_changed? }
+      if: :should_set_pages_language?
 
     after_update :unpublish_pages,
-      if: -> { changes[:public] == [true, false] }
+      if: :should_unpublish_pages?
 
     before_destroy :check_for_default
     after_destroy :delete_language_root_page
@@ -153,6 +153,14 @@ def remove_old_default
       lang.save(validate: false)
     end
 
+    def should_set_pages_language?
+      if active_record_5_1?
+        saved_change_to_language_code? || saved_change_to_country_code?
+      else
+        language_code_changed? || country_code_changed?
+      end
+    end
+
     def set_pages_language
       pages.update_all language_code: code
     end
@@ -165,6 +173,14 @@ def delete_language_root_page
       root_page.try(:destroy) && layout_root_page.try(:destroy)
     end
 
+    def should_unpublish_pages?
+      if active_record_5_1?
+        saved_changes[:public] == [true, false]
+      else
+        changes[:public] == [true, false]
+      end
+    end
+
     def unpublish_pages
       pages.update_all(public_on: nil, public_until: nil)
     end

app/models/alchemy/page.rb

@@ -37,7 +37,7 @@
 #
 
 module Alchemy
-  class Page < ActiveRecord::Base
+  class Page < BaseRecord
     include Alchemy::Hints
     include Alchemy::Logger
     include Alchemy::Touching
@@ -123,7 +123,7 @@ class Page < ActiveRecord::Base
       unless: :systempage?
 
     after_update :create_legacy_url,
-      if: :urlname_changed?,
+      if: :should_create_legacy_url?,
       unless: :redirects_to_external?
 
     # Concerns
@@ -483,9 +483,22 @@ def set_language_code
       self.language_code = language.code
     end
 
+    def should_create_legacy_url?
+      if active_record_5_1?
+        saved_change_to_urlname?
+      else
+        urlname_changed?
+      end
+    end
+
     # Stores the old urlname in a LegacyPageUrl
     def create_legacy_url
-      legacy_urls.find_or_create_by(urlname: urlname_was)
+      if active_record_5_1?
+        former_urlname = urlname_before_last_save
+      else
+        former_urlname = urlname_was
+      end
+      legacy_urls.find_or_create_by(urlname: former_urlname)
     end
 
     def set_published_at

app/models/alchemy/page/page_elements.rb

@@ -24,8 +24,12 @@ module Page::PageElements
         join_table: ElementToPage.table_name
 
       after_create :autogenerate_elements, unless: -> { systempage? || do_not_autogenerate }
-      after_update :trash_not_allowed_elements!, if: :page_layout_changed?
-      after_update :autogenerate_elements, if: :page_layout_changed?
+
+      after_update :trash_not_allowed_elements!,
+        if: :has_page_layout_changed?
+
+      after_update :autogenerate_elements,
+        if: :has_page_layout_changed?
     end
 
     module ClassMethods
@@ -276,6 +280,14 @@ def trash_not_allowed_elements!
       not_allowed_elements.to_a.map(&:trash!)
     end
 
+    def has_page_layout_changed?
+      if active_record_5_1?
+        saved_change_to_page_layout?
+      else
+        page_layout_changed?
+      end
+    end
+
     # Deletes unique and already present definitions from @_element_definitions.
     #
     def delete_unique_element_definitions!

app/models/alchemy/page/page_naming.rb

@@ -14,17 +14,21 @@ module Page::PageNaming
       validates :name,
         presence: true
       validates :urlname,
-        uniqueness: {scope: [:language_id, :layoutpage], if: 'urlname.present?'},
+        uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }},
         exclusion:  {in: RESERVED_URLNAMES},
-        length:     {minimum: 3, if: 'urlname.present?'},
+        length:     {minimum: 3, if: -> { urlname.present? }},
         format:     {with: /\A[:\.\w\-+_\/\?&%;=]*\z/, if: :redirects_to_external?}
       validates :urlname,
         on: :update,
         presence: {if: :redirects_to_external?}
 
-      before_save :set_title, if: 'title.blank?', unless: proc { systempage? || redirects_to_external? }
+      before_save :set_title,
+        unless: -> { systempage? || redirects_to_external? },
+        if: -> { title.blank? }
+
       after_update :update_descendants_urlnames,
-        if: -> { Config.get(:url_nesting) && (urlname_changed? || visible_changed?) }
+        if: :should_update_descendants_urlnames?
+
       after_move :update_urlname!,
         if: -> { Config.get(:url_nesting) },
         unless: :redirects_to_external?
@@ -70,6 +74,15 @@ def visible_ancestors
 
     private
 
+    def should_update_descendants_urlnames?
+      return false if !Config.get(:url_nesting)
+      if active_record_5_1?
+        saved_change_to_urlname? || saved_change_to_visible?
+      else
+        urlname_changed? || visible_changed?
+      end
+    end
+
     def update_descendants_urlnames
       reload
       descendants.each do |descendant|

app/models/alchemy/picture.rb

@@ -21,7 +21,7 @@
 #
 
 module Alchemy
-  class Picture < ActiveRecord::Base
+  class Picture < BaseRecord
     CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
 
     include Alchemy::NameConversions

app/models/alchemy/site.rb

@@ -15,7 +15,7 @@
 #
 
 module Alchemy
-  class Site < ActiveRecord::Base
+  class Site < BaseRecord
     # validations
     validates_presence_of :host
     validates_uniqueness_of :host

lib/alchemy/essence.rb

@@ -35,7 +35,7 @@ def acts_as_essence(options = {})
           attr_writer :validation_errors
           include Alchemy::Essence::InstanceMethods
           stampable stamper_class_name: Alchemy.user_class_name
-          validate :validate_ingredient, :on => :update, :if => 'validations.any?'
+          validate :validate_ingredient, on: :update, if: -> { validations.any? }
 
           has_one :content, :as => :essence, class_name: "Alchemy::Content"
           has_one :element, :through => :content, class_name: "Alchemy::Element"

spec/dummy/config/initializers/new_framework_defaults.rb

@@ -18,9 +18,6 @@
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = true
 
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
-
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }