dom 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8584195bab3ab80020115f6f91c2707f9d8d452
-  data.tar.gz: f3cf38faf00c31a4b11823fc920147a6a312355c
+  metadata.gz: 88b038b2977ed6d5ebca9f8d1069576c54af8173
+  data.tar.gz: fa7ba3f5e0791bff501b4027828a790346ef4627
 SHA512:
-  metadata.gz: 719fce10bc791310d7f138db495fc8670443a845e0bfbc153a352835ea873202fd785875f4565ff4d0cac86bfc8ca19d4c8e345bfdfd88afb16dc1ecc3b16b8a
-  data.tar.gz: 860b198dab65fdaf52b040090b3db0f95ac51e130b68b771efef308796ebefaa767b1de367a6becf0d1655ef8614c17c7d3f8d57127a7fd3ba73f3df1ddb76a4
+  metadata.gz: 421b0495c1e9fc83ea6512cd23a8db67a8a06352d8f7759e742fdc2f467c91d6204b3635fc95049741b525fc8a8282df44d9c9b417b5c74ace943e4da0111bd0
+  data.tar.gz: 424a460427f206fbb60330bbd1edf8fabde0bba3bb3f58e66d9acb04d1e38c4dc4aa6b9d7b83836ddbc8ac5244ce68516cda99df9c8cc15d45173ebe6eba6a64

data/lib/dom.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require "stringio"
 require "strscan"
 require "htmlentities"
 
 class File
-	def self.relativize f; f.sub(%r{\A/}o, "".freeze) end
+	def self.relativize f; f.sub(%r{\A/}o, "") end
 end
 
 module Dom
@@ -21,29 +22,29 @@ module Dom
 		.prepend($/)
 	end
 	def self.join_pre a, tag
-		a.map{|e| e.to_s.escape_html(tag).prepend("-->".freeze).concat("<!--#$/".freeze)}
+		a.map{|e| e.to_s.escape_html(tag).prepend("-->").concat("<!--#$/")}
 		.join.gsub(/^/o, Indent)
-		.prepend("<!--#$/".freeze).concat("-->".freeze)
+		.prepend("<!--#$/").concat("-->")
 	end
 	def self.attr h
-		" ".concat(h.map do
+		(+" ").concat(h.map do
 			|k, v|
 			v = case v
 			when nil then next
-			when false then "none".freeze
-			when true then "".freeze
+			when false then "none"
+			when true then ""
 			else v
 			end
-			"%s=\"%s\"".freeze % [hyphenize(k), v]
-		end.compact.join" ".freeze)
+			"%s=\"%s\"" % [hyphenize(k), v]
+		end.compact.join" ")
 	end
 	def self.json_attr h; h.map{|k, v| [hyphenize(k), v]}.to_h end
-	def self.hyphenize sym; sym.to_s.tr("_".freeze, "-".freeze) end
+	def self.hyphenize sym; sym.to_s.tr("_", "-") end
 end
 
 module Kernel
 	private def dom tag, mounted: nil, **attr
-		("<%s%s />".freeze % [Dom.hyphenize(tag), Dom.attr(attr)])
+		("<%s%s />" % [Dom.hyphenize(tag), Dom.attr(attr)])
 		.dom_escaped.mounted_set(mounted)
 	end
 	private def jsonml tag, attr = nil
@@ -54,7 +55,7 @@ end
 class String
 	def dom tag, mounted: nil, **attr
 		_tag = Dom.hyphenize(tag)
-		("<%s%s>%s</%s>".freeze % [_tag, Dom.attr(attr), escape_html(tag)._ansi2html, _tag])
+		("<%s%s>%s</%s>" % [_tag, Dom.attr(attr), escape_html(tag)._ansi2html, _tag])
 		.dom_escaped.mounted_set(mounted)
 	end
 	def mounted; nil end
@@ -87,8 +88,8 @@ class String
 		sc = StringScanner.new(self)
 		io = StringIO.new
 		io.print(
-			if sc.scan(/\e\[0?m/o) then '</span>'.freeze
-			elsif sc.scan(/\e\[0?(\d+)m/o) then '<span class="%s">'.freeze % AnsiColor[sc[1]]
+			if sc.scan(/\e\[0?m/o) then '</span>'
+			elsif sc.scan(/\e\[0?(\d+)m/o) then '<span class="%s">' % AnsiColor[sc[1]]
 			end ||
 		sc.scan(/./mo)) until sc.eos?
 		io.string
@@ -114,13 +115,17 @@ class DomString < String
 end
 
 class Array
-	def dom tag, mounted: nil, **attr
+	def dom tag = nil, mounted: nil, **attr
 		error_objs = select{|e| e.kind_of?(String).!}
 		unless error_objs.empty?
 			raise "All array elements must be a string: #{error_objs.first.inspect}"
 		end
-		_tag = Dom.hyphenize(tag)
-		("<%s%s>%s</%s>".freeze % [_tag, Dom.attr(attr), Dom.join(self, tag), _tag])
+		if tag
+			_tag = Dom.hyphenize(tag)
+			"<%s%s>%s</%s>" % [_tag, Dom.attr(attr), Dom.join(self, tag), _tag]
+		else
+			Dom.join(self, tag)
+		end
 		.dom_escaped.mounted_set(*map(&:mounted), mounted)
 	end
 	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr), *self] end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dom
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - sawa
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Creates HTML DOM strings