erector 0.8.2 → 0.8.3

data/spec/rails2/rails_app/vendor/plugins/rails_xss/test/rails_xss_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class RailsXssTest < ActiveSupport::TestCase
+  test "ERB::Util.h should mark its return value as safe and escape it" do
+    escaped = ERB::Util.h("<p>")
+    assert_equal "&lt;p&gt;", escaped
+    assert escaped.html_safe?
+  end
+
+  test "ERB::Util.h should leave previously safe strings alone " do
+    # TODO this seems easier to compose and reason about, but
+    # this should be verified
+    escaped = ERB::Util.h("<p>".html_safe)
+    assert_equal "<p>", escaped
+    assert escaped.html_safe?
+  end
+
+  test "ERB::Util.h should not implode when passed a non-string" do
+    assert_nothing_raised do
+      assert_equal "1", ERB::Util.h(1)
+    end
+  end
+end

data/spec/rails2/rails_app/vendor/plugins/rails_xss/test/test_helper.rb

@@ -0,0 +1,5 @@
+abort 'RAILS_ROOT=/path/to/rails/2.3/app rake test' unless ENV['RAILS_ROOT']
+require File.expand_path('config/environment', ENV['RAILS_ROOT'])
+require File.expand_path('../../init', __FILE__)
+require 'active_support/test_case'
+require 'test/unit'

data/spec/rails2/rails_app/vendor/plugins/rails_xss/test/text_helper_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class TextHelperTest < ActionView::TestCase
+
+  def setup
+    @controller = Class.new do
+      attr_accessor :request
+      def url_for(*args) "http://www.example.com" end
+    end.new
+  end
+
+  def test_simple_format_with_escaping_html_options
+    assert_dom_equal(%(<p class="intro">It's nice to have options.</p>),
+                     simple_format("It's nice to have options.", :class=>"intro"))
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,11 +1,5 @@
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
-VENDOR_RAILS = "#{File.dirname(__FILE__)}/rails_root/vendor/rails"
-RAILS_LOAD_PATHS = Dir["#{VENDOR_RAILS}/*/lib"]
-RAILS_LOAD_PATHS.each do |path|
-  $LOAD_PATH.unshift(File.expand_path(path))
-end
-
 require "rubygems"
 require "bundler"
 Bundler.setup
@@ -19,6 +13,8 @@ require "rspec"
 require "rspec/autorun"
 require "open3"
 
+require "wrong/adapters/rspec"
+
 unless '1.9'.respond_to?(:force_encoding)
   String.class_eval do
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erector
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,15 +9,158 @@ authors:
 - Brian Takita
 - Jeff Dean
 - Jim Kingdon
+- John Firebaugh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-16 00:00:00.000000000 -08:00
-default_executable: erector
+date: 2011-07-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2158316440 !ruby/object:Gem::Requirement
+  requirement: &2156352300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156352300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156348780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156348780
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156339520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: *2156339520
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156327880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: *2156327880
+- !ruby/object:Gem::Dependency
+  name: rubyforge
+  requirement: &2156324400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156324400
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2156313460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156313460
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2156305000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156305000
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2156294560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156294560
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2156278680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156278680
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &2156269660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156269660
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &2156267940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156267940
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2156264860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: *2156264860
+- !ruby/object:Gem::Dependency
+  name: wrong
+  requirement: &2156249840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156249840
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: &2156238400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +168,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2158316440
+  version_requirements: *2156238400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158315880 !ruby/object:Gem::Requirement
+  requirement: &2156215560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,7 +179,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158315880
+  version_requirements: *2156215560
 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,
@@ -62,9 +205,6 @@ files:
 - lib/erector/erect/erected.rb
 - lib/erector/erect/indenting.rb
 - lib/erector/erect/rhtml.treetop
-- lib/erector/errors.rb
-- lib/erector/extensions/hash.rb
-- lib/erector/extensions/object.rb
 - lib/erector/externals.rb
 - lib/erector/html.rb
 - lib/erector/inline.rb
@@ -73,13 +213,19 @@ files:
 - lib/erector/needs.rb
 - lib/erector/output.rb
 - lib/erector/rails.rb
-- lib/erector/rails/extensions/action_controller.rb
-- lib/erector/rails/extensions/rails_helpers.rb
-- lib/erector/rails/extensions/rails_widget.rb
-- lib/erector/rails/rails_form_builder.rb
-- lib/erector/rails/rails_version.rb
-- lib/erector/rails/template_handlers/ert_handler.rb
-- lib/erector/rails/template_handlers/rb_handler.rb
+- lib/erector/rails/form_builder.rb
+- lib/erector/rails/railtie.rb
+- lib/erector/rails/template_handler.rb
+- lib/erector/rails/widget_renderer.rb
+- lib/erector/rails2.rb
+- lib/erector/rails2/extensions/action_controller.rb
+- lib/erector/rails2/extensions/rails_helpers.rb
+- lib/erector/rails2/extensions/rails_widget.rb
+- lib/erector/rails2/rails_form_builder.rb
+- lib/erector/rails2/rails_version.rb
+- lib/erector/rails2/template_handlers/ert_handler.rb
+- lib/erector/rails2/template_handlers/rb_handler.rb
+- lib/erector/rails3.rb
 - lib/erector/raw_string.rb
 - lib/erector/sass.rb
 - lib/erector/unicode.rb
@@ -93,7 +239,6 @@ files:
 - lib/erector/widgets/form.rb
 - lib/erector/widgets/page.rb
 - lib/erector/widgets/table.rb
-- rails/init.rb
 - spec/erect/erect_rails_spec.rb
 - spec/erect/erect_spec.rb
 - spec/erect/erected_spec.rb
@@ -119,13 +264,102 @@ files:
 - spec/erector/widgets/form_spec.rb
 - spec/erector/widgets/page_spec.rb
 - spec/erector/widgets/table_spec.rb
+- spec/rails2/erect_rails_spec.rb
+- spec/rails2/rails_app/app/controllers/application_controller.rb
+- spec/rails2/rails_app/app/helpers/application_helper.rb
+- spec/rails2/rails_app/app/views/test/_erb.erb
+- spec/rails2/rails_app/app/views/test/_erector.rb
+- spec/rails2/rails_app/app/views/test/_partial_with_locals.rb
+- spec/rails2/rails_app/app/views/test/bare.rb
+- spec/rails2/rails_app/app/views/test/erb_from_erector.html.rb
+- spec/rails2/rails_app/app/views/test/erector_from_erb.html.erb
+- spec/rails2/rails_app/app/views/test/erector_with_locals_from_erb.html.erb
+- spec/rails2/rails_app/app/views/test/implicit_assigns.html.rb
+- spec/rails2/rails_app/app/views/test/needs.html.rb
+- spec/rails2/rails_app/app/views/test/needs_subclass.html.rb
+- spec/rails2/rails_app/app/views/test/protected_instance_variable.html.rb
+- spec/rails2/rails_app/app/views/test/render_default.html.rb
+- spec/rails2/rails_app/app/views/test/render_partial.html.rb
+- spec/rails2/rails_app/config/boot.rb
+- spec/rails2/rails_app/config/database.yml
+- spec/rails2/rails_app/config/environment.rb
+- spec/rails2/rails_app/config/environments/development.rb
+- spec/rails2/rails_app/config/environments/production.rb
+- spec/rails2/rails_app/config/environments/test.rb
+- spec/rails2/rails_app/config/initializers/backtrace_silencers.rb
+- spec/rails2/rails_app/config/initializers/cookie_verification_secret.rb
+- spec/rails2/rails_app/config/initializers/inflections.rb
+- spec/rails2/rails_app/config/initializers/mime_types.rb
+- spec/rails2/rails_app/config/initializers/new_rails_defaults.rb
+- spec/rails2/rails_app/config/initializers/session_store.rb
+- spec/rails2/rails_app/config/locales/en.yml
+- spec/rails2/rails_app/config/routes.rb
+- spec/rails2/rails_app/db/development.sqlite3
+- spec/rails2/rails_app/db/schema.rb
+- spec/rails2/rails_app/db/seeds.rb
+- spec/rails2/rails_app/doc/README_FOR_APP
+- spec/rails2/rails_app/Gemfile
+- spec/rails2/rails_app/Gemfile.lock
+- spec/rails2/rails_app/log/development.log
+- spec/rails2/rails_app/log/production.log
+- spec/rails2/rails_app/log/server.log
+- spec/rails2/rails_app/log/test.log
+- spec/rails2/rails_app/public/404.html
+- spec/rails2/rails_app/public/422.html
+- spec/rails2/rails_app/public/500.html
+- spec/rails2/rails_app/public/favicon.ico
+- spec/rails2/rails_app/public/images/rails.png
+- spec/rails2/rails_app/public/index.html
+- spec/rails2/rails_app/public/javascripts/application.js
+- spec/rails2/rails_app/public/javascripts/controls.js
+- spec/rails2/rails_app/public/javascripts/dragdrop.js
+- spec/rails2/rails_app/public/javascripts/effects.js
+- spec/rails2/rails_app/public/javascripts/prototype.js
+- spec/rails2/rails_app/public/robots.txt
+- spec/rails2/rails_app/Rakefile
+- spec/rails2/rails_app/README
+- spec/rails2/rails_app/script/about
+- spec/rails2/rails_app/script/console
+- spec/rails2/rails_app/script/dbconsole
+- spec/rails2/rails_app/script/destroy
+- spec/rails2/rails_app/script/generate
+- spec/rails2/rails_app/script/performance/benchmarker
+- spec/rails2/rails_app/script/performance/profiler
+- spec/rails2/rails_app/script/plugin
+- spec/rails2/rails_app/script/runner
+- spec/rails2/rails_app/script/server
+- spec/rails2/rails_app/spec/rails_helpers_spec.rb
+- spec/rails2/rails_app/spec/rails_spec_helper.rb
+- spec/rails2/rails_app/spec/rails_widget_spec.rb
+- spec/rails2/rails_app/spec/render_spec.rb
+- spec/rails2/rails_app/test/performance/browsing_test.rb
+- spec/rails2/rails_app/test/test_helper.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/init.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/tasks/rails_xss_tasks.rake
+- spec/rails2/rails_app/vendor/plugins/rails_xss/MIT-LICENSE
+- spec/rails2/rails_app/vendor/plugins/rails_xss/Rakefile
+- spec/rails2/rails_app/vendor/plugins/rails_xss/README.markdown
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/active_record_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/caching_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/date_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/erb_util_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_tag_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/output_safety_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/rails_xss_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/test_helper.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/text_helper_test.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://erector.rubyforge.org/
 licenses: []
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -136,7 +370,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3942824524895088224
+      hash: -2892608317364591105
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: erector
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Html Builder library.
@@ -175,4 +409,95 @@ test_files:
 - spec/erector/widgets/form_spec.rb
 - spec/erector/widgets/page_spec.rb
 - spec/erector/widgets/table_spec.rb
+- spec/rails2/erect_rails_spec.rb
+- spec/rails2/rails_app/app/controllers/application_controller.rb
+- spec/rails2/rails_app/app/helpers/application_helper.rb
+- spec/rails2/rails_app/app/views/test/_erb.erb
+- spec/rails2/rails_app/app/views/test/_erector.rb
+- spec/rails2/rails_app/app/views/test/_partial_with_locals.rb
+- spec/rails2/rails_app/app/views/test/bare.rb
+- spec/rails2/rails_app/app/views/test/erb_from_erector.html.rb
+- spec/rails2/rails_app/app/views/test/erector_from_erb.html.erb
+- spec/rails2/rails_app/app/views/test/erector_with_locals_from_erb.html.erb
+- spec/rails2/rails_app/app/views/test/implicit_assigns.html.rb
+- spec/rails2/rails_app/app/views/test/needs.html.rb
+- spec/rails2/rails_app/app/views/test/needs_subclass.html.rb
+- spec/rails2/rails_app/app/views/test/protected_instance_variable.html.rb
+- spec/rails2/rails_app/app/views/test/render_default.html.rb
+- spec/rails2/rails_app/app/views/test/render_partial.html.rb
+- spec/rails2/rails_app/config/boot.rb
+- spec/rails2/rails_app/config/database.yml
+- spec/rails2/rails_app/config/environment.rb
+- spec/rails2/rails_app/config/environments/development.rb
+- spec/rails2/rails_app/config/environments/production.rb
+- spec/rails2/rails_app/config/environments/test.rb
+- spec/rails2/rails_app/config/initializers/backtrace_silencers.rb
+- spec/rails2/rails_app/config/initializers/cookie_verification_secret.rb
+- spec/rails2/rails_app/config/initializers/inflections.rb
+- spec/rails2/rails_app/config/initializers/mime_types.rb
+- spec/rails2/rails_app/config/initializers/new_rails_defaults.rb
+- spec/rails2/rails_app/config/initializers/session_store.rb
+- spec/rails2/rails_app/config/locales/en.yml
+- spec/rails2/rails_app/config/routes.rb
+- spec/rails2/rails_app/db/development.sqlite3
+- spec/rails2/rails_app/db/schema.rb
+- spec/rails2/rails_app/db/seeds.rb
+- spec/rails2/rails_app/doc/README_FOR_APP
+- spec/rails2/rails_app/Gemfile
+- spec/rails2/rails_app/Gemfile.lock
+- spec/rails2/rails_app/log/development.log
+- spec/rails2/rails_app/log/production.log
+- spec/rails2/rails_app/log/server.log
+- spec/rails2/rails_app/log/test.log
+- spec/rails2/rails_app/public/404.html
+- spec/rails2/rails_app/public/422.html
+- spec/rails2/rails_app/public/500.html
+- spec/rails2/rails_app/public/favicon.ico
+- spec/rails2/rails_app/public/images/rails.png
+- spec/rails2/rails_app/public/index.html
+- spec/rails2/rails_app/public/javascripts/application.js
+- spec/rails2/rails_app/public/javascripts/controls.js
+- spec/rails2/rails_app/public/javascripts/dragdrop.js
+- spec/rails2/rails_app/public/javascripts/effects.js
+- spec/rails2/rails_app/public/javascripts/prototype.js
+- spec/rails2/rails_app/public/robots.txt
+- spec/rails2/rails_app/Rakefile
+- spec/rails2/rails_app/README
+- spec/rails2/rails_app/script/about
+- spec/rails2/rails_app/script/console
+- spec/rails2/rails_app/script/dbconsole
+- spec/rails2/rails_app/script/destroy
+- spec/rails2/rails_app/script/generate
+- spec/rails2/rails_app/script/performance/benchmarker
+- spec/rails2/rails_app/script/performance/profiler
+- spec/rails2/rails_app/script/plugin
+- spec/rails2/rails_app/script/runner
+- spec/rails2/rails_app/script/server
+- spec/rails2/rails_app/spec/rails_helpers_spec.rb
+- spec/rails2/rails_app/spec/rails_spec_helper.rb
+- spec/rails2/rails_app/spec/rails_widget_spec.rb
+- spec/rails2/rails_app/spec/render_spec.rb
+- spec/rails2/rails_app/test/performance/browsing_test.rb
+- spec/rails2/rails_app/test/test_helper.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/init.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/rails_xss.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/lib/tasks/rails_xss_tasks.rake
+- spec/rails2/rails_app/vendor/plugins/rails_xss/MIT-LICENSE
+- spec/rails2/rails_app/vendor/plugins/rails_xss/Rakefile
+- spec/rails2/rails_app/vendor/plugins/rails_xss/README.markdown
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/active_record_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/caching_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/date_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/erb_util_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/form_tag_helper_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/output_safety_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/rails_xss_test.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/test_helper.rb
+- spec/rails2/rails_app/vendor/plugins/rails_xss/test/text_helper_test.rb
 - spec/spec_helper.rb