haml-rails 1.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd4e782b975a13cfd5ef38f19650e2c9028dc006
-  data.tar.gz: f8ba9eb9204a69d693bb6889ff11179f99fd5055
+SHA256:
+  metadata.gz: c92791c4d02db70961e18508ae709bd86a9bae7325eb8afd6f7c8286c3d7824f
+  data.tar.gz: 0a4ad454a0c72f707159ee95c4a529cdf3c4194a64b13a690b475a1ff72687c1
 SHA512:
-  metadata.gz: 89b10fb1366277ed37d3022d109a94827105eecbfcb60e44adfb605b57beacd8620a1f647812deb83ab6d2a0d5e4ee4eebd99ef1fe91869b22593451d02da9a0
-  data.tar.gz: eeb501849dc14d680c872c5ca98bc4fe4fc0c16071836e37810ae2d06afc2a0454db610c9807a017086078ed0cae16dbf7a074536b2749c8497f0c2f99a06196
+  metadata.gz: e3232df46c3893fab9e0cec861ddb8d88bfd9fe3c40bc0e05a4c67915ef58bd4f54ff9e39a4cc040853cd42fe421942629a46f31294b1622098047e42d5a89a2
+  data.tar.gz: d25c5e7ff3ef9fb3e0879129ffe8689c9e06d2b945b404d2be3775573142645304189440deb9ca755b1d5684df1775ea707acd046d6c31f77abdb750bcd98677

data/.github/workflows/ruby.yml

@@ -0,0 +1,64 @@
+# 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:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - 3.1
+          - 3.0
+          - 2.7
+          - jruby
+        gemfile:
+          - rails_7_0
+          - rails_6_1
+          - rails_6_0
+
+        include:
+          - ruby-version: 2.7
+            gemfile: rails_5_2
+          - ruby-version: 2.7
+            gemfile: rails_5_1
+
+          - 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
+
+        exclude:
+          - ruby-version: jruby
+            gemfile: rails_7_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
+    steps:
+    - uses: actions/checkout@v3
+    - 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/Appraisals

@@ -1,15 +1,19 @@
-appraise "rails_4_0" do
-  gem "rails", "~> 4.0.1"
+appraise "rails_5_1" do
+  gem "rails", "~> 5.1.0"
 end
 
-appraise "rails_4_1" do
-  gem "rails", "4.1"
+appraise "rails_5_2" do
+  gem "rails", "~> 5.2.0"
 end
 
-appraise "rails_4_2" do
-  gem "rails", "4.2"
+appraise "rails_6_0" do
+  gem "rails", "~> 6.0.0"
 end
 
-appraise "rails_5_0" do
-  gem "rails", "5.0"
+appraise "rails_6_1" do
+  gem "rails", "~> 6.1.0"
+end
+
+appraise "rails_7_0" do
+  gem "rails", "~> 7.0.0"
 end

data/Gemfile

@@ -3,6 +3,4 @@ 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'

data/README.md

@@ -1,10 +1,11 @@
 # Haml-rails
+[![Build Status](https://travis-ci.org/haml/haml-rails.svg)](https://travis-ci.org/haml/haml-rails)
 
-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. 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", "~> 0.9"
+    gem "haml-rails", "~> 2.0"
 
 This ensures that:
 
@@ -30,19 +31,29 @@ start using `app/views/layouts/application.html.haml` instead.
 
 If you want to convert all of your .erb views into .haml, you can do so using the following command:
 
-    $ rake haml:erb2haml
+    $ rails haml:erb2haml
 
 If you already have .haml files for one or more of the .erb files, the rake task will give you the option of either
 replacing these .haml files or leaving them in place.
 
 Once the task is complete, you will have the option of deleting the original .erb files. Unless you are under
-version control, it is recommended that you decline this option.
+version control, it is recommended that you decline this option.  If you are running in a script, you can use
+an environment variable to answer this question.
+
+    $ HAML_RAILS_DELETE_ERB=true rails haml:erb2haml
+
+Running the above will not prompt for the question and will delete the original .erb files.  Setting this value to
+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:
 
-Haml-rails version 0.4 is the last version to support Rails 3. To use it, add this line to your Gemfile:
+    gem "haml-rails", "~> 1.0.0"
+
+For Rails 3, use haml-rails version 0.4 by adding this line to your Gemfile instead:
 
     gem "haml-rails", "~> 0.4.0"
 
@@ -50,10 +61,6 @@ Haml-rails version 0.4 is the last version to support Rails 3. To use it, add th
 
 Haml generators originally from [rails3-generators](http://github.com/indirect/rails3-generators), and written by José Valim, André Arko, Paul Barry, Anuj Dutta, Louis T, and Chris Rhoden. Tests originally written by Louis T.
 
-### Code Status
-
-[![Build Status](https://travis-ci.org/indirect/haml-rails.svg)](https://travis-ci.org/indirect/haml-rails)
-
 ### License
 
 Ruby license or MIT license, take your pick.

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "html2haml"
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "html2haml"
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "html2haml"
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "html2haml"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "html2haml"
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"

data/haml-rails.gemspec

@@ -7,24 +7,24 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["André Arko"]
   s.email       = ["andre@arko.net"]
-  s.homepage    = "http://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. 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.required_rubygems_version = ">= 1.3.6"
+  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 "activesupport", [">= 4.0.1"]
-  s.add_dependency "actionpack",    [">= 4.0.1"]
-  s.add_dependency "railties",      [">= 4.0.1"]
-  s.add_dependency "html2haml",     [">= 1.0.1"]
-
-  s.add_development_dependency "rails",   [">= 4.0.1"]
-  s.add_development_dependency "bundler", "~> 1.7"
+  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_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', '~> 1.0'
+  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/controller/controller_generator.rb

@@ -5,12 +5,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,14 @@
-require 'generators/haml/controller/controller_generator'
+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)
-          empty_directory view_base_path
+      private
 
-          if self.behavior == :invoke
-            formats.each do |format|
-              layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
-              template filename_with_extensions(:layout, format), 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
-
-      def formats
-        [:text, :html]
+      def handler
+        :haml
       end
     end
   end

data/lib/generators/haml/mailer/templates/layout.html.haml

@@ -1,3 +1,8 @@
+!!!
 %html
+  %head
+    %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
+    :css
+      /* Email styles need to be inline */
   %body
     = yield

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

@@ -21,7 +21,7 @@ module Haml
         end
       end
 
-    protected
+      private
 
       def available_views
         %w(index edit show new)
@@ -30,7 +30,6 @@ module Haml
       def handler
         :haml
       end
-
     end
   end
 end

data/lib/haml-rails/version.rb

@@ -1,5 +1,5 @@
 module Haml
   module Rails
-    VERSION = "1.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/haml-rails.rb

@@ -4,8 +4,6 @@ require 'haml/railtie'
 
 module Haml
   module Rails
-    class Engine < ::Rails::Engine
-    end
     class Railtie < ::Rails::Railtie
       config.app_generators.template_engine :haml
 
@@ -46,7 +44,13 @@ module Haml
       # provided directly by railties 3.2..4.1 but was dropped in 4.2.
       if Gem::Requirement.new(">= 4.2").satisfied_by?(Gem::Version.new(::Rails.version))
         initializer 'haml_rails.configure_source_annotation' do
-          SourceAnnotationExtractor::Annotation.register_extensions('haml') do |tag|
+          annotation_class = if ::Rails::VERSION::STRING >= '6.0'
+            require 'rails/source_annotation_extractor'
+            ::Rails::SourceAnnotationExtractor::Annotation
+          else
+            ::SourceAnnotationExtractor::Annotation
+          end
+          annotation_class.register_extensions('haml') do |tag|
             /\s*-#\s*(#{tag}):?\s*(.*)/
           end
         end

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

@@ -4,7 +4,6 @@ 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'
 
@@ -27,9 +26,7 @@ module Haml
         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,16 +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
-      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 until ['y', 'n'].include?(should_delete)
-
+    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 until ['y', 'n'].include?(should_delete)
+    end
     if should_delete == 'y'
       puts "Deleting original .erb files."
       File.delete(*erb_files)

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

@@ -1,5 +1,6 @@
 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 +12,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,6 @@
 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)
@@ -13,34 +14,74 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
     run_generator
 
     if ::Rails.version.to_s >= '4.2'
-
       assert_file "app/views/layouts/mailer.text.haml" do |view|
-        assert_match /\= yield/, view
+        assert_match(/\= yield/, view)
       end
 
       assert_file "app/views/layouts/mailer.html.haml" do |view|
-        assert_match /\= yield/, view
+        assert_match(/\= yield/, view)
       end
 
-      assert_file "app/views/notifier/foo.html.haml" do |view|
-        assert_match %r(app/views/notifier/foo\.html\.haml), view
-        assert_match /\= @greeting/, view
+      assert_file "app/views/notifier_mailer/foo.html.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/foo\.html\.haml), view
+        assert_match(/\= @greeting/, view)
       end
 
-      assert_file "app/views/notifier/bar.html.haml" do |view|
-        assert_match %r(app/views/notifier/bar\.html\.haml), view
-        assert_match /\= @greeting/, view
+      assert_file "app/views/notifier_mailer/bar.html.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/bar\.html\.haml), view
+        assert_match(/\= @greeting/, view)
+      end
+
+      assert_file "app/views/notifier_mailer/foo.text.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/foo\.text\.haml), view
+        assert_match(/\= @greeting/, view)
+      end
+
+      assert_file "app/views/notifier_mailer/bar.text.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/bar\.text\.haml), view
+        assert_match(/\= @greeting/, view)
+      end
+    else
+      if ::Rails.version.to_s >= '4.1'
+        assert_file "app/views/notifier/foo.html.haml" do |view|
+          assert_match %r(app/views/notifier/foo\.html\.haml), view
+          assert_match(/\= @greeting/, view)
+        end
+
+        assert_file "app/views/notifier/bar.html.haml" do |view|
+          assert_match %r(app/views/notifier/bar\.html\.haml), view
+          assert_match(/\= @greeting/, view)
+        end
       end
-    end
 
-    assert_file "app/views/notifier/foo.text.haml" do |view|
-      assert_match %r(app/views/notifier/foo\.text\.haml), view
-      assert_match /\= @greeting/, view
+      assert_file "app/views/notifier/foo.text.haml" do |view|
+        assert_match %r(app/views/notifier/foo\.text\.haml), view
+        assert_match(/\= @greeting/, view)
+      end
+
+      assert_file "app/views/notifier/bar.text.haml" do |view|
+        assert_match %r(app/views/notifier/bar\.text\.haml), view
+        assert_match(/\= @greeting/, view)
+      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_file "app/views/notifier/bar.text.haml" do |view|
-      assert_match %r(app/views/notifier/bar\.text\.haml), view
-      assert_match /\= @greeting/, view
+      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,6 @@
 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/test_helper.rb

@@ -1,79 +1,47 @@
 require 'rubygems'
 require 'minitest/autorun'
-require 'rails/all'
+require 'action_pack'
+require 'action_controller'
+require 'action_view'
+require 'rails'
 require 'rails/generators'
 require 'rails/generators/test_case'
+Bundler.require(:default)
 
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
+  config.eager_load = false
 end
 
 module Rails
   def self.root
-    @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails'))
+    @root ||= Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails')))
   end
 end
 
-# Call configure to load the settings from
-# Rails.application.config.generators to Rails::Generators
-Rails.application.load_generators
+TestApp.initialize!
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-def copy_routes
-  routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
-  destination = File.join(Rails.root, "config")
-  FileUtils.mkdir_p(destination)
-  FileUtils.cp File.expand_path(routes), File.expand_path(destination)
-end
-
-# Asserts the given class exists in the given content. When a block is given,
-# it yields the content of the class.
-#
-#   assert_file "test/functional/accounts_controller_test.rb" do |controller_test|
-#     assert_class "AccountsControllerTest", controller_test do |klass|
-#       assert_match /context "index action"/, klass
-#     end
-#   end
-#
-def assert_class(klass, content)
-  assert content =~ /class #{klass}(\(.+\))?(.*?)\nend/m, "Expected to have class #{klass}"
-  yield $2.strip if block_given?
-end
-
-def generator_list
-  {
-    :rails        => ['scaffold', 'controller', 'mailer'],
-    :haml         => ['scaffold', 'controller', 'mailer']
-  }
-end
-
-def path_prefix(name)
-  case name
-  when :rails
-    'rails/generators'
-  else
-    'generators'
-  end
-end
+module Haml
+  module Rails
+    module GeneratorTestHelpers
+      private
 
-def require_generators(generator_list)
-  generator_list.each do |name, generators|
-    generators.each do |generator_name|
-      if name.to_s == 'rails' && generator_name.to_s == 'mailer'
-        require File.join(path_prefix(name), generator_name.to_s, "#{generator_name}_generator")
-      else
-        require File.join(path_prefix(name), name.to_s, generator_name.to_s, "#{generator_name}_generator")
+      def copy_routes
+        routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
+        destination = File.join(::Rails.root, "config")
+        FileUtils.mkdir_p(destination)
+        FileUtils.cp File.expand_path(routes), File.expand_path(destination)
       end
     end
   end
 end
-alias :require_generator :require_generators
 
-require_generators generator_list
+::Rails::Generators::TestCase.include Haml::Rails::GeneratorTestHelpers
 
 # Remove tmp directory when test suite is completed
-MiniTest::Unit.after_tests do
+MiniTest.after_run do
   tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp'))
   FileUtils.rm_r(tmp_dir)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - André Arko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,51 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: html2haml
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +73,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -92,28 +86,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,17 +126,17 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: Haml-rails provides Haml generators for Rails 4. It also enables Haml
+        version: '0'
+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.
@@ -152,17 +146,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
@@ -185,13 +180,12 @@ files:
 - test/lib/generators/haml/controller_generator_test.rb
 - test/lib/generators/haml/mailer_generator_test.rb
 - test/lib/generators/haml/scaffold_generator_test.rb
-- test/lib/generators/haml/testing_helper.rb
 - test/test_helper.rb
-homepage: http://github.com/indirect/haml-rails
+homepage: https://github.com/haml/haml-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,16 +193,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 2.0.0
 requirements: []
-rubyforge_project: haml-rails
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: let your Gemfile do the configuring
 test_files: []

data/.travis.yml

@@ -1,30 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-before_install: "gem install bundler"
-rvm:
-  - 2.4.1
-  - 2.3.1
-  - 2.2.5
-  - 2.1
-  - 2.0
-  - 1.9.3
-  - jruby-19mode
-gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_0.gemfile
-matrix:
-  exclude:
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_4_1.gemfile
-script: "bundle exec rake test"

data/gemfiles/rails_4_0.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "~> 4.0.1"
-
-gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "4.1"
-
-gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "4.2"
-
-gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "5.0"
-
-gemspec :path => "../"

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

@@ -1 +0,0 @@
-require_generators :haml => ['scaffold', 'controller', 'mailer']