fortitude 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8fe2be7aaffdb2b3e57d0b26fdacbc2c1124a57
-  data.tar.gz: 01ada85328794df979d33ccff7a2ea41f88425f3
+  metadata.gz: b672c6981cd2da1af20a06cac52a1da20f1e03d1
+  data.tar.gz: 1e0c7a205c8c821ea68218c1fe15a729902d9a90
 SHA512:
-  metadata.gz: 7394aeae5282f4109dbbe772a882ae066043a253813fc63b6b4e0d1ebdabb31de3e998a66969c347b37262c3a3365af2d6a1bf084e15ed9a8f9a6afa9c672ff5
-  data.tar.gz: 58b2ad3cdddd71f0120f9039ab9112ecaa4fc542c2104e98565341898e36c6b247dd7c60c07f39cee47d4fb5c47f95f11b0d27bbb75a605050c41fe47d38bd51
+  metadata.gz: 281dbee5a7ade09027c4855542f200e1186c23f8d86fafdaa4940e1843df904dab8119d0a5f8b7414a64c378e7588f03dd4a591cc4850fe1f0e3ee8690c7e86a
+  data.tar.gz: 17a6d7cdbd63ddfa38f32e671d747c34df382e0558f49549132a68c2d6d84ccc574003870e21ebf769697a0dc6424b85de762459055948cb8acc160005d512e8

data/.travis.yml

@@ -2,15 +2,15 @@ rvm:
     - "1.8.7"
     - "1.9.3"
     - "2.0.0"
-    - "2.1.2"
-    - "jruby-1.7.15"
+    - "2.1.4"
+    - "jruby-1.7.16.1"
 env:
-    - FORTITUDE_SPECS_RAILS_VERSION=4.1.6
-    - FORTITUDE_SPECS_RAILS_VERSION=4.0.10
-    - FORTITUDE_SPECS_RAILS_VERSION=3.2.19
+    - FORTITUDE_SPECS_RAILS_VERSION=4.1.7
+    - FORTITUDE_SPECS_RAILS_VERSION=4.0.11
+    - FORTITUDE_SPECS_RAILS_VERSION=3.2.20
     - FORTITUDE_SPECS_RAILS_VERSION=3.1.12
     - FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-    - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.6
+    - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.7
     - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20
 before_script:
     - export JRUBY_OPTS="$JRUBY_OPTS -J-Xmx128m -J-Xms128m -J-Xss2048k"
@@ -18,11 +18,11 @@ matrix:
     exclude:
         # Rails 4.x doesn't support Ruby 1.8.7
         -   rvm: 1.8.7
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.6
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.7
         -   rvm: 1.8.7
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.6
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.7
         -   rvm: 1.8.7
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.10
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.11
         # 2014-06-19 ageweke -- ARGH. After trying about seventeen different things, no matter what I do,
         # Travis fails JRuby builds about 20% of the time with "Killed". Their documentation indicates that this
         # is likely an out-of-memory issue (i.e., entire VM's memory is consumed). However, I'm running JRuby with
@@ -34,17 +34,17 @@ matrix:
         # one manually to make sure there aren't other failures, too. This is very frustrating, but I can't seem to
         # find a way around it. If there's a fix out there somewhere, I'm all ears!
     allow_failures:
-        -   rvm: jruby-1.7.15
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.6
-        -   rvm: jruby-1.7.15
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.10
-        -   rvm: jruby-1.7.15
-            env: FORTITUDE_SPECS_RAILS_VERSION=3.2.19
-        -   rvm: jruby-1.7.15
+        -   rvm: jruby-1.7.16.1
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.7
+        -   rvm: jruby-1.7.16.1
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.11
+        -   rvm: jruby-1.7.16.1
+            env: FORTITUDE_SPECS_RAILS_VERSION=3.2.20
+        -   rvm: jruby-1.7.16.1
             env: FORTITUDE_SPECS_RAILS_VERSION=3.1.12
-        -   rvm: jruby-1.7.15
+        -   rvm: jruby-1.7.16.1
             env: FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-        -   rvm: jruby-1.7.15
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.6
-        -   rvm: jruby-1.7.15
+        -   rvm: jruby-1.7.16.1
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.7
+        -   rvm: jruby-1.7.16.1
             env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20

data/CHANGES.md

@@ -1,5 +1,24 @@
 # Fortitude Releases
 
+## 0.0.6, 11 November 2014
+
+* Fixed an issue where naming a widget with an `.html.rb` extension (for example) at the end would work at first,
+  but cause really irritating errors (like `uninitialized constant Views::Foo::Bar` apparently _in_ the very file
+  that defines `Views::Foo::Bar` correctly in `app/views/foo/bar.html.rb`) when editing code in development mode.
+  (Thanks to [Jacob Maine](https://github.com/mainej) for the very detailed bug report!)
+* Fixed an issue where trying to use Fortitude as a Tilt engine, but passing `nil` for the `locals`, would cause an
+  exception. (Thanks to [Roman Heinrich](https://github.com/mindreframer) for reporting the bug!)
+* Using Fortitude as a template engine for mailers (`ActionMailer::Base` subclasses) now works. (Believe it or not,
+  this was almost completely an issue of forgetting to support this, rather than it being undone — the code
+  was complete, and it was just a matter of applying it to `ActionMailer::Base` as well as `ActionController::Base`.)
+  (Thanks to [Jacob Maine](https://github.com/mainej) for the bug report and pull request!)
+* The various on-the-fly modules that Fortitude creates and mixes in to widgets (and define helpers,  tag methods,
+  and `needs` methods) now all have actual names, which makes them much easier to identify in debugging printouts.
+* The code in `spec/` that knew how to reliably create, maintain, shut down, and otherwise manipulate an external
+  `rails server` process has now been pulled out into its own gem, `oop_rails_server`; this is so I can also use it
+  with a new, closely-related upcoming project, and because reuse is good. ;)
+* Updated the Travis configuration to the very latest Ruby and Rails versions.
+
 ## 0.0.5, 22 September 2014
 
 * You can now load both Fortitude and Erector at the same time into a project, and it will "just work": Erector

data/CONTRIBUTORS.md

@@ -4,3 +4,5 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
 
 * [Ahto Jussila](https://github.com/ahto): a patch to provide separate MRI and JRuby gems, so that
   `gem install fortitude` works properly no matter which platform you're on.
+* [Roman Heinrich](https://github.com/mindreframer): reporting a bug where trying to use Fortitude as a Tilt
+  engine to render would fail if the locals passed in were `nil`.

data/fortitude.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake-compiler"
   s.add_development_dependency "json"
   s.add_development_dependency "tilt", "~> 2.0"
+  s.add_development_dependency "oop_rails_server", ">= 0.0.3"
 end

data/lib/fortitude/rails/railtie.rb

@@ -130,18 +130,34 @@ module Fortitude
           # "Search for a file in autoload_paths matching the provided suffix."
           #
           # So, we just look to see if the given +path_suffix+ is specifying something like
-          # <tt>views/foo/bar</tt>; if so, we glue it together properly, removing the initial
-          # <tt>views/</tt> first. (Otherwise, the mechanism would expect
+          # <tt>views/foo/bar</tt> or the fully-qualified version thereof; if so, we glue it together properly,
+          # removing the initial <tt>views/</tt> first. (Otherwise, the mechanism would expect
           # <tt>Views::Foo::Bar</tt> to show up in <tt>app/views/views/foo/bar</tt> (yes, a double
           # +views+), since <tt>app/views</tt> is on the autoload path.)
           def search_for_file_with_fortitude(path_suffix)
-            # This just makes sure our path always ends in exactly one ".rb", whether it started
-            # with one or not.
-            new_path_suffix = path_suffix.sub(/(\.rb)?$/, ".rb")
+            # Remove any ".rb" extension, if present...
+            new_path_suffix = path_suffix.sub(/(\.rb)?$/, "")
 
-            if new_path_suffix =~ %r{^views(/.*)$}i
-              path = File.join(@@_fortitude_views_root, $1)
-              return path if File.file?(path)
+            found_subpath = if new_path_suffix =~ %r{^views(/.*)$}i
+              $1
+            elsif new_path_suffix =~ %r{^#{Regexp.escape(@@_fortitude_views_root)}(/.*)$}i
+              $1
+            end
+
+            if found_subpath
+              full_path = File.join(@@_fortitude_views_root, "#{found_subpath}")
+              directory = File.dirname(full_path)
+              filename = File.basename(full_path)
+
+              regexp1 = /^#{Regexp.escape(filename)}\./
+              regexp2 = /\.rb$/i
+              applicable_entries = Dir.entries(directory).select do |entry|
+                ((entry == filename) || (entry =~ regexp1 && entry =~ regexp2)) && File.file?(File.join(directory, entry))
+              end
+              return nil if applicable_entries.length == 0
+
+              entry_to_use = applicable_entries.sort_by { |e| e.length }.reverse.first
+              return File.join(directory, entry_to_use)
             end
 
             # Make sure that we remove the views autoload path before letting the rest of
@@ -184,74 +200,10 @@ module Fortitude
         end
 
         require "fortitude/rails/template_handler"
+        require "fortitude/rails/rendering_methods"
 
-        # This is our support for render :widget. Although, originally, it looked like creating a new subclass
-        # of ActionView::Template was going to be the correct thing to do here, it turns out it isn't: the entire
-        # template system is predicated around the idea that you have a template, which is compiled to output
-        # Ruby source code, and then that gets evaluated to actually generate output.
-        #
-        # Because <tt>render :widget => ...</tt> takes an already-instantiated widget as input, this simply isn't
-        # possible: you can't reverse-engineer an arbitrary Ruby object into source code, and, without source code,
-        # the whole templating paradigm doesn't make sense.
-        #
-        # So, instead, we simply transform <tt>render :widget => ...</tt> into a <tt>render :text => ...</tt> of the
-        # widget's output, and let Rails take it away from there.
-        ::ActionController::Base.class_eval do
-          def fortitude_rendering_context_for(delegate_object, yield_block)
-            @_fortitude_rendering_contexts ||= { }
-            @_fortitude_rendering_contexts[delegate_object.object_id] ||= create_fortitude_rendering_context(
-              :delegate_object => delegate_object, :yield_block => yield_block)
-          end
-
-          def create_fortitude_rendering_context(options)
-            ::Fortitude::RenderingContext.new(options)
-          end
-
-          def render_with_fortitude(*args, &block)
-            if (options = args[0]).kind_of?(Hash)
-              if (widget = options[:widget])
-                rendering_context = fortitude_rendering_context_for(self, nil)
-                widget.render_to(rendering_context)
-
-                options = options.dup
-                options[:text] = rendering_context.output_buffer_holder.output_buffer.html_safe
-                options[:layout] = true unless options.has_key?(:layout)
-
-                new_args = [ options ] + args[1..-1]
-                return render_without_fortitude(*new_args, &block)
-              elsif (widget_block = options[:inline]) && (options[:type] == :fortitude)
-                options.delete(:inline)
-
-                rendering_context = fortitude_rendering_context_for(self, nil)
-                widget_class = Class.new(Fortitude::Widgets::Html5)
-                widget_class.use_instance_variables_for_assigns(true)
-                widget_class.extra_assigns(:use)
-                widget_class.send(:define_method, :content, &widget_block)
-
-                assigns = { }
-                instance_variables.each do |ivar_name|
-                  value = instance_variable_get(ivar_name)
-                  assigns[$1.to_sym] = value if ivar_name =~ /^@(.*)$/
-                end
-                assigns = assigns.merge(options[:locals] || { })
-
-                widget = widget_class.new(assigns)
-                widget.render_to(rendering_context)
-
-                options = options.dup
-                options[:text] = rendering_context.output_buffer_holder.output_buffer.html_safe
-                options[:layout] = true unless options.has_key?(:layout)
-
-                new_args = [ options ] + args[1..-1]
-                return render_without_fortitude(*new_args, &block)
-              end
-            end
-
-            return render_without_fortitude(*args, &block)
-          end
-
-          alias_method_chain :render, :fortitude
-        end
+        ::ActionController::Base.send(:include, ::Fortitude::Rails::RenderingMethods)
+        ::ActionMailer::Base.send(:include, ::Fortitude::Rails::RenderingMethods)
       end
     end
   end

data/lib/fortitude/rails/rendering_methods.rb

@@ -0,0 +1,77 @@
+require 'active_support/concern'
+
+module Fortitude
+  module Rails
+    module RenderingMethods
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :render, :fortitude
+      end
+
+      def fortitude_rendering_context_for(delegate_object, yield_block)
+        @_fortitude_rendering_contexts ||= { }
+        @_fortitude_rendering_contexts[delegate_object.object_id] ||= create_fortitude_rendering_context(
+          :delegate_object => delegate_object, :yield_block => yield_block)
+      end
+
+      def create_fortitude_rendering_context(options)
+        ::Fortitude::RenderingContext.new(options)
+      end
+
+      # This is our support for render :widget. Although, originally, it looked like creating a new subclass
+      # of ActionView::Template was going to be the correct thing to do here, it turns out it isn't: the entire
+      # template system is predicated around the idea that you have a template, which is compiled to output
+      # Ruby source code, and then that gets evaluated to actually generate output.
+      #
+      # Because <tt>render :widget => ...</tt> takes an already-instantiated widget as input, this simply isn't
+      # possible: you can't reverse-engineer an arbitrary Ruby object into source code, and, without source code,
+      # the whole templating paradigm doesn't make sense.
+      #
+      # So, instead, we simply transform <tt>render :widget => ...</tt> into a <tt>render :text => ...</tt> of the
+      # widget's output, and let Rails take it away from there.
+      def render_with_fortitude(*args, &block)
+        if (options = args[0]).kind_of?(Hash)
+          if (widget = options[:widget])
+            rendering_context = fortitude_rendering_context_for(self, nil)
+            widget.render_to(rendering_context)
+
+            options = options.dup
+            options[:text] = rendering_context.output_buffer_holder.output_buffer.html_safe
+            options[:layout] = true unless options.has_key?(:layout)
+
+            new_args = [ options ] + args[1..-1]
+            return render_without_fortitude(*new_args, &block)
+          elsif (widget_block = options[:inline]) && (options[:type] == :fortitude)
+            options.delete(:inline)
+
+            rendering_context = fortitude_rendering_context_for(self, nil)
+            widget_class = Class.new(Fortitude::Widgets::Html5)
+            widget_class.use_instance_variables_for_assigns(true)
+            widget_class.extra_assigns(:use)
+            widget_class.send(:define_method, :content, &widget_block)
+
+            assigns = { }
+            instance_variables.each do |ivar_name|
+              value = instance_variable_get(ivar_name)
+              assigns[$1.to_sym] = value if ivar_name =~ /^@(.*)$/
+            end
+            assigns = assigns.merge(options[:locals] || { })
+
+            widget = widget_class.new(assigns)
+            widget.render_to(rendering_context)
+
+            options = options.dup
+            options[:text] = rendering_context.output_buffer_holder.output_buffer.html_safe
+            options[:layout] = true unless options.has_key?(:layout)
+
+            new_args = [ options ] + args[1..-1]
+            return render_without_fortitude(*new_args, &block)
+          end
+        end
+
+        return render_without_fortitude(*args, &block)
+      end
+    end
+  end
+end

data/lib/fortitude/tags/tags_module.rb

@@ -7,6 +7,7 @@ module Fortitude
         include Fortitude::Tags::TagSupport
 
         @widget_class = widget_class
+        @widget_class.send(:const_set, :DefinedFortitudeTags, self)
         @widget_class.send(:include, self)
       end
 

data/lib/fortitude/tilt/fortitude_template.rb

@@ -19,7 +19,9 @@ module Fortitude
         end
       end
 
-      def render(scope=Object.new, locals={}, &block)
+      def render(scope=Object.new, locals = nil, &block)
+        locals ||= { }
+
         rendering_context = Fortitude::RenderingContext.new({
           :yield_block => block, :render_yield_result => false,
           :helpers_object => scope, :instance_variables_object => scope })

data/lib/fortitude/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/fortitude/widget/modules_and_subclasses.rb

@@ -44,8 +44,10 @@ module Fortitude
           @tags_module = Fortitude::Tags::TagsModule.new(self)
           @helpers_module = Module.new
           include @helpers_module
+          const_set(:DefinedFortitudeHelpers, @helpers_module)
           @needs_module = Module.new
           include @needs_module
+          const_set(:FortitudeNeedsMethods, @helpers_module)
         end
         private :create_modules!
 

data/spec/helpers/fortitude_rails_helpers.rb

@@ -0,0 +1,19 @@
+module Spec
+  module Helpers
+    module FortitudeRailsHelpers
+      def rails_server_project_root
+        @rails_server_project_root ||= File.expand_path(File.join(File.dirname(__FILE__), '../..'))
+      end
+
+      def rails_server_additional_gemfile_lines
+        [
+          "gem 'fortitude', :path => '#{rails_server_project_root}'"
+        ]
+      end
+
+      def rails_server_default_version
+        ENV['FORTITUDE_SPECS_RAILS_VERSION']
+      end
+    end
+  end
+end

data/spec/helpers/global_helper.rb

@@ -1,8 +1,10 @@
 require 'fortitude'
-require 'helpers/rails_helpers'
+require 'oop_rails_server'
 require 'helpers/system_helpers'
+require 'helpers/fortitude_rails_helpers'
 
 RSpec.configure do |c|
-  c.include RailsHelpers, :type => :rails
+  c.include ::OopRailsServer::Helpers, :type => :rails
+  c.include ::Spec::Helpers::FortitudeRailsHelpers, :type => :rails
   c.include SystemHelpers, :type => :system
 end

data/spec/rails/capture_system_spec.rb

@@ -23,7 +23,7 @@ describe "Rails capture support", :type => :rails do
   end
 
   it "should be able to provide content in a widget with provide" do
-    skip "Rails 3.0.x doesn't support :provide" if @rails_server.rails_version =~ /^3\.0\./
+    skip "Rails 3.0.x doesn't support :provide" if rails_server.rails_version =~ /^3\.0\./
 
     expect_match('widget_provide',
       %r{erb_layout_needing_content}i,

data/spec/rails/development_mode_system_spec.rb

@@ -13,11 +13,21 @@ describe "Rails development-mode support", :type => :rails do
     expect_match("reload_widget", /after_reload/)
   end
 
+  it "should automatically reload widgets if related files change on disk, even if they're named '.html.rb' at the end" do
+    expect_match("reload_widget_with_html_extension", /with_html_extension.*helper: yo/)
+    sleep 1
+    splat_new_module_for_reload_widget_failing!
+    expect_exception("reload_widget_with_html_extension", NameError, "some_helper")
+    sleep 1
+    splat_new_module_for_reload_widget!
+    expect_match("reload_widget_with_html_extension", /with_html_extension.*helper: yo/)
+  end
+
   it "should let you change the controller, and that should work fine, too" do
-    expect_match("reload_widget", /datum\s+one\s+datum/)
+    expect(rails_server.get("replaced/reload_widget")).to match(/datum\s+one\s+datum/)
     sleep 1
     splat_new_controller!
-    expect_match("reload_widget", /datum\s+two\s+datum/)
+    expect(rails_server.get("replaced/reload_widget")).to match(/datum\s+two\s+datum/)
   end
 
   it "should, by default, format output" do
@@ -32,6 +42,42 @@ describe "Rails development-mode support", :type => :rails do
 <!-- END Views::DevelopmentModeSystemSpec::SampleOutput depth 0 -->}mi)
   end
 
+  it "should pick up changes to mailer views" do
+    expect_match("mailer_view_test", /mail sent/i)
+    mail = mail_sent_to('mailer_view_test@example.com')
+    expect(mail[:body].strip).to match(%r{<p>this is the basic mail!</p>}mi)
+    clear_mails!
+
+    sleep 1
+    splat_new_mailer_view!
+    expect_match("mailer_view_test", /mail sent/i)
+    mail = mail_sent_to('mailer_view_test@example.com')
+    expect(mail[:body].strip).to match(%r{<p>this is the NEW basic mail!</p>}mi)
+  end
+
+  it "should pick up changes to mailer layouts" do
+    expect_match("mailer_layout_test", /mail sent/i)
+    mail = mail_sent_to('mailer_layout_test@example.com')
+    expect(mail[:body].strip).to match(%r{this is the layout, before.*this is the basic mail!.*this is the layout, after}mi)
+    clear_mails!
+
+    sleep 1
+    splat_new_mailer_layout!
+    expect_match("mailer_layout_test", /mail sent/i)
+    mail = mail_sent_to('mailer_layout_test@example.com')
+    expect(mail[:body].strip).to match(%r{this is the NEW layout, before.*this is the basic mail!.*this is the NEW layout, after}mi)
+  end
+
+  it "should format output and output BEGIN/END debugging tags in mailers" do
+    expect_match("mailer_formatting_test", /mail sent/i)
+    mail = mail_sent_to('mailer_formatting_test@example.com')
+    expect(mail[:body].strip).to eq(%{<!-- BEGIN Views::DevelopmentModeMailer::MailerFormattingTest depth 0 -->
+<div>
+  <p>this is the text!</p>
+</div>
+<!-- END Views::DevelopmentModeMailer::MailerFormattingTest depth 0 -->})
+  end
+
   private
   def splat_new_widget!
     reload_file = File.join(rails_server.rails_root, 'app/views/development_mode_system_spec/reload_widget.rb')
@@ -48,17 +94,65 @@ EOS
     end
   end
 
+  def splat_new_module_for_reload_widget_failing!
+    module_file = File.join(rails_server.rails_root, 'app/views/shared/some_module.rb')
+    File.open(module_file, 'w') do |f|
+      f.puts <<-EOS
+module Views::Shared::SomeModule
+end
+EOS
+    end
+  end
+
+  def splat_new_module_for_reload_widget!
+    module_file = File.join(rails_server.rails_root, 'app/views/shared/some_module.rb')
+    File.open(module_file, 'w') do |f|
+      f.puts <<-EOS
+module Views::Shared::SomeModule
+  def some_helper
+    "yo"
+  end
+end
+EOS
+    end
+  end
+
   def splat_new_controller!
-    controller_file = File.join(rails_server.rails_root, 'app/controllers/development_mode_system_spec_controller.rb')
+    controller_file = File.join(rails_server.rails_root, 'app/controllers/replaced_controller.rb')
     File.open(controller_file, 'w') do |f|
       f.puts <<-EOS
-class DevelopmentModeSystemSpecController < ApplicationController
+class ReplacedController < ApplicationController
   def reload_widget
     @datum = "two"
   end
+end
+EOS
+    end
+  end
+
+  def splat_new_mailer_view!
+    reload_file = File.join(rails_server.rails_root, 'app/views/development_mode_mailer/mailer_view_test.rb')
+    File.open(reload_file, 'w') do |f|
+      f.puts <<-EOS
+class Views::DevelopmentModeMailer::MailerViewTest < Fortitude::Widgets::Html5
+  def content
+    p "this is the NEW basic mail!"
+  end
+end
+EOS
+    end
+  end
+
 
-  def sample_output
-    @name = "Jessica"
+  def splat_new_mailer_layout!
+    reload_file = File.join(rails_server.rails_root, 'app/views/layouts/mail_layout.rb')
+    File.open(reload_file, 'w') do |f|
+      f.puts <<-EOS
+class Views::Layouts::MailLayout < Fortitude::Widgets::Html5
+  def content
+    p "this is the NEW layout, before"
+    yield
+    p "this is the NEW layout, after"
   end
 end
 EOS