fortitude 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18462239455549b7d5cb928e800d12039ee251d5
-  data.tar.gz: 36098bcd9321189387d6321c9211e335adb4d530
+  metadata.gz: 88845b81038d6b4a3d41b56c84e701006030b928
+  data.tar.gz: fc4e1b77e485646708cf7f68575a085023909550
 SHA512:
-  metadata.gz: f2ccd3ba05b45c281a0d5919ab747c8a2afcaec9c06c7b303e45a757502c6201f58968279af65077a358cd8d92662cb93e9b59cb03b5a45de7db014e2a9fe112
-  data.tar.gz: db8657d85913dfa462056ca3965bcf41120cc64bd3fca78976a228eee205a552f78f354877f4c7ce5896b9cfba5b121da5516cabac05b572fc0d4272cffd32a3
+  metadata.gz: 8297fce44cc771521a2ff0ac537ef65ef9f71cd2f0df2b150dedc2b8574287e2bfa97c976479c2b829c581b7a92ed268ebfd3a0b7cd77bb80b4f8482efcb1f53
+  data.tar.gz: c9332675c8e1c4a7e0309b8a7b078d6ab62e9acd14f9c2defd4a0aee17e1aaf29b74ecdecc61c5172164b6d256ee3009e2adf0a1e25d9ed4906bdaa2df85eb9e

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Fortitude Releases
 
+## 0.0.3, 23 June 2014
+
+* Changed `Fortitude::Widget#to_html` to return the generated HTML. If you pass a `Fortitude::RenderingContext` into
+  this method that has previously been used to render other HTML, you'll get all HTML (old and new) both, because
+  we always append to a single output buffer — but that should be a corner case at most.
+
 ## 0.0.2, 21 June 2014
 
 * Void tags (those that can't take content, ever, like `<hr>` or `<br>`) are now never closed in HTML4 doctypes

data/lib/fortitude/rails/railtie.rb

@@ -209,7 +209,7 @@ module Fortitude
             if (options = args[0]).kind_of?(Hash)
               if (widget = options[:widget])
                 rendering_context = fortitude_rendering_context(:delegate_object => self)
-                widget.to_html(rendering_context)
+                widget.render_to(rendering_context)
 
                 options = options.dup
                 options[:text] = rendering_context.output_buffer_holder.output_buffer.html_safe
@@ -234,7 +234,7 @@ module Fortitude
                 assigns = assigns.merge(options[:locals] || { })
 
                 widget = widget_class.new(assigns)
-                widget.to_html(rendering_context)
+                widget.render_to(rendering_context)
 
                 options = options.dup
                 options[:text] = rendering_context.output_buffer_holder.output_buffer.html_safe

data/lib/fortitude/rails/renderer.rb

@@ -32,7 +32,7 @@ module Fortitude
             # RC for both the initial view rendering and for the partial layout, but they need different yield blocks.
             # Yuck, but this does the job.
             rendering_context.with_yield_block(block) do
-              widget.to_html(rendering_context)
+              widget.render_to(rendering_context)
             end
             rendering_context.flush!
           end

data/lib/fortitude/tilt/fortitude_template.rb

@@ -69,7 +69,7 @@ which is not a Class that inherits from Fortitude::Widget.}
         widget_assigns = fortitude_class.extract_needed_assigns_from(widget_assigns) unless fortitude_class.extra_assigns == :use
 
         widget = fortitude_class.new(widget_assigns)
-        widget.to_html(rendering_context)
+        widget.render_to(rendering_context)
         rendering_context.output_buffer_holder.output_buffer
       end
 

data/lib/fortitude/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/fortitude/widget/rendering.rb

@@ -23,8 +23,7 @@ module Fortitude
         end
       end
 
-      # PUBLIC API
-      def to_html(rendering_context)
+      def render_to(rendering_context)
         @_fortitude_rendering_context = rendering_context
         @_fortitude_output_buffer_holder = rendering_context.output_buffer_holder
 
@@ -39,6 +38,12 @@ module Fortitude
         end
       end
 
+      # PUBLIC API
+      def to_html(rendering_context = ::Fortitude::RenderingContext.new({ }))
+        render_to(rendering_context)
+        rendering_context.output_buffer_holder.output_buffer
+      end
+
       # PUBLIC API
       def rendering_context
         @_fortitude_rendering_context
@@ -46,7 +51,7 @@ module Fortitude
 
       # PUBLIC API
       def widget(w)
-        w.to_html(@_fortitude_rendering_context)
+        w.render_to(@_fortitude_rendering_context)
       end
 
       # PUBLIC API

data/spec/helpers/system_helpers.rb

@@ -86,7 +86,7 @@ module SystemHelpers
       widget_or_class
     end
     rendering_context = options[:rendering_context] || rc
-    widget.to_html(rendering_context)
+    widget.render_to(rendering_context)
     html_from(rendering_context)
   end
 

data/spec/system/widget_return_values_system_spec.rb

@@ -1,4 +1,22 @@
 describe "Fortitude widget return values", :type => :system do
+  describe "#to_html" do
+    it "should return the rendered text" do
+      wc = widget_class do
+        needs :name
+
+        def content
+          h1 "hello, #{name}"
+          div {
+            p "you are awesome, #{name}"
+          }
+        end
+      end
+
+      expect(wc.new(:name => 'wendy').to_html).to eq(
+        %{<h1>hello, wendy</h1><div><p>you are awesome, wendy</p></div>})
+    end
+  end
+
   describe "#widget" do
     it "should return whatever the widget returns" do
       inner = widget_class_with_content do
@@ -52,7 +70,7 @@ describe "Fortitude widget return values", :type => :system do
     end
   end
 
-  describe "#to_html" do
+  describe "#render_to" do
     it "should return whatever #content returns" do
       wc = widget_class_with_content do
         text "foo"
@@ -61,7 +79,7 @@ describe "Fortitude widget return values", :type => :system do
 
       widget = wc.new
       rendering_context = rc
-      actual_rv = widget.to_html(rendering_context)
+      actual_rv = widget.render_to(rendering_context)
       expect(actual_rv).to eq(:widget_rv)
     end
 
@@ -82,7 +100,7 @@ describe "Fortitude widget return values", :type => :system do
 
       widget = wc.new
       rendering_context = rc
-      actual_rv = widget.to_html(rendering_context)
+      actual_rv = widget.render_to(rendering_context)
       expect(actual_rv).to eq(:widget_rv)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Geweke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport