active_mappers 1.4.1 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6645f47b539aaf463969e77a0124e6f175e1d416062a1b20b3cfb844a70d7f1
-  data.tar.gz: e9281f76b54f95f5435aefd6d546456ad2e8370f747603360cc6623727c42a85
+  metadata.gz: ac980b374337decc27f455542605a5aaf6da146ec1a3b96547e69f9287061b44
+  data.tar.gz: 1df7c23ac090efebb1498bc6ecc8d9944a282edf03179fae71a88c5204c08102
 SHA512:
-  metadata.gz: 6d1b60f6a7a67fd6f258427c202955cc4a60fcf143d57b4ccd6b10aa1b9d88e95ffeb3874cd72dcf997a5836dd7a59914be75bf7358d426bbabfb97a9195b4df
-  data.tar.gz: 0a921774c1c38eee7d0ec1adbf436676190bbdb2b2b3e396da146aec2bc024acd278ee49cd469017e32d26db03ea17e0f0a28888afade69c297417b2954ba7e6
+  metadata.gz: 40d83c52a139b9f76e7eda851cc071f4435b3a7c8d35a294e632d45a92471c34753b72c5ac0d5b0e600646ad7cce468a7f56ffbca0b39ab8f410a28fea9c1a8e
+  data.tar.gz: 6aadec0ca9cf96a877df5e534b1be7870cee3417d2332d23410b8bb0e223af1224b6b85a0b4b5f11c319525c8f643f020e1dd98680acfaf7ad861ce622050947

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.1'
-  s.date        = '2019-05-10'
+  s.version     = '1.4.6'
+  s.date        = '2020-11-10'
   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 = 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")
+        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
         
-        { key => mapper_to_use.with(path.to_s.split('.').inject(resource, :try), options.merge(rootless: true)) }
+        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)) }
       end
     end
 
-    def self.polymorphic(key)
-      each do |resource|
+    def self.polymorphic(key, **options)
+      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), 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.1
+  version: 1.4.6
 platform: ruby
 authors:
 - Michaël Villeneuve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-11-10 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.