html-tag 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7030cc9de11a7bd5172e81e687059c13b402c425b884b2712a0f75128ae21c0
-  data.tar.gz: '085a7ec6e169b51bae3255471e0c98213fc29fbc9bed605995d1fc3ce1ff676c'
+  metadata.gz: 9ba38f960d59ed54a47b5d55bc646cab39b6e93c87808e93461d1608899ae256
+  data.tar.gz: ff09c472468abec600b5a4a59dd36949d126f6f98eb86928795e63c5bf0eb6cc
 SHA512:
-  metadata.gz: 22a1470ec594bdeb3fdab6d80f42e281d1b074d97afd8a52f0f4c7fde28a89c1f4f6946bf416209d841d458b0b8a918ca852d9f01df77e1a3de15a5351e546cb
-  data.tar.gz: f98f366e0aba2d17c760c7e433e55a7563deccc4d2803476b475cb53ed95fad2f6081d3d49f829a2b47345c7823c1049d61b647dadf4db14b39ac592f3b5cace
+  metadata.gz: 86f6b42c9a0166e266ef719a68c80dc67474a816c51e3ae15f17f870ba3c52429a13eb8623c40a926a9183ef6b970adb1fb99588a467553b24848555f281d037
+  data.tar.gz: 350e52e105ceafd9d0e737af1bac20b53c7b0305324dc4d070bb5d586b24b3cbaa446d5c3aa7833d49dc16b7e2dbf212cb2ae0af3cd81dbac25b815c1f913962

data/.version

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/html-tag/adapter.rb

@@ -8,26 +8,42 @@ module HtmlTagBuilderHelper
   end
 end
 
-# Rails
+# add to Rails, Sinatra or all other that respond to ApplicationHelper
 if defined?(ActionView::Base)
-  ActionView::Base.send :include, HtmlTagBuilderHelper
-
-# Sinatra
+  class ActionView::Base
+    def tag *args, &block
+      args.first ? HtmlTagBuilder.tag(*args, &block) : HtmlTagBuilder
+    end
+  end
 elsif defined?(Sinatra::Base)
   class Sinatra::Base
-    include HtmlTagBuilderHelper
-    alias :tag :xtag
+    def tag *args, &block
+      args.first ? HtmlTagBuilder.tag(*args, &block) : HtmlTagBuilder
+    end
   end
-
-# Lux and other
 elsif defined?(ApplicationHelper)
-  # all other frameworks, including Lux
   module ApplicationHelper
-    include HtmlTagBuilderHelper
-    alias :tag :xtag
+    def tag *args, &block
+      args.first ? HtmlTagBuilder.tag(*args, &block) : HtmlTagBuilder
+    end
   end
-
 end
 
+# Hash
+unless {}.respond_to?(:tag)
+  class Hash
+    def tag node_name=nil, inner_html=nil
+      HtmlTagBuilder.build self, node_name, inner_html
+    end
+  end
+end
 
+# String
+unless ''.respond_to?(:tag)
+  class String
+    def tag node_name, opts={}
+      HtmlTagBuilder.build opts, node_name, self
+    end
+  end
+end
 

data/lib/html-tag/base.rb

@@ -40,11 +40,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 +69,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-tag
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank