haml-rails 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd4e782b975a13cfd5ef38f19650e2c9028dc006
-  data.tar.gz: f8ba9eb9204a69d693bb6889ff11179f99fd5055
+SHA256:
+  metadata.gz: aabd39031775035905df0e25dc366c5d23136d548ebe418e160e18c4d488a9da
+  data.tar.gz: 12698b8d07d1b31d5393fa3b2d559681f81685dcf59cede01d5b5b5953cf143b
 SHA512:
-  metadata.gz: 89b10fb1366277ed37d3022d109a94827105eecbfcb60e44adfb605b57beacd8620a1f647812deb83ab6d2a0d5e4ee4eebd99ef1fe91869b22593451d02da9a0
-  data.tar.gz: eeb501849dc14d680c872c5ca98bc4fe4fc0c16071836e37810ae2d06afc2a0454db610c9807a017086078ed0cae16dbf7a074536b2749c8497f0c2f99a06196
+  metadata.gz: 21fc8f09ee72b62aa3f36cb4199c19aaeea94fb57aed8715cb8aef115710010edff6ea09a8fda3bdbd36a1eb1a281ad9079eb42ee190f9aec2d31a2a33c94179
+  data.tar.gz: 033700067b79242c2286760861dd6d3f440992561dfd08d4485c7392588a6e90408fbc5ae6c5dabfd8a0c77f8368d5f900883982f51686062dde41d86b1063db

data/.travis.yml

@@ -1,30 +1,23 @@
 sudo: false
 language: ruby
 cache: bundler
-before_install: "gem install bundler"
+before_install:
+  - "gem update --system"
+  - "gem install bundler"
 rvm:
-  - 2.4.1
-  - 2.3.1
-  - 2.2.5
-  - 2.1
-  - 2.0
-  - 1.9.3
-  - jruby-19mode
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+  - jruby-9.2.5.0
 gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6.beta2.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
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.beta2.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_6.beta2.gemfile
 script: "bundle exec rake test"

data/Appraisals

@@ -13,3 +13,15 @@ end
 appraise "rails_5_0" do
   gem "rails", "5.0"
 end
+
+appraise "rails_5_1" do
+  gem "rails", "5.1"
+end
+
+appraise "rails_5_2" do
+  gem "rails", "5.2"
+end
+
+appraise "rails_6.beta2" do
+  gem "rails", "6.0.0.beta2"
+end

data/README.md

@@ -1,10 +1,11 @@
 # Haml-rails
+[![Build Status](https://travis-ci.org/indirect/haml-rails.svg)](https://travis-ci.org/indirect/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.
 
 To use it, add this line to your Gemfile:
 
-    gem "haml-rails", "~> 0.9"
+    gem "haml-rails", "~> 2.0"
 
 This ensures that:
 
@@ -30,13 +31,19 @@ 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
 
@@ -50,10 +57,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_4_0.gemfile → rails_5_1.gemfile}

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "rubysl", "~> 2.0", :platforms => :rbx
 gem "minitest", :platforms => :rbx
 gem "html2haml"
-gem "rails", "~> 4.0.1"
+gem "rails", "~> 5.1.5"
 
 gemspec :path => "../"

data/gemfiles/{rails_4_1.gemfile → rails_5_2.gemfile}

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "rubysl", "~> 2.0", :platforms => :rbx
 gem "minitest", :platforms => :rbx
 gem "html2haml"
-gem "rails", "4.1"
+gem "rails", "~> 5.2.0"
 
 gemspec :path => "../"

data/gemfiles/{rails_4_2.gemfile → rails_6.beta2.gemfile}

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "rubysl", "~> 2.0", :platforms => :rbx
 gem "minitest", :platforms => :rbx
 gem "html2haml"
-gem "rails", "4.2"
+gem "rails", "6.0.0.beta2"
 
 gemspec :path => "../"

data/haml-rails.gemspec

@@ -7,22 +7,23 @@ 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/indirect/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.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 "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 "rails",   [">= 4.0.1"]
-  s.add_development_dependency "bundler", "~> 1.7"
+  s.add_development_dependency "rails",   [">= 5.1"]
+  s.add_development_dependency "bundler", "~> 2.0"
   s.add_development_dependency "rake"
   s.add_development_dependency 'appraisal', '~> 1.0'
 

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

@@ -7,13 +7,13 @@ module Haml
 
       def copy_view_files
         if ::Rails.version.to_s >= "4.2.0"
-          view_base_path = File.join("app/views", class_path, file_name)
+          view_base_path = File.join("app/views", class_path, file_name + "_mailer")
           empty_directory view_base_path
 
-          if self.behavior == :invoke
+          if 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
+              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
 

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/haml-rails/version.rb

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

data/lib/haml-rails.rb

@@ -46,7 +46,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/tasks/erb2haml.rake

@@ -58,8 +58,12 @@ namespace :haml do
 
     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]
+      if ENV.has_key?("HAML_RAILS_DELETE_ERB")
+        should_delete = ENV["HAML_RAILS_DELETE_ERB"] == "true" ? "y" : "n"
+      else
+        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)
 
     if should_delete == 'y'

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

@@ -13,34 +13,55 @@ 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
-    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
-    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.text.haml" do |view|
-      assert_match %r(app/views/notifier/bar\.text\.haml), view
-      assert_match /\= @greeting/, view
+        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
+
+      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
 end

data/test/test_helper.rb

@@ -73,7 +73,7 @@ alias :require_generator :require_generators
 require_generators generator_list
 
 # 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.0.1
 platform: ruby
 authors:
 - André Arko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -36,42 +36,42 @@ dependencies:
     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
@@ -92,28 +92,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: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -159,10 +159,9 @@ files:
 - 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.beta2.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
@@ -187,7 +186,7 @@ files:
 - 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/indirect/haml-rails
 licenses:
 - MIT
 metadata: {}
@@ -199,15 +198,14 @@ 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
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: let your Gemfile do the configuring

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 => "../"