haml-rails 2.0.1 → 3.0.0

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

@@ -0,0 +1,29 @@
+= form_with(model: <%= model_resource_name %>) do |form|
+  - if <%= singular_table_name %>.errors.any?
+    %div{style: "color: red"}
+      %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
+<% if attribute.password_digest? -%>
+    = form.label :password, style: "display: block"
+    = form.password_field :password
+
+  %div
+    = form.label :password_confirmation, style: "display: block"
+    = form.password_field :password_confirmation
+<% elsif attribute.attachments? -%>
+    = form.label :<%= attribute.column_name %>, style: "display: block"
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true
+<% else -%>
+    = form.label :<%= attribute.column_name %>, style: "display: block"
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>
+  %div
+    = form.submit

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

@@ -0,0 +1,10 @@
+%h1 Editing <%= human_name.downcase %>
+
+= render "form", <%= singular_table_name %>: @<%= singular_table_name %>
+
+%br
+
+%div
+  = link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>
+  |
+  = link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>

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

@@ -0,0 +1,11 @@
+%p{style: "color: green"}= notice
+
+%h1 <%= human_name.pluralize %>
+
+%div{id: "<%= plural_table_name %>"}
+  - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+    = render <%= singular_table_name %>
+    %p
+      = link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(singular_table_name) %>
+
+= link_to "New <%= human_name.downcase %>", <%= new_helper(type: :path) %>

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

@@ -0,0 +1,8 @@
+%h1 New <%= human_name.downcase %>
+
+= render "form", <%= singular_table_name %>: @<%= singular_table_name %>
+
+%br
+
+%div
+  = link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>

data/lib/generators/haml/scaffold/templates/7_0/partial.html.haml

@@ -0,0 +1,14 @@
+%div{id: dom_id(<%= singular_name %>)}
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+  %p
+    %strong <%= attribute.human_name %>:
+<% if attribute.attachment? -%>
+    = link_to <%= singular_name %>.<%= attribute.column_name %>.filename, <%= singular_name %>.<%= attribute.column_name %> if <%= singular_name %>.<%= attribute.column_name %>.attached?
+<% elsif attribute.attachments? -%>
+    - <%= singular_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>|
+      %div= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %>
+<% else -%>
+    = <%= singular_name %>.<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>

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

@@ -0,0 +1,10 @@
+%p{style: "color: green"}= notice
+
+= render @<%= singular_table_name %>
+
+%div
+  = link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %>
+  |
+  = link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>
+
+  = button_to "Destroy this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete

data/lib/generators/haml/scaffold/templates/7_1

@@ -0,0 +1 @@
+7_0

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

@@ -0,0 +1,29 @@
+= form_with(model: <%= model_resource_name %>) do |form|
+  - if <%= singular_table_name %>.errors.any?
+    %div{style: "color: red"}
+      %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
+<% if attribute.password_digest? -%>
+    = form.label :password, style: "display: block"
+    = form.password_field :password
+
+  %div
+    = form.label :password_confirmation, style: "display: block"
+    = form.password_field :password_confirmation
+<% elsif attribute.attachments? -%>
+    = form.label :<%= attribute.column_name %>, style: "display: block"
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true
+<% else -%>
+    = form.label :<%= attribute.column_name %>, style: "display: block"
+    = form.<%= attribute.field_type %> :<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>
+  %div
+    = form.submit

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

@@ -0,0 +1,12 @@
+- content_for :title, "Editing <%= human_name.downcase %>"
+
+%h1 Editing <%= human_name.downcase %>
+
+= render "form", <%= singular_table_name %>: @<%= singular_table_name %>
+
+%br
+
+%div
+  = link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>
+  |
+  = link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>

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

@@ -0,0 +1,13 @@
+%p{style: "color: green"}= notice
+
+- content_for :title, "<%= human_name.pluralize %>"
+
+%h1 <%= human_name.pluralize %>
+
+%div{id: "<%= plural_table_name %>"}
+  - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+    = render <%= singular_table_name %>
+    %p
+      = link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(singular_table_name) %>
+
+= link_to "New <%= human_name.downcase %>", <%= new_helper(type: :path) %>

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

@@ -0,0 +1,10 @@
+- content_for :title, "New <%= human_name.downcase %>"
+
+%h1 New <%= human_name.downcase %>
+
+= render "form", <%= singular_table_name %>: @<%= singular_table_name %>
+
+%br
+
+%div
+  = link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>

data/lib/generators/haml/scaffold/templates/7_2/partial.html.haml

@@ -0,0 +1,14 @@
+%div{id: dom_id(<%= singular_name %>)}
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+  %p
+    %strong <%= attribute.human_name %>:
+<% if attribute.attachment? -%>
+    = link_to <%= singular_name %>.<%= attribute.column_name %>.filename, <%= singular_name %>.<%= attribute.column_name %> if <%= singular_name %>.<%= attribute.column_name %>.attached?
+<% elsif attribute.attachments? -%>
+    - <%= singular_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>|
+      %div= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %>
+<% else -%>
+    = <%= singular_name %>.<%= attribute.column_name %>
+<% end -%>
+
+<% end -%>

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

@@ -0,0 +1,10 @@
+%p{style: "color: green"}= notice
+
+= render @<%= singular_table_name %>
+
+%div
+  = link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %>
+  |
+  = link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>
+
+  = button_to "Destroy this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete

data/lib/generators/haml/scaffold/templates/8_0

@@ -0,0 +1 @@
+7_2

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

@@ -0,0 +1 @@
+8_0/_form.html.haml

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

@@ -0,0 +1 @@
+8_0/edit.html.haml

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

@@ -0,0 +1 @@
+8_0/index.html.haml

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

@@ -0,0 +1 @@
+8_0/new.html.haml

data/lib/generators/haml/scaffold/templates/partial.html.haml

@@ -0,0 +1 @@
+8_0/partial.html.haml

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

@@ -0,0 +1 @@
+8_0/show.html.haml

data/lib/haml-rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Haml
   module Rails
-    VERSION = "2.0.1"
+    VERSION = "3.0.0"
   end
 end

data/lib/haml-rails.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 require 'haml'
 require 'rails'
 require 'haml/railtie'
 
 module Haml
   module Rails
-    class Engine < ::Rails::Engine
-    end
     class Railtie < ::Rails::Railtie
       config.app_generators.template_engine :haml
 

data/lib/rails/generators/haml/application_layout/application_layout_generator.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'shellwords'
 
 module Haml
   module Generators
     class ApplicationLayoutGenerator < ::Rails::Generators::Base
-
       HTML_LAYOUT_PATH = 'app/views/layouts/application.html.erb'
       HAML_LAYOUT_PATH = 'app/views/layouts/application.html.haml'
 
@@ -16,20 +17,21 @@ module Haml
         app_layout_to   = ::Rails.root.join(HAML_LAYOUT_PATH).to_s
 
         if File.exist?(app_layout_from)
-
           if !File.exist?(app_layout_to)
             `html2haml #{app_layout_from.shellescape} #{app_layout_to.shellescape}`
-            puts "Success! app/views/layouts/application.html.haml is created.\n" \
-                 "Please remove the erb file: app/views/layouts/application.html.erb"
+            if $?.success?
+              puts "Success! app/views/layouts/application.html.haml is created.\n" \
+                   "Please remove the erb file: app/views/layouts/application.html.erb"
+            else
+              puts "Error! Failed to execute html2haml command."
+            end
           else
             puts "Error! There is a file named app/views/layouts/application.html.haml already."
           end
         else
           puts "Error! There is no file named app/views/layouts/application.html.erb."
         end
-
       end
-
     end
   end
 end

data/lib/tasks/erb2haml.rake

@@ -10,6 +10,8 @@ namespace :haml do
       exit
     end
 
+    erb_files_to_convert = erb_files.dup
+
     haml_files_w_out_ext = haml_files.map { |f| f.gsub(/\.haml\z/, '') }
 
     # Get a list of all those erb files that already seem to have .haml equivalents
@@ -22,21 +24,24 @@ namespace :haml do
       puts "Some of your .html.erb files seem to already have .haml equivalents:"
       already_existing.map { |f| puts "\t#{f}" }
 
-      # Ask the user whether he/she would like to overwrite them.
-      begin
-        puts "Would you like to overwrite these .haml files? (y/n)"
-        should_overwrite = STDIN.gets.chomp.downcase[0]
-      end until ['y', 'n'].include?(should_overwrite)
+      if ENV.has_key?("HAML_RAILS_OVERWRITE_HAML") && (ENV["HAML_RAILS_OVERWRITE_HAML"] == "false")
+        should_overwrite = 'n'
+      else
+        # Ask the user whether he/she would like to overwrite them.
+        begin
+          puts "Would you like to overwrite these .haml files? (y/n)"
+          should_overwrite = STDIN.gets.chomp.downcase[0]
+        end until ['y', 'n'].include?(should_overwrite)
+      end
       puts '-'*80
 
       # If we are not overwriting, remove each already_existing from our erb_files list
       if should_overwrite == 'n'
-        erb_files = erb_files - already_existing
+        erb_files_to_convert = erb_files - already_existing
 
-        if erb_files.empty?
+        if erb_files_to_convert.empty?
           # It is possible no .erb files remain, after we remove already_existing
-          puts "No .erb files remain. Task will now exit."
-          return
+          puts "No .erb files to convert"
         end
       else
         # Delete the current .haml
@@ -44,7 +49,7 @@ namespace :haml do
       end
     end
 
-    erb_files.each do |file|
+    erb_files_to_convert.each do |file|
       puts "Generating HAML for #{file}..."
       `html2haml #{file} #{file.gsub(/\.erb\z/, '.haml')}`
     end
@@ -52,20 +57,19 @@ namespace :haml do
     puts '-'*80
 
     puts "HAML generated for the following files:"
-    erb_files.each do |file|
+    erb_files_to_convert.each do |file|
       puts "\t#{file}"
     end
 
     puts '-'*80
-    begin
-      if ENV.has_key?("HAML_RAILS_DELETE_ERB")
-        should_delete = ENV["HAML_RAILS_DELETE_ERB"] == "true" ? "y" : "n"
-      else
+    if ENV.has_key?("HAML_RAILS_DELETE_ERB") && (ENV["HAML_RAILS_DELETE_ERB"] == "true")
+      should_delete = 'y'
+    else
+      begin
         puts 'Would you like to delete the original .erb files? (This is not recommended unless you are under version control.) (y/n)'
         should_delete = STDIN.gets.chomp.downcase[0]
-      end
-    end until ['y', 'n'].include?(should_delete)
-
+      end until ['y', 'n'].include?(should_delete)
+    end
     if should_delete == 'y'
       puts "Deleting original .erb files."
       File.delete(*erb_files)

data/test/fixtures/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 TestApp.routes.draw do |map|
   # The priority is based upon order of creation:
   # first created -> highest priority.

data/test/lib/generators/haml/controller_generator_test.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'test_helper'
-require 'lib/generators/haml/testing_helper'
+require 'rails/generators/rails/controller/controller_generator'
+require 'generators/haml/controller/controller_generator'
 
 class Haml::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
   destination Rails.root
@@ -11,8 +14,8 @@ class Haml::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
   arguments %w(Account foo bar --template-engine haml)
 
   test "should invoke haml engine" do
-    run_generator 
+    run_generator
     assert_file "app/views/account/foo.html.haml"
     assert_file "app/views/account/bar.html.haml"
-  end 
+  end
 end

data/test/lib/generators/haml/mailer_generator_test.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'test_helper'
-require 'lib/generators/haml/testing_helper'
+require 'rails/generators/mailer/mailer_generator'
+require 'generators/haml/mailer/mailer_generator'
 
 class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
   destination File.join(Rails.root)
@@ -64,4 +67,23 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
       end
     end
   end
+
+  test 'suffix is not duplicated' do
+    if ::Rails.version.to_s >= '4.2'
+      run_generator ['notifier_mailer', 'foo', 'bar', '--template-engine', 'haml']
+
+      assert_no_file 'app/views/notifier_mailer_mailer/'
+      assert_file 'app/views/notifier_mailer/'
+
+      assert_no_file 'app/views/notifier_mailer_mailer/foo.text.haml'
+      assert_file 'app/views/notifier_mailer/foo.text.haml'
+      assert_no_file 'app/views/notifier_mailer_mailer/foo.html.haml'
+      assert_file 'app/views/notifier_mailer/foo.html.haml'
+
+      assert_no_file 'app/views/notifier_mailer_mailer/bar.text.haml'
+      assert_file 'app/views/notifier_mailer/bar.text.haml'
+      assert_no_file 'app/views/notifier_mailer_mailer/bar.html.haml'
+      assert_file 'app/views/notifier_mailer/bar.html.haml'
+    end
+  end
 end

data/test/lib/generators/haml/scaffold_generator_test.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'test_helper'
-require 'lib/generators/haml/testing_helper'
+require 'rails/generators/rails/scaffold/scaffold_generator'
+require 'generators/haml/scaffold/scaffold_generator'
 
 class Haml::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCase
   destination File.join(Rails.root)

data/test/lib/generators/haml/scaffold_template_contents_test.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'rails/generators/rails/scaffold/scaffold_generator'
+require 'generators/haml/scaffold/scaffold_generator'
+require 'action_controller/test_case'
+
+class Haml::Generators::ScaffoldTemplateContentsTest < Rails::Generators::TestCase
+  destination File.join(Rails.root)
+  tests Rails::Generators::ScaffoldGenerator
+  arguments %w(person name)
+
+  setup :prepare_destination
+  setup :copy_routes
+
+  def view_context
+    @view_context ||= begin
+      require Rails.root.join('app/controllers/people_controller')
+
+      controller = PeopleController.new
+      controller.set_request!(ActionDispatch::Request.empty)
+      controller.request.session = ActionController::TestSession.new
+
+      if controller.lookup_context.respond_to? :append_view_paths
+        controller.lookup_context.append_view_paths([Rails.root.join('app/views')])
+      else
+        controller.lookup_context.view_paths << Rails.root.join('app/views')
+      end
+      controller.instance_variable_set :@people, []
+      controller.instance_variable_set :@person, Person.new(1, 'Person 1')
+
+      controller.view_context
+    end
+  end
+
+  def assert_html_content_with_erb_version(view, html)
+    view_context.lookup_context.handlers = [:erb]
+    erb_html = view_context.render(template: "people/#{view}")
+
+    assert_equal scrub(erb_html), scrub(html), "#{view} template result differs from the ERB version"
+  end
+
+  def scrub(html)
+    html = strip_whitespace html
+    strip_authenticity_token! html
+    html
+  end
+
+  def strip_whitespace(html)
+    html_doc = Nokogiri::HTML(html)
+    html_doc.xpath('//text()').each do |text_node|
+      text_node.remove if text_node.text.strip.empty?
+      text_node.content = text_node.text.strip
+    end
+    html_doc.to_html
+  end
+
+  def strip_authenticity_token!(html)
+    html.sub!(/(<input type="hidden" name="authenticity_token" value=").*?"/, '\1"')
+    html.sub!(/(<input autocomplete="off" name="authenticity_token" type="hidden" value=").*?"/, '\1"')
+  end
+
+  test 'should generate a set of templates that are 100% compatible with the original ERB templates' do
+    run_generator
+    run_generator default_arguments + %w(--template-engine haml)
+
+    %w(index edit new show).each do |view|
+      assert_file "app/views/people/#{view}.html.haml"
+
+      view_context.lookup_context.handlers = [:haml]
+      haml_html = view_context.render(template: "people/#{view}")
+
+      assert_html_content_with_erb_version view, haml_html
+    end
+  end
+end