tag_helper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eabb8b249d6c44b44f92b70f466833eeb165565
-  data.tar.gz: a1bbaa8fbbc8e7c074c9cbc9c665f34a642a8f63
+  metadata.gz: 6b2ddf245d8a964ded991b0b8ffa1b1550bc009c
+  data.tar.gz: 11f3ae737de3edadcce4662756c6f105d70f02f6
 SHA512:
-  metadata.gz: 48c4004d2647dde1d73a0d67b18c7ae8daef6d000783a3dfd49f32aefc72691a4eb556e3a890cc6afbf99acc2cc62313412b160b18ed9f906bb5518e405e92b1
-  data.tar.gz: 70c3db7ce70aa6cc34775eb823e429f930d166c31319e86ac149c4ff7df529b52d2f4c9c5398791d366b677b47a656a9c8828450e3ea7ad9d961281e5d1ab07c
+  metadata.gz: 09a6eb568cd5786b8ce8af6eeac3ee21259e93b4318cc11d4a828c6f8345501a756b486e4dc57dc290512f846aa0c4c334917ab80ecf1aca1172956123efe87e
+  data.tar.gz: bd38809cdb62357d444800e46ff6631d404bb63a675ad0afb00052e7b94c9b828e30dbaa48a281d3c83e817e72c743fb4dd27a074d3653891442f6dff368e5ad

data/README.md

@@ -1,5 +1,5 @@
-tag_helper
-==========
+TagHelper
+=========
 
 Lightweight Ruby lib for building XHTML tags.
 
@@ -28,27 +28,29 @@ $ gem install tag_helper
 ```ruby
 require 'tag_helper'
 
-TagHelper.unary(:img, src: '1.png', alt: 'number one!'))
+include TagHelper
+
+tag(:img, src: '1.png', alt: 'number one!')
 # => '<img src="1.png" alt="number one!" />'
 
-TagHelper.unary(:br)
+tag(:br)
 # => '<br />'
 
-TagHelper.content(:label, 'Name', for: 'name'))
+tag(:label, for: 'name') { 'Name' }
 # => '<label for="name">Name</label>'
 
-TagHelper.content(:p, '<script>alert(0)</script>')
-# => '<p>&lt;script&gt;alert(0)&lt;/script&gt;</p>'
+tag(:div) do
+  tag(:form) do
+    tag(:input, type: 'text')
+  end
+end
+# => '<div><form><input type="text" /></form></div>'
 ```
 
-## LICENSE
-
-Copyright (c) 2015 Dejan Simic
-
-MIT License
+## Code Status
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+[![Circle CI](https://circleci.com/gh/dejan/tag_helper.svg?style=svg&circle-token=cefb9d11fb03efefcf9e35bbc29d9eef68bd980e)](https://circleci.com/gh/dejan/tag_helper)
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+## License
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+TagHelper is released under the [MIT License](https://raw.githubusercontent.com/dejan/tag_helper/master/MIT-LICENCE).

data/lib/tag_helper.rb

@@ -2,29 +2,35 @@ require 'cgi'
 
 # XHTML tags builder
 module TagHelper
-  module_function
+  def tag(tag_name, attrs = {})
+    if block_given?
+      content_tag(tag_name, yield, attrs)
+    else
+      unary_tag(tag_name, attrs)
+    end
+  end
+
+  private
 
-  def unary(tag, attrs = {})
-    "<#{tag_and_attributes(tag, attributes(attrs))} />"
+  def unary_tag(tag_name, attrs = {})
+    "<#{tag_and_attributes(tag_name, tag_attributes(attrs))} />"
   end
 
-  def content(tag, value, attrs = {})
-    start_tag = "<#{tag_and_attributes(tag, attributes(attrs))}>"
-    end_tag   = "</#{tag}>"
-    [start_tag, escape_html(value), end_tag].join
+  def content_tag(tag_name, value, attrs = {})
+    start_tag = "<#{tag_and_attributes(tag_name, tag_attributes(attrs))}>"
+    end_tag   = "</#{tag_name}>"
+    [start_tag, value, end_tag].join
   end
 
-  def tag_and_attributes(tag, attributes)
-    attributes.empty? ? tag : "#{tag} #{attributes}"
+  def tag_and_attributes(tag_name, attributes)
+    attributes.empty? ? tag_name : "#{tag_name} #{attributes}"
   end
 
-  def attributes(hash)
+  def tag_attributes(hash)
     hash.to_a
       .reject { |_k, v| v.nil? }
-      .map { |k, v| %(#{escape_html(k)}="#{escape_html(v)}") }.join(' ')
+      .map { |k, v| %(#{k}="#{v}") }.join(' ')
   end
 
-  def escape_html(str)
-    CGI.escapeHTML(str.to_s)
-  end
+  extend self
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tag_helper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake