fortitude 0.0.4 → 0.0.5

data/lib/fortitude/widget/widget_class_inheritable_attributes.rb

@@ -15,6 +15,7 @@ module Fortitude
         _fortitude_class_inheritable_attribute :extra_assigns, :ignore, [ :error, :ignore, :use ]
         _fortitude_class_inheritable_attribute :automatic_helper_access, true, [ true, false ]
         _fortitude_class_inheritable_attribute :implicit_shared_variable_access, false, [ true, false ]
+        _fortitude_class_inheritable_attribute :record_tag_emission, false, [ true, false ]
         _fortitude_class_inheritable_attribute :enforce_element_nesting_rules, false, [ true, false ]
         _fortitude_class_inheritable_attribute :enforce_attribute_rules, false, [ true, false ]
         _fortitude_class_inheritable_attribute :enforce_id_uniqueness, false, [ true, false ]
@@ -30,6 +31,12 @@ module Fortitude
         end)
         _fortitude_class_inheritable_attribute :debug, false, [ true, false ]
       end
+
+      module ClassMethods
+        def _fortitude_record_emitting_tag?
+          self.enforce_element_nesting_rules || self.record_tag_emission
+        end
+      end
     end
   end
 end

data/spec/helpers/rails_server.rb

@@ -248,6 +248,10 @@ EOS
         # new-style hash syntax. As a result, we pin the version backwards in this one specific case.
         gemfile_contents << "\ngem 'execjs', '~> 2.0.0'\n" if RUBY_VERSION =~ /^1\.8\./
 
+        Array(@options[:additional_gemfile_lines] || [ ]).each do |gemfile_line|
+          gemfile_contents << "\n#{gemfile_line}\n"
+        end
+
         File.open(gemfile, 'w') { |f| f << gemfile_contents }
       end
 

data/spec/rails/basic_rails_system_spec.rb

@@ -4,4 +4,8 @@ describe "basic Rails support", :type => :rails do
   it "should be able to render a trivial widget" do
     expect_match("trivial_widget", /layout_default/, /hello, world/)
   end
+
+  it "should be able to use 'render' more than once in an action, and it should work fine" do
+    expect_match("double_render", /layout_default/, /hello, world.*goodbye, world.*and this is the last partial\!/mi)
+  end
 end

data/spec/rails/erector_coexistence_system_spec.rb

@@ -0,0 +1,33 @@
+describe "Erector coexistence support", :type => :rails do
+  uses_rails_with_template :erector_coexistence_system_spec, :additional_gemfile_lines => "gem 'erector'"
+
+  begin
+    gem 'erector'
+  rescue Gem::LoadError => le
+    # ok
+  end
+
+  begin
+    require 'erector'
+  rescue LoadError => le
+    # ok
+  end
+
+  if defined?(::Erector::Widget)
+    it "should be able to render a Fortitude widget in app/views" do
+      expect_match("fortitude_widget_in_app_views", /this is Fortitude: foo = bar/)
+    end
+
+    it "should be able to render a Fortitude widget in app/v/views" do
+      expect_match("fortitude_widget_in_app_v_views", /this is Fortitude: foo = marph/)
+    end
+
+    it "should be able to render an Erector widget in app/views" do
+      expect_match("erector_widget_in_app_views", /<p\s+class\s*=\s*"some_class"\s*>this is Erector: foo = baz<\/p>/)
+    end
+
+    it "should be able to render an Erector widget in app/v/views" do
+      expect_match("erector_widget_in_app_v_views", /<p\s+class\s*=\s*"some_class"\s*>this is Erector: foo = quux<\/p>/)
+    end
+  end
+end

data/spec/rails/rendering_context_system_spec.rb

@@ -32,7 +32,7 @@ describe "Rails RenderingContext support", :type => :rails do
   end
 
   it "should still call that method for all widgets" do
-    expect_match("uses_direct_context_for_all_widgets", /context is: SimpleRc, value 67890.*context is: SimpleRc, value 67891.*context is: SimpleRc, value 67890/mi)
+    expect_match("uses_direct_context_for_all_widgets", /context is: SimpleRc, value 67890.*context is: SimpleRc, value 67890.*context is: SimpleRc, value 67890/mi)
   end
 
   it "should call start_widget! and end_widget! properly on widgets in Rails" do
@@ -55,10 +55,26 @@ describe "Rails RenderingContext support", :type => :rails do
     lines = lines.select { |l| l =~ /^\d:/ }.map { |l| l.strip }
 
     expect(lines[0]).to eq("0: start Views::RenderingContextSystemSpec::StartEndWidgetThroughPartials")
-    expect(lines[1]).to eq("1: start [{:partial=>\"start_end_widget_through_partials_partial\"}]")
+    expect(lines[1]).to eq("1: start Fortitude::Tags::RenderWidgetPlaceholder [{:partial=>\"start_end_widget_through_partials_partial\"}]")
     expect(lines[2]).to eq("2: start Views::RenderingContextSystemSpec::StartEndWidgetThroughPartialsPartialWidget 12345")
     expect(lines[3]).to eq("3: end Views::RenderingContextSystemSpec::StartEndWidgetThroughPartialsPartialWidget 12345")
-    expect(lines[4]).to eq("4: end [{:partial=>\"start_end_widget_through_partials_partial\"}]")
+    expect(lines[4]).to eq("4: end Fortitude::Tags::RenderWidgetPlaceholder [{:partial=>\"start_end_widget_through_partials_partial\"}]")
     expect(lines.length).to eq(5)
+  end
+
+       # +<div><span>yohoho
+       # +<p>[Views::RenderingContextSystemSpec::CurrentElementNestingToplevel][Fortitude::Tags::Tag][Fortitude::Tags::PartialTagPlaceholder][Array][Views::RenderingContextSystemSpec::CurrentElementNestingChild][Fortitude::Tags::Tag]</p>
+       # +</span>
+       # +</div>
+
+  it "should return the correct #current_element_nesting, even through multiple widgets and partials" do
+    text = get_success("current_element_nesting_toplevel")
+    expect(text).to match(%r{<div><span>yohoho\s*<p>0:.*</p>\s*</span>\s*</div>$}mi)
+    expect(text).to match(%r{0: \[Views::RenderingContextSystemSpec::CurrentElementNestingToplevel\]}mi)
+    expect(text).to match(%r{1: \[Fortitude::Tags::Tag/:div\]}mi)
+    expect(text).to match(%r{2: \[Fortitude::Tags::PartialTagPlaceholder/:_fortitude_partial_placeholder\]}mi)
+    expect(text).to match(%r{3: \[Fortitude::Tags::RenderWidgetPlaceholder/:_fortitude_render_widget_placeholder\]}mi)
+    expect(text).to match(%r{4: \[Views::RenderingContextSystemSpec::CurrentElementNestingChild\]}mi)
+    expect(text).to match(%r{5: \[Fortitude::Tags::Tag/:p\]}mi)
   end
 end

data/spec/rails/rendering_system_spec.rb

@@ -20,6 +20,12 @@ describe "Rails rendering support", :type => :rails do
       expect(data).not_to match(/rails_spec_application/)
     end
 
+    it "should set the Content-Type to text/html when using render :widget" do
+      response = get_response("render_widget")
+      expect(response.body).to match(/hello from a widget named Fred/)
+      expect(response.header['Content-Type']).to match(%r{text/html}i)
+    end
+
     it "should let you render a widget with 'render \"foo\"'" do
       expect_match("render_widget_via_file_path", /hello from a widget named Fred/)
     end

data/spec/rails/templates/basic_rails_system_spec/app/controllers/basic_rails_system_spec_controller.rb

@@ -2,6 +2,11 @@ class BasicRailsSystemSpecController < ApplicationController
   def trivial_widget
   end
 
+  def double_render
+    @rendered_string = render_to_string(:action => 'double_render_one', :layout => nil)
+    render :action => 'double_render_two'
+  end
+
   def the_class_should_not_load
     render :text => BasicRailsSystemSpec::ClassShouldNotLoad.new.to_s
   end

data/spec/rails/templates/basic_rails_system_spec/app/views/basic_rails_system_spec/double_render_one.rb

@@ -0,0 +1,5 @@
+class Views::BasicRailsSystemSpec::DoubleRenderOne < Fortitude::Widgets::Html5
+  def content
+    p "hello, world"
+  end
+end

data/spec/rails/templates/basic_rails_system_spec/app/views/basic_rails_system_spec/double_render_three.rb

@@ -0,0 +1,5 @@
+class Views::BasicRailsSystemSpec::DoubleRenderThree < Fortitude::Widgets::Html5
+  def content
+    p "and this is the last partial!"
+  end
+end

data/spec/rails/templates/basic_rails_system_spec/app/views/basic_rails_system_spec/double_render_two.rb

@@ -0,0 +1,9 @@
+class Views::BasicRailsSystemSpec::DoubleRenderTwo < Fortitude::Widgets::Html5
+  needs :rendered_string
+
+  def content
+    rawtext rendered_string
+    p "goodbye, world"
+    render :partial => 'double_render_three'
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/controllers/erector_coexistence_system_spec_controller.rb

@@ -0,0 +1,19 @@
+class ErectorCoexistenceSystemSpecController < ApplicationController
+  prepend_view_path "app/v/views"
+
+  def fortitude_widget_in_app_views
+    @foo = "bar"
+  end
+
+  def fortitude_widget_in_app_v_views
+    @foo = "marph"
+  end
+
+  def erector_widget_in_app_views
+    @foo = "baz"
+  end
+
+  def erector_widget_in_app_v_views
+    @foo = "quux"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/erector_widget_in_app_v_views.rb

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::ErectorWidgetInAppVViews < Erector::Widget
+  needs :foo
+
+  def content
+    p.some_class "this is Erector: foo = #{@foo}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/fortitude_widget_in_app_v_views.rb

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::FortitudeWidgetInAppVViews < Fortitude::Widgets::Html5
+  needs :foo
+
+  def content
+    p "this is Fortitude: foo = #{foo}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_in_app_views.rb

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::ErectorWidgetInAppViews < Erector::Widget
+  needs :foo
+
+  def content
+    p.some_class "this is Erector: foo = #{@foo}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_in_app_views.rb

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::FortitudeWidgetInAppViews < Fortitude::Widgets::Html5
+  needs :foo
+
+  def content
+    p "this is Fortitude: foo = #{foo}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/config/application.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env)
+
+module ErectorCoexistenceSystemSpec
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    config.autoload_paths += [ File.join(Rails.root, "app", "v") ]
+  end
+end

data/spec/rails/templates/rendering_context_system_spec/app/controllers/rendering_context_system_spec_controller.rb

@@ -35,7 +35,7 @@ class RenderingContextSystemSpecController < ApplicationController
   def uses_direct_context_in_view
     $invoke_count = 0
     class << self
-      def fortitude_rendering_context(options)
+      def create_fortitude_rendering_context(options)
         out = SimpleRc.new(options.merge(:the_value => 67890 + $invoke_count))
         $invoke_count += 1
         out
@@ -46,7 +46,7 @@ class RenderingContextSystemSpecController < ApplicationController
   def uses_direct_context_for_all_widgets
     $invoke_count = 0
     class << self
-      def fortitude_rendering_context(options)
+      def create_fortitude_rendering_context(options)
         out = SimpleRc.new(options.merge(:the_value => 67890 + $invoke_count))
         $invoke_count += 1
         out

data/spec/rails/templates/rendering_context_system_spec/app/views/rendering_context_system_spec/_current_element_nesting_intermediate.html.erb

@@ -0,0 +1,3 @@
+<span>yohoho
+<%= render :partial => 'current_element_nesting_child' %>
+</span>

data/spec/rails/templates/rendering_context_system_spec/app/views/rendering_context_system_spec/current_element_nesting_child.rb

@@ -0,0 +1,13 @@
+class Views::RenderingContextSystemSpec::CurrentElementNestingChild < Fortitude::Widgets::Html5
+  record_tag_emission true
+
+  def content
+    p {
+      rendering_context.current_element_nesting.each_with_index do |item, index|
+        name_text = ""
+        name_text = "/#{item.name.inspect}" if item.respond_to?(:name)
+        text "#{index}: [#{item.class.name}#{name_text}]\n"
+      end
+    }
+  end
+end

data/spec/rails/templates/rendering_context_system_spec/app/views/rendering_context_system_spec/current_element_nesting_toplevel.rb

@@ -0,0 +1,9 @@
+class Views::RenderingContextSystemSpec::CurrentElementNestingToplevel < Fortitude::Widgets::Html5
+  record_tag_emission true
+
+  def content
+    div {
+      render :partial => 'current_element_nesting_intermediate'
+    }
+  end
+end

data/spec/rails/templates/rendering_context_system_spec/app/views/rendering_context_system_spec/start_end_widget_through_partials.rb

@@ -5,8 +5,8 @@ class Views::RenderingContextSystemSpec::StartEndWidgetThroughPartials < Fortitu
     rendering_context.start_end_calls.each_with_index do |data, index|
       start_or_end = data[0]
       widget = data[1]
-      widget_data = if widget.kind_of?(Array)
-        widget.inspect
+      widget_data = if widget.respond_to?(:render_args)
+        "#{widget.class.name} #{widget.render_args.inspect}"
       else
         widget.class.name
       end

data/spec/system/convenience_methods_system_spec.rb

@@ -1,4 +1,26 @@
 describe "Fortitude convenience methods", :type => :system do
+  describe "#all_fortitude_superclasses" do
+    it "should return an empty array for ::Fortitude::Widget" do
+      expect(::Fortitude::Widget.all_fortitude_superclasses).to eq([ ])
+    end
+
+    it "should return just ::Fortitude::Widget for a direct subclass" do
+      class ConvenienceSpecAllSuperclassesDirectSubclass < ::Fortitude::Widget; end
+      expect(ConvenienceSpecAllSuperclassesDirectSubclass.all_fortitude_superclasses).to eq([ ::Fortitude::Widget ])
+    end
+
+    it "should return a whole class hierarchy if appropriate" do
+      class ConvenienceSpecAllSuperclassesGrandparent < ::Fortitude::Widget; end
+      class ConvenienceSpecAllSuperclassesParent < ConvenienceSpecAllSuperclassesGrandparent; end
+      class ConvenienceSpecAllSuperclassesChild < ConvenienceSpecAllSuperclassesParent; end
+      expect(ConvenienceSpecAllSuperclassesChild.all_fortitude_superclasses).to eq([
+        ConvenienceSpecAllSuperclassesParent,
+        ConvenienceSpecAllSuperclassesGrandparent,
+        ::Fortitude::Widget
+      ])
+    end
+  end
+
   describe "#javascript" do
     it "should output JavaScript inside the proper tag, by default" do
       expect(render(widget_class_with_content { javascript "hi, there" })).to eq(

data/spec/system/inline_system_spec.rb

@@ -25,7 +25,7 @@ describe "Fortitude inline-code support", :type => :system do
 <div>
   <p>hello, julia</p>
 </div>
-<!-- END  depth 0 -->})
+<!-- END (anonymous widget class) depth 0 -->})
   end
 
   it "should let you get rendered content back with .inline_html" do
@@ -53,6 +53,6 @@ describe "Fortitude inline-code support", :type => :system do
 <div>
   <p>hello, julia</p>
 </div>
-<!-- END  depth 0 -->})
+<!-- END (anonymous widget class) depth 0 -->})
   end
 end

data/spec/system/record_tag_emission_system_spec.rb

@@ -0,0 +1,71 @@
+describe "Fortitude record_tag_emission behavior", :type => :system do
+  before :each do
+    @recording_class = widget_class do
+      attr_reader :recorded_tags
+
+      def content
+        div {
+          p {
+            @recorded_tags = rendering_context.current_element_nesting.dup
+          }
+        }
+      end
+    end
+  end
+
+  it "should not record tag emission by default" do
+    expect(recorded_tags_from(@recording_class.new)).to eq([ ])
+  end
+
+  it "should record tag emission if asked to" do
+    @recording_class.class_eval { record_tag_emission true }
+    expect(recorded_tags_from(@recording_class.new).map(&:name)).to eq([ :div, :p ])
+  end
+
+  it "should record tag emission across two widgets" do
+    parent_class = widget_class do
+      record_tag_emission true
+      attr_accessor :child_instance
+
+      def content
+        div {
+          widget child_instance
+        }
+      end
+    end
+
+    child_class = widget_class do
+      record_tag_emission true
+      attr_reader :recorded_tags
+
+      def content
+        p {
+          @recorded_tags = rendering_context.current_element_nesting.dup
+        }
+      end
+    end
+
+    parent_instance = parent_class.new
+    child_instance = child_class.new
+
+    parent_instance.child_instance = child_instance
+
+    results = render(parent_instance)
+    expect(results).to eq("<div><p></p></div>")
+
+    rt = child_instance.recorded_tags
+
+    expect(rt.shift).to be(parent_instance)
+    expect(rt.shift.name).to eq(:div)
+    expect(rt.shift).to be(child_instance)
+    expect(rt.shift.name).to eq(:p)
+    expect(rt).to eq([ ])
+  end
+
+  def recorded_tags_from(instance)
+    expect(render(instance)).to eq("<div><p></p></div>")
+    rt = instance.recorded_tags
+    expect(rt.shift).to be(instance)
+    rt
+  end
+end

data/spec/system/rendering_context_system_spec.rb

@@ -21,6 +21,27 @@ describe "Fortitude rendering context interactions", :type => :system do
     super(widget_or_class, options.merge(:rendering_context => @rc))
   end
 
+  it "should return the parent widget properly" do
+    child_widget_class = widget_class_with_content { p "child: #{rendering_context.parent_widget.some_method}" }
+    parent_widget_class = widget_class do
+      attr_accessor :child_widget_class
+
+      def some_method
+        "ahoy!"
+      end
+
+      def content
+        p "foo"
+        widget child_widget_class.new
+        p "baz"
+      end
+    end
+
+    pw = parent_widget_class.new
+    pw.child_widget_class = child_widget_class
+    expect(render(pw)).to eq("<p>foo</p><p>child: ahoy!</p><p>baz</p>")
+  end
+
   it "should call start_widget! and end_widget! on the context when starting and ending a simple widget" do
     wc = widget_class_with_content { p "foo" }
     instance = wc.new