html_format 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46a4cdb45df13a48e56927254c498f13d0ba0c6
-  data.tar.gz: 72c9babeb2d5701317f6727dd759ad373def2fbf
+  metadata.gz: 15a5d06beaa01fe23e72b23952879b4f7bf3ec3e
+  data.tar.gz: a9e44f86a7b748196a541462ff2a15e82ae80725
 SHA512:
-  metadata.gz: a69f00217d5a952eb7e5c06a0d94f8acb54229ee2ae87755596f56f718c72443179dc7e39e0b6fbd0e5d9f1b1b3e2ffe0a2f8855049f0ff1caaebf92283a4483
-  data.tar.gz: a79e25e14e0c07810b1df301fdedae787d239caab030ac402d830c1105c59950eab6c034efe707aa03863c1f521910f0bf6c3e91302de52abd9153ea9eb0f740
+  metadata.gz: 8d127c1a85828f90491cc1bebbc7343837bc15ce30ac08f6442cf2bfccec535782d60d352c5b484067b38393e3c1f25615d77b4b7abd7574e1954c1a6273224e
+  data.tar.gz: 4de2bef2f5ecd4f9f8c49325985c19e8e17b64ea9736da8ee18adc1b3095a631644bffc1ac1592cf8a0b9559c7c06e37e2dd91b45d4a9d1dfc65ea1a040c9e9f

data/lib/html_format/generator.rb

@@ -5,7 +5,7 @@ require 'action_view'
 module HtmlFormat
   mattr_accessor :default_options
   self.default_options = {
-    table_class: 'table table-striped table-bordered table-hover',
+    table_class: ['table', 'table-striped', 'table-bordered', 'table-hover'],
     nesting: false,
     title_tag: :h2,
     header_patch: false,     # If there is no header, add it
@@ -54,58 +54,63 @@ module HtmlFormat
 
       info = function_table.find { |e| e[:_case].call(obj) }
       body = ''.html_safe
-      if true
-        if @options[:caption].present?
-          body << content_tag(:caption, @options[:caption])
-        end
+
+      if v = @options[:caption].presence
+        body << v
       end
       if @options[:header_patch]
-        if info[:header_patch]
-          if v = info[:header_patch].call(obj)
+        if info[:header_process]
+          if v = info[:header_process].call(obj)
             body << v
           end
         end
       end
       body << info[:process].call(obj)
-      body = content_tag(:table, body, :class => table_class(info))
+      body = tag.table(body, :class => table_class(info))
       if @options[:depth].zero?
         if @options[:responsive]
-          body = content_tag(:div, body, :class => 'table-responsive')
+          body = tag.div(body, :class => 'table-responsive')
         end
         if @options[:title].present?
-          body = content_tag(@options[:title_tag], @options[:title], :class => 'title') + body
+          body = tag.(@options[:title_tag], @options[:title], :class => 'title') + body
         end
       end
-      content_tag(:div, body, :class => "html_format html_format_depth_#{@options[:depth]}")
+      tag.div(body, :class => ['html_format', "html_format_depth_#{@options[:depth]}"])
     end
 
     private
 
     def function_table
       [
+        # Hash
+        #
         # {a: 1, b: 2}
+        #
         # [a][1]
         # [b][2]
         {
           _case: -> e { e.kind_of?(Hash) },
           css_class: 'html_format_type_hash',
-          header_patch: -> e {
-            content_tag(:thead) do
-              tr do
-                th(@options[:key_label]) + th(@options[:value_label])
+          header_process: -> e {
+            tag.thead do
+              tag.tr do
+                tag.th(@options[:key_label]) + tag.th(@options[:value_label])
               end
             end
           },
           process: -> e {
             e.collect {|key, val|
-              tr do
-                th(key) + td(val)
+              tag.tr do
+                tag.th(key) + td(val)
               end
             }.join.html_safe
           },
         },
 
+        # Array of Hash
+        #
         # [{a: 1, b: 2}, {a: 3, b: 4}]
+        #
         # [a][b]
         # [1][2]
         # [3][4]
@@ -115,14 +120,14 @@ module HtmlFormat
           process: -> e {
             keys = e.inject([]) { |a, e| a | e.keys }
             body = ''.html_safe
-            body += content_tag(:thead) do
-              tr do
-                keys.collect {|e| th(e) }.join.html_safe
+            body += tag.thead do
+              tag.tr do
+                keys.collect {|e| tag.th(e) }.join.html_safe
               end
             end
-            body + content_tag(:tbody) do
+            body + tag.tbody do
               e.collect { |hash|
-                tr do
+                tag.tr do
                   keys.collect { |key| td(hash[key]) }.join.html_safe
                 end
               }.join.html_safe
@@ -130,24 +135,28 @@ module HtmlFormat
           },
         },
 
+        # Array of Array
+        #
         # [[:a, :b], [ 1,  2], [ 3,  4]]
+        #
         # [a][b]
         # [1][2]
         # [3][4]
         {
           _case: -> e { e.kind_of?(Array) && e.all?{|e|e.kind_of?(Array)} },
           css_class: 'html_format_type_array_of_array',
-          header_patch: -> e {
+          header_process: -> e {
             if e.first.kind_of?(Array)
-              content_tag(:thead) do
-                e.first.collect { td('') }.join.html_safe # カラムの意味はわからないので空ラベルとする
+              tag.thead do
+                # I do not know the meaning of the column so make it empty label
+                e.first.collect { td('') }.join.html_safe
               end
             end
           },
           process: -> e {
-            content_tag(:tbody) do
+            tag.tbody do
               e.collect { |elems|
-                tr do
+                tag.tr do
                   elems.collect { |e| td(e) }.join.html_safe
                 end
               }.join.html_safe
@@ -155,44 +164,42 @@ module HtmlFormat
           },
         },
 
+        # Array
+        #
         # [:a, :b]
+        #
         # [a][b]
         {
           _case: -> e { e.kind_of?(Array) },
           css_class: 'html_format_type_array',
           process: -> e {
-            content_tag(:tbody) do
-              tr do
+            tag.tbody do
+              tag.tr do
                 e.collect { |e| td(e) }.join.html_safe
               end
             end
           },
         },
 
+        # Ohter
+        #
         # :a
+        #
         # [a]
         {
           _case: -> e { true },
           css_class: 'html_format_type_object',
           process: -> e {
-            content_tag(:tbody) do
-              tr { td(e) }
+            tag.tbody do
+              tag.tr { td(e) }
             end
           },
         },
       ]
     end
 
-    def tr(&block)
-      content_tag(:tr, &block)
-    end
-
-    def th(val)
-      content_tag(:th, val)
-    end
-
     def td(val)
-      content_tag(:td, value_as_string(val))
+      tag.td(value_as_string(val))
     end
 
     def value_as_string(val)
@@ -209,11 +216,10 @@ module HtmlFormat
 
     def table_class(info)
       if @options[:depth] == 0
-        # return 'table table-condensed table-bordered table-striped'
-        "table #{info[:css_class]} #{@options[:table_class]}".squish.scan(/\S+/).uniq.join(' ')
+        ['table', info[:css_class], @options[:table_class]].join(' ').squish.scan(/\S+/).uniq.join(' ')
       else
-        # 入れ子になったテーブルは小さめにして装飾を避ける
-        'table table-condensed'
+        # Keep nested tables small and avoid decorations
+        ['table', 'table-condensed']
       end
     end
   end

data/lib/html_format/version.rb

@@ -1,3 +1,3 @@
 module HtmlFormat
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end