active_mappers 1.4.7 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c952cdc3025177afc55d21f7967db40c7dad0fee5209701332433978d00c65
-  data.tar.gz: dae057bb4874202b6534ca59d7c0e11ca3765863ed27c9ddd1b83e64baa4bb41
+  metadata.gz: 32a8f6aba4888e9ff50871fab7eb457de33f785d5a32758c77bbb01c1ef75d80
+  data.tar.gz: a1c03591088552e3bbdf29e291de4e9628c50b06af5a294358935812d2419271
 SHA512:
-  metadata.gz: 4fae6b5c455eb0c8eb1798a94dfac64b3bcc8cc82df6761f8669e9f574fdc3efc8e51bcfd862abf9a9293601bf28e8ea2642b55e13ba4a17f4af05efde430085
-  data.tar.gz: 339571d128963541e8ba5ee0bde89b688b17b409169e03cecdc0afc3787d9b3fe4203a91ec1de32f32a7b87dde75b3d9d3079965934c8383df27f5aaa3b77a13
+  metadata.gz: 0b44b4c1097e49c8c4520eff7bf8d64cc5c98709b87ae429f9d53e613ca914e5cf15f4526dddbf422d8f45beaa8c7280ed520cd39e51f0c79b396739fc8d3f3c
+  data.tar.gz: f281126bf5b01be6eb640fcde71fbda419d9eed32417af5afd30f4c6f7245ccbbef6bade670bfe176730ce904562088623dd76c9e93b5d199cf675af374e3018

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.7'
-  s.date        = '2020-11-12'
+  s.version     = '1.5.1'
+  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

@@ -11,7 +11,6 @@ module ActiveMappers
 
         @klass.class_variables.each do |var_name|
           dsl_values = @subclass.class_variable_get(var_name)
-
           dsl_values[@subclass.name] = dsl_values[@klass.name].dup
         end
       end
@@ -23,4 +22,4 @@ module ActiveMappers
       end
     end
   end
-end
+end

data/lib/active_mappers/key_transformer.rb

@@ -12,8 +12,8 @@ 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
+    def self.resource_to_mapper(resource, class_from, scope=nil)
+      "#{base_namespace(class_from)}::#{resource.class.name}Mapper#{scope ? "Scope#{scope.capitalize}" : nil}".constantize
     end
 
     def self.resource_class_to_mapper(resource_class_name, class_from)

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 = {}
@@ -80,14 +85,17 @@ module ActiveMappers
     end
 
     def self.each(&block)
+      # puts "[l. #{__LINE__}] [#{name}] each"
       @@renderers[name] = (@@renderers[name] || []) << block
     end
 
     def self.with(args, options = {})
-      return evaluate_scopes(args, options) unless options[:scope].nil?
-
+      # puts "[l. #{__LINE__}] WITH - #{name} - #{options}"
+      if options[:scope].present? && !name.include?('Scope')
+        return evaluate_scopes(args, options)
+      end
       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
@@ -95,13 +103,25 @@ module ActiveMappers
     end
 
     def self.evaluate_scopes(args, options)
-      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))
+      # puts "[l. #{__LINE__}] [#{name}] evaluate_scopes #{options}"
+      class_to_call = begin
+        "::#{name}Scope#{options[:scope].capitalize}".constantize
+      rescue
+        if options[:fallback_class]
+          options[:fallback_class]
+        elsif options[:fallback_on_missing_scope]
+          self
+        else
+          raise("ActiveMappers [#{name}] No scope named #{options[:scope]} found")
+        end
+      end
+      # puts "[l.#{__LINE__}] evaluate_scopes class_to_call -> #{class_to_call}"
+      return class_to_call.with(args, options.merge(initial_mapper: self))
     end
 
     def self.scope(*params, &block)
+      # puts "[l.#{__LINE__}] [#{name}] CREATING SCOPE CLASSES (name: #{name} | params: #{params.inspect}) ===> ::#{name}Scope#{params.first.capitalize}"
       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")
@@ -113,21 +133,43 @@ 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 = {})
+      # puts "[l.#{__LINE__}] [#{name}] ONE - options: #{options.inspect} - inheritance_column: #{@@inheritance_column[name]}"
       return nil unless resource
+
+      if @@inheritance_column[name] && !options[:fallback_class]
+        main_mapper = KeyTransformer.resource_to_mapper(resource, self)
+        # puts "[l.#{__LINE__}] [#{name}] ONE - main_mapper #{main_mapper}"
+        mapper = options[:scope] ? (KeyTransformer.resource_to_mapper(resource, self, options[:scope]) rescue main_mapper) : main_mapper
+        # puts "[l.#{__LINE__}] [#{name}] ONE - mapper #{mapper}"
+        if name != mapper&.name
+          return mapper.with(resource, options.merge(rootless: true, fallback_class: options[:initial_mapper]))
+        end
+      end
+
       return {} if @@renderers[name].nil? # Mapper is empty
+
+      # base_mapper = name.rpartition('::').first
+
+      # renderers = ancestors.select { |it| it.name.start_with?(base_mapper) }.map do |ancestor|
+      #   puts "---> #{ancestor.name}"
+      #   @@renderers[ancestor.name].map do |renderer|
+      #     renderer.call(resource, options[:context])
+      #   end.reduce(&:merge)
+      # end.reduce(&:merge)
+
       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.7
+  version: 1.5.1
 platform: ruby
 authors:
 - Michaël Villeneuve
-autorequire: 
+- Loïc SENCE
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-12 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: []