clowne 0.1.0 → 1.3.0

data/lib/clowne/declarations.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'clowne/dsl'
-require 'clowne/plan'
+require "clowne/dsl"
+require "clowne/utils/plan"
 
 module Clowne
   module Declarations # :nodoc:
     module_function
 
-    def add(id, declaration = nil)
-      declaration = Proc.new if block_given?
+    def add(id, declaration = nil, &block)
+      declaration = block if block_given?
 
       if declaration.is_a?(Class)
-        DSL.send(:define_method, id) do |*args, &block|
-          declarations.push declaration.new(*args, &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)
@@ -23,9 +23,12 @@ module Clowne
   end
 end
 
-require 'clowne/declarations/init_as'
-require 'clowne/declarations/exclude_association'
-require 'clowne/declarations/finalize'
-require 'clowne/declarations/include_association'
-require 'clowne/declarations/nullify'
-require 'clowne/declarations/trait'
+require "clowne/declarations/base"
+require "clowne/declarations/init_as"
+require "clowne/declarations/exclude_association"
+require "clowne/declarations/finalize"
+require "clowne/declarations/include_association"
+require "clowne/declarations/nullify"
+require "clowne/declarations/trait"
+require "clowne/declarations/after_persist"
+require "clowne/declarations/after_clone"

data/lib/clowne/declarations/after_clone.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Clowne
+  module Declarations
+    class AfterClone < Base # :nodoc: all
+      attr_reader :block
+
+      def initialize(*, &block)
+        raise ArgumentError, "Block is required for after_clone" unless block
+
+        @block = block
+      end
+
+      def compile(plan)
+        plan.add(:after_clone, self)
+      end
+    end
+  end
+end
+
+Clowne::Declarations.add :after_clone, Clowne::Declarations::AfterClone

data/lib/clowne/declarations/after_persist.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Clowne
+  module Declarations
+    class AfterPersist < Base # :nodoc: all
+      attr_reader :block
+
+      def initialize(*, &block)
+        raise ArgumentError, "Block is required for after_persist" unless block
+
+        @block = block
+      end
+
+      def compile(plan)
+        plan.add(:after_persist, self)
+      end
+    end
+  end
+end
+
+Clowne::Declarations.add :after_persist, Clowne::Declarations::AfterPersist

data/lib/clowne/declarations/base.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Clowne
+  module Declarations
+    class Base # :nodoc: all
+      # Used with partial_apply.
+      # By default match everything
+      def matches?(_)
+        true
+      end
+    end
+  end
+end

data/lib/clowne/declarations/exclude_association.rb

@@ -2,10 +2,10 @@
 
 module Clowne
   module Declarations
-    class ExcludeAssociation # :nodoc: all
+    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

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

data/lib/clowne/declarations/include_association.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'clowne/ext/string_constantize'
+require "clowne/ext/string_constantize"
 
 module Clowne
   module Declarations
-    class IncludeAssociation # :nodoc: all
+    class IncludeAssociation < Base # :nodoc: all
       using Clowne::Ext::StringConstantize
 
       attr_accessor :name, :scope, :options
@@ -19,8 +19,22 @@ module Clowne
         plan.add_to(:association, name, self)
       end
 
+      def matches?(names)
+        names = Array(names)
+        names.include?(name)
+      end
+
+      def params_proxy
+        @_params_proxy ||= Clowne::Utils::Params.proxy(options[:params])
+      end
+
+      def params
+        options[:params]
+      end
+
       def clone_with
         return @clone_with if instance_variable_defined?(:@clone_with)
+
         @clone_with =
           case options[:clone_with]
           when String, Symbol

data/lib/clowne/declarations/init_as.rb

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

data/lib/clowne/declarations/nullify.rb

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

data/lib/clowne/declarations/trait.rb

@@ -13,6 +13,7 @@ module Clowne
 
       def compiled
         return @compiled if instance_variable_defined?(:@compiled)
+
         @compiled = compile
       end
 

data/lib/clowne/dsl.rb

@@ -5,10 +5,19 @@ module Clowne
     def adapter(adapter = nil)
       if adapter.nil?
         return @_adapter if instance_variable_defined?(:@_adapter)
+
         @_adapter = Clowne.default_adapter
       else
         @_adapter = Clowne.resolve_adapter(adapter)
       end
     end
+
+    private
+
+    def current_adapter(user_adapter)
+      return adapter if user_adapter.nil?
+
+      Clowne.resolve_adapter(user_adapter)
+    end
   end
 end

data/lib/clowne/ext/lambda_as_proc.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Clowne
+  module Ext
+    # Add to_proc method for lambda
+    module LambdaAsProc
+      refine Proc do
+        def to_proc
+          return self unless lambda?
+
+          this = self
+          proc { |*args| this.call(*args.take(this.arity)) }
+        end
+      end
+    end
+  end
+end

data/lib/clowne/ext/orm_ext.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'clowne/ext/string_constantize'
+require "clowne/ext/string_constantize"
 
 module Clowne
   module Ext

data/lib/clowne/ext/record_key.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Clowne
+  module Ext
+    module RecordKey # :nodoc: all
+      def key(record)
+        id = record.respond_to?(:id) && record.id ? record.id : record.__id__
+        [record.class.name, id].join("#")
+      end
+    end
+  end
+end

data/lib/clowne/ext/string_constantize.rb

@@ -6,15 +6,21 @@ module Clowne
     module StringConstantize
       refine String do
         def constantize
-          names = split('::')
+          names = split("::")
 
           return nil if names.empty?
 
           # Remove the first blank element in case of '::ClassName' notation.
           names.shift if names.size > 1 && names.first.empty?
 
-          names.inject(Object) do |constant, name|
-            constant.const_get(name) if constant.const_defined?(name)
+          begin
+            names.inject(Object) do |constant, name|
+              constant.const_get(name)
+            end
+          # rescue instead of const_defined? allow us to use
+          # Rails const autoloading (aka patched const_get)
+          rescue NameError
+            nil
           end
         end
       end

data/lib/clowne/ext/yield_self_then.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Clowne
+  module Ext # :nodoc: all
+    # Add yield_self and then if missing
+    module YieldSelfThen
+      module Ext
+        unless nil.respond_to?(:yield_self)
+          def yield_self
+            yield self
+          end
+        end
+
+        alias then yield_self
+      end
+
+      # See https://github.com/jruby/jruby/issues/5220
+      ::Object.include(Ext) if RUBY_PLATFORM.match?(/java/i)
+
+      refine Object do
+        include Ext
+      end
+    end
+  end
+end

data/lib/clowne/planner.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
-require 'clowne/plan'
+require "clowne/utils/plan"
 
 module Clowne
   class Planner # :nodoc: all
     class << self
       # Compile plan for cloner with traits
-      def compile(cloner, traits: nil)
+      def compile(adapter, cloner, traits: nil)
         declarations = cloner.declarations.dup
 
         declarations += compile_traits(cloner, traits) unless traits.nil?
 
-        declarations.each_with_object(Plan.new(cloner.adapter.registry)) do |declaration, plan|
+        declarations.each_with_object(
+          Utils::Plan.new(adapter.registry)
+        ) do |declaration, plan|
           declaration.compile(plan)
         end
       end
@@ -26,12 +28,23 @@ module Clowne
         end
       end
 
+      def filter_declarations(plan, only)
+        return plan if only.nil?
+
+        plan.dup.tap do |new_plan|
+          new_plan.declarations.reject! do |(type, declaration)|
+            !only.key?(type) || !declaration.matches?(only[type])
+          end
+        end
+      end
+
       private
 
       def compile_traits(cloner, traits)
         traits.map do |id|
           trait = cloner.traits[id]
           raise ConfigurationError, "Trait not found: #{id}" if trait.nil?
+
           trait.compiled
         end.flatten
       end

data/lib/clowne/resolvers/after_clone.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Clowne
+  class Resolvers
+    module AfterClone # :nodoc: all
+      def self.call(source, record, declaration, params:, **_options)
+        operation = Clowne::Utils::Operation.current
+        operation.add_after_clone(
+          proc do
+            declaration.block.call(source, record, params)
+          end
+        )
+        record
+      end
+    end
+  end
+end

data/lib/clowne/resolvers/after_persist.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Clowne
+  class Resolvers
+    module AfterPersist # :nodoc: all
+      def self.call(source, record, declaration, params:, **_options)
+        operation = Clowne::Utils::Operation.current
+        params ||= {}
+        operation.add_after_persist(
+          proc do
+            declaration.block.call(source, record, **params.merge(mapper: operation.mapper))
+          end
+        )
+        record
+      end
+    end
+  end
+end

data/lib/clowne/resolvers/finalize.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Clowne
+  class Resolvers
+    module Finalize # :nodoc: all
+      def self.call(source, record, declaration, params:, **_options)
+        declaration.block.call(source, record, **params)
+        record
+      end
+    end
+  end
+end

data/lib/clowne/resolvers/init_as.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Clowne
+  class Resolvers
+    module InitAs # :nodoc: all
+      # rubocop: disable Metrics/ParameterLists
+      def self.call(source, _record, declaration, params:, adapter:, **_options)
+        adapter.init_record(declaration.block.call(source, **params))
+      end
+      # rubocop: enable Metrics/ParameterLists
+    end
+  end
+end