html2haml 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea4fc47f04129ec7319391ff8d7b37540b63916
-  data.tar.gz: 41d533c8b9145b86c6a826544a03defb22188ad1
+  metadata.gz: 6eafad574519456fe8650f7fbcbf58827cf25b52
+  data.tar.gz: f4fe8909bb86ba40db7b85b7894e04038b04cbb1
 SHA512:
-  metadata.gz: 14ff09f53248de46f29ebe2c570c82478b4f6b384bf055a84130ce6a409eb3c6fcf8e18ee833d4167cb33c4d2feb5f9ea2141b3eba022ca278647a822dd5fadf
-  data.tar.gz: 817b603e6331163c738fb4076a67aa7d85d1adf4fbe2fa525a75a69a025813c6dc2862aff0c8d25b1cd8be88dc77e13482fdefcb04c449e84cabb50eacd107ed
+  metadata.gz: bb573d6a7d7af653a3d90e83b38ed2fbef33777944c66f7fa137190c2fc831dfa7af918de7e63ee641ead20ab7cbe88cbf370d99d9374e5d9f4e4c4b0d70405d
+  data.tar.gz: 6fcedbe8c9c81e9641dbab74464a9a13dc31beffbb153a15018b4e548bc63a79fe6bade20bcd1b00b8c6a753e3c98316c08cbaa2f8558fa3b9f6b65c2587e5cf

data/.travis.yml

@@ -4,14 +4,14 @@ sudo: false
 before_install: gem update bundler --no-document
 
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
   - 2.1.10
   - 2.0.0
   - 1.9.3
   - rbx-2
-  - jruby-9.1.7.0
+  - jruby-9.1.8.0
 
 gemfile:
   - Gemfile

data/Changelog.markdown

@@ -1,5 +1,9 @@
 # HTML2Haml Changelog
 
+## 2.2.0
+
+* Haml 5 support.
+
 ## 2.1.0
 
 * Reduce specificity of Haml 4.0 version dependency.

data/README.md

@@ -57,8 +57,8 @@ See `html2haml --help`:
     Description: Transforms an HTML file into corresponding Haml code.
 
     Options:
-        -e, --erb                        Parse ERb tags.
-            --no-erb                     Don't parse ERb tags.
+        -e, --erb                        Parse ERB tags.
+            --no-erb                     Don't parse ERB tags.
             --html-attributes            Use HTML style attributes instead of Ruby hash style.
             --ruby19-attributes          Use Ruby 1.9-style attributes when possible.
         -E ex[:in]                       Specify the default external and internal character encodings.

data/html2haml.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/html2haml/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Norman Clarke", "Stefan Natchev"]
-  gem.email         = ["norman@njclarke.com", "stefan.natchev@gmail.com"]
+  gem.authors       = ["Akira Matsuda", "Stefan Natchev"]
+  gem.email         = ["ronnie@dio.jp", "stefan.natchev@gmail.com"]
   gem.description   = %q{Converts HTML into Haml}
   gem.summary       = %q{Converts HTML into Haml}
   gem.homepage      = "http://haml.info"
@@ -21,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nokogiri', '>= 1.6.0'
   gem.add_dependency 'erubis', '~> 2.7.0'
   gem.add_dependency 'ruby_parser', '~> 3.5'
-  gem.add_dependency 'haml', '~> 4.0'
+  gem.add_dependency 'haml', ['>= 4.0', '< 6']
   gem.add_development_dependency 'simplecov', '~> 0.7.1'
-  gem.add_development_dependency 'minitest', '~> 4.4.0'
+  gem.add_development_dependency 'minitest', '>= 4.4.0'
   gem.add_development_dependency 'rake'
 end

data/lib/html2haml/exec.rb

@@ -203,11 +203,11 @@ Description: Transforms an HTML file into corresponding Haml code.
 Options:
 END
 
-        opts.on('-e', '--erb', 'Parse ERb tags.') do
+        opts.on('-e', '--erb', 'Parse ERB tags.') do
           @module_opts[:erb] = true
         end
 
-        opts.on('--no-erb', "Don't parse ERb tags.") do
+        opts.on('--no-erb', "Don't parse ERB tags.") do
           @options[:no_erb] = true
         end
 

data/lib/html2haml/version.rb

@@ -1,3 +1,3 @@
 module Html2haml
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/test/erb_test.rb

@@ -531,7 +531,7 @@ ERB
   end
 
   #https://github.com/haml/html2haml/issues/43
-  def test_escaped_ruby_call_when_preceeded_by_text
+  def test_escaped_ruby_call_when_preceded_by_text
     assert_equal(<<HAML.rstrip, render_erb(<<ERB))
 random text
 = form_tag(url: sessions_path) do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: html2haml
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
-- Norman Clarke
+- Akira Matsuda
 - Stefan Natchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -57,16 +57,22 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +91,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
@@ -111,7 +117,7 @@ dependencies:
         version: '0'
 description: Converts HTML into Haml
 email:
-- norman@njclarke.com
+- ronnie@dio.jp
 - stefan.natchev@gmail.com
 executables:
 - html2haml
@@ -158,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Converts HTML into Haml