active_mappers 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb3ead7f2e01c74596860dd9d08e128cf654538b70edc0141617909d81230fd
-  data.tar.gz: '08488c7003f0a900295f4e86b9a6f975b5f317c2490821a69060693f2c36d127'
+  metadata.gz: 16811a18fe1b63819d670a4e585c4332a8e33bcdd9d17fe6bae637a1a77aa6d7
+  data.tar.gz: 5b56675cc1c54d601edf2b56d1fe7de8e777201731aa520419c956c21d998269
 SHA512:
-  metadata.gz: 17b41436d9c4477d5fe21936140a103c1c3f2e528d734601e69653e3d5e608117a97fa67c27d2742bd45b2ee170d85bea0940319152b0fe1b0d5bea26668b6f4
-  data.tar.gz: 06a3873ae63e407e1c4f35c3ae471502fbc30d1b935b21115aaaffada25e95060bae5498a44965913201276cd7dd9a10a0d2d892c28bbc829c60b79d931026a7
+  metadata.gz: a58442bba50d6f30e59cb401a3a1f04b62c20fd6ebeeb5f7674d09b4b522c9afa8a6ca79cbeeb43e6b315c9541193242e1b8e2847adc1fd05914b75d310ffadc
+  data.tar.gz: b56d83421fe67e28be9bea210aecc83202b4798166fac5dc7cdffde10a55cee3c6e55c0ec511c7c19dd7aa54da0a312615c9b229eb7ec8c7aa97c5dc381d4f67

data/lib/active_mappers.rb

@@ -32,24 +32,23 @@ module ActiveMappers
 
     def self.relation(key, mapper = nil, optional_path = nil)
       path = optional_path || key
-
       each do |resource|
-        mapper ||= "::#{resource.send(key).class.name}Mapper".constantize
-        { key => mapper.with(path.to_s.split('.').inject(resource, :try), rootless: true) }
+        mapper_to_use = mapper || KeyTransformer.resource_to_mapper(resource.send(key), self)
+        { key => mapper_to_use.with(path.to_s.split('.').inject(resource, :try), rootless: true) }
       end
     end
 
     def self.polymorphic(key)
       each do |resource|
-        resource_mapper = "::#{resource.send("#{key}_type")}Mapper".constantize
+        resource_mapper = "#{KeyTransformer.base_namespace(self)}::#{resource.send("#{key}_type")}Mapper".constantize
         { key => resource_mapper.with(resource.send(key), rootless: true) }
       end
     end
 
     def self.acts_as_polymorph
       each do |resource|
-        mapper = "::#{resource.class}Mapper".constantize
-        mapper.with(resource, rootless: true)
+        mapper = KeyTransformer.resource_to_mapper(resource, self)
+        mapper.with(resource, rootless: true)  
       rescue NameError
         raise NotImplementedError, 'No mapper found for this type of resource'
       end

data/lib/active_mappers/key_transformer.rb

@@ -12,6 +12,10 @@ module ActiveMappers
       Setup.camelcase_keys ? hash.to_lower_camel_case : hash
     end
 
+    def self.resource_to_mapper(resource, class_from)
+      "#{base_namespace(class_from)}::#{resource.class.name}Mapper".constantize
+    end
+
     def initialize(name)
       @name = name
     end
@@ -36,5 +40,11 @@ module ActiveMappers
 
       (Setup.root_keys_transformer || transformer).call(@name)
     end
+
+    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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_mappers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michaël Villeneuve