rom-changeset 5.1.2 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b42968372a3555e8a1a89480c78f75fc2faa07f338d06f2b32636d4e449e5b7
-  data.tar.gz: afd3093895d1acc300a8971cae0dff8f92fc4f45a3ad62f24e6756941c320af3
+  metadata.gz: b5a4ea75bcd9a214497927450d214530d5a3463e2079ae352ec24438f9c5c8f1
+  data.tar.gz: 02d7fdb3a5d700fd800d8170dfa3dee15a898392131f3a4ffff911c7a0e220b0
 SHA512:
-  metadata.gz: d6bc1f125a0606285f3b8ab5038aef3af7b987e0fee43f5d3ce026165fbfb231ac67f5b370f11ba96ae24c7fb7f712198a3c6d0415373c18ee21795066460d4d
-  data.tar.gz: 401db36d8098da987e1ac10b4139d5171b2a15f528d3cc1a8e0eff7a40c00285b0b5478a6baa2894bd04cbce0a81e58e02cd7b0590a68bac4546a952c71e4793
+  metadata.gz: 6b913372527a053b698935fc60d17b3e3093c49e2a152f437d699dfbfce78770411f89d968f7e47bc3cba771f313aa3a458a4c9e6d1706278cd3de9e6cef092b
+  data.tar.gz: 82701e7bb81506e39207d999b986d544173b9251de886a1c0f4d0d6ba2e6b903ff97bf9d621eb149b296c7d04a5964b39ad1a363993630e1a809a0c54d64c6e8

data/lib/rom/changeset.rb

@@ -114,8 +114,8 @@ module ROM
     # Enable a plugin for the changeset
     #
     # @api public
-    def self.use(plugin, options = EMPTY_HASH)
-      ROM.plugin_registry[:changeset].fetch(plugin).apply_to(self, options)
+    def self.use(plugin, **options)
+      ROM.plugin_registry[:changeset].fetch(plugin).apply_to(self, **options)
     end
 
     # Return a new changeset with provided relation
@@ -128,8 +128,8 @@ module ROM
     # @return [Changeset]
     #
     # @api public
-    def new(relation, new_options = EMPTY_HASH)
-      self.class.new(relation, new_options.empty? ? options : options.merge(new_options))
+    def new(relation, **new_options)
+      self.class.new(relation, **options, **new_options)
     end
 
     # Persist changeset
@@ -161,7 +161,7 @@ module ROM
     #
     # @api private
     def command
-      relation.command(command_type, command_compiler_options)
+      relation.command(command_type, **command_compiler_options)
     end
 
     # Return configured command compiler options

data/lib/rom/changeset/extensions/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/relation/graph'
 
 module ROM
@@ -21,4 +23,4 @@ module ROM
       end
     end
   end
-end
+end

data/lib/rom/changeset/pipe.rb

@@ -1,61 +1,63 @@
 # frozen_string_literal: true
 
-require 'transproc/all'
-require 'transproc/registry'
 require 'transproc/transformer'
 
+require 'rom/changeset/pipe_registry'
+
 module ROM
   class Changeset
-    # Transproc Registry useful for pipe
-    #
-    # @api private
-    module PipeRegistry
-      extend Transproc::Registry
-
-      import Transproc::HashTransformations
-
-      def self.add_timestamps(data)
-        now = Time.now
-        Hash(created_at: now, updated_at: now).merge(data)
-      end
-
-      def self.touch(data)
-        Hash(updated_at: Time.now).merge(data)
-      end
-    end
-
     # Composable data transformation pipe used by default in changesets
     #
     # @api private
     class Pipe < Transproc::Transformer[PipeRegistry]
       extend Initializer
 
-      param :processor, default: -> { self.class.transproc }
+      define!(&:identity)
+
+      param :processor, optional: true
+
       option :use_for_diff, optional: true, default: -> { true }
-      option :diff_processor, default: -> { use_for_diff ? processor : nil }
+      option :diff_processor, default: -> { self[processor] }
 
-      def self.[](name)
-        container[name]
+      def self.new(*args, **opts)
+        if args.empty?
+          initialize(**opts)
+        else
+          super
+        end
+      end
+
+      def self.initialize(**opts)
+        transformer = allocate
+        transformer.__send__(:initialize, dsl.(transformer), **opts)
+        transformer
+      end
+
+      def self.[](name_or_proc)
+        container[name_or_proc]
       end
 
-      def [](name)
-        self.class[name]
+      def [](*args)
+        self.class[*args]
       end
 
       def bind(context)
         if processor.is_a?(Proc)
-          self.class.new(Pipe[-> *args { context.instance_exec(*args, &processor) }])
+          new(self.class[-> *args { context.instance_exec(*args, &processor) }])
         else
           self
         end
       end
 
-      def compose(other, for_diff: other.is_a?(Pipe) ? other.use_for_diff : false)
-        new_proc = processor ? processor >> other : other
+      def compose(other, for_diff: other.is_a?(self.class) ? other.use_for_diff : false)
+        new_proc = processor >> other
 
         if for_diff
-          diff_proc = diff_processor ? diff_processor >> other : other
-          new(new_proc, diff_processor: diff_proc)
+          diff_proc = diff_processor >> (
+            other.is_a?(self.class) ? other.diff_processor : other
+          )
+
+          new(new_proc, use_for_diff: true, diff_processor: diff_proc)
         else
           new(new_proc)
         end
@@ -63,23 +65,15 @@ module ROM
       alias_method :>>, :compose
 
       def call(data)
-        if processor
-          processor.call(data)
-        else
-          data
-        end
+        processor.call(data)
       end
 
       def for_diff(data)
-        if diff_processor
-          diff_processor.call(data)
-        else
-          data
-        end
+        use_for_diff ? diff_processor.call(data) : data
       end
 
-      def new(processor, opts = EMPTY_HASH)
-        Pipe.new(processor, opts.empty? ? options : options.merge(opts))
+      def new(processor, **opts)
+        self.class.new(processor, **options, **opts)
       end
     end
   end

data/lib/rom/changeset/pipe_registry.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'transproc/all'
+require 'transproc/registry'
+
+module ROM
+  class Changeset
+    # Transproc Registry useful for pipe
+    #
+    # @api private
+    module PipeRegistry
+      extend Transproc::Registry
+
+      import Transproc::Coercions
+      import Transproc::HashTransformations
+
+      def self.add_timestamps(data)
+        now = Time.now
+        Hash(created_at: now, updated_at: now).merge(data)
+      end
+
+      def self.touch(data)
+        Hash(updated_at: Time.now).merge(data)
+      end
+    end
+  end
+end

data/lib/rom/changeset/stateful.rb

@@ -57,11 +57,11 @@ module ROM
       # @see https://github.com/solnic/transproc Transproc
       #
       # @api public
-      def self.map(options = EMPTY_HASH, &block)
+      def self.map(**options, &block)
         if block.parameters.empty?
-          pipes << Class.new(Pipe, &block).new(options)
+          pipes << Class.new(Pipe).define!(&block).new(**options)
         else
-          pipes << Pipe.new(block, options)
+          pipes << Pipe.new(block, **options)
         end
       end
 
@@ -87,12 +87,13 @@ module ROM
       #
       # @return [Pipe]
       def self.default_pipe(context)
-        pipes.size > 0 ? pipes.map { |p| p.bind(context) }.reduce(:>>) : EMPTY_PIPE
+        !pipes.empty? ? pipes.map { |p| p.bind(context) }.reduce(:>>) : EMPTY_PIPE
       end
 
       # @api private
       def self.inherited(klass)
         return if klass == ROM::Changeset
+
         super
         klass.instance_variable_set(:@__pipes__, pipes.dup)
       end
@@ -149,13 +150,13 @@ module ROM
       # @api public
       def extend(*steps, **options, &block)
         if block
-          if steps.size > 0
-            extend(*steps, options).extend(options, &block)
+          if !steps.empty?
+            extend(*steps, **options).extend(**options, &block)
           else
-            with(pipe: pipe.compose(Pipe.new(block).bind(self), options))
+            with(pipe: pipe.compose(Pipe.new(block).bind(self), **options))
           end
         else
-          with(pipe: steps.reduce(pipe.with(options)) { |a, e| a.compose(pipe[e], options) })
+          with(pipe: steps.reduce(pipe.with(**options)) { |a, e| a.compose(pipe[e], **options) })
         end
       end
 
@@ -278,6 +279,7 @@ module ROM
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/rom/changeset/update.rb

@@ -45,7 +45,7 @@ module ROM
       #
       # @api public
       def diff?
-        ! diff.empty?
+        !diff.empty?
       end
 
       # Return if there's no diff between the original and changeset data

data/lib/rom/changeset/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   class Changeset
-    VERSION = '5.1.2'
+    VERSION = '5.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-changeset
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2020-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: transproc
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +102,7 @@ files:
 - lib/rom/changeset/delete.rb
 - lib/rom/changeset/extensions/relation.rb
 - lib/rom/changeset/pipe.rb
+- lib/rom/changeset/pipe_registry.rb
 - lib/rom/changeset/stateful.rb
 - lib/rom/changeset/update.rb
 - lib/rom/changeset/version.rb
@@ -135,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.0.pre3
 signing_key: 
 specification_version: 4
 summary: Changeset abstraction for rom-rb