dom 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1219b93b5c18c22d26821c1092a089ee00a5a4
-  data.tar.gz: 96a575a9fa9ce3159d78f72932abdb2aa1fef53f
+  metadata.gz: 3e3e8109c1a95328ff38ea23213be43fa8a06865
+  data.tar.gz: d61374e6c2985930d0d7ae0d572a1bf5c2d8856b
 SHA512:
-  metadata.gz: 7155b243a44e0614bda027debd95dff6b6d2a05192772d9a53e7337ca36a89b64b7a88cbf1dd7239a8f97b114fe1e21786e36df3d487ce99d9c5604583296b3c
-  data.tar.gz: 359b50537f6b7c485d00594bb706b6e53ab21fea812d2ba3417e0feb6f3c98a31c1b5e0b76ca9b48e46cfd1828ee7c1a94d007c28b29106ce1526df350e19e6f
+  metadata.gz: e880eadaae730af643e02a29ff85f569a2b4ebcddda509ec49eeffa5a7aafd59cdc8804b1c3e233852ffb5596340643919522645e65a50a55aa194da73329de8
+  data.tar.gz: 2307e935d2a2fd80321f4d3c71f3ac5d4a7e6424a9b44a4934e042d53368d789460a3765ead8149bf3f9e3f67c83d33255b6dc4cd7a5b39cb2e0eadafdb11d39

data/lib/dom.rb

@@ -8,6 +8,7 @@ end
 
 module Dom
 	Coder = HTMLEntities.new
+	Indent = "  "
 	def self.compact; singleton_class.class_eval{alias join join_compact} end
 	def self.nested; singleton_class.class_eval{alias join join_nested} end
 	def self.pre; singleton_class.class_eval{alias join join_pre} end
@@ -15,35 +16,39 @@ module Dom
 		a.map{|e| e.to_s.escape_html(tag)}.join(s)
 	end
 	def self.join_nested a, tag
-		"#$/#{join_compact(a, tag, $/).gsub(/^/o, "  ".freeze)}#$/"
+		"#$/%s#$/".freeze % join_compact(a, tag, $/).gsub(/^/o, "  ".freeze)
 	end
 	def self.join_pre a, tag
-		"<!--#$/#{"-->#{join_compact(a, tag, "<!--#$/-->".freeze)}<!--".gsub(/^/o, "  ".freeze)}#$/-->"
+		"<!--#$/#{Indent}-->%s<!--#$/-->".freeze %
+		join_compact(a, tag, "<!--#$/-->".freeze).gsub(/^/o, Indent)
 	end
-	def self.attr h; h.map{|k, v| " #{hyphenize(k)}=\"#{v}\""}.join end
+	def self.attr h; h.map{|k, v| " %s=\"%s\"".freeze % [hyphenize(k), v]}.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
 end
 
 module Kernel
-	private
-	def dom tag, attr = {}
-		"<#{Dom.hyphenize(tag)}#{Dom.attr(attr)} />".escaped
+	private def dom tag, mounted: nil, **attr
+		("<%s%s />".freeze % [Dom.hyphenize(tag), Dom.attr(attr)])
+		.dom_escaped.mounted_set(mounted)
+	end
+	private def jsonml tag, attr = nil
+		[Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr)]
 	end
-	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr)] end
 end
 
 class String
-	def dom tag, attr = {}
-		"<#{Dom.hyphenize(tag)}#{Dom.attr(attr)}>"\
-		"#{escape_html(tag).ansi2html}"\
-		"</#{Dom.hyphenize(tag)}>".escaped
+	def dom tag, mounted: nil, **attr
+		_tag = Dom.hyphenize(tag)
+		("<%s%s>%s</%s>".freeze % [_tag, Dom.attr(attr), escape_html(tag).ansi2html, _tag])
+		.dom_escaped.mounted_set(mounted)
 	end
+	def mounted; nil end
 	def escape_html tag = nil
 		case tag; when :style, :script then self else Dom::Coder.encode(self) end
 	end
 	def unescape_html; Dom::Coder.decode(self) end
-	def escaped; DomString.new(self) end
+	def dom_escaped; DomString.new(self) end
 	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr), self] end
 	AnsiColor = {
 		"1" => "bold",
@@ -71,9 +76,8 @@ class String
 		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]]
-			elsif sc.scan(/./mo) then sc.matched
-			end
-		) until sc.eos?
+			end ||
+		sc.scan(/./mo)) until sc.eos?
 		io.string
 	end
 end
@@ -81,17 +85,26 @@ end
 class DomString < String
 	def to_s; self end
 	def escape_html tag = nil; self end
-	def escaped; self end
-	def % v; super(v).escaped end
-	def * v; super(v).escaped end
-	def + v; super(v).escaped end
+	def dom_escaped; self end
+	def % v; super(v).dom_escaped end
+	def * v; super(v).dom_escaped end
+	def + v; super(v).dom_escaped end
+	def mounted_set *mounted
+		mounted.compact!
+		if mounted.empty?
+		elsif @mounted then @mounted.concat(mounted.join)
+		else @mounted = mounted.join
+		end
+		self
+	end
+	attr_reader :mounted
 end
 
 class Array
-	def dom tag, attr = {}
-		"<#{Dom.hyphenize(tag)}#{Dom.attr(attr)}>"\
-		"#{Dom.join(self, tag)}"\
-		"</#{Dom.hyphenize(tag)}>".escaped
+	def dom tag, mounted: nil, **attr
+		_tag = Dom.hyphenize(tag)
+		("<%s%s>%s</%s>".freeze % [_tag, Dom.attr(attr), Dom.join(self, tag), _tag])
+		.dom_escaped.mounted_set(*map(&:mounted), mounted)
 	end
 	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr), *self] end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dom
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - sawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: []
@@ -36,7 +36,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Creates HTML DOM strings