fortitude 0.9.5 → 0.9.6

data/lib/rails/generators/fortitude/mailer/mailer_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators/erb/mailer/mailer_generator'
+
+module Fortitude
+  module Generators
+    class MailerGenerator < ::Erb::Generators::MailerGenerator
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_view_base
+        generate "fortitude:base_view"
+      end
+
+      protected
+      def handler
+        :rb
+      end
+
+      def formats
+        [:html]
+      end
+
+      def format
+        :html
+      end
+    end
+  end
+end

data/lib/rails/generators/fortitude/mailer/templates/layout.html.rb

@@ -0,0 +1,9 @@
+class Views::Layouts::Mailer < Views::Base
+  def contents
+    html {
+      body {
+        yield
+      }
+    }
+  end
+end

data/lib/rails/generators/fortitude/mailer/templates/view.html.rb

@@ -0,0 +1,12 @@
+<%
+our_class_name = class_name.camelize
+our_class_name += "Mailer" if @path =~ %r{_mailer/}
+-%>
+class Views::<%= our_class_name %>::<%= @action.camelize %> < Views::Base
+  needs :greeting
+
+  def content
+    h1 "<%= class_name %>#<%= @action %>"
+    p "#{greeting}, find me in <%= @path %>"
+  end
+end

data/lib/rails/generators/fortitude/scaffold/scaffold_generator.rb

@@ -0,0 +1,29 @@
+require 'rails/generators/erb/scaffold/scaffold_generator'
+
+module Fortitude
+  module Generators
+    class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
+      source_root File.join(File.dirname(__FILE__), 'templates')
+
+      def copy_view_files
+        available_views.each do |view|
+          filename = filename_with_extensions(view)
+          template "#{view}.html.rb", File.join("app/views", controller_file_path, filename)
+        end
+      end
+
+      def create_view_base
+        generate "fortitude:base_view"
+      end
+
+      protected
+      def available_views
+        %w(index new show edit form)
+      end
+
+      def handler
+        :rb
+      end
+    end
+  end
+end

data/lib/rails/generators/fortitude/scaffold/templates/edit.html.rb

@@ -0,0 +1,13 @@
+class Views::<%= plural_table_name.camelize %>::Edit < Views::Base
+  needs :<%= singular_table_name %>
+
+  def content
+    h1 "Editing <%= singular_table_name.titleize %>"
+
+    widget Views::<%= plural_table_name.camelize %>::Form, :<%= singular_table_name %> => <%= singular_table_name %>
+
+    link_to 'Show', <%= singular_table_name %>
+    text " | "
+    link_to 'Back', <%= index_helper %>_path
+  end
+end

data/lib/rails/generators/fortitude/scaffold/templates/form.html.rb

@@ -0,0 +1,44 @@
+class Views::<%= plural_table_name.camelize %>::Form < Views::Base
+  needs :<%= singular_table_name %>
+
+  def content
+    form_for(<%= singular_table_name %>) do |f|
+      if <%= singular_table_name %>.errors.any?
+        div(:id => :error_explanation) {
+          h2 {
+            text pluralize(<%= singular_table_name %>.errors.count, "error")
+            text " prohibited this <%= singular_table_name %> from being saved:"
+          }
+
+          ul {
+            <%= singular_table_name %>.errors.full_messages.each do |message|
+              li message
+            end
+          }
+        }
+      end
+
+<% attributes.each do |attribute| -%>
+<% if attribute.respond_to?(:password_digest?) && attribute.password_digest? -%>
+      div(:class => :field) {
+        f.label :password
+        f.password_field :password
+      }
+
+      div(:class => :field) {
+        f.label :password_confirmation
+        f.password_field :password_confirmation
+      }
+<% else -%>
+<% name = if attribute.respond_to?(:column_name) then attribute.column_name else attribute.name end -%>
+      div(:class => :field) {
+        f.label :<%= name %>
+        f.<%= attribute.field_type %> :<%= name %>
+      }
+<% end -%>
+<% end -%>
+
+      div(:class => :actions) { f.submit }
+    end
+  end
+end

data/lib/rails/generators/fortitude/scaffold/templates/index.html.rb

@@ -0,0 +1,45 @@
+class Views::<%= plural_table_name.camelize %>::Index < Views::Base
+  needs :<%= plural_table_name %>, :notice => nil
+
+  def content
+    p notice, :id => :notice
+
+    h1 "<%= plural_table_name.titleize %>"
+
+    table {
+      thead {
+        tr {
+          <% attributes.reject { |a| a.respond_to?(:password_digest?) && a.password_digest? }.each do |attribute| -%>
+th "<%= attribute.human_name %>"
+          <% end -%>
+th
+          th
+          th
+        }
+      }
+
+      tbody {
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+          tr {
+<% attributes.reject { |a| a.respond_to?(:password_digest?) && a.password_digest? }.each do |attribute| -%>
+            td <%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
+            td {
+              link_to 'Show', <%= singular_table_name %>
+            }
+            td {
+              link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
+            }
+            td {
+              link_to 'Destroy', <%= singular_table_name %>, :method => :delete, :data => { :confirm => 'Are you sure?' }
+            }
+          }
+        end
+      }
+    }
+
+    br
+
+    link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_table_name %>_path
+  end
+end

data/lib/rails/generators/fortitude/scaffold/templates/new.html.rb

@@ -0,0 +1,11 @@
+class Views::<%= plural_table_name.camelize %>::New < Views::Base
+  needs :<%= singular_table_name %> => nil
+
+  def content
+    h1 "New <%= singular_table_name.titleize %>"
+
+    widget Views::<%= plural_table_name.camelize %>::Form, :<%= singular_table_name %> => <%= singular_table_name %>
+
+    link_to 'Back', <%= index_helper %>_path
+  end
+end

data/lib/rails/generators/fortitude/scaffold/templates/show.html.rb

@@ -0,0 +1,18 @@
+class Views::<%= plural_table_name.camelize %>::Show < Views::Base
+  needs :<%= singular_table_name %>, :notice => nil
+
+  def content
+    p notice, :id => :notice
+
+<% attributes.reject { |a| a.respond_to?(:password_digest?) && a.password_digest? }.each do |attribute| -%>
+    p {
+      strong "<%= attribute.human_name %>:"
+      text <%= singular_table_name %>.<%= attribute.name %>
+    }
+<% end %>
+
+    link_to "Edit", edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
+    text " | "
+    link_to 'Back', <%= index_helper %>_path
+  end
+end

data/spec/rails/complex_helpers_system_spec.rb

@@ -6,6 +6,7 @@ describe "Rails complex helper support", :type => :rails do
       %r{OUTSIDE_BEFORE\s*<form.*action=\"/complex_helpers_system_spec/form_for_test\".*
         INSIDE_BEFORE\s*
         FIRST:\s*<input.*person_first_name.*/>\s*
+        MIDDLE:\s*<input.*person_middle_name.*/>\s*
         LAST:\s*<input.*person_last_name.*/>\s*
         INSIDE_AFTER\s*
         </form>\s*
@@ -67,6 +68,11 @@ describe "Rails complex helper support", :type => :rails do
         </label>}mix)
   end
 
+  it "should allow implicitly carrying through things like IDs from one request to another" do
+    id = rand(1_000_000)
+    expect(rails_server.get("/carryover/#{id}")).to match(%r{Edit:\s*.*/carryover/#{id}/edit})
+  end
+
   it "should cache based on a name properly" do
     expect_match("cache_test?a=a1&b=b1",
       /before_cache\(a1,b1\).*inside_cache\(a1,b1\).*after_cache\(a1,b1\)/mi)

data/spec/rails/data_passing_system_spec.rb

@@ -21,6 +21,10 @@ describe "Rails data-passing support", :type => :rails do
     expect_actionview_exception('omitted_variable', 'Fortitude::Errors::MissingNeed', /bar/)
   end
 
+  it "should not give you an error just because a variable is set to nil" do
+    expect_match("nil_data_widget", /foo is: "the_foo"/, /bar is: nil/)
+  end
+
   it "should not propagate un-needed variables" do
     expect_match("extra_variables", /foo method call: the_foo/, /foo instance var: nil/,
       /bar method call: NoMethodError/, /bar instance var: nil/,

data/spec/rails/generators_system_spec.rb

@@ -0,0 +1,166 @@
+describe "Rails generator support", :type => :rails do
+  # We use development mode so that we don't have to bounce the Rails server every time we
+  # generate something new.
+  uses_rails_with_template :generators_system_spec, :rails_env => :development
+
+  def views_base_path
+    @views_base_path ||= File.join(rails_server.rails_root, 'app', 'views', 'base.rb')
+  end
+
+  def clean_views_base!
+    File.delete(views_base_path) if File.exist?(views_base_path)
+  end
+
+  def ensure_views_base_is_correct!
+    expect(File.exist?(views_base_path)).to be_truthy
+
+    contents = File.read(views_base_path)
+    expect(contents).to match(/Views::Base\s*<\s*Fortitude::Widget\s*\n/)
+    expect(contents).to match(/doctype\s+:html5/)
+  end
+
+  def generate!(what)
+    rails_server.run_command_in_rails_root!("rails generate #{what}")
+  end
+
+  def ensure_file_matches!(subpath, regexp)
+    path = File.join(rails_server.rails_root, subpath)
+    expect(File.exist?(path)).to be_truthy
+
+    contents = File.read(path)
+    expect(contents).to match(regexp)
+  end
+
+  def ensure_action_matches!(subpath, regexp)
+    response = rails_server.get(subpath)
+    expect(response).to match(regexp)
+    response
+  end
+
+  describe "base view generation" do
+    it "should be able to generate a Views::Base file" do
+      clean_views_base!
+      generate!("fortitude:base_view")
+      ensure_views_base_is_correct!
+    end
+  end
+
+  describe "controller generation" do
+    it "should be able to generate a controller action that creates a Fortitude view" do
+      generate!("controller gen_con1 act_ion1")
+      ensure_file_matches!('app/views/gen_con1/act_ion1.html.rb', /Views::GenCon1::ActIon1\s*<\s*Views::Base/)
+      ensure_action_matches!('gen_con1/act_ion1', %r{<h1>\s*GenCon1#act_ion1\s*</h1>\s*<p>\s*Find me in app/views/gen_con1/act_ion1.html.rb\s*</p>}mi)
+    end
+
+    it "should generate a Views::Base file" do
+      clean_views_base!
+      generate!("controller gencon2 action2")
+      ensure_views_base_is_correct!
+    end
+
+    it "should not overwrite an existing Views::Base file" do
+      prior_contents = "class Views::Base < Fortitude::Widget\n  doctype :html5\n  def something\n  end\nend"
+      File.open(views_base_path, 'w') { |f| f.puts prior_contents }
+
+      generate!("controller gencon3 action3")
+
+      expect(File.exist?(views_base_path)).to be_truthy
+      expect(File.read(views_base_path).strip).to eq(prior_contents.strip)
+    end
+
+    it "should allow switching back to ERb if desired" do
+      generate!("controller gen_con4 act_ion1 -e erb")
+      expect(File.exist?(File.join(rails_server.rails_root, 'app/views/gen_con4/act_ion1.html.rb'))).to be_falsey
+      expect(File.exist?(File.join(rails_server.rails_root, 'app/views/gen_con4/act_ion1.html.erb'))).to be_truthy
+    end
+  end
+
+  describe "mailer generation" do
+    def mailer_path_suffix
+      if rails_server.actual_rails_version =~ /^[34]\./
+        ""
+      else
+        "_mailer"
+      end
+    end
+
+    def mailer_class_suffix
+      if rails_server.actual_rails_version =~ /^[34]\./
+        ""
+      else
+        "Mailer"
+      end
+    end
+
+    it "should be able to generate a mailer that creates a Fortitude view and layout" do
+      generate!("mailer gen1 act_ion1")
+      ensure_file_matches!("app/views/gen1#{mailer_path_suffix}/act_ion1.html.rb", /Views::Gen1#{mailer_class_suffix}::ActIon1\s*<\s*Views::Base/)
+    end
+
+    it "should generate a Views::Base file" do
+      clean_views_base!
+      generate!("mailer gen1 act_ion1")
+      ensure_views_base_is_correct!
+    end
+
+    it "should not overwrite an existing Views::Base file" do
+      prior_contents = "class Views::Base < Fortitude::Widget\n  doctype :html5\n  def something\n  end\nend"
+      File.open(views_base_path, 'w') { |f| f.puts prior_contents }
+
+      generate!("mailer gen1 act_ion1")
+
+      expect(File.exist?(views_base_path)).to be_truthy
+      expect(File.read(views_base_path).strip).to eq(prior_contents.strip)
+    end
+  end
+
+  describe "scaffold generation" do
+    it "should be able to generate a scaffold" do
+      generate!("scaffold MyModel foo:string bar:integer")
+
+      # We need to disable CSRF protection, since we're not using a session
+      application_controller = File.join(rails_server.rails_root, 'app', 'controllers', 'application_controller.rb')
+      application_controller_contents = File.read(application_controller)
+      if (! application_controller_contents.gsub!(/^\s*protect_from_forgery.*$/, "protect_from_forgery :with => :null_session"))
+        application_controller_contents.gsub!(/^end\Z/, "  protect_from_forgery :with => :null_session\nend\n")
+      end
+      File.open(application_controller, 'w') { |f| f.puts application_controller_contents }
+
+      # Need this to create the table (which will be in SQLite by default, which is easy), or else
+      # the controller actions will fail since there will be no such table.
+      rails_server.run_command_in_rails_root!("rake db:migrate")
+
+      ensure_file_matches!('app/views/my_models/index.html.rb', %r{class Views::MyModels::Index < Views::Base})
+      ensure_file_matches!('app/views/my_models/show.html.rb', %r{class Views::MyModels::Show < Views::Base})
+      ensure_file_matches!('app/views/my_models/edit.html.rb', %r{class Views::MyModels::Edit < Views::Base})
+      ensure_file_matches!('app/views/my_models/new.html.rb', %r{class Views::MyModels::New < Views::Base})
+      ensure_file_matches!('app/views/my_models/form.html.rb', %r{class Views::MyModels::Form < Views::Base})
+
+      # Ruby 1.8.7 and Rails 3.0.x seems to have issues unless we do this, sadly...
+      rails_server.stop!
+      rails_server.start!
+
+      # This won't check that the views all have the right HTML in them (that's nearly impossible without
+      # just duplicating exactly what they're supposed to contain, right here), but it will check that they
+      # compile and produce some kind of HTML output.
+      ensure_action_matches!('my_models', %r{<h1>\s*My Models\s*</h1>}m)
+      new_html = ensure_action_matches!('my_models/new', %r{<form.*action=["']/my_models["']}m)
+
+      # Now, we try to create one
+      response = rails_server.post('my_models', :post_variables => {
+        'my_model[foo]' => 'foo1', 'my_model[bar]' => 23456, :commit => 'Create My model' },
+        :ignore_status_code => true)
+
+      new_url = if (300..399).include?(Integer(response.code))
+        response['Location']
+      else
+        raise "Response didn't seem to give us a redirect: #{response.code.inspect} (from #{response.inspect})"
+      end
+      path = URI.parse(new_url).path
+
+      ensure_action_matches!(path, %r{foo1.*23456}m)
+      ensure_action_matches!("#{path}/edit", %r{Editing.*foo1.*23456}m)
+      ensure_action_matches!("my_models", %r{<h1>\s*My Models\s*</h1>.*foo1.*23456}m)
+    end
+  end
+end

data/spec/rails/templates/complex_helpers_system_spec/app/controllers/carryover_controller.rb

@@ -0,0 +1,11 @@
+class CarryoverController < ApplicationController
+  def show
+    # nothing here
+    @the_id = params[:id]
+  end
+
+  def edit
+    # nothing here
+    @the_id = params[:id]
+  end
+end

data/spec/rails/templates/complex_helpers_system_spec/app/views/carryover/show.html.rb

@@ -0,0 +1,9 @@
+class Views::Carryover::Show < Fortitude::Widgets::Html5
+  needs :the_id
+
+  def content
+    h1 "Show Carryover #{the_id}"
+
+    p "Edit: #{edit_carryover_path}"
+  end
+end

data/spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/form_for_test.rb

@@ -5,6 +5,8 @@ class Views::ComplexHelpersSystemSpec::FormForTest < Fortitude::Widgets::Html5
       text "INSIDE_BEFORE"
       text "FIRST: "
       f.text_field :first_name
+      text "MIDDLE: "
+      f.send(:text_field, :middle_name)
       text "LAST: "
       f.text_field :last_name
       text "INSIDE_AFTER"