gorp 0.18.1 → 0.18.2

data/gorp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.18.1"
+  s.version = "0.18.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
     assertions based on selections (typically CSS) against the generated HTML.
 }
   s.email = %q{rubys@intertwingly.net}
-  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
+  s.extra_rdoc_files = ["README", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.css", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "gorp.gemspec", "lib/gorp.rb", "lib/gorp/commands.rb", "lib/gorp/edit.rb", "lib/gorp/env.rb", "lib/gorp/net.rb", "lib/gorp/output.css", "lib/gorp/output.rb", "lib/gorp/rails.env", "lib/gorp/rails.rb", "lib/gorp/test.rb", "lib/gorp/xml.rb", "lib/version.rb"]
   s.homepage = %q{http://github.com/rubys/gorp}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Gorp", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/gorp/output.css

@@ -0,0 +1,26 @@
+body {background-color: #F5F5DC}
+#banner {margin-top: 0}
+pre {font-weight: bold; margin: 0; padding: 0}
+pre.stdin {color: #800080; margin-top: 1em; padding: 0}
+pre.irb {color: #800080; padding: 0}
+pre.stdout {color: #000; padding: 0}
+pre.logger {color: #088; padding: 0}
+pre.hilight {color: #000; background-color: #FF0; padding: 0}
+pre.stderr {color: #F00; padding: 0}
+div.body {border-style: solid; border-color: #800080; padding: 0.5em}
+.issue, .traceback {background:#FDD; border: 4px solid #F00; 
+            font-weight: bold; margin-top: 1em; padding: 0.5em}
+div.body, .issue, .traceback {
+  -webkit-border-radius: 0.7em; -moz-border-radius: 0.7em;}
+ul.toc {list-style: none}
+ul a {text-decoration: none}
+ul a:hover {text-decoration: underline; color: #000;
+            background-color: #F5F5DC}
+a.toc h2 {background-color: #981A21; color:#FFF; padding: 6px}
+ul a:visited {color: #000}
+h2 {clear: both}
+p.desc {font-style: italic}
+p.overview {border-width: 2px; border-color: #000;
+  border-style: solid; border-radius: 4em;
+  background-color: #CCF; margin: 1.5em 1.5em; padding: 1em 2em; 
+-webkit-border-radius: 4em; -moz-border-radius: 4em;}

data/lib/gorp/output.rb

@@ -13,34 +13,9 @@ at_exit do
       $x.title $title
       $x.meta 'http-equiv'=>'text/html; charset=UTF-8'
       $x.style :type => "text/css" do
-        $x.text! <<-'EOF'.gsub(/^  /, '')
-          body {background-color: #F5F5DC}
-          #banner {margin-top: 0}
-          pre {font-weight: bold; margin: 0; padding: 0}
-          pre.stdin {color: #800080; margin-top: 1em; padding: 0}
-          pre.irb {color: #800080; padding: 0}
-          pre.stdout {color: #000; padding: 0}
-          pre.logger {color: #088; padding: 0}
-          pre.hilight {color: #000; background-color: #FF0; padding: 0}
-          pre.stderr {color: #F00; padding: 0}
-          div.body {border-style: solid; border-color: #800080; padding: 0.5em}
-          .issue, .traceback {background:#FDD; border: 4px solid #F00; 
-                      font-weight: bold; margin-top: 1em; padding: 0.5em}
-          div.body, .issue, .traceback {
-            -webkit-border-radius: 0.7em; -moz-border-radius: 0.7em;}
-          ul.toc {list-style: none}
-          ul a {text-decoration: none}
-          ul a:hover {text-decoration: underline; color: #000;
-                      background-color: #F5F5DC}
-          a.toc h2 {background-color: #981A21; color:#FFF; padding: 6px}
-          ul a:visited {color: #000}
-          h2 {clear: both}
-          p.desc {font-style: italic}
-          p.overview {border-width: 2px; border-color: #000;
-            border-style: solid; border-radius: 4em;
-            background-color: #CCF; margin: 1.5em 1.5em; padding: 1em 2em; 
-            -webkit-border-radius: 4em; -moz-border-radius: 4em;}
-        EOF
+        open(File.join(File.dirname(__FILE__), 'output.css')) do |file|
+          $x.text! file.read.gsub(/^/, '      ')
+        end
       end
     end
   

data/lib/gorp/test.rb

@@ -147,7 +147,7 @@ class Gorp::TestCase < ActiveSupport::TestCase
         @@base.send method, *args
 
         if block
-          @raw = $x.target!
+          @raw = $y.target!
           @selected = HTML::Document.new(@raw).root.children
           block.call
         end
@@ -238,11 +238,21 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
       sections.keys.sort_by {|key| key.split('.').map {|n| n.to_i}}.each do |n|
         output.write(sections[n])
       end
-      output.write('<a class="toc" id="env">')
-      output.write(env)
-      output.write('<a class="toc" id="todos">')
-      todos.sub! /<ul.*\/ul>/m, '<h2>None!</h2>' unless todos.include? '<li>'
-      output.write(todos)
+
+      if sections.empty?
+        output.write($x.target!)
+      end
+
+      if env
+        output.write('<a class="toc" id="env">')
+        output.write(env)
+      end
+
+      if todos
+        output.write('<a class="toc" id="todos">')
+        todos.sub! /<ul.*\/ul>/m, '<h2>None!</h2>' unless todos.include? '<li>'
+        output.write(todos)
+      end
       output.write("\n  </body>")
       output.write(tail)
     end
@@ -254,3 +264,23 @@ class HTMLRunner < Test::Unit::UI::Console::TestRunner
     at_exit { raise SystemExit.new(1) } unless @result.passed?
   end
 end
+
+# Produce output for standalone scripts
+at_exit do
+  next if caller.empty? or $output
+  source = File.basename(caller.first.split(/:/).first)
+  name = source.sub(Regexp.new(Regexp.escape(File.extname(source))+'$'), '')
+  $output = name
+
+  suite = Test::Unit::TestSuite.new(name)
+  ObjectSpace.each_object(Class) do |c|
+    next unless c.superclass == Gorp::TestCase
+    suite << c.suite
+  end
+  def suite.sections
+    style = open(File.join(File.dirname(__FILE__), 'output.css')) {|fh| fh.read}
+    head = "<head><title>#{$output}</title><style>\n#{style}</style></head>"
+    {:head=>"<html>\n#{head}\n  ", :tail=>"\n</html>"}
+  end 
+  HTMLRunner.run(suite)
+end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 18
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors: 
 - Sam Ruby
@@ -135,6 +135,7 @@ extra_rdoc_files:
 - lib/gorp/edit.rb
 - lib/gorp/env.rb
 - lib/gorp/net.rb
+- lib/gorp/output.css
 - lib/gorp/output.rb
 - lib/gorp/rails.env
 - lib/gorp/rails.rb
@@ -151,6 +152,7 @@ files:
 - lib/gorp/edit.rb
 - lib/gorp/env.rb
 - lib/gorp/net.rb
+- lib/gorp/output.css
 - lib/gorp/output.rb
 - lib/gorp/rails.env
 - lib/gorp/rails.rb