amoeba 3.1.0 → 3.3.0

data/gemfiles/activerecord_5.2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+
+group :development, :test do
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+  gem 'sqlite3', '~> 1.3.0'
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'pry'
+end
+
+gemspec path: '../'

data/gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+
+group :development, :test do
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+  gem 'sqlite3', '~> 1.6.0'
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'pry'
+end
+
+gemspec path: '../'

data/gemfiles/activerecord_6.1.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.0'
+
+group :development, :test do
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+  gem 'sqlite3', '~> 1.6.0'
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'pry'
+end
+
+gemspec path: '../'

data/gemfiles/activerecord_7.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.0'
+
+group :development, :test do
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+  gem 'sqlite3', '~> 1.6.0'
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'pry'
+end
+
+gemspec path: '../'

data/gemfiles/activerecord_head.gemfile

@@ -1,23 +1,21 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git "git://github.com/rails/arel.git" do
-  gem "arel"
-end
-
-git "git://github.com/rails/rails.git" do
-  gem "activerecord"
+git 'https://github.com/rails/rails.git', branch: 'main' do
+  gem 'activerecord'
 end
 
 group :development, :test do
-  gem "rake"
-  gem "coveralls", :require => false
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+  gem 'sqlite3', '~> 1.6.0'
 end
 
 group :local_development do
-  gem "pry"
-  gem "appraisal"
+  gem 'appraisal'
+  gem 'pry'
 end
 
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/jruby_activerecord_7.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.0'
+
+group :development, :test do
+  gem 'activerecord-jdbc-adapter', '~> 70.1'
+  gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1'
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'pry'
+end
+
+gemspec path: '../'

data/gemfiles/jruby_activerecord_head.gemfile

@@ -0,0 +1,26 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+git 'https://github.com/rails/rails.git', branch: 'main' do
+  gem 'activerecord'
+end
+
+group :development, :test do
+  git 'https://github.com/jruby/activerecord-jdbc-adapter' do
+    gem 'activerecord-jdbc-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter',
+        glob: 'activerecord-jdbcsqlite3-adapter/activerecord-jdbcsqlite3-adapter.gemspec'
+  end
+
+  gem 'rake'
+  gem 'simplecov', '~> 0.21.2'
+  gem 'simplecov-lcov', '~> 0.8.0'
+end
+
+group :local_development do
+  gem 'appraisal'
+  gem 'pry'
+end
+
+gemspec path: '../'

data/lib/amoeba/class_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
   module ClassMethods
     def amoeba(&block)

data/lib/amoeba/cloner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Amoeba
@@ -29,7 +31,7 @@ module Amoeba
     private
 
     def parenting_style
-      amoeba.upbringing ? amoeba.upbringing : _parent_amoeba.parenting
+      amoeba.upbringing || _parent_amoeba.parenting
     end
 
     def inherit_strict_parent_settings
@@ -47,8 +49,9 @@ module Amoeba
     end
 
     def inherit_parent_settings
-      return if !_parent_amoeba.inherit
-      return unless %w(strict relaxed submissive).include?(parenting_style.to_s)
+      return unless _parent_amoeba.inherit
+      return unless %w[strict relaxed submissive].include?(parenting_style.to_s)
+
       __send__("inherit_#{parenting_style}_parent_settings".to_sym)
     end
 
@@ -67,12 +70,14 @@ module Amoeba
       # and old children on the copy
       return unless association.macro == :has_many ||
                     association.is_a?(::ActiveRecord::Reflection::ThroughReflection)
+
       amoeba.exclude_association(association.options[:through])
     end
 
     def follow_only_includes
       amoeba.includes.each do |include, options|
         next if options[:if] && !@old_object.send(options[:if])
+
         follow_association(include, @object_klass.reflect_on_association(include))
       end
     end
@@ -81,6 +86,7 @@ module Amoeba
       @object_klass.reflections.each do |name, association|
         exclude = amoeba.excludes[name.to_sym]
         next if exclude && (exclude.blank? || @old_object.send(exclude[:if]))
