activeadmin_decorator 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9066952cd77bd579269b0bf534618271ad135a974fdf9d837ea35e416c8508d6
-  data.tar.gz: 93750f0e9c841dbf9408c5463d9453895c8f796e059290faf761fdad14123001
+  metadata.gz: c5fef3015a46bcf7b93b09a8a12018f117e4c301e208b24dba8b2f4405c5f81e
+  data.tar.gz: 89ef8d221f034e59303f563253cedbf3c6a49a49b5bf105ab5c550ec10822fe4
 SHA512:
-  metadata.gz: 351b713fde7f9a5c868861cb75e1ed6d91646d5657f07955a1c6ab0b0ea6af8e45b13121cfeba35bfbe5d809cc07861dd6b688d4a78752c0fff6b036a983ad21
-  data.tar.gz: f812a8602b9365810bc9d8da56c40d09b677e4622ee8bc102f11b4bbdbf4c660596e2309b90630cdcfd05f0c2f1e5f6407459dc54cf75dfbd65efa9d02b7f84f
+  metadata.gz: 2a0fa368c1a9acaf58cc87c76147fac4d5cdcc19404c0afbf137b6e0447eb8e8f89f927e492789b001e5d62a0435e6e6f7e5bb904975b8a2e1848065154ac5ea
+  data.tar.gz: aa450eea02e047f607b1552c8428585bada299f387d9f84900979a734e28f555febdcbef55775c2f4eee262fd20ee15917133ddb3b8983abff2f1521cf94716e

data/.rubocop.yml

@@ -1,5 +1,7 @@
 AllCops:
   TargetRubyVersion: 3.2
+  NewCops: enable
+  SuggestExtensions: false
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile

@@ -8,3 +8,4 @@ gemspec
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
+gem "rubocop-rspec", "~> 1.42"

data/README.md

@@ -39,6 +39,9 @@ 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:
@@ -52,6 +55,7 @@ class UserDecorator < ActiveAdmin::ArbreDecorator
   end
 end
 ```
+This is done by using including `Arbre::Element::BuilderMethods` and new `arbre_context`.
 
 Also included: `ActionView::Helpers` and `Rails.application.routes.url_helpers`,
 so you can:

data/lib/activeadmin/arbre_decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'decorator'
+require_relative "decorator"
 
 module ActiveAdmin
   class ArbreDecorator < Decorator

data/lib/activeadmin/decorator/association.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module ActiveAdmin
+  class Decorator < SimpleDelegator
+    module Association
+      class << self
+        def decorate(association, with: nil, parent: nil)
+          raise ArgumentError, "parent or with required" if parent.nil? && with.nil?
+
+          if association.nil?
+            nil
+          elsif association.respond_to?(:each)
+            decorate_many(association, with, parent)
+          else
+            decorate_one(association, with, parent)
+          end
+        end
+
+        def decorate_many(association, with, parent)
+          with ||=
+            if association.is_a?(ActiveRecord::Relation)
+              decorator_class_name_for(parent, association.klass)
+            else
+              decorator_class_name_for(parent, association.first.class)
+            end
+          with = with.constantize if with.is_a?(String)
+          association.map { |item| with.new(item) }
+        end
+
+        def decorate_one(element, with, parent)
+          with ||= decorator_class_name_for(parent, element.class)
+          with = with.constantize if with.is_a?(String)
+          with.new(element)
+        end
+
+        def decorator_class_name_for(parent, klass)
+          parent_class_elements = parent.class.name.split("::")
+          prefix = parent_class_elements[0...-1]
+          suffix = parent_class_elements[-1].sub(/^#{parent.model.class.name}/, "")
+          [*prefix, klass].join("::").concat(suffix)
+        end
+      end
+    end
+  end
+end

data/lib/activeadmin/decorator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'delegate'
+require "delegate"
+require_relative "decorator/association"
 
 module ActiveAdmin
   class Decorator < SimpleDelegator
@@ -8,29 +9,23 @@ module ActiveAdmin
       # Utility method for ActiveAdmin
       def decorate(*args)
         object = args[0]
-        if object.is_a?(Enumerable)
-          object.map { |o| new(o) }
-        else
-          new(object)
-        end
+        Association.decorate(object, with: self)
       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) # rubocop:disable Metrics/MethodLength
+        raise ArgumentError, "relation must be a Symbol or Proc" unless relation.is_a?(Symbol) || relation.is_a?(Proc)
+
         define_method(association) do
-          associated =
-            case relation
-            when Symbol then model.send(relation)
-            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)
-            associated = associated.map { |item| with.new(item) }
+          if instance_variable_defined?("@#{association}_decorated")
+          then instance_variable_get("@#{association}_decorated")
           else
-            associated = with.new(associated)
+            result =
+              if relation.is_a?(Proc) then relation.call(model)
+              elsif relation.is_a?(Symbol) then model.send(relation)
+              end
+            instance_variable_set("@#{association}_decorated", Association.decorate(result, with:, parent: self))
           end
-          associated
         end
       end
     end

data/lib/activeadmin_decorator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_decorator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -69,6 +69,7 @@ files:
 - Rakefile
 - lib/activeadmin/arbre_decorator.rb
 - lib/activeadmin/decorator.rb
+- lib/activeadmin/decorator/association.rb
 - lib/activeadmin_decorator.rb
 - lib/activeadmin_decorator/version.rb
 - sig/activeadmin_decorator.rbs