haml-rails 2.1.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92791c4d02db70961e18508ae709bd86a9bae7325eb8afd6f7c8286c3d7824f
-  data.tar.gz: 0a4ad454a0c72f707159ee95c4a529cdf3c4194a64b13a690b475a1ff72687c1
+  metadata.gz: be3a0bf741095a473f255170b23034ce05f30adc72901a005976184c94e88bd0
+  data.tar.gz: a63f77e4275deb71cb8a8cbdb9c98013f9b6487e2e9ced4bf1c44c8cdea9c2e9
 SHA512:
-  metadata.gz: e3232df46c3893fab9e0cec861ddb8d88bfd9fe3c40bc0e05a4c67915ef58bd4f54ff9e39a4cc040853cd42fe421942629a46f31294b1622098047e42d5a89a2
-  data.tar.gz: d25c5e7ff3ef9fb3e0879129ffe8689c9e06d2b945b404d2be3775573142645304189440deb9ca755b1d5684df1775ea707acd046d6c31f77abdb750bcd98677
+  metadata.gz: ca52609d810eff129d39e7764c420e139467ba53f85d106f07830583e6bd3e76f672c050b30e43883f6b7443a698e2f6a6c0aa9c8ee8d46a2c7fdc05375ed75b
+  data.tar.gz: 17aba7d35c28b7b0f3bd0b22b0c7baeacba605d24ca29c7bca7558d0a2a6d9c34c831410cdc9d06ff44357fdb8dbb6339b9787ac07fe4688df2e4eb138419101

data/.github/workflows/ruby.yml

@@ -1,10 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
 name: Ruby
 
 on:
@@ -20,38 +13,68 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - 3.1
-          - 3.0
-          - 2.7
-          - jruby
-        gemfile:
-          - rails_7_0
-          - rails_6_1
-          - rails_6_0
+          - '4.0'
+          - '3.4'
+          - '3.3'
+          - '3.2'
+          - '3.1'
+        rails-version:
+          - '8.1'
+          - '8.0'
+          - '7.2'
+          - '7.1'
+          - '7.0'
+          - '6.1'
 
         include:
-          - ruby-version: 2.7
-            gemfile: rails_5_2
-          - ruby-version: 2.7
-            gemfile: rails_5_1
+          - ruby-version: '3.1'
+            rails-version: '6.0'
 
-          - ruby-version: 2.6
-            gemfile: rails_6_1
-          - ruby-version: 2.6
-            gemfile: rails_6_0
-          - ruby-version: 2.6
-            gemfile: rails_5_2
-          - ruby-version: 2.6
-            gemfile: rails_5_1
+          - ruby-version: '3.0'
+            rails-version: '7.1'
+          - ruby-version: '3.0'
+            rails-version: '7.0'
+          - ruby-version: '3.0'
+            rails-version: '6.1'
+          - ruby-version: '3.0'
+            rails-version: '6.0'
+
+          - ruby-version: '2.7'
+            rails-version: '7.1'
+          - ruby-version: '2.7'
+            rails-version: '7.0'
+          - ruby-version: '2.7'
+            rails-version: '6.1'
+          - ruby-version: '2.7'
+            rails-version: '6.0'
+          - ruby-version: '2.7'
+            rails-version: '5.2'
+          - ruby-version: '2.7'
+            rails-version: '5.1'
+
+          - ruby-version: '2.6'
+            rails-version: '6.1'
+          - ruby-version: '2.6'
+            rails-version: '6.0'
+          - ruby-version: '2.6'
+            rails-version: '5.2'
+          - ruby-version: '2.6'
+            rails-version: '5.1'
 
-        exclude:
           - ruby-version: jruby
-            gemfile: rails_7_0
+            rails-version: '6.1'
+
+        exclude:
+          - ruby-version: '3.1'
+            rails-version: '8.1'
+          - ruby-version: '3.1'
+            rails-version: '8.0'
 
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    env:
+      RUBY_VERSION: ${{ matrix.ruby-version }}
+      RAILS_VERSION: ${{ matrix.rails-version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+## 3.1.0
+
+### Features
+
+- Add Rails 8.1 and Ruby 4.0 support.
+
+- Add an authentication generator that produces Haml views for
+  `rails generate authentication` (Rails 8+), generating `passwords/new`,
+  `passwords/edit`, and `sessions/new` templates.
+  [#198](https://github.com/haml/haml-rails/pull/198) (Evan Brooks)
+
+### Bug fixes
+
+- Fix Haml fragment cache dependency detection on Rails 8.1. Rails 8.1 tightened
+  its ERB dependency tracker to only match `render` calls inside `<% %>` tags,
+  which stopped changes to a Haml partial from busting the cache of templates
+  that render it. Haml templates now use the `:ruby` render tracker (available
+  since Rails 7.2), which compiles the template before scanning for `render`
+  calls. [#200](https://github.com/haml/haml-rails/pull/200),
+  fixes [#199](https://github.com/haml/haml-rails/issues/199) (Nick Schimek)
+
+- Add Rails 8.1 scaffold templates. The generated scaffold partial now wraps
+  each attribute in a `<div>` (instead of `<p>`) to match Rails 8.1's output.

data/Gemfile

@@ -4,3 +4,24 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'html2haml'
+
+if ENV['RAILS_VERSION']
+  gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
+else
+  gem 'rails'
+end
+
+if RUBY_ENGINE == 'ruby'
+  gem 'debug'
+end
+
+if (ENV['RUBY_VERSION'] || RUBY_VERSION) >= '3.3'
+  gem 'mutex_m'
+  gem 'base64'
+  gem 'bigdecimal'
+  gem 'drb'
+end
+
+if (ENV['RUBY_VERSION'] || RUBY_VERSION) >= '4.0'
+  gem 'benchmark'
+end

data/README.md

@@ -1,11 +1,12 @@
 # Haml-rails
-[![Build Status](https://travis-ci.org/haml/haml-rails.svg)](https://travis-ci.org/haml/haml-rails)
+[![Gem Version](https://badge.fury.io/rb/haml-rails.svg)](https://rubygems.org/gems/haml-rails)
+[![Ruby](https://github.com/haml/haml-rails/actions/workflows/ruby.yml/badge.svg)](https://github.com/haml/haml-rails/actions/workflows/ruby.yml)
 
-Haml-rails provides Haml generators for Rails 5. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah.
+Haml-rails provides Haml generators for Rails 5, 6, 7, and 8. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah.
 
 To use it, add this line to your Gemfile:
 
-    gem "haml-rails", "~> 2.0"
+    gem "haml-rails"
 
 This ensures that:
 
@@ -23,6 +24,10 @@ to `app/views/layouts/application.html.haml` using this command:
 
     $ rails generate haml:application_layout convert
 
+This requires the html2haml gem and you can install it locally:
+
+    gem install html2haml
+
 After the application layout file is converted successfully,
 make sure to delete `app/views/layouts/application.html.erb`, so Rails can
 start using `app/views/layouts/application.html.haml` instead.

data/haml-rails.gemspec

@@ -9,9 +9,11 @@ Gem::Specification.new do |s|
   s.email       = ["andre@arko.net"]
   s.homepage    = "https://github.com/haml/haml-rails"
   s.summary     = "let your Gemfile do the configuring"
-  s.description = "Haml-rails provides Haml generators for Rails 5. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah."
+  s.description = "Haml-rails provides Haml generators for Rails 5.1 and above. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah."
   s.licenses    = ["MIT"]
 
+  s.metadata    = { "rubygems_mfa_required" => "true" }
+
   s.required_rubygems_version = ">= 2.0.0"
   s.required_ruby_version     = ">= 2.3.0"
 
@@ -19,12 +21,11 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", [">= 5.1"]
   s.add_dependency "actionpack",    [">= 5.1"]
   s.add_dependency "railties",      [">= 5.1"]
-  
+
   s.add_development_dependency "html2haml", [">= 1.0.1"]
   s.add_development_dependency "rails",   [">= 5.1"]
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
-  s.add_development_dependency 'appraisal'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}

data/lib/generators/haml/authentication/authentication_generator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "rails/generators/erb/authentication/authentication_generator"
+
+module Haml
+  module Generators
+    class AuthenticationGenerator < Erb::Generators::AuthenticationGenerator
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_files
+        template "app/views/passwords/new.html.haml"
+        template "app/views/passwords/edit.html.haml"
+        template "app/views/sessions/new.html.haml"
+      end
+    end
+  end
+end

data/lib/generators/haml/authentication/templates/app/views/passwords/edit.html.haml

@@ -0,0 +1,10 @@
+%h1 Update your password
+
+= tag.div(flash[:alert], style: "color:red") if flash[:alert]
+
+= form_with url: password_path(params[:token]), method: :put do |form|
+  = form.password_field :password, required: true, autocomplete: "new-password", placeholder: "Enter new password", maxlength: 72
+  %br
+  = form.password_field :password_confirmation, required: true, autocomplete: "new-password", placeholder: "Repeat new password", maxlength: 72
+  %br
+  = form.submit "Save"

data/lib/generators/haml/authentication/templates/app/views/passwords/new.html.haml

@@ -0,0 +1,8 @@
+%h1 Forgot your password?
+
+= tag.div(flash[:alert], style: "color:red") if flash[:alert]
+
+= form_with url: passwords_path do |form|
+  = form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address]
+  %br
+  = form.submit "Email reset instructions"

data/lib/generators/haml/authentication/templates/app/views/sessions/new.html.haml

@@ -0,0 +1,12 @@
+= tag.div(flash[:alert], style: "color:red") if flash[:alert]
+= tag.div(flash[:notice], style: "color:green") if flash[:notice]
+
+= form_with url: session_path do |form|
+  = form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address]
+  %br
+  = form.password_field :password, required: true, autocomplete: "current-password", placeholder: "Enter your password", maxlength: 72
+  %br
+  = form.submit "Sign in"
+%br
+
+= link_to "Forgot password?", new_password_path

data/lib/generators/haml/controller/controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/erb/controller/controller_generator'
 
 module Haml

data/lib/generators/haml/mailer/mailer_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/erb/mailer/mailer_generator'
 
 module Haml

data/lib/generators/haml/scaffold/scaffold_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/erb/scaffold/scaffold_generator'
 
 module Haml
@@ -5,31 +7,44 @@ module Haml
     class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       source_root File.expand_path("../templates", __FILE__)
 
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+      hook_for :form_builder, :as => :scaffold
+
       def copy_view_files
         available_views.each do |view|
-          filename = filename_with_extensions(view)
-          template "#{view}.html.haml", File.join("app/views", controller_file_path, filename)
-        end
-      end
+          next if (view == '_form') && !options[:form_builder].nil?
 
-      hook_for :form_builder, :as => :scaffold
+          template_filename = find_template_for_rails_version view
+          filename = filename_with_extensions view
 
-      def copy_form_file
-        if options[:form_builder].nil?
-          filename = filename_with_extensions("_form")
-          template "_form.html.haml", File.join("app/views", controller_file_path, filename)
+          template template_filename, File.join('app/views', controller_file_path, filename)
+        end
+
+        if ::Rails::VERSION::MAJOR >= 7
+          template find_template_for_rails_version('partial'), File.join('app/views', controller_file_path, "_#{singular_name}.html.haml")
         end
       end
 
       private
 
       def available_views
-        %w(index edit show new)
+        %w(index edit show new _form)
       end
 
       def handler
         :haml
       end
+
+      def find_template_for_rails_version(view)
+        find_in_source_paths "#{rails_version}/#{view}.html.haml"
+      rescue Thor::Error
+        "#{view}.html.haml"
+      end
+
+      def rails_version
+        @rails_version ||= "#{::Rails::VERSION::MAJOR}_#{::Rails::VERSION::MINOR}"
+      end
     end
   end
 end

data/lib/generators/haml/scaffold/templates/5_1/_form.html.haml

@@ -0,0 +1,26 @@
+= form_with(model: <%= singular_table_name %>, local: true) do |form|
+  - if <%= singular_table_name %>.errors.any?
+    %div{id: "error_explanation"}
+      %h2= "#{pluralize(<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+
+      %ul
+        - <%= singular_table_name %>.errors.full_messages.each do |message|
+          %li= message
+
+<% attributes.each do |attribute| -%>
+  %div{class: "field"}
+<% if attribute.password_digest? -%>
+    = form.label :password
+    = form.password_field :password, id: :<%= field_id(:password) %>
+
+  %div{class: "field"}
+    = form.label :password_confirmation
+    = form.password_field :password_confirmation, id: :<%= field_id(:password_confirmation) %>
+<% else -%>
+    = form.label :<%= attribute.column_name %>
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>, id: :<%= field_id(attribute.column_name) %>
+<% end -%>
+
+<% end -%>
+  %div{class: "actions"}
+    = form.submit

data/lib/generators/haml/scaffold/templates/5_1/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Show', @<%= singular_table_name %>
+|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/5_1/index.html.haml

@@ -0,0 +1,25 @@
+%p{id: "notice"}= notice
+
+%h1 <%= plural_table_name.titleize %>
+
+%table
+  %thead
+    %tr
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+      %th <%= attribute.human_name %>
+<% end -%>
+      %th{colspan: "3"}
+
+  %tbody
+    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+      %tr
+<% attributes.reject(&: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?' }
+
+%br
+
+= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_table_name %>_path

data/lib/generators/haml/scaffold/templates/5_1/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/5_1/show.html.haml

@@ -0,0 +1,11 @@
+%p{id: "notice"}= notice
+
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+%p
+  %strong <%= attribute.human_name %>:
+  = @<%= singular_table_name %>.<%= attribute.name %>
+
+<% end -%>
+= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)
+|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/5_2/_form.html.haml

@@ -0,0 +1,26 @@
+= form_with(model: <%= model_resource_name %>, local: true) do |form|
+  - if <%= singular_table_name %>.errors.any?
+    %div{id: "error_explanation"}
+      %h2= "#{pluralize(<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+
+      %ul
+        - <%= singular_table_name %>.errors.full_messages.each do |message|
+          %li= message
+
+<% attributes.each do |attribute| -%>
+  %div{class: "field"}
+<% if attribute.password_digest? -%>
+    = form.label :password
+    = form.password_field :password
+
+  %div{class: "field"}
+    = form.label :password_confirmation
+    = form.password_field :password_confirmation
+<% else -%>
+    = form.label :<%= attribute.column_name %>
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>
+  %div{class: "actions"}
+    = form.submit

data/lib/generators/haml/scaffold/templates/5_2/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Show', @<%= singular_table_name %>
+|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/5_2/index.html.haml

@@ -0,0 +1,25 @@
+%p{id: "notice"}= notice
+
+%h1 <%= plural_table_name.titleize %>
+
+%table
+  %thead
+    %tr
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+      %th <%= attribute.human_name %>
+<% end -%>
+      %th{colspan: "3"}
+
+  %tbody
+    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+      %tr
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+        %td= <%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
+        %td= link_to 'Show', <%= model_resource_name %>
+        %td= link_to 'Edit', edit_<%= singular_route_name %>_path(<%= singular_table_name %>)
+        %td= link_to 'Destroy', <%= model_resource_name %>, method: :delete, data: { confirm: 'Are you sure?' }
+
+%br
+
+= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_route_name %>_path

data/lib/generators/haml/scaffold/templates/5_2/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/5_2/show.html.haml

@@ -0,0 +1,11 @@
+%p{id: "notice"}= notice
+
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+%p
+  %strong <%= attribute.human_name %>:
+  = @<%= singular_table_name %>.<%= attribute.name %>
+
+<% end -%>
+= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)
+|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/6_0/_form.html.haml

@@ -0,0 +1,29 @@
+= form_with(model: <%= model_resource_name %>, local: true) do |form|
+  - if <%= singular_table_name %>.errors.any?
+    %div{id: "error_explanation"}
+      %h2= "#{pluralize(<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+
+      %ul
+        - <%= singular_table_name %>.errors.full_messages.each do |message|
+          %li= message
+
+<% attributes.each do |attribute| -%>
+  %div{class: "field"}
+<% if attribute.password_digest? -%>
+    = form.label :password
+    = form.password_field :password
+
+  %div{class: "field"}
+    = form.label :password_confirmation
+    = form.password_field :password_confirmation
+<% elsif attribute.attachments? -%>
+    = form.label :<%= attribute.column_name %>
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true
+<% else -%>
+    = form.label :<%= attribute.column_name %>
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>
+  %div{class: "actions"}
+    = form.submit

data/lib/generators/haml/scaffold/templates/6_0/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Show', @<%= singular_table_name %>
+|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/6_0/index.html.haml

@@ -0,0 +1,25 @@
+%p{id: "notice"}= notice
+
+%h1 <%= plural_table_name.titleize %>
+
+%table
+  %thead
+    %tr
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+      %th <%= attribute.human_name %>
+<% end -%>
+      %th{colspan: "3"}
+
+  %tbody
+    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+      %tr
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+        %td= <%= singular_table_name %>.<%= attribute.column_name %>
+<% end -%>
+        %td= link_to 'Show', <%= model_resource_name %>
+        %td= link_to 'Edit', edit_<%= singular_route_name %>_path(<%= singular_table_name %>)
+        %td= link_to 'Destroy', <%= model_resource_name %>, method: :delete, data: { confirm: 'Are you sure?' }
+
+%br
+
+= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_route_name %>_path

data/lib/generators/haml/scaffold/templates/6_0/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/6_0/show.html.haml

@@ -0,0 +1,18 @@
+%p{id: "notice"}= notice
+
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+%p
+  %strong <%= attribute.human_name %>:
+<% if attribute.attachment? -%>
+  = link_to @<%= singular_table_name %>.<%= attribute.column_name %>.filename, @<%= singular_table_name %>.<%= attribute.column_name %> if @<%= singular_table_name %>.<%= attribute.column_name %>.attached?
+<% elsif attribute.attachments? -%>
+  - @<%= singular_table_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>|
+    %div= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %>
+<% else -%>
+  = @<%= singular_table_name %>.<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>
+= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)
+|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/6_1/_form.html.haml

@@ -0,0 +1,29 @@
+= form_with(model: <%= model_resource_name %>) do |form|
+  - if <%= singular_table_name %>.errors.any?
+    %div{id: "error_explanation"}
+      %h2= "#{pluralize(<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+
+      %ul
+        - <%= singular_table_name %>.errors.each do |error|
+          %li= error.full_message
+
+<% attributes.each do |attribute| -%>
+  %div{class: "field"}
+<% if attribute.password_digest? -%>
+    = form.label :password
+    = form.password_field :password
+
+  %div{class: "field"}
+    = form.label :password_confirmation
+    = form.password_field :password_confirmation
+<% elsif attribute.attachments? -%>
+    = form.label :<%= attribute.column_name %>
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true
+<% else -%>
+    = form.label :<%= attribute.column_name %>
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>
+  %div{class: "actions"}
+    = form.submit

data/lib/generators/haml/scaffold/templates/6_1/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing <%= singular_table_name.titleize %>
+
+= render 'form', <%= singular_table_name %>: @<%= singular_table_name %>
+
+= link_to 'Show', @<%= singular_table_name %>
+|
+= link_to 'Back', <%= index_helper %>_path