haml-rails 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aabd39031775035905df0e25dc366c5d23136d548ebe418e160e18c4d488a9da
-  data.tar.gz: 12698b8d07d1b31d5393fa3b2d559681f81685dcf59cede01d5b5b5953cf143b
+  metadata.gz: 675edf6edfcd12cf4e411bd43aca9143cd4ae8f0597ab5235e4ebb65fae5e4e0
+  data.tar.gz: 21e1357af940ed0d8c70bc561393920389547ee68d8bb319c1bfba4484343d94
 SHA512:
-  metadata.gz: 21fc8f09ee72b62aa3f36cb4199c19aaeea94fb57aed8715cb8aef115710010edff6ea09a8fda3bdbd36a1eb1a281ad9079eb42ee190f9aec2d31a2a33c94179
-  data.tar.gz: 033700067b79242c2286760861dd6d3f440992561dfd08d4485c7392588a6e90408fbc5ae6c5dabfd8a0c77f8368d5f900883982f51686062dde41d86b1063db
+  metadata.gz: 75f63d2c53a4a6caaa9f8bbdfd94f629602ea13755aa085e1a30c6dff5306129e21e7ac95b3caf51d5cdd189f971c754ceb144b50a924a89b8861ee5aafab57b
+  data.tar.gz: 15fb9334379933441817672433b2186e1e1a3e6eb079927b42cd6807cea227eb71bbaad2f45231dd9c3ab1d41e10f8dec8b3a9ad27bcf73edbe4084b3aa2f3c6

data/.github/workflows/ruby.yml

@@ -0,0 +1,83 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - '3.4'
+          - '3.3'
+          - '3.2'
+          - '3.1'
+        rails-version:
+          - '8.0'
+          - '7.2'
+          - '7.1'
+          - '7.0'
+          - '6.1'
+
+        include:
+          - ruby-version: '3.1'
+            rails-version: '6.0'
+
+          - 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'
+
+          - ruby-version: jruby
+            rails-version: '6.1'
+
+        exclude:
+          - ruby-version: '3.1'
+            rails-version: '8.0'
+
+    env:
+      RUBY_VERSION: ${{ matrix.ruby-version }}
+      RAILS_VERSION: ${{ matrix.rails-version }}
+    steps:
+    - uses: actions/checkout@v5
+    - 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):
+      uses: ruby/setup-ruby@v1
+    # uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -4,3 +4,4 @@
 gemfiles/*.lock
 tmp/
 /vendor/bundle
+log

data/Gemfile

@@ -3,6 +3,21 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in haml-rails.gemspec
 gemspec
 
-gem 'rubysl', '~> 2.0', platforms: :rbx
-gem 'minitest', platforms: :rbx
 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

data/README.md

@@ -1,11 +1,12 @@
 # Haml-rails
-[![Build Status](https://travis-ci.org/indirect/haml-rails.svg)](https://travis-ci.org/indirect/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 4. 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.
@@ -47,9 +52,13 @@ false will also not prompt, however, will leave the .erb files intact.
 
 ### Older versions of Rails
 
-The current version of Haml-rails requires 4.0.1 or later.
+The current version of Haml-rails requires Rails 5.1 or later.
+
+Haml-rails version 1.0.0 is the last version to support Rails 4. To use it, add this line to your Gemfile:
+
+    gem "haml-rails", "~> 1.0.0"
 
-Haml-rails version 0.4 is the last version to support Rails 3. To use it, add this line to your Gemfile:
+For Rails 3, use haml-rails version 0.4 by adding this line to your Gemfile instead:
 
     gem "haml-rails", "~> 0.4.0"
 

data/haml-rails.gemspec

@@ -7,25 +7,25 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["André Arko"]
   s.email       = ["andre@arko.net"]
-  s.homepage    = "https://github.com/indirect/haml-rails"
+  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 4. 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.rubyforge_project         = "haml-rails"
+  s.metadata    = { "rubygems_mfa_required" => "true" }
+
   s.required_rubygems_version = ">= 2.0.0"
   s.required_ruby_version     = ">= 2.3.0"
 
-  s.add_dependency "haml",          [">= 4.0.6", "< 6.0"]
+  s.add_dependency "haml",          [">= 4.0.6"]
   s.add_dependency "activesupport", [">= 5.1"]
   s.add_dependency "actionpack",    [">= 5.1"]
   s.add_dependency "railties",      [">= 5.1"]
-  s.add_dependency "html2haml",     [">= 1.0.1"]
-
+  
+  s.add_development_dependency "html2haml", [">= 1.0.1"]
   s.add_development_dependency "rails",   [">= 5.1"]
-  s.add_development_dependency "bundler", "~> 2.0"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
-  s.add_development_dependency 'appraisal', '~> 1.0'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}

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
@@ -5,12 +7,11 @@ module Haml
     class ControllerGenerator < Erb::Generators::ControllerGenerator
       source_root File.expand_path("../templates", __FILE__)
 
-    protected
+      private
 
       def handler
         :haml
       end
-
     end
   end
 end

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

@@ -1,42 +1,16 @@
-require 'generators/haml/controller/controller_generator'
+# frozen_string_literal: true
+
+require 'rails/generators/erb/mailer/mailer_generator'
 
 module Haml
   module Generators
-    class MailerGenerator < ControllerGenerator
+    class MailerGenerator < Erb::Generators::MailerGenerator
       source_root File.expand_path("../templates", __FILE__)
 
-      def copy_view_files
-        if ::Rails.version.to_s >= "4.2.0"
-          view_base_path = File.join("app/views", class_path, file_name + "_mailer")
-          empty_directory view_base_path
-
-          if behavior == :invoke
-            formats.each do |format|
-              layout_path = File.join("app/views/layouts", class_path, filename_with_extensions("mailer", format))
-              template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path)
-            end
-          end
-
-          actions.each do |action|
-            @action = action
-
-            formats.each do |format|
-              @path = File.join(view_base_path, filename_with_extensions(action, format))
-              template filename_with_extensions(:view, format), @path
-            end
-          end
-        else
-          super
-        end
-      end
-
-    protected
-      def format
-        :text
-      end
+      private
 
-      def formats
-        [:text, :html]
+      def handler
+        :haml
       end
     end
   end

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,32 +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
+
+          template template_filename, File.join('app/views', controller_file_path, filename)
+        end
 
-      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)
+        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
 
-    protected
+      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

data/lib/generators/haml/scaffold/templates/6_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.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