activeadmin_decorator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9066952cd77bd579269b0bf534618271ad135a974fdf9d837ea35e416c8508d6
-  data.tar.gz: 93750f0e9c841dbf9408c5463d9453895c8f796e059290faf761fdad14123001
+  metadata.gz: 1aa3d5c6a44294b75d34898242260a457d281767f805e171b34f96fa0c22a441
+  data.tar.gz: ed311ac3f20aebac9af7e5a10e4e0ac576c2da717edaa0df8e061bedd56ab0b4
 SHA512:
-  metadata.gz: 351b713fde7f9a5c868861cb75e1ed6d91646d5657f07955a1c6ab0b0ea6af8e45b13121cfeba35bfbe5d809cc07861dd6b688d4a78752c0fff6b036a983ad21
-  data.tar.gz: f812a8602b9365810bc9d8da56c40d09b677e4622ee8bc102f11b4bbdbf4c660596e2309b90630cdcfd05f0c2f1e5f6407459dc54cf75dfbd65efa9d02b7f84f
+  metadata.gz: d39774cfbfafec1065209ce73b89ba98caeb2221385f70f4ecf1628a6466a225834b03bc5fc83a4ee38d45098b15710953cab11b0342de38204b6c5d4d6053d9
+  data.tar.gz: 9a06ba36f44a9476eed1e7a4241d3d5eba2fd4ec4ff06632a3f5ca6949ad7b43117d795171b5afaa86693a609038ad085dc7e78bc0b17641b7418f0a408f984b

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/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.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_decorator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michal Papis