active_mappers 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 660fe37e8dede541a621db6bc132f584b029025ce0603d35bd33000b59b0be37
-  data.tar.gz: 49850740fc025f8de67e69514f0cc2711afd09d2c8df0aaf06d4faeb5816ee20
+  metadata.gz: d79ff028b7e6d2f46b741374a9ba710f9d5e29b2bdaa5a09dbd561bb77db1ed5
+  data.tar.gz: 2d32b10d4d164961029216dc6e242f95ff8fea2a64f597868107bbdbef4aa02a
 SHA512:
-  metadata.gz: c483bc2c304c8be75080bf1a80b6aa559edb3788b22296ebf4bdc4be1e875f9c233dd2b8c5595e3753d319385e9724c03003e8169a0ecb07283b092fcd8ae686
-  data.tar.gz: f247beef558bccb27f44bcc234eedad0cc65c97185bd3f4f6d7d29d96cbc521a44888af5be85013999ef4c37c8a8bb568412d6ef87ffdb57a4e06c613813b4dd
+  metadata.gz: d72a097acd2e309cdf830c3b5af1d7af3109c77c0dfb7f93e6c9b10391189f281cc77a57270b8077c61cde835d04cec71284efa5433f0059d9e5f143ddd000f4
+  data.tar.gz: f90b555e71c1214a46ddfa340b1cec14dc210b4adee614e13f8e150064f36eb4ac6a8c161ea96d00e76b7cfc1884a3396e73c79a2bf6b0119c306037c802269a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_mappers (1.4.3)
+    active_mappers (1.4.4)
       activesupport (>= 4.2)
       method_source (~> 0.9.2)
       mocha (>= 1.8.0)
@@ -11,29 +11,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     concurrent-ruby (1.1.5)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     metaclass (0.0.4)
     method_source (0.9.2)
-    minitest (5.11.3)
-    mocha (1.8.0)
+    minitest (5.13.0)
+    mocha (1.9.0)
       metaclass (~> 0.0.1)
     rake (12.3.1)
-    ruby2ruby (2.4.2)
+    ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.13.0)
+    ruby_parser (3.14.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.12.0)
+    sexp_processor (4.13.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby

data/active_mappers.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'active_mappers'
-  s.version     = '1.4.3'
-  s.date        = '2019-10-30'
+  s.version     = '1.4.4'
+  s.date        = '2019-11-12'
   s.summary     = 'Slick, fast view layer for you Rails API.'
   s.description = 'Fast, simple, declarative way to design your API\'s view layer'
   s.authors     = ['Michaël Villeneuve']

data/lib/active_mappers.rb

@@ -44,10 +44,14 @@ module ActiveMappers
     def self.relation(key, mapper = nil, **options)
       path = options[:optional_path] || key
       each do |resource|
-        relation_class_name = resource.class&.reflect_on_association(options[:optional_path] || key)&.class_name
-        raise "undefined relation : #{key.to_s}" if (mapper.nil? && relation_class_name.nil?)
-
-        mapper_to_use = mapper || KeyTransformer.resource_class_to_mapper(relation_class_name, self)
+        mapper_to_use = if mapper
+          mapper
+        else
+          relation_class_name = resource.class&.reflect_on_association(options[:optional_path] || key)&.class_name
+          raise "undefined relation : #{key.to_s}" if (mapper.nil? && relation_class_name.nil?)
+          KeyTransformer.resource_class_to_mapper(relation_class_name, self)
+        end
+        
         raise "'#{mapper_to_use.name}' should be a mapper" unless mapper_to_use.ancestors.map(&:to_s).include?("ActiveMappers::Base")
 
         { key => mapper_to_use.with(path.to_s.split('.').inject(resource, :try), default_options.merge(options)) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mappers
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Michaël Villeneuve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport