erector 0.8.0 → 0.8.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 0
+:patch: 1

data/lib/erector/externals.rb

@@ -59,7 +59,7 @@ module Erector
             texts_hash[t] = options.delete(t) if options.has_key? t
           end
           texts_hash.each do |t, texts|
-            texts.each do |text|
+            [texts].flatten.each do |text|
               deps << interpret_args(t, text, options)
             end
           end
@@ -79,9 +79,10 @@ module Erector
 
     def render_with_externals(options_to_external_renderer = {})
       output = Erector::Output.new
-      self.to_a(:output => output)
+      self.to_a(:output => output) # render all the externals onto this new output buffer
       nested_widgets = output.widgets.to_a
-      externals = ExternalRenderer.new({:classes => nested_widgets}.merge(options_to_external_renderer)).to_html(:output => output)
+      renderer = ExternalRenderer.new({:classes => nested_widgets}.merge(options_to_external_renderer))
+      externals = renderer.to_a(:output => output)
       output.to_a
     end
 

data/lib/erector/output.rb

@@ -62,11 +62,11 @@ module Erector
     end
 
     def to_s
-      RawString.new(buffer.to_s)
+      RawString.new(buffer.kind_of?(String) ? buffer : buffer.join)
     end
 
     def to_a
-      buffer.to_a
+      buffer.kind_of?(Array) ? buffer : [buffer]
     end
 
     def newline

data/lib/erector/rails/template_handlers/rb_handler.rb

@@ -34,7 +34,7 @@ begin
       instance_variables_for_widget_assignment_for(cell)
     end
   end
-rescue NameError
+rescue NameError, ArgumentError
 end
 
 module Erector

data/lib/erector/version.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 ##
 # Erector view framework
 module Erector

data/spec/erector/caching_spec.rb

@@ -231,7 +231,9 @@ require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
         widget.new.to_html(:content_method_name => :bar).should == "bar"
       end
 
-      it "works when passing an existing output as a parameter to to_html"
+      it "works when passing an existing output as a parameter to to_html" do
+        pending
+      end
     end
 
     describe '#widget' do

data/spec/erector/externals_spec.rb

@@ -98,6 +98,7 @@ module ExternalsSpec
         x[1].text.should == "bar.js"
         x[1].type.should == :js
       end
+
       it "adds multiple files from hash of different types" do
         x = Test.send :interpret_args, :js => ["foo.js", "bar.js"], :css=>'file.css'
         x.size.should == 3
@@ -105,6 +106,7 @@ module ExternalsSpec
         x.map(&:text).include?('bar.js')
         x.map(&:text).include?('file.css')
       end
+
       it "adds multiple files from hash and preserves the options" do
         x = Test.send :interpret_args, :js => ["foo.js", "bar.js"], :foo=>false
         x.size.should == 2
@@ -211,7 +213,7 @@ module ExternalsSpec
 
     it "#render_with_externals sticks the externals for all its rendered sub-widgets at the end of the output buffer" do
       s = Dinner.new.render_with_externals
-      s.to_s.should ==
+      s.join.should ==
         "<span>dinner</span>" +
           "<span>dessert</span>" +
           "<link href=\"/dessert.css\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />" +
@@ -222,7 +224,7 @@ module ExternalsSpec
     it "#render_externals returns externals for all rendered sub-widgets to an output buffer" do
       widget = Dinner.new
       widget.to_html
-      widget.render_externals.to_s.should ==
+      widget.render_externals.join.should ==
         "<link href=\"/dessert.css\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />" +
           "<script src=\"/dinner.js\" type=\"text/javascript\"></script>" +
           "<script src=\"/dessert.js\" type=\"text/javascript\"></script>"

data/spec/erector/html_spec.rb

@@ -115,7 +115,7 @@ describe Erector::HTML do
         object = ['a', 'b']
         erector do
           element 'div', object
-        end.should == "<div>#{object.to_s}</div>"
+        end.should == "<div>#{CGI.escapeHTML object.to_s}</div>"
       end
     end
 
@@ -224,11 +224,12 @@ describe Erector::HTML do
 
     context "with a non-string, non-raw" do
       it "calls to_s and quotes" do
+        array = [7, "foo&bar"]
         erector do
           element 'a' do
-            text [7, "foo&bar"]
+            text array
           end
-        end.should == "<a>7foo&amp;bar</a>"
+        end.should == "<a>#{CGI.escapeHTML array.to_s}</a>"
       end
     end
   end
@@ -380,7 +381,7 @@ describe Erector::HTML do
       # be pretty confusing when this method can already take either a name or number
       lambda {
         erector { text character([]) }
-      }.should raise_error("Unrecognized argument to character: ")
+      }.should raise_error("Unrecognized argument to character: #{[].to_s}")
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -07:00
+date: 2010-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency