erector 0.5.1 → 0.6.3

data/spec/erector/widgets/table_spec.rb

@@ -23,7 +23,7 @@ module TableSpec
     describe "with custom heading" do
       attr_reader :html, :doc
       before do
-        widget = CustomHeadingTable.new(nil, :row_objects => [])
+        widget = CustomHeadingTable.new(:row_objects => [])
         @html = widget.to_s
         @doc = Hpricot(html)
       end
@@ -45,7 +45,7 @@ module TableSpec
       attr_reader :html, :doc
       before do
         @object1 = Struct.new(:first_name).new("Hello")
-        widget = CustomCellTable.new(nil, :row_objects => [@object1])
+        widget = CustomCellTable.new(:row_objects => [@object1])
         @html = widget.to_s
         @doc = Hpricot(html)
       end
@@ -63,7 +63,7 @@ module TableSpec
         @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])
+        widget = DefaultsTestTable.new(:row_objects => [@object1, @object2, @object3])
         @html = widget.to_s
         @doc = Hpricot(html)
         @table = doc.at("table")

data/spec/spec.opts

@@ -0,0 +1 @@
+--backtrace

data/spec/spec_helper.rb

@@ -2,15 +2,13 @@ dir = File.dirname(__FILE__)
 require "rubygems"
 $LOAD_PATH.unshift("#{dir}/../lib")
 require "erector"
-require "erector/rails"
 require "hpricot"
 require "rr"
 require 'tempfile'
 require 'ostruct'
-require 'treetop'
-require "erector/erect"
-require "erector/erected"
+ARGV.push(*File.read("#{File.dirname(__FILE__)}/spec.opts").split("\n"))
 require "spec"
+require "spec/autorun"
 
 Spec::Runner.configure do |config|
   config.mock_with :rr

data/spec/spec_suite.rb

@@ -3,13 +3,12 @@ class SpecSuite
     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
+      require "#{dir}/../lib/erector/rails/rails_version"
+
+      rails_version = Erector::Rails::RAILS_VERSION
+      puts "Running rails_spec_suite for Rails version #{rails_version}"
+
+      system("ruby #{dir}/rails_spec_suite.rb") || raise("Failed for version #{rails_version}")
     end
 
     def core
@@ -29,11 +28,6 @@ class SpecSuite
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.3
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,29 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -05:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :runtime
@@ -42,61 +22,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.0
     version: 
-description: Erector is a Builder-like view framework, inspired by Markaby but overcoming some of its flaws. In Erector all views are objects, not template files, which allows the full power of object-oriented programming (inheritance, modular decomposition, encapsulation) in views. See the rdoc for the Erector::Widget class to learn how to make your own widgets, and visit the project site at http://erector.rubyforge.org for more documentation.
-email: 
-- alex@pivotallabs.com
+description: Html Builder library.
+email: erector@googlegroups.compivotallabsopensource@googlegroups.com
 executables: 
-- erect
+- erector
 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/indentation_spec.rb
-- spec/erector/unicode_builder_spec.rb
-- spec/erector/widget_spec.rb
-- spec/erector/widgets
-- spec/erector/widgets/table_spec.rb
-- spec/rails_spec_suite.rb
-- spec/spec_helper.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
-- 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/widget.rb
-- lib/erector/rails/supported_rails_versions.rb
-- lib/erector/rails/template_handlers
-- 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/2.2.0
-- lib/erector/rails/template_handlers/2.2.0/action_view_template_handler.rb
+- lib/erector/rails/extensions/rails_widget/helpers.rb
+- lib/erector/rails/extensions/rails_widget.rb
+- lib/erector/rails/rails_version.rb
 - lib/erector/rails/template_handlers/action_view_template_handler.rb
 - lib/erector/rails.rb
 - lib/erector/raw_string.rb
@@ -105,14 +48,25 @@ files:
 - lib/erector/unicode_builder.rb
 - lib/erector/version.rb
 - lib/erector/widget.rb
-- lib/erector/widgets
 - lib/erector/widgets/table.rb
 - lib/erector/widgets.rb
 - lib/erector.rb
 - README.txt
-- bin/erect
+- VERSION.yml
+- bin/erector
+- spec/core_spec_suite.rb
+- spec/erector/indentation_spec.rb
+- spec/erector/unicode_builder_spec.rb
+- spec/erector/widget_spec.rb
+- spec/erector/widgets/table_spec.rb
+- spec/rails_spec_suite.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/spec_suite.rb
 has_rdoc: true
 homepage: http://erector.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -134,9 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erector
-rubygems_version: 1.3.0
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
-summary: Erector is a Builder-like view framework, inspired by Markaby but overcoming some of its flaws
+specification_version: 3
+summary: Html Builder library.
 test_files: []
 

data/lib/erector/rails/extensions/action_controller/1.2.5/action_controller.rb

@@ -1,17 +0,0 @@
-ActionController::Base.class_eval do
-  def render_widget(widget_class, assigns=@assigns)
-    @__widget_class = widget_class
-    @__widget_assigns = assigns
-    add_variables_to_assigns
-    render :inline => "<% @__widget_class.new(self, @__widget_assigns, _erbout).render %>"
-  end
-
-  def render_with_erector_widget(*options, &block)
-    if options.first.is_a?(Hash) && widget = options.first.delete(:widget)
-      render_widget widget, @assigns, &block
-    else
-      render_without_erector_widget *options, &block
-    end
-  end
-  alias_method_chain :render, :erector_widget
-end

data/lib/erector/rails/extensions/action_controller/2.2.0/action_controller.rb

@@ -1,26 +0,0 @@
-ActionController::Base.class_eval do
-  def render_widget(widget_class, assigns=nil)
-    @__widget_class = widget_class
-    if assigns
-      @__widget_assigns = assigns
-    else
-      @__widget_assigns = {}
-      variables = instance_variable_names
-      variables -= protected_instance_variables
-      variables.each do |name|
-        @__widget_assigns[name.sub('@', "")] = instance_variable_get(name)
-      end
-    end
-    response.template.send(:_evaluate_assigns_and_ivars)
-    render :inline => "<% @__widget_class.new(self, @__widget_assigns, output_buffer).render %>"
-  end
-
-  def render_with_erector_widget(*options, &block)
-    if options.first.is_a?(Hash) && widget = options.first.delete(:widget)
-      render_widget widget, @assigns, &block
-    else
-      render_without_erector_widget *options, &block
-    end
-  end
-  alias_method_chain :render, :erector_widget
-end

data/lib/erector/rails/extensions/widget/1.2.5/widget.rb

@@ -1,18 +0,0 @@
-module Erector
-  Widget.class_eval do
-    attr_reader :_erbout
-
-    after_initialize do
-      @_erbout = output
-    end
-
-    def define_javascript_functions(*args)
-      begin
-        text raw(helpers.define_javascript_functions(*args))
-      rescue => e
-        puts e.backtrace.join("\n\t")
-        raise e
-      end
-    end
-  end
-end

data/lib/erector/rails/extensions/widget/2.2.0/widget.rb

@@ -1,23 +0,0 @@
-module Erector
-  Widget.class_eval do
-    def output
-      if helpers.respond_to?(:output_buffer)
-        helpers.output_buffer
-      else
-        @output
-      end
-    end
-
-    def capture_with_helpers(&block)
-      if helpers
-        helpers.capture(&block)
-      else
-        capture_without_helpers(&block)
-      end
-    end
-    alias_method_chain :capture, :helpers
-
-    # This is here to force #helpers.capture to return the output
-    def __in_erb_template; end
-  end
-end

data/lib/erector/rails/supported_rails_versions.rb

@@ -1,13 +0,0 @@
-module Erector
-  module Rails
-    SUPPORTED_RAILS_VERSIONS = {
-#      "1.2.5" => {'version' => '1.2.5', 'git_tag' => 'v1.2.5'},
-      "1.99.0" => {'version' => '1.99.0', 'git_tag' => 'v2.0.0_RC1'},
-      "2.0.2" => {'version' => '2.0.2', 'git_tag' => 'v2.0.2'},
-      "2.1.0" => {'version' => '2.1.0', 'git_tag' => 'v2.1.0'},
-      "2.2.0" => {'version' => '2.2.0', 'git_tag' => 'v2.2.0'},
-      "2.2.2" => {'version' => '2.2.2', 'git_tag' => 'v2.2.2'},
-#      "edge" => {'version' => 'edge', 'git_tag' => 'master'}, #TODO: Readd edge support
-    }
-  end
-end

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

@@ -1,32 +0,0 @@
-module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    class Erector
-      def self.line_offset
-        2
-      end
-
-      attr_reader :view
-      def initialize(view)
-        @view = view
-      end
-
-      def compilable?
-        true
-      end
-
-      ActionView::Base.register_template_handler :rb, ActionView::TemplateHandlers::Erector
-
-      def render(template, local_assigns)
-        relative_path_parts = view.first_render.split('/')
-        require_dependency view.template_file_path
-
-        dot_rb = /\.rb$/
-        widget_class = relative_path_parts.inject(Views) do |mod, node|
-          mod.const_get(node.gsub(dot_rb, '').gsub(".html", "").camelize)
-        end
-        render_method = view.is_partial_template? ? 'render_partial' : 'render'
-        widget_class.new(view, view.assigns).to_s(render_method)
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    class Erector < TemplateHandler
-      def self.line_offset
-        2
-      end
-
-      attr_reader :view
-      def initialize(view)
-        @view = view
-      end
-
-      def compilable?
-        true
-      end
-      undef :compile
-
-      ActionView::Base.register_template_handler :rb, ActionView::TemplateHandlers::Erector
-
-      def render(template, local_assigns)
-        relative_path_parts = view.first_render.split('/')
-        file_name = relative_path_parts.last
-        require_dependency(view.template_file_path)
-
-        dot_rb = /\.rb$/
-        widget_class = relative_path_parts.inject(Views) do |mod, node|
-          mod.const_get(node.gsub(dot_rb, '').gsub(".html", "").camelize)
-        end
-        render_method = view.is_partial_template? ? 'render_partial' : 'render'
-        widget = widget_class.new(view, view.assigns)
-        widget.to_s(render_method)
-      end
-    end
-  end
-end
-

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

@@ -1,31 +0,0 @@
-module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    class Erector < TemplateHandler
-      include Compilable
-      def self.line_offset
-        2
-      end
-
-      ActionView::Template.instance_eval do
-        register_template_handler :rb, ActionView::TemplateHandlers::Erector
-      end
-
-      def compile(template)
-        relative_path_parts = template.path.split('/')
-
-        is_partial = relative_path_parts.last =~ /^_/
-        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$/, '').camelize
-          class_parts
-        end
-        widget_class_name = widget_class_parts.join("::")
-        render_method = is_partial ? 'render_partial' : 'render'
-
-        erb_template = "<% #{widget_class_name}.new(self, controller.assigns, _erbout).#{render_method} %>"
-        ::ERB.new(erb_template, nil, ActionView::Base.erb_trim_mode).src
-      end
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    class Erector < TemplateHandler
-      include Compilable
-      def self.line_offset
-        2
-      end
-
-      ActionView::Template.instance_eval do
-        register_template_handler :rb, ActionView::TemplateHandlers::Erector
-      end
-
-      def compile(template)
-        relative_path_parts = template.path.split('/')
-
-        is_partial = relative_path_parts.last =~ /^_/
-        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$/, '').camelize
-          class_parts
-        end
-        widget_class_name = widget_class_parts.join("::")
-        render_method = is_partial ? 'render_partial' : 'render'
-
-        erb_template = <<-ERB
-        <%
-          assigns = instance_variables.inject({}) do |hash, name|
-            hash[name.sub('@', "")] = instance_variable_get(name)
-            hash
-          end
-
-          widget = #{widget_class_name}.new(self, assigns, output_buffer)
-          widget.#{render_method}
-        %>
-        ERB
-        ::ERB.new(
-          erb_template,
-          nil,
-          ::ActionView::TemplateHandlers::ERB.erb_trim_mode,
-          "@output_buffer"
-        ).src
-      end
-    end
-  end
-end