html-tag 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c14a5d669505ed74d43e52cb564a8635a48a21670e0dce86756b3fc18a90a28
-  data.tar.gz: 00c996b4444863bd710c722585b53638a28f562e64a79483335a853a7e4670e0
+  metadata.gz: 1af81083a15e78d8cecfed801fb466ce389ccae3bd5378528acc1f63aa345e3a
+  data.tar.gz: 668a8a601339fe419daba93f97c33df6f4d3c1ce391b6df6cb70d3cb5574f719
 SHA512:
-  metadata.gz: 00eebf82a2b96e95f25272f536ada28d90115a2a177a129c5877a966449dc87de88833520eb9aa0e8d18038f06a9fd3bab079e10ae92c40be3479e4670787592
-  data.tar.gz: 57047fe46f74f6bb2e6d400c1c0bbb4e9832fc631eabc43cd4f83070c7ccfa67d2a87c6a6c62e1b44db73d61ed3ce2b1fc17412f6a461616f37c349fc759b9b2
+  metadata.gz: d520970b6bfbeb1738e7dc23110f4c66e3859a98fbeb59876f9d31bd916f1b288bb72743da4b38bc944942880d92c4641cce873e1e8e57f82ac726dafacdacfa
+  data.tar.gz: fd4750d1cdbfe778a41a02371a3cca980956ec553acf66df3daf5b40a73c3249e22aceab0287e6f0ca3760da46d71befeb7d029d696d847abd786504bf1ada0a

data/.version

@@ -1 +1 @@
-2.0.0
+3.0.0

data/lib/html-tag/globals.rb

@@ -0,0 +1,31 @@
+# Hash
+unless {}.respond_to?(:tag)
+  class Hash
+    def tag node_name, inner_html=nil
+      ::HtmlTag::Outbound.build node_name, self, inner_html
+    end
+  end
+end
+
+# String
+unless ''.respond_to?(:tag)
+  class String
+    def tag node_name, opts={}
+      ::HtmlTag::Outbound.build node_name, opts, self
+    end
+  end
+end
+
+# HtmlTag do ...
+def HtmlTag *args, &block
+  args[0] ||= :div
+
+  if args[0].class == Hash
+    args[1] = args[0]
+    args[0] = :div
+  end
+
+  out = HtmlTag::Inbound.new self
+  out.send(*args, &block)
+  out.render
+end

data/lib/html-tag/html_tag.rb

@@ -1,18 +1,38 @@
 # inclue HtmlTag to import tag method
 
+require 'set'
+
 module HtmlTag
   extend self
 
-  def tag
-    ::HtmlTagBuilder
+  ###
+
+  OPTS = {
+    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
   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)
+      Outbound.tag(tag_name, args[0], args[1], &block)
     else
       super
     end
   end
-end
+end

data/lib/html-tag/inbound.rb

@@ -0,0 +1,180 @@
+# improved builder that is not pasing node pointers
+
+# HtmlTag do
+#   form do
+#     input name: q
+#   end
+# end
+
+module HtmlTag
+  class Inbound
+    IVARS ||= Struct.new :HtmlTagInboundIvars, :context, :data, :depth, :inbound
+
+    # allows to add cusom tags if needed
+    # HtmlTag::Inbound.define :foo
+    def self.define tag, empty: false
+      if empty
+        EMPTY_TAGS.add tag
+      end
+
+      define_method tag do |*args, &block|
+        tag tag, *args, &block
+      end
+    end
+
+    # create static methods for all common tags (method missing is slow)
+    (TAGS + EMPTY_TAGS).each {|tag| define tag }
+
+    ###
+
+    def initialize context
+      # copy all instance varialbes from context
+      for el in context.instance_variables
+        unless el.to_s.include?('@_')
+          val = context.instance_variable_get el
+          instance_variable_set el, val
+        end
+      end
+
+      # lets keep all instance vars in one object
+      @_iv = IVARS.new
+      @_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
+      if block
+        @_iv.context.instance_exec(&block)
+      else
+        @_iv.context
+      end
+    end
+    alias :context :parent
+    alias :this :parent
+
+    # export renderd data
+    def render
+      @_iv.data
+        .join('')
+        .gsub(/\n+/, $/)
+        .gsub(/([\w>])[[:blank:]]+</, '\1<')
+    end
+
+    # render single node
+    def tag name, *args, &block
+      opt_hash, opt_data = _prepare_tag_params args
+
+      tag_data = "%s%s<%s" % [_depth_new_line, _depth_spaces, name]
+
+      # if tag params given, add them
+      if opt_hash
+        tag_data += ' '
+        tag_data += opt_hash.inject([]) do |t, el|
+          key, value = el
+
+          case value
+          when Array
+            value = value.join(' ')
+          when Hash
+            for el in value
+              t.push '%s-%s="%s"' % [key, el[0], _escape_param(el[1])]
+            end
+          else
+            t.push '%s="%s"' % [key, _escape_param(value)]
+          end
+          t
+        end.join(' ')
+      end
+
+      unless EMPTY_TAGS.include?(name)
+        tag_data += '>'
+      end
+
+      @_iv.data << tag_data
+
+      # nested blocks
+      if block
+        @_iv.depth += 1
+        instance_exec(@_iv.context, &block)
+        # block.call(self) # for outbound render
+        @_iv.depth -= 1
+      end
+
+      if EMPTY_TAGS.include?(name)
+        @_iv.data << ' />'
+      else
+        unless opt_data
+          @_iv.data << _depth_spaces
+        end
+
+        @_iv.data << '%s</%s>%s' % [opt_data, name, _depth_new_line]
+      end
+    end
+
+    def push data
+      @_iv.data << data
+    end
+
+    def method_missing name, *args, &block
+      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
+      else
+        message = [
+          %{HTML tag "#{name}" not found.},
+          "Use this.#{name}() to call method in parent context",
+          "or use tag(:#{name}, params, data) to add custom html node."
+        ]
+        raise NoMethodError.new(message.join(' '))
+      end
+    end
+
+    private
+
+    def _prepare_tag_params 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
+        opt_hash, opt_data = opt_data, opt_hash
+      end
+
+      [opt_hash, opt_data]
+    end
+
+    def _depth_spaces
+      if OPTS[:format]
+        ' ' * 2 * @_iv.depth
+      else
+        ''
+      end
+    end
+
+    def _depth_new_line
+      OPTS[:format] ? $/ : ''
+    end
+
+    def _escape_param el
+      el.to_s.gsub(/"/, '&quot;')
+    end
+  end
+end

data/lib/html-tag/outbound.rb

@@ -0,0 +1,127 @@
+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

data/lib/html-tag.rb

@@ -1,3 +1,5 @@
-require_relative './html-tag/html_tag_builder'
 require_relative './html-tag/html_tag'
-require_relative './html-tag/adapter'
+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: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies: []
 description: Fast and powerful tag builder, upgrade to Rails tag helper, framework
   agnostic.
@@ -19,9 +19,10 @@ extra_rdoc_files: []
 files:
 - "./.version"
 - "./lib/html-tag.rb"
-- "./lib/html-tag/adapter.rb"
+- "./lib/html-tag/globals.rb"
 - "./lib/html-tag/html_tag.rb"
-- "./lib/html-tag/html_tag_builder.rb"
+- "./lib/html-tag/inbound.rb"
+- "./lib/html-tag/outbound.rb"
 homepage: https://github.com/dux/html-tag
 licenses:
 - MIT
@@ -41,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: HTML tag builder

data/lib/html-tag/adapter.rb

@@ -1,17 +0,0 @@
-# Hash
-unless {}.respond_to?(:tag)
-  class Hash
-    def tag node_name, inner_html=nil
-      ::HtmlTagBuilder.build node_name, self, inner_html
-    end
-  end
-end
-
-# String
-unless ''.respond_to?(:tag)
-  class String
-    def tag node_name, opts={}
-      ::HtmlTagBuilder.build node_name, opts, self
-    end
-  end
-end

data/lib/html-tag/html_tag_builder.rb

@@ -1,124 +0,0 @@
-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 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, attriobutes 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] == '_'
-        opts ||= {}
-        opts[:class] = name.to_s.sub('_', '').gsub('_', '-')
-        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)
-        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
-    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