azahara_schema 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94ff9042c2246d38dbfabfc0b4935c0e3e187cdee2a98f23bf6f37c25b4defa
-  data.tar.gz: 301ab4cbe1764857c16f9c26e69e607a2bac6c5be3ee335e9cd7ec63ca8c426b
+  metadata.gz: d41cee35775a78e8ef619042baf4a3e44e3b72488d0e6b4be145baf20d3d8175
+  data.tar.gz: ac919eeeb5a76024b2222f60d1afaae85b0c4d3d756c0c63564e3b6d4f8adeb2
 SHA512:
-  metadata.gz: 9a72b9632ec5e74ff694b679fcd37dbee464dbf37300941a52b4c55312055b8bbaee54c3e2dd9f1fe2527c414f53c09dbacee7ff834528a0f99ea46b70101139
-  data.tar.gz: 5ada7cf0f14f608d304bd7f1b6a93baa6ea7d19d76ad287486b42445251507b037ac92a26e90bb2a88ebb3878c9e509ca76f665dc20cb32233fc847a82b5bdef
+  metadata.gz: 9140e0d6cdfa550323172bd59932934ba988818fb8b13f9f580dc55a1e8c5db717820ee0fa2e0420be5fc4a77aee2d234c5bfc407ad836ecfc09f015a943d377
+  data.tar.gz: a09337cfaffcb0f6cb8fae65c6abec8313e9a59cfb1e7f33e9bbaa258aa2db95cce445219e82995922c9db5c74fc83cb9455111b1a7ed20a7a0baa4a387ab007

data/lib/azahara_schema/attribute_formatter.rb

@@ -47,24 +47,29 @@ module AzaharaSchema
       'fa'
     end
 
-    def attribute_human_value(attribute, entity, **options)
-      val = attribute.value(entity)
+    def human_value(attribute, value, **options)
       case attribute.type
       when 'love'
-        attribute.available_values.detect{|l, v| v == val }.try(:[], 0)
+        attribute.available_values.detect{|l, v| v == value }.try(:[], 0)
       when 'list'
-        attribute.attribute_name.human_list_value(val, options)
+        attribute.attribute_name.human_list_value(value, options)
+      when 'datetime'
+        value ? l(value) : value
       else
-        val
+        value
       end
     end
 
+    def attribute_human_value(attribute, entity, **options)
+      human_value(attribute, attribute.value(entity))
+    end
+
     def formatted_value(attribute, entity, **options)
       real_formatter(attribute).format_value(attribute, attribute_human_value(attribute, entity), formatting_options(attribute,entity).merge(options))
     end
 
     def html_formatted_value(attribute, entity, **options)
-      format_value_html(attribute, attribute.value(entity), formatting_options(attribute,entity).merge(options))
+      format_value_html(attribute, attribute_human_value(attribute, entity, options), formatting_options(attribute,entity).merge(options))
     end
 
     def attribute_html_label(attribute, **options)
@@ -75,19 +80,14 @@ module AzaharaSchema
       template.content_tag('div', class: 'attribute') do
         s = ''.html_safe
         s << template.content_tag('div', attribute_html_label(attribute, options), class: 'label')
-        s << template.content_tag('div', format_value_html(attribute, attribute.value(entity), options), class: 'value')
+        s << template.content_tag('div', html_formatted_value(attribute, entity, options), class: 'value')
         s
       end
     end
 
 
     def format_value(attribute, unformated_value, **options)
-      case attribute.type
-      when 'datetime'
-        unformated_value ? l(unformated_value) : unformated_value
-      else
-        unformated_value
-      end
+      unformated_value
     end
 
     def format_value_html(attribute, unformated_value, **options)

data/lib/azahara_schema/schema.rb

@@ -32,9 +32,13 @@ module AzaharaSchema
       AzaharaSchema::Schema.new(model, *attributes)
     end
 
-    def self.attribute_type(model, name)
-      col = model.columns_hash[name.to_s]
-      col && col.type
+    def self.attribute_type(model, name, col=nil)
+      col ||= model.columns_hash[name.to_s]
+      if model.defined_enums[col.name]
+        'list'
+      else
+        col && col.type
+      end
     end
 
     def self.attribute(model, name, attr_type=nil)
@@ -43,9 +47,7 @@ module AzaharaSchema
     end
 
     def self.attribute_for_column(model, col, attr_type=nil)
-      attr_type ||= ('list' if model.defined_enums[col.name])
-      attr_type ||= col.type
-      attribute(model, col.name, attr_type)
+      attribute(model, col.name, attr_type || attribute_type(model, col.name, col) )
     end
 
     def self.enabled_filters(*filter_names)

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails