erector 0.2.61 → 0.2.83

data/bin/erect

@@ -2,30 +2,6 @@
 dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{dir}/../lib")
 require "erector"
-require "erector/erected"  # pull this out so we don't recreate the grammar every time
-require "rake"
+require "erector/erect"
 
-# todo:
-# --add_to_svn
-# --delete_original
-
-files = FileList.new
-ARGV.each do |file|
-  if File.directory?(file)
-    files.add(FileList["#{file}/**/*.rhtml", "#{file}/**/*.html", "#{file}/**/*.html.erb"])
-  else
-    files.add(file)
-  end
-end
-
-files.each do |file|
-  print "Erecting #{file}... "
-  begin
-    e = Erector::Erected.new(file)
-    e.convert
-    puts " --> #{e.filename}"
-  rescue => e
-    puts e
-    puts
-  end
-end
+Erector::Erect.new(ARGV).run

data/lib/erector.rb

@@ -11,4 +11,5 @@ require "erector/widgets"
 ##
 # Erector view framework
 module Erector
+  VERSION = "0.2.83"
 end

data/lib/erector/erect.rb

@@ -0,0 +1,146 @@
+require "optparse"
+require "rake"
+require "erector/erected"  # pull this out so we don't recreate the grammar every time
+
+module Erector
+  class Erect
+    attr_reader :files, :verbose, :mode, :output_dir
+    def initialize(args)
+      @verbose = true
+      @mode = :to_erector
+      @output_dir = nil
+      
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: erect [options] [file|dir]*"
+
+        opts.separator "Converts from html/rhtml files to erector widgets, or from erector widgets to html files"
+        opts.separator ""
+        opts.separator "Options:"
+
+        opts.on("-q", "--quiet",
+                "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
+
+        opts.on("--to-html", "Convert from erector to html") do
+          @mode = :to_html
+        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
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          @mode = :help
+          puts opts
+          exit
+        end
+
+        opts.on_tail("-v", "--version", "Show version") do
+          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
+      files.each do |file|
+        if File.directory?(file)
+          exploded_files.add(explode(file))
+        else
+          exploded_files.add(file)
+        end
+      end
+      @files = exploded_files
+    end
+    
+    def explode(dir)
+      case mode
+      when :to_erector
+        FileList["#{dir}/**/*.rhtml", "#{dir}/**/*.html", "#{dir}/**/*.html.erb"]
+      when :to_html
+        FileList["#{dir}/**/*.rb"]
+      end
+    end
+    
+    def run
+      self.send(mode)
+    end
+    
+    def to_erector
+      files.each do |file|
+        say "Erecting #{file}... "
+        begin
+          e = Erector::Erected.new(file)
+          e.convert
+          say " --> #{e.filename}\n"
+        rescue => e
+          puts e
+          puts
+        end
+      end
+    end
+
+    def to_html
+      files.each do |file|
+        say "Erecting #{file}... "
+        #todo: move this into Erected with better tests for the naming methods
+        begin
+          #todo: fail if file isn't a .rb file
+          require file
+          #todo: understand modulized widgets (e.g. class Foo::Bar::Baz < Erector::Widget in baz.rb)
+          filename = file.split('/').last.gsub(/\.rb$/, '')
+          widget_name = camelize(filename)
+          widget_class = constantize(widget_name)
+          
+          if widget_class < Erector::Widget
+            widget = widget_class.new
+            dir = output_dir || File.dirname(file)
+            FileUtils.mkdir_p(dir)
+            output_file = "#{dir}/#{filename}.html"
+            File.open(output_file, "w") do |f|
+              f.puts widget.to_s
+            end
+            say " --> #{output_file}\n"
+          else
+            say " -- not a widget, skipping\n"
+          end
+        rescue => e
+          puts e
+          puts
+        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
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      else
+        lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
+      end
+    end
+    def constantize(camel_cased_word)
+      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
+        raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
+      end
+      Object.module_eval("::#{$1}", __FILE__, __LINE__)
+    end
+    
+
+  end
+end

data/lib/erector/extensions/action_view_template_handler.rb

@@ -6,8 +6,20 @@ module ActionView
       end
 
       def render(template, local_assigns)
-        paths = @view.first_render.split('/')
+        banana = @view.first_render
+        paths = banana.split('/')
         dot_rb = /\.rb$/
+        file_path = "#{RAILS_ROOT}/app/views/#{banana}.rb"
+        if File.exists?(file_path)
+          require_dependency file_path
+        else
+          partial_file_path = file_path.gsub(/\/([^\/]*)$/, '/_\1')
+          if File.exists?(partial_file_path)
+            require_dependency partial_file_path
+          else
+            return
+          end
+        end
         widget_class = paths.inject(Views) do |current_module, node|
           current_module.const_get(node.gsub(dot_rb, '').camelize)
         end

data/lib/erector/rhtml.treetop

@@ -13,7 +13,7 @@ grammar Rhtml
   end
 
   rule node
-    hprintlet / printlet / scriptlet / doctype / self_closing_tag / closetag / opentag / text
+    hprintlet / printlet / scriptlet / doctype / self_closing_tag / imgtag / closetag / opentag / text
   end
 
   rule scriptlet
@@ -85,6 +85,14 @@ grammar Rhtml
     }
   end
 
+  rule imgtag
+   '<' tag_name:'img' attrs:attributes? space '>' <Erector::Indenting> {
+      def convert
+        line "#{tag_name.text_value}#{attrs.blank? ? "" : attrs.convert}"
+      end
+    }
+  end
+
   rule closetag
    '</' tag_name:tagname '>' <Erector::Indenting> {
       def convert

data/spec/erect/erect_spec.rb

@@ -0,0 +1,145 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../spec_helper"
+require "#{dir}/../../lib/erector/erect"
+require 'tempfile'
+
+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(["--to-html", mr_slate_rb])
+      erect.run
+      File.exist?(mr_slate_html).should be_false
+    end
+  end
+end

data/spec/{convert → erect}/rhtml_parser_spec.rb

@@ -84,6 +84,10 @@ describe RhtmlParser do
   it "converts open, text, close" do
     parse("<div>hello</div>").convert.should == "div do\n  text 'hello'\nend\n"
   end
+  
+  it "autocloses an img tag" do
+    parse("<img src='foo'>").convert.should == "img :src => 'foo'\n"
+  end
 
   it "converts a scriptlet" do
     parse("<% foo %>").convert.should == "foo\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.2.61
+  version: 0.2.83
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-18 00:00:00 -07:00
+date: 2008-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +49,10 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- spec/convert
-- spec/convert/erected_spec.rb
-- spec/convert/rhtml_parser_spec.rb
+- spec/erect
+- 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
@@ -62,6 +63,7 @@ files:
 - spec/spec_suite.rb
 - spec/view_caching.rb
 - lib/erector
+- lib/erector/erect.rb
 - lib/erector/erected.rb
 - lib/erector/extensions
 - lib/erector/extensions/action_controller.rb