deep_cloneable 2.4.0 → 3.0.0

data/gemfiles/5.0.gemfile

@@ -1,16 +1,16 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "activerecord", "~> 5.0.0"
-gem "highline", "~> 1.6.0", :group => :test
-gem "rake", "~> 10.4", :group => :test
-gem "rack", "~> 1.6", :group => :test
-gem "git", "~> 1.2.9", :group => :test
-gem "minitest", :group => :test
-gem "appraisal", :group => :test
-gem "sqlite3", :group => :test
-gem "rdoc", ">= 2.4.2", "< 6", :group => :test
-gem "nokogiri", "~> 1.5.0", :group => :test
-gem "jeweler", :group => :test
-gem "i18n", "~> 0.7.0"
+gem 'activerecord', '~> 5.0.0'
+gem 'appraisal', :group => :test
+gem 'git', '~> 1.2.9', :group => :test
+gem 'highline', '~> 1.6.0', :group => :test
+gem 'i18n', '~> 0.7.0'
+gem 'jeweler', :group => :test
+gem 'minitest', :group => :test
+gem 'nokogiri', '~> 1.5.0', :group => :test
+gem 'rack', '~> 1.6', :group => :test
+gem 'rake', '~> 10.4', :group => :test
+gem 'rdoc', '>= 2.4.2', '< 6', :group => :test
+gem 'sqlite3', :group => :test

data/gemfiles/5.1.gemfile

@@ -1,16 +1,16 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "activerecord", "~> 5.1.0"
-gem "highline", "~> 1.6.0", :group => :test
-gem "rake", "~> 10.4", :group => :test
-gem "rack", "~> 1.6", :group => :test
-gem "git", "~> 1.2.9", :group => :test
-gem "minitest", :group => :test
-gem "appraisal", :group => :test
-gem "sqlite3", :group => :test
-gem "rdoc", ">= 2.4.2", "< 6", :group => :test
-gem "nokogiri", "~> 1.5.0", :group => :test
-gem "jeweler", :group => :test
-gem "i18n", "~> 0.7.0"
+gem 'activerecord', '~> 5.1.0'
+gem 'appraisal', :group => :test
+gem 'git', '~> 1.2.9', :group => :test
+gem 'highline', '~> 1.6.0', :group => :test
+gem 'i18n', '~> 0.7.0'
+gem 'jeweler', :group => :test
+gem 'minitest', :group => :test
+gem 'nokogiri', '~> 1.5.0', :group => :test
+gem 'rack', '~> 1.6', :group => :test
+gem 'rake', '~> 10.4', :group => :test
+gem 'rdoc', '>= 2.4.2', '< 6', :group => :test
+gem 'sqlite3', :group => :test

data/gemfiles/5.2.gemfile

@@ -1,15 +1,15 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "activerecord", "~> 5.2.0"
-gem "highline", "~> 1.6.0", :group => :test
-gem "rake", "~> 10.4", :group => :test
-gem "rack", "~> 1.6", :group => :test
-gem "git", "~> 1.2.9", :group => :test
-gem "minitest", :group => :test
-gem "appraisal", :group => :test
-gem "sqlite3", :group => :test
-gem "rdoc", ">= 2.4.2", "< 6", :group => :test
-gem "nokogiri", "~> 1.5.0", :group => :test
-gem "jeweler", :group => :test
+gem 'activerecord', '~> 5.2.0'
+gem 'appraisal', :group => :test
+gem 'git', '~> 1.2.9', :group => :test
+gem 'highline', '~> 1.6.0', :group => :test
+gem 'jeweler', :group => :test
+gem 'minitest', :group => :test
+gem 'nokogiri', '~> 1.5.0', :group => :test
+gem 'rack', '~> 1.6', :group => :test
+gem 'rake', '~> 10.4', :group => :test
+gem 'rdoc', '>= 2.4.2', '< 6', :group => :test
+gem 'sqlite3', :group => :test

data/gemfiles/6.0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0.beta3'
+gem 'appraisal', :group => :test
+gem 'git', '~> 1.2.9', :group => :test
+gem 'highline', '~> 1.6.0', :group => :test
+gem 'jeweler', :group => :test
+gem 'minitest', :group => :test
+gem 'nokogiri', '~> 1.5.0', :group => :test
+gem 'rack', '~> 1.6', :group => :test
+gem 'rake', '~> 10.4', :group => :test
+gem 'rdoc', '>= 2.4.2', '< 6', :group => :test
+gem 'sqlite3', :group => :test

data/gemfiles/6.0.gemfile.lock

@@ -0,0 +1,91 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activerecord (6.0.0.beta3)
+      activemodel (= 6.0.0.beta3)
+      activesupport (= 6.0.0.beta3)
+    activesupport (6.0.0.beta3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 1.3, >= 1.3.1)
+    addressable (2.4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (1.6.21)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.9)
+      builder
+      bundler
+      git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
+      rake
+      rdoc
+      semver2
+    jwt (2.1.0)
+    mime-types (2.99.3)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.5.11)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.1.0)
+    rack (1.6.11)
+    rake (10.5.0)
+    rdoc (5.1.0)
+    semver2 (3.4.2)
+    sqlite3 (1.4.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    zeitwerk (1.4.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 6.0.0.beta3)
+  appraisal
+  git (~> 1.2.9)
+  highline (~> 1.6.0)
+  jeweler
+  minitest
+  nokogiri (~> 1.5.0)
+  rack (~> 1.6)
+  rake (~> 10.4)
+  rdoc (>= 2.4.2, < 6)
+  sqlite3
+
+BUNDLED WITH
+   1.17.3

data/init.rb

@@ -1 +1 @@
-require 'deep_cloneable'
+require 'deep_cloneable'

data/lib/deep_cloneable.rb

@@ -1,215 +1,16 @@
 require 'active_record'
+require 'active_support/lazy_load_hooks'
+require 'active_support/core_ext/array/wrap'
 
-class ActiveRecord::Base
-  module DeepCloneable
-    # Deep dups an ActiveRecord model. See README.rdoc
-    def deep_clone(*args, &block)
-      options = args[0] || {}
+require 'deep_cloneable/association_not_found_exception'
+require 'deep_cloneable/skip_validations'
+require 'deep_cloneable/deep_clone'
 
-      dictionary = options[:dictionary]
-      dictionary ||= {} if options.delete(:use_dictionary)
-
-      kopy = if dictionary
-               find_in_dictionary_or_dup(dictionary)
-             else
-               dup
-             end
-
-      yield(self, kopy) if block
-
-      deep_exceptions = {}
-      if options[:except]
-        exceptions = array_wrap(options[:except])
-        exceptions.each do |attribute|
-          dup_default_attribute_value_to(kopy, attribute, self) unless attribute.is_a?(Hash)
-        end
-        deep_exceptions = exceptions.select { |e| e.is_a?(Hash) }.inject({}) { |m, h| m.merge(h) }
-      end
-
-      deep_onlinesses = {}
-      if options[:only]
-        onlinesses = array_wrap(options[:only])
-        object_attrs = kopy.attributes.keys.collect(&:to_sym)
-        exceptions = object_attrs - onlinesses
-        exceptions.each do |attribute|
-          dup_default_attribute_value_to(kopy, attribute, self) unless attribute.is_a?(Hash)
-        end
-        deep_onlinesses = onlinesses.select { |e| e.is_a?(Hash) }.inject({}) { |m, h| m.merge(h) }
-      end
-
-      if options[:include]
-        normalized_includes_list(options[:include]).each do |association, conditions_or_deep_associations|
-          conditions = {}
-
-          if association.is_a? Hash
-            conditions_or_deep_associations = association[association.keys.first]
-            association = association.keys.first
-          end
-
-          if conditions_or_deep_associations.is_a?(Hash)
-            conditions_or_deep_associations = conditions_or_deep_associations.dup
-            conditions[:if]     = conditions_or_deep_associations.delete(:if)     if conditions_or_deep_associations[:if]
-            conditions[:unless] = conditions_or_deep_associations.delete(:unless) if conditions_or_deep_associations[:unless]
-          elsif conditions_or_deep_associations.is_a?(Array)
-            conditions_or_deep_associations = conditions_or_deep_associations.dup
-            conditions_or_deep_associations.delete_if { |entry| conditions.merge!(entry) if entry.is_a?(Hash) && (entry.key?(:if) || entry.key?(:unless)) }
-          end
-
-          dup_options = {}
-          dup_options[:include] = conditions_or_deep_associations if conditions_or_deep_associations.present?
-          dup_options[:except] = deep_exceptions[association] if deep_exceptions[association]
-          dup_options[:only] = deep_onlinesses[association] if deep_onlinesses[association]
-          dup_options[:dictionary] = dictionary if dictionary
-          dup_options[:skip_missing_associations] = options[:skip_missing_associations] if options[:skip_missing_associations]
-
-          if (association_reflection = self.class.reflect_on_association(association))
-            if options[:validate] == false
-              kopy.instance_eval do
-                # Force :validate => false on all saves.
-                def perform_validations(options = {})
-                  options[:validate] = false
-                  super(options)
-                end
-              end
-            end
-
-            association_type = association_reflection.macro
-            association_type = "#{association_type}_through" if association_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
-
-            duped_object = send(
-              "dup_#{association_type}_association",
-              { :reflection => association_reflection, :association => association, :copy => kopy, :conditions => conditions, :dup_options => dup_options },
-              &block
-            )
-
-            kopy.send("#{association}=", duped_object)
-          elsif !options[:skip_missing_associations]
-            raise AssociationNotFoundException, "#{self.class}##{association}"
-          end
-        end
-      end
-
-      kopy
-    end
-
-    protected
-
-    def find_in_dictionary_or_dup(dictionary, dup_on_miss = true)
-      tableized_class = self.class.name.tableize.to_sym
-      dictionary[tableized_class] ||= {}
-      dict_val = dictionary[tableized_class][self]
-      dict_val.nil? && dup_on_miss ? dictionary[tableized_class][self] = dup : dict_val
-    end
-
-    private
-
-    def dup_belongs_to_association(options, &block)
-      object = deep_cloneable_object_for(options[:association], options[:conditions])
-      object && object.deep_clone(options[:dup_options], &block)
-    end
-
-    def dup_has_one_association(options, &block)
-      dup_belongs_to_association options, &block
-    end
-
-    def dup_has_many_association(options, &block)
-      foreign_key = options[:reflection].foreign_key.to_s
-      reverse_association = find_reverse_association(options[:reflection], foreign_key, :belongs_to)
-      objects = deep_cloneable_objects_for(options[:association], options[:conditions])
-
-      objects.map do |object|
-        object = object.deep_clone(options[:dup_options], &block)
-        object.send("#{foreign_key}=", nil)
-        object.send("#{reverse_association.name}=", options[:copy]) if reverse_association
-        object
-      end
-    end
-
-    def dup_has_one_through_association(options, &block)
-      foreign_key = options[:reflection].through_reflection.foreign_key.to_s
-      reverse_association = find_reverse_association(options[:reflection], foreign_key, :has_one, :association_foreign_key)
-
-      object = deep_cloneable_object_for(options[:association], options[:conditions])
-      object && process_joined_object_for_deep_clone(object, options.merge(:reverse_association => reverse_association), &block)
-    end
-
-    def dup_has_many_through_association(options, &block)
-      foreign_key = options[:reflection].through_reflection.foreign_key.to_s
-      reverse_association = find_reverse_association(options[:reflection], foreign_key, :has_many, :association_foreign_key)
-
-      objects = deep_cloneable_objects_for(options[:association], options[:conditions])
-      objects.map { |object| process_joined_object_for_deep_clone(object, options.merge(:reverse_association => reverse_association), &block) }
-    end
-
-    def dup_has_and_belongs_to_many_association(options, &block)
-      foreign_key = options[:reflection].foreign_key.to_s
-      reverse_association = find_reverse_association(options[:reflection], foreign_key, :has_and_belongs_to_many, :association_foreign_key)
-
-      objects = deep_cloneable_objects_for(options[:association], options[:conditions])
-      objects.map { |object| process_joined_object_for_deep_clone(object, options.merge(:reverse_association => reverse_association), &block) }
-    end
-
-    def find_reverse_association(source_reflection, primary_key_name, macro, matcher = :foreign_key)
-      if source_reflection.inverse_of.present?
-        source_reflection.inverse_of
-      else
-        source_reflection.klass.reflect_on_all_associations.detect do |reflection|
-          reflection != source_reflection && (macro.nil? || reflection.macro == macro) && (reflection.send(matcher).to_s == primary_key_name)
-        end
-      end
-    end
-
-    def deep_cloneable_object_for(single_association, conditions)
-      object = send(single_association)
-      evaluate_conditions(object, conditions) && object
-    end
-
-    def deep_cloneable_objects_for(many_association, conditions)
-      send(many_association).select { |object| evaluate_conditions(object, conditions) }
-    end
-
-    def process_joined_object_for_deep_clone(object, options, &block)
-      if (dictionary = options[:dup_options][:dictionary]) && object.find_in_dictionary_or_dup(dictionary, false)
-        object = object.deep_clone(options[:dup_options], &block)
-      elsif options[:reverse_association]
-        object.send(options[:reverse_association].name).target << options[:copy]
-      end
-      object
-    end
-
-    def evaluate_conditions(object, conditions)
-      conditions.none? || (conditions[:if] && conditions[:if].call(object)) || (conditions[:unless] && !conditions[:unless].call(object))
-    end
-
-    def dup_default_attribute_value_to(kopy, attribute, origin)
-      kopy[attribute] = origin.class.column_defaults.dup[attribute.to_s]
-    end
-
-    def normalized_includes_list(includes)
-      list = []
-      Array(includes).each do |item|
-        if item.is_a?(Hash) && item.size > 1
-          item.each { |key, value| list << { key => value } }
-        else
-          list << item
-        end
-      end
-
-      list
-    end
-
-    def array_wrap(object)
-      if object.respond_to?(:to_ary)
-        object.to_ary || [object]
-      else
-        [object]
-      end
-    end
-
-    class AssociationNotFoundException < StandardError; end
+module DeepCloneable
+end
 
-    ActiveRecord::Base.class_eval { protected :initialize_dup } if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
-  end
+ActiveSupport.on_load :active_record do
+  protected :initialize_dup if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
 
-  include DeepCloneable
+  include DeepCloneable::DeepClone
 end

data/lib/deep_cloneable/association_not_found_exception.rb

@@ -0,0 +1,4 @@
+module DeepCloneable
+  class AssociationNotFoundException < StandardError
+  end
+end

data/lib/deep_cloneable/deep_clone.rb

@@ -0,0 +1,194 @@
+module DeepCloneable
+  module DeepClone
+    # Deep dups an ActiveRecord model. See README.rdoc
+    def deep_clone(*args, &block)
+      options = args[0] || {}
+
+      dictionary = options[:dictionary]
+      dictionary ||= {} if options.delete(:use_dictionary)
+
+      kopy = if dictionary
+               find_in_dictionary_or_dup(dictionary)
+             else
+               dup
+             end
+
+      deep_exceptions = {}
+      if options[:except]
+        exceptions = Array.wrap(options[:except])
+        exceptions.each do |attribute|
+          dup_default_attribute_value_to(kopy, attribute, self) unless attribute.is_a?(Hash)
+        end
+        deep_exceptions = exceptions.select { |e| e.is_a?(Hash) }.inject({}) { |m, h| m.merge(h) }
+      end
+
+      deep_onlinesses = {}
+      if options[:only]
+        onlinesses = Array.wrap(options[:only])
+        object_attrs = kopy.attributes.keys.collect(&:to_sym)
+        exceptions = object_attrs - onlinesses
+        exceptions.each do |attribute|
+          dup_default_attribute_value_to(kopy, attribute, self) unless attribute.is_a?(Hash)
+        end
+        deep_onlinesses = onlinesses.select { |e| e.is_a?(Hash) }.inject({}) { |m, h| m.merge(h) }
+      end
+
+      kopy.instance_eval { extend ::DeepCloneable::SkipValidations } if options[:validate] == false
+
+      if options[:include]
+        normalized_includes_list(options[:include]).each do |association, conditions_or_deep_associations|
+          conditions = {}
+
+          if association.is_a? Hash
+            conditions_or_deep_associations = association[association.keys.first]
+            association = association.keys.first
+          end
+
+          if conditions_or_deep_associations.is_a?(Hash)
+            conditions_or_deep_associations = conditions_or_deep_associations.dup
+            conditions[:if]     = conditions_or_deep_associations.delete(:if)     if conditions_or_deep_associations[:if]
+            conditions[:unless] = conditions_or_deep_associations.delete(:unless) if conditions_or_deep_associations[:unless]
+          elsif conditions_or_deep_associations.is_a?(Array)
+            conditions_or_deep_associations = conditions_or_deep_associations.dup
+            conditions_or_deep_associations.delete_if { |entry| conditions.merge!(entry) if entry.is_a?(Hash) && (entry.key?(:if) || entry.key?(:unless)) }
+          end
+
+          dup_options = {}
+          dup_options[:include] = conditions_or_deep_associations if conditions_or_deep_associations.present?
+          dup_options[:except] = deep_exceptions[association] if deep_exceptions[association]
+          dup_options[:only] = deep_onlinesses[association] if deep_onlinesses[association]
+          dup_options[:dictionary] = dictionary if dictionary
+
+          [:skip_missing_associations, :validate].each do |option|
+            dup_options[option] = options[option] if options.key?(option)
+          end
+
+          if (association_reflection = self.class.reflect_on_association(association))
+            association_type = association_reflection.macro
+            association_type = "#{association_type}_through" if association_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
+
+            duped_object = send(
+              "dup_#{association_type}_association",
+              { :reflection => association_reflection, :association => association, :copy => kopy, :conditions => conditions, :dup_options => dup_options },
+              &block
+            )
+
+            kopy.send("#{association}=", duped_object)
+          elsif !options[:skip_missing_associations]
+            raise ::DeepCloneable::AssociationNotFoundException, "#{self.class}##{association}"
+          end
+        end
+      end
+
+      yield(self, kopy) if block
+
+      kopy
+    end
+
+    protected
+
+    def find_in_dictionary_or_dup(dictionary, dup_on_miss = true)
+      tableized_class = self.class.name.tableize.to_sym
+      dictionary[tableized_class] ||= {}
+      dict_val = dictionary[tableized_class][self]
+      dict_val.nil? && dup_on_miss ? dictionary[tableized_class][self] = dup : dict_val
+    end
+
+    private
+
+    def dup_belongs_to_association(options, &block)
+      object = deep_cloneable_object_for(options[:association], options[:conditions])
+      object && object.deep_clone(options[:dup_options], &block)
+    end
+
+    def dup_has_one_association(options, &block)
+      dup_belongs_to_association options, &block
+    end
+
+    def dup_has_many_association(options, &block)
+      foreign_key = options[:reflection].foreign_key.to_s
+      reverse_association = find_reverse_association(options[:reflection], foreign_key, :belongs_to)
+      objects = deep_cloneable_objects_for(options[:association], options[:conditions])
+
+      objects.map do |object|
+        object = object.deep_clone(options[:dup_options], &block)
+        object.send("#{foreign_key}=", nil)
+        object.send("#{reverse_association.name}=", options[:copy]) if reverse_association
+        object
+      end
+    end
+
+    def dup_has_one_through_association(options, &block)
+      foreign_key = options[:reflection].through_reflection.foreign_key.to_s
+      reverse_association = find_reverse_association(options[:reflection], foreign_key, :has_one, :association_foreign_key)
+
+      object = deep_cloneable_object_for(options[:association], options[:conditions])
+      object && process_joined_object_for_deep_clone(object, options.merge(:reverse_association => reverse_association), &block)
+    end
+
+    def dup_has_many_through_association(options, &block)
+      foreign_key = options[:reflection].through_reflection.foreign_key.to_s
+      reverse_association = find_reverse_association(options[:reflection], foreign_key, :has_many, :association_foreign_key)
+
+      objects = deep_cloneable_objects_for(options[:association], options[:conditions])
+      objects.map { |object| process_joined_object_for_deep_clone(object, options.merge(:reverse_association => reverse_association), &block) }
+    end
+
+    def dup_has_and_belongs_to_many_association(options, &block)
+      foreign_key = options[:reflection].foreign_key.to_s
+      reverse_association = find_reverse_association(options[:reflection], foreign_key, :has_and_belongs_to_many, :association_foreign_key)
+
+      objects = deep_cloneable_objects_for(options[:association], options[:conditions])
+      objects.map { |object| process_joined_object_for_deep_clone(object, options.merge(:reverse_association => reverse_association), &block) }
+    end
+
+    def find_reverse_association(source_reflection, primary_key_name, macro, matcher = :foreign_key)
+      if source_reflection.inverse_of.present?
+        source_reflection.inverse_of
+      else
+        source_reflection.klass.reflect_on_all_associations.detect do |reflection|
+          reflection != source_reflection && (macro.nil? || reflection.macro == macro) && (reflection.send(matcher).to_s == primary_key_name)
+        end
+      end
+    end
+
+    def deep_cloneable_object_for(single_association, conditions)
+      object = send(single_association)
+      evaluate_conditions(object, conditions) ? object : nil
+    end
+
+    def deep_cloneable_objects_for(many_association, conditions)
+      send(many_association).select { |object| evaluate_conditions(object, conditions) }
+    end
+
+    def process_joined_object_for_deep_clone(object, options, &block)
+      if (dictionary = options[:dup_options][:dictionary]) && object.find_in_dictionary_or_dup(dictionary, false)
+        object = object.deep_clone(options[:dup_options], &block)
+      elsif options[:reverse_association]
+        object.send(options[:reverse_association].name).target << options[:copy]
+      end
+      object
+    end
+
+    def evaluate_conditions(object, conditions)
+      conditions.none? || (conditions[:if] && conditions[:if].call(object)) || (conditions[:unless] && !conditions[:unless].call(object))
+    end
+
+    def dup_default_attribute_value_to(kopy, attribute, origin)
+      kopy[attribute] = origin.class.column_defaults.dup[attribute.to_s]
+    end
+
+    def normalized_includes_list(includes)
+      list = []
+      Array(includes).each do |item|
+        if item.is_a?(Hash) && item.size > 1
+          item.each { |key, value| list << { key => value } }
+        else
+          list << item
+        end
+      end
+
+      list
+    end
+  end
+end