html-tag 1.0.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b88800aadc21733d2b0da8e33e274a8b95fd8008a972ebb760864ae29b18fa61
-  data.tar.gz: f0108dae498ca7302f6e3de9285676aa0cc01903cd95f58742e5e0ae9d415085
+  metadata.gz: b43ddb467f75e41732aa8b0e5bc12bbc29c03e383f84686d010b73ae233ada39
+  data.tar.gz: 1101fe71fd0db7dda7d1a6780fe055cc33c40a6a264882b34898d738189b87a0
 SHA512:
-  metadata.gz: 9fa4dcb68bb10d7b96b63239c44693f7ec92a03fb8ac6de41d5fd344ae5722d79f90f04806a57279ab868666af2a446b8ad4d2e49f951fa27c83517486a44c8e
-  data.tar.gz: d36b0ed5b1e20b89513e86626fc17e8db0fb8adf9de711649ee43429ea0ff265e7edb75b57e936190601099c4f6f6d4740336bbc0bc56364bb436a6512f81b94
+  metadata.gz: baf58e6d0931f7cc1ef5778c69a4a2142eba85799f4f06ca95d690f1a69bd3021d356c2ebe9ed639be86d119c401b13b682fcd72483cd3cdf88d5392612ec443
+  data.tar.gz: 92973aeae92e95b45b8f82753cd86b6c2d7a4085e926a9df5d67d149b0680d3d7853eb3a02af4799051b7bf095d60e0907e85f378ea6621e12931f5be9b28cb6

data/.version

@@ -1 +1 @@
-1.0.0
+1.3.2

data/lib/html-tag/adapter.rb

@@ -1,33 +1,24 @@
-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 *args, &block
+    args.first ? HtmlTagBuilder.tag(*args, &block) : HtmlTagBuilder
+  end
+end

data/lib/html-tag/base.rb

@@ -17,11 +17,11 @@ class HtmlTagBuilder
         data = nil
       end
 
-      # covert n._row to n(class: 'row')
+      # covert n._row_foo to n(class: 'row-foo')
       name = name.to_s
       if name.to_s[0, 1] == '_'
         opts ||= {}
-        opts[:class] = name.to_s.sub('_', '')
+        opts[:class] = name.to_s.sub('_', '').gsub('_', '-')
         name = :div
       end
 
@@ -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
@@ -82,10 +82,11 @@ class HtmlTagBuilder
 
     def __add_opts opts, key, value
       unless value.to_s.blank?
-        opts.push key.to_s.gsub(/_/,'-')+'="'+value.to_s.gsub(/"/,'&quot;')+'"'
+        value = value.join(' ') if value.is_a?(Array)
+        key   = key.to_s.gsub(/data_/,'data-')
+        opts.push key+'="'+value.to_s.gsub(/"/,'&quot;')+'"'
       end
     end
-
   end
 
   ###
@@ -97,15 +98,17 @@ 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.div(class: 'klasa') do -> n.('klasa') do
+  # n.('foo') do -> n.div(class: 'foo') do
   def call class_name, &block
     @data.push self.class.tag(:div, { class: class_name }, &block)
   end
 
+  private
+
   # forward to class
   def method_missing tag_name, *args, &block
     @data.push self.class.tag(tag_name, args[0], args[1], &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Dino Reic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2021-02-12 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
@@ -54,8 +54,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: HTML tag builder
 test_files: []