html-tag 1.3.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e059a4d0fc919b9a8c8ea26b5909c24b5519acf7459314b15fb8d7b485f543b
-  data.tar.gz: 6a9386662a963454a5235376be4eec0f6170b21f393c069fd008f92fbdf89741
+  metadata.gz: 5c14a5d669505ed74d43e52cb564a8635a48a21670e0dce86756b3fc18a90a28
+  data.tar.gz: 00c996b4444863bd710c722585b53638a28f562e64a79483335a853a7e4670e0
 SHA512:
-  metadata.gz: b9d7af17a77ce73ca4c3488092b8772e008ee4b1d8848a0058f3ee969c7e3e24523aa6fc81fb8f9e7f903d4deaeafa0608bb7633894ea22af954e43886df72a8
-  data.tar.gz: b5e3893b3e76b8fc8744c7fb71a508d327d6f8fea98efd51c9b1b3893955d7c17e6c1260b019333b45c399edf125163040c1903e219d8312dccaa266abb80d4c
+  metadata.gz: 00eebf82a2b96e95f25272f536ada28d90115a2a177a129c5877a966449dc87de88833520eb9aa0e8d18038f06a9fd3bab079e10ae92c40be3479e4670787592
+  data.tar.gz: 57047fe46f74f6bb2e6d400c1c0bbb4e9832fc631eabc43cd4f83070c7ccfa67d2a87c6a6c62e1b44db73d61ed3ce2b1fc17412f6a461616f37c349fc759b9b2

data/.version

@@ -1 +1 @@
-1.3.3
+2.0.0

data/lib/html-tag.rb

@@ -1,6 +1,3 @@
-unless ''.respond_to?(:blank?)
-  require 'fast_blank'
-end
-
-require_relative './html-tag/base'
+require_relative './html-tag/html_tag_builder'
+require_relative './html-tag/html_tag'
 require_relative './html-tag/adapter'

data/lib/html-tag/adapter.rb

@@ -2,7 +2,7 @@
 unless {}.respond_to?(:tag)
   class Hash
     def tag node_name, inner_html=nil
-      HtmlTagBuilder.build self, node_name, inner_html
+      ::HtmlTagBuilder.build node_name, self, inner_html
     end
   end
 end
@@ -11,20 +11,7 @@ end
 unless ''.respond_to?(:tag)
   class String
     def tag node_name, opts={}
-      HtmlTagBuilder.build opts, node_name, self
+      ::HtmlTagBuilder.build node_name, opts, 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/html_tag.rb

@@ -0,0 +1,18 @@
+# inclue HtmlTag to import tag method
+
+module HtmlTag
+  extend self
+
+  def tag
+    ::HtmlTagBuilder
+  end
+
+  # forward to class only if
+  def method_missing tag_name, *args, &block
+    if self === HtmlTag
+      ::HtmlTagBuilder.tag(tag_name, args[0], args[1], &block)
+    else
+      super
+    end
+  end
+end

data/lib/html-tag/{base.rb → html_tag_builder.rb}

@@ -1,24 +1,41 @@
+require 'set'
+
 class HtmlTagBuilder
+  EMPTY_TAGS ||= Set.new %w(area base br col embed hr img input keygen link meta param source track wbr)
+
   class << self
     # tag.div -> tag.tag :div
-    def method_missing tag_name, *args, &block
-      tag tag_name, args[0], args[1], &block
+    def method_missing name, *args, &block
+      tag name, args[0], args[1], &block
     end
 
     # tag :div, { 'class'=>'iform' } do
-    def tag name=nil, opts={}, data=nil
-      if Array === opts
-        # join data given as an array
-        data = opts
-        opts = {}
-      elsif Hash === data
-        # tag.button('btn', href: '/') { 'Foo' }
-        opts = data.merge class: opts
-        data = nil
+    def tag name, *args
+      data, opts =
+      if args[1]
+        args[0].class == Hash ? args.reverse : args
+      elsif args[0]
+        if args[0].class == Symbol
+          # tag.div(:a) { 1 } -> <div class="a">1</div>
+          [nil, { class: args[0].to_s.gsub('__', ' ').gsub('_', '-') }]
+        elsif args[0].class == Hash
+          [nil, args[0]]
+        else
+          [args[0], {}]
+        end
+      else
+        [nil, {}]
+      end
+
+      opts ||= {}
+
+      unless opts.class == Hash
+        raise ArgumentError.new('HtmlTag: bad agrument, attriobutes are no a hash')
       end
 
-      # tag.div(:a) { 1 } -> <div class="a">1</div>
-      opts = opts.to_s if opts.class == Symbol
+      if data.class == Hash
+        raise ArgumentError.new('HtmlTag: bad agrument, data sent as hash')
+      end
 
       # covert n._row_foo to n(class: 'row-foo')
       name = name.to_s
@@ -28,21 +45,11 @@ class HtmlTagBuilder
         name = :div
       end
 
-      # covert tag.a '.foo.bar' to class names
-      # covert tag.a '#id' to id names
-      if (data || block_given?) && opts.is_a?(String)
-        given = opts.dup
-        opts  = {}
-
-        given.sub(/#([\w\-]+)/) { opts[:id] = $1 }
-        klass = given.sub(/^\./, '').gsub('.', ' ')
-        opts[:class] = klass unless klass.blank?
-      end
-
-      # fix data and opts unless opts is Hash
-      data, opts = opts, {} unless opts.class == Hash
-
       if block_given?
+        if data
+          raise ArgumentError.new('HtmlTag: data is allreay defined and block is given')
+        end
+
         stack = new
         data  = yield(stack, opts)
 
@@ -52,11 +59,13 @@ class HtmlTagBuilder
 
       data = data.join('') if data.is_a?(Array)
 
-      build opts, name, data
+      build name, opts, data
     end
 
     # build html node
-    def build attrs, node=nil, text=nil
+    def build node, attrs={}, text=nil
+      node = node.to_s
+
       opts = []
       attrs.each do |attr_key, attr_value|
         if attr_value.is_a?(Hash)
@@ -70,12 +79,13 @@ class HtmlTagBuilder
 
       opts = opts.first ? ' '+opts.join(' ') : ''
 
-      return opts unless node
-
-      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
+      if node
+        text ||= '' unless EMPTY_TAGS.include?(node)
+        out = text ? %{<#{node}#{opts}>#{text}</#{node}>} : %{<#{node}#{opts} />}
+        out.respond_to?(:html_safe) ? out.html_safe : out
+      else
+        opts
+      end
     end
 
     # tag.div(class: 'klasa') do -> tag.('klasa') do
@@ -84,7 +94,7 @@ class HtmlTagBuilder
     end
 
     def __add_opts opts, key, value
-      unless value.to_s.blank?
+      unless value.to_s == ''
         value = value.join(' ') if value.is_a?(Array)
         key   = key.to_s.gsub(/data_/,'data-')
         opts.push key+'="'+value.to_s.gsub(/"/,'&quot;')+'"'
@@ -105,15 +115,10 @@ class HtmlTagBuilder
     @data.push block_given? ? yield : data
   end
 
-  # 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)
   end
-end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: html-tag
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: fast_blank
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
+date: 2021-02-27 00:00:00.000000000 Z
+dependencies: []
 description: Fast and powerful tag builder, upgrade to Rails tag helper, framework
   agnostic.
 email: reic.dino@gmail.com
@@ -34,7 +20,8 @@ files:
 - "./.version"
 - "./lib/html-tag.rb"
 - "./lib/html-tag/adapter.rb"
-- "./lib/html-tag/base.rb"
+- "./lib/html-tag/html_tag.rb"
+- "./lib/html-tag/html_tag_builder.rb"
 homepage: https://github.com/dux/html-tag
 licenses:
 - MIT