erector 0.5.0 → 0.5.1

data/lib/erector/rails/template_handlers/2.1.0/action_view_template_handler.rb

@@ -17,7 +17,7 @@ module ActionView #:nodoc:
         require_dependency File.expand_path(template.filename)
 
         widget_class_parts = relative_path_parts.inject(['Views']) do |class_parts, node|
-          class_parts << node.gsub(/^_/, "").gsub(/(\.html)?\.rb$/, '').classify
+          class_parts << node.gsub(/^_/, "").gsub(/(\.html)?\.rb$/, '').camelize
           class_parts
         end
         widget_class_name = widget_class_parts.join("::")

data/lib/erector/rails/template_handlers/2.2.0/action_view_template_handler.rb

@@ -17,7 +17,7 @@ module ActionView #:nodoc:
         require_dependency File.expand_path(template.filename)
 
         widget_class_parts = relative_path_parts.inject(['Views']) do |class_parts, node|
-          class_parts << node.gsub(/^_/, "").gsub(/(\.html)?\.rb$/, '').classify
+          class_parts << node.gsub(/^_/, "").gsub(/(\.html)?\.rb$/, '').camelize
           class_parts
         end
         widget_class_name = widget_class_parts.join("::")

data/lib/erector/rhtml.treetop

@@ -150,7 +150,7 @@ grammar Rhtml
   end
 
   rule space
-    ' '*
+    [ \n\t]*
   end
 
 end

data/lib/erector/version.rb

@@ -1,8 +1,8 @@
-##
+  ##
 # Erector view framework
 module Erector
   if !Erector.const_defined?(:VERSION)
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end
 

data/lib/erector/widget.rb

@@ -26,20 +26,27 @@ module Erector
 
       # tags which are always self-closing
       def empty_tags
-        ['area', 'base', 'br', 'hr', 'img', 'input', 'link', 'meta']
+        ['area', 'base', 'br', 'col', 'frame', 
+        'hr', 'img', 'input', 'link', 'meta']
       end
 
       # tags which can contain other stuff
       def full_tags
         [
-          'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'body',
-          'button', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
-          'dd', 'del', 'div', 'dl', 'dt', 'em',
-          'fieldset', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html', 'i',
+          'a', 'abbr', 'acronym', 'address', 
+          'b', 'bdo', 'big', 'blockquote', 'body', 'button', 
+          'caption', 'center', 'cite', 'code', 'colgroup',
+          'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em',
+          'fieldset', 'form', 'frameset',
+          'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html', 'i',
           'iframe', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
-          'noframes', 'noscript', 'ol', 'optgroup', 'option', 'p', 'param', 'pre',
-          'samp', 'script', 'select', 'small', 'span', 'strong', 'style', 'sub', 'sup',
-          'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title', 'tr', 'tt', 'u', 'ul', 'var'
+          'noframes', 'noscript', 
+          'object', 'ol', 'optgroup', 'option', 'p', 'param', 'pre',
+          'q', 's',
+          'samp', 'script', 'select', 'small', 'span', 'strike',
+          'strong', 'style', 'sub', 'sup',
+          'table', 'tbody', 'td', 'textarea', 'tfoot', 
+          'th', 'thead', 'title', 'tr', 'tt', 'u', 'ul', 'var'
         ]
       end
 
@@ -121,7 +128,7 @@ module Erector
     # calls this widget's #render method and returns the string.
     #
     # If it's called again later 
-    # then it returns the earlier rendered string, which leads to higher performance, but may have confusing
+    # then it returns the earlier rendered string, which may lead to higher performance, but may have confusing
     # effects if some underlying state has changed. In general we recommend you create a new instance of every
     # widget for each render, unless you know what you're doing.
     def to_s(render_method_name=:render, &blk)
@@ -295,9 +302,6 @@ module Erector
       output.concat "<?xml#{format_sorted(sort_for_xml_declaration(attributes))}?>"
     end
 
-    # Deprecated synonym of instruct
-    alias_method :instruct!, :instruct
-
     # Creates a whole new output string, executes the block, then converts the output string to a string and
     # emits it as raw text. If at all possible you should avoid this method since it hurts performance,
     # and use #render_to instead.

data/spec/erect/rhtml_parser_spec.rb

@@ -169,6 +169,14 @@ describe RhtmlParser do
     @parser.root = :attribute
     parse("a=\"don't worry\"").convert.should == ":a => 'don\\'t worry'"
   end
+
+  it "allows newlines where whitespace is allowed" do
+    parse("<img src='foo' \nalt='bar' />").convert.should == "img :src => 'foo', :alt => 'bar'\n"
+  end
+  
+  it "treats tab characters the same as spaces" do
+    parse("<div \t />").convert.should == "div\n"
+  end
   
   it "deals with HTML entities in text" do
     parse("&lt;").convert.should == "text '<'\n"

data/spec/erector/widget_spec.rb

@@ -319,7 +319,7 @@ module WidgetSpec
       end
 
       it "renders the proper empty-element tags" do
-        ['area', 'base', 'br', 'hr', 'img', 'input', 'link', 'meta'].each do |tag_name|
+        Erector::Widget.empty_tags.each do |tag_name|
           expected = "<#{tag_name} />"
           actual = Erector::Widget.new do
             send(tag_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -05:00
+date: 2008-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,62 +52,62 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
+- spec/core_spec_suite.rb
+- spec/erect
+- spec/erect/erect_spec.rb
+- spec/erect/erected_spec.rb
+- spec/erect/rhtml_parser_spec.rb
 - spec/erector
-- spec/erector/widgets
-- spec/erector/widgets/table_spec.rb
+- spec/erector/indentation_spec.rb
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
-- spec/erector/indentation_spec.rb
+- spec/erector/widgets
+- spec/erector/widgets/table_spec.rb
 - spec/rails_spec_suite.rb
-- spec/spec_suite.rb
-- spec/core_spec_suite.rb
 - spec/spec_helper.rb
-- spec/erect
-- spec/erect/erected_spec.rb
-- spec/erect/erect_spec.rb
-- spec/erect/rhtml_parser_spec.rb
+- spec/spec_suite.rb
 - lib/erector
+- lib/erector/erect.rb
+- lib/erector/erected.rb
+- lib/erector/extensions
+- lib/erector/extensions/object.rb
+- lib/erector/indenting.rb
 - lib/erector/rails
 - lib/erector/rails/extensions
-- lib/erector/rails/extensions/action_controller.rb
 - lib/erector/rails/extensions/action_controller
 - lib/erector/rails/extensions/action_controller/1.2.5
 - lib/erector/rails/extensions/action_controller/1.2.5/action_controller.rb
 - lib/erector/rails/extensions/action_controller/2.2.0
 - lib/erector/rails/extensions/action_controller/2.2.0/action_controller.rb
+- lib/erector/rails/extensions/action_controller.rb
+- lib/erector/rails/extensions/action_view.rb
 - lib/erector/rails/extensions/widget
 - lib/erector/rails/extensions/widget/1.2.5
 - lib/erector/rails/extensions/widget/1.2.5/widget.rb
 - lib/erector/rails/extensions/widget/2.2.0
 - lib/erector/rails/extensions/widget/2.2.0/widget.rb
-- lib/erector/rails/extensions/action_view.rb
 - lib/erector/rails/extensions/widget.rb
+- lib/erector/rails/supported_rails_versions.rb
 - lib/erector/rails/template_handlers
-- lib/erector/rails/template_handlers/action_view_template_handler.rb
+- lib/erector/rails/template_handlers/1.2.5
+- lib/erector/rails/template_handlers/1.2.5/action_view_template_handler.rb
 - lib/erector/rails/template_handlers/2.0.0
 - lib/erector/rails/template_handlers/2.0.0/action_view_template_handler.rb
 - lib/erector/rails/template_handlers/2.1.0
 - lib/erector/rails/template_handlers/2.1.0/action_view_template_handler.rb
-- lib/erector/rails/template_handlers/1.2.5
-- lib/erector/rails/template_handlers/1.2.5/action_view_template_handler.rb
 - lib/erector/rails/template_handlers/2.2.0
 - lib/erector/rails/template_handlers/2.2.0/action_view_template_handler.rb
-- lib/erector/rails/supported_rails_versions.rb
-- lib/erector/widgets
-- lib/erector/widgets/table.rb
+- lib/erector/rails/template_handlers/action_view_template_handler.rb
 - lib/erector/rails.rb
-- lib/erector/extensions
-- lib/erector/extensions/object.rb
-- lib/erector/erect.rb
-- lib/erector/indenting.rb
-- lib/erector/rhtml.treetop
 - lib/erector/raw_string.rb
-- lib/erector/version.rb
-- lib/erector/widgets.rb
+- lib/erector/rhtml.treetop
 - lib/erector/unicode.rb
 - lib/erector/unicode_builder.rb
+- lib/erector/version.rb
 - lib/erector/widget.rb
-- lib/erector/erected.rb
+- lib/erector/widgets
+- lib/erector/widgets/table.rb
+- lib/erector/widgets.rb
 - lib/erector.rb
 - README.txt
 - bin/erect
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erector
-rubygems_version: 1.3.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Erector is a Builder-like view framework, inspired by Markaby but overcoming some of its flaws