fortitude 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef3f1d9ea4fed42b18ff222ae38850effb0f9fae
-  data.tar.gz: 555f72bda0961a863c4c418ffe59fbaee11250cd
+  metadata.gz: 8bc0feb041f46a5daae1e38effcc4f63c04a6585
+  data.tar.gz: 76f87dc4c555d49e3316cd11ceeeeeecd94c98c8
 SHA512:
-  metadata.gz: e4491a8d9a39112a5ba3b39ae093d2d312eb1507eab816fe13846c7b8d92f4fc4239057f9751ab1019462795d5c19f3994d9ceb56dd9eaf76934be7e41339686
-  data.tar.gz: 9308e4d70f1cc45765e731983d02262dbab9988bb59a0092ef78c701196ec2e76a1025331c288ebafaa16ccfa340e0ba8ec1bc19590165e9c413475feff37c5f
+  metadata.gz: 860c7e733059f5fc5ec10bce8bbf05a8c547587d937d88641cc40f69003ec723371d27a25c2cc39c84854551a0847648a27611a3f8e66efe9dc6002ed9edb919
+  data.tar.gz: 6e59c6df7ddcb49be326c3f8ba80a35ead5a7888f83b5dc55d28c09ddc1349670bd850e78a36dae6bec85b7fe538a50d5c2e5ee97f7291f320faa107c1157b3f

data/CHANGES.md

@@ -1,5 +1,14 @@
 # Fortitude Releases
 
+## 0.9.1, 14 December 2014
+
+* Fixed a bug where doing something like `div nil, :class => 'foo'` would simply output `<div></div>`, rather than the
+  desired `<div class="foo"></div>`. (Thanks to [Leaf](https://github.com/leafo) for the bug report!)
+* You can now render widgets from ERb using a `widget` method, using the exact same syntax you would for rendering them
+  from Fortitude. In addition, this works for Erector widgets, too.
+* Fixed a bug where calling `Fortitude::Widget.widget_class_from_file` would fail if the class name as specified in the
+  source text of the file started with leading colons (_e.g._, `class ::Views::Foo`).
+
 ## 0.9.0, 29 November 2014
 
 Updated Fortitude's version number to 0.9.0: at this point, Fortitude should be considered fully production-ready,

data/CONTRIBUTORS.md

@@ -29,6 +29,8 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
     the module it used to mix in helper methods was given two names, one of them incorrect.
   * Reporting a bug where using `#capture` inside a widget being rendered via `render :widget => ...` would not work
     properly.
+  * Reporting a bug where doing something like `div(nil, :class => 'foo')` would produce just `<div></div>` instead of
+    the desired `<div class="foo"></div>`.
 * [Adam Becker](https://github.com/ajb) for:
   * Discussion and details around exactly what `:attribute => true`, `:attribute => false`, and so on should render
     from Fortitude.

data/lib/fortitude/method_templates/tag_method_template.rb.smpl

@@ -11,16 +11,24 @@ def #{method_name}(content_or_attributes = nil, attributes = nil)
     end                                                                    # :if needs_formatting
 
     if (! content_or_attributes)
-      if block_given?
-        _fortitude_raise_no_content_allowed_error(#{tag_object_const})     # :if ! content_allowed
-        o.#{concat_method}(#{open_const})
-        #{yield_call}
-        o = @_fortitude_output_buffer_holder.output_buffer
-        o.#{concat_method}(#{close_const})
+      if attributes
+        content_or_attributes, attributes = attributes, nil
       else
-        o.#{concat_method}(#{alone_const})
+        if block_given?
+          _fortitude_raise_no_content_allowed_error(#{tag_object_const})     # :if ! content_allowed
+          o.#{concat_method}(#{open_const})
+          #{yield_call}
+          o = @_fortitude_output_buffer_holder.output_buffer
+          o.#{concat_method}(#{close_const})
+        else
+          o.#{concat_method}(#{alone_const})
+        end
+
+        return FORTITUDE_NO_RETURN_VALUE_FROM_TAGS
       end
-    elsif content_or_attributes.kind_of?(Hash)
+    end
+
+    if content_or_attributes.kind_of?(Hash)
       this_tag.validate_attributes(self, content_or_attributes)            # :if needs_attribute_rules
       this_tag.validate_id_uniqueness(self, content_or_attributes)         # :if needs_id_uniqueness
       o.#{concat_method}(#{partial_open_const})

data/lib/fortitude/rails/fortitude_rails_helpers.rb

@@ -0,0 +1,32 @@
+require 'active_support/concern'
+
+module Fortitude
+  module Rails
+    module FortitudeRailsHelpers
+      extend ActiveSupport::Concern
+
+      EMPTY_RETURN_VALUE = ''.html_safe.freeze
+
+      def widget(target, assigns = {}, options = {}, &block)
+        if target.kind_of?(Class) && ((target < ::Fortitude::Widget) || ::Fortitude::Erector.is_erector_widget_class?(target))
+          assigns ||= { }
+          target = target.new(assigns)
+        end
+
+        if target.kind_of?(::Fortitude::Widget)
+          rendering_context = ::Fortitude::RenderingContext.new(:delegate_object => self)
+          target.render_to(rendering_context, &block)
+        elsif ::Fortitude::Erector.is_erector_widget?(target)
+          target.send(:_emit,
+            :parent => self,
+            :helpers => self,
+            :output => output_buffer)
+        else
+          raise TypeError, "You must pass a Fortitude or Erector widget, or widget class, to #widget; you passed: #{target.inspect}"
+        end
+
+        EMPTY_RETURN_VALUE
+      end
+    end
+  end
+end

data/lib/fortitude/rails/railtie.rb

@@ -1,4 +1,5 @@
 require 'fortitude/rendering_context'
+require 'fortitude/rails/fortitude_rails_helpers'
 
 if defined?(ActiveSupport)
   ActiveSupport.on_load(:before_initialize) do
@@ -28,6 +29,8 @@ module Fortitude
           Fortitude::Rails::Helpers.apply_refined_helpers_to!(Fortitude::Widget)
         end
 
+        ::ActionView::Base.send(:include, ::Fortitude::Rails::FortitudeRailsHelpers)
+
         if ::Rails.env.development?
           ::Fortitude::Widget.class_eval do
             format_output true

data/lib/fortitude/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/fortitude/widget/files.rb

@@ -130,6 +130,7 @@ or add a "magic comment" to the source code of this widget that looks like this:
           out = nil
 
           class_names.each do |class_name|
+            class_name = $1 if class_name =~ /^:+(.*)$/i
             klass = begin
               "::#{class_name}".constantize
             rescue NameError => ne

data/spec/rails/erb_integration_system_spec.rb

@@ -6,6 +6,16 @@ describe "Rails ERb integration support", :type => :rails do
       /erb_start/, /erb_end/, /erb_start.*erb to widget with render partial widget.*erb_end/m)
   end
 
+  it "should let you call a widget from an ERb file with widget" do
+    expect_match("erb_to_widget_with_widget", /erb to widget with widget widget/,
+      /erb_start/, /erb_end/, /erb_start.*erb to widget with widget widget, name Josephine.*erb_end/m)
+  end
+
+  it "should let you call a widget from an ERb file with widget, passing the class" do
+    expect_match("erb_to_widget_with_widget_class", /erb to widget with widget widget/,
+      /erb_start/, /erb_end/, /erb_start.*erb to widget with widget widget, name Josephine.*erb_end/m)
+  end
+
   it "should prefer ERb partials to Fortitude partials" do
     expect_match("prefers_erb_partial", /erb partial/,
       /erb_start.*erb partial.*erb_end/m)

data/spec/rails/erector_coexistence_system_spec.rb

@@ -38,6 +38,14 @@ describe "Erector coexistence support", :type => :rails do
       expect_match("render_widget_erector", /this is an Erector widget/, :no_layout => true)
     end
 
+    it "should be able to render a Fortitude widget from ERb using #widget" do
+      expect_match("widget_from_erb_fortitude", /this is a Fortitude widget, Josephine.*this is a Fortitude widget, Amanda/mi)
+    end
+
+    it "should be able to render an Erector widget from ERb using #widget" do
+      expect_match("widget_from_erb_erector", /this is an Erector widget, Josephine.*this is an Erector widget, Amanda/mi)
+    end
+
     it "should be able to render a Fortitude widget with just a class using render :widget" do
       expect_match("render_widget_fortitude_class", /this is a Fortitude widget/)
     end

data/spec/rails/templates/erb_integration_system_spec/app/controllers/erb_integration_system_spec_controller.rb

@@ -2,6 +2,12 @@ class ErbIntegrationSystemSpecController < ApplicationController
   def erb_to_widget_with_render_partial
   end
 
+  def erb_to_widget_with_widget
+  end
+
+  def erb_to_widget_with_widget_class
+  end
+
   def prefers_erb_partial
   end
 

data/spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget.html.erb

@@ -0,0 +1,3 @@
+<p>erb_start</p>
+<%= widget Views::ErbIntegrationSystemSpec::ErbToWidgetWithWidgetWidget.new(:name => 'Josephine') %>
+<p>erb_end</p>

data/spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget_class.html.erb

@@ -0,0 +1,3 @@
+<p>erb_start</p>
+<%= widget Views::ErbIntegrationSystemSpec::ErbToWidgetWithWidgetWidget, :name => 'Josephine' %>
+<p>erb_end</p>

data/spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget_widget.rb

@@ -0,0 +1,7 @@
+class Views::ErbIntegrationSystemSpec::ErbToWidgetWithWidgetWidget < Fortitude::Widgets::Html5
+  needs :name
+
+  def content
+    p "erb to widget with widget widget, name #{name}"
+  end
+end

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

@@ -25,6 +25,14 @@ class ErectorCoexistenceSystemSpecController < ApplicationController
     render :widget => ::Views::ErectorWidget.new
   end
 
+  def widget_from_erb_fortitude
+    # nothing here
+  end
+
+  def widget_from_erb_erector
+    # nothing here
+  end
+
   def render_widget_fortitude_class
     render :widget => ::Views::FortitudeWidget
   end

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

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::ErectorWidget < ::Erector::Widget
+  needs :name
+
+  def content
+    p "this is an Erector widget, #{@name}"
+  end
+end

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

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::FortitudeWidget < ::Fortitude::Widgets::Html5
+  needs :name
+
+  def content
+    p "this is a Fortitude widget, #{name}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/widget_from_erb_erector.html.erb

@@ -0,0 +1,4 @@
+<p>erb_start</p>
+<%= widget Views::ErectorCoexistenceSystemSpec::ErectorWidget.new(:name => 'Josephine') %>
+<%= widget Views::ErectorCoexistenceSystemSpec::ErectorWidget, :name => 'Amanda' %>
+<p>erb_end</p>

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/widget_from_erb_fortitude.html.erb

@@ -0,0 +1,4 @@
+<p>erb_start</p>
+<%= widget Views::ErectorCoexistenceSystemSpec::FortitudeWidget.new(:name => 'Josephine') %>
+<%= widget Views::ErectorCoexistenceSystemSpec::FortitudeWidget, :name => 'Amanda' %>
+<p>erb_end</p>

data/spec/system/needs_building_performance_system_spec.rb

@@ -0,0 +1,39 @@
+describe "Fortitude needs-building performance", :type => :system do
+  CLASS_COUNT = 2_000
+  NEEDS_NAMES = %w{foo bar baz quux marph}
+
+  it "should build needs quickly" do
+    skip "nope"
+
+    widget_classes = [ ]
+
+    puts "creating #{CLASS_COUNT} widget classes..."
+    CLASS_COUNT.times do |i|
+      klass = widget_class do
+        def content
+          "widget_class!"
+        end
+      end
+
+      needs_count = rand(NEEDS_NAMES.length + 1)
+      needs_count.times do |i|
+        klass.send(:needs, NEEDS_NAMES[i] => "the_#{NEEDS_NAMES[i]}")
+      end
+
+      widget_classes << klass
+    end
+
+    start_time = Time.now
+    widget_classes.each { |wc| wc.new }
+    end_time = Time.now
+
+    puts "Took #{end_time - start_time} seconds to instantiate all #{widget_classes.length} widget classes the first time."
+    puts "total_time_spent: #{$total_time_spent}"
+
+    start_time = Time.now
+    widget_classes.each { |wc| wc.new }
+    end_time = Time.now
+
+    puts "Took #{end_time - start_time} seconds to instantiate all #{widget_classes.length} widget classes the second time."
+  end
+end

data/spec/system/tag_rendering_system_spec.rb

@@ -23,6 +23,10 @@ describe "Fortitude tag rendering", :type => :system do
     should_render_to("") { rawtext(nil) }
   end
 
+  it "should allow rendering nil as text, but still passing options" do
+    should_render_to("<div class=\"foo\"></div>") { div(nil, :class => 'foo') }
+  end
+
   it "should render an attribute mapped to nil as missing" do
     should_render_to("<p></p>") { p(:class => nil) }
     should_render_to("<p></p>") { p(:foo => { :bar => nil }) }

data/spec/system/widget_class_from_spec.rb

@@ -56,6 +56,10 @@ describe "Fortitude widget-class-from-(file|source) support", :type => :system d
       expect(wcfs("class WidgetFromClass12 < WidgetFromClass12Parent; end")).to eq(WidgetFromClass12)
     end
 
+    it "should work if given a class name with a leading :: prefix" do
+      expect(wcfs("class ::WidgetFromClassWithColons < Fortitude::Widget; end")).to eq(::WidgetFromClassWithColons)
+    end
+
     it "should be able to guess the class name of a class namespaced in a module" do
       module ::Wcfs1; end
       expect(wcfs("class Wcfs1::WidgetFromClass6 < ::Fortitude::Widget; end")).to eq(Wcfs1::WidgetFromClass6)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Andrew Geweke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,6 +174,7 @@ files:
 - lib/fortitude/method_templates/tag_method_template.rb.smpl
 - lib/fortitude/method_templates/text_method_template.rb.smpl
 - lib/fortitude/rails.rb
+- lib/fortitude/rails/fortitude_rails_helpers.rb
 - lib/fortitude/rails/helpers.rb
 - lib/fortitude/rails/railtie.rb
 - lib/fortitude/rails/renderer.rb
@@ -363,6 +364,9 @@ files:
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_partial_from_widget.rb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_render_partial.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_render_partial_widget.rb
+- spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget.html.erb
+- spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget_class.html.erb
+- spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget_widget.rb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/fortitude_partial_with_underscore.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial_partial.rb
@@ -370,12 +374,16 @@ files:
 - spec/rails/templates/erector_coexistence_system_spec/app/helpers/application_helper.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/erector_widget_in_app_v_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/fortitude_widget_in_app_v_views.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_from_fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_in_app_views.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_from_erector_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_in_app_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_erector_widget_from_fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_fortitude_widget_from_erector_widget.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/widget_from_erb_erector.html.erb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/widget_from_erb_fortitude.html.erb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/config/application.rb
@@ -527,6 +535,7 @@ files:
 - spec/system/inline_system_spec.rb
 - spec/system/localization_system_spec.rb
 - spec/system/method_precedence_system_spec.rb
+- spec/system/needs_building_performance_system_spec.rb
 - spec/system/needs_system_spec.rb
 - spec/system/other_outputters_system_spec.rb
 - spec/system/rails_not_available_spec.rb
@@ -711,6 +720,9 @@ test_files:
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_partial_from_widget.rb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_render_partial.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_render_partial_widget.rb
+- spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget.html.erb
+- spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget_class.html.erb
+- spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/erb_to_widget_with_widget_widget.rb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/fortitude_partial_with_underscore.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial_partial.rb
@@ -718,12 +730,16 @@ test_files:
 - spec/rails/templates/erector_coexistence_system_spec/app/helpers/application_helper.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/erector_widget_in_app_v_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/fortitude_widget_in_app_v_views.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_from_fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_in_app_views.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_from_erector_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_in_app_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_erector_widget_from_fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_fortitude_widget_from_erector_widget.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/widget_from_erb_erector.html.erb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/widget_from_erb_fortitude.html.erb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/config/application.rb
@@ -875,6 +891,7 @@ test_files:
 - spec/system/inline_system_spec.rb
 - spec/system/localization_system_spec.rb
 - spec/system/method_precedence_system_spec.rb
+- spec/system/needs_building_performance_system_spec.rb
 - spec/system/needs_system_spec.rb
 - spec/system/other_outputters_system_spec.rb
 - spec/system/rails_not_available_spec.rb