haml-rails 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8064aca7be819a48cb04b8190419e0af4e19fde6
-  data.tar.gz: b62de0f2d026e5b30d81094df1d3516e526f88c6
+  metadata.gz: fd4e782b975a13cfd5ef38f19650e2c9028dc006
+  data.tar.gz: f8ba9eb9204a69d693bb6889ff11179f99fd5055
 SHA512:
-  metadata.gz: 3ff054d70313f175385ed447a0a2518d9fbd7f78b54acdf68f5c9cbc80e6ca1b6bcd6e0f952240d4eabc18f67ae511c2c3efd5a7727fbc209f92431aac3b7568
-  data.tar.gz: fcddf27870d2275f52f5653921fb558b89883815cce99351982e5f914fdb051e2ec2539b2b314b1fb8c6aef26261431222109da73c4e34097a7c4660b5b1369e
+  metadata.gz: 89b10fb1366277ed37d3022d109a94827105eecbfcb60e44adfb605b57beacd8620a1f647812deb83ab6d2a0d5e4ee4eebd99ef1fe91869b22593451d02da9a0
+  data.tar.gz: eeb501849dc14d680c872c5ca98bc4fe4fc0c16071836e37810ae2d06afc2a0454db610c9807a017086078ed0cae16dbf7a074536b2749c8497f0c2f99a06196

data/.travis.yml

@@ -1,17 +1,30 @@
+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
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
   - jruby-19mode
-  - rbx
 gemfile:
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.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"
+script: "bundle exec rake test"

data/Appraisals

@@ -8,4 +8,8 @@ end
 
 appraise "rails_4_2" do
   gem "rails", "4.2"
-end
+end
+
+appraise "rails_5_0" do
+  gem "rails", "5.0"
+end

data/README.md

@@ -52,7 +52,7 @@ Haml generators originally from [rails3-generators](http://github.com/indirect/r
 
 ### Code Status
 
-[![Build Status](https://travis-ci.org/indirect/haml-rails.png)](https://travis-ci.org/indirect/haml-rails)
+[![Build Status](https://travis-ci.org/indirect/haml-rails.svg)](https://travis-ci.org/indirect/haml-rails)
 
 ### License
 

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,10 @@
+# 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/haml-rails.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "haml-rails"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "haml",          [">= 4.0.6", "< 5.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"]

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

@@ -6,31 +6,38 @@ module Haml
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_view_files
-        view_base_path = File.join("app/views", class_path, file_name)
-        empty_directory view_base_path
+        if ::Rails.version.to_s >= "4.2.0"
+          view_base_path = File.join("app/views", class_path, file_name)
+          empty_directory view_base_path
 
-        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
+          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
-        end
 
-        actions.each do |action|
-          @action = action
+          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
+            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]
       end
-
     end
   end
 end

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

@@ -1,3 +1,3 @@
-%hmtl
+%html
   %body
-    = yield
+    = yield

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

@@ -1 +1 @@
-= yield
+= yield

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

@@ -1,4 +1,4 @@
 %h1= class_name + "#" + @action
 
 %p
-  = @greeting + ", find me in <%= @path %>"
+  = @greeting + ", find me in <%= @path %>"

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

@@ -3,8 +3,8 @@
     #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 |msg|
-          %li= msg
+        - @<%= singular_table_name %>.errors.full_messages.each do |message|
+          %li= message
 
 <% for attribute in attributes -%>
   .field

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

@@ -18,7 +18,7 @@
 <% 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?' }
+        %td= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' }
 
 %br
 

data/lib/haml-rails.rb

@@ -42,7 +42,7 @@ module Haml
         end
       end
 
-      # Configure source annoatation on haml files (support for HAML was
+      # Configure source annotation on haml files (support for HAML was
       # 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
@@ -54,7 +54,7 @@ module Haml
 
       rake_tasks do
         load 'tasks/erb2haml.rake'
-      end  
+      end
     end
   end
 end

data/lib/haml-rails/version.rb

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

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

@@ -1,20 +1,24 @@
 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'
+
       # Converts existing application.html.erb to haml format,
       # and creates app/views/layouts/application.html.haml
       # with some error checking.
       def convert
-        app_layout_from = ::Rails.root.join('app/views/layouts/application.html.erb')
-        app_layout_to   = ::Rails.root.join('app/views/layouts/application.html.haml')
+        app_layout_from = ::Rails.root.join(HTML_LAYOUT_PATH).to_s
+        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} #{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"
           else

data/lib/tasks/erb2haml.rake

@@ -64,7 +64,7 @@ namespace :haml do
 
     if should_delete == 'y'
       puts "Deleting original .erb files."
-      File.delete *erb_files
+      File.delete(*erb_files)
     else
       puts "Please remember to delete your .erb files once you have ensured they were translated correctly."
     end
@@ -72,4 +72,4 @@ namespace :haml do
     puts '-'*80
     puts "Task complete!"
   end
-end
+end

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

@@ -12,12 +12,25 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
   test "should invoke template engine" do
     run_generator
 
-    assert_file "app/views/layouts/mailer.text.haml" do |view|
-      assert_match /\= yield/, view
-    end
+    if ::Rails.version.to_s >= '4.2'
+
+      assert_file "app/views/layouts/mailer.text.haml" do |view|
+        assert_match /\= yield/, view
+      end
+
+      assert_file "app/views/layouts/mailer.html.haml" do |view|
+        assert_match /\= yield/, view
+      end
 
-    assert_file "app/views/layouts/mailer.html.haml" do |view|
-      assert_match /\= yield/, view
+      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
 
     assert_file "app/views/notifier/foo.text.haml" do |view|
@@ -25,19 +38,9 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
       assert_match /\= @greeting/, 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
-    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
-
-    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

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

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

data/test/test_helper.rb

@@ -70,4 +70,10 @@ def require_generators(generator_list)
 end
 alias :require_generator :require_generators
 
-require_generators generator_list
+require_generators generator_list
+
+# Remove tmp directory when test suite is completed
+MiniTest::Unit.after_tests 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: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - André Arko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -19,7 +19,7 @@ dependencies:
         version: 4.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: haml-rails
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: let your Gemfile do the configuring