html_pretty 0.1.1 → 0.2.0

data/README.md

@@ -1,2 +1,2 @@
-html-pretty
-===========
+html-pretty [![Build Status](https://secure.travis-ci.org/fengb/html_pretty.png)](http://travis-ci.org/fengb/html_pretty)
+===========

data/Rakefile

@@ -1,46 +1,45 @@
-
-
-namespace :output do
-  def work_dir
-    'compare'
-  end
-
-  def src_file
-    "#{work_dir}/_orig.html"
+namespace :compare do
+  def src_str
+    @src_str ||= IO.read("compare/_orig.html")
   end
 
-  def orig_str
-    IO.read(orig_file)
+  def comptask(taskname, options={}, &block)
+    desc "Output comparison for #{taskname}"
+    task taskname do
+      require options.delete(:require) || taskname.to_s
+      File.open("compare/#{taskname}.html", 'w') do |outfile|
+        block.call(outfile, src_str)
+      end
+    end
   end
 
-  def dst_file(t)
-    "#{work_dir}/#{t.rpartition(':').last}.html"
+  comptask :html_pretty do |outfile, instr|
+    outfile.write HtmlPretty.run(src_str)
   end
 
-  task :html_pretty do |t|
-    sh "ruby -Ilib bin/html_pretty #{orig_file} >#{dst_file(t)}"
+  comptask :htmlbeautifier do |outfile, instr|
+    HtmlBeautifier::Beautifier.new(outfile).scan(instr)
   end
 
-  task :htmlbeautifier do |t|
-    sh "htmlbeautifier <#{orig_file} >#{dst_file(t)}"
+  comptask :rexml, :require => 'rexml/document' do |outfile, instr|
+    REXML::Document.new(instr).write(outfile, 2)
   end
 
-  task :tidy do |t|
-    sh "tidy -i -q #{orig_file} >#{dst_file(t)} 2>&1"
+  comptask :nokogiri do |outfile, instr|
+    outfile.write Nokogiri::XML(instr, &:noblanks).to_xhtml(:indent => 2)
   end
+end
+desc "Output all comparisons"
+task :compare => %w[compare:html_pretty compare:htmlbeautifier compare:rexml compare:nokogiri]
 
-  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
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |rt|
+  rt.fail_on_error = false
+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
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format progress"
 end
-task :output => 'output:html_pretty'
 
-task :default => :output
+task :default => [:spec, :features]

data/lib/html_pretty/version.rb

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

data/lib/html_pretty.rb

@@ -14,7 +14,17 @@ module HtmlPretty
       elsif blob =~ SPECIAL
         out << "  " * indent << blob << "\n"
       else
-        blob = blob.gsub(/^[ \t]*\n/, "")   # kill blank lines
+        # Remove all newlines within a tag definition
+        # Example: '<a\nb=1\nc=2>' => '<a b=1 c=2>'
+        blob = blob.split(/(<.*?>)/).map do |blub|
+                 if blub.start_with?('<')
+                   blub.gsub(/\n/, ' ')
+                 else
+                   blub
+                 end
+               end.join
+
+        blob = blob.gsub(/^[ \t]*\n/, '')   # kill blank lines
         blob = blob.gsub(/^[ \t]+/, '')     # kill opening whitespace
         blob = blob.gsub(/[ \t]+$/, '')     # kill closing whitespace
         blob = blob.gsub(/[ \t]+/, ' ')     # collapse all whitespace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_pretty
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: htmlbeautifier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: html_pretty is yet another HTML prettifier.  It purposefully does not
   do parsing or validation.
 email: benjamin.feng@gmail.com