erector 0.9.0 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b29fc352efeac52d0d2dfbf8b1be475a80b1e62b
+  data.tar.gz: 16d464024312c7186a63ae9d965891f3493e89bb
+SHA512:
+  metadata.gz: c1981c778c0f399282a0cab3ad6fdd3d5dd1de0aeb4f9890db0125049d4ffebaba1dd5608b4e4c334d73dbdde382c7651a2eae41bec730444fb1798cf2a6dc64
+  data.tar.gz: 5919bae5734c2284d59e96eb194ac10115cc86323fd8249fd4e64ba4d5809ec01db83635d4c890b83b8775d76200fce8262136aeef721681e46672a6b05f9e65

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem "treetop", ">= 1.2.3"
 
 group :development do
+  gem "rake", "~>10.0.1"
   gem "activesupport", "~>3"
   gem "rspec", "~>2"
   gem "rubyforge"
@@ -13,7 +14,7 @@ group :development do
   gem "sass"
   gem "erubis"
   gem "rdoc", "~> 3.4"
-  gem "wrong", ">=0.5.4"
+  gem "wrong", ">=0.6.3"
 end
 
 group :rails do

data/README.txt

@@ -2,7 +2,7 @@
 
 * http://erector.rubyforge.org
 * mailto:erector@googlegroups.com
-* http://github.com/pivotal/erector
+* http://github.com/erector/erector
 * http://www.pivotaltracker.com/projects/482
 
 == DESCRIPTION

data/Rakefile

@@ -102,11 +102,13 @@ task :publish => [:web, :docs] do
   rdoc_dir = "rdoc"
   rsync_args = '--archive --verbose --delete'
 
-  puts "== Publishing web site to RubyForge"
-  sh %{rsync #{rsync_args} --exclude=#{rdoc_dir} #{local_dir}/ #{host}:#{remote_dir}}
-
-  puts "== Publishing rdoc to RubyForge"
-  sh %{rsync #{rsync_args} #{rdoc_dir}/ #{host}:#{remote_dir}/rdoc}
+  # TODO: publish site to gh-pages
+  # puts "== Publishing web site to RubyForge"
+  # sh %{rsync #{rsync_args} --exclude=#{rdoc_dir} #{local_dir}/ #{host}:#{remote_dir}}
+  #
+  # TODO: publish docs to gh-pages
+  # puts "== Publishing rdoc to RubyForge"
+  # sh %{rsync #{rsync_args} #{rdoc_dir}/ #{host}:#{remote_dir}/rdoc}
 end
 
 
@@ -158,27 +160,37 @@ namespace :spec do
     spec.pattern = 'spec/erect/*_spec.rb'
   end
 
-
-  desc "Run specs for erector's Rails integration."
-  RSpec::Core::RakeTask.new(:rails) do |spec|
+  desc "Run specs for erector's Rails 3 integration."
+  RSpec::Core::RakeTask.new(:integration_rails3) do |spec|
     spec.pattern = 'spec/rails_root/spec/*_spec.rb'
   end
 
-  desc "Run specs for erector's Rails integration under Rails 2."
+  desc "Run specs for erector's Rails 2 integration."
+  RSpec::Core::RakeTask.new(:integration_rails2) do |spec|
+    spec.pattern = 'spec/rails2/rails_app/spec/*_spec.rb'
+  end
+
+  def prepare_gemfile gemfile
+    Bundler.with_clean_env { sh "bundle check --gemfile #{gemfile} || bundle install --gemfile #{gemfile}" }
+  end
+
+  desc "Run specs for erector's Rails integration under Rails 2.  - prepare with 'bundle install --gemfile Gemfile-rails2"
   task :rails2 do
-    rails_app = "#{here}/spec/rails2/rails_app"
-    gemfile = "#{rails_app}/Gemfile"
-    Dir.chdir(rails_app) do
-      # Bundler.with_clean_env do
-        sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake rails2"
-      # end
-    end
+    gemfile = "#{here}/Gemfile-rails2"
+    sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:integration_rails2"
   end
 
   desc "Run all specs under Rails 3.1 - prepare with 'bundle install --gemfile Gemfile-rails31'"
   task :rails31 do
     gemfile = "#{here}/Gemfile-rails31"
-    sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:erect spec:rails"
+    sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:erect spec:integration_rails3"
+  end
+
+  desc "Run all specs under latest Rails - prepare with 'bundle install --gemfile Gemfile-rails'"
+  task :rails do
+    gemfile = "#{here}/Gemfile-rails"
+    prepare_gemfile gemfile
+    sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:core spec:erect spec:integration_rails3"
   end
 
   desc "Run specs for the Erector web site."
@@ -189,4 +201,4 @@ namespace :spec do
 end
 
 desc "Run most specs"
-task :spec => ['spec:core', 'spec:erect', 'spec:rails', 'spec:rails2', 'spec:web']
+task :spec => ['spec:rails', 'spec:rails2', 'spec:web']

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 9
+:minor: 10
 :patch: 0

data/lib/erector/abstract_widget.rb

@@ -33,6 +33,16 @@ module Erector
       @@prettyprint_default = enabled
     end
 
+    @@hyphenize_underscores = false
+
+    def self.hyphenize_underscores
+      @@hyphenize_underscores
+    end
+
+    def self.hyphenize_underscores=(enabled)
+      @@hyphenize_underscores = enabled
+    end
+
     def self.inline(*args, &block)
       Class.new(self) do
         include Erector::Inline

data/lib/erector/html_widget.rb

@@ -77,25 +77,25 @@ module Erector
     tag 'param', :self_closing
 
     tag 'a', :inline
-    tag 'abbr'
-    tag 'acronym'
+    tag 'abbr', :inline
+    tag 'acronym', :inline
     tag 'address'
     tag 'article'
     tag 'aside'
     tag 'audio'
 
     tag 'b', :inline
-    tag 'bdo'
-    tag 'big'
+    tag 'bdo', :inline
+    tag 'big', :inline
     tag 'blockquote'
     tag 'body'
     tag 'button', :inline
 
     tag 'canvas'
-    tag 'caption'
+    tag 'caption', :inline
     tag 'center'
-    tag 'cite'
-    tag 'code'
+    tag 'cite', :inline
+    tag 'code', :inline
     tag 'colgroup'
     tag 'command'
 
@@ -103,13 +103,13 @@ module Erector
     tag 'dd'
     tag 'del'
     tag 'details'
-    tag 'dfn'
+    tag 'dfn', :inline
     tag 'dialog'
     tag 'div'
     tag 'dl'
-    tag 'dt'
+    tag 'dt', :inline
 
-    tag 'em'
+    tag 'em', :inline
 
     tag 'fieldset'
     tag 'figure'
@@ -132,9 +132,9 @@ module Erector
     tag 'iframe'
     tag 'ins'
     tag 'keygen'
-    tag 'kbd'
-    tag 'label'
-    tag 'legend'
+    tag 'kbd', :inline
+    tag 'label', :inline
+    tag 'legend', :inline
     tag 'li'
 
     tag 'map'
@@ -154,13 +154,13 @@ module Erector
     tag 'pre'
     tag 'progress'
 
-    tag 'q'
+    tag 'q', :inline
     tag 'ruby'
     tag 'rt'
     tag 'rp'
     tag 's'
 
-    tag 'samp'
+    tag 'samp', :inline
     tag 'script'
     tag 'section'
     tag 'select', :inline
@@ -169,10 +169,10 @@ module Erector
     tag 'span', :inline
     tag 'strike'
 
-    tag 'strong'
+    tag 'strong', :inline
     tag 'style'
-    tag 'sub'
-    tag 'sup'
+    tag 'sub', :inline
+    tag 'sup', :inline
 
     tag 'table'
     tag 'tbody'
@@ -185,12 +185,12 @@ module Erector
     tag 'time'
     tag 'title'
     tag 'tr'
-    tag 'tt'
+    tag 'tt', :inline
 
     tag 'u'
     tag 'ul'
 
-    tag 'var'
+    tag 'var', :inline
     tag 'video'
 
 

data/lib/erector/needs.rb

@@ -65,6 +65,14 @@ module Erector
       def needs?(name)
         needed_variables.empty? || needed_variables.include?(name)
       end
+
+      def ignore_extra_assigns
+        @ignore_extra_assigns ||= false
+      end
+
+      def ignore_extra_assigns=(new_value)
+        @ignore_extra_assigns = (new_value ? :true : :false)
+      end
     end
 
     def initialize(assigns = {})
@@ -75,7 +83,7 @@ module Erector
       # set variables with default values
       self.class.needed_defaults.each do |name, value|
         unless assigned.include?(name)
-          value = [NilClass, FalseClass, TrueClass, Fixnum, Float].include?(value.class) ? value : value.dup
+          value = [NilClass, FalseClass, TrueClass, Fixnum, Float, Symbol].include?(value.class) ? value : value.dup
           instance_variable_set("@#{name}", value)
           assigned << name
         end
@@ -87,7 +95,7 @@ module Erector
       end
 
       excess = assigned - self.class.needed_variables
-      unless self.class.needed_variables.empty? || excess.empty?
+      unless self.class.needed_variables.empty? || excess.empty? || self.class.ignore_extra_assigns
         raise ArgumentError, "Excess parameter#{excess.size == 1 ? '' : 's'} for #{self.class.name}: #{excess.join(', ')}"
       end
     end

data/lib/erector/promise.rb

@@ -84,6 +84,10 @@ module Erector
 
     def method_missing(method_name, *args, &block)
       method_name = method_name.to_s
+      if Erector::Widget.hyphenize_underscores
+        method_name = method_name.gsub(/_/, "-")
+      end
+
       if method_name =~ /\!$/
         id_str = method_name[0...-1]
         raise ArgumentError, "setting id #{id_str} but id #{@attributes["id"]} already present" if @attributes["id"]

data/lib/erector/rails3.rb

@@ -120,6 +120,16 @@ module Erector
       rawtext(captured)
     end
 
+    # Rails content_for is output if and only if no block given
+    def content_for(*args,&block)
+      if block
+        helpers.content_for(*args,&block)
+      else
+        rawtext(helpers.content_for(*args))
+        ''
+      end
+    end
+
     # Delegate to non-markup producing helpers via method_missing,
     # returning their result directly.
     def method_missing(name, *args, &block)

data/lib/erector/sass.rb

@@ -8,6 +8,10 @@ module Erector
   # Current support is barebones. Please offer suggestions (or better
   # yet, patches) for whether and how to support, e.g., caching,
   # loading from files, precompilation, etc.
+  #
+  # It seems to me that SASS/SCSS should be part of the Page widget, which
+  # would allow all the little style snippets to be compiled together
+  # and appear in the document HEAD.
   module Sass
     def sass(arg, options = {})
       require "sass"
@@ -20,7 +24,7 @@ module Erector
       end
       style raw(::Sass.compile(sass_text, options))
     end
-    
+
     def scss(arg, options = {})
       sass arg, {:syntax => :scss}.merge(options)
     end

data/lib/erector/widgets/table.rb

@@ -1,15 +1,11 @@
-begin
- require "active_support/inflector"
-
- module Erector
+module Erector
   module Widgets #:nodoc:
-
-
-    # The Table widget provides the ability to render a table from a 
+    # The Table widget provides the ability to render a table from a
     # list of objects (one for each row).
     #
     # Because the default for the column titles utilizes the ActiveSupport
-    # Inflector#titleize method, this widget requires active_support to be loaded.
+    # Inflector#titleize method, this widget requires active_support to be loaded
+    # (or some other gem that adds `titleize` to String).
     #
     #   class UsersTable < Erector::Widgets::Table
     #     column :first_name
@@ -26,7 +22,7 @@ begin
         # that the user sees) and a block which renders the cell given
         # a row object.  If the block is not specified, the cell contains
         # the result of calling a method whose name is id.
-        # 
+        #
         # The name can be a string or a proc.
         def column(id, name=id.to_s.titleize, &cell_proc)
           cell_proc ||= proc {|object| text object.__send__(id)}
@@ -98,7 +94,4 @@ begin
       end
     end
   end
- end
-rescue LoadError => e
-  $stderr.puts "Erector::Widgets::Table requires active_support"
 end

data/spec/erect/erect_rails_spec.rb

@@ -42,9 +42,9 @@ unless Dir.respond_to?(:mktmpdir)
   end
 end
 
-# Note: this is *not* inside the rails_root since we're not testing 
+# Note: this is *not* inside the rails_root since we're not testing
 # Erector inside a rails app. We're testing that we can use the command-line
-# converter tool on a newly generated scaffold app (like we brag about in the 
+# converter tool on a newly generated scaffold app (like we brag about in the
 # user guide).
 #
 describe "the 'erector' command" do
@@ -87,7 +87,7 @@ describe "the 'erector' command" do
           run "BUNDLE_GEMFILE=./Gemfile bundle exec #{erector_dir}/bin/erector ./app/views/posts"
 
           FileUtils.rm_f("app/views/posts/*.erb")
-          run "BUNDLE_GEMFILE=./Gemfile bundle exec rake --trace db:migrate"
+          run "BUNDLE_GEMFILE=./Gemfile bundle exec rake db:migrate"
 
           # run "script/server" # todo: launch in background; use mechanize or something to crawl it; then kill it
           # perhaps use open4?

data/spec/erector/convenience_spec.rb

@@ -212,7 +212,7 @@ describe Erector::Convenience do
     it "accepts extra attributes" do
       erector do
         url "http://example.com", :onclick=>"alert('foo')"
-      end.should == "<a href=\"http://example.com\" onclick=\"alert('foo')\">http://example.com</a>"
+      end.should == "<a href=\"http://example.com\" onclick=\"alert(&#39;foo&#39;)\">http://example.com</a>"
     end
 
   end

data/spec/erector/hello_from_readme_spec.rb

@@ -3,9 +3,9 @@ require File.expand_path("#{here}/../spec_helper")
 
 describe "Hello World example from README" do
   it "works" do
-    Dir.chdir(here) do
+    Dir.chdir('/tmp') do
       clear_bundler_env
-      html = sys "ruby hello_from_readme.rb"
+      html = `ruby #{File.join(here,'hello_from_readme.rb')} 2>&1`
       html.should == "<html><head><title>Welcome page</title></head><body><p>Hello, world</p></body></html>\n"
     end
   end

data/spec/erector/html_spec.rb

@@ -77,6 +77,40 @@ describe Erector::HTML do
       end
     end
 
+    context "with underscored attributes" do
+      context "without hyphenize_underscores" do
+        it "keeps class names as underscored" do
+          erector do
+            empty_element('foo').max_thingie
+          end.should == '<foo class="max_thingie" />'
+        end
+
+        it "also keeps classes specified as attributes as underscored" do
+          erector do
+            empty_element('foo', :class => "max_thingie")
+          end.should == '<foo class="max_thingie" />'
+        end
+      end
+
+      context "with hyphenize_underscores" do
+        before do
+          Erector::Widget.hyphenize_underscores = true
+        end
+
+        it "turns underscores in class names into hyphens" do
+          erector do
+            empty_element('foo').max_thingie
+          end.should == '<foo class="max-thingie" />'
+        end
+
+        it "lets you pick underscores or hyphens when specifying a class as an attribute" do
+          erector do
+            empty_element('foo', :class => "max_thingie")
+          end.should == '<foo class="max_thingie" />'
+        end
+      end
+    end
+
     context "with inner tags" do
       it "returns nested tags" do
         erector do
@@ -394,7 +428,7 @@ describe Erector::HTML do
 
   describe 'escaping' do
     plain = 'if (x < y && x > z) alert("don\'t stop");'
-    escaped = "if (x &lt; y &amp;&amp; x &gt; z) alert(&quot;don't stop&quot;);"
+    escaped = "if (x &lt; y &amp;&amp; x &gt; z) alert(&quot;don&#39;t stop&quot;);"
 
     describe "#text" do
       it "does HTML escape its param" do