express_admin 1.7.25 → 1.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead2f7234d30986e7ae5191a3b2ab0e52255f4e1
-  data.tar.gz: 12034e77823a4c1f6c5235366b1cca85397320e1
+  metadata.gz: 997e0b7b334817dc76efd76805c325b81c93f5e2
+  data.tar.gz: ed78a8471ebbad6147f00c27dfaa535aa23ca577
 SHA512:
-  metadata.gz: 41eeca514e5102d7d5fd3df73296e49142c1b5eee4c450cd466408ed77d37528ba6f6e755c9ec726d2ed696cfd71dc8bf52424fe14d34eb9d758ed5ed8b31e3f
-  data.tar.gz: 162968e3617a7c3db30d5e626887e8e6e3dba6672098aa2f7f2edd5651dcddb198a2c68b84474e67f59130f97953241b7daf2840cbab0e75a984a07d7cfeb566
+  metadata.gz: 62c247411891b79fc02576251dac34a8824e14e2c096ee183d16253fde0eb8198a596cb860b1cd2b3cc231a2b39a26262e955803960ac03ae0df59bc7cbe05d0
+  data.tar.gz: 58363ee6be8f1035361032868b8dab0134fb50a705ec5966d7cbc29a98c0326020cf264979e28da5f75275d1646e96aed4bf99a3d3f61be11f6078bcf83bb084

data/app/components/express_admin/definition_list.rb

@@ -4,6 +4,10 @@ module ExpressAdmin
       class DefinitionList < ExpressTemplates::Components::Configurable
         include ExpressTemplates::Components::Capabilities::Resourceful
 
+        COLUMN_REGEX_LIST = {
+          in_words: /(\w+)_in_words/
+        }
+
         tag :dl
 
         list_types = {}
@@ -31,13 +35,24 @@ module ExpressAdmin
 
         def definitions_from_hash(hash)
           processed = hash.map do |k,v|
-            value = if v.kind_of? Symbol
-              resource.send(v)
-            elsif v.respond_to?(:call)
-              v.call(resource).html_safe
-            else
-              v
-            end
+            value =
+              if attrib = v.to_s.match(COLUMN_REGEX_LIST[:in_words]).try(:[], 1)
+                if resource.send(attrib)
+                  if resource.send(attrib) < DateTime.now
+                    "#{helpers.time_ago_in_words(resource.send(attrib))} ago"
+                  else
+                    "in #{helpers.time_ago_in_words(resource.send(attrib))}"
+                  end
+                else
+                  'never'
+                end
+              elsif v.kind_of? Symbol
+                resource.send(v)
+              elsif v.respond_to?(:call)
+                v.call(resource).to_s.html_safe
+              else
+                v
+              end
             [promptify(k), value]
           end
           Hash[processed]
@@ -59,4 +74,4 @@ module ExpressAdmin
       end
     end
   end
-end
+end

data/app/components/express_admin/definition_table.rb

@@ -16,7 +16,6 @@ module ExpressAdmin
             end
           }
         }
-
       end
     end
   end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.25"
+  VERSION = "1.7.26"
 end

data/test/dummy/test/components/definition_list_test.rb

@@ -17,7 +17,8 @@ module ExpressAdmin
         array: ["field1", "field2"],
         hash: {term1: "def1",
                term2: "def2",
-               term3: "def3"})
+               term3: "def3"},
+        hash_with_in_words: { "Created At:" => :created_at_in_words })
     end
 
     def deflist(*args)
@@ -26,6 +27,12 @@ module ExpressAdmin
       }.to_s
     end
 
+    def deflist_with_resource(*args)
+      arbre(widget: Widget.first) {
+        definition_list(:widget, *args)
+      }.to_s
+    end
+
     test "accepts array as input" do
       assert deflist(list_types[:array])
     end
@@ -66,6 +73,9 @@ HTML
       assert_equal DEFLIST_MARKUP_ARR, deflist(list_types[:array])
     end
 
-  end
+    test "definition_list renders attribute in words" do
+      assert_match "<dt>Created At:</dt>\n  <dd>less than a minute ago</dd>", deflist_with_resource(list_types[:hash_with_in_words])
+    end
 
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.25
+  version: 1.7.26
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates