Merge pull request #58 from pomartel/ruby3

Ruby 3.0 compatibility

Author: ssnickolay

Gemfile

@@ -9,7 +9,7 @@ gem "sqlite3", "~> 1.4.1", platform: :ruby
 gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
 gem "jdbc-sqlite3", platform: :jruby
 
-gem "activerecord", "~> 5.2"
+gem "activerecord", ">= 6.0", "< 6.2.0"
 gem "sequel", ">= 5.0"
 gem "simplecov"
 

README.md

@@ -69,7 +69,7 @@ class UserCloner < Clowne::Cloner
   nullify :login
 
   # params here is an arbitrary Hash passed into cloner
-  finalize do |_source, record, params|
+  finalize do |_source, record, **params|
     record.email = params[:email]
   end
 end

clowne.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'factory_bot', '~> 4.8'
+  spec.add_development_dependency 'factory_bot', '~> 5'
   spec.add_development_dependency 'rubocop', '~> 0.75.0'
   spec.add_development_dependency 'rubocop-md', '~> 0.3.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.36.0'

docs/README.md

@@ -69,7 +69,7 @@ class UserCloner < Clowne::Cloner
   nullify :login
 
   # params here is an arbitrary Hash passed into cloner
-  finalize do |_source, record, params|
+  finalize do |_source, record, **params|
     record.email = params[:email]
   end
 end

docs/after_persist.md

@@ -30,7 +30,7 @@ class UserCloner < Clowne::Cloner
 
   after_persist do |origin, clone, mapper:, **|
     cloned_bio = mapper.clone_of(origin.bio)
-    clone.update_attributes(bio_id: cloned_bio.id)
+    clone.update(bio_id: cloned_bio.id)
   end
 end
 
@@ -50,7 +50,7 @@ end
 user = User.create
 posts = Array.new(3) { Post.create(user: user) }
 bio = posts.sample
-user.update_attributes(bio_id: bio.id)
+user.update(bio_id: bio.id)
 
 operation = UserCloner.call(user, run_job: true)
 # => <#Clowne::Utils::Operation ...>

docs/clone_mapper.md

@@ -9,7 +9,7 @@ class UserCloner < Clowne::Cloner
   # ...
   after_persist do |origin, clone, mapper:, **|
     cloned_bio = mapper.clone_of(origin.bio)
-    clone.update_attributes(bio_id: cloned_bio.id)
+    clone.update(bio_id: cloned_bio.id)
   end
 end
 ```

docs/finalize.md

@@ -4,12 +4,12 @@ To apply custom transformations to the cloned record, you can use the `finalize`
 
 ```ruby
 class UserCloner < Clowne::Cloner
-  finalize do |_source, record, _params|
+  finalize do |_source, record, **_params|
     record.name = "This is copy!"
   end
 
   trait :change_email do
-    finalize do |_source, record, params|
+    finalize do |_source, record, **params|
       record.email = params[:email]
     end
   end

docs/getting_started.md

@@ -81,7 +81,7 @@ class UserCloner < Clowne::Cloner
   nullify :login
 
   # params here is an arbitrary Hash passed into cloner
-  finalize do |_source, record, params|
+  finalize do |_source, record, **params|
     record.email = params[:email]
   end
 end

docs/operation.md

@@ -11,7 +11,7 @@ class UserCloner < Clowne::Cloner
   nullify :email
 
   after_persist do |_origin, cloned, **|
-    cloned.update_attributes(email: "evl-#{cloned.id}.ms")
+    cloned.update(email: "evl-#{cloned.id}.ms")
   end
 end
 
@@ -34,7 +34,7 @@ operation.to_record
 # Call only after_persist callbacks:
 user2 = operation.to_record
 # => <#User id: 2, email: 'evl-2.ms', ...>
-user2.update_attributes(email: "[email protected]")
+user2.update(email: "[email protected]")
 # => <#User id: 2, email: '[email protected]' ...>
 operation.run_after_persist
 # => <#User id: 2, email: 'evl-2.ms', ...>

docs/parameters.md

@@ -8,7 +8,7 @@ Example:
 class UserCloner < Clowne::Cloner
   include_association :posts, ->(params) { where(state: params[:state]) }
 
-  finalize do |_source, record, params|
+  finalize do |_source, record, **params|
     record.email = params[:email]
   end
 end
