active_mappers 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd6aff3a462dafe4ba0f85444bf23fb99e2f8027d94250bd7ffff3895bb130ae
-  data.tar.gz: 42e031c3259e4fd067688ea6a535d0dd8037a71a357409e70f38a913dccfcf4d
+  metadata.gz: '079a7410d46bddc8c29fb479c93f0c36a5ea6063dc4cccec243abe1e2091600c'
+  data.tar.gz: 603213482116be282fc19e985555f125600eff1e327a97884e9d8cca03801edb
 SHA512:
-  metadata.gz: 3d327e22f9b39a5f7f6678de13bf3e35c3631fa5db233fa1765f0043b219b5a16f934251e894e29cd5f05811d67d1275cb3c68139d061127ffddf440c12b246f
-  data.tar.gz: bab2ba1315fac05d999afd1e656cd51b4054ecc893e6c2261f3edc71cdc7b81157abc1c8a2a8caaa7f6175e22d5e1e9597d68c287fba9d70e85569d7353eb4de
+  metadata.gz: 57dcef48079943b68c9509bc6a0d3dc00dd9b87dcf38cc7f4b9ec00d06bceb9f39a91d10d0cce9e38c1ee6e085ddbbeefabdb005c7d1c2cec35f87f5d771ca96
+  data.tar.gz: 8a7273caea91fa180c6ab736242c59e837cb11c62af195d75e35c3a41a20d1a603c1d8d3141cafc2380bfc285144252311390076f6b39cadbe9e27e7405df4aa

data/lib/active_mappers.rb

@@ -32,10 +32,15 @@ module ActiveMappers
       end
     end
 
-    def self.relation(key, mapper = nil, options = {})
+    def self.relation(key, mapper = nil, **options)
       path = options[:optional_path] || key
       each do |resource|
-        mapper_to_use = mapper || KeyTransformer.resource_to_mapper(resource.send(key), self)
+        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)       
+        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), options.merge(rootless: true)) }
       end
     end

data/lib/active_mappers/key_transformer.rb

@@ -16,6 +16,14 @@ module ActiveMappers
       "#{base_namespace(class_from)}::#{resource.class.name}Mapper".constantize
     end
 
+    def self.resource_class_to_mapper(resource_class_name, class_from)
+      resource_class_name[0..1] = '' if resource_class_name.start_with?('::')
+      
+      "#{base_namespace(class_from)}::#{resource_class_name}Mapper".constantize
+    rescue NameError
+      raise "undefined mapper: '#{base_namespace(class_from)}::#{resource_class_name}Mapper'"
+    end
+
     def initialize(name)
       @name = name
     end
@@ -44,6 +52,7 @@ module ActiveMappers
     def self.base_namespace(class_from)
       base_namespace = class_from.name.split('::')[0] rescue ""
       base_namespace = '' unless Setup.ignored_namespaces.include?(base_namespace.downcase.to_sym)
+
       base_namespace
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mappers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michaël Villeneuve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport