erector 0.7.2 → 0.8.0

data/spec/erector/widgets/field_table_spec.rb

@@ -30,7 +30,7 @@ module Erector
         end
 
         it "renders the CreateUser form" do
-          PasswordForm.new(:username => "bobdole").to_s.should ==
+          PasswordForm.new(:username => "bobdole").to_html.should ==
             "<form action=\"/user\" method=\"post\">" +
               "<fieldset class=\"field_table\">" +
               "<legend>Sign Up</legend>" +
@@ -80,7 +80,7 @@ module Erector
 
         it "renders a table with no fields and no buttons" do
           table = FieldTable.new(:title => "Meals")
-          doc = Nokogiri::HTML(table.to_s)
+          doc = Nokogiri::HTML(table.to_html)
           doc.css("fieldset legend").text.should == "Meals"
           doc.at("fieldset")["class"].should == "field_table"
           doc.css("fieldset > table > tr").size.should == 0
@@ -90,7 +90,7 @@ module Erector
           table = FieldTable.new(:title => "Meals") do |t|
             t.button { t.input :type => "button", :value => "cancel" }
           end
-          doc = Nokogiri::HTML(table.to_s)
+          doc = Nokogiri::HTML(table.to_html)
           doc.css("fieldset > table > tr").size.should == 1
           doc.at("fieldset table tr")["class"].should == "field_table_buttons"
           doc.at("td.field_table_button input")["value"].should == "cancel"
@@ -100,7 +100,7 @@ module Erector
           table = FieldTable.new(:title => "Meals") do |t|
             t.field("Breakfast") { t.text "scrambled eggs" }
           end
-          doc = Nokogiri::HTML(table.to_s)
+          doc = Nokogiri::HTML(table.to_html)
           doc.css("fieldset > table > tr").size.should == 1
           doc.at("fieldset table tr")["class"].should == "field_table_field"
           doc.at("fieldset table tr th").text.should == "Breakfast:"
@@ -111,7 +111,7 @@ module Erector
           table = FieldTable.new(:title => "Meals") do |t|
             t.field { t.text "yum yum" }
           end
-          doc = Nokogiri::HTML(table.to_s)
+          doc = Nokogiri::HTML(table.to_html)
           doc.css("fieldset > table > tr").size.should == 1
           doc.at("fieldset table tr")["class"].should == "field_table_field"
           doc.at("fieldset table tr th").text.should == ""
@@ -123,7 +123,7 @@ module Erector
             t.field("Breakfast", "the most important meal of the day") { t.text "eggs" }
             t.field("Lunch") { t.text "hot dogs" }
           end
-          doc = Nokogiri::HTML(table.to_s)
+          doc = Nokogiri::HTML(table.to_html)
           doc.at("fieldset table tr").css("td[3]").text.should == "the most important meal of the day"
         end
 

data/spec/erector/widgets/form_spec.rb

@@ -5,15 +5,15 @@ describe Form do
   include Erector::Mixin
 
   it "defaults to POST, with no magic hidden method param" do
-    Form.new(:action => "/foo").to_s.should == "<form action=\"/foo\" method=\"post\"></form>"
+    Form.new(:action => "/foo").to_html.should == "<form action=\"/foo\" method=\"post\"></form>"
   end
 
   it "works plainly with GET too" do
-    Form.new(:action => "/foo", :method => "get").to_s.should == "<form action=\"/foo\" method=\"get\"></form>"
+    Form.new(:action => "/foo", :method => "get").to_html.should == "<form action=\"/foo\" method=\"get\"></form>"
   end
   
   it "uses POST and adds a magic hidden field with a _method param for DELETE" do
-    Form.new(:action => "/foo", :method => "delete").to_s.should == 
+    Form.new(:action => "/foo", :method => "delete").to_html.should ==
       "<form action=\"/foo\" method=\"post\">"+
       "<input name=\"_method\" type=\"hidden\" value=\"delete\" />"+
       "</form>"

data/spec/erector/widgets/page_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
 
 describe Erector::Widgets::Page do
   it "works" do
-    Erector::Widgets::Page.new.to_s
+    Erector::Widgets::Page.new.to_html
   end
 
   it "renders body_content" do
@@ -10,13 +10,13 @@ describe Erector::Widgets::Page do
       def body_content
         text "body_content"
       end
-    end.new.to_s.should =~ /body_content/
+    end.new.to_html.should =~ /body_content/
   end
 
   it "renders a block passed to new" do
     Erector::Widgets::Page.new do
-      text "body_content"
-    end.to_s.should =~ /body_content/
+      text "nice bod"
+    end.to_html.should =~ /nice bod/
   end
 
   it "renders a block passed to content" do
@@ -26,7 +26,7 @@ describe Erector::Widgets::Page do
           text "body_content"
         end
       end
-    end.new.to_s.should =~ /body_content/
+    end.new.to_html.should =~ /body_content/
   end
 
   it "allows subclasses to provide a css class for the body" do
@@ -34,6 +34,52 @@ describe Erector::Widgets::Page do
       def body_attributes
         {:class => "funky"}
       end
-    end.new.to_s.should =~ /<body class=\"funky\">/
+    end.new.to_html.should =~ /<body class=\"funky\">/
+  end
+
+  it "allows subclasses to be called with a block" do
+    fun_page_class = Class.new(Erector::Widgets::Page) do
+      def body_content
+        h3 "what's fun?"
+        call_block
+      end
+    end
+    fun_page_class.new do
+      text "soccer!"
+    end.to_html.should include("<h3>what's fun?</h3>soccer!")
+  end
+
+  class NiceWidget < Erector::Widget
+    external :style, ".nice {}"
+    def content
+      text "nice widget"
+    end
+  end
+  class MeanWidget < Erector::Widget
+    external :style, ".mean {}"
+  end
+
+  class NicePage < Erector::Widgets::Page
+    def body_content
+      text "nice page"
+      widget NiceWidget
+    end
+  end
+
+  class MeanPage < Erector::Widgets::Page
+    def body_content
+      widget MeanWidget
+    end
+  end
+
+  it "only puts into dependencies those from widgets rendered on it" do
+    s = NicePage.new.to_html
+    s.should include("nice page")
+    s.should include("nice widget")
+    s.should include(".nice {}")
+    s.should_not include(".mean {}")
+
+    MeanPage.new.to_html.should include(".mean {}")
+    MeanPage.new.to_html.should_not include(".nice {}")
   end
 end

data/spec/erector/widgets/table_spec.rb

@@ -24,7 +24,7 @@ module TableSpec
       attr_reader :html, :doc
       before do
         widget = CustomHeadingTable.new(:row_objects => [])
-        @html = widget.to_s
+        @html = widget.to_html
         @doc = Nokogiri::HTML(html)
       end
 
@@ -46,7 +46,7 @@ module TableSpec
       before do
         @object1 = Struct.new(:first_name).new("Hello")
         widget = CustomCellTable.new(:row_objects => [@object1])
-        @html = widget.to_s
+        @html = widget.to_html
         @doc = Nokogiri::HTML(html)
       end
 
@@ -64,7 +64,7 @@ module TableSpec
         @object2 = Struct.new(:first_name, :last_name, :email).new(4, 5, 6)
         @object3 = Struct.new(:first_name, :last_name, :email).new(7, 8, 9)
         widget = DefaultsTestTable.new(:row_objects => [@object1, @object2, @object3])
-        @html = widget.to_s
+        @html = widget.to_html
         @doc = Nokogiri::HTML(html)
         @table = doc.at("table")
       end
@@ -96,4 +96,4 @@ module TableSpec
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,17 @@
-dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+VENDOR_RAILS = "#{File.dirname(__FILE__)}/rails_root/vendor/rails"
+RAILS_LOAD_PATHS = Dir["#{VENDOR_RAILS}/*/lib"]
+RAILS_LOAD_PATHS.each do |path|
+  $LOAD_PATH.unshift(File.expand_path(path))
+end
+
 require "rubygems"
-$LOAD_PATH.unshift("#{dir}/../lib")
 require "erector"
 require "nokogiri"
 require "rr"
 require 'tempfile'
 require 'ostruct'
-ARGV.push(*File.read("#{File.dirname(__FILE__)}/spec.opts").split("\n"))
 require "spec"
 require "spec/autorun"
 
@@ -14,32 +19,6 @@ Spec::Runner.configure do |config|
   config.mock_with :rr
 end
 
-# This mimics Rails load path and dependency stuff
-RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/rails_root") unless defined?(RAILS_ROOT)
-#$: << "#{RAILS_ROOT}/app"
-module Views
-  module TemplateHandlerSpec
-  end
-end
-
-
-# uncomment this to find leftover debug putses
-#
-# alias :original_puts :puts
-# def puts(string ="")
-#   super string.to_s + "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
-# end
-# 
-# alias :original_p :p
-# def p(string="")
-#   original_puts "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
-#   super(string)
-# end
-# 
-# alias :original_print :print
-# def print(string="")
-#   super string + "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
-# end
 unless '1.9'.respond_to?(:force_encoding)
   String.class_eval do
     begin
@@ -49,3 +28,65 @@ unless '1.9'.respond_to?(:force_encoding)
     end
   end
 end
+
+module Matchers
+  # borrowed from http://github.com/aiwilliams/spec_goodies
+
+  class IncludeOnly # :nodoc:all
+    def initialize(*expected)
+      @expected = expected.flatten
+    end
+
+    def matches?(actual)
+      @missing = @expected.reject {|e| actual.include?(e)}
+      @extra = actual.reject {|e| @expected.include?(e)}
+      @extra.empty? && @missing.empty?
+    end
+
+    def failure_message
+      message = "expected to include only #{@expected.inspect}"
+      message << "\nextra: #{@extra.inspect}" unless @extra.empty?
+      message << "\nmissing: #{@missing.inspect}" unless @missing.empty?
+      message
+    end
+
+    def negative_failure_message
+      "expected to include more than #{@expected.inspect}"
+    end
+
+    def to_s
+      "include only #{@expected.inspect}"
+    end
+  end
+
+  # Unlike checking that two Enumerables are equal, where the
+  # objects in corresponding positions must be equal, this will
+  # allow you to ensure that an Enumerable has all the objects
+  # you expect, in any order; no more, no less.
+  def include_only(*expected)
+    IncludeOnly.new(*expected)
+  end
+end
+
+Spec::Runner.configure do |config|
+  include Matchers
+end
+
+def capturing_output
+  output = StringIO.new
+  $stdout = output
+  yield
+  output.string
+ensure
+  $stdout = STDOUT
+end
+
+def capturing_stderr
+  output = StringIO.new
+  $stderr = output
+  yield
+  output.string
+ensure
+  $stderr = STDERR
+end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  hash: 63
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -08:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Html Builder library.
 email: erector@googlegroups.compivotallabsopensource@googlegroups.com
 executables: 
@@ -30,16 +42,29 @@ extensions: []
 
 extra_rdoc_files: 
 - README.txt
+- spec/erector/sample-file.txt
 files: 
-- lib/erector/erect.rb
-- lib/erector/erected.rb
+- lib/erector/after_initialize.rb
+- lib/erector/caching.rb
+- lib/erector/convenience.rb
+- lib/erector/dependencies.rb
+- lib/erector/dependency.rb
+- lib/erector/erect/erect.rb
+- lib/erector/erect/erected.rb
+- lib/erector/erect/indenting.rb
+- lib/erector/erect/rhtml.treetop
+- lib/erector/errors.rb
+- lib/erector/extensions/hash.rb
 - lib/erector/extensions/object.rb
 - lib/erector/externals.rb
-- lib/erector/indenting.rb
+- lib/erector/html.rb
 - lib/erector/inline.rb
+- lib/erector/jquery.rb
 - lib/erector/mixin.rb
+- lib/erector/needs.rb
+- lib/erector/output.rb
 - lib/erector/rails/extensions/action_controller.rb
-- lib/erector/rails/extensions/rails_widget/rails_helpers.rb
+- lib/erector/rails/extensions/rails_helpers.rb
 - lib/erector/rails/extensions/rails_widget.rb
 - lib/erector/rails/rails_form_builder.rb
 - lib/erector/rails/rails_version.rb
@@ -47,12 +72,13 @@ files:
 - lib/erector/rails/template_handlers/rb_handler.rb
 - lib/erector/rails.rb
 - lib/erector/raw_string.rb
-- lib/erector/rhtml.treetop
+- lib/erector/sass.rb
 - lib/erector/unicode.rb
 - lib/erector/unicode_builder.rb
 - lib/erector/version.rb
 - lib/erector/widget.rb
 - lib/erector/widgets/environment_badge.rb
+- lib/erector/widgets/external_renderer.rb
 - lib/erector/widgets/field_table.rb
 - lib/erector/widgets/form.rb
 - lib/erector/widgets/page.rb
@@ -63,25 +89,30 @@ files:
 - README.txt
 - VERSION.yml
 - bin/erector
-- spec/core_spec_suite.rb
 - spec/erect/erect_rails_spec.rb
 - spec/erect/erect_spec.rb
 - spec/erect/erected_spec.rb
 - spec/erect/rhtml_parser_spec.rb
-- spec/erector/external_spec.rb
+- spec/erector/caching_spec.rb
+- spec/erector/convenience_spec.rb
+- spec/erector/dependency_spec.rb
+- spec/erector/externals_spec.rb
+- spec/erector/html_spec.rb
 - spec/erector/indentation_spec.rb
 - spec/erector/inline_spec.rb
+- spec/erector/jquery_spec.rb
 - spec/erector/mixin_spec.rb
+- spec/erector/needs_spec.rb
+- spec/erector/output_spec.rb
+- spec/erector/sample-file.txt
+- spec/erector/sass_spec.rb
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
 - spec/erector/widgets/field_table_spec.rb
 - spec/erector/widgets/form_spec.rb
 - spec/erector/widgets/page_spec.rb
 - spec/erector/widgets/table_spec.rb
-- spec/rails_spec_suite.rb
-- spec/spec.opts
 - spec/spec_helper.rb
-- spec/spec_suite.rb
 has_rdoc: true
 homepage: http://erector.rubyforge.org
 licenses: []
@@ -93,21 +124,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: erector
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Html Builder library.