+
         follow_association(name, association)
       end
     end
@@ -108,8 +114,9 @@ module Amoeba
 
     def follow_association(relation_name, association)
       return unless amoeba.known_macros.include?(association.macro.to_sym)
+
       follow_klass = ::Amoeba::Macros.list[association.macro.to_sym]
-      follow_klass.new(self).follow(relation_name, association) if follow_klass
+      follow_klass&.new(self)&.follow(relation_name, association)
     end
 
     def process_overrides

data/lib/amoeba/config.rb

@@ -1,43 +1,27 @@
+# frozen_string_literal: true
+
 module Amoeba
   class Config
     DEFAULTS = {
-      enabled:        false,
-      inherit:        false,
-      do_preproc:     false,
-      parenting:      false,
-      raised:         false,
-      dup_method:     :dup,
-      remap_method:   nil,
-      includes:       {},
-      excludes:       {},
-      clones:         [],
+      enabled: false,
+      inherit: false,
+      do_preproc: false,
+      parenting: false,
+      raised: false,
+      dup_method: :dup,
+      remap_method: nil,
+      includes: {},
+      excludes: {},
+      clones: [],
       customizations: [],
-      overrides:      [],
-      null_fields:    [],
-      coercions:      {},
-      prefixes:       {},
-      suffixes:       {},
-      regexes:        {},
-      known_macros:   [:has_one, :has_many, :has_and_belongs_to_many]
-    }
-
-    # ActiveRecord 3.x have different implementation of deep_dup
-    if ::ActiveRecord::VERSION::MAJOR == 3
-      DEFAULTS.instance_eval do
-        def deep_dup
-          each_with_object(dup) do |(key, value), hash|
-            hash[key.deep_dup] = value.deep_dup
-          end
-        end
-      end
-      Object.class_eval do
-        def deep_dup
-          duplicable? ? dup : self
-        end
-      end
-    end
-
-    DEFAULTS.freeze
+      overrides: [],
+      null_fields: [],
+      coercions: {},
+      prefixes: {},
+      suffixes: {},
+      regexes: {},
+      known_macros: %i[has_one has_many has_and_belongs_to_many]
+    }.freeze
 
     DEFAULTS.each do |key, value|
       value.freeze if value.is_a?(Array) || value.is_a?(Hash)
@@ -53,7 +37,7 @@ module Amoeba
       @config = self.class::DEFAULTS.deep_dup
     end
 
-    alias_method :upbringing, :raised
+    alias upbringing raised
 
     def enable
       @config[:enabled] = true
@@ -110,35 +94,25 @@ module Amoeba
     def include_association(value = nil, options = {})
       enable
       @config[:excludes] = {}
-      push_value_to_hash({ value => options }, :includes)
+      value = value.is_a?(Array) ? value.map! { |v| [v, options] }.to_h : { value => options }
+      push_value_to_hash(value, :includes)
     end
 
     def include_associations(*values)
       values.flatten.each { |v| include_association(v) }
     end
 
-    # TODO: remove this method in v3.0.0
-    def include_field(value = nil)
-      warn 'include_field is deprecated and will be removed in version 3.0.0; please use include_association instead'
-      include_association(value)
-    end
-
     def exclude_association(value = nil, options = {})
       enable
       @config[:includes] = {}
-      push_value_to_hash({ value => options }, :excludes)
+      value = value.is_a?(Array) ? value.map! { |v| [v, options] }.to_h : { value => options }
+      push_value_to_hash(value, :excludes)
     end
 
     def exclude_associations(*values)
       values.flatten.each { |v| exclude_association(v) }
     end
 
-    # TODO: remove this method in v3.0.0
-    def exclude_field(value = nil)
-      warn 'exclude_field is deprecated and will be removed in version 3.0.0; please use exclude_association instead'
-      exclude_association(value)
-    end
-
     def clone(value = nil)
       enable
       push_value_to_array(value, :clones)

data/lib/amoeba/instance_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
   module InstanceMethods
     def _parent_amoeba
@@ -10,6 +12,7 @@ module Amoeba
 
     def _first_superclass_with_amoeba
       return @_first_superclass_with_amoeba unless @_first_superclass_with_amoeba.nil?
+
       klass = self.class
       while klass.superclass < ::ActiveRecord::Base
         klass = klass.superclass

data/lib/amoeba/macros/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
   module Macros
     class Base
@@ -8,7 +10,7 @@ module Amoeba
       end
 
       def follow(_relation_name, _association)
-        fail "#{self.class.name} doesn't implement `follow`!"
+        raise "#{self.class.name} doesn't implement `follow`!"
       end
 
       class << self
@@ -19,6 +21,7 @@ module Amoeba
 
       def remapped_relation_name(name)
         return name unless @cloner.amoeba.remap_method
+
         @old_object.__send__(@cloner.amoeba.remap_method, name.to_sym) || name
       end
     end

data/lib/amoeba/macros/has_and_belongs_to_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
   module Macros
     class HasAndBelongsToMany < ::Amoeba::Macros::Base

data/lib/amoeba/macros/has_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
   module Macros
     class HasMany < ::Amoeba::Macros::Base

data/lib/amoeba/macros/has_one.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 module Amoeba
   module Macros
     class HasOne < ::Amoeba::Macros::Base
       def follow(relation_name, association)
         return if association.is_a?(::ActiveRecord::Reflection::ThroughReflection)
+
         old_obj = @old_object.__send__(relation_name)
         return unless old_obj
+
         copy_of_obj = old_obj.amoeba_dup(@options)
         copy_of_obj[:"#{association.foreign_key}"] = nil
         relation_name = remapped_relation_name(relation_name)

data/lib/amoeba/macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
   module Macros
     extend self

data/lib/amoeba/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amoeba
-  VERSION = '3.1.0'
+  VERSION = '3.3.0'
 end

data/lib/amoeba.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'active_support/all'
 require 'amoeba/version'
@@ -14,5 +16,7 @@ require 'amoeba/instance_methods'
 module Amoeba
 end
 
-ActiveRecord::Base.send :extend, Amoeba::ClassMethods
-ActiveRecord::Base.send :include, Amoeba::InstanceMethods
+ActiveSupport.on_load :active_record do
+  extend Amoeba::ClassMethods
+  include Amoeba::InstanceMethods
+end

data/spec/lib/amoeba_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'amoeba' do
   context 'dup' do
-    before :each do
+    before do
       require ::File.dirname(__FILE__) + '/../support/data.rb'
     end
 
@@ -73,12 +73,17 @@ describe 'amoeba' do
       expect(new_post.supercats.map(&:ramblings)).to include('Copy of zomg')
       expect(new_post.supercats.map(&:other_ramblings).uniq.length).to eq(1)
       expect(new_post.supercats.map(&:other_ramblings).uniq).to include('La la la')
-      expect(new_post.contents).to eq("Here's a copy: #{old_post.contents.gsub(/dog/, 'cat')} (copied version)")
+      expect(new_post.contents).to eq("Here's a copy: #{old_post.contents.gsub(/dog/,
+                                                                               'cat')} (copied version)")
       expect(new_post.comments.length).to eq(5)
-      expect(new_post.comments.select { |c| c.nerf == 'ratatat' && c.contents.nil? }.length).to eq(1)
+      expect(new_post.comments.select do |c|
+               c.nerf == 'ratatat' && c.contents.nil?
+             end.length).to eq(1)
       expect(new_post.comments.select { |c| c.nerf == 'ratatat' }.length).to eq(2)
       expect(new_post.comments.select { |c| c.nerf == 'bonk' }.length).to eq(1)
-      expect(new_post.comments.select { |c| c.nerf == 'bonkers' && c.contents.nil? }.length).to eq(1)
+      expect(new_post.comments.select do |c|
+               c.nerf == 'bonkers' && c.contents.nil?
+             end.length).to eq(1)
 
       new_post.widgets.map(&:id).each do |id|
         expect(old_post.widgets.map(&:id)).not_to include(id)
@@ -96,7 +101,9 @@ describe 'amoeba' do
       expect(new_author.errors.messages).to be_empty
       expect(new_author.posts.first.custom_things.length).to eq(3)
       expect(new_author.posts.first.custom_things.select { |ct| ct.value == [] }.length).to eq(1)
-      expect(new_author.posts.first.custom_things.select { |ct| ct.value == [1, 2] }.length).to eq(1)
+      expect(new_author.posts.first.custom_things.select do |ct|
+               ct.value == [1, 2]
+             end.length).to eq(1)
       expect(new_author.posts.first.custom_things.select { |ct| ct.value == [78] }.length).to eq(1)
       # }}}
       # Products {{{
@@ -176,60 +183,90 @@ describe 'amoeba' do
     end
   end
 
-  context 'use if condition in includes and excludes' do
+  context 'Using a if condition' do
+    subject { post.amoeba_dup.save! }
+
     before(:all) do
       require ::File.dirname(__FILE__) + '/../support/data.rb'
     end
+
     before { ::Post.fresh_amoeba }
 
-    subject { post.amoeba_dup.save! }
     let(:post) { Post.first }
 
-    it 'includes associations with truthy condition' do
+    it 'includes an association with truthy condition' do
       ::Post.amoeba do
         include_association :comments, if: :truthy?
       end
-      expect { subject }.to change { Comment.count }.by(3)
+      expect { subject }.to change(Comment, :count).by(3)
     end
 
-    it 'does not include associations with false condition' do
+    it 'does not include an association with a falsey condition' do
       ::Post.amoeba do
         include_association :comments, if: :falsey?
       end
-      expect { subject }.not_to change { Comment.count }
+      expect { subject }.not_to change(Comment, :count)
     end
 
-    it 'excludes associations with truthy condition' do
+    it 'excludes an association with a truthy condition' do
       ::Post.amoeba do
         exclude_association :comments, if: :truthy?
       end
-      expect { subject }.not_to change { Comment.count }
+      expect { subject }.not_to change(Comment, :count)
     end
 
-    it 'does not exclude associations with false condition' do
+    it 'does not exclude an association with a falsey condition' do
       ::Post.amoeba do
         exclude_association :comments, if: :falsey?
       end
-      expect { subject }.to change { Comment.count }.by(3)
+      expect { subject }.to change(Comment, :count).by(3)
+    end
+
+    it 'includes associations from a given array with a truthy condition' do
+      ::Post.amoeba do
+        include_association [:comments], if: :truthy?
+      end
+      expect { subject }.to change(Comment, :count).by(3)
+    end
+
+    it 'does not include associations from a given array with a falsey condition' do
+      ::Post.amoeba do
+        include_association [:comments], if: :falsey?
+      end
+      expect { subject }.not_to change(Comment, :count)
+    end
+
+    it 'does exclude associations from a given array with a truthy condition' do
+      ::Post.amoeba do
+        exclude_association [:comments], if: :truthy?
+      end
+      expect { subject }.not_to change(Comment, :count)
+    end
+
+    it 'does not exclude associations from a given array with a falsey condition' do
+      ::Post.amoeba do
+        exclude_association [:comments], if: :falsey?
+      end
+      expect { subject }.to change(Comment, :count).by(3)
     end
   end
 
   context 'override' do
-    before :each do
+    before do
       ::Image.fresh_amoeba
       ::Image.amoeba do
         override ->(old, new) { new.product_id = 13 if old.filename == 'test.jpg' }
       end
     end
 
-    it 'should override fields' do
+    it 'overrides fields' do
       image = ::Image.create(filename: 'test.jpg', product_id: 12)
       image_dup = image.amoeba_dup
       expect(image_dup.save).to be_truthy
       expect(image_dup.product_id).to eq(13)
     end
 
-    it 'should not override fields' do
+    it 'does not override fields' do
       image = ::Image.create(filename: 'test2.jpg', product_id: 12)
       image_dup = image.amoeba_dup
       expect(image_dup.save).to be_truthy
