erector 0.4.191 → 0.4.200

data/lib/erector.rb

@@ -8,12 +8,8 @@ require "#{dir}/erector/raw_string"
 require "#{dir}/erector/widget"
 require "#{dir}/erector/unicode"
 require "#{dir}/erector/widgets"
+require "#{dir}/erector/version"
 if Object.const_defined?(:RAILS_ROOT)
   require "#{dir}/erector/rails"
 end
 
-##
-# Erector view framework
-module Erector
-  VERSION = "0.4.191"
-end

data/lib/erector/doc.rb

@@ -2,6 +2,8 @@ module Erector
   # A proxy to an IO object that adds methods to add xml.
   class Doc
 
+    cattr_accessor :prettyprint_default
+
     NON_NEWLINEY = {'i' => true, 'b' => true, 'small' => true,
       'img' => true, 'span' => true, 'a' => true,
       'input' => true, 'textarea' => true, 'button' => true, 'select' => true
@@ -15,6 +17,7 @@ module Erector
       @output = output
       @at_start_of_line = true
       @indent = 0
+      @enable_prettyprint = prettyprint_default
     end
 
     def output

data/lib/erector/version.rb

@@ -0,0 +1,6 @@
+##
+# Erector view framework
+module Erector
+  VERSION = "0.4.200"
+end
+

data/lib/erector/widget.rb

@@ -252,6 +252,20 @@ module Erector
     def close_tag(tag_name)
       @doc.close_tag tag_name
     end
+    
+    # Emits the result of joining the elements in array with the separator.
+    # The array elements and separator can be Erector::Widget objects,
+    # which are rendered, or strings, which are quoted and output.
+    def join(array, separator)
+      first = true
+      array.each do |widget_or_text|
+        if !first
+          text separator
+        end
+        first = false
+        text widget_or_text
+      end
+    end
 
     # Emits an XML instruction, which looks like this: <?xml version=\"1.0\" encoding=\"UTF-8\"?>
     def instruct(attributes={:version => "1.0", :encoding => "UTF-8"})

data/lib/erector/widgets.rb

@@ -1 +1,2 @@
-require "erector/widgets/table"
+require "#{File.dirname(__FILE__)}/widgets/table"
+

data/spec/erector/indentation_spec.rb

@@ -123,5 +123,13 @@ END
     end.enable_prettyprint(true).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::Doc.prettyprint_default = true
+    Erector::Widget.new { br }.to_s.should == "<br />\n"
+    Erector::Doc.prettyprint_default = false
+    Erector::Widget.new { br }.to_s.should == "<br />"
+  end
+  
 end
 

data/spec/erector/widget_spec.rb

@@ -401,6 +401,50 @@ module WidgetSpec
       end
     end
 
+    describe "#join" do
+
+      it "empty array means nothing to join" do
+        Erector::Widget.new do
+          join [], Erector::Widget.new { text "x" }
+        end.to_s.should == ""
+      end
+      
+      it "larger example with two tabs" do
+        Erector::Widget.new do
+          tab1 = 
+            Erector::Widget.new do
+              a "Upload document", :href => "/upload"
+            end
+          tab2 =
+            Erector::Widget.new do
+              a "Logout", :href => "/logout"
+            end
+          join [tab1, tab2],
+            Erector::Widget.new { text nbsp(" |"); text " " }
+        end.to_s.should == 
+          '<a href="/upload">Upload document</a>&#160;| <a href="/logout">Logout</a>'
+      end
+      
+      it "plain string as join separator means pass it to text" do
+        Erector::Widget.new do
+          join [
+            Erector::Widget.new { text "x" },
+            Erector::Widget.new { text "y" }
+          ], "<>"
+        end.to_s.should == "x&lt;&gt;y"
+      end
+
+      it "plain string as item to join means pass it to text" do
+        Erector::Widget.new do
+          join [
+            "<",
+            "&"
+          ], Erector::Widget.new { text " + " }
+        end.to_s.should == "&lt; + &amp;"
+      end
+
+    end
+
     describe '#h' do
       before do
         @widget = Erector::Widget.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.4.191
+  version: 0.4.200
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 -07:00
+date: 2008-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,26 +51,6 @@ extra_rdoc_files:
 files: 
 - spec/spec_helper.rb
 - spec/core_spec_suite.rb
-- spec/rails
-- spec/rails/rails_root
-- spec/rails/rails_root/doc
-- spec/rails/rails_root/config
-- spec/rails/rails_root/config/environments
-- spec/rails/rails_root/config/initializers
-- spec/rails/rails_root/spec
-- spec/rails/rails_root/spec/extensions
-- spec/rails/rails_root/script
-- spec/rails/rails_root/script/process
-- spec/rails/rails_root/script/performance
-- spec/rails/rails_root/app
-- spec/rails/rails_root/app/views
-- spec/rails/rails_root/app/views/template_handler_spec
-- spec/rails/rails_root/app/controllers
-- spec/rails/rails_root/app/helpers
-- spec/rails/rails_root/public
-- spec/rails/rails_root/public/javascripts
-- spec/rails/rails_root/public/images
-- spec/rails/extensions
 - spec/rails_spec_suite.rb
 - spec/erect
 - spec/erect/rhtml_parser_spec.rb
@@ -80,7 +60,6 @@ files:
 - spec/erector/widgets
 - spec/erector/widgets/table_spec.rb
 - spec/erector/doc_spec.rb
-- spec/erector/extensions
 - spec/erector/widget_spec.rb
 - spec/erector/indentation_spec.rb
 - spec/erector/unicode_builder_spec.rb
@@ -109,6 +88,7 @@ files:
 - lib/erector/rhtml.treetop
 - lib/erector/rails.rb
 - lib/erector/indenting.rb
+- lib/erector/version.rb
 - lib/erector/erected.rb
 - README.txt
 - bin/erect