tramway-core 1.9.7 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6a328c279dd1871957bf8851a856080ba81d2ce9fc8c4721ff05d4e5331611
-  data.tar.gz: fafad584ace4ddfeadb2865ff695758bf82adcc06a19ca2ef30d1aade5a083ac
+  metadata.gz: 430efd71ac7c88ad99e9f694e9a69275eae2547584aab8304398fa1107980a76
+  data.tar.gz: da4601abe1d6b27e79908646a9f966430e16b11d4ea720101700d1054efe879f
 SHA512:
-  metadata.gz: 842b72abd33c0c7e8bd4024551101ad34df8bea2bb90e8dc3a1abd9ed6afcabb5de8ad2b7408443ee25e32256e71921adbb3f372f2bb245556cb1f0c25b97f73
-  data.tar.gz: 9694d549f73d6728b7cb599cf882b44bebd1196aa4bea48625a0803148d7fb65edcaebc10034ce3d8ce216159b918ca730b1b8ab6ca81c395f1176c943520fa8
+  metadata.gz: 9639e164d342d2a783031a42573985f0f0c9af9877826c8f06c8b60acf7b95482372ea938cde6d2f56d91edef19e3bdf78fbb5cf7ba5eecceb58239bbac9d398
+  data.tar.gz: 5eeb8adc7c07a0d8a2f7df339c58be45f63ba74d68b1bc34ed08ccf4e5df2b76508b1403dfae7c1574360e647cc6aeaba215a076aa79bd3cf69a1ccbf4a284b6

data/app/decorators/tramway/core/application_decorator.rb

@@ -82,13 +82,15 @@ class Tramway::Core::ApplicationDecorator
     end.compact
   end
 
+  include Tramway::Core::Concerns::AttributesDecoratorHelper
+
   def attributes
     object.attributes.reduce({}) do |hash, attribute|
       value = try(attribute[0]) ? send(attribute[0]) : object.send(attribute[0])
       if attribute[0].to_s.in? object.class.state_machines.keys.map(&:to_s)
-        hash.merge! attribute[0] => object.send("human_#{attribute[0]}_name")
+        hash.merge! attribute[0] => state_machine_view(object, attribute[0])
       elsif value.class.in? [ ActiveSupport::TimeWithZone, DateTime, Time ]
-        hash.merge! attribute[0] => I18n.l(attribute[1])
+        hash.merge! attribute[0] => datetime_view(attribute[1])
       elsif value.class.superclass == ApplicationUploader
         tags = content_tag(:div) do
           if value.url.match(/jpg|JPG|png|PNG$/)

data/app/decorators/tramway/core/concerns/attributes_decorator_helper.rb

@@ -0,0 +1,9 @@
+module Tramway::Core::Concerns::AttributesDecoratorHelper
+  def datetime_view(value)
+    I18n.l value
+  end
+
+  def state_machine_view(object, attribute_name)
+    object.send "human_#{attribute_name}_name"
+  end
+end

data/app/models/tramway/core/application_record.rb

@@ -33,6 +33,7 @@ module Tramway
           end
         end
       end
+
       # FIXME detect inhertited locales
       def human_state_name
         I18n.t "activerecord.state_machines.tramway/core/application_record.state.states.#{state}"

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.9.7'
+    VERSION = '1.9.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.8
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails
@@ -339,6 +339,7 @@ files:
 - app/controllers/tramway/core/application_controller.rb
 - app/decorators/tramway/core/application_decorated_collection.rb
 - app/decorators/tramway/core/application_decorator.rb
+- app/decorators/tramway/core/concerns/attributes_decorator_helper.rb
 - app/forms/tramway/core/application_form.rb
 - app/forms/tramway/core/extendable_form.rb
 - app/forms/tramway/core/form_creator.rb