html_pretty 0.1.0 → 0.1.1

data/Rakefile

@@ -1,25 +1,46 @@
-require 'rexml/document'
 
 
-task :compare do
-  dstdir = 'compare'
-  srcfile = "#{dstdir}/_orig.html"
-  srcstr = IO.read(srcfile)
+namespace :output do
+  def work_dir
+    'compare'
+  end
 
-  `ruby -Ilib bin/html_pretty #{srcfile} >#{dstdir}/html_pretty.html`
-  `htmlbeautifier <#{srcfile} >#{dstdir}/htmlbeautifier.html`
-  `tidy -i -q #{srcfile} >#{dstdir}/tidy.html 2>&-`
+  def src_file
+    "#{work_dir}/_orig.html"
+  end
 
-  begin
-    require 'nokogiri'
-    doc = Nokogiri::XML(srcstr, &:noblanks)
-    File.open("#{dstdir}/nokogiri.html", 'w'){|f| f.write doc.to_xhtml(:indent => 2)}
-  rescue LoadError => e
-    $stderr.puts '-- nokogiri not found -- skipping'
+  def orig_str
+    IO.read(orig_file)
+  end
+
+  def dst_file(t)
+    "#{work_dir}/#{t.rpartition(':').last}.html"
+  end
+
+  task :html_pretty do |t|
+    sh "ruby -Ilib bin/html_pretty #{orig_file} >#{dst_file(t)}"
   end
 
-  doc = REXML::Document.new(srcstr)
-  File.open("#{dstdir}/rexml.html", 'w'){|f| doc.write f, 2}
+  task :htmlbeautifier do |t|
+    sh "htmlbeautifier <#{orig_file} >#{dst_file(t)}"
+  end
+
+  task :tidy do |t|
+    sh "tidy -i -q #{orig_file} >#{dst_file(t)} 2>&1"
+  end
+
+  task :rexml do |t|
+    require 'rexml/document'
+    doc = REXML::Document.new(orig_str)
+    File.open(dst_file(t), 'w'){|f| doc.write f, 2}
+  end
+
+  task :nokogiri do |t|
+    require 'nokogiri'
+    doc = Nokogiri::XML(orig_str, &:noblanks)
+    File.open(dst_file(t), 'w'){|f| f.write doc.to_xhtml(:indent => 2)}
+  end
 end
+task :output => 'output:html_pretty'
 
-task :default => :compare
+task :default => :output

data/lib/html_pretty.rb

@@ -2,7 +2,7 @@ require 'html_pretty/version'
 
 
 module HtmlPretty
-  SPECIAL = /(<!--.*?-->|<script.*?\/script>|<style.*?\/style>)/m
+  SPECIAL = /(<!DOCTYPE.*?>|<!--.*?-->|<script.*?\/script>|<style.*?\/style>)/m
 
   # Really bad assumption heavy tidy...
   # Self rolled because other versions have weird errors

data/lib/html_pretty/version.rb

@@ -1,3 +1,3 @@
 module HtmlPretty
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_pretty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec