active_mappers 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3667d085d34c9dc82b81c74d86ee0d71586582b2b52072e22c0ef79b2cf12bfa
-  data.tar.gz: 2062f976d9bd10e73020fedeab83fcc468a14685e713fbd44e0b927e160872b7
+  metadata.gz: 32a8f6aba4888e9ff50871fab7eb457de33f785d5a32758c77bbb01c1ef75d80
+  data.tar.gz: a1c03591088552e3bbdf29e291de4e9628c50b06af5a294358935812d2419271
 SHA512:
-  metadata.gz: 91225abdb07c262dedcd047a97ea95a8ef132519591880decde3525311d9a1cba65e5f3b33542cf826dfa5ddc639b2744dfbd08dcaa4e185cddd0aaf1c80a5f6
-  data.tar.gz: 0dcaa09aed08f57a9026c4ac6887315c39664959573d76ca95ef81c6c7b17c7f141deb73742debcbd0a972fce9b065e8123bf0587597db59b49bca7eb14a1383
+  metadata.gz: 0b44b4c1097e49c8c4520eff7bf8d64cc5c98709b87ae429f9d53e613ca914e5cf15f4526dddbf422d8f45beaa8c7280ed520cd39e51f0c79b396739fc8d3f3c
+  data.tar.gz: f281126bf5b01be6eb640fcde71fbda419d9eed32417af5afd30f4c6f7245ccbbef6bade670bfe176730ce904562088623dd76c9e93b5d199cf675af374e3018

data/active_mappers.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'active_mappers'
-  s.version     = '1.5.0'
+  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'

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

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

@@ -85,12 +85,15 @@ 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) : one(args, options)
       else
@@ -100,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")
@@ -129,13 +144,30 @@ module ActiveMappers
     end
 
     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] && (mapper = KeyTransformer.resource_to_mapper(resource, self) rescue nil) && name != mapper&.name
-        return mapper.with(resource, default_options.merge(options))
+
+      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, options[:context])
       end.reduce(&:merge)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_mappers
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Michaël Villeneuve