butternut 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/butternut.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{butternut}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2009-12-14}
+  s.date = %q{2009-12-15}
   s.description = %q{Based on Cucumber's HTML formatter, Butternut uses Celerity to capture page sources after each step.}
   s.email = %q{viking415@gmail.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "spec/butternut/formatter_spec.rb",
      "spec/butternut/helpers_spec.rb",
      "spec/butternut_spec.rb",
+     "spec/fixtures/blargh.html",
      "spec/fixtures/css/bar.css",
      "spec/fixtures/facepalm.jpg",
      "spec/fixtures/foo.css",

data/lib/butternut/helpers.rb

@@ -10,11 +10,19 @@ module Butternut
     end
 
     def current_url
-      browser.page.getWebResponse.getRequestUrl.toString
+      browser.page.web_response.request_url.to_string
     end
 
     def current_page_source
-      browser.page ? browser.page.as_xml : nil
+      return nil    unless browser.page
+
+      string_writer = java.io.StringWriter.new
+      print_writer  = java.io.PrintWriter.new(string_writer)
+
+      root = browser.page.document_element
+      node_to_xml(root, print_writer)
+      print_writer.close
+      string_writer.to_string
     end
 
     # Fill in a text field with a value
@@ -47,5 +55,49 @@ module Butternut
       elt = browser.send(type, :label, label_or_name)
       elt.exist? ? elt : browser.send(type, :name, label_or_name)
     end
+
+    private
+      # NOTE: I have to do this because HtmlUnit's asXml likes to put spaces
+      #       and newlines in the middle of whitespace-sensitive tags (like
+      #       <a> and <textarea>).  Fail.
+      def node_to_xml(node, print_writer)
+        closing_tag = false
+
+        case node
+        when HtmlUnit::Html::DomText
+          # just print out the text
+          print_writer.write(HtmlUnit::Util::StringUtils.escape_xml_chars(node.data))
+        when HtmlUnit::Html::DomCDataSection, HtmlUnit::Html::DomProcessingInstruction
+          # use default printXml here
+          node.print_xml("", print_writer)
+        when HtmlUnit::Html::DomComment
+          print_writer.write("<!-- #{node.data} -->")
+        when HtmlUnit::Html::HtmlTextArea
+          node_print_opening_tag(node, print_writer)
+          print_writer.write(node.text)
+          closing_tag = true
+        else
+          node_print_opening_tag(node, print_writer)
+          closing_tag = true
+        end
+
+        child = node.first_child
+        while child
+          node_to_xml(child, print_writer)
+          child = child.next_sibling
+        end
+
+        node_print_closing_tag(node, print_writer) if closing_tag
+      end
+
+      def node_print_opening_tag(node, print_writer)
+        print_writer.write("<")
+        node.print_opening_tag_content_as_xml(print_writer)
+        print_writer.write(">")
+      end
+
+      def node_print_closing_tag(node, print_writer)
+        print_writer.write("</#{node.tag_name}>")
+      end
   end
 end

data/spec/butternut/formatter_spec.rb

@@ -111,9 +111,9 @@ module Butternut
         end
 
         it "turns off links" do
-          @page_doc.css('a').each do |link|
-            link['href'].should == "#"
-          end
+          link = @page_doc.at('a')
+          link['href'].should == "#"
+          link.inner_html.should == "Picard song"
         end
 
         it "turns off scripts" do

data/spec/butternut/helpers_spec.rb

@@ -6,11 +6,11 @@ module Butternut
 
     def define_stub_chain
       # This is what I hate about RSpec.
-      @stub_request_url = stub("fake request url", :toString => "http://example.com")
-      @stub_response = stub("fake web response", :getRequestUrl => @stub_request_url)
+      @stub_request_url = stub("fake request url", :to_string => "http://example.com")
+      @stub_response = stub("fake web response", :request_url => @stub_request_url)
       @stub_page = stub("fake html page", {
         :as_xml => "<cheese>pepperjack</cheese>",
-        :getWebResponse => @stub_response
+        :web_response => @stub_response
       })
       @stub_element = stub("fake element", :value= => nil, :select => nil, :click => nil, :exist? => true)
       @stub_empty = stub("fake empty element", :exist? => false)
@@ -48,21 +48,25 @@ module Butternut
     describe "#current_url" do
       before(:each) { define_stub_chain }
       it do
-        @stub_request_url.should_receive(:toString).and_return("http://google.com")
+        @stub_request_url.should_receive(:to_string).and_return("http://google.com")
         current_url.should == "http://google.com"
       end
     end
 
     describe "#current_page_source" do
-      before(:each) { define_stub_chain }
+      before(:each) do
+        @browser = browser
+        visit("file://" + File.expand_path(File.dirname(__FILE__) + "/../fixtures/blargh.html"))
+      end
 
-      it "returns the current page's source" do
-        @stub_page.should_receive(:as_xml).and_return("pants")
-        current_page_source.should == "pants"
+      it "constructs the current page's source" do
+        # HtmlUnit's text node parsing it a little strange
+        expected = "<html><head>\n    <title>Blargh</title>\n  </head><body>\n    <p>Foo</p>\n    <p>Bar</p>\n  \n</body></html>"
+        current_page_source.should == expected
       end
 
       it "returns nil if page is nil" do
-        @stub_browser.stub!(:page).and_return(nil)
+        @browser.stub!(:page).and_return(nil)
         current_page_source.should be_nil
       end
     end

data/spec/fixtures/blargh.html

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>Blargh</title>
+  </head>
+  <body>
+    <p>Foo</p>
+    <p>Bar</p>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: butternut
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
   - Jeremy Stephens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 Z
+date: 2009-12-15 00:00:00 Z
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
   - spec/butternut/formatter_spec.rb
   - spec/butternut/helpers_spec.rb
   - spec/butternut_spec.rb
+  - spec/fixtures/blargh.html
   - spec/fixtures/css/bar.css
   - spec/fixtures/facepalm.jpg
   - spec/fixtures/foo.css