@@ -27,7 +27,7 @@ As result we strongly recommend to use ruby keyword arguments instead of params
 
 ```ruby
 # Bad
-finalize do |_source, record, params|
+finalize do |_source, record, **params|
   record.email = params[:email]
 end
 
@@ -82,7 +82,7 @@ class UserCloner < Clowne::Cloner
 end
 
 class ProfileCloner < Clowne::Cloner
-  finalize do |_source, record, params|
+  finalize do |_source, record, **params|
     record.jsonb_field = params
   end
 end

lib/clowne/adapters/active_record/dsl.rb

@@ -6,8 +6,8 @@ module Adapters
     module ActiveRecordDSL
       module InstanceMethods # :nodoc:
         # Shortcut to call class's cloner call with self
-        def clowne(*args, &block)
-          self.class.cloner_class.call(self, *args, &block)
+        def clowne(**args, &block)
+          self.class.cloner_class.call(self, **args, &block)
         end
       end
 

lib/clowne/adapters/base/association.rb

@@ -30,7 +30,7 @@ def association
 
         def clone_one(child)
           cloner = cloner_for(child)
-          cloner ? cloner.call(child, cloner_options) : dup_record(child)
+          cloner ? cloner.call(child, **cloner_options) : dup_record(child)
         end
 
         def with_scope

lib/clowne/declarations.rb

@@ -11,8 +11,8 @@ def add(id, declaration = nil, &block)
       declaration = block if block_given?
 
       if declaration.is_a?(Class)
-        DSL.send(:define_method, id) do |*args, &inner_block|
-          declarations.push declaration.new(*args, &inner_block)
+        DSL.send(:define_method, id) do |*args, **hargs, &inner_block|
+          declarations.push declaration.new(*args, **hargs, &inner_block)
         end
       elsif declaration.is_a?(Proc)
         DSL.send(:define_method, id, &declaration)

lib/clowne/declarations/after_clone.rb

@@ -5,7 +5,7 @@ module Declarations
     class AfterClone < Base # :nodoc: all
       attr_reader :block
 
-      def initialize(&block)
+      def initialize(*, &block)
         raise ArgumentError, "Block is required for after_clone" unless block
 
         @block = block

lib/clowne/declarations/after_persist.rb

@@ -5,7 +5,7 @@ module Declarations
     class AfterPersist < Base # :nodoc: all
       attr_reader :block
 
-      def initialize(&block)
+      def initialize(*, &block)
         raise ArgumentError, "Block is required for after_persist" unless block
 
         @block = block

lib/clowne/declarations/exclude_association.rb

@@ -5,7 +5,7 @@ module Declarations
     class ExcludeAssociation < Base # :nodoc: all
       attr_accessor :name
 
-      def initialize(name)
+      def initialize(name, **)
         @name = name.to_sym
       end
 

lib/clowne/declarations/finalize.rb

@@ -5,7 +5,7 @@ module Declarations
     class Finalize < Base # :nodoc: all
       attr_reader :block
 
-      def initialize(&block)
+      def initialize(*, &block)
         raise ArgumentError, "Block is required for finalize" unless block
 
         @block = block

lib/clowne/declarations/init_as.rb

@@ -5,7 +5,7 @@ module Declarations
     class InitAs < Base # :nodoc: all
       attr_reader :block
 
-      def initialize(&block)
+      def initialize(*, &block)
         raise ArgumentError, "Block is required for init_as" unless block
 
         @block = block

lib/clowne/declarations/nullify.rb

@@ -5,7 +5,7 @@ module Declarations
     class Nullify < Base # :nodoc: all
       attr_reader :attributes
 
-      def initialize(*attributes)
+      def initialize(*attributes, **)
         raise ArgumentError, "At least one attribute required" if attributes.empty?
 
         @attributes = attributes

lib/clowne/resolvers/after_persist.rb

@@ -8,7 +8,7 @@ def self.call(source, record, declaration, params:, **_options)
         params ||= {}
         operation.add_after_persist(
           proc do
-            declaration.block.call(source, record, params.merge(mapper: operation.mapper))
+            declaration.block.call(source, record, **params.merge(mapper: operation.mapper))
           end
         )
         record

lib/clowne/resolvers/finalize.rb

@@ -4,7 +4,7 @@ module Clowne
   class Resolvers
     module Finalize # :nodoc: all
       def self.call(source, record, declaration, params:, **_options)
-        declaration.block.call(source, record, params)
+        declaration.block.call(source, record, **params)
         record
       end
     end

spec/clowne/adapters/active_record/associations/belongs_to_spec.rb

@@ -28,7 +28,7 @@
     context "with custom cloner" do
       let(:topic_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |_source, record, params|
+          finalize do |_source, record, **params|
             record.title += params.fetch(:suffix, "-2")
             record.description += " (Cloned)"
           end

spec/clowne/adapters/active_record/associations/has_and_belongs_to_many_spec.rb

@@ -40,7 +40,7 @@
     context "with custom cloner" do
       let(:tag_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |_source, record, params|
+          finalize do |_source, record, **params|
             record.value += params.fetch(:suffix, "-2")
           end
 

spec/clowne/adapters/active_record/associations/has_many_spec.rb

@@ -15,7 +15,7 @@
   before(:all) do
     module AR
       class PostCloner < Clowne::Cloner
-        finalize do |_source, record, params|
+        finalize do |_source, record, **params|
           record.topic_id = params[:topic_id] if params[:topic_id]
         end
 
@@ -138,7 +138,7 @@ class PostCloner < Clowne::Cloner
 
       let(:post_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |source, record, _params|
+          finalize do |source, record, **_params|
             record.title = "Copy of #{source.title}"
           end
         end

spec/clowne/adapters/active_record/associations/has_one_spec.rb

@@ -17,7 +17,7 @@
   before(:all) do
     module AR
       class ImageCloner < Clowne::Cloner
-        finalize do |source, record, params|
+        finalize do |source, record, **params|
           record.created_at = source.created_at if params[:include_timestamps]
         end
 
@@ -33,7 +33,7 @@ class ImageCloner < Clowne::Cloner
       end
 
       class PreviewImageCloner < Clowne::Cloner
-        finalize do |source, record, params|
+        finalize do |source, record, **params|
           record.created_at = source.created_at if params[:include_timestamps]
         end
 
@@ -119,7 +119,7 @@ class PreviewImageCloner < Clowne::Cloner
     context "with custom cloner" do
       let(:image_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |source, record, _params|
+          finalize do |source, record, **_params|
             record.title = "Copy of #{source.title}"
           end
         end

spec/clowne/adapters/sequel/associations/many_to_many_spec.rb

@@ -41,7 +41,7 @@
     context "with custom cloner" do
       let(:tag_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |_source, record, params|
+          finalize do |_source, record, **params|
             record.value += params.fetch(:suffix, "-2")
           end
 

spec/clowne/adapters/sequel/associations/one_to_many_spec.rb

@@ -17,7 +17,7 @@ module Sequel
       class PostCloner < Clowne::Cloner
         include_associations :image, :tags
 
-        finalize do |_source, record, params|
+        finalize do |_source, record, **params|
           record.topic_id = params[:topic_id] if params[:topic_id]
         end
 
@@ -171,7 +171,7 @@ class PostCloner < Clowne::Cloner
 
       let(:post_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |source, record, _params|
+          finalize do |source, record, **_params|
             record.title = "Copy of #{source.title}"
           end
         end

spec/clowne/adapters/sequel/associations/one_to_one_spec.rb

@@ -17,7 +17,7 @@
   before(:all) do
     module Sequel
       class ImageCloner < Clowne::Cloner
-        finalize do |source, record, params|
+        finalize do |source, record, **params|
           record.created_at = source.created_at if params[:include_timestamps]
         end
 
@@ -33,7 +33,7 @@ class ImageCloner < Clowne::Cloner
       end
 
       class PreviewImageCloner < Clowne::Cloner
-        finalize do |source, record, params|
+        finalize do |source, record, **params|
           record.created_at = source.created_at if params[:include_timestamps]
         end
 
@@ -114,7 +114,7 @@ class PreviewImageCloner < Clowne::Cloner
     context "with custom cloner" do
       let(:image_cloner) do
         Class.new(Clowne::Cloner) do
-          finalize do |source, record, _params|
+          finalize do |source, record, **_params|
             record.title = "Copy of #{source.title}"
           end
         end

spec/clowne/cloner_spec.rb

@@ -12,7 +12,7 @@
 
       nullify :title, :description
 
-      finalize do |_source, _record, _params|
+      finalize do |_source, _record, **_params|
         1 + 1
       end
 

spec/clowne/integrations/active_record_dsl_spec.rb

@@ -26,7 +26,7 @@ class Post < ActiveRecord::Base
         clowne_config do
           include_association :image
 
-          finalize do |source, record, params|
+          finalize do |source, record, **params|
             record.title = params[:title] || "Clone of #{source.title}"
           end
         end

spec/clowne/integrations/active_record_spec.rb

@@ -12,7 +12,7 @@ class ImgCloner < Clowne::Cloner
       end
 
       class BasePostCloner < Clowne::Cloner
-        finalize do |_source, record, params|
+        finalize do |_source, record, **params|
           record.contents = params[:post_contents] if params[:post_contents].present?
         end
       end

spec/clowne/integrations/after_persist_spec.rb

@@ -6,7 +6,7 @@ class TopicCloner < Clowne::Cloner
 
         after_persist do |origin, clone, mapper:|
           cloned_image = mapper.clone_of(origin.image)
-          clone.update_attributes(image_id: cloned_image.id)
+          clone.update(image_id: cloned_image.id)
         end
       end
 
@@ -41,7 +41,7 @@ class ImgCloner < Clowne::Cloner
 
   before do
     images.each { |image| create(:preview_image, image: image) }
-    topic.update_attributes(image_id: topic_image.id)
+    topic.update(image_id: topic_image.id)
   end
 
   describe 'The main idea of "after persist" feature is a possibility