active_mappers 1.4.2 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0474908efb2d39ccf71fce1f9b50c66b92fd25e079983d16393dbf2effd111e3'
-  data.tar.gz: f1f3d5e37d076424e2dda3935177f7d73c35d56cbab4cb45e0cf11a0dcd5d7e4
+  metadata.gz: d9c952cdc3025177afc55d21f7967db40c7dad0fee5209701332433978d00c65
+  data.tar.gz: dae057bb4874202b6534ca59d7c0e11ca3765863ed27c9ddd1b83e64baa4bb41
 SHA512:
-  metadata.gz: 106e4e860470afcab4d85def1fab45b9b1649548d1d28be7e5e9f72c3d009b36caaa83b77938b5671bf1210cac75a15ad487813aebda0299b6e847a7fcc81eab
-  data.tar.gz: c2104b4b538e95049bb7de6aa04c9e63fdad645a76c1af11cfea1942e62fdc27a8e2bdb9a8e8c13df6d50e41067b37ff9926ed7ba007b10101cee0aedde7a257
+  metadata.gz: 4fae6b5c455eb0c8eb1798a94dfac64b3bcc8cc82df6761f8669e9f574fdc3efc8e51bcfd862abf9a9293601bf28e8ea2642b55e13ba4a17f4af05efde430085
+  data.tar.gz: 339571d128963541e8ba5ee0bde89b688b17b409169e03cecdc0afc3787d9b3fe4203a91ec1de32f32a7b87dde75b3d9d3079965934c8383df27f5aaa3b77a13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_mappers (1.4.0)
+    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.2'
-  s.date        = '2019-10-09'
+  s.version     = '1.4.7'
+  s.date        = '2020-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,31 +44,36 @@ 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 = 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.dup, self)
+        end
 
-        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)) }
+
+        { key => mapper_to_use.with(path.to_s.split('.').inject(resource, :try), default_options.merge(options)) }
       end
     end
 
     def self.polymorphic(key, **options)
-      each do |resource|
+      each do |resource, context|
+        options[:context] = context
         if polymorphic_resource = resource.send("#{key}_type")
           resource_mapper = "#{KeyTransformer.base_namespace(self)}::#{polymorphic_resource}Mapper".constantize
-          { key => resource_mapper.with(resource.send(key), options.merge(rootless: true)) }
+          { key => resource_mapper.with(resource.send(key), default_options.merge(options)) }
         else
           {}
         end
       end
     end
 
-    def self.acts_as_polymorph
+    def self.acts_as_polymorph(**options)
       each do |resource|
         mapper = KeyTransformer.resource_to_mapper(resource, self)
-        mapper.with(resource, rootless: true)
+        mapper.with(resource, default_options.merge(options))
       rescue NameError
         raise NotImplementedError, 'No mapper found for this type of resource'
       end
@@ -80,7 +85,7 @@ module ActiveMappers
 
     def self.with(args, options = {})
       return evaluate_scopes(args, options) unless options[:scope].nil?
-      
+
       response = if options[:rootless]
         args.respond_to?(:each) ? all(args, options[:context]) : one(args, options[:context])
       else
@@ -90,14 +95,13 @@ module ActiveMappers
     end
 
     def self.evaluate_scopes(args, options)
-      class_to_call = "::#{name}Scope#{options[:scope].capitalize}".constantize rescue raise("ActiveMappers [#{name}] No scope named #{options[:scope]} found")
+      class_to_call = "::#{name}Scope#{options[:scope].capitalize}".constantize rescue (options[:fallback_on_missing_scope] ? self : raise("ActiveMappers [#{name}] No scope named #{options[:scope]} found"))
       return class_to_call.with(args, options.except(:scope))
     end
 
     def self.scope(*params, &block)
-      raise "ActiveMappers [#{name}] scope must be a bloc" if block.nil? || !block.respond_to?(:call)
+      raise "ActiveMappers [#{name}] scope must be a block" if block.nil? || !block.respond_to?(:call)
 
-      
       params.each do |param|
         block_content = Ruby2Ruby.new.process(RubyParser.new.process(block.source).to_a.last)
         eval("class ::#{name}Scope#{param.capitalize} < ::#{name} ; #{block_content}; end")
@@ -107,7 +111,7 @@ module ActiveMappers
     def self.render_with_root(args, options = {})
       resource_name = options[:root]
       resource_name ||= KeyTransformer.apply_on(self.name)
-      
+
       if args.respond_to?(:each)
         { resource_name.to_s.pluralize.to_sym => all(args, options[:context]) }
       else
@@ -128,5 +132,10 @@ module ActiveMappers
 
       KeyTransformer.format_keys(renderers)
     end
+
+    def self.default_options
+      { rootless: true, fallback_on_missing_scope: true }
+    end
+
   end
 end

data/lib/active_mappers/key_transformer.rb

@@ -18,14 +18,14 @@ module ActiveMappers
 
     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
+      @name = name.dup
     end
 
     def remove_ignored_namespace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mappers
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.7
 platform: ruby
 authors:
 - Michaël Villeneuve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Slick, fast view layer for you Rails API.