erector 0.3.110 → 0.4.191

data/spec/erector/widgets/table_spec.rb

@@ -1,43 +1,38 @@
 require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
 
-#TODO: This is very confusing with column_a etc.  Rewrite to use LastName, FirstName, Email or something like that.
-
 module TableSpec
   class DefaultsTestTable < Erector::Widgets::Table
-    column :column_a
-    column :column_b
-    column :column_c
+    column :first_name
+    column :last_name
+    column :email
     row_classes :even, :odd
   end
 
   class CustomHeadingTable < Erector::Widgets::Table
-    column :a, "Column - A"
-    column :b, lambda {|id| span id}
+    column :first_name, "Column - First Name"
+    column :email, lambda {|id| span id}
   end
 
   class CustomCellTable < Erector::Widgets::Table
-    column :a do |obj|
-      span obj.a
+    column :first_name do |obj|
+      span obj.first_name
     end
   end
 
   describe ::Erector::Widgets::Table do
     describe "with custom heading" do
+      attr_reader :html, :doc
       before do
-        view_cache do
-          widget = CustomHeadingTable.new(
-            nil,
-              :row_objects => []
-          )
-          widget.to_s
-        end
+        widget = CustomHeadingTable.new(nil, :row_objects => [])
+        @html = widget.to_s
+        @doc = Hpricot(html)
       end
 
       it "renders a custom heading text and procs" do
         table = doc.at("table")
         table.search("th").map {|c| c.inner_html}.should == [
-          "Column - A",
-          "<span>b</span>"
+          "Column - First Name",
+          "<span>email</span>"
         ]
       end
 
@@ -47,15 +42,12 @@ module TableSpec
     end
 
     describe "with custom cell content" do
+      attr_reader :html, :doc
       before do
-        @object1 = Struct.new(:a).new("Hello")
-        view_cache do
-          widget = CustomCellTable.new(
-            nil,
-              :row_objects => [@object1]
-          )
-          widget.to_s
-        end
+        @object1 = Struct.new(:first_name).new("Hello")
+        widget = CustomCellTable.new(nil, :row_objects => [@object1])
+        @html = widget.to_s
+        @doc = Hpricot(html)
       end
 
       it "renders custom cell html" do
@@ -66,24 +58,21 @@ module TableSpec
     end
 
     describe "with default heading and cell definitions" do
+      attr_reader :html, :doc
       before do
-        @object1 = Struct.new(:column_a, :column_b, :column_c).new(1, 2, 3)
-        @object2 = Struct.new(:column_a, :column_b, :column_c).new(4, 5, 6)
-        @object3 = Struct.new(:column_a, :column_b, :column_c).new(7, 8, 9)
-        view_cache do
-          widget = DefaultsTestTable.new(
-            nil,
-              :row_objects => [@object1, @object2, @object3]
-          )
-          widget.to_s
-        end
+        @object1 = Struct.new(:first_name, :last_name, :email).new(1, 2, 3)
+        @object2 = Struct.new(:first_name, :last_name, :email).new(4, 5, 6)
+        @object3 = Struct.new(:first_name, :last_name, :email).new(7, 8, 9)
+        widget = DefaultsTestTable.new(nil, :row_objects => [@object1, @object2, @object3])
+        @html = widget.to_s
+        @doc = Hpricot(html)
         @table = doc.at("table")
       end
 
       it "renders column titles" do
         title_row = @table.at("tr")
         titles = title_row.search("th").collect {|heading| heading.inner_html}
-        titles.should == [ "Column A", "Column B", "Column C" ]
+        titles.should == [ "First Name", "Last Name", "Email" ]
       end
 
       it "renders data" do

data/spec/rails_spec_suite.rb

@@ -0,0 +1,3 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/spec_suite"
+SpecSuite.rails

data/spec/spec_helper.rb

@@ -1,19 +1,24 @@
 dir = File.dirname(__FILE__)
 require "rubygems"
-require "active_record"
-require "spec"
-require "#{dir}/view_caching"
 $LOAD_PATH.unshift("#{dir}/../lib")
 require "erector"
+require "erector/rails"
 require "hpricot"
-require "action_controller/test_process"
+require "rr"
+require 'tempfile'
+require 'ostruct'
+require 'treetop'
+require "erector/erect"
+require "erector/erected"
+require "spec"
+
 
 Spec::Runner.configure do |config|
-  config.include ViewCaching
+  config.mock_with :rr
 end
 
 # This mimics Rails load path and dependency stuff
-RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../test/rails_root") unless defined?(RAILS_ROOT)
+RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/rails_root") unless defined?(RAILS_ROOT)
 #$: << "#{RAILS_ROOT}/app"
 module Views
   module TemplateHandlerSpec

data/spec/spec_suite.rb

@@ -1,4 +1,45 @@
-dir = File.dirname(__FILE__)
-Dir["#{dir}/**/*_spec.rb"].each do |file|
-  require file
+class SpecSuite
+  class << self
+    def all
+      system("ruby #{dir}/core_spec_suite.rb") || raise("Core Spec Suite failed")
+      dir = File.dirname(__FILE__)
+      require "#{dir}/../lib/erector/rails/supported_rails_versions"
+      versions = Erector::Rails::SUPPORTED_RAILS_VERSIONS.keys.sort.reverse
+      versions.each do |rails_version|
+        puts "Running rails_spec_suite for Rails version #{rails_version}"
+          run_with_rails_version("#{dir}/rails_spec_suite.rb", rails_version) ||
+            "Suite failed for Rails version #{rails_version}"
+      end
+    end
+
+    def core
+      run Dir["#{dir}/{erect,erector}/**/*_spec.rb"]
+    end
+
+    def rails
+      Dir.chdir("#{dir}/rails_root") do
+        run Dir["spec/**/*_spec.rb"]
+      end
+    end
+
+    def run(files)
+      files.each do |file|
+        require file
+      end
+    end
+
+    protected
+    def run_with_rails_version(suite_path, rails_version)
+      system("export RAILS_VERSION=#{rails_version} && ruby #{suite_path}") ||
+        raise("Failed for version #{rails_version}")
+    end
+
+    def dir
+      File.dirname(__FILE__)
+    end
+  end
 end
+
+if $0 == __FILE__
+  SpecSuite.all
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.3.110
+  version: 0.4.191
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 -07:00
+date: 2008-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,41 +49,67 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 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
 - spec/erect/erect_spec.rb
 - spec/erect/erected_spec.rb
-- spec/erect/rhtml_parser_spec.rb
 - spec/erector
-- spec/erector/extensions
-- spec/erector/extensions/render_widget_spec.rb
-- spec/erector/extensions/template_handler_spec.rb
-- spec/erector/rails_helpers_spec.rb
-- spec/erector/widget_spec.rb
 - spec/erector/widgets
 - spec/erector/widgets/table_spec.rb
-- spec/rails
-- spec/rails/standard_helpers_spec.rb
-- spec/rails/view_spec.rb
-- spec/spec_helper.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
 - spec/spec_suite.rb
-- spec/view_caching.rb
+- lib/erector.rb
 - lib/erector
+- lib/erector/widgets
+- lib/erector/widgets/table.rb
+- lib/erector/rails
+- lib/erector/rails/supported_rails_versions.rb
+- lib/erector/rails/extensions
+- lib/erector/rails/extensions/action_controller.rb
+- lib/erector/rails/extensions/widget.rb
+- lib/erector/rails/extensions/action_view.rb
+- lib/erector/rails/template_handlers
+- lib/erector/rails/template_handlers/action_view_template_handler.rb
+- lib/erector/raw_string.rb
+- lib/erector/widgets.rb
+- lib/erector/widget.rb
 - lib/erector/erect.rb
-- lib/erector/erected.rb
+- lib/erector/unicode_builder.rb
+- lib/erector/doc.rb
 - lib/erector/extensions
-- lib/erector/extensions/action_controller.rb
-- lib/erector/extensions/action_view_template_handler.rb
 - lib/erector/extensions/object.rb
-- lib/erector/helpers.rb
-- lib/erector/html_parts.rb
-- lib/erector/indenting.rb
-- lib/erector/raw_string.rb
+- lib/erector/unicode.rb
 - lib/erector/rhtml.treetop
-- lib/erector/widget.rb
-- lib/erector/widgets
-- lib/erector/widgets/table.rb
-- lib/erector/widgets.rb
-- lib/erector.rb
+- lib/erector/rails.rb
+- lib/erector/indenting.rb
+- lib/erector/erected.rb
 - README.txt
 - bin/erect
 has_rdoc: true
@@ -109,9 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erector
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Erector is a Builder-like view framework, inspired by Markaby but overcoming some of its flaws
-test_files: 
-- test/rails_root/app/views/template_handler_spec/test_page.rb
+test_files: []
+

data/lib/erector/extensions/action_controller.rb

@@ -1,24 +0,0 @@
-module ActionController #:nodoc:
-  class Base
-    def render_widget(widget_class, assigns=@assigns)
-      render :text => render_widget_to_string(widget_class, assigns)
-    end
-
-    def render_widget_to_string(widget_class, assigns = @assigns)
-      add_variables_to_assigns
-      @rendered_widget = widget_class.new(@template, assigns.merge(:params => params))
-      @rendered_widget.to_s
-    end
-
-    def render_with_erector_widget(*options, &block)
-      if options.first.is_a?(Hash) && widget = options.first.delete(:widget)
-        render_widget widget, *options, &block
-      else
-        render_without_erector_widget *options, &block
-      end
-    end
-    alias_method_chain :render, :erector_widget
-
-    attr_reader :rendered_widget
-  end
-end

data/lib/erector/extensions/action_view_template_handler.rb

@@ -1,66 +0,0 @@
-module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    class Erector
-      def initialize(view)
-        @view = view
-      end
-
-      def render(template, local_assigns)
-
-        if template =~ /class ([\w:_]+)/
-          classname_from_template = $1
-          template_path = Inflector::underscore(classname_from_template)
-        else
-          template_path = @view.first_render
-        end
-
-        paths = template_path.split('/')
-        if paths.first == 'views'
-          paths.shift
-          template_path = paths.join('/')
-        end
-
-        found = false
-        @view.view_paths.each_with_index do |view_path, i|
-          full_path = "#{view_path}/#{template_path}.rb"
-          if File.exists?(full_path)
-            require_dependency full_path
-            found = true
-            break
-          else
-            partial_file_path = full_path.gsub(/\/([^\/]*)$/, '/_\1')
-            if File.exists?(partial_file_path)
-              require_dependency partial_file_path
-              found = true
-              break
-            end
-          end
-        end
-        return unless found
-
-        dot_rb = /\.rb$/
-        widget_class = paths.inject(Views) do |current_module, node|
-          current_module.const_get(node.gsub(dot_rb, '').camelize)
-        end
-
-        rendered_widget = widget_class.new(@view, @view.assigns)
-        assign_locals(rendered_widget, local_assigns)
-        rendered_widget.to_s
-      end
-      
-    private
-      # TODO: move into widget
-      def assign_locals(widget, local_assigns)
-        widget.assign_locals(local_assigns)
-      end
-      
-    end
-  end
-end
-
-ActionView::Base.instance_eval do
-  if respond_to?(:register_template_handler)
-    register_template_handler :rb, ActionView::TemplateHandlers::Erector
-  end
-end
-# ActionMailer::Base.register_template_extension('rb')

data/lib/erector/html_parts.rb

@@ -1,63 +0,0 @@
-module Erector
-  
-  # An array to which is written a stream of HTML "parts" -- each part being an open tag, a string, a close tag, etc.
-  class HtmlParts < Array
-    def to_s
-      map do |part|
-        case part[:type].to_sym
-        when :open
-          part[:attributes] ?
-            "<#{part[:tagName]}#{format_attributes(part[:attributes])}>" :
-            "<#{part[:tagName]}>"
-        when :close
-          "</#{part[:tagName]}>"
-        when :empty
-          part[:attributes] ?
-            "<#{part[:tagName]}#{format_attributes(part[:attributes])} />" :
-            "<#{part[:tagName]}  />"
-        when :text
-          part[:value].html_escape
-        when :instruct
-          "<?xml#{format_sorted(sort_for_xml_declaration(part[:attributes]))}?>"
-        end
-      end.join
-    end
-
-    protected
-    def format_attributes(attributes)
-      return "" if !attributes || attributes.empty?
-      return format_sorted(sorted(attributes))
-    end
-
-    def format_sorted(sorted)
-      results = ['']
-      sorted.each do |key, value|
-        if value
-          if value.is_a?(Array)
-            value = [value].flatten.join(' ')
-          end
-          results << "#{key}=\"#{value.html_escape}\""
-        end
-      end
-      return results.join(' ')
-    end
-
-    def sorted(attributes)
-      stringized = []
-      attributes.each do |key, value|
-        stringized << [key.to_s, value]
-      end
-      return stringized.sort
-    end
-
-    def sort_for_xml_declaration(attributes)
-      # correct order is "version, encoding, standalone" (XML 1.0 section 2.8).  
-      # But we only try to put version before encoding for now.
-      stringized = []
-      attributes.each do |key, value|
-        stringized << [key.to_s, value]
-      end
-      return stringized.sort{|a, b| b <=> a}
-    end
-  end  
-end