html-tag 3.0.1 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62429fba4dc4f58b599307927a448ac66ff140053a52f3641188cd9b1c261033
-  data.tar.gz: e692ee406a52cdd0d7c4750dd0553768ede5614ea17ca55f9c9c9066d0832c4c
+  metadata.gz: 6eaa9e68ea5e104f1daf2c3d36b8e64835ade4e33efa9b662aa2c5da5555c482
+  data.tar.gz: 6f48a76f0f4aeb814b9a98f5864bcac91a6b3758f4b015056e8d41876b9bc94d
 SHA512:
-  metadata.gz: 44aba32e3255ac8c7f843ac14919dde2994f42168d5c8594c96d46233964d0f09567f72c34c6301a4b8d6655694a6e36506fe153fbc2c01b9aee2ada2d62d677
-  data.tar.gz: f028fe5ee782953b8b6ad78774c2af0307774f069c050e1633c50e6d95886c31feb4d4272bac9cc7f514e12c44da1b913175c12f8824831c1c8575e025211c6b
+  metadata.gz: 936d7c82a1fbe23b232136833f1003b4af0c450f31e2f23d5d9683678b77070f1de8341dd8f0daf672676bb42a91a4dc64ea694688500d87d099918178ccd935
+  data.tar.gz: 95b4334aeb8a0286875b9638a2486ed8d6eaa87cf61525151aa6c2fcefd4b9deced6c1bb58b0bdd5fdf1f142ee33a8beeb8d193412146d6a3c892e98bfcc9cff

data/.version

@@ -1 +1 @@
-3.0.1
+3.0.6

data/lib/html-tag/globals.rb

@@ -1,8 +1,8 @@
 # Hash
 unless {}.respond_to?(:tag)
   class Hash
-    def tag node_name, inner_html=nil
-      HtmlTag().send node_name, self, inner_html
+    def tag node_name, inner_html=nil, &block
+      HtmlTag::Inbound.new.tag(node_name, inner_html, self, &block).join('')
     end
   end
 end
@@ -10,8 +10,8 @@ end
 # String
 unless ''.respond_to?(:tag)
   class String
-    def tag node_name, opts = nil
-      HtmlTag().send node_name, self, opts
+    def tag node_name, opts = nil, &block
+      HtmlTag::Inbound.new.tag(node_name, self, opts, &block).join('')
     end
   end
 end
@@ -19,8 +19,8 @@ end
 # HtmlTag do ...
 module HtmlTag
   class Proxy
-    def initialize
-      @pointer = HtmlTag::Inbound.new
+    def initialize scope = nil
+      @pointer = HtmlTag::Inbound.new scope
     end
 
     def method_missing name, *args, &block
@@ -32,18 +32,30 @@ module HtmlTag
 end
 
 def HtmlTag *args, &block
-  args[0] ||= :div
+  if [Class, Module].include?(args[0].class)
+    # imports tag method without poluting ancesstors namespace
+    # class SomeClass
+    #   HtmlTag self
+    args[0].define_method :tag do |*tag_args, &tag_block|
+      HtmlTag *tag_args, &tag_block
+    end
+  else
+    # HtmlTag do ...
+    args[0] ||= :div
 
-  if args[0].class == Hash
-    args[1] = args[0]
-    args[0] = :div
-  end
+    if args[0].class == Hash
+      args[1] = args[0]
+      args[0] = :div
+    end
 
-  if block
-    out = HtmlTag::Inbound.new self
-    out.send(*args, &block)
-    out.render
-  else
-    HtmlTag::Proxy.new
+    if block
+      # HtmlTag(:ul) { li ... }
+      out = HtmlTag::Inbound.new self
+      out.send(*args, &block)
+      out.render
+    else
+      # HtmlTag._foo 123
+      HtmlTag::Proxy.new self
+    end
   end
 end

data/lib/html-tag/html_tag.rb

@@ -11,28 +11,15 @@ module HtmlTag
     format: false
   }
 
-  TAGS ||= Set.new %i(
-    a b button code colgroup dd div dl dt em fieldset form h1 h2 h3 h4 h5 h6
-    header i iframe label legend li main map nav noscript object ol optgroup option p pre q
-    script section select small span strong summary table tbody td textarea tfoot th thead title tr u ul video
-  )
-
-  EMPTY_TAGS ||= Set.new %w(area base br col embed hr img input keygen link meta param source track wbr)
-
   def tag *args, &block
-    if block
-      HtmlTag *args, &block
-    else
-      # HtmlTag()
-      ::HtmlTag::Outbound
-    end
+    HtmlTag *args, &block
   end
 
   # forward to class only if
   def method_missing tag_name, *args, &block
     if self === HtmlTag
-      # Proxy.new.tag(tag_name, args[0], args[1], &block)
-      Outbound.tag(tag_name, args[0], args[1], &block)
+      # Outbound.tag(tag_name, args[0], args[1], &block)
+      Proxy.new.tag(tag_name, args[0], args[1], &block)
     else
       super
     end

data/lib/html-tag/inbound.rb

@@ -1,24 +1,26 @@
-# improved builder that is not pasing node pointers
-
-# HtmlTag do
-#   form do
-#     input name: q
-#   end
-# end
+# improved HTML builder that doess not need node pointers
 
 module HtmlTag
   class Inbound
-    IVARS ||= Struct.new :HtmlTagInboundIvars, :context, :data, :depth, :inbound
+    IVARS ||= Struct.new :HtmlTagInboundIvars, :context, :data, :depth
+
+    TAGS ||= Set.new %i(
+      a article b button code center colgroup dd div dl dt em fieldset form h1 h2 h3 h4 h5 h6
+      header i iframe label legend li main map nav noscript object ol optgroup option p pre q
+      script section select small span sub strong style summary table tbody td textarea tfoot th thead title tr u ul video
+    )
+
+    EMPTY_TAGS ||= Set.new %w(area base br col embed hr img input keygen link meta param source track wbr)
 
     # allows to add cusom tags if needed
     # HtmlTag::Inbound.define :foo
-    def self.define tag, empty: false
+    def self.define name, empty: false
       if empty
-        EMPTY_TAGS.add tag
+        EMPTY_TAGS.add name
       end
 
-      define_method tag do |*args, &block|
-        tag tag, *args, &block
+      define_method name do |*args, &block|
+        tag name, *args, &block
       end
     end
 
@@ -38,15 +40,18 @@ module HtmlTag
 
       # lets keep all instance vars in one object
       @_iv = IVARS.new
-      @_iv.context = context
-      @_iv.data    = []
-      @_iv.depth   = 0
-      @_iv.inbound = true
+      @_iv.context   = context
+      @_iv.data      = []
+      @_iv.depth     = 0
     end
 
     # access parent context via parent / context / this
     # h1 class: this.class_name
     def parent &block
+      unless @_iv.context
+        raise 'Host scope is not available'
+      end
+
       if block
         @_iv.context.instance_exec(&block)
       else
@@ -61,7 +66,7 @@ module HtmlTag
       @_iv.data
         .join('')
         .gsub(/\n+/, $/)
-        .gsub(/([\w>])[[:blank:]]+</, '\1<')
+        #.gsub(/([\w>])[[:blank:]]+</, '\1<')
     end
 
     # render single node
@@ -78,7 +83,7 @@ module HtmlTag
 
           if value.class == Hash
             for el in value
-              t.push "%s-%s='%s'" % [key, el[0], _escape_param(el[1])]
+              t.push '%s-%s=%s' % [key, el[0], _escape_param(el[1])]
             end
           else
             if value.class == Array
@@ -87,7 +92,7 @@ module HtmlTag
 
             key = key.to_s.sub(/^data_/, 'data-')
 
-            t.push "%s='%s'" % [key, _escape_param(value)]
+            t.push '%s=%s' % [key, _escape_param(value)]
           end
           t
         end.join(' ')
@@ -102,15 +107,20 @@ module HtmlTag
       # nested blocks
       if block
         @_iv.depth += 1
+        node_count = @_iv.data.length
 
-        if @_iv.context
+        block_data = if @_iv.context
           # HtmlTag scope
-          instance_exec(&block)
+          instance_exec(self, &block)
         else
           # outbound scope
           block.call(self)
         end
 
+        if block_data.class == String && node_count == @_iv.data.length
+          @_iv.data << block_data
+        end
+
         @_iv.depth -= 1
       end
 
@@ -121,11 +131,19 @@ module HtmlTag
           @_iv.data << _depth_spaces
         end
 
+        if opt_data.class == Array
+          opt_data = opt_data.join('')\
+        end
+
         @_iv.data << '%s</%s>%s' % [opt_data, name, _depth_new_line]
       end
     end
 
-    def push data
+    def push data = nil
+      if block_given?
+        data = yield
+      end
+
       @_iv.data << data
     end
 
@@ -134,6 +152,8 @@ module HtmlTag
 
       if klass.start_with?('_')
         tag klass, *args, &block
+      elsif @_iv.context
+        @_iv.context.send name, *args, &block
       else
         message = [
           %{HTML tag "#{name}" not found.},
@@ -152,7 +172,7 @@ module HtmlTag
       # allow any arragement of vars
       # div class: :foo, 123
       # div 123, class: :foo
-      if opt_hash && opt_hash.class != Hash
+      if opt_data.class == Hash || (opt_hash && opt_hash.class != Hash)
         opt_hash, opt_data = opt_data, opt_hash
       end
 
@@ -187,7 +207,16 @@ module HtmlTag
     end
 
     def _escape_param el
-      el.to_s.gsub(/'/, '&apos;')
+      data = el.to_s
+
+      if data.include?('"')
+        # if we dump json export to a tag attribute, there will be a lot of qutes
+        # it is much more readable to use quot(') insted of quote (") in this case
+        "'%s'" % data.gsub(/'/, '&apos;')
+      else
+        # regualr node
+        '"%s"' % data
+      end
     end
   end
 end

data/lib/html-tag.rb

@@ -1,5 +1,4 @@
 require_relative './html-tag/html_tag'
-require_relative './html-tag/outbound'
 require_relative './html-tag/inbound'
 require_relative './html-tag/globals'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-tag
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.6
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Fast and powerful tag builder, upgrade to Rails tag helper, framework
   agnostic.
@@ -22,7 +22,6 @@ files:
 - "./lib/html-tag/globals.rb"
 - "./lib/html-tag/html_tag.rb"
 - "./lib/html-tag/inbound.rb"
-- "./lib/html-tag/outbound.rb"
 homepage: https://github.com/dux/html-tag
 licenses:
 - MIT

data/lib/html-tag/outbound.rb

@@ -1,127 +0,0 @@
-module HtmlTag
-  class Outbound
-    class << self
-      # tag.div -> tag.tag :div
-      def method_missing name, *args, &block
-        tag name, args[0], args[1], &block
-      end
-
-      # tag :div, { 'class'=>'iform' } do
-      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, attributes are no a hash')
-        end
-
-        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
-        if name.to_s[0, 1] == '_'
-          classes = name
-            .sub('_', '')
-            .split('__')
-            .map{|it| it.gsub('_', '-') }
-            .join(' ')
-
-          opts ||= {}
-          opts[:class] = "#{classes} #{opts[:class]}".sub(/\s+$/, '')
-          name = :div
-        end
-
-        if block_given?
-          if data
-            raise ArgumentError.new('HtmlTag: data is allreay defined and block is given')
-          end
-
-          stack = new
-          data  = yield(stack, opts)
-
-          # if data is pushed to passed node, use that data
-          data = stack.data if stack.data.first
-        end
-
-        data = data.join('') if data.is_a?(Array)
-
-        build name, opts, data
-      end
-
-      # build html node
-      def build node, attrs={}, text=nil
-        node = node.to_s
-
-        opts = []
-        attrs.each do |attr_key, attr_value|
-          if attr_value.is_a?(Hash)
-            for data_key, data_value in attr_value
-              __add_opts opts, "#{attr_key}-#{data_key}", data_value
-            end
-          else
-            __add_opts opts, attr_key, attr_value
-          end
-        end
-
-        opts = opts.first ? ' '+opts.join(' ') : ''
-
-        if node
-          text ||= '' unless EMPTY_TAGS.include?(node)
-          text ? %{<#{node}#{opts}>#{text}</#{node}>} : %{<#{node}#{opts} />}
-        else
-          opts
-        end
-      end
-
-      # tag.div(class: 'klasa') do -> tag.('klasa') do
-      def call class_name, &block
-        tag(:div, class_name, &block)
-      end
-
-      def __add_opts opts, key, value
-        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;')+'"'
-        end
-      end
-    end
-
-    ###
-
-    attr_reader :data
-
-    def initialize
-      @data = []
-    end
-
-    # push data to stack
-    def push data=nil
-      @data.push block_given? ? yield : data
-    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