dom 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af86488c43e306be0a7fc24c9343b9c2aab9cb8e
-  data.tar.gz: a046070bdf9b9031aab60bd4e61c8b7f8280e503
+  metadata.gz: 49c3fb432d27f5488f5955f5b99153e274ab55a1
+  data.tar.gz: 41b6f84db64138f97586c68287bbf7b7e7f6c3ed
 SHA512:
-  metadata.gz: 0d70cc43b27b7b5e473fb6c5c73613f8f6ec579f5a60f0f5a6ece248587bacb3228bcb78f38590d55d711cbac8e61db9bea31f9930932ce2a2f2e554e44f81b4
-  data.tar.gz: 7583a410834679d1f060451978da8e488828691fdde6f27e508ff3de43d25f1300b1b8eb8d8496ad74aa911afdc7d965484f36acc50bdc0db2752f2b96941b01
+  metadata.gz: 8161f52adbecfdcc1ad7ffcdc473a73c5b5441cbe4d8d1fa0265280b1e65f21bcec23ebe612c2f5957c7d49a48063dbca59a901cb7aaca4b0db01fb74e6de06e
+  data.tar.gz: 6fde54d4c5a320f265590de3532e28e69941e4f239119c93edbcc20e2ac16cce5d3c14193ac4010a5b6b6e6355b5438d1bb95b8b9738816892242b7a50def64c

data/lib/dom.rb

@@ -16,6 +16,7 @@ module Dom
 		"<!--#$/#{"-->#{join_compact(a, tag, "<!--#$/-->")}<!--".gsub(/^/, "  ")}#$/-->"
 	end
 	def self.attr h; h.map{|k, v| " #{hyphenize(k)}=\"#{v}\""}.join end
+	def self.json_attr h; Hash[h.map{|k, v| [hyphenize(k), v]}] end
 	def self.hyphenize sym; sym.to_s.tr("_", "-") end
 end
 
@@ -24,6 +25,7 @@ module Kernel
 	def dom tag, attr = {}
 		"<#{Dom.hyphenize(tag)}#{Dom.attr(attr)} />".escaped
 	end
+	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr)] end
 end
 
 class String
@@ -36,8 +38,12 @@ class String
 		case tag; when :style, :script then self else CGI.escapeHTML(self) end
 	end
 	def escaped; DomString.new(self) end
+	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr), self] end
 	AnsiColor = {
 		"1" => "bold",
+		"4" => "underline",
+		"5" => "blink",
+		"7" => "inverse",
 		"30" => "black",
 		"31" => "red",
 		"32" => "green",
@@ -46,16 +52,23 @@ class String
 		"35" => "magenta",
 		"36" => "cyan",
 		"37" => "white",
-		"90" => "grey"
+		"40" => "bg-black",
+		"41" => "bg-red",
+		"42" => "bg-green",
+		"43" => "bg-yellow",
+		"44" => "bg-blue",
+		"45" => "bg-magenta",
+		"46" => "bg-cyan",
+		"47" => "bg-white",
 	}
 	def ansi2html
 		ansi = StringScanner.new(escape_html)
 		html = StringIO.new
 		until ansi.eos?
-			if ansi.scan(/\e\[(3[0-7]|90|1)m/)
-				html.print(%{<span class="#{AnsiColor[ansi[1]]}">})
-			elsif ansi.scan(/\e\[0?m/)
+			if ansi.scan(/\e\[0?m/)
 				html.print(%{</span>})
+			elsif ansi.scan(/\e\[0?(\d+)m/)
+				html.print(%{<span class="#{AnsiColor[ansi[1]]}">})
 			else
 				html.print(ansi.scan(/./m))
 			end
@@ -78,6 +91,7 @@ class Array
 		"#{Dom.join(self, tag)}"\
 		"</#{Dom.hyphenize(tag)}>".escaped
 	end
+	def jsonml tag, attr = nil; [Dom.hyphenize(tag), *([Dom.json_attr(attr)] if attr), *self] end
 end
 
 Dom.nested

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dom
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: []
@@ -26,17 +26,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0.preview.1
 signing_key: 
 specification_version: 4
 summary: Creates HTML DOM strings