html2haml 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4ea4fc47f04129ec7319391ff8d7b37540b63916
-  data.tar.gz: 41d533c8b9145b86c6a826544a03defb22188ad1
+SHA256:
+  metadata.gz: 2dcfae96b25443e16ee6148e085a6e544ef7ed31a71ab6842e91adf7a1c8b8dd
+  data.tar.gz: bb855c6b054a108c847ede14bd5bf17a723908ef8ac74b5c2daf9ab1fe231313
 SHA512:
-  metadata.gz: 14ff09f53248de46f29ebe2c570c82478b4f6b384bf055a84130ce6a409eb3c6fcf8e18ee833d4167cb33c4d2feb5f9ea2141b3eba022ca278647a822dd5fadf
-  data.tar.gz: 817b603e6331163c738fb4076a67aa7d85d1adf4fbe2fa525a75a69a025813c6dc2862aff0c8d25b1cd8be88dc77e13482fdefcb04c449e84cabb50eacd107ed
+  metadata.gz: 94d0f1ed89b8321a9d3eaa6bf899d18b8cb840980b6c63aec9c72b9ed211f40e435f05080fe5497061bb34eae69804ab60c47395bb68b3db70405cb53d5798f3
+  data.tar.gz: 23477a707ca4f07c5f25fc71dcd2572c08622fb2b7a539fc29e561244a98050d67f839e10f07a57234eaaf41de22b8585a68b526b92b02633c7a5908ac8dc462

data/.github/workflows/main.yml

@@ -0,0 +1,38 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby-version:
+          - '1.9'
+          - '2.0'
+          - '2.1'
+          - '2.2'
+          - '2.3'
+          - '2.4'
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - ruby-head
+          - jruby
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+        continue-on-error: ${{ matrix.ruby-version == 'ruby-head' }}
+
+      - run: |
+          bundle exec rake
+        continue-on-error: ${{ (matrix.ruby-version == 'ruby-head') || (matrix.ruby-version == 'jruby') }}

data/Changelog.markdown

@@ -1,5 +1,15 @@
 # HTML2Haml Changelog
 
+## 2.3.0
+
+* Haml 6+ support.
+
+* Fixed a bug that embedded ruby code was not parsed with the current version of ruby.
+
+## 2.2.0
+
+* Haml 5 support.
+
 ## 2.1.0
 
 * Reduce specificity of Haml 4.0 version dependency.

data/Gemfile

@@ -3,3 +3,13 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+
+if RUBY_VERSION < '2.1'
+  gem 'ruby_parser', '< 3.14'
+elsif RUBY_VERSION < '2.3'
+  gem 'ruby_parser', '< 3.18'
+else
+  gem 'ruby_parser', '>= 3.18'
+end
+
+gem 'sexp_processor', RUBY_VERSION < '2.1' ? '< 4.14.0' : '> 4.14.0'

data/README.md

@@ -1,6 +1,6 @@
 # Html2haml
 
-[![Build Status](https://travis-ci.org/haml/html2haml.svg?branch=master)](https://travis-ci.org/haml/html2haml)
+[![Build Status](https://github.com/haml/html2haml/workflows/test/badge.svg)](https://github.com/haml/html2haml/actions)
 [![Code Climate](https://codeclimate.com/github/haml/html2haml.svg)](https://codeclimate.com/github/haml/html2haml)
 [![Gem Version](https://badge.fury.io/rb/html2haml.svg)](https://rubygems.org/gems/html2haml)
 
@@ -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'
   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/html/erb.rb

@@ -98,7 +98,7 @@ module Html2haml
       # @param code [String] Ruby code to check
       # @return [Boolean]
       def valid_ruby?(code)
-        RubyParser.new.parse(code)
+        RubyParser.for_current_ruby.parse(code)
       rescue Racc::ParseError, RubyParser::SyntaxError
         false
       end

data/lib/html2haml/html.rb

@@ -439,18 +439,17 @@ module Html2haml
 
       def attribute_value_can_be_bare_ruby?(value)
         begin
-          ruby = RubyParser.new.parse(value)
+          ruby = RubyParser.for_current_ruby.parse(value)
         rescue Racc::ParseError, RubyParser::SyntaxError
           return false
         end
 
         return false if ruby.nil?
-        return true if ruby.sexp_type == :str   #regular string
-        return true if ruby.sexp_type == :dstr  #string with interpolation
-        return true if ruby.sexp_type == :lit   #symbol
-        return true if ruby.sexp_type == :call && ruby.mass == 1 #local var or method with no params
 
-        false
+        (ruby.sexp_type == :str) ||   #regular string
+        (ruby.sexp_type == :dstr) ||  #string with interpolation
+        (ruby.sexp_type == :lit) ||   #symbol
+        (ruby.sexp_type == :call && ruby.mass == 1) #local var or method with no params
       end
 
 

data/lib/html2haml/version.rb

@@ -1,3 +1,3 @@
 module Html2haml
-  VERSION = "2.1.0"
+  VERSION = "2.3.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.3.0
 platform: ruby
 authors:
-- Norman Clarke
+- Akira Matsuda
 - Stefan Natchev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -57,14 +57,14 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -85,14 +85,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,15 +111,15 @@ dependencies:
         version: '0'
 description: Converts HTML into Haml
 email:
-- norman@njclarke.com
+- ronnie@dio.jp
 - stefan.natchev@gmail.com
 executables:
 - html2haml
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - Changelog.markdown
 - Gemfile
@@ -142,7 +142,7 @@ homepage: http://haml.info
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,9 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.9
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Converts HTML into Haml
 test_files:

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-sudo: false
-
-before_install: gem update bundler --no-document
-
-rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
-  - 2.1.10
-  - 2.0.0
-  - 1.9.3
-  - rbx-2
-  - jruby-9.1.7.0
-
-gemfile:
-  - Gemfile
-
-branches:
-  only:
-    - master
-
-script: "bundle exec rake test"
-
-matrix:
-  allow_failures:
-    - rvm: rbx-2