haml-rails 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de34ddf946841da774bd57f3302958800218790
-  data.tar.gz: fed180c073e106ba9209f484eaf60797187f7641
+  metadata.gz: 1194c05de58e60e4b2efa587f17020b45665d8c0
+  data.tar.gz: ddaa9a2548583370eb6ea516efbd91c82c915ab6
 SHA512:
-  metadata.gz: 4f8fa062c4f4bc44d6fe472d40f7b983bb9ee121c73d5417ab84b9a7270e470566e485fc364bf9dc9dcbbe78ab2af46bbc92d435aa74ea33d548b8bcccac95a3
-  data.tar.gz: 2ad094c5345cffac1f576fa9edf93133145dab2ee15b2fc21caa3d1de04fda918670031e6e2b93aaa1740296b6e7304ed8bab5df331fbbf6e40821a93f161210
+  metadata.gz: 5600d4136bfd90a004d840eb21dd96c350746c01dacd707caccfc31af0cbbda8ba8921c1fa5730386e8891eee4036e570ca19d8f808ce5588e4b92da2e3d0805
+  data.tar.gz: 66e1ee8280f73770f5d70a41e780645d90fe65f22f6ad02abd141084791eaf5f711b9800c3cf2e34a6e32a50dcf54bd3f485e3e98686f4d4f621c317175ba9b6

data/.travis.yml

@@ -1,16 +1,14 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - rbx
 gemfile:
-  - gemfiles/rails_3_1.gemfile
-  - gemfiles/rails_3_2.gemfile
   - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_4_1.gemfile
 matrix:
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4_1.gemfile

data/Appraisals

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

data/Gemfile

@@ -2,3 +2,7 @@ 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,6 +1,6 @@
 # Haml-rails
 
-Haml-rails provides Haml generators for Rails 3. 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 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:
 
@@ -13,6 +13,26 @@ This ensures that:
 
 Pretty fancy, eh? The modern world is just so amazing.
 
+### Converting Rails application layout file to haml format
+
+Once Haml-rails is installed on the Rails application,
+you can convert the erb layout file, `app/views/layouts/application.html.erb`
+to `app/views/layouts/application.html.haml` using this command:
+
+    $ rails generate haml:application_layout convert
+
+After the application layout file is converted successfully,
+make sure to delete `app/views/layouts/application.html.erb`, so Rails can
+start using `app/views/layouts/application.html.haml` instead.
+
+### Older versions of Rails
+
+The current version of Haml-rails requires 4.0.1 or later.
+
+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", "~> 0.4.0"
+
 ### Contributors
 
 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.

data/gemfiles/rails_4_0.gemfile

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

data/gemfiles/rails_4_1.gemfile

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

data/haml-rails.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["andre@arko.net"]
   s.homepage    = "http://github.com/indirect/haml-rails"
   s.summary     = "let your Gemfile do the configuring"
-  s.description = "Haml-rails provides Haml generators for Rails 3. 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 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"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   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"

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

@@ -1,22 +1,24 @@
 %h1 Listing <%= plural_table_name %>
 
 %table
-  %tr
+  %thead
+    %tr
 <% for attribute in attributes -%>
-    %th <%= attribute.human_name %>
+      %th <%= attribute.human_name %>
 <% end -%>
-    %th
-    %th
-    %th
-
-  - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
-    %tr
+      %th
+      %th
+      %th
+      
+  %tbody
+    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+      %tr
 <% for attribute in attributes -%>
-      %td= <%= singular_table_name %>.<%= attribute.name %>
+        %td= <%= singular_table_name %>.<%= attribute.name %>
 <% 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 '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?' }
 
 %br
 

data/lib/haml-rails.rb

@@ -1,5 +1,6 @@
 require 'haml'
 require 'rails'
+require 'haml/railtie'
 
 module Haml
   module Rails

data/lib/haml-rails/version.rb

@@ -1,5 +1,5 @@
 module Haml
   module Rails
-    VERSION = "0.5.3"
+    VERSION = "0.6.0"
   end
 end

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

@@ -0,0 +1,31 @@
+require 'rails'
+
+module Haml
+  module Generators
+    class ApplicationLayoutGenerator < ::Rails::Generators::Base
+
+      # 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')
+
+        if File.exist?(app_layout_from)
+
+          if !File.exist?(app_layout_to)
+            `html2haml #{app_layout_from} #{app_layout_to}`
+            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! 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/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
 require 'rails/all'
 require 'rails/generators'
 require 'rails/generators/test_case'

metadata

@@ -1,134 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: haml-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - André Arko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-12-04 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'
-    - - <
+    - - "<"
       - !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'
-    - - <
+    - - "<"
       - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !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
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
-description: Haml-rails provides Haml generators for Rails 3. It also enables Haml
+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.
@@ -138,16 +152,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3_1.gemfile
-- gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
@@ -161,6 +174,7 @@ files:
 - lib/generators/haml/scaffold/templates/show.html.haml
 - lib/haml-rails.rb
 - lib/haml-rails/version.rb
+- lib/rails/generators/haml/application_layout/application_layout_generator.rb
 - test/fixtures/routes.rb
 - test/lib/generators/haml/controller_generator_test.rb
 - test/lib/generators/haml/mailer_generator_test.rb
@@ -177,17 +191,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.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: let your Gemfile do the configuring

data/gemfiles/rails_3_1.gemfile

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

data/gemfiles/rails_3_2.gemfile

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