@@ -238,7 +275,7 @@ describe 'amoeba' do
   end
 
   context 'nullify' do
-    before :each do
+    before do
       ::Image.fresh_amoeba
       ::Image.amoeba do
         nullify :product_id
@@ -248,14 +285,14 @@ describe 'amoeba' do
     let(:image) { ::Image.create(filename: 'test.jpg', product_id: 12) }
     let(:image_dup) { image.amoeba_dup }
 
-    it 'should nullify fields' do
+    it 'nullifies fields' do
       expect(image_dup.save).to be_truthy
       expect(image_dup.product_id).to be_nil
     end
   end
 
   context 'strict propagate' do
-    it 'should call #reset_amoeba' do
+    it 'calls #reset_amoeba' do
       expect(::SuperBlackBox).to receive(:reset_amoeba).and_call_original
       box = ::SuperBlackBox.create(title: 'Super Black Box', price: 9.99, length: 1, metal: '1')
       new_box = box.amoeba_dup
@@ -284,13 +321,16 @@ describe 'amoeba' do
 
   context 'preprocessing fields' do
     subject { super_admin.amoeba_dup }
-    let(:super_admin) { ::SuperAdmin.create!(email: 'user@example.com', active: true, password: 'password') }
 
-    it 'should accept "set" to set false to attribute' do
+    let(:super_admin) do
+      ::SuperAdmin.create!(email: 'user@example.com', active: true, password: 'password')
+    end
+
+    it 'accepts "set" to set false to attribute' do
       expect(subject.active).to be false
     end
 
-    it 'should skip "prepend" if it equal to false' do
+    it 'skips "prepend" if it equal to false' do
       expect(subject.password).to eq('password')
     end
   end
@@ -301,13 +341,15 @@ describe 'amoeba' do
     it 'does not fail with a deep inheritance' do
       sub_sub_product = BoxSubSubProduct.create(title: 'Awesome shoes')
       another_product = BoxAnotherProduct.create(title: 'Cleaning product')
-      sub_sub_product.update_attributes(box: box, another_product: another_product)
+      sub_sub_product.update(box: box, another_product: another_product)
       expect(box.sub_products.first.another_product.title).to eq('Cleaning product')
       expect(box.amoeba_dup.sub_products.first.another_product.title).to eq('Cleaning product')
     end
   end
 
   context 'inheritance extended' do
+    subject { stage.amoeba_dup }
+
     let(:stage) do
       stage = CustomStage.new(title: 'My Stage', external_id: 213)
       stage.listeners.build(name: 'John')
@@ -318,19 +360,19 @@ describe 'amoeba' do
       stage
     end
 
-    subject { stage.amoeba_dup }
-
-    it "contains parent association and own associations", :aggregate_failures do
+    it 'contains parent association and own associations', :aggregate_failures do
       subject
-      expect { subject.save! }.to change(Listener, :count).by(2).
-                                  and change(Specialist, :count).by(1).
-                                  and change(CustomRule, :count).by(1)
+      expect { subject.save! }.to change(Listener, :count).by(2)
+                                                          .and change(Specialist, :count).by(1)
+                                                                                         .and change(
+                                                                                           CustomRule, :count
+                                                                                         ).by(1)
 
       expect(subject.title).to eq 'My Stage'
       expect(subject.external_id).to be_nil
-      expect(subject.listeners.find_by(name: 'John')).to_not be_nil
-      expect(subject.listeners.find_by(name: 'Helen')).to_not be_nil
-      expect(subject.specialists.find_by(name: 'Jack')).to_not be_nil
+      expect(subject.listeners.find_by(name: 'John')).not_to be_nil
+      expect(subject.listeners.find_by(name: 'Helen')).not_to be_nil
+      expect(subject.specialists.find_by(name: 'Jack')).not_to be_nil
       expect(subject.custom_rules.first.description).to eq 'Kill all humans'
     end
   end