berns 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 675a795e6f002f4a7a01d8f0cf2212cf700ee532cbfc6f931ac8da70916549c9
-  data.tar.gz: 26f950193def91bbe73e1bf6aee8a5976b91093aa6c4b627463bdf519724bdbc
+  metadata.gz: 1f544945cd9c43afe1ce6d3bdf6e7a3c026b6386925cbe7ac9a6ba36ba228b76
+  data.tar.gz: 21add20e6f88c5c56ba48a5b60d48c80e4f4be0b9b351540345479f2a5f94896
 SHA512:
-  metadata.gz: 0bf3f0367bc6d49a93c623a3974646dbcbeb67999dc336fd03e8b3cab6610e804e2975e981a522c007e363ba03aed3c8b8e819186f47dfc95de811714e51307a
-  data.tar.gz: 643b84ca007b078b79339f83a505e0aabd62bb0beca30890bb8fb4fb9451a8a63a052eec2abbc28127bdc5a504fb98b5d71ea8e7db095fc16f3292bb0c75f424
+  metadata.gz: 40ac56793d022c1191c775aba8020221e6251b9c9be9f61485bd4e0ad3b90e3b46e2e1f4aa1070a3fadce6026b2f48f4b31da156bdba89930fe7c3d557fff06f
+  data.tar.gz: 1af75731f2ce07e6978653b45f077ff20784d950cecbfce74970185c3c2a487c306187d821fed30edba3f4e920a5a7741c9bd009c584f86c7e1c6a0a3d9272fe

data/lib/berns.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
+require 'cgi/escape'
+
 # A utility library for generating HTML strings
 module Berns
+  HASH = {}.freeze
   SPACE = ' '
   EMPTY = ''
 
@@ -13,17 +16,17 @@ module Berns
   # Full list of standard HTML5 elements - https://www.w3schools.com/TAgs/default.asp
   STANDARD = %i[a abbr address article aside audio b bdi bdo blockquote body button canvas caption cite code colgroup datalist dd del details dfn dialog div dl dt em fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 head header html i iframe ins kbd label legend li main map mark menu meter nav noscript object ol optgroup option output p picture pre progress q rp rt ruby s samp script section select small span strong style sub summary table tbody td template textarea tfoot th thead time title tr u ul var video].freeze
 
-  # Dynamically defined methods that are simple proxies to {Markup#element}.
+  # Dynamically defined methods that are simple proxies to {#element}.
   STANDARD.each do |elm|
-    define_singleton_method(elm) do |arguments = {}, &block|
-      element(elm, arguments, &block)
+    define_singleton_method(elm) do |attributes = HASH, &block|
+      element(elm, attributes, &block)
     end
   end
 
-  # Dynamically defined methods that are simple proxies to {Markup#void}.
+  # Dynamically defined methods that are simple proxies to {#void}.
   VOID.each do |elm|
-    define_singleton_method(elm) do |arguments = {}|
-      void(elm, arguments)
+    define_singleton_method(elm) do |attributes = HASH|
+      void(elm, attributes)
     end
   end
 
@@ -52,14 +55,10 @@ module Berns
   # @yieldreturn [String]
   #   The textual content of the element. May be HTML or plain text.
   # @return [String]
-  def self.element(tag, attributes = {})
-    content = yield if block_given?
-
-    # Move stuff around unless the attributes are empty.
-    attrs = to_attributes(attributes)
-    attrs = " #{ attrs }" unless attrs.empty?
+  def self.element(tag, attributes = HASH)
+    return "<#{ tag }>#{ yield if block_given? }</#{ tag }>" if attributes.empty?
 
-    "<#{ tag }#{ attrs }>#{ content }</#{ tag }>"
+    "<#{ tag } #{ to_attributes(attributes) }>#{ yield if block_given? }</#{ tag }>"
   end
 
   # Same as above, but generates void elements i.e. ones without any textual
@@ -69,12 +68,10 @@ module Berns
   #   void(:br) # => "<br>"
   #
   # @return [String]
-  def self.void(tag, attributes = {})
-    # Move stuff around unless the attributes are empty.
-    attrs = to_attributes(attributes)
-    attrs = " #{ attrs }" unless attrs.empty?
+  def self.void(tag, attributes = HASH)
+    return "<#{ tag }>" if attributes.empty?
 
-    "<#{ tag }#{ attrs }>"
+    "<#{ tag } #{ to_attributes(attributes) }>"
   end
 
   # Converts a hash into HTML attributes by mapping each key/value combination
@@ -88,12 +85,22 @@ module Berns
   #
   # @param attributes [Hash]
   #   The hash to convert to HTML attributes.
+  #
   # @return [String]
   #   The space-joined string containing HTML attributes.
   def self.to_attributes(attributes)
-    attributes.map do |attribute, value|
-      to_attribute(attribute, value)
-    end.join(SPACE).chomp(SPACE)
+    return EMPTY if attributes.empty?
+
+    string = +''
+
+    attributes.each do |attr, value|
+      string << SPACE
+
+      to_attribute(attr, value, string)
+    end
+
+    string.strip!
+    string
   end
 
   # Converts a single attribute and value into an HTML attribute string.
@@ -105,20 +112,28 @@ module Berns
   #   The attribute key.
   # @param value [String, Boolean, Hash]
   #   The value to assign to the attribute.
+  # @param string [String, nil]
+  #   The string modify in place with attributes and values.
+  #
   # @return [String]
   #   A single HTML attribute.
-  def self.to_attribute(attribute, value)
-    case value
-    when TrueClass
-      attribute.to_s
-    when Hash
-      value.map do |subattribute, subvalue|
-        "#{ attribute }-#{ to_attribute(subattribute, subvalue) }"
-      end.join(SPACE)
-    when FalseClass
-      EMPTY
+  def self.to_attribute(attribute, value, string = +'')
+    if value.is_a?(FalseClass) # rubocop:disable Style/CaseLikeIf
+      # noop
+    elsif value.is_a?(TrueClass)
+      string << attribute.to_s
+    elsif value.is_a?(Hash)
+      value.each do |attr, subval|
+        string << SPACE
+
+        to_attribute(attr.nil? ? attribute : "#{ attribute }-#{ attr }", subval, string)
+      end
+
+      string.strip!
     else
-      "#{ attribute }='#{ value }'"
+      string << %(#{ attribute }="#{ CGI.escapeHTML(value.to_s) }")
     end
+
+    string
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berns
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,9 +53,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A utility library for generating HTML strings.
 email:
-- taylor.beck@engageft.com
+- beck.taylorg@gmail.com
 - evan@lecklider.com
 executables: []
 extensions: []
@@ -76,14 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A utility library for generating HTML strings.