html-tag 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af81083a15e78d8cecfed801fb466ce389ccae3bd5378528acc1f63aa345e3a
-  data.tar.gz: 668a8a601339fe419daba93f97c33df6f4d3c1ce391b6df6cb70d3cb5574f719
+  metadata.gz: 62429fba4dc4f58b599307927a448ac66ff140053a52f3641188cd9b1c261033
+  data.tar.gz: e692ee406a52cdd0d7c4750dd0553768ede5614ea17ca55f9c9c9066d0832c4c
 SHA512:
-  metadata.gz: d520970b6bfbeb1738e7dc23110f4c66e3859a98fbeb59876f9d31bd916f1b288bb72743da4b38bc944942880d92c4641cce873e1e8e57f82ac726dafacdacfa
-  data.tar.gz: fd4750d1cdbfe778a41a02371a3cca980956ec553acf66df3daf5b40a73c3249e22aceab0287e6f0ca3760da46d71befeb7d029d696d847abd786504bf1ada0a
+  metadata.gz: 44aba32e3255ac8c7f843ac14919dde2994f42168d5c8594c96d46233964d0f09567f72c34c6301a4b8d6655694a6e36506fe153fbc2c01b9aee2ada2d62d677
+  data.tar.gz: f028fe5ee782953b8b6ad78774c2af0307774f069c050e1633c50e6d95886c31feb4d4272bac9cc7f514e12c44da1b913175c12f8824831c1c8575e025211c6b

data/.version

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/html-tag/globals.rb

@@ -2,7 +2,7 @@
 unless {}.respond_to?(:tag)
   class Hash
     def tag node_name, inner_html=nil
-      ::HtmlTag::Outbound.build node_name, self, inner_html
+      HtmlTag().send node_name, self, inner_html
     end
   end
 end
@@ -10,13 +10,27 @@ 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
+      HtmlTag().send node_name, self, opts
     end
   end
 end
 
 # HtmlTag do ...
+module HtmlTag
+  class Proxy
+    def initialize
+      @pointer = HtmlTag::Inbound.new
+    end
+
+    def method_missing name, *args, &block
+      @pointer
+        .send(name, *args, &block)
+        .join('')
+    end
+  end
+end
+
 def HtmlTag *args, &block
   args[0] ||= :div
 
@@ -25,7 +39,11 @@ def HtmlTag *args, &block
     args[0] = :div
   end
 
-  out = HtmlTag::Inbound.new self
-  out.send(*args, &block)
-  out.render
+  if block
+    out = HtmlTag::Inbound.new self
+    out.send(*args, &block)
+    out.render
+  else
+    HtmlTag::Proxy.new
+  end
 end

data/lib/html-tag/html_tag.rb

@@ -23,6 +23,7 @@ module HtmlTag
     if block
       HtmlTag *args, &block
     else
+      # HtmlTag()
       ::HtmlTag::Outbound
     end
   end
@@ -30,6 +31,7 @@ module HtmlTag
   # 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)
     else
       super

data/lib/html-tag/inbound.rb

@@ -27,7 +27,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?('@_')
@@ -66,7 +66,7 @@ module HtmlTag
 
     # 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 +76,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 +102,15 @@ module HtmlTag
       # nested blocks
       if block
         @_iv.depth += 1
-        instance_exec(@_iv.context, &block)
-        # block.call(self) # for outbound render
+
+        if @_iv.context
+          # HtmlTag scope
+          instance_exec(&block)
+        else
+          # outbound scope
+          block.call(self)
+        end
+
         @_iv.depth -= 1
       end
 
@@ -123,19 +133,7 @@ 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
       else
         message = [
           %{HTML tag "#{name}" not found.},
@@ -148,7 +146,7 @@ module HtmlTag
 
     private
 
-    def _prepare_tag_params args
+    def _prepare_tag_params name, args
       opt_hash, opt_data = args
 
       # allow any arragement of vars
@@ -158,7 +156,22 @@ module HtmlTag
         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 +187,7 @@ module HtmlTag
     end
 
     def _escape_param el
-      el.to_s.gsub(/"/, '&quot;')
+      el.to_s.gsub(/'/, '&apos;')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-tag
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Dino Reic