html-tag 3.0.0 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af81083a15e78d8cecfed801fb466ce389ccae3bd5378528acc1f63aa345e3a
-  data.tar.gz: 668a8a601339fe419daba93f97c33df6f4d3c1ce391b6df6cb70d3cb5574f719
+  metadata.gz: dbe612eb55803c0518ef0c59757a6fedeac1ec3e5859fb20f712ab578287483e
+  data.tar.gz: 1926ecbaa5fa256e935d7f56f40d74009b853f22cf31d977f9be65ed46c458d2
 SHA512:
-  metadata.gz: d520970b6bfbeb1738e7dc23110f4c66e3859a98fbeb59876f9d31bd916f1b288bb72743da4b38bc944942880d92c4641cce873e1e8e57f82ac726dafacdacfa
-  data.tar.gz: fd4750d1cdbfe778a41a02371a3cca980956ec553acf66df3daf5b40a73c3249e22aceab0287e6f0ca3760da46d71befeb7d029d696d847abd786504bf1ada0a
+  metadata.gz: 9d7a187837aadba38e7672e04a9a8b11cdd1e376099ba24ce9dec2502dcee7b7b33e0213d13416e3a4e08dba17a04b6e34a821e26903ca377d32817f9fb5aa71
+  data.tar.gz: 7b66aaf48524a02d1ff082a38009c72da9093c8681786af272dba6f84b7d1da5e9bdce30b44401fd6ddfff7c565f05fa246c5cf1bc4276421b148bc90b2f0d0e

data/.version

@@ -1 +1 @@
-3.0.0
+3.0.5

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::Outbound.build 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,22 +10,52 @@ end
 # String
 unless ''.respond_to?(:tag)
   class String
-    def tag node_name, opts={}
-      ::HtmlTag::Outbound.build node_name, opts, self
+    def tag node_name, opts = nil, &block
+      HtmlTag::Inbound.new.tag(node_name, self, opts, &block).join('')
     end
   end
 end
 
 # HtmlTag do ...
-def HtmlTag *args, &block
-  args[0] ||= :div
+module HtmlTag
+  class Proxy
+    def initialize scope = nil
+      @pointer = HtmlTag::Inbound.new scope
+    end
 
-  if args[0].class == Hash
-    args[1] = args[0]
-    args[0] = :div
+    def method_missing name, *args, &block
+      @pointer
+        .send(name, *args, &block)
+        .join('')
+    end
   end
+end
 
-  out = HtmlTag::Inbound.new self
-  out.send(*args, &block)
-  out.render
+def HtmlTag *args, &block
+  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 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,26 +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::Outbound
-    end
+    HtmlTag *args, &block
   end
 
   # forward to class only if
   def method_missing tag_name, *args, &block
     if self === HtmlTag
-      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
 
@@ -27,7 +29,7 @@ module HtmlTag
 
     ###
 
-    def initialize context
+    def initialize context = nil
       # copy all instance varialbes from context
       for el in context.instance_variables
         unless el.to_s.include?('@_')
@@ -41,12 +43,15 @@ module HtmlTag
       @_iv.context = context
       @_iv.data    = []
       @_iv.depth   = 0
-      @_iv.inbound = true
     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,12 +66,12 @@ module HtmlTag
       @_iv.data
         .join('')
         .gsub(/\n+/, $/)
-        .gsub(/([\w>])[[:blank:]]+</, '\1<')
+        #.gsub(/([\w>])[[:blank:]]+</, '\1<')
     end
 
     # render single node
     def tag name, *args, &block
-      opt_hash, opt_data = _prepare_tag_params args
+      name, opt_hash, opt_data = _prepare_tag_params name, args
 
       tag_data = "%s%s<%s" % [_depth_new_line, _depth_spaces, name]
 
@@ -76,15 +81,18 @@ module HtmlTag
         tag_data += opt_hash.inject([]) do |t, el|
           key, value = el
 
-          case value
-          when Array
-            value = value.join(' ')
-          when Hash
+          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
-            t.push '%s="%s"' % [key, _escape_param(value)]
+            if value.class == Array
+              value = value.join(' ')
+            end
+
+            key = key.to_s.sub(/^data_/, 'data-')
+
+            t.push '%s=%s' % [key, _escape_param(value)]
           end
           t
         end.join(' ')
@@ -99,8 +107,19 @@ module HtmlTag
       # nested blocks
       if block
         @_iv.depth += 1
-        instance_exec(@_iv.context, &block)
-        # block.call(self) # for outbound render
+
+        block_data = if @_iv.context
+          # HtmlTag scope
+          instance_exec(self, &block)
+        else
+          # outbound scope
+          block.call(self)
+        end
+
+        if block_data.class == String
+          @_iv.data << block_data
+        end
+
         @_iv.depth -= 1
       end
 
@@ -111,11 +130,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
 
@@ -123,19 +150,9 @@ module HtmlTag
       klass = name.to_s
 
       if klass.start_with?('_')
-        # _foo__bar-baz class: 'dux' ->  <div class="foo bar-baz dux"></div>
-        classes = klass
-          .sub('_', '')
-          .split('__')
-          .map{|it| it.gsub('_', '-') }
-          .join(' ')
-
-        prepared = _prepare_tag_params args
-
-        prepared[0] ||= {}
-        prepared[0][:class] = "#{classes} #{prepared[0][:class]}".sub(/\s+$/, '')
-
-        tag :div, *prepared, &block
+        tag klass, *args, &block
+      elsif @_iv.context
+        @_iv.context.send name, *args, &block
       else
         message = [
           %{HTML tag "#{name}" not found.},
@@ -148,17 +165,32 @@ module HtmlTag
 
     private
 
-    def _prepare_tag_params args
+    def _prepare_tag_params name, args
       opt_hash, opt_data = args
 
       # 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
 
-      [opt_hash, opt_data]
+      # _foo__bar-baz class: 'dux' ->  <div class="foo bar-baz dux"></div>
+      klass = name.to_s
+      if klass.start_with?('_')
+        classes = klass
+          .sub('_', '')
+          .split('__')
+          .map{|it| it.gsub('_', '-') }
+          .join(' ')
+
+        klass = :div
+
+        opt_hash ||= {}
+        opt_hash[:class] = "#{classes} #{opt_hash[:class]}".sub(/\s+$/, '')
+      end
+
+      [klass, opt_hash, opt_data]
     end
 
     def _depth_spaces
@@ -174,7 +206,16 @@ module HtmlTag
     end
 
     def _escape_param el
-      el.to_s.gsub(/"/, '&quot;')
+      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.0
+  version: 3.0.5
 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