html-tag 1.1.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7030cc9de11a7bd5172e81e687059c13b402c425b884b2712a0f75128ae21c0
-  data.tar.gz: '085a7ec6e169b51bae3255471e0c98213fc29fbc9bed605995d1fc3ce1ff676c'
+  metadata.gz: 6e059a4d0fc919b9a8c8ea26b5909c24b5519acf7459314b15fb8d7b485f543b
+  data.tar.gz: 6a9386662a963454a5235376be4eec0f6170b21f393c069fd008f92fbdf89741
 SHA512:
-  metadata.gz: 22a1470ec594bdeb3fdab6d80f42e281d1b074d97afd8a52f0f4c7fde28a89c1f4f6946bf416209d841d458b0b8a918ca852d9f01df77e1a3de15a5351e546cb
-  data.tar.gz: f98f366e0aba2d17c760c7e433e55a7563deccc4d2803476b475cb53ed95fad2f6081d3d49f829a2b47345c7823c1049d61b647dadf4db14b39ac592f3b5cace
+  metadata.gz: b9d7af17a77ce73ca4c3488092b8772e008ee4b1d8848a0058f3ee969c7e3e24523aa6fc81fb8f9e7f903d4deaeafa0608bb7633894ea22af954e43886df72a8
+  data.tar.gz: b5e3893b3e76b8fc8744c7fb71a508d327d6f8fea98efd51c9b1b3893955d7c17e6c1260b019333b45c399edf125163040c1903e219d8312dccaa266abb80d4c

data/.version

@@ -1 +1 @@
-1.1.0
+1.3.3

data/lib/html-tag/adapter.rb

@@ -1,33 +1,30 @@
-module HtmlTagBuilderHelper
-  # tag :div, { 'class'=>'iform' } do
-  # tag.div(class: :iform) { |n| ... }
-  def xtag name=nil, opts={}, data=nil
-    return HtmlTagBuilder unless name
-    data = yield(opts) if block_given?
-    HtmlTagBuilder.tag name, opts, data
+# Hash
+unless {}.respond_to?(:tag)
+  class Hash
+    def tag node_name, inner_html=nil
+      HtmlTagBuilder.build self, node_name, inner_html
+    end
   end
 end
 
-# Rails
-if defined?(ActionView::Base)
-  ActionView::Base.send :include, HtmlTagBuilderHelper
-
-# Sinatra
-elsif defined?(Sinatra::Base)
-  class Sinatra::Base
-    include HtmlTagBuilderHelper
-    alias :tag :xtag
-  end
-
-# Lux and other
-elsif defined?(ApplicationHelper)
-  # all other frameworks, including Lux
-  module ApplicationHelper
-    include HtmlTagBuilderHelper
-    alias :tag :xtag
+# String
+unless ''.respond_to?(:tag)
+  class String
+    def tag node_name, opts={}
+      HtmlTagBuilder.build opts, node_name, self
+    end
   end
-
 end
 
+# All other objects
+class Object
+  def tag
+    HtmlTagBuilder
+  end
 
-
+  # Rails has tag methd defeined in views, in ActionView::Helpers::TagHelper
+  # Access HtmlTagBuilder via xtag then
+  def xtag
+    HtmlTagBuilder
+  end
+end

data/lib/html-tag/base.rb

@@ -17,6 +17,9 @@ class HtmlTagBuilder
         data = nil
       end
 
+      # tag.div(:a) { 1 } -> <div class="a">1</div>
+      opts = opts.to_s if opts.class == Symbol
+
       # covert n._row_foo to n(class: 'row-foo')
       name = name.to_s
       if name.to_s[0, 1] == '_'
@@ -40,11 +43,11 @@ class HtmlTagBuilder
       data, opts = opts, {} unless opts.class == Hash
 
       if block_given?
-        inline = new
-        data = yield(inline, opts)
+        stack = new
+        data  = yield(stack, opts)
 
         # if data is pushed to passed node, use that data
-        data = inline.data if inline.data.first
+        data = stack.data if stack.data.first
       end
 
       data = data.join('') if data.is_a?(Array)
@@ -69,8 +72,8 @@ class HtmlTagBuilder
 
       return opts unless node
 
-      text = yield opts if block_given?
-      text ||= '' unless ['input', 'img', 'meta', 'link', 'hr', 'br'].include?(node.to_s)
+      empty_tags = ['input', 'img', 'meta', 'link', 'hr', 'br', 'col', 'frame', 'area']
+      text ||= '' unless empty_tags.include?(node.to_s)
       out = text ? %{<#{node}#{opts}>#{text}</#{node}>} : %{<#{node}#{opts} />}
       out.respond_to?(:html_safe) ? out.html_safe : out
     end
@@ -83,10 +86,10 @@ class HtmlTagBuilder
     def __add_opts opts, key, value
       unless value.to_s.blank?
         value = value.join(' ') if value.is_a?(Array)
-        opts.push key.to_s.gsub(/_/,'-')+'="'+value.to_s.gsub(/"/,'&quot;')+'"'
+        key   = key.to_s.gsub(/data_/,'data-')
+        opts.push key+'="'+value.to_s.gsub(/"/,'&quot;')+'"'
       end
     end
-
   end
 
   ###
@@ -98,8 +101,8 @@ class HtmlTagBuilder
   end
 
   # push data to stack
-  def push data
-    @data.push data
+  def push data=nil
+    @data.push block_given? ? yield : data
   end
 
   # n.('foo') do -> n.div(class: 'foo') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-tag
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Dino Reic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -39,7 +39,7 @@ homepage: https://github.com/dux/html-tag
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: HTML tag builder
 test_files: []