active_mappers 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac980b374337decc27f455542605a5aaf6da146ec1a3b96547e69f9287061b44
-  data.tar.gz: 1df7c23ac090efebb1498bc6ecc8d9944a282edf03179fae71a88c5204c08102
+  metadata.gz: 3667d085d34c9dc82b81c74d86ee0d71586582b2b52072e22c0ef79b2cf12bfa
+  data.tar.gz: 2062f976d9bd10e73020fedeab83fcc468a14685e713fbd44e0b927e160872b7
 SHA512:
-  metadata.gz: 40d83c52a139b9f76e7eda851cc071f4435b3a7c8d35a294e632d45a92471c34753b72c5ac0d5b0e600646ad7cce468a7f56ffbca0b39ab8f410a28fea9c1a8e
-  data.tar.gz: 6aadec0ca9cf96a877df5e534b1be7870cee3417d2332d23410b8bb0e223af1224b6b85a0b4b5f11c319525c8f643f020e1dd98680acfaf7ad861ce622050947
+  metadata.gz: 91225abdb07c262dedcd047a97ea95a8ef132519591880decde3525311d9a1cba65e5f3b33542cf826dfa5ddc639b2744dfbd08dcaa4e185cddd0aaf1c80a5f6
+  data.tar.gz: 0dcaa09aed08f57a9026c4ac6887315c39664959573d76ca95ef81c6c7b17c7f141deb73742debcbd0a972fce9b065e8123bf0587597db59b49bca7eb14a1383

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_mappers (1.4.4)
+    active_mappers (1.5.0)
       activesupport (>= 4.2)
       method_source (~> 0.9.2)
       mocha (>= 1.8.0)
@@ -11,31 +11,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
       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.7.0)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    drb (2.2.0)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    metaclass (0.0.4)
     method_source (0.9.2)
-    minitest (5.13.0)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
-    rake (12.3.1)
-    ruby2ruby (2.4.4)
+    minitest (5.21.2)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    mutex_m (0.2.0)
+    racc (1.7.3)
+    rake (13.1.0)
+    ruby2_keywords (0.0.5)
+    ruby2ruby (2.5.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.14.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.13.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.1)
+    ruby_parser (3.21.0)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.17.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
@@ -45,4 +55,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.17.2
+   2.5.4

data/active_mappers.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = 'active_mappers'
-  s.version     = '1.4.6'
-  s.date        = '2020-11-10'
+  s.version     = '1.5.0'
+  s.date        = '2024-01-26'
   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']
+  s.authors     = ['Michaël Villeneuve', 'Loïc SENCE']
   s.homepage    = 'https://github.com/fidme/active_mappers'
   s.email       = 'contact@michaelvilleneuve.fr'
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do

data/lib/active_mappers/handlers/inheritance.rb

@@ -23,4 +23,4 @@ module ActiveMappers
       end
     end
   end
-end
+end

data/lib/active_mappers.rb

@@ -14,11 +14,16 @@ require_relative 'active_mappers/key_transformer'
 module ActiveMappers
   class Base
     @@renderers = {}
+    @@inheritance_column = {}
 
     def self.inherited(subclass)
       Handlers::Inheritance.new(subclass, self).handle
     end
 
+    def self.inheritance_column(val)
+      @@inheritance_column[name] = val
+    end
+
     def self.attributes(*params)
       each do |resource|
         h = {}
@@ -49,9 +54,9 @@ module ActiveMappers
         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)
+          KeyTransformer.resource_class_to_mapper(relation_class_name.dup, self)
         end
-        
+
         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)) }
@@ -87,7 +92,7 @@ module ActiveMappers
       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])
+        args.respond_to?(:each) ? all(args, options) : one(args, options)
       else
         render_with_root(args, options)
       end
@@ -113,21 +118,26 @@ module ActiveMappers
       resource_name ||= KeyTransformer.apply_on(self.name)
 
       if args.respond_to?(:each)
-        { resource_name.to_s.pluralize.to_sym => all(args, options[:context]) }
+        { resource_name.to_s.pluralize.to_sym => all(args, options) }
       else
-        { resource_name.to_s.singularize.to_sym => one(args, options[:context]) }
+        { resource_name.to_s.singularize.to_sym => one(args, options) }
       end
     end
 
-    def self.all(collection, context = nil)
-      collection.map { |el| one(el, context) }.compact
+    def self.all(collection, options = {})
+      collection.map { |el| one(el, options) }.compact
     end
 
-    def self.one(resource, context = nil)
+    def self.one(resource, options = {})
       return nil unless resource
+      if @@inheritance_column[name] && (mapper = KeyTransformer.resource_to_mapper(resource, self) rescue nil) && name != mapper&.name
+        return mapper.with(resource, default_options.merge(options))
+      end
+
       return {} if @@renderers[name].nil? # Mapper is empty
+
       renderers = @@renderers[name].map do |renderer|
-        renderer.call(resource, context)
+        renderer.call(resource, options[:context])
       end.reduce(&:merge)
 
       KeyTransformer.format_keys(renderers)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_mappers
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Michaël Villeneuve
-autorequire: 
+- Loïc SENCE
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,7 +102,7 @@ homepage: https://github.com/fidme/active_mappers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.4
+signing_key:
 specification_version: 4
 summary: Slick, fast view layer for you Rails API.
 test_files: []