activeadmin_decorator 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbd1ee7dba87fb7db7df96d74b0c9f7ad65f228d49501eeb0dc6dcb375c543d
-  data.tar.gz: a6857c139caad372f9c969aacd1dd4c635f3517580c6958b657203a71f3644a5
+  metadata.gz: 1aa3d5c6a44294b75d34898242260a457d281767f805e171b34f96fa0c22a441
+  data.tar.gz: ed311ac3f20aebac9af7e5a10e4e0ac576c2da717edaa0df8e061bedd56ab0b4
 SHA512:
-  metadata.gz: 61a35efbc1eea4be20001404d3a3ff3789c25493d7e61b08c3a962d0987d94e5a659e2dc7303670d5316c3d63ca4b74e9fba0f8c58460fdeb206db9cc201e505
-  data.tar.gz: 49c9d04c49fd4d6c2471d5f65c530b91268885e70048ac3388f454a085539a233f69bc2185f2ca9862de615d1ee961e5d2763b880cd6e7a5bd3594f7a59a32bd
+  metadata.gz: d39774cfbfafec1065209ce73b89ba98caeb2221385f70f4ecf1628a6466a225834b03bc5fc83a4ee38d45098b15710953cab11b0342de38204b6c5d4d6053d9
+  data.tar.gz: 9a06ba36f44a9476eed1e7a4241d3d5eba2fd4ec4ff06632a3f5ca6949ad7b43117d795171b5afaa86693a609038ad085dc7e78bc0b17641b7418f0a408f984b

data/README.md

@@ -39,21 +39,25 @@ end
 Each decorated association will be available as a method on the decorator,
 you can still access the original association with `model.association_name`.
 
+The association decorator class name will be auto-detected from the relation result and current decorator name if not given.
+Example for `:comments` association on `Decorators::UserDecorator` it will be `Decorators::CommentDecorator`.
+
 ### ArbreDecorator
 
 With `ActiveAdmin::ArbreDecorator` you can keep your show/index blocks in AA clean and use Arbre DSL in decorator:
 ```ruby
 class UserDecorator < ActiveAdmin::ArbreDecorator
   def full_name
-    ul do |list|
-      list.li first_name
-      list.li last_name
+    ul do
+      li first_name
+      li last_name
     end
   end
 end
 ```
+This is done by using including `Arbre::Element::BuilderMethods` and new `arbre_context`.
 
-Also included: `ActiveAdmin::ViewHelpers`, `ActionView::Helpers` and `Rails.application.routes.url_helpers`,
+Also included: `ActionView::Helpers` and `Rails.application.routes.url_helpers`,
 so you can:
 ```ruby
 class CommentDecorator < ActiveAdmin::ArbreDecorator

data/lib/activeadmin/arbre_decorator.rb

@@ -4,43 +4,16 @@ require_relative 'decorator'
 
 module ActiveAdmin
   class ArbreDecorator < Decorator
-    include ActiveAdmin::ViewHelpers
     include ActionView::Helpers
-
-    CONFLICTING_METHODS = %i[display_name title].freeze
+    include Arbre::Element::BuilderMethods
 
     def initialize(obj)
       super
       singleton_class.include Rails.application.routes.url_helpers
-      CONFLICTING_METHODS.each do |method|
-        define_singleton_method(method) { obj.send(method) } if !custom_method?(method) && obj.respond_to?(method)
-      end
-    end
-
-    ruby2_keywords def method_missing(method, *args, &block)
-      if cached_arbre_element.respond_to?(method) && !model.respond_to?(method)
-        Arbre::Context.new(model:) do
-          __send__(method, *args, &block)
-        end
-      else
-        super
-      end
-    end
-
-    def respond_to?(method, include_private = false)
-      return false if CONFLICTING_METHODS.include?(method) && !model.respond_to?(method) && !custom_method?(method)
-
-      super
     end
 
     private
 
-    def cached_arbre_element
-      @cached_arbre_element ||= Arbre::Element.new
-    end
-
-    def custom_method?(method_name)
-      methods.include?(method_name) && method(method_name).owner < ArbreDecorator
-    end
+    def arbre_context = @arbre_context ||= Arbre::Context.new
   end
 end

data/lib/activeadmin/decorator.rb

@@ -16,7 +16,7 @@ module ActiveAdmin
       end
 
       # use in decorator to decorate association
-      def decorates_association(association, relation: association, with: "Decorators::#{association.to_s.singularize.classify}")
+      def decorates_association(association, relation: association, with: nil)
         define_method(association) do
           associated =
             case relation
@@ -24,10 +24,13 @@ module ActiveAdmin
             when Proc then relation.call(model)
             else raise ArgumentError, "relation must be a Symbol or Proc"
             end
-          with = with.constantize if with.is_a?(String)
           if associated.is_a?(ActiveRecord::Relation)
+            with ||= decorator_class_name_for(associated.klass)
+            with = with.constantize if with.is_a?(String)
             associated = associated.map { |item| with.new(item) }
           else
+            with ||= decorator_class_name_for(associated.class)
+            with = with.constantize if with.is_a?(String)
             associated = with.new(associated)
           end
           associated
@@ -38,5 +41,14 @@ module ActiveAdmin
     def model = __getobj__
 
     def nil? = model.nil?
+
+    private
+
+    # autodetect decorator class name for association
+    def decorator_class_name_for(klass)
+      @prefix ||= self.class.name.split('::')[0...-1].freeze
+      @suffix ||= self.class.name.split('::')[-1].sub(/^#{model.class.name}/, '').freeze
+      [*@prefix, klass].join('::').concat(@suffix)
+    end
   end
 end

data/lib/activeadmin_decorator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveadminDecorator
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_decorator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-05 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin