erector-rails4 0.1.3 → 0.2.0

data/spec/erector/dependency_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'benchmark'
-require 'active_support' # for Symbol#to_proc
 
 module DependencySpec
   describe Erector::Dependency do

data/spec/erector/html_spec.rb

@@ -159,7 +159,7 @@ describe Erector::HTML do
         object = ['a', 'b']
         erector do
           element 'div', object
-        end.should == "<div>#{CGI.escapeHTML object.to_s}</div>"
+        end.should == "<div>#{CGI::escapeHTML object.to_s}</div>"
       end
     end
 
@@ -273,7 +273,7 @@ describe Erector::HTML do
           element 'a' do
             text array
           end
-        end.should == "<a>#{CGI.escapeHTML array.to_s}</a>"
+        end.should == "<a>#{CGI::escapeHTML array.to_s}</a>"
       end
     end
   end
@@ -466,9 +466,9 @@ describe Erector::HTML do
         erector { rawtext plain }.should == plain
       end
     end
-    describe "#text!" do
+    describe "#rawtext" do
       it "doesn't HTML escape its param" do
-        erector { text! plain }.should == plain
+        erector { rawtext plain }.should == plain
       end
     end
     describe "#element" do

data/spec/erector/indentation_spec.rb

@@ -8,8 +8,8 @@ describe "indentation" do
     widget.instance_eval do
       @prettyprint = true
     end
-    widget.send(:newliney?, "i").should == false
-    widget.send(:newliney?, "table").should == true
+    widget.class.send(:newliney?, "i").should == false
+    widget.class.send(:newliney?, "table").should == true
   end
 
   it "should not add newline for non-newliney tags" do

data/spec/erector/needs_spec.rb

@@ -15,6 +15,14 @@ describe Erector::Needs do
     lambda { Thing2.new(:foo => 1) }.should raise_error(ArgumentError)
   end
 
+  it "doesn't support needs 'string'" do
+    expect {
+      class Thing2 < Erector::Widget
+        needs 'asdf'
+      end
+    }.to raise_error
+  end
+
   it "doesn't complain if you pass it a declared parameter" do
     class Thing2b < Erector::Widget
       needs :foo
@@ -98,6 +106,21 @@ describe Erector::Needs do
     }.should_not raise_error
   end
 
+  it "allows nil to be overridden by subclasses" do
+    class Thing10 < Erector::Widget
+      needs :title,
+            id: nil,
+            html_opts: {}
+    end
+    class Thing11 < Thing10
+      needs id: 'newProjectModal', title: 'asdf'
+    end
+    lambda {
+      thing = Thing11.new
+      thing.instance_variable_get(:@id).should eq 'newProjectModal'
+    }.should_not raise_error
+  end
+
   it "doesn't attempt to dup undupable value if there's another need passed in (bug)" do
     class Section < Erector::Widget
       needs :title, :href => nil, :stinky => false, :awesome => true, :answer => 42, :shoe_size => 12.5, :event_type => :jump
@@ -138,4 +161,14 @@ describe Erector::Needs do
     end
     lambda { ThingWithOverlap.new(:text => "alas") }.should_not raise_error
   end
+
+  # https://github.com/ajb/erector-rails4/issues/23
+  # ...but this is passing?
+  it 'can need variables of the same name as the class' do
+    class Post < Erector::Widget
+      needs :post
+    end
+    view = Post.new(post: { foo: 'bar' })
+    view.instance_variable_get(:@post)[:foo].should == 'bar'
+  end
 end

data/spec/erector/output_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-require 'active_support'
-
 module Erector
   describe Erector::Output do
     before do

data/spec/erector/promise_spec.rb

@@ -73,10 +73,10 @@ module Erector
         @output.to_s.should == "<foo />"
       end
 
-      it "renders RawStrings for open and close" do
+      it "renders html_safe strings for open and close" do
         promise = Promise.new(@output, "foo")
         promise._render
-        @buffer.each{|s| s.should be_a(RawString)}
+        @buffer.each{|s| s.should be_html_safe}
       end
 
       it "fills its target with attributes" do

data/spec/erector/widget_spec.rb

@@ -201,12 +201,12 @@ module WidgetSpec
         end.should == '<div><p>Captured Content</p></div>'
       end
 
-      it "returns a RawString" do
+      it "returns an html_safe string" do
         captured = nil
         erector do
           captured = capture_content {}
         end.should == ""
-        captured.should be_a_kind_of(Erector::RawString)
+        captured.should be_html_safe
       end
 
       it "works with nested captures" do

data/spec/performance/allocation_spec.rb

@@ -0,0 +1,19 @@
+describe 'Allocation', performance: true do
+
+  it 'takes time' do
+    require 'spec_helper'
+    require 'allocation_stats'
+    require_relative 'support/basic_widget'
+
+    stats = AllocationStats.trace do
+      Erector.inline {
+        div(class: 'foo') {
+          p 'Hey!'
+        }
+      }.to_html
+    end
+
+    puts stats.allocations(alias_paths: true).group_by(:sourcefile, :sourceline, :class).to_text
+  end
+
+end

data/spec/performance/ruby_prof_spec.rb

@@ -0,0 +1,23 @@
+describe 'Ruby Prof', performance: true do
+
+  it 'takes time' do
+    require 'spec_helper'
+    require 'ruby-prof'
+    require_relative 'support/basic_widget'
+
+    result = RubyProf.profile do
+      Erector.inline {
+        div(class: 'foo') {
+          p 'Hey!'
+        }
+      }.to_html
+    end
+
+    printer = RubyProf::GraphPrinter.new(result)
+    printer.print(STDOUT, sort_method: :self_time)
+
+    printer2 = RubyProf::FlatPrinter.new(result)
+    printer2.print(STDOUT, sort_method: :self_time)
+  end
+
+end

data/spec/performance/widget_to_html_spec.rb

@@ -1,10 +1,16 @@
-require 'spec_helper'
-require_relative 'support/basic_widget'
+describe 'Widget to HTML', performance: true do
 
-Benchmark.bmbm do |x|
+  it 'takes time' do
+    require 'spec_helper'
+    require_relative 'support/basic_widget'
 
-  x.report('BasicWidget#to_html') do
-    BasicWidget.new.to_html
+    Benchmark.bmbm do |x|
+      x.report('BasicWidget#to_html') do
+        100.times do
+          BasicWidget.new.to_html
+        end
+      end
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -18,14 +18,5 @@ require 'rspec/rails'
 Dir[Rails.root.join("../../spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
-
-end
-
-def capturing_output
-  output = StringIO.new
-  $stdout = output
-  yield
-  output.string
-ensure
-  $stdout = STDOUT
+  config.filter_run_excluding performance: true
 end

data/spec/support/capturing_output.rb

@@ -0,0 +1,8 @@
+def capturing_output
+  output = StringIO.new
+  $stdout = output
+  yield
+  output.string
+ensure
+  $stdout = STDOUT
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erector-rails4
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Chaffee
@@ -13,10 +13,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,6 +85,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +113,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +211,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: allocation_stats
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 description: This is a fork of Erector, updated for Rails 4.
 email: adam@dobt.co
 executables: []
@@ -195,6 +251,7 @@ files:
 - ".travis.yml"
 - Appraisals
 - Gemfile
+- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -202,11 +259,11 @@ files:
 - gemfiles/rails_3.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- lib/erector-rails4.rb
 - lib/erector.rb
 - lib/erector/abstract_widget.rb
 - lib/erector/after_initialize.rb
 - lib/erector/attributes.rb
-- lib/erector/cache.rb
 - lib/erector/caching.rb
 - lib/erector/convenience.rb
 - lib/erector/dependencies.rb
@@ -228,7 +285,6 @@ files:
 - lib/erector/rails/railtie.rb
 - lib/erector/rails/template_handler.rb
 - lib/erector/rails/widget_renderer.rb
-- lib/erector/raw_string.rb
 - lib/erector/sass.rb
 - lib/erector/tag.rb
 - lib/erector/text.rb
@@ -238,6 +294,10 @@ files:
 - lib/erector/widget.rb
 - lib/erector/widgets.rb
 - lib/erector/xml_widget.rb
+- script/bootstrap
+- script/cibuild
+- script/performance
+- script/release
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application.rb
 - spec/dummy/app/controllers/application_controller.rb
@@ -247,21 +307,39 @@ files:
 - spec/dummy/app/views/test/_erb.erb
 - spec/dummy/app/views/test/_erector.rb
 - spec/dummy/app/views/test/_partial_with_locals.rb
+- spec/dummy/app/views/test/_partial_with_rails_helpers.rb
+- spec/dummy/app/views/test/_user.rb
+- spec/dummy/app/views/test/_virtual_path_partial.rb
 - spec/dummy/app/views/test/bare.rb
 - spec/dummy/app/views/test/erb_from_erector.html.rb
 - spec/dummy/app/views/test/erector_from_erb.html.erb
+- spec/dummy/app/views/test/erector_with_helpers_from_erb.html.erb
 - spec/dummy/app/views/test/erector_with_locals_from_erb.html.erb
 - spec/dummy/app/views/test/implicit_assigns.html.rb
-- spec/dummy/app/views/test/needs.html.rb
-- spec/dummy/app/views/test/needs_subclass.html.rb
+- spec/dummy/app/views/test/needs.rb
+- spec/dummy/app/views/test/needs_subclass.rb
 - spec/dummy/app/views/test/protected_instance_variable.html.rb
 - spec/dummy/app/views/test/render_default.html.rb
 - spec/dummy/app/views/test/render_default_erb_with_layout.html.erb
 - spec/dummy/app/views/test/render_default_widget_with_layout.html.rb
 - spec/dummy/app/views/test/render_partial.html.rb
+- spec/dummy/app/views/test/render_virtual_path.rb
 - spec/dummy/app/views/test/render_with_widget_as_layout.rb
 - spec/dummy/app/views/test/render_with_widget_as_layout_using_content_for.rb
 - spec/dummy/app/views/test/simple_form.html.rb
+- spec/dummy/app/views/test/users.rb
+- spec/dummy/app/views/test_caching/_foos.rb
+- spec/dummy/app/views/test_caching/_partial.rb
+- spec/dummy/app/views/test_caching/cache_helper.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_explicit_dependencies.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_implicit_dependencies.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_partial.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_skip_digest.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_dynamic_keys.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_needs.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_needs_keys.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_skip_digest.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_static_keys.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -280,14 +358,12 @@ files:
 - spec/dummy/db/seeds.rb
 - spec/dummy/script/rails
 - spec/dummy/spec/autoload_spec.rb
+- spec/dummy/spec/caching_spec.rb
 - spec/dummy/spec/form_builder_spec.rb
 - spec/dummy/spec/rails_helpers_spec.rb
-- spec/dummy/spec/rails_spec_helper.rb
 - spec/dummy/spec/rails_widget_spec.rb
 - spec/dummy/spec/render_spec.rb
 - spec/erector/after_initialize_spec.rb
-- spec/erector/cache_spec.rb
-- spec/erector/caching_spec.rb
 - spec/erector/convenience_spec.rb
 - spec/erector/dependency_spec.rb
 - spec/erector/hello_from_readme.rb
@@ -306,10 +382,13 @@ files:
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
 - spec/erector/xml_widget_spec.rb
+- spec/performance/allocation_spec.rb
+- spec/performance/ruby_prof_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
+- spec/support/capturing_output.rb
+homepage: http://github.com/ajb/erector-rails4
 licenses:
 - MIT
 metadata: {}
@@ -321,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -343,21 +422,39 @@ test_files:
 - spec/dummy/app/views/test/_erb.erb
 - spec/dummy/app/views/test/_erector.rb
 - spec/dummy/app/views/test/_partial_with_locals.rb
+- spec/dummy/app/views/test/_partial_with_rails_helpers.rb
+- spec/dummy/app/views/test/_user.rb
+- spec/dummy/app/views/test/_virtual_path_partial.rb
 - spec/dummy/app/views/test/bare.rb
 - spec/dummy/app/views/test/erb_from_erector.html.rb
 - spec/dummy/app/views/test/erector_from_erb.html.erb
+- spec/dummy/app/views/test/erector_with_helpers_from_erb.html.erb
 - spec/dummy/app/views/test/erector_with_locals_from_erb.html.erb
 - spec/dummy/app/views/test/implicit_assigns.html.rb
-- spec/dummy/app/views/test/needs.html.rb
-- spec/dummy/app/views/test/needs_subclass.html.rb
+- spec/dummy/app/views/test/needs.rb
+- spec/dummy/app/views/test/needs_subclass.rb
 - spec/dummy/app/views/test/protected_instance_variable.html.rb
 - spec/dummy/app/views/test/render_default.html.rb
 - spec/dummy/app/views/test/render_default_erb_with_layout.html.erb
 - spec/dummy/app/views/test/render_default_widget_with_layout.html.rb
 - spec/dummy/app/views/test/render_partial.html.rb
+- spec/dummy/app/views/test/render_virtual_path.rb
 - spec/dummy/app/views/test/render_with_widget_as_layout.rb
 - spec/dummy/app/views/test/render_with_widget_as_layout_using_content_for.rb
 - spec/dummy/app/views/test/simple_form.html.rb
+- spec/dummy/app/views/test/users.rb
+- spec/dummy/app/views/test_caching/_foos.rb
+- spec/dummy/app/views/test_caching/_partial.rb
+- spec/dummy/app/views/test_caching/cache_helper.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_explicit_dependencies.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_implicit_dependencies.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_partial.rb
+- spec/dummy/app/views/test_caching/cache_helper_with_skip_digest.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_dynamic_keys.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_needs.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_needs_keys.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_skip_digest.rb
+- spec/dummy/app/views/test_caching/cacheable_widget_with_static_keys.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -376,14 +473,12 @@ test_files:
 - spec/dummy/db/seeds.rb
 - spec/dummy/script/rails
 - spec/dummy/spec/autoload_spec.rb
+- spec/dummy/spec/caching_spec.rb
 - spec/dummy/spec/form_builder_spec.rb
 - spec/dummy/spec/rails_helpers_spec.rb
-- spec/dummy/spec/rails_spec_helper.rb
 - spec/dummy/spec/rails_widget_spec.rb
 - spec/dummy/spec/render_spec.rb
 - spec/erector/after_initialize_spec.rb
-- spec/erector/cache_spec.rb
-- spec/erector/caching_spec.rb
 - spec/erector/convenience_spec.rb
 - spec/erector/dependency_spec.rb
 - spec/erector/hello_from_readme.rb
@@ -402,6 +497,10 @@ test_files:
 - spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
 - spec/erector/xml_widget_spec.rb
+- spec/performance/allocation_spec.rb
+- spec/performance/ruby_prof_spec.rb
 - spec/performance/support/basic_widget.rb
 - spec/performance/widget_to_html_spec.rb
 - spec/spec_helper.rb
+- spec/support/capturing_output.rb
+has_rdoc: