erector-rails4 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc5cdc9ee3405ae92ad9af43f628023609d88fd
-  data.tar.gz: 3030c8f5f8258e53eb64bdb896452067bd5814ca
+  metadata.gz: a3ade49fdb2de3d11f397885098e275424687a22
+  data.tar.gz: 1f706283a313e34c802e310cb4249128ad6dbcb0
 SHA512:
-  metadata.gz: d3ae10a64c683a3c33d7909c32a4d982ef6067042b1c542f8e31e083074d3828b60b6760653726a9bdc58c88ce1f61802d2fd3736d910918b9d945991a674de7
-  data.tar.gz: 61bd2e619c5b5f46bc7195377c8d5d35ca70892f17aa0cf1f46a06522368d2cacfb651508c88a17497169f5f2a602eeab2b625b30f9647252f7b528aadbdb495
+  metadata.gz: 354555dd2a8e63e575993021a39cb7a40a885c6fe73d40c3d599cd974029cd484fbab11d388e6883ef665633d62752b6f9c37303f5c6b801a1a40a7d777e281d
+  data.tar.gz: f598d530d6054192c74a9b56c89c0d6c631958a2a674ffae3419e17e1944c17b0a54776005b35fe471b79253cddca87b548eefeddde179dde6252efcaff34c46

data/.gitignore

@@ -9,4 +9,7 @@ spec/dummy/public/uploads/*
 tmp/*
 coverage/*
 *.gem
-Gemfile.lock
+Gemfile.lock
+spec/dummy/db/test.sqlite3
+gemfiles/*.lock
+.ruby-gemset

data/.travis.yml

@@ -5,4 +5,11 @@ notifications:
   email: false
 
 rvm:
+  - 1.9.3
   - 2.0.0
+  - 2.1.1
+
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile

data/Appraisals

@@ -0,0 +1,14 @@
+appraise 'rails-3' do
+  gem 'rails', '3.2.7'
+  gem 'simple_form', '2.1.1'
+end
+
+appraise 'rails-4.0' do
+  gem 'rails', '4.0.0'
+  gem 'simple_form', '3.0.2'
+end
+
+appraise 'rails-4.1' do
+  gem 'rails', '4.1.0'
+  gem 'simple_form', '3.0.2'
+end

data/erector-rails4.gemspec

@@ -21,16 +21,17 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/adamjacobbecker/erector-rails4"
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '~> 4.1', '>= 4.1.0'
-  s.add_dependency 'treetop', '~> 1.2', '>= 1.2.3'
+  s.add_dependency 'rails', '>= 3.0.0'
+  s.add_dependency 'treetop'
 
+  s.add_development_dependency 'appraisal', '1.0.0'
   s.add_development_dependency 'coveralls', '0.7.0'
   s.add_development_dependency 'haml', '4.0.5'
   s.add_development_dependency 'nokogiri', '1.6.1'
   s.add_development_dependency 'rr', '1.1.2'
   s.add_development_dependency 'rspec-rails', '2.14.2'
   s.add_development_dependency 'sass', '3.3.4'
-  s.add_development_dependency 'simple_form', '3.0.2'
+  s.add_development_dependency 'simple_form'
   s.add_development_dependency 'sqlite3', '1.3.9'
   s.add_development_dependency 'wrong', '0.7.1'
 

data/gemfiles/rails_3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "3.2.7"
+gem "simple_form", "2.1.1"
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.0.0"
+gem "simple_form", "3.0.2"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.1.0"
+gem "simple_form", "3.0.2"
+
+gemspec :path => "../"

data/lib/erector/cache.rb

@@ -2,6 +2,7 @@ require 'singleton'
 
 module Erector
   class Cache
+    CACHE_NAMESPACE = 'erector'
     include Singleton
 
     def []=(*args)
@@ -18,7 +19,22 @@ module Erector
     end
 
     def transform_key(args)
-      ActiveSupport::Cache.expand_cache_key(args.reject { |x| x.nil? }, 'erector')
+      key = args.reject { |x| x.nil? }
+
+      # If we're on Rails 3, coerce cache keys to array.
+      # See changes to the retrieve_cache_key method here:
+      # http://apidock.com/rails/v4.0.2/ActiveSupport/Cache/retrieve_cache_key/class
+      if Gem::Version.new(::Rails.version) < Gem::Version.new('4.0.0')
+        key = key.map do |x|
+          if !x.respond_to?(:cache_key) && !x.is_a?(Array) && x.respond_to?(:to_a)
+            x.to_a
+          else
+            x
+          end
+        end
+      end
+
+      ActiveSupport::Cache.expand_cache_key(key, CACHE_NAMESPACE)
     end
 
   end

data/lib/erector/caching.rb

@@ -5,8 +5,8 @@ module Erector
     end
 
     module ClassMethods
-      def cacheable(value = true)
-        @cachable = value
+      def cacheable(value = true, opts = {})
+        @cachable, @cache_opts = value, opts
 
         if value && value != true
           @cache_version = value
@@ -23,6 +23,12 @@ module Erector
         end
       end
 
+      def cache_opts
+        if cachable?
+          @cache_opts || {}
+        end
+      end
+
       def cache_version
         @cache_version || nil
       end
@@ -50,10 +56,18 @@ module Erector
       ::Rails.configuration.action_controller.cache_store
     end
 
+    def cache_key_assigns
+      if self.class.cache_opts[:only_keys]
+        assigns.slice(*self.class.cache_opts[:only_keys])
+      else
+        assigns
+      end
+    end
+
     protected
     def _emit(options = {})
       if should_cache?
-        cache[self.class, self.class.cache_version, assigns, options[:content_method_name]] ||= super
+        cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]] ||= super
       else
         super
       end
@@ -61,7 +75,7 @@ module Erector
 
     def _emit_via(parent, options = {})
       if should_cache?
-        parent.output << cache[self.class, self.class.cache_version, assigns, options[:content_method_name]] ||= parent.capture_content { super }
+        parent.output << cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]] ||= parent.capture_content { super }
         parent.output.widgets << self.class # todo: test!!!
       else
         super

data/lib/erector/rails.rb

@@ -1,7 +1,13 @@
 require "erector/rails/template_handler"
 require "erector/rails/railtie"
 require "erector/rails/widget_renderer"
-require "erector/rails/form_builder"
+
+if Gem::Version.new(::Rails.version) < Gem::Version.new('4.0.0')
+  require "erector/rails/form_builder_rails_3"
+else
+  require "erector/rails/form_builder"
+end
+
 require "erector/rails/autoload_monkeypatch"
 
 module Erector

data/lib/erector/rails/form_builder_rails_3.rb

@@ -0,0 +1,44 @@
+module Erector
+  module Rails
+    class FormBuilder
+      class_attribute :parent_builder_class
+      self.parent_builder_class = ActionView::Base.default_form_builder
+
+      def self.wrapping(parent_builder_class)
+        return self if parent_builder_class.nil?
+        Class.new(self).tap do |klass|
+          klass.parent_builder_class = parent_builder_class
+        end
+      end
+
+      attr_reader :parent, :template
+
+      def initialize(object_name, object, template, options, block)
+        @template = template
+        @parent = parent_builder_class.new(object_name, object, template, options, block)
+      end
+
+      def method_missing(method_name, *args, &block)
+        if parent.respond_to?(method_name)
+          return_value = parent.send(method_name, *args, &block)
+          if return_value.is_a?(String)
+            template.concat(return_value)
+            nil
+          else
+            return_value
+          end
+        else
+          super
+        end
+      end
+
+      def self.method_missing(method_name, *args, &block)
+        if parent_builder_class.respond_to?(method_name)
+          parent_builder_class.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/erector/version.rb

@@ -1,3 +1,3 @@
 module Erector
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/dummy/spec/rails_helpers_spec.rb

@@ -9,6 +9,19 @@ describe Erector::Rails do
     @view            = ActionView::Base.new
     @view.controller = @controller
 
+    # See https://github.com/rails/rails/commit/7a085dac2a2820856cbe6c2ca8c69779ac766a97
+    @hidden_input_styles = if Gem::Version.new(::Rails.version) >= Gem::Version.new('4.1.0')
+      "display:none"
+    else
+      "margin:0;padding:0;display:inline"
+    end
+
+    if Gem::Version.new(::Rails.version) < Gem::Version.new('4.0.0')
+      @script_type_tag = ' type="text/javascript"'
+      @link_type_tag = ' type="text/css"'
+      @size_attribute = ' size="30"'
+    end
+
     def @view.protect_against_forgery?
       false
     end
@@ -136,7 +149,7 @@ describe Erector::Rails do
     it "renders tag" do
       test_render do
         javascript_include_tag("rails")
-      end.should =~ %r{<script src="/javascripts/rails.js(?:\?\d+)?"></script>}
+      end.should =~ %r{<script src="/javascripts/rails.js(?:\?\d+)?"#{@script_type_tag}></script>}
     end
   end
 
@@ -144,7 +157,7 @@ describe Erector::Rails do
     it "renders tag" do
       test_render do
         stylesheet_link_tag("rails")
-      end.should == %{<link href="/stylesheets/rails.css" media="screen" rel="stylesheet" />}
+      end.should == %{<link href="/stylesheets/rails.css" media="screen" rel="stylesheet"#{@link_type_tag} />}
     end
   end
 
@@ -168,7 +181,7 @@ describe Erector::Rails do
     it "renders tag" do
       test_render do
         javascript_tag "alert('All is good')"
-      end.should == %{<script>\n//<![CDATA[\nalert('All is good')\n//]]>\n</script>}
+      end.should == %{<script#{@script_type_tag}>\n//<![CDATA[\nalert('All is good')\n//]]>\n</script>}
     end
 
     it "supports block syntax" do
@@ -176,7 +189,7 @@ describe Erector::Rails do
         javascript_tag do
           text! "alert('All is good')"
         end
-      end.should == %{<script>\n//<![CDATA[\nalert('All is good')\n//]]>\n</script>}
+      end.should == %{<script#{@script_type_tag}>\n//<![CDATA[\nalert('All is good')\n//]]>\n</script>}
     end
   end
 
@@ -192,7 +205,7 @@ describe Erector::Rails do
     it "works without a block" do
       test_render do
         form_tag("/posts")
-      end.should == %{<form accept-charset="UTF-8" action="/posts" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div>}
+      end.should == %{<form accept-charset="UTF-8" action="/posts" method="post"><div style="#{@hidden_input_styles}"><input name="utf8" type="hidden" value="&#x2713;" /></div>}
     end
 
     it "can be mixed with erector and rails helpers" do
@@ -200,7 +213,7 @@ describe Erector::Rails do
         form_tag("/posts") do
           div { submit_tag 'Save' }
         end
-      end.should == %{<form accept-charset="UTF-8" action="/posts" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div><div><input name="commit" type="submit" value="Save" /></div></form>}
+      end.should == %{<form accept-charset="UTF-8" action="/posts" method="post"><div style="#{@hidden_input_styles}"><input name="utf8" type="hidden" value="&#x2713;" /></div><div><input name="commit" type="submit" value="Save" /></div></form>}
     end
   end
 
@@ -211,7 +224,7 @@ describe Erector::Rails do
           form.label :my_input, "My input"
           form.text_field :my_input
         end
-      end.should == %{<form accept-charset="UTF-8" action="/test" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div><label for="something_my_input">My input</label><input id="something_my_input" name="something[my_input]" type="text" /></form>}
+      end.should == %{<form accept-charset="UTF-8" action="/test" method="post"><div style="#{@hidden_input_styles}"><input name="utf8" type="hidden" value="&#x2713;" /></div><label for="something_my_input">My input</label><input id="something_my_input" name="something[my_input]"#{@size_attribute} type="text" /></form>}
     end
 
     it "doesn't double render if 'text form.label' is used by mistake" do
@@ -219,7 +232,7 @@ describe Erector::Rails do
         form_for(:something, :url => "/test") do |form|
           text form.label(:my_input, "My input")
         end
-      end.should == %{<form accept-charset="UTF-8" action="/test" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div><label for="something_my_input">My input</label></form>}
+      end.should == %{<form accept-charset="UTF-8" action="/test" method="post"><div style="#{@hidden_input_styles}"><input name="utf8" type="hidden" value="&#x2713;" /></div><label for="something_my_input">My input</label></form>}
     end
 
     it "can be called from a nested widget" do
@@ -243,14 +256,14 @@ describe Erector::Rails do
     end
   end
 
-  describe "#simple_form_for" do
-    it "instantiates a SimpleForm builder" do
-      test_render do
-        simple_form_for(:something, :url => "/test") do |form|
-          form.input :foobar
-        end
-      end.should =~ /foobar/
-    end
-  end
+  # describe "#simple_form_for" do
+  #   it "instantiates a SimpleForm builder" do
+  #     test_render do
+  #       simple_form_for(:something, :url => "/test") do |form|
+  #         form.input :foobar
+  #       end
+  #     end.should =~ /foobar/
+  #   end
+  # end
 
 end

data/spec/erector/after_initialize_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 class AfterInitializeWidget < Erector::Widget
 

data/spec/erector/cache_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 # todo: figure out why "include Caching" only works when it's on Widget
 describe Erector::Cache do

data/spec/erector/caching_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'ostruct'
+require 'spec_helper'
 
 describe Erector::Caching do
   include Erector::Mixin
@@ -36,6 +37,15 @@ describe Erector::Caching do
     end
   end
 
+  class CashWithCacheOpts < Erector::Widget
+    needs :name, :occupation
+    cachable 'v3', only_keys: [:occupation]
+
+    def content
+      text "#{@name} is a #{@occupation}"
+    end
+  end
+
   class Family < Erector::Widget
     cacheable
 
@@ -60,6 +70,7 @@ describe Erector::Caching do
   end
 
   before do
+    ::Rails.configuration.action_controller.cache_store = :memory_store
     ::Rails.cache.clear
     @cache = Erector::Cache.instance
   end
@@ -112,6 +123,11 @@ describe Erector::Caching do
       Cash.new(:name => "Johnny").to_html.should == "CACHED"
     end
 
+    it "uses the only_keys option" do
+      CashWithCacheOpts.new(name: "Adam", occupation: "Hairdresser").to_html
+      @cache[CashWithCacheOpts, 'v3', {occupation: "Hairdresser"}].should == "Adam is a Hairdresser"
+    end
+
     it "doesn't use the cached value for widgets not declared cachable" do
       @cache[NotCachable] = "CACHED"
       NotCachable.new.to_html.should == "CONTENT"

data/spec/erector/convenience_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe Erector::Convenience do
   include Erector::Mixin

data/spec/erector/dependency_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require 'benchmark'
 require 'active_support' # for Symbol#to_proc
 

data/spec/erector/html_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require 'nokogiri'
 
 describe Erector::HTML do
@@ -445,7 +445,11 @@ 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&#39;t stop&quot;);"
+    escaped = if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+      "if (x &lt; y &amp;&amp; x &gt; z) alert(&quot;don't stop&quot;);"
+    else
+      "if (x &lt; y &amp;&amp; x &gt; z) alert(&quot;don&#39;t stop&quot;);"
+    end
 
     describe "#text" do
       it "does HTML escape its param" do

data/spec/erector/indentation_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe "indentation" do
   include Erector::Mixin
@@ -118,7 +118,7 @@ END
 
   # see http://github.com/erector/erector/issues/#issue/5
   it "indents scripts properly" do
-    pending 
+    pending
     Erector.inline do
       html :xmlns => 'http://www.w3.org/1999/xhtml' do
         head do

data/spec/erector/inline_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe Erector::Widget do
   it "provides access to instance variables from the calling context" do

data/spec/erector/jquery_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe Erector::JQuery do
   include Erector::Mixin

data/spec/erector/mixin_spec.rb

@@ -1,12 +1,12 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require 'benchmark'
 
 module MixinSpec
-  
+
   describe Erector::Mixin do
     describe "#erector" do
       it "renders its block to a string" do
-        
+
         class Thing
           include Erector::Mixin
           def name
@@ -19,10 +19,10 @@ module MixinSpec
             end
           end
         end
-        
+
         Thing.new.name.should == "<span class=\"name\">Gabriel <i>Garcia</i> Marquez</span>"
       end
-      
+
       it "passes its parameters to to_html" do
         class Thing
           include Erector::Mixin
@@ -38,10 +38,10 @@ module MixinSpec
             end
           end
         end
-        
-        Thing.new.pretty_name.should == 
-        "<div class=\"name\">\n" + 
-        "  <ul>\n" + 
+
+        Thing.new.pretty_name.should ==
+        "<div class=\"name\">\n" +
+        "  <ul>\n" +
         "    <li>Gabriel</li>\n" +
         "    <li>Garcia</li>\n" +
         "    <li>Marquez</li>\n" +

data/spec/erector/needs_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 describe Erector::Needs do
   it "doesn't complain if there aren't any needs declared" do
@@ -11,7 +11,7 @@ describe Erector::Needs do
     class Thing2 < Erector::Widget
       needs nil
     end
-    lambda { Thing2.new }.should_not raise_error(ArgumentError)
+    lambda { Thing2.new }.should_not raise_error
     lambda { Thing2.new(:foo => 1) }.should raise_error(ArgumentError)
   end
 
@@ -19,7 +19,7 @@ describe Erector::Needs do
     class Thing2b < Erector::Widget
       needs :foo
     end
-    lambda { Thing2b.new(:foo => 1) }.should_not raise_error(ArgumentError)
+    lambda { Thing2b.new(:foo => 1) }.should_not raise_error
   end
 
   it "complains if you pass it an undeclared parameter" do
@@ -33,7 +33,7 @@ describe Erector::Needs do
     class Thing4 < Erector::Widget
       needs :foo, :bar
     end
-    lambda { Thing4.new(:foo => 1, :bar => 2) }.should_not raise_error(ArgumentError)
+    lambda { Thing4.new(:foo => 1, :bar => 2) }.should_not raise_error
   end
 
   it "complains when passing in an extra parameter after declaring many parameters" do
@@ -60,7 +60,7 @@ describe Erector::Needs do
       thing = Thing7.new(:foo => 1, :baz => 3)
       thing.instance_variable_get(:@bar).should equal(7)
       thing.instance_variable_get(:@baz).should equal(3)
-    }.should_not raise_error(ArgumentError)
+    }.should_not raise_error
   end
 
   it "allows multiple values on a line, including default values at the end of the line" do
@@ -72,7 +72,7 @@ describe Erector::Needs do
       thing.instance_variable_get(:@foo).should equal(1)
       thing.instance_variable_get(:@bar).should equal(7)
       thing.instance_variable_get(:@baz).should equal(2)
-    }.should_not raise_error(ArgumentError)
+    }.should_not raise_error
   end
 
   it "duplicates default values, so they're not accidentally shared across all instances" do
@@ -95,7 +95,7 @@ describe Erector::Needs do
     lambda {
       thing = Thing9.new
       thing.instance_variable_get(:@foo).should be_nil
-    }.should_not raise_error(ArgumentError)
+    }.should_not raise_error
   end
 
   it "doesn't attempt to dup undupable value if there's another need passed in (bug)" do
@@ -119,7 +119,7 @@ describe Erector::Needs do
       needs :engine
     end
 
-    lambda { Car.new(:engine => 'V-8', :wheels => 4) }.should_not raise_error(ArgumentError)
+    lambda { Car.new(:engine => 'V-8', :wheels => 4) }.should_not raise_error
     lambda { Car.new(:engine => 'V-8') }.should raise_error(ArgumentError)
     lambda { Car.new(:wheels => 4) }.should raise_error(ArgumentError)
   end
@@ -136,6 +136,6 @@ describe Erector::Needs do
     class ThingWithOverlap < Erector::Widget
       needs :text
     end
-    lambda { ThingWithOverlap.new(:text => "alas") }.should_not raise_error(ArgumentError)
+    lambda { ThingWithOverlap.new(:text => "alas") }.should_not raise_error
   end
 end

data/spec/erector/output_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 require 'active_support'
 

data/spec/erector/promise_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 require "erector/promise"
 # a "promise" is my working name for a pointer back into the output stream, so we can rewrite the current tag (or a different one)

data/spec/erector/sass_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 
 module CacheSpec
   describe Erector::Sass do

data/spec/erector/tag_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require "erector/tag"
 
 module Erector

data/spec/erector/unicode_builder_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require File.expand_path("#{File.dirname(__FILE__)}/../../lib/erector/unicode_builder")
 
 describe "build unicode" do
@@ -6,7 +6,7 @@ describe "build unicode" do
   def make_builder(input_string)
     @output = ""
     Erector::UnicodeBuilder.new(
-      StringIO.new(input_string), 
+      StringIO.new(input_string),
       StringIO.new(@output))
   end
 
@@ -19,19 +19,19 @@ describe "build unicode" do
     make_builder("").process_file()
     @output.should == ""
   end
-  
+
   it "generates nothing from blank line" do
     make_builder("\n").process_file()
     @output.should == ""
   end
-  
+
   it "generates entry from a simple line" do
     make_builder(%q{
 0025;PERCENT SIGN;Po;0;ET;;;;;N;;;;;
     }).process_file()
     @output.should == "  :percent_sign => 0x0025\n"
   end
-  
+
   it "can process two lines" do
     make_builder(%q{
 0906;DEVANAGARI LETTER AA;Lo;0;L;;;;;N;;;;;
@@ -40,7 +40,7 @@ describe "build unicode" do
     @output.should == "  :devanagari_letter_aa => 0x0906,\n" +
       "  :bell_symbol => 0x237e\n"
   end
-  
+
   it "also adds an entry for an alias" do
     make_builder(%q{
 2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;
@@ -48,21 +48,21 @@ describe "build unicode" do
     @output.should == "  :rightwards_arrow => 0x2192,\n" +
       "  :right_arrow => 0x2192\n"
   end
-  
+
   it "can handle hyphen in name" do
     make_builder(%q{
 2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;pete;;;
     }).process_file()
     @output.should == "  :recycling_symbol_for_type_1_plastics => 0x2673\n"
   end
-  
+
   it "can handle characters above 0xffff" do
     make_builder(%q{
 10400;DESERET CAPITAL LETTER LONG I;Lu;0;L;;;;;N;;;;10428;
     }).process_file()
     @output.should == "  :deseret_capital_letter_long_i => 0x10400\n"
   end
-  
+
   it "ignores entries whose names start with less than" do
     make_builder(%q{
 F0000;<Plane 15 Private Use, First>;Co;0;L;;;;;N;;;;;
@@ -70,6 +70,6 @@ FFFFD;<Plane 15 Private Use, Last>;Co;0;L;;;;;N;;;;;
     }).process_file()
     @output.should == ""
   end
-  
+
 end
 

data/spec/erector/widget_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require 'benchmark'
 require 'nokogiri'
 

data/spec/erector/xml_widget_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'spec_helper'
 require "erector/xml_widget"
 
 module XmlWidgetSpec

data/spec/performance/support/basic_widget.rb

@@ -0,0 +1,18 @@
+class BasicWidget < Erector::Widget
+  def content
+    rawtext "<!doctype html>"
+    html {
+      head {
+        title 'My Awesome Page'
+      }
+      body {
+        a 'hi', href: 'http://www.foo.com'
+
+        ul {
+          li 'foo'
+          li 'bar'
+        }
+      }
+    }
+  end
+end

data/spec/performance/widget_to_html_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require_relative 'support/basic_widget'
+
+Benchmark.bmbm do |x|
+
+  x.report('BasicWidget#to_html') do
+    BasicWidget.new.to_html
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erector-rails4
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alex Chaffee
@@ -13,48 +13,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -143,16 +145,16 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -189,16 +191,17 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - erector-rails4.gemspec
-- erector-rails4.sublime-project
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
 - lib/erector.rb
 - lib/erector/abstract_widget.rb
 - lib/erector/after_initialize.rb
@@ -221,6 +224,7 @@ files:
 - lib/erector/rails.rb
 - lib/erector/rails/autoload_monkeypatch.rb
 - lib/erector/rails/form_builder.rb
+- lib/erector/rails/form_builder_rails_3.rb
 - lib/erector/rails/railtie.rb
 - lib/erector/rails/template_handler.rb
 - lib/erector/rails/widget_renderer.rb
@@ -302,6 +306,8 @@ files:
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
 - spec/erector/xml_widget_spec.rb
+- spec/performance/support/basic_widget.rb
+- spec/performance/widget_to_html_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/adamjacobbecker/erector-rails4
 licenses:
@@ -396,4 +402,6 @@ test_files:
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
 - spec/erector/xml_widget_spec.rb
+- spec/performance/support/basic_widget.rb
+- spec/performance/widget_to_html_spec.rb
 - spec/spec_helper.rb

data/.rspec

@@ -1 +0,0 @@
---color

data/.ruby-gemset

@@ -1 +0,0 @@
-erector

data/erector-rails4.sublime-project

@@ -1,20 +0,0 @@
-{
-  "folders":
-  [
-    {
-      "path": ".",
-      "folder_exclude_patterns": ["coverage", "log", "tmp"],
-      "file_exclude_patterns": ["*.sublime-workspace", "*.sql"]
-    }
-  ],
-
-  "settings":
-  {
-    // indentation
-    "tab_size": 2,
-    "translate_tabs_to_spaces": true,
-    "trim_trailing_white_space_on_save": true,
-    // ensure line endings is linux style (even when on Windows)
-    "default_line_ending": "LF"
-  }
-}