effective_resources 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adee85d1da92d005ebe0329f1b977aab11944ee0
-  data.tar.gz: d2f0a66e76368a937d7a7d57690635177b63ed50
+  metadata.gz: c25e36357edcadd3180eca0a181c8b3c4acf4f21
+  data.tar.gz: f70d3b19608cc354782dcb756b960301d40d12aa
 SHA512:
-  metadata.gz: e2fcab634cdafa892b22bbe8e7a86f5ad982d20a8a8548a364226362de5a80dab216e26ad392c0ff600ce3a43fb085d759f0d4d8e10f9790fc86857cb1703b9d
-  data.tar.gz: d2ddcb29d2dff7a536f4c83d978afbadc69d2ae839fee7826371e59f247f0c8f3be50d460e839c0d116cf910844c4ae666564445f4ab52d56c2f1d55eed03901
+  metadata.gz: d8cd4177e5d66d6421ce3cd354bc4164e3c18599cc15af3ac47d9c4d2cda7864af4f31ce61c8184252d99543e59e520cd80ca149cd1ca843959248ad2fda186b
+  data.tar.gz: dcb5869b6d3a5a6f4b93a401435ded35287859ba80f9e1aec61d905c4194db65d6505b44cfd6363cb8bdf87dd96425ca876fd396326ebc1e4f4c2db5e1ca34f8

data/app/helpers/effective_resources_helper.rb

@@ -71,5 +71,42 @@ module EffectiveResourcesHelper
   alias_method :bootstrap_icon_to, :glyphicon_to
   alias_method :glyph_icon_to, :glyphicon_to
 
+  ### Tableize attributes
+
+  # This is used by effective_orders, effective_logging, effective_trash and effective_mergery
+  def tableize_hash(obj, table: 'table', th: true, sub_table: 'table', sub_th: true, flatten: true)
+    case obj
+    when Hash
+      if flatten && obj[:attributes].kind_of?(Hash)
+        obj = obj[:attributes].merge(obj.except(:attributes))
+      end
+
+      content_tag(:table, class: table.presence) do
+        content_tag(:tbody) do
+          obj.map do |key, value|
+            content_tag(:tr) do
+              content_tag((th == true ? :th : :td), key) +
+              content_tag(:td) { tableize_hash(value, table: sub_table, th: sub_th, sub_table: sub_table, sub_th: sub_th, flatten: flatten) }
+            end
+          end.join.html_safe
+        end
+      end
+    when Array
+      obj.map { |value| tableize_hash(value, table: sub_table, th: sub_th, sub_table: sub_table, sub_th: sub_th, flatten: flatten) }.join('<br>')
+    when Symbol
+      ":#{obj}"
+    when NilClass
+      '-'
+    else
+      obj.to_s.presence || '""'
+    end.html_safe
+  end
+
+  def format_resource_value(value)
+    @format_resource_tags ||= ActionView::Base.sanitized_allowed_tags.to_a + ['table', 'thead', 'tbody', 'tfoot', 'tr', 'td', 'th']
+    @format_resource_atts ||= ActionView::Base.sanitized_allowed_attributes.to_a + ['colspan', 'rowspan']
+
+    simple_format(sanitize(value.to_s, tags: @format_resource_tags, attributes: @format_resource_atts), {}, sanitize: false)
+  end
 
 end

data/app/models/effective/resources/associations.rb

@@ -28,7 +28,7 @@ module Effective
 
       def nested_resources
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @nested_resources ||= klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] && ass.options[:class_name] != 'Effective::Attachment' }
+        @nested_resources ||= klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] }
       end
 
       def associated(name)

data/app/models/effective/resources/instance.rb

@@ -19,12 +19,8 @@ module Effective
           attributes[association.name] = instance.send(association.name).to_s
         end
 
-        has_ones.each do |association|
-          attributes[association.name] = instance.send(association.name).to_s
-        end
-
         nested_resources.each do |association|
-          attributes[association.name] = {}
+          attributes[association.name] ||= {}
 
           Array(instance.send(association.name)).each_with_index do |child, index|
             resource = Effective::Resource.new(child)
@@ -32,6 +28,18 @@ module Effective
           end
         end
 
+        has_ones.each do |association|
+          attributes[association.name] = instance.send(association.name).to_s
+        end
+
+        has_manys.each do |association|
+          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+        end
+
+        has_and_belongs_to_manys.each do |association|
+          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+        end
+
         attributes.delete_if { |_, value| value.blank? }
       end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.10'.freeze
+  VERSION = '0.3.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails