berns 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d86db169c443fbe77f5f22560d9e5dabec886e9dc4092258d0baf124a0d1cc0
-  data.tar.gz: 11c1d828b8f26628dd813fdd3df8cd39a0e42e83b11f5b1df64f87716e8afdb4
+  metadata.gz: 1f544945cd9c43afe1ce6d3bdf6e7a3c026b6386925cbe7ac9a6ba36ba228b76
+  data.tar.gz: 21add20e6f88c5c56ba48a5b60d48c80e4f4be0b9b351540345479f2a5f94896
 SHA512:
-  metadata.gz: a5d58daef750ba78d776c8ce34bc5ddcdb90701718b8f6110871363c05926219c60dddfbc1eba14a6decf5f2645b6c75f9a3d9f014b8c024a831e8fa13997b2e
-  data.tar.gz: e184ef843bb995eaf0008c551e7f7d7bf86906d0c6a51f9f7b1c7ff7a4af1bea1c28cc2fde5e88c01d367cb6ec4e9d717d70ae0d8618331f3c6e479d48890c5d
+  metadata.gz: 40ac56793d022c1191c775aba8020221e6251b9c9be9f61485bd4e0ad3b90e3b46e2e1f4aa1070a3fadce6026b2f48f4b31da156bdba89930fe7c3d557fff06f
+  data.tar.gz: 1af75731f2ce07e6978653b45f077ff20784d950cecbfce74970185c3c2a487c306187d821fed30edba3f4e920a5a7741c9bd009c584f86c7e1c6a0a3d9272fe

data/lib/berns.rb

@@ -3,6 +3,7 @@ require 'cgi/escape'
 
 # A utility library for generating HTML strings
 module Berns
+  HASH = {}.freeze
   SPACE = ' '
   EMPTY = ''
 
@@ -17,15 +18,15 @@ module Berns
 
   # 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 {#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
 
@@ -54,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?
+  def self.element(tag, attributes = HASH)
+    return "<#{ tag }>#{ yield if block_given? }</#{ tag }>" if attributes.empty?
 
-    # Move stuff around unless the attributes are empty.
-    attrs = to_attributes(attributes)
-    attrs = " #{ attrs }" unless attrs.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
@@ -71,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
@@ -90,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.
@@ -107,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|
-        to_attribute(subattribute ? "#{ attribute }-#{ subattribute }" : attribute, 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 }="#{ CGI.escapeHTML(value.to_s) }")
+      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.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,34 @@ 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:
 - beck.taylorg@gmail.com
@@ -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.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A utility library for generating HTML strings.