rom 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a76e7a694c3096111424b115fe238285183a2e8
-  data.tar.gz: 27559d733a9470cbdc93878625b5c0157ec56964
+  metadata.gz: 2c8052ad74ae5b51b3c93fdf26f763c9b4311c03
+  data.tar.gz: 7b08d6d109408b867d9835091f2659113677d9f0
 SHA512:
-  metadata.gz: 27fcabc336dde4cee458d52311b3f2eed5934bc5a12055f339a0e7051e14526d14a17fc4aa2d581aa4ccf58ae4fc83357ae87689a328e4b4c2b9c530a5ffa2f6
-  data.tar.gz: bf6a440ce37fe9953752c8781737361b1cae014afd78d808db2468a71de68c9e0af7bb7d6920227ce4317a25e5bba86ae64b0f1150d20eccf05416f94089108f
+  metadata.gz: 104cc004f3767ad8ce1907597ef7d93b2eca030517cacc174830c391ce64e09f367980b0f6d271be535286c2cbd4fb949bae1d656b32b604011b353450abf5ff
+  data.tar.gz: c82137cf1b58dfa77ac280b0847c78625eb0fd86f0da3d416f71b2cf5340f9342703086d40681b482813ca0d2be10461db3c04c044133bf6b975e435ce7ac039

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v3.3.1 2017-07-09
+
+### Fixed
+
+* `Relation#map_with` works with custom mappers (solnic)
+
+[Compare v3.3.0...v3.3.1](https://github.com/rom-rb/rom/compare/v3.3.0...v3.3.1)
+
 # v3.3.0 2017-07-05
 
 This release only adds deprecation warnings in preparation for rom 4.0 release.

data/lib/rom/setup/finalize.rb

@@ -61,8 +61,8 @@ module ROM
     def run!
       infer_relations
 
-      relations = load_relations
       mappers = load_mappers
+      relations = load_relations(mappers)
       commands = load_commands(relations)
 
       container = Container.new(gateways, relations, mappers, commands)
@@ -91,8 +91,12 @@ module ROM
     # This includes both classes created via DSL and explicit definitions
     #
     # @api private
-    def load_relations
-      FinalizeRelations.new(gateways, relation_classes, plugins.select(&:relation?)).run!
+    def load_relations(mappers)
+      FinalizeRelations.new(
+        gateways,
+        relation_classes,
+        mappers: mappers, plugins: plugins.select(&:relation?)
+      ).run!
     end
 
     # @api private

data/lib/rom/setup/finalize/finalize_relations.rb

@@ -1,4 +1,5 @@
 require 'rom/relation_registry'
+require 'rom/mapper_registry'
 
 module ROM
   class Finalize
@@ -11,9 +12,10 @@ module ROM
       # @param [Array] relation_classes a list of relation descendants
       #
       # @api private
-      def initialize(gateways, relation_classes, plugins = EMPTY_ARRAY)
+      def initialize(gateways, relation_classes, mappers: EMPTY_HASH, plugins: EMPTY_ARRAY)
         @gateways = gateways
         @relation_classes = relation_classes
+        @mappers = mappers
         @plugins = plugins
       end
 
@@ -58,9 +60,16 @@ module ROM
           plugin.apply_to(klass)
         end
 
+        relname = klass.register_as
         dataset = gateway.dataset(klass.schema.name.dataset).instance_exec(klass, &ds_proc)
+        mappers = @mappers.key?(relname) ? @mappers[relname] : MapperRegistry.new
 
-        options = { __registry__: registry, schema: schema.with(relations: registry), **plugin_options }
+        options = {
+          __registry__: registry,
+          schema: schema.with(relations: registry),
+          mappers: mappers,
+          **plugin_options
+        }
 
         klass.new(dataset, options)
       end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '3.3.0'.freeze
+  VERSION = '3.3.1'.freeze
 end

data/spec/integration/setup_spec.rb

@@ -113,6 +113,9 @@ RSpec.describe 'Configuring ROM' do
 
       expect(container.relation(:users).by_name('Jane').as(:users).to_a)
         .to eql([Test::User.new(name: 'Jane')])
+
+      expect(container.relations[:users].map_with(:users).to_a)
+        .to eql([Test::User.new(name: 'Jane')])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby