pivotal-erector 0.5.1 → 0.6.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-erector
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - Alex Chaffee
@@ -12,8 +12,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
-default_executable: erect
+date: 2009-05-06 00:00:00 -07:00
+default_executable: erector
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
@@ -26,9 +26,9 @@ dependencies:
         version: 1.2.3
     version: 
 description: Html Builder library.
-email: erector-devel@rubyforge.org
+email: erector@googlegroups.com
 executables: 
-- erect
+- erector
 extensions: []
 
 extra_rdoc_files: 
@@ -36,7 +36,7 @@ extra_rdoc_files:
 files: 
 - README.txt
 - VERSION.yml
-- bin/erect
+- bin/erector
 - lib/erector.rb
 - lib/erector/erect.rb
 - lib/erector/erected.rb
@@ -44,17 +44,10 @@ files:
 - lib/erector/indenting.rb
 - lib/erector/rails.rb
 - lib/erector/rails/extensions/action_controller.rb
-- lib/erector/rails/extensions/action_controller/1.2.5/action_controller.rb
-- lib/erector/rails/extensions/action_controller/2.2.0/action_controller.rb
 - lib/erector/rails/extensions/action_view.rb
-- lib/erector/rails/extensions/widget.rb
-- lib/erector/rails/extensions/widget/1.2.5/widget.rb
-- lib/erector/rails/extensions/widget/2.2.0/widget.rb
-- lib/erector/rails/supported_rails_versions.rb
-- lib/erector/rails/template_handlers/1.2.5/action_view_template_handler.rb
-- lib/erector/rails/template_handlers/2.0.0/action_view_template_handler.rb
-- lib/erector/rails/template_handlers/2.1.0/action_view_template_handler.rb
-- lib/erector/rails/template_handlers/2.2.0/action_view_template_handler.rb
+- lib/erector/rails/extensions/rails_widget.rb
+- lib/erector/rails/extensions/rails_widget/helpers.rb
+- lib/erector/rails/rails_version.rb
 - lib/erector/rails/template_handlers/action_view_template_handler.rb
 - lib/erector/raw_string.rb
 - lib/erector/rhtml.treetop
@@ -65,17 +58,15 @@ files:
 - lib/erector/widgets.rb
 - lib/erector/widgets/table.rb
 - spec/core_spec_suite.rb
-- spec/erect/erect_spec.rb
-- spec/erect/erected_spec.rb
-- spec/erect/rhtml_parser_spec.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
+has_rdoc: false
 homepage: http://erector.rubyforge.org/
 post_install_message: 
 rdoc_options: 
@@ -99,20 +90,17 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Html Builder library.
 test_files: 
+- spec/core_spec_suite.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.opts
 - 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

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/supported_rails_versions.rb

@@ -1,14 +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'},
-      "2.3.2" => {'version' => '2.3.2', 'git_tag' => 'v2.3.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

data/spec/erect/erect_spec.rb

@@ -1,145 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-
-module Erector
-  describe Erect do
-    it "parses an empty command line" do
-      erect = Erect.new([])
-      erect.files.should == []
-    end
-    
-    it "parses a command line with one filename on it" do
-      erect = Erect.new(["foo.html"])
-      erect.files.should == ["foo.html"]
-    end
-    
-    it "parses a command line with several filenames on it" do
-      erect = Erect.new(["foo.html", "bar/baz.html"])
-      erect.files.should == ["foo.html", "bar/baz.html"]
-    end
-    
-    it "is verbose by default, but quiet when told" do
-      Erect.new([]).verbose.should be_true
-      Erect.new(["-q"]).verbose.should be_false
-    end
-
-    it "parses a command line with several filenames and an option on it" do
-      erect = Erect.new(["-q", "foo.html", "bar/baz.html"])
-      erect.files.should == ["foo.html", "bar/baz.html"]
-    end
- 
-    def capture
-      output = StringIO.new
-      $stdout = output
-      yield
-      output.string
-    ensure
-      $stdout = STDOUT
-    end
-    
-    it "exits immediately from help" do
-      output = capture do
-        lambda {
-          erect = Erect.new(["-h"])
-        }.should raise_error(SystemExit)
-      end
-      output.should =~ /^Usage/
-    end
-    
-    it "exits immediately from --version" do
-      output = capture do
-        lambda {
-          erect = Erect.new(["--version"])
-        }.should raise_error(SystemExit)
-      end
-      output.should == Erector::VERSION + "\n"
-    end
-    
-    it "changes to html output" do
-      erect = Erect.new(["--to-html"])
-      erect.mode.should == :to_html
-    end
-
-  end
-  
-  describe "Erect functionally" do
-    
-    attr_reader :dir, :fred_html, :wilma_rhtml, :barney_html_erb, :fred_rb
-    
-    def create(file, body="hi")
-      File.open(file, "w") do |f|
-        f.puts(body)
-      end
-    end
-    
-    before :all do
-      @dir = Dir.tmpdir + "/#{Time.now.to_i}" + "/explode"
-      @fred_html = "#{dir}/fred.html"
-      @wilma_rhtml = "#{dir}/wilma.rhtml"
-      @barney_html_erb = "#{dir}/barney.html.erb"
-      @fred_rb = "#{dir}/fred.rb"
-
-      FileUtils.mkdir_p(dir)
-      create(fred_html)
-      create(wilma_rhtml)
-      create(barney_html_erb)
-      create(fred_rb, "class Fred < Erector::Widget\ndef render\ndiv 'dino'\nend\nend")
-    end
-    
-    it "explodes dirs into .html etc. files when in to-rb mode" do
-      erect = Erect.new(["--to-erector", dir])
-      erect.files.sort.should == [barney_html_erb, fred_html, wilma_rhtml]
-    end
-    
-    it "explodes dirs into .rb files when in to-html mode" do    
-      erect = Erect.new(["--to-html", dir])
-      erect.files.should == [fred_rb]
-    end
-    
-    it "outputs .rb files in the same directory as the input .html files" do
-      erect = Erect.new(["--to-erector", "-q", fred_html])
-      erect.run
-      File.exist?(fred_rb).should be_true
-      File.read(fred_rb).should include("text 'hi'")
-    end
-    
-    it "outputs .html files in the same directory as the input .rb files" do
-      betty_rb = "#{dir}/betty.rb"
-      betty_html = "#{dir}/betty.html"
-      create(betty_rb, "class Betty < Erector::Widget\ndef render\ndiv 'bam bam'\nend\nend")
-
-      erect = Erect.new(["--to-html", "-q", betty_rb])
-      erect.run
-      File.exist?(betty_html).should be_true
-      File.read(betty_html).should == "<div>bam bam</div>\n"
-    end
-    
-    it "outputs .html files in the given directory" do
-      create(fred_rb, "class Fred < Erector::Widget\ndef render\ndiv 'dino'\nend\nend")
-      
-      
-      out_dir = "#{dir}/out"
-      out_file = "#{out_dir}/fred.html"
-      Erect.new([]).output_dir.should be_nil
-      erect = Erect.new(["--to-html", "-o", "#{out_dir}", "-q", fred_rb])
-      erect.output_dir.should == out_dir
-      erect.run
-      File.exist?(out_file).should be_true
-      File.read(out_file).should == "<div>dino</div>\n"
-    end
-    
-    it "supports the --add-to-svn option"
-    it "supports the --delete-original option"
-
-    it "skips rendering classes that aren't widgets" do
-      mr_slate_rb = "#{dir}/mr_slate.rb"
-      mr_slate_html = "#{dir}/mr_slate.html"
-      create(mr_slate_rb, "class MrSlate\nend")
-      erect = Erect.new(["-q", "--to-html", mr_slate_rb])
-      erect.run
-      File.exist?(mr_slate_html).should be_false
-    end
-    
-    it "properly indents lines beginning with for, unless, etc."
-    it "escapes single quotes inside text strings"
-  end
-end

data/spec/erect/erected_spec.rb

@@ -1,80 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-
-module Erector
-  describe Erected do
-
-    it "picks the right file name" do
-      Erected.new("foo.html.erb").filename.should == "foo.rb"
-      Erected.new("foo.html").filename.should == "foo.rb"
-      Erected.new("foo.bar.html").filename.should == "foo.rb"
-      Erected.new("foo_bar.html.erb").filename.should == "foo_bar.rb"
-      Erected.new("stuff/foo_bar.html.erb").filename.should == "stuff/foo_bar.rb"
-    end
-
-    it "picks a nice class name" do
-      Erected.new("foo.html.erb").classname.should == "Foo"
-      Erected.new("foo.html").classname.should == "Foo"
-      Erected.new("foo.bar.html").classname.should == "Foo"
-      Erected.new("foo_bar.html.erb").classname.should == "FooBar"
-      Erected.new("stuff/foo_bar.html.erb").classname.should == "FooBar"
-    end
-
-    it "picks an even nicer class name if it's in a views dir" do
-      Erected.new("app/views/stuff/foo_bar.html.erb").classname.should == "Views::Stuff::FooBar"
-      Erected.new("views/stuff/foo_bar.html.erb").classname.should == "Views::Stuff::FooBar"
-    end
-
-    def convert(dir, input, output)
-      dir = Dir.tmpdir + "/#{Time.now.to_i}" + "/#{dir}"
-
-      FileUtils.mkdir_p(dir)
-      html = "#{dir}/dummy.html"
-      rb = "#{dir}/dummy.rb"
-
-      File.open(html, "w") do |f|
-        f.puts(input)
-      end
-
-      @e = Erected.new(html)
-      @e.convert
-
-      File.read(rb).should == output
-    end
-
-    it "converts a normal file" do
-      convert(".",
-        "<div>hello</div>",
-        "class Dummy < Erector::Widget\n" +
-          "  def render\n" +
-          "    div do\n" +
-          "      text 'hello'\n" +
-          "    end\n" +
-          "  end\n" +
-          "end\n"
-      )
-    end
-
-    it "converts a views file" do
-      convert("app/views/foos",
-        "<div>hello</div>",
-        "class Views::Foos::Dummy < Erector::Widget\n" +
-          "  def render\n" +
-          "    div do\n" +
-          "      text 'hello'\n" +
-          "    end\n" +
-          "  end\n" +
-          "end\n"
-      )
-    end
-
-# todo: figure out if there is any such thing as unparsable HTML anymore
-#    it "raises an exception if given unparsable HTML" do
-#      begin
-#        convert(".", "<", "")
-#      rescue => e
-#        e.to_s.should include("Could not parse")
-#      end
-#    end
-    
-  end
-end