activerecord-bixformer 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2997fd363bb3144808f6fc79f37a77e010c545b1
-  data.tar.gz: 00d3291893753e6115c797e87b9c3be4766f6678
+  metadata.gz: 3db69e1e687cb737ae1a261d797265032643d595
+  data.tar.gz: 3d5fda5071c5cce61a59b414e0c6ce57b0b6fd50
 SHA512:
-  metadata.gz: 25b2c4383f76c590735b67f700d34985954823657360034d0c888d6eb576343533f7e4c1d8e667b42b0adae40d71d9c01c2608aebb96164ef9d3c17463b5b0de
-  data.tar.gz: 8f8fb5c76740f603cbac2a1a32b6cb22e895079ee62afe69fe9f3d03538b119681d6e197fe084229cf3519181beb7a837024989fe7a34524d3064376c22f4e5a
+  metadata.gz: 5a71ced71a841db66584996b40b32c5dcf5d0eea111975ce93de8db701c54ea8b5efa8fb45b586bf4bb0d0076b5de1128437a29ef0ddd2fb3707a5de8bfe736f
+  data.tar.gz: ef835276b2d227c9008df48d9a32bf55c46110d3b9b24188ef5fb17c49b079fa3ef51d3ff8dbec2632c32eb5b121768a3ab25ba5dffd3b56ee1bb38c027ac625

data/lib/activerecord-bixformer/attribute/base.rb

@@ -20,6 +20,10 @@ module ActiveRecord
           value
         end
 
+        def should_be_included
+          nil
+        end
+
         private
 
         def record_attribute_value(record)

data/lib/activerecord-bixformer/attribute/formatted_foreign_key.rb

@@ -83,6 +83,10 @@ module ActiveRecord
           foreign_record&.__send__(foreign_constant.primary_key)
         end
 
+        def should_be_included
+          @model.activerecord_constant.reflections.find { |k, r| r.foreign_key == @name }.first
+        end
+
         private
 
         def foreign_constant

data/lib/activerecord-bixformer/model/base.rb

@@ -87,6 +87,20 @@ module ActiveRecord
           arr  = []
           hash = {}
 
+          @attributes.each do |attr|
+            attr_should_be_included = attr.should_be_included
+
+            next unless attr_should_be_included
+
+            if attr_should_be_included.is_a?(::Hash)
+              hash.merge!(attr_should_be_included)
+            elsif attr_should_be_included.is_a?(::Array)
+              arr.push *attr_should_be_included
+            else
+              arr.push attr_should_be_included
+            end
+          end
+
           @associations.each do |assoc|
             assoc_should_be_included = assoc.should_be_included
 

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.4.9"
+    VERSION = "0.4.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Hiroaki Otsu