haml-rails 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 754bd59211dcca7161c1c20b59f9a5b3f3d0855b
-  data.tar.gz: 990889fe237e677b7d8fa8c861ec9f6f3007b82a
+  metadata.gz: 8064aca7be819a48cb04b8190419e0af4e19fde6
+  data.tar.gz: b62de0f2d026e5b30d81094df1d3516e526f88c6
 SHA512:
-  metadata.gz: a492400ff4971e33cdd203a861bcd5462d81b39538394bdae078c68b32595981459a642b9bbe3d96436a08c3591ee5520e38caf6d3975ab5ed0cc7995e634456
-  data.tar.gz: 17de4af9850407b36ef6276f525f993c714b144a96a0fdbc29e0ea317b04c308f616cd4f5957be70daeaf1cae0acf2a406520971b108afe032e8607c1ee7b69a
+  metadata.gz: 3ff054d70313f175385ed447a0a2518d9fbd7f78b54acdf68f5c9cbc80e6ca1b6bcd6e0f952240d4eabc18f67ae511c2c3efd5a7727fbc209f92431aac3b7568
+  data.tar.gz: fcddf27870d2275f52f5653921fb558b89883815cce99351982e5f914fdb051e2ec2539b2b314b1fb8c6aef26261431222109da73c4e34097a7c4660b5b1369e

data/.travis.yml

@@ -3,12 +3,15 @@ rvm:
   - 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_4_2.gemfile
 matrix:
   exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_4_1.gemfile
+script: "bundle exec rake test"

data/Appraisals

@@ -1,13 +1,11 @@
 appraise "rails_4_0" do
   gem "rails", "~> 4.0.1"
-
-  gem 'rubysl', '~> 2.0', platforms: :rbx
-  gem 'minitest', platforms: :rbx
 end
 
 appraise "rails_4_1" do
-  gem "rails", "4.1.0.beta1"
+  gem "rails", "4.1"
+end
 
-  gem 'rubysl', '~> 2.0', platforms: :rbx
-  gem 'minitest', platforms: :rbx
+appraise "rails_4_2" do
+  gem "rails", "4.2"
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 André Arko
+Copyright (c) 2010-2015 André Arko
 
 MIT Licence
 

data/README.md

@@ -4,10 +4,11 @@ Haml-rails provides Haml generators for Rails 4. It also enables Haml as the tem
 
 To use it, add this line to your Gemfile:
 
-    gem "haml-rails"
+    gem "haml-rails", "~> 0.9"
 
 This ensures that:
-  * Any time you generate a controller or scaffold, you'll get Haml templates (instead of ERB)
+
+  * Any time you generate a resource, view, or mailer, you'll get Haml templates (instead of ERB)
   * When your Rails application loads, Haml will be loaded and initialized automatically
   * Haml templates will be respected by the view template cache digestor
 

data/Rakefile

@@ -1,11 +1,7 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-begin
-  require 'appraisal'
-rescue LoadError
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/gemfiles/rails_4_0.gemfile

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

data/gemfiles/rails_4_1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.0.beta1"
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
+gem "rails", "4.1"
 
-gem 'rubysl', '~> 2.0', platforms: :rbx
-gem 'minitest', platforms: :rbx
-
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails_4_2.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", "4.2"
+
+gemspec :path => "../"

data/haml-rails.gemspec

@@ -15,16 +15,16 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "haml-rails"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "haml",          [">= 3.1", "< 5.0"]
+  s.add_dependency "haml",          [">= 4.0.6", "< 5.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.2"
+  s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rake"
-  s.add_development_dependency 'appraisal', '>= 0.3.8'
+  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/mailer/mailer_generator.rb

@@ -5,10 +5,30 @@ module Haml
     class MailerGenerator < ControllerGenerator
       source_root File.expand_path("../templates", __FILE__)
 
-    protected
+      def copy_view_files
+        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
+          end
+        end
+
+        actions.each do |action|
+          @action = action
 
-      def format
-        :text
+          formats.each do |format|
+            @path = File.join(view_base_path, filename_with_extensions(action, format))
+            template filename_with_extensions(:view, format), @path
+          end
+        end
+      end
+
+    protected
+      def formats
+        [:text, :html]
       end
 
     end

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

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

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

@@ -0,0 +1 @@
+= yield

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

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

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

@@ -9,7 +9,7 @@
       %th
       %th
       %th
-      
+
   %tbody
     - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
       %tr

data/lib/haml-rails.rb

@@ -4,15 +4,12 @@ require 'haml/railtie'
 
 module Haml
   module Rails
+    class Engine < ::Rails::Engine
+    end
     class Railtie < ::Rails::Railtie
-      if ::Rails.version.to_s >= "3.1"
-        config.app_generators.template_engine :haml
-      else
-        config.generators.template_engine :haml
-      end
+      config.app_generators.template_engine :haml
 
       config.before_initialize do
-        Haml.init_rails(binding)
         Haml::Template.options[:format] = :html5
       end
 

data/lib/haml-rails/version.rb

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

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

@@ -2,16 +2,17 @@ require 'test_helper'
 require 'lib/generators/haml/testing_helper'
 
 class Haml::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
-  destination File.join(Rails.root)
+  destination Rails.root
   tests Rails::Generators::ControllerGenerator
-  arguments %w(Account foo bar --template-engine haml)
 
   setup :prepare_destination
   setup :copy_routes
 
-  test "should invoke template engine" do
-    run_generator
-    assert_file "app/views/account/foo.html.haml", %r(app/views/account/foo\.html\.haml)
-    assert_file "app/views/account/bar.html.haml", %r(app/views/account/bar\.html\.haml)
-  end
+  arguments %w(Account foo bar --template-engine haml)
+
+  test "should invoke haml engine" do
+    run_generator 
+    assert_file "app/views/account/foo.html.haml"
+    assert_file "app/views/account/bar.html.haml"
+  end 
 end

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

@@ -11,14 +11,33 @@ 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
+
+    assert_file "app/views/layouts/mailer.html.haml" do |view|
+      assert_match /\= yield/, view
+    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/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/test_helper.rb

@@ -7,26 +7,24 @@ require 'rails/generators/test_case'
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)
 end
-Rails.application = TestApp
 
 module Rails
   def self.root
     @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails'))
   end
 end
-Rails.application.config.root = Rails.root
 
 # Call configure to load the settings from
 # Rails.application.config.generators to Rails::Generators
-Rails::Generators.configure! Rails.application.config.generators
+Rails.application.load_generators
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 def copy_routes
-  routes = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb'))
+  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), 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,

metadata

@@ -1,147 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: haml-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - André Arko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+        version: 4.0.6
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+        version: 4.0.6
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: html2haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '1.0'
 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
@@ -152,8 +152,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE
@@ -161,10 +161,14 @@ files:
 - Rakefile
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
 - lib/generators/haml/mailer/mailer_generator.rb
+- lib/generators/haml/mailer/templates/layout.html.haml
+- lib/generators/haml/mailer/templates/layout.text.haml
+- lib/generators/haml/mailer/templates/view.html.haml
 - lib/generators/haml/mailer/templates/view.text.haml
 - lib/generators/haml/scaffold/scaffold_generator.rb
 - lib/generators/haml/scaffold/templates/_form.html.haml
@@ -192,17 +196,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: haml-rails
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: let your Gemfile do the configuring