clowne 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0815485e47677a65023e13711ad70570b79c97057ad8d09bed83f45aa293f939'
-  data.tar.gz: d1f8a39135462f1bca941515d055f19f44cdf92c0152ea0c49d8dd3f39475fb7
+  metadata.gz: 3f0d72961e8144605b8f0dbd7953161f17ec4c585c67b3e5bde80d84b3664f1b
+  data.tar.gz: 5981d937f60d54993ab6bee595598dbc0b52ac99e38e29ef84f5007661929c5b
 SHA512:
-  metadata.gz: 809ecabf16dc071eda96f03853baaa42b5736804864e417e2d9a03ee3d37425b7e01c649cee2a2b8728813ffb09a3a4fb61a59e53ebdbf5f3da0b0a435a91807
-  data.tar.gz: 9c186a3f86f85f2a08eaea4612329a86f104328c99aa561f82a9b42f9b69f50b159f15b1426aec68585aca6f24c937b0967876689b84a0d04a64ac041169c175
+  metadata.gz: ecd7010d94b67e2f0c9f19d2dbde4b6b302481156be2657199d6d9fa98c142807f1b006ddb306a2fd8cb3b2d72b3fd4e1708e34c5fe3541ddd0b2320b5e63112
+  data.tar.gz: d56c783b4eed7af9ac5e478cfc2b2154b74644ea03fcc84f9fb7bd54c4e2ac8505355bd0ba0405c96255046232f3eee12c83671ef64173f29097ab859a9e428f

data/.travis.yml

@@ -24,6 +24,8 @@ matrix:
       gemfile: gemfiles/railsmaster.gemfile
     - rvm: jruby-9.2.8.0
       gemfile: gemfiles/jruby.gemfile
+    - rvm: 3.0
+      gemfile: Gemfile
     - rvm: 2.7
       gemfile: Gemfile
     - rvm: 2.6.5

data/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"
 

data/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

data/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'

data/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

data/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 ...>

data/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
 ```

data/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

data/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

data/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: "admin@example.com")
+user2.update(email: "admin@example.com")
 # => <#User id: 2, email: 'admin@example.com' ...>
 operation.run_after_persist
 # => <#User id: 2, email: 'evl-2.ms', ...>

data/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

data/lib/clowne/adapters/active_record/dsl.rb

@@ -6,8 +6,8 @@ module Clowne
     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
 

data/lib/clowne/adapters/base/association.rb

@@ -30,7 +30,7 @@ module Clowne
 
         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

data/lib/clowne/cloner.rb

@@ -44,7 +44,7 @@ module Clowne # :nodoc: all
       end
 
       # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
-      def call(object, **options)
+      def call(object, **options, &block)
         raise(UnprocessableSourceError, "Nil is not cloneable object") if object.nil?
 
         options = Clowne::Utils::Options.new(options)
@@ -59,7 +59,7 @@ module Clowne # :nodoc: all
             plan_with_traits(options.traits, current_adapter: current_adapter)
           end
 
-        plan = Clowne::Planner.enhance(plan, Proc.new) if block_given?
+        plan = Clowne::Planner.enhance(plan, block) if block
 
         plan = Clowne::Planner.filter_declarations(plan, options.only)
 

data/lib/clowne/declarations.rb

@@ -11,8 +11,8 @@ module Clowne
       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)

data/lib/clowne/declarations/after_clone.rb

@@ -5,10 +5,10 @@ module Clowne
     class AfterClone < Base # :nodoc: all
       attr_reader :block
 
-      def initialize
-        raise ArgumentError, "Block is required for after_clone" unless block_given?
+      def initialize(*, &block)
+        raise ArgumentError, "Block is required for after_clone" unless block
 
-        @block = Proc.new
+        @block = block
       end
 
       def compile(plan)

data/lib/clowne/declarations/after_persist.rb

@@ -5,10 +5,10 @@ module Clowne
     class AfterPersist < Base # :nodoc: all
       attr_reader :block
 
-      def initialize
-        raise ArgumentError, "Block is required for after_persist" unless block_given?
+      def initialize(*, &block)
+        raise ArgumentError, "Block is required for after_persist" unless block
 
-        @block = Proc.new
+        @block = block
       end
 
       def compile(plan)

data/lib/clowne/declarations/exclude_association.rb

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

data/lib/clowne/declarations/finalize.rb

@@ -5,10 +5,10 @@ module Clowne
     class Finalize < Base # :nodoc: all
       attr_reader :block
 
-      def initialize
-        raise ArgumentError, "Block is required for finalize" unless block_given?
+      def initialize(*, &block)
+        raise ArgumentError, "Block is required for finalize" unless block
 
-        @block = Proc.new
+        @block = block
       end
 
       def compile(plan)

data/lib/clowne/declarations/init_as.rb

@@ -5,10 +5,10 @@ module Clowne
     class InitAs < Base # :nodoc: all
       attr_reader :block
 
-      def initialize
-        raise ArgumentError, "Block is required for init_as" unless block_given?
+      def initialize(*, &block)
+        raise ArgumentError, "Block is required for init_as" unless block
 
-        @block = Proc.new
+        @block = block
       end
 
       def compile(plan)

data/lib/clowne/declarations/nullify.rb

@@ -5,7 +5,7 @@ module Clowne
     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

data/lib/clowne/resolvers/after_persist.rb

@@ -8,7 +8,7 @@ module Clowne
         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

data/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

data/lib/clowne/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clowne
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clowne
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Vladimir Dementyev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement