rom-core 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a3f6e2d5a5766b74211f597f8c770b4ec40b5bd1854713362d2aadf34771cc1
-  data.tar.gz: 91d1f31afbaed20b9069c65cd1f49800f9fd51a2667171545622183bb7e40100
+  metadata.gz: bccec1ca22ee806eff149f4e61c1c6cf75eed1dfb1944ee7635239fdff7d7d26
+  data.tar.gz: 6ed39c371e2541d83e0060df63278444b852713f3c8a177242b1c41bbbeb14cb
 SHA512:
-  metadata.gz: 477a287ed6a51fc9d8a471d10bf1d7fa58e303e1eb74889c40e87d1ff81e6b24228d89b63cd2e99050460bb3f66dd5463132247e758204eb151d769194d47065
-  data.tar.gz: d92fe3590ddbae8511705100c4bb91c5539dd54a987a461e12e41e5faab35d28a31852faf58b6494a9ee7172ccf564a0f44f643c2da5a95914069b1b6fd36257
+  metadata.gz: 4f53fba8d16d7483f9b1779bcf461b71c4d3ed7cde17466765e022284a310c61947317340380ca8d9065ac8a4a0741d0c777b55f161d085355aa67a52d062f9e
+  data.tar.gz: e1508e8c595774a991c7a57eaa15bff719b83a022c768cc1f7e05931001321045524975ade75295c8e6963882cfe78f03f5f7dae4111916248f3364b2780200e

data/lib/rom/attribute.rb

@@ -22,6 +22,8 @@ module ROM
 
     extend Initializer
 
+    META_OPTIONS = %i[primary_key foreign_key source target relation].freeze
+
     # @!attribute [r] type
     #   @return [Dry::Types::Nominal, Dry::Types::Sum, Dry::Types::Constrained] The attribute's type object
     param :type

data/lib/rom/gateway.rb

@@ -34,22 +34,6 @@ module ROM
     #    @param [Symbol] adapter The adapter identifier
     defines :adapter
 
-    # @!method self.mapper_compiler
-    #  Get or set gateway-specific mapper compiler class
-    #
-    #  @overload mapper_compiler
-    #    Return mapper compiler class
-    #    @return [Class]
-    #
-    #  @overload mapper_compiler(klass)
-    #    @example
-    #      class MyGateway < ROM::Gateway
-    #        mapper_compiler MyMapperCompiler
-    #      end
-    #
-    #    @param [Class] klass The mapper compiler class
-    defines :mapper_compiler
-
     # @!attribute [r] connection
     #   @return [Object] The gateway's connection object (type varies across adapters)
     attr_reader :connection
@@ -106,17 +90,15 @@ module ROM
       when Symbol
         klass = class_from_symbol(gateway_or_scheme)
 
-        if klass.instance_method(:initialize).arity == 0
+        if klass.instance_method(:initialize).arity.zero?
           klass.new
         else
           klass.new(*args)
         end
       else
-        if args.empty?
-          gateway_or_scheme
-        else
-          raise ArgumentError, "Can't accept arguments when passing an instance"
-        end
+        raise ArgumentError, "Can't accept arguments when passing an instance" unless args.empty?
+
+        gateway_or_scheme
       end
     end
 
@@ -128,7 +110,7 @@ module ROM
     #
     # @api private
     def self.class_from_symbol(type)
-      adapter = ROM.adapters.fetch(type) {
+      adapter = ROM.adapters.fetch(type) do
         begin
           require "rom/#{type}"
         rescue LoadError
@@ -136,7 +118,7 @@ module ROM
         end
 
         ROM.adapters.fetch(type)
-      }
+      end
 
       adapter.const_get(:Gateway)
     end
@@ -196,15 +178,6 @@ module ROM
       transaction_runner(opts).run(opts, &block)
     end
 
-    # Return configured mapper compiler class
-    #
-    # @return [Class]
-    #
-    # @api private
-    def mapper_compiler
-      self.class.mapper_compiler
-    end
-
     private
 
     # @api private

data/lib/rom/relation/combined.rb

@@ -14,15 +14,25 @@ module ROM
 
       # Create a new relation combined with others
       #
-      # @param [Relation] root
+      # @param [Relation] relation
       # @param [Array<Relation>] nodes
       #
       # @return [Combined]
       #
       # @api public
-      def self.new(root, nodes)
-        root_ns = root.options[:struct_namespace]
-        super(root, nodes.map { |node| node.struct_namespace(root_ns) })
+      def self.new(relation, nodes)
+        struct_ns = relation.options[:struct_namespace]
+        new_nodes = nodes.map { |node| node.struct_namespace(struct_ns) }
+
+        root =
+          if relation.is_a?(self)
+            new_nodes.concat(relation.nodes)
+            relation.root
+          else
+            relation
+          end
+
+        super(root, new_nodes)
       end
 
       # Combine this graph with more nodes
@@ -142,7 +152,7 @@ module ROM
 
       # @api private
       def decorate?(other)
-        super || other.is_a?(Wrap)
+        super || other.is_a?(self.class) || other.is_a?(Wrap)
       end
     end
   end

data/lib/rom/schema/dsl.rb

@@ -149,7 +149,7 @@ module ROM
           type.meta(source: relation, read: type.meta[:read].optional)
         else
           type.meta(source: relation)
-        end
+        end.meta(Attribute::META_OPTIONS.map { |opt| [opt, options[opt]] if options.key?(opt) }.compact.to_h)
       end
 
       # Specify which key(s) should be the primary key

data/lib/rom/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module Core
-    VERSION = '5.0.1'
+    VERSION = '5.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-core
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby