snaptable 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63027ccb0c6c51b72acd15c9589005d146e5e7a6d75c300d5ccbf37de508da2c
-  data.tar.gz: 6651f729c5cdddc7d41857b3c85db1ddce3794fca964492b86bd493fc6d26caf
+  metadata.gz: b0203c800bc07e68796bd21371315d3ad87d083f0431d2c9aa42b7b856dde471
+  data.tar.gz: 5c33e463f36a732c9091f379ced36caf3d2e105cb5c080cdff1879cd022c6506
 SHA512:
-  metadata.gz: a691e48ea16f98d17b5449a8966ad2af7467c66a0e719820283b0bfbecf47c2168b5ad5feabbcab3e194993cda4f1d05c1067d37d3f9803d1dd7ad14f3b4a738
-  data.tar.gz: 6350e19c8f8f22d05b03925160906a757bb7d6ade6ee09cf52c0a0158cc632f98bd24114b51306ff2c7bbf68bd98cc414e12fffd4895b9cec4b46dc2fa0a74fc
+  metadata.gz: c76e95b4382399619cbe008fe107ee9f2c3ecb1c0e519d5afce71993e932c0f9c717afaf405d1b897ba1a633ee9dae8da53a371ac60d40417037486b20c8466b
+  data.tar.gz: 28736105c9c34676597409ab2e32b1c042d77be09cdbab4c354dd062085dfca9acd97482ab177887ac920b9caccbe370a551ff10094cc9bcfcccbbf96eb3b540

data/lib/snaptable/constructor/renderer.rb

@@ -28,27 +28,30 @@ module Snaptable
 
       def values(element)
         attributes.map do |attribute|
-          attr_value = if attribute.is_a?(Symbol) || attribute.is_a?(String)
-            element.send(attribute)
-          else
-            element.send(*attribute.keys).send(*attribute.values)
+          if attribute.is_a?(Symbol) || attribute.is_a?(String)
+            attr_value = element.send(attribute)
+          else # a hash { model: :attribute }
+            attr_value = element.send(attribute.keys[0]).send(attribute.values[0])
+            attr_model = attribute.keys[0].to_s.capitalize.constantize
+            attribute = attribute.values[0]
           end
-          format(attribute, attr_value)
+          format(attribute, attr_value, attr_model)
         end
       end
 
-      def format(attribute, attr_value)
+      def format(attribute, attr_value, attr_model)
+        attr_model ||= model
         if attr_value.is_a?(Date) || attr_value.is_a?(Time) || attr_value.is_a?(DateTime)
           attr_value = l(attr_value, format: :snaptable)
-        elsif !attr_value.nil? && attribute.to_s.in?(enums)
-          attr_value = t("#{model.model_name.i18n_key}.#{attribute.to_s.pluralize}.#{attr_value}")
+        elsif !attr_value.nil? && attribute.to_s.in?(enums(attr_model))
+          attr_value = t("#{attr_model.model_name.i18n_key}.#{attribute.to_s.pluralize}.#{attr_value}")
         end
         attr_value = view_context.strip_tags(attr_value.to_s)
         attr_value = view_context.truncate(attr_value, length: 40) unless options[:truncate] == false
         return attr_value
       end
 
-      def enums
+      def enums(model)
         model.defined_enums.keys
       end
 

data/lib/snaptable/version.rb

@@ -1,3 +1,3 @@
 module Snaptable
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptable
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - khcr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails