active_mappers 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0474908efb2d39ccf71fce1f9b50c66b92fd25e079983d16393dbf2effd111e3'
-  data.tar.gz: f1f3d5e37d076424e2dda3935177f7d73c35d56cbab4cb45e0cf11a0dcd5d7e4
+  metadata.gz: 660fe37e8dede541a621db6bc132f584b029025ce0603d35bd33000b59b0be37
+  data.tar.gz: 49850740fc025f8de67e69514f0cc2711afd09d2c8df0aaf06d4faeb5816ee20
 SHA512:
-  metadata.gz: 106e4e860470afcab4d85def1fab45b9b1649548d1d28be7e5e9f72c3d009b36caaa83b77938b5671bf1210cac75a15ad487813aebda0299b6e847a7fcc81eab
-  data.tar.gz: c2104b4b538e95049bb7de6aa04c9e63fdad645a76c1af11cfea1942e62fdc27a8e2bdb9a8e8c13df6d50e41067b37ff9926ed7ba007b10101cee0aedde7a257
+  metadata.gz: c483bc2c304c8be75080bf1a80b6aa559edb3788b22296ebf4bdc4be1e875f9c233dd2b8c5595e3753d319385e9724c03003e8169a0ecb07283b092fcd8ae686
+  data.tar.gz: f247beef558bccb27f44bcc234eedad0cc65c97185bd3f4f6d7d29d96cbc521a44888af5be85013999ef4c37c8a8bb568412d6ef87ffdb57a4e06c613813b4dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_mappers (1.4.0)
+    active_mappers (1.4.3)
       activesupport (>= 4.2)
       method_source (~> 0.9.2)
       mocha (>= 1.8.0)

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.3'
+  s.date        = '2019-10-30'
   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

@@ -47,10 +47,10 @@ module ActiveMappers
         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 = 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
 
@@ -58,17 +58,17 @@ module ActiveMappers
       each do |resource|
         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 +80,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 +90,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 +106,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 +127,10 @@ module ActiveMappers
 
       KeyTransformer.format_keys(renderers)
     end
+
+    def self.default_options
+      { rootless: true, fallback_on_missing_scope: true }
+    end
+
   end
 end

metadata

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