pivotal-erector 0.6.7 → 0.7.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 6
-:patch: 7
+:minor: 7
+:patch: 0

data/lib/erector.rb

@@ -7,6 +7,7 @@ require "active_support/inflections"
 require "#{dir}/erector/extensions/object"
 require "#{dir}/erector/raw_string"
 require "#{dir}/erector/widget"
+require "#{dir}/erector/inline"
 require "#{dir}/erector/unicode"
 require "#{dir}/erector/widgets"
 require "#{dir}/erector/version"

data/lib/erector/inline.rb

@@ -0,0 +1,36 @@
+module Erector
+  def self.inline(*args, &block)
+    InlineWidget.new(*args, &block)
+  end
+  
+  module Inline
+    # Evaluates its block (the one that was passed in the constructor) as a new widget's
+    # content method.
+    # Since "self" is pointing to the new widget, it can get access
+    # to parent widget methods via method_missing. Since it executes inside the 
+    # widget it does not
+    # have access to instance variables of the caller, although it does
+    # have access to bound variables.
+    def content
+      if @block
+        instance_eval(&@block)
+      end
+    end
+    
+    private
+    # This is part of the sub-widget/parent feature (see #widget method).
+    def method_missing(name, *args, &block)
+      block ||= lambda {} # captures self HERE
+      if @parent
+        @parent.send(name, *args, &block)
+      else
+        super
+      end
+    end
+  end
+  
+  class InlineWidget < Erector::Widget
+    include Inline
+  end
+
+end

data/lib/erector/mixin.rb

@@ -1,7 +1,11 @@
 module Erector
   module Mixin
+    # Executes the block as if it were the content body of a fresh Erector::Inline,
+    # and returns the #to_s value. Since it executes inside the new widget it does not
+    # have access to instance variables of the caller, although it does
+    # have access to bound variables. 
     def erector(options = {}, &block)
-      Erector::Widget.new(&block).to_s(options)
+      Erector.inline(&block).to_s(options)
     end
   end
 end

data/lib/erector/rails/extensions/rails_widget.rb

@@ -1,5 +1,9 @@
 module Erector
   class RailsWidget < Widget
+    def self.inline(*args, &block)
+      InlineRailsWidget.new(*args, &block)
+    end
+
     def output
       process_output_buffer || @output
     end
@@ -33,6 +37,11 @@ module Erector
       end
     end
   end
+  
+  class InlineRailsWidget < RailsWidget
+    include Inline
+  end
+  
 end
 
 require "#{File.dirname(__FILE__)}/rails_widget/helpers"

data/lib/erector/widget.rb

@@ -51,6 +51,7 @@ module Erector
           'b', 'bdo', 'big', 'blockquote', 'body', 'button', 
           'caption', 'center', 'cite', 'code', 'colgroup',
           'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em',
+          'embed',
           'fieldset', 'form', 'frameset',
           'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html', 'i',
           'iframe', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
@@ -226,16 +227,6 @@ module Erector
     def assign_local(name, value)
       raise ArgumentError, "Sorry, #{name} is a reserved variable name for Erector. Please choose a different name." if RESERVED_INSTANCE_VARS.include?(name)
       instance_variable_set("@#{name}", value)
-      if any_are_needed?
-        raise ArgumentError, "Sorry, #{name} is a reserved method name for Erector. Please choose a different name." if respond_to?(name)
-        metaclass.module_eval do
-          attr_reader name
-        end
-      end
-    end
-    
-    def any_are_needed?
-      !self.class.get_needs.empty?
     end
     
     # Render (like to_s) but adding newlines and indentation.
@@ -294,11 +285,11 @@ module Erector
     # Inside this method you call the magic #element methods which emit HTML
     # and text to the output string. If you call "super" (or don't override
     # +content+) then your widget will render any block that was passed into
-    # its constructor (in the current instance context so it can get access
-    # to parent widget methods via method_missing).
+    # its constructor. If you want this block to have access to Erector methods
+    # then see Erector::Inline#content.
     def content
       if @block
-        instance_eval(&@block)
+        @block.call
       end
     end
 
@@ -576,16 +567,6 @@ module Erector
 
 protected
 
-    # This is part of the sub-widget/parent feature (see #widget method).
-    def method_missing(name, *args, &block)
-      block ||= lambda {} # captures self HERE
-      if @parent
-        @parent.send(name, *args, &block)
-      else
-        super
-      end
-    end
-
     def __element__(tag_name, *args, &block)
       if args.length > 2
         raise ArgumentError, "Cannot accept more than three arguments"

data/spec/erect/erect_rails_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-
 require "erector/rails"
 
+
 # Note: this is *not* inside the rails_root since we're not testing 
 # Erector inside a rails app. We're testing that we can use the command-line
 # converter tool on a newly generated scaffold app (like we brag about in the 
@@ -21,21 +21,30 @@ module Erector
   describe "Erect in a Rails app" do
     
     def run(cmd)
-      puts cmd
-      stdout = `#{cmd}`
-      if $? != 0
-        raise "Command #{cmd} failed, returning '#{stdout}', current dir '#{Dir.getwd}'"
+      puts "Running #{cmd}"
+      stderr_file = Dir.tmpdir + "/stderr.txt"
+      stdout = IO.popen(cmd + " 2>#{stderr_file}") do |pipe|
+        pipe.read
+      end
+      stderr = File.open(stderr_file) {|f| f.read}
+      FileUtils.rm_f(stderr_file)
+      if $?.exitstatus != 0
+        raise "Command #{cmd} failed\nDIR:\n  #{Dir.getwd}\nSTDOUT:\n#{indent stdout}\nSTDERR:\n#{indent stderr}"
       else
         return stdout
       end
     end
     
+    def indent(s)
+      s.gsub(/^/, '  ')
+    end
+    
     def run_rails(app_dir)
       # To ensure we're working with the right version of Rails we use "gem 'rails', 1.2.3"
       # in a "ruby -e" command line invocation of the rails executable to generate an
       # app called explode.
       #
-      puts "Generating fresh rails #{Erector::Rails::RAILS_VERSION} app"
+      puts "Generating fresh rails #{Erector::Rails::RAILS_VERSION} app in #{app_dir}"
       run "ruby -e \"require 'rubygems'; gem 'rails', '#{Erector::Rails::RAILS_VERSION}'; load 'rails'\" #{app_dir}"
     end
       
@@ -45,12 +54,16 @@ module Erector
       
       FileUtils.mkdir_p(app_dir)
       run_rails app_dir
-      FileUtils.cd(app_dir, :verbose => true) do
+      
+      FileUtils.mkdir_p(app_dir + "/vendor/gems")
+      FileUtils.cp_r("#{File.dirname __FILE__}/../..", "#{app_dir}/vendor/gems/erector")
+      
+      FileUtils.cd(app_dir) do
         run "script/generate scaffold post title:string body:text published:boolean"
         run "#{erector_bin}/erector app/views/posts"
         FileUtils.rm_f("app/views/posts/*.erb")
-        run "(echo ''; echo \"require 'erector'\") >> config/environment.rb"
-        run "rake db:migrate"
+#        run "(echo ''; echo \"require 'erector'\") >> config/environment.rb"
+        run "rake --trace db:migrate"
         # run "script/server" # todo: launch in background; use mechanize or something to crawl it; then kill it
         # perhaps use open4?
         # open http://localhost:3000/posts

data/spec/erector/indentation_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
 describe "indentation" do
 
   it "can detect newliney tags" do
-    widget = ::Erector::Widget.new
+    widget = ::Erector.inline
     widget.instance_eval do 
       @prettyprint = true
     end
@@ -12,28 +12,28 @@ describe "indentation" do
   end
 
   it "should not add newline for non-newliney tags" do
-    Erector::Widget.new() do
+    Erector.inline do
       text "Hello, "
       b "World"
     end.to_pretty.should == "Hello, <b>World</b>"
   end
   
   it "should add newlines before open newliney tags" do
-    Erector::Widget.new() do
+    Erector.inline do
       p "foo"
       p "bar"
     end.to_pretty.should == "<p>foo</p>\n<p>bar</p>\n"
   end
   
   it "should add newlines between text and open newliney tag" do
-    Erector::Widget.new() do
+    Erector.inline do
       text "One"
       p "Two"
     end.to_pretty.should == "One\n<p>Two</p>\n"
   end
   
   it "should add newlines after end newliney tags" do
-    Erector::Widget.new() do
+    Erector.inline do
       tr do
         td "cell"
       end
@@ -41,7 +41,7 @@ describe "indentation" do
   end
   
   it "should treat empty elements as start and end" do
-    Erector::Widget.new() do
+    Erector.inline do
       p "before"
       br
       p "after"
@@ -49,7 +49,7 @@ describe "indentation" do
   end
   
   it "empty elements sets at_start_of_line" do
-    Erector::Widget.new() do
+    Erector.inline do
       text "before"
       br
       p "after"
@@ -59,7 +59,7 @@ describe "indentation" do
   it "will not insert extra space before/after input element" do
     # If dim memory serves, the reason for not adding spaces here is
     # because it affects/affected the rendering in browsers.
-    Erector::Widget.new() do
+    Erector.inline do
       text 'Name'
       input :type => 'text'
       text 'after'
@@ -67,7 +67,7 @@ describe "indentation" do
   end
   
   it "will indent" do
-    Erector::Widget.new() do
+    Erector.inline do
       html do
         head do
           title "hi"
@@ -93,12 +93,12 @@ END
   end
   
   it "preserves indentation for sub-rendered widgets" do
-    tea = Erector::Widget.new do
+    tea = Erector.inline do
       div do
         p "oolong"
       end
     end
-    cup = Erector::Widget.new do
+    cup = Erector.inline do
       div do
         p "fine china"
         tea.write_via(self)
@@ -116,14 +116,14 @@ END
   end
   
   it "can turn off newlines" do
-    Erector::Widget.new() do
+    Erector.inline do
       text "One"
       p "Two"
     end.to_s.should == "One<p>Two</p>"
   end
   
   it "can turn newlines on and off" do
-    widget = Erector::Widget.new() do
+    widget = Erector.inline do
       text "One"
       p "Two"
     end
@@ -133,18 +133,18 @@ END
   end
   
   it "can turn on newlines via to_pretty" do
-    widget = Erector::Widget.new() do
+    widget = Erector.inline do
       text "One"
       p "Two"
     end.to_pretty.should == "One\n<p>Two</p>\n"
   end
   
   it "can turn newlines on/off via global variable" do
-    Erector::Widget.new { br }.to_s.should == "<br />"
+    Erector.inline { br }.to_s.should == "<br />"
     Erector::Widget.prettyprint_default = true
-    Erector::Widget.new { br }.to_s.should == "<br />\n"
+    Erector.inline { br }.to_s.should == "<br />\n"
     Erector::Widget.prettyprint_default = false
-    Erector::Widget.new { br }.to_s.should == "<br />"
+    Erector.inline { br }.to_s.should == "<br />"
   end
   
 end

data/spec/erector/inline_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'benchmark'
+
+describe "passing in a block" do
+  describe Erector::Widget do
+    it "'s block is evaluated in the calling object's context" do
+      
+      @sample_instance_variable = "yum"
+      sample_bound_variable = "yay"
+      Erector::Widget.new do
+        @sample_instance_variable.should == "yum"
+        sample_bound_variable.should == "yay"
+        lambda {text "you can't call Erector methods from in here"}.should raise_error(NoMethodError)
+        # puts "uncomment this to prove this is being executed"
+      end.to_s
+      
+    end
+  end
+
+  describe Erector::Inline do
+    it "'s block is evaluated in the widget's context" do
+      
+      @sample_instance_variable = "yum"
+      sample_bound_variable = "yay"
+      Erector.inline do
+        @sample_instance_variable.should be_nil
+        sample_bound_variable.should == "yay"
+        text "you can call Erector methods from in here"
+        # puts "uncomment this to prove this is being executed"
+      end.to_s
+      
+    end
+  end
+  
+  describe Erector::Mixin do
+    include Erector::Mixin
+    it "'s block is evaluated in the parent widget's context" do
+      
+      @sample_instance_variable = "yum"
+      sample_bound_variable = "yay"
+      erector do
+        @sample_instance_variable.should be_nil
+        sample_bound_variable.should == "yay"
+        text "you can call Erector methods from in here"
+        # puts "uncomment this to prove this is being executed"
+      end
+      
+    end
+  end
+    
+end

data/spec/erector/widget_spec.rb

@@ -14,7 +14,7 @@ module WidgetSpec
       class << self
         define_method("invokes #content and returns the string representation of the rendered widget") do
           it "invokes #content and returns the string representation of the rendered widget" do
-            widget = Erector::Widget.new do
+            widget = Erector.inline do
               div "Hello"
             end
             mock.proxy(widget).content
@@ -54,7 +54,7 @@ module WidgetSpec
 
     describe "#to_a" do
       it "returns an array" do
-        widget = Erector::Widget.new do
+        widget = Erector.inline do
           div "Hello"
         end
         widget.to_a.should == ["<div>", "Hello", "</div>"]
@@ -63,7 +63,7 @@ module WidgetSpec
     # removing this, since oddly, when i run this test solo it works, but when
     # i run it as part of a rake suite, i get the opposite result -Alex
     #   it "runs faster than using a string as the output" do
-    #     widget = Erector::Widget.new do
+    #     widget = Erector.inline do
     #       1000.times do |i|
     #         div "Lorem ipsum dolor sit amet #{i}, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est #{i} laborum."
     #       end
@@ -84,7 +84,7 @@ module WidgetSpec
 
     describe "#instruct" do
       it "when passed no arguments; returns an XML declaration with version 1 and utf-8" do
-        html = Erector::Widget.new do
+        html = Erector.inline do
           instruct
           # version must precede encoding, per XML 1.0 4th edition (section 2.8)
         end.to_s.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -131,7 +131,7 @@ module WidgetSpec
       
       context "when passed a class" do
         it "renders it" do
-          Erector::Widget.new do
+          Erector.inline do
             div do
               widget Orphan, :name => "Annie"
             end
@@ -141,7 +141,7 @@ module WidgetSpec
       
       context "when passed an instance" do
         it "renders it" do
-          Erector::Widget.new do
+          Erector.inline do
             div do
               widget Orphan.new(:name => "Oliver")
             end
@@ -167,20 +167,28 @@ module WidgetSpec
             end
           end
 
-          widget = Class.new(Erector::Widget) do
+          grandchild = Class.new(Erector::InlineWidget) do
             needs :parent_widget, :child_widget
             def content
-              widget(parent_widget) do
-                widget(child_widget) do
-                  super
+              widget(@parent_widget) do
+                widget(@child_widget) do
+                  div :id => "grandchild"
                 end
               end
             end
           end
 
-          widget.new(:parent_widget => parent_widget, :child_widget => child_widget) do
-            div :id => "widget"
-          end.to_s.should == '<div id="parent_widget"><div id="child_widget"><div id="widget"></div></div></div>'
+          grandchild.new(:parent_widget => parent_widget, :child_widget => child_widget).to_s.should == '<div id="parent_widget"><div id="child_widget"><div id="grandchild"></div></div></div>'
+
+          pending "pretty-print indentation is messed up with nesting" do
+          grandchild.new(:parent_widget => parent_widget, :child_widget => child_widget).to_pretty.should == 
+          "<div id=\"parent_widget\">\n" + 
+          "  <div id=\"child_widget\">\n" + 
+          "    <div id=\"grandchild\"></div>\n" + 
+          "  </div>\n" +
+          "</div>"
+          end
+
         end
       end
     end
@@ -188,7 +196,7 @@ module WidgetSpec
     describe "#element" do
       context "when receiving one argument" do
         it "returns an empty element" do
-          Erector::Widget.new do
+          Erector.inline do
             element('div')
           end.to_s.should == "<div></div>"
         end
@@ -196,7 +204,7 @@ module WidgetSpec
 
       context "with a attribute hash" do
         it "returns an empty element with the attributes" do
-          html = Erector::Widget.new do
+          html = Erector.inline do
             element(
               'div',
               :class => "foo bar",
@@ -214,7 +222,7 @@ module WidgetSpec
 
       context "with an array of CSS classes" do
         it "returns a tag with the classes separated" do
-          Erector::Widget.new do
+          Erector.inline do
             element('div', :class => [:foo, :bar])
           end.to_s.should == "<div class=\"foo bar\"></div>";
         end
@@ -222,16 +230,15 @@ module WidgetSpec
 
       context "with an array of CSS classes as strings" do
         it "returns a tag with the classes separated" do
-          Erector::Widget.new do
+          Erector.inline do
             element('div', :class => ['foo', 'bar'])
           end.to_s.should == "<div class=\"foo bar\"></div>";
         end
       end
 
-
       context "with a CSS class which is a string" do
         it "just use that as the attribute value" do
-          Erector::Widget.new do
+          Erector.inline do
             element('div', :class => "foo bar")
           end.to_s.should == "<div class=\"foo bar\"></div>";
         end
@@ -239,7 +246,7 @@ module WidgetSpec
 
       context "with many attributes" do
         it "alphabetize them" do
-            Erector::Widget.new do
+            Erector.inline do
               empty_element('foo', :alpha => "", :betty => "5", :aardvark => "tough",
                 :carol => "", :demon => "", :erector => "", :pi => "3.14", :omicron => "", :zebra => "", :brain => "")
             end.to_s.should == "<foo aardvark=\"tough\" alpha=\"\" betty=\"5\" brain=\"\" carol=\"\" demon=\"\" " \
@@ -249,7 +256,7 @@ module WidgetSpec
 
       context "with inner tags" do
         it "returns nested tags" do
-          widget = Erector::Widget.new do
+          widget = Erector.inline do
             element 'div' do
               element 'div'
             end
@@ -260,7 +267,7 @@ module WidgetSpec
 
       context "with text" do
         it "returns element with inner text" do
-          Erector::Widget.new do
+          Erector.inline do
             element 'div', 'test text'
           end.to_s.should == "<div>test text</div>"
         end
@@ -269,7 +276,7 @@ module WidgetSpec
       context "with object other than hash" do
         it "returns element with inner text == object.to_s" do
           object = ['a', 'b']
-          Erector::Widget.new do
+          Erector.inline do
             element 'div', object
           end.to_s.should == "<div>#{object.to_s}</div>"
         end
@@ -277,7 +284,7 @@ module WidgetSpec
 
       context "with parameters and block" do
         it "returns element with inner html and attributes" do
-          Erector::Widget.new do
+          Erector.inline do
             element 'div', 'class' => "foobar" do
               element 'span', 'style' => 'display: none;'
             end
@@ -287,7 +294,7 @@ module WidgetSpec
 
       context "with content and parameters" do
         it "returns element with content as inner html and attributes" do
-          Erector::Widget.new do
+          Erector.inline do
             element 'div', 'test text', :style => "display: none;"
           end.to_s.should == '<div style="display: none;">test text</div>'
         end
@@ -296,7 +303,7 @@ module WidgetSpec
       context "with more than three arguments" do
         it "raises ArgumentError" do
           proc do
-            Erector::Widget.new do
+            Erector.inline do
               element 'div', 'foobar', {}, 'fourth'
             end.to_s
           end.should raise_error(ArgumentError)
@@ -306,7 +313,7 @@ module WidgetSpec
       it "renders the proper full tags" do
         Erector::Widget.full_tags.each do |tag_name|
           expected = "<#{tag_name}></#{tag_name}>"
-          actual = Erector::Widget.new do
+          actual = Erector.inline do
             send(tag_name)
           end.to_s
           begin
@@ -321,7 +328,7 @@ module WidgetSpec
       describe "quoting" do
         context "when outputting text" do
           it "quotes it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'div', 'test &<>text'
             end.to_s.should == "<div>test &amp;&lt;&gt;text</div>"
           end
@@ -329,7 +336,7 @@ module WidgetSpec
 
         context "when outputting text via text" do
           it "quotes it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'div' do
                 text "test &<>text"
               end
@@ -339,7 +346,7 @@ module WidgetSpec
 
         context "when outputting attribute value" do
           it "quotes it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'a', :href => "foo.cgi?a&b"
             end.to_s.should == "<a href=\"foo.cgi?a&amp;b\"></a>"
           end
@@ -347,7 +354,7 @@ module WidgetSpec
 
         context "with raw text" do
           it "does not quote it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'div' do
                 text raw("<b>bold</b>")
               end
@@ -357,7 +364,7 @@ module WidgetSpec
 
         context "with raw text and no block" do
           it "does not quote it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'div', raw("<b>bold</b>")
             end.to_s.should == "<div><b>bold</b></div>"
           end
@@ -365,7 +372,7 @@ module WidgetSpec
 
         context "with raw attribute" do
           it "does not quote it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'a', :href => raw("foo?x=&nbsp;")
             end.to_s.should == "<a href=\"foo?x=&nbsp;\"></a>"
           end
@@ -373,7 +380,7 @@ module WidgetSpec
 
         context "with quote in attribute" do
           it "quotes it" do
-            Erector::Widget.new do
+            Erector.inline do
               element 'a', :onload => "alert(\"foo\")"
             end.to_s.should == "<a onload=\"alert(&quot;foo&quot;)\"></a>"
           end
@@ -382,7 +389,7 @@ module WidgetSpec
 
       context "with a non-string, non-raw" do
         it "calls to_s and quotes" do
-          Erector::Widget.new do
+          Erector.inline do
             element 'a' do
               text [7, "foo&bar"]
             end
@@ -394,7 +401,7 @@ module WidgetSpec
     describe "#empty_element" do
       context "when receiving attributes" do
         it "renders an empty element with the attributes" do
-          Erector::Widget.new do
+          Erector.inline do
             empty_element 'input', :name => 'foo[bar]'
           end.to_s.should == '<input name="foo[bar]" />'
         end
@@ -402,7 +409,7 @@ module WidgetSpec
 
       context "when not receiving attributes" do
         it "renders an empty element without attributes" do
-          Erector::Widget.new do
+          Erector.inline do
             empty_element 'br'
           end.to_s.should == '<br />'
         end
@@ -411,7 +418,7 @@ module WidgetSpec
       it "renders the proper empty-element tags" do
         Erector::Widget.empty_tags.each do |tag_name|
           expected = "<#{tag_name} />"
-          actual = Erector::Widget.new do
+          actual = Erector.inline do
             send(tag_name)
           end.to_s
           begin
@@ -426,13 +433,13 @@ module WidgetSpec
 
     describe "#nbsp" do
       it "turns consecutive spaces into consecutive non-breaking spaces" do
-        Erector::Widget.new do
+        Erector.inline do
           text nbsp("a  b")
         end.to_s.should == "a&#160;&#160;b"
       end
 
       it "works in text context" do
-        Erector::Widget.new do
+        Erector.inline do
           element 'a' do
             text nbsp("&<> foo")
           end
@@ -440,13 +447,13 @@ module WidgetSpec
       end
 
       it "works in attribute value context" do
-        Erector::Widget.new do
+        Erector.inline do
           element 'a', :href => nbsp("&<> foo")
         end.to_s.should == "<a href=\"&amp;&lt;&gt;&#160;foo\"></a>"
       end
       
       it "defaults to a single non-breaking space if given no argument" do
-        Erector::Widget.new do
+        Erector.inline do
           text nbsp
         end.to_s.should == "&#160;"
       end
@@ -455,26 +462,26 @@ module WidgetSpec
 
     describe "#character" do
       it "renders a character given the codepoint number" do
-        Erector::Widget.new do
+        Erector.inline do
           text character(160)
         end.to_s.should == "&#xa0;"
       end
       
       it "renders a character given the unicode name" do
-        Erector::Widget.new do
+        Erector.inline do
           text character(:right_arrow)
         end.to_s.should == "&#x2192;"
       end
 
       it "renders a character above 0xffff" do
-        Erector::Widget.new do
+        Erector.inline do
           text character(:old_persian_sign_ka)
         end.to_s.should == "&#x103a3;"
       end
 
       it "throws an exception if a name is not recognized" do
         lambda {
-          Erector::Widget.new do
+          Erector.inline do
             text character(:no_such_character_name)
           end.to_s
         }.should raise_error("Unrecognized character no_such_character_name")
@@ -484,7 +491,7 @@ module WidgetSpec
         # Perhaps calling to_s would be more ruby-esque, but that seems like it might
         # be pretty confusing when this method can already take either a name or number
         lambda {
-          Erector::Widget.new do
+          Erector.inline do
             text character([])
           end.to_s
         }.should raise_error("Unrecognized argument to character: ")
@@ -494,19 +501,19 @@ module WidgetSpec
     describe "#join" do
 
       it "empty array means nothing to join" do
-        Erector::Widget.new do
+        Erector.inline do
           join [], Erector::Widget.new { text "x" }
         end.to_s.should == ""
       end
       
       it "larger example with two tabs" do
-        Erector::Widget.new do
+        Erector.inline do
           tab1 = 
-            Erector::Widget.new do
+            Erector.inline do
               a "Upload document", :href => "/upload"
             end
           tab2 =
-            Erector::Widget.new do
+            Erector.inline do
               a "Logout", :href => "/logout"
             end
           join [tab1, tab2],
@@ -516,7 +523,7 @@ module WidgetSpec
       end
       
       it "plain string as join separator means pass it to text" do
-        Erector::Widget.new do
+        Erector.inline do
           join [
             Erector::Widget.new { text "x" },
             Erector::Widget.new { text "y" }
@@ -525,7 +532,7 @@ module WidgetSpec
       end
 
       it "plain string as item to join means pass it to text" do
-        Erector::Widget.new do
+        Erector.inline do
           join [
             "<",
             "&"
@@ -560,7 +567,7 @@ module WidgetSpec
             </script>
           EXPECTED
           expected.gsub!(/^            /, '')
-          Erector::Widget.new do
+          Erector.inline do
             javascript do
               rawtext 'if (x < y && x > z) alert("don\'t stop");'
             end
@@ -577,14 +584,14 @@ module WidgetSpec
           </script>
         EXPECTED
         expected.gsub!(/^          /, '')
-        Erector::Widget.new do
+        Erector.inline do
           javascript('alert("&<>\'hello");')
         end.to_s.should == expected
       end
 
       context "when receiving a params hash" do
         it "renders a source file" do
-          html = Erector::Widget.new do
+          html = Erector.inline do
             javascript(:src => "/my/js/file.js")
           end.to_s
           doc = Hpricot(html)
@@ -594,7 +601,7 @@ module WidgetSpec
 
       context "when receiving text and a params hash" do
         it "renders a source file" do
-          html = Erector::Widget.new do
+          html = Erector.inline do
             javascript('alert("&<>\'hello");', :src => "/my/js/file.js")
           end.to_s
           doc = Hpricot(html)
@@ -607,7 +614,7 @@ module WidgetSpec
       context "with too many arguments" do
         it "raises ArgumentError" do
           proc do
-            Erector::Widget.new do
+            Erector.inline do
               javascript 'foobar', {}, 'fourth'
             end.to_s
           end.should raise_error(ArgumentError)
@@ -617,7 +624,7 @@ module WidgetSpec
 
     describe "#css" do
       it "makes a link when passed a string" do
-        Erector::Widget.new do
+        Erector.inline do
           css "erector.css"
         end.to_s.should == "<link href=\"erector.css\" rel=\"stylesheet\" type=\"text/css\" />"
       end
@@ -625,7 +632,7 @@ module WidgetSpec
 
     describe "#url" do
       it "renders an anchor tag with the same href and text" do
-        Erector::Widget.new do
+        Erector.inline do
           url "http://example.com"
         end.to_s.should == "<a href=\"http://example.com\">http://example.com</a>"
       end
@@ -633,7 +640,7 @@ module WidgetSpec
 
     describe '#capture' do
       it "should return content rather than write it to the buffer" do
-        widget = Erector::Widget.new do
+        widget = Erector.inline do
           captured = capture do
             p 'Captured Content'
           end
@@ -645,7 +652,7 @@ module WidgetSpec
       end
 
       it "works with nested captures" do
-        widget = Erector::Widget.new do
+        widget = Erector.inline do
           captured = capture do
             captured = capture do
               p 'Nested Capture'
@@ -663,11 +670,11 @@ module WidgetSpec
 
     describe 'nested' do
       it "can insert another widget without raw" do
-        inner = Erector::Widget.new do
+        inner = Erector.inline do
           p "foo"
         end
 
-        outer = Erector::Widget.new do
+        outer = Erector.inline do
           div inner
         end.to_s.should == '<div><p>foo</p></div>'
       end
@@ -693,7 +700,7 @@ module WidgetSpec
       end
 
       it "passing a widget to text method renders it" do
-        Erector::Widget.new() do
+        Erector.inline do
           text "B"
           text A.new()
           text "B"
@@ -769,8 +776,8 @@ module WidgetSpec
         end
         lambda { 
           thing = Thing7.new(:foo => 1, :baz => 3) 
-          thing.bar.should equal(7)
-          thing.baz.should equal(3)
+          thing.instance_variable_get(:@bar).should equal(7)
+          thing.instance_variable_get(:@baz).should equal(3)
         }.should_not raise_error
       end
       
@@ -780,9 +787,9 @@ module WidgetSpec
         end
         lambda { 
           thing = Thing8.new(:foo => 1, :baz => 2)
-          thing.foo.should equal(1)
-          thing.bar.should equal(7)
-          thing.baz.should equal(2)
+          thing.instance_variable_get(:@foo).should equal(1)
+          thing.instance_variable_get(:@bar).should equal(7)
+          thing.instance_variable_get(:@baz).should equal(2)
         }.should_not raise_error
       end
       
@@ -792,7 +799,7 @@ module WidgetSpec
         end
         lambda {
           thing = Thing9.new
-          thing.foo.should be_nil
+          thing.instance_variable_get(:@foo).should be_nil
         }.should_not raise_error
       end
       
@@ -814,34 +821,27 @@ module WidgetSpec
         lambda { Car.new(:wheels => 4) }.should raise_error
       end
       
-      it "defines accessors for each of the needed variables" do
+      it "no longer defines accessors for each of the needed variables" do
         class NeedfulThing < Erector::Widget
           needs :love
         end
         thing = NeedfulThing.new(:love => "all we need")
-        thing.love.should == "all we need"
+        lambda {thing.love}.should raise_error(NoMethodError)
       end
       
-      it "doesnt define accessors for non-needed variables" do
-        class NeedlessThing < Erector::Widget
-        end
-        thing = NeedlessThing.new(:love => "all we need")
-        lambda {thing.love}.should raise_error
-      end
-
-      it "complains if you attempt to 'need' a variable whose name overlaps with an existing method" do
+      it "no longer complains if you attempt to 'need' a variable whose name overlaps with an existing method" do
         class ThingWithOverlap < Erector::Widget
           needs :text
         end
-        lambda { ThingWithOverlap.new(:text => "alas") }.should raise_error(ArgumentError)
+        lambda { ThingWithOverlap.new(:text => "alas") }.should_not raise_error(ArgumentError)
       end
-      
+           
     end
     
     describe "#close_tag" do
       it "works when it's all alone, even though it messes with the indent level" do
-        Erector::Widget.new { close_tag :foo }.to_s.should == "</foo>"
-        Erector::Widget.new { close_tag :foo; close_tag :bar }.to_s.should == "</foo></bar>"
+        Erector.inline { close_tag :foo }.to_s.should == "</foo>"
+        Erector.inline { close_tag :foo; close_tag :bar }.to_s.should == "</foo></bar>"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-erector
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Alex Chaffee
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-09-27 00:00:00 -07:00
 default_executable: erector
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - lib/erector/erected.rb
 - lib/erector/extensions/object.rb
 - lib/erector/indenting.rb
+- lib/erector/inline.rb
 - lib/erector/mixin.rb
 - lib/erector/rails.rb
 - lib/erector/rails/extensions/action_controller.rb
@@ -64,6 +65,7 @@ files:
 - spec/erect/erected_spec.rb
 - spec/erect/rhtml_parser_spec.rb
 - spec/erector/indentation_spec.rb
+- spec/erector/inline_spec.rb
 - spec/erector/mixin_spec.rb
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
@@ -72,8 +74,9 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_suite.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://erector.rubyforge.org/
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -93,26 +96,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.2.0
+rubyforge_project: erector
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Html Builder library.
 test_files: 
-- spec/rails_spec_suite.rb
-- spec/spec_suite.rb
+- spec/core_spec_suite.rb
+- spec/erect
+- spec/erect/erect_rails_spec.rb
+- spec/erect/erect_spec.rb
+- spec/erect/erected_spec.rb
+- spec/erect/rhtml_parser_spec.rb
 - spec/erector
 - spec/erector/indentation_spec.rb
+- spec/erector/inline_spec.rb
+- spec/erector/mixin_spec.rb
 - spec/erector/unicode_builder_spec.rb
+- spec/erector/widget_spec.rb
 - spec/erector/widgets
 - spec/erector/widgets/table_spec.rb
-- spec/erector/mixin_spec.rb
-- spec/erector/widget_spec.rb
-- spec/erect
-- spec/erect/erected_spec.rb
-- spec/erect/erect_rails_spec.rb
-- spec/erect/rhtml_parser_spec.rb
-- spec/erect/erect_spec.rb
+- spec/rails_spec_suite.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/core_spec_suite.rb
+- spec/spec_suite.rb