erector 0.8.2 → 0.8.3

data/README.txt

@@ -67,10 +67,6 @@ When installing this way, erector is automatically available to your Rails code
 
 Three spec rake tasks are provided: spec:core (core functionality),
 spec:erect (the erector command line tool), and spec:rails (rails integration).
-You do not need to have Rails installed to run the latter two; they will clone
-the rails git repository and set it up for testing automatically. You can test
-against a different version of Rails by changing the constants in
-lib/erector/rails/rails_version.rb
 
 'rake spec' will run the complete set of specs.
 

data/VERSION.yml

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

data/lib/erector.rb

@@ -9,9 +9,6 @@ rescue LoadError => e
   # oh well, no Sass
 end
 
-require "erector/errors"
-require "erector/extensions/object"
-require "erector/extensions/hash"
 require "erector/raw_string"
 require "erector/dependencies"
 require "erector/dependency"
@@ -28,7 +25,8 @@ require "erector/abstract_widget"
 require "erector/widget"
 
 require "erector/inline"
-require "erector/unicode"
 require "erector/widgets"
 require "erector/version"
 require "erector/mixin"
+
+require "erector/rails" if defined?(Rails)

data/lib/erector/abstract_widget.rb

@@ -32,7 +32,7 @@ module Erector
 
     def initialize(assigns = {}, &block)
       unless assigns.is_a? Hash
-        raise "Erector widgets are initialized with only a parameter hash. (Other parameters are passed to to_html, or the #widget method.)"
+        raise ArgumentError, "Erector widgets are initialized with only a parameter hash, but you passed #{assigns.class}:#{assigns.inspect}. (Other parameters are passed to to_html, or the #widget method.)"
       end
 
       @_assigns = assigns
@@ -66,6 +66,7 @@ module Erector
     #           Rails view object.
     # content_method_name:: in case you want to call a method other than
     #                       #content, pass its name in here.
+    #
     def to_html(options = {})
       raise "Erector::Widget#to_html takes an options hash, not a symbol. Try calling \"to_html(:content_method_name=> :#{options})\"" if options.is_a? Symbol
       _render(options).to_s

data/lib/erector/erect/erect.rb

@@ -3,6 +3,9 @@ require "rake"
 require "erector/erect/erected"  # pull this out so we don't recreate the grammar every time
 
 module Erector
+
+  # "erect" is the erstwhile name of the command-line tool that converts between HTML/ERB and Erector.
+  # It's invoked via "erector --to-html foo.rb" or "erector --to-erector foo.html" (default is --to-erector)
   class Erect
     attr_reader :files, :verbose, :mode, :output_dir, :superklass, :method_name
     def initialize(args)
@@ -11,7 +14,7 @@ module Erector
       @output_dir = nil
       @superklass = 'Erector::Widget'
       @method_name = 'content'
-      
+
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: erector [options] [file|dir]*"
 
@@ -23,7 +26,7 @@ module Erector
                 "Operate silently except in case of error") do |quiet|
           @verbose = !quiet
         end
-        
+
         opts.on("--to-erector", "(default) Convert from html/rhtml to erector classes") do
           @mode = :to_erector
         end
@@ -31,15 +34,15 @@ module Erector
         opts.on("--to-html", "Convert from erector to html") do
           @mode = :to_html
         end
-        
+
         opts.on("--superclass SUPERCLASS", "Superclass for new widget (default Erector::Widget)") do |superklass|
           @superklass = superklass
         end
-        
+
         opts.on("--method METHOD", "Method containing content for widget (default 'content')") do |method_name|
           @method_name = method_name
         end
-        
+
         opts.on("-o", "--output-dir DIRECTORY", "Output files to DIRECTORY (default: output files go next to input files)") do |dir|
           @output_dir = dir
         end
@@ -54,17 +57,17 @@ module Erector
           puts Erector::VERSION
           exit
         end
-        
+
       end
       opts.parse!(args)
       @files = args
       explode_dirs
     end
-    
+
     def say(msg)
       print msg if verbose
     end
-    
+
     #todo: unit test
     def explode_dirs
       exploded_files = FileList.new
@@ -77,7 +80,7 @@ module Erector
       end
       @files = exploded_files
     end
-    
+
     def explode(dir)
       case mode
       when :to_erector
@@ -86,13 +89,13 @@ module Erector
         FileList["#{dir}/**/*.rb"]
       end
     end
-    
+
     def run
       @success = true
       self.send(mode)
       @success
     end
-    
+
     def to_erector
       files.each do |file|
         say "Erecting #{file}... "
@@ -118,7 +121,7 @@ module Erector
           filename = file.split('/').last.gsub(/\.rb$/, '')
           widget_name = camelize(filename)
           widget_class = constantize(widget_name)
-          
+
           if widget_class < Erector::Widget
             widget = widget_class.new
             #todo: skip if it's missing a no-arg constructor
@@ -139,7 +142,7 @@ module Erector
         end
       end
     end
-    
+
     # stolen from activesuppport/lib/inflector.rb
     def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
       if first_letter_in_uppercase
@@ -154,7 +157,7 @@ module Erector
       end
       Object.module_eval("::#{$1}", __FILE__, __LINE__)
     end
-    
+
 
   end
 end

data/lib/erector/erect/rhtml.treetop

@@ -80,11 +80,11 @@ grammar Rhtml
       def convert_removing_trims
         convert.gsub(/\s*\-\s*$/, '')
       end
-      
+
       def text_value_removing_trims
         text_value.gsub(/\s*\-\s*$/, '')
       end
-      
+
       def convert
         code = text_value.strip
         # matches a word, followed by either a word, a string, or a symbol
@@ -101,7 +101,7 @@ grammar Rhtml
 			end
 		}
 	end
-	
+
 	rule directive
 	  '<!' [^>]* '>' <Erector::Indenting> {
 			def convert
@@ -113,7 +113,7 @@ grammar Rhtml
   rule tagname
     [A-Za-z0-9_:-]+
   end
-  
+
   rule varname
     [A-Za-z0-9_]+
   end
@@ -157,7 +157,7 @@ grammar Rhtml
         if stripped.empty?
           ""
         else
-          line "text '#{stripped.html_unescape.gsub(/\'/, "\\\\'")
+          line "text '#{CGI.unescapeHTML(stripped).gsub(/\'/, "\\\\'")
           }'"
         end
       end
@@ -197,19 +197,27 @@ grammar Rhtml
       def value
         val.text_value
       end
-    
+
       def convert
         extract_erb(val.text_value)
       end
-      
+
       def parenthesize_if_necessary(s)
         return s if s.strip =~ /^\(.*\)$/ || s =~ /^[A-Z0-9_]*$/i
         "(" + s + ")"
       end
-      
+
+      def escape_single_quotes(s)
+        s.gsub(/[']/, '\\\\\'')
+      end
+
+      def escape_quoted(s)
+        escape_single_quotes(CGI.unescapeHTML(s))
+      end
+
       def extract_erb(s, parenthesize = true)
         if s =~ /^(.*?)<%=(.*?)%>(.*?)$/
-          pre, code, post = $1.html_unescape.escape_single_quotes, $2, $3.html_unescape.escape_single_quotes
+          pre, code, post = escape_quoted($1), $2, escape_quoted($3)
           out = ""
           out = "'#{pre}' + " unless pre.length == 0
           out += parenthesize_if_necessary(code.strip)
@@ -220,7 +228,7 @@ grammar Rhtml
           out = parenthesize_if_necessary(out) if parenthesize
           out
         else
-          "'" + s.html_unescape.escape_single_quotes + "'"
+          "'" + escape_quoted(s) + "'"
         end
       end
     }

data/lib/erector/externals.rb

@@ -1,4 +1,10 @@
 module Erector
+
+  # Externals are a mechanism by which a widget can declare page-level
+  # resources upon which it depends. They are not emitted during the widget's
+  # normal rendering process. Rather, the Erector::Widget::Page keeps track of
+  # all the widgets it renders, then goes back and inserts the proper tags for
+  # all the externals inside its HEAD element.
   module Externals
     def self.included(base)
       base.extend ClassMethods
@@ -45,7 +51,7 @@ module Erector
       def my_dependencies
         @my_dependencies ||= Dependencies.new
       end
-      
+
       private
       INFERABLE_TYPES = [:css, :js]
 

data/lib/erector/html.rb

@@ -177,6 +177,7 @@ module Erector
     # Return a character given its unicode code point or unicode name.
     def character(code_point_or_name)
       if code_point_or_name.is_a?(Symbol)
+        require "erector/unicode"
         found = Erector::CHARACTERS[code_point_or_name]
         if found.nil?
           raise "Unrecognized character #{code_point_or_name}"
@@ -203,7 +204,7 @@ module Erector
     #
     # Since "Authors should avoid putting two or more adjacent hyphens inside comments,"
     # we emit a warning if you do that.
-    def comment(text = '', &block)
+    def comment(text = '')
       puts "Warning: Authors should avoid putting two or more adjacent hyphens inside comments." if text =~ /--/
 
       conditional = text =~ /\[if .*\]/
@@ -212,9 +213,9 @@ module Erector
       rawtext text
       rawtext ">" if conditional
 
-      if block
+      if block_given?
         rawtext "\n"
-        block.call
+        yield
         rawtext "\n"
       end
 
@@ -224,43 +225,33 @@ module Erector
 
     # Emits a javascript block inside a +script+ tag, wrapped in CDATA
     # doohickeys like all the cool JS kids do.
-    def javascript(*args, &block)
-      if args.length > 2
-        raise ArgumentError, "Cannot accept more than two arguments"
+    def javascript(value = nil, attributes = {})
+      if value.is_a?(Hash)
+        attributes = value
+        value      = nil
+      elsif block_given? && value
+        raise ArgumentError, "You can't pass both a block and a value to javascript -- please choose one."
       end
-      attributes, value = nil, nil
-      arg0 = args[0]
-      if arg0.is_a?(Hash)
-        attributes = arg0
-      else
-        value = arg0
-        arg1 = args[1]
-        if arg1.is_a?(Hash)
-          attributes = arg1
+
+      script(attributes.merge(:type => "text/javascript")) do
+        # Shouldn't this be a "cdata" HtmlPart?
+        # (maybe, but the syntax is specific to javascript; it isn't
+        # really a generic XML CDATA section.  Specifically,
+        # ]]> within value is not treated as ending the
+        # CDATA section by Firefox2 when parsing text/html,
+        # although I guess we could refuse to generate ]]>
+        # there, for the benefit of XML/XHTML parsers).
+        output << raw("\n// <![CDATA[\n")
+        if block_given?
+          yield
+        else
+          output << raw(value)
         end
+        output << raw("\n// ]]>")
+        output.append_newline # this forces a newline even if we're not in pretty mode
       end
-      attributes ||= {}
-      attributes[:type] = "text/javascript"
-      open_tag 'script', attributes
-
-      # Shouldn't this be a "cdata" HtmlPart?
-      # (maybe, but the syntax is specific to javascript; it isn't
-      # really a generic XML CDATA section.  Specifically,
-      # ]]> within value is not treated as ending the
-      # CDATA section by Firefox2 when parsing text/html,
-      # although I guess we could refuse to generate ]]>
-      # there, for the benefit of XML/XHTML parsers).
-      rawtext "\n// <![CDATA[\n"
-      if block
-        instance_eval(&block)
-      else
-        rawtext value
-      end
-      rawtext "\n// ]]>"
-      output.append_newline # this forces a newline even if we're not in pretty mode
 
-      close_tag 'script'
-      rawtext "\n"
+      output << raw("\n")
     end
 
     protected
@@ -322,7 +313,7 @@ module Erector
           results << "#{key}=\"#{h(value)}\""
         end
       end
-      return results.join(' ')
+      results.join(' ')
     end
 
     def sorted(attributes)
@@ -330,7 +321,7 @@ module Erector
       attributes.each do |key, value|
         stringized << [key.to_s, value]
       end
-      return stringized.sort
+      stringized.sort
     end
 
     def sort_for_xml_declaration(attributes)
@@ -340,7 +331,7 @@ module Erector
       attributes.each do |key, value|
         stringized << [key.to_s, value]
       end
-      return stringized.sort{|a, b| b <=> a}
+      stringized.sort{|a, b| b <=> a}
     end
 
     NON_NEWLINEY = {'i' => true, 'b' => true, 'small' => true,

data/lib/erector/rails.rb

@@ -1,27 +1,7 @@
-require "action_controller"
-require "erector/rails/rails_version"
-require "erector/rails/rails_form_builder"
-require "erector/rails/extensions/action_controller"
-require "erector/rails/extensions/rails_helpers"
-require "erector/rails/extensions/rails_widget"
-require "erector/rails/template_handlers/rb_handler"
-require "erector/rails/template_handlers/ert_handler"
-
-module Erector
-  def self.init_rails(binding)
-    # Rails defaults do not include app/views in the eager load path.
-    # It needs to be there, because erector views are .rb files.
-    if config = eval("config if defined? config", binding)
-      view_path = config.view_path
-      config.load_paths       << view_path unless config.load_paths.include?(view_path)
-      config.eager_load_paths << view_path unless config.eager_load_paths.include?(view_path)
-
-      # Rails probably already ran Initializer#set_load_path and
-      # #set_autoload_paths by the time we got here.
-      $LOAD_PATH.unshift(view_path) unless $LOAD_PATH.include?(view_path)
-      unless ActiveSupport::Dependencies.load_paths.include?(view_path)
-        ActiveSupport::Dependencies.load_paths << view_path
-      end
-    end
-  end
+require 'rails/version'
+if Rails::VERSION::MAJOR == 2
+  require 'erector/rails2'
+else
+  require 'erector/rails3'
 end
+

data/lib/erector/rails/form_builder.rb

@@ -0,0 +1,36 @@
+module Erector
+  module Rails
+    class FormBuilder
+      class_attribute :parent_builder_class
+      self.parent_builder_class = ActionView::Base.default_form_builder
+
+      def self.wrapping(parent_builder_class)
+        return self if parent_builder_class.nil?
+        Class.new(self).tap do |klass|
+          klass.parent_builder_class = parent_builder_class
+        end
+      end
+
+      attr_reader :parent, :template
+
+      def initialize(object_name, object, template, options, proc)
+        @template = template
+        @parent = parent_builder_class.new(object_name, object, template, options, proc)
+      end
+
+      def method_missing(method_name, *args, &block)
+        if parent.respond_to?(method_name)
+          return_value = parent.send(method_name, *args, &block)
+          if return_value.is_a?(String)
+            template.concat(return_value)
+            nil
+          else
+            return_value
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end