haml 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1516ce57a2223bbb3e48b98b360ee5afd000187c
-  data.tar.gz: 4684ec8a3d54757e1b42f3431e5972a99fc3ed3d
+  metadata.gz: 9b62d5ba7d60ed7cbcd3dade098f61ff08b286a4
+  data.tar.gz: 8839cd13c83fab48b9bcd69981b610f5f3a8c5f6
 SHA512:
-  metadata.gz: 815057d4871feeff8fdb368b55d640444fa730f06ef8a0344fcc8f9e23e8d17d444057d2a09531249a2a3905d848c4da4ba0be478a0429b9b1296e7bfe8fb0b4
-  data.tar.gz: d72bf87bad6fdf37a18291cb19dfccbb6a4d10aed7151be5c4461925bf4bddc45fe01dd8eab6c561a936c727e19c0d57017abe3628a2adb56ddcc5d7706e5e08
+  metadata.gz: 5d314e93aa06f42d37d57bbf4ab1f849ef030080ad4d322b1a0ff37b7ab4c9d2901ef72d816c801b9d00a1c0b214edb4e37982fe13416c2aa6156f22c0093b8a
+  data.tar.gz: 4c959e9053cb049b025e97964d0a95bdf03f6628bed7d8a20e76bc8ee1ec62b1acbc54e669fc015f9d130a7ca938d8254f462ae8275f03a4b2cc14a78c85cbfa

data/.travis.yml

@@ -13,10 +13,10 @@ rvm:
 gemfile:
   - test/gemfiles/Gemfile.rails-5.1.x
   - test/gemfiles/Gemfile.rails-5.0.x
+  - test/gemfiles/Gemfile.rails-5.0.x.erubi
   - test/gemfiles/Gemfile.rails-4.2.x
   - test/gemfiles/Gemfile.rails-4.1.x
   - test/gemfiles/Gemfile.rails-4.0.x
-  - test/gemfiles/Gemfile.rails-edge
 matrix:
   exclude:
     - rvm: 2.0.0
@@ -25,14 +25,21 @@ matrix:
       gemfile: test/gemfiles/Gemfile.rails-5.1.x
     - rvm: 2.0.0
       gemfile: test/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.0.0
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
     - rvm: 2.1.10
       gemfile: test/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.1.10
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
     - rvm: 2.4.1
       gemfile: test/gemfiles/Gemfile.rails-4.0.x
     - rvm: 2.4.1
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
     - rvm: 2.4.1
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
+  include:
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/Gemfile.rails-edge
   allow_failures:
     - rvm: rbx-3
     - gemfile: test/gemfiles/Gemfile.rails-edge

data/CHANGELOG.md

@@ -1,16 +1,24 @@
 # Haml Changelog
 
+## 5.0.3
+
+Released on September 7, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.2...v5.0.3)).
+
+* Use `String#dump` instead of `String#inspect` to generate string literal. (Takashi Kokubun)
+* Fix Erubi superclass mismatch error. [#952](https://github.com/haml/haml/pull/952) (thanks [Robin Daugherty](https://github.com/RobinDaugherty))
+
 ## 5.0.2
 
 Released on August 1, 2017
-([diff](https://github.com/haml/haml/compare/v5.0.2...v5.0.1)).
+([diff](https://github.com/haml/haml/compare/v5.0.1...v5.0.2)).
 
 * Let `haml -c` fail if generated Ruby code is syntax error. [#880](https://github.com/haml/haml/issues/880) (Takashi Kokubun)
 * Fix `NoMethodError` bug caused with Sprockets 3 and :sass filter. [#930](https://github.com/haml/haml/pull/930) (thanks [Gonzalez Maximiliano](https://github.com/emaxi))
 * Fix `list_of` helper with multi-line content. [#933](https://github.com/haml/haml/pull/933) (thanks [Benoit Larroque](https://github.com/zetaben))
 * Optimize rendering performance by changing timing to fix textareas. [#941](https://github.com/haml/haml/pull/941) (Takashi Kokubun)
 * Fix `TypeError` with empty :ruby filter. [#942](https://github.com/haml/haml/pull/942) (Takashi Kokubun)
-* Fix inconsitent attribute sort order. (Takashi Kokubun)
+* Fix inconsistent attribute sort order. (Takashi Kokubun)
 
 ## 5.0.1
 

data/lib/haml/compiler.rb

@@ -95,13 +95,11 @@ module Haml
         parse = false
         value = t[:parse] ? nil : t[:value]
         dynamic_attributes = Haml::Parser::DynamicAttributes.new
-        preserve_script = false
       else
         object_ref = t[:object_ref]
         parse = t[:parse]
         value = t[:value]
         dynamic_attributes = t[:dynamic_attributes]
-        preserve_script = t[:preserve_script]
       end
 
       if @options[:trace]

data/lib/haml/railtie.rb

@@ -26,7 +26,15 @@ module Haml
           require "haml/sass_rails_filter"
         end
 
-        if defined? Erubi
+        # Any object under ActionView::Template will be defined as the root constant with the same
+        # name if it exists. If Erubi is loaded at all, ActionView::Template::Handlers::ERB::Erubi
+        # will turn out to be a reference to the ::Erubi module.
+        # In Rails 4.2, calling const_defined? results in odd exceptions, which seems to be
+        # solved by looking for ::Erubi first.
+        # However, in JRuby, the const_defined? finds it anyway, so we must make sure that it's
+        # not just a reference to ::Erubi.
+        if defined?(::Erubi) && const_defined?('ActionView::Template::Handlers::ERB::Erubi') &&
+            ActionView::Template::Handlers::ERB::Erubi != ::Erubi
           require "haml/helpers/safe_erubi_template"
           Haml::Filters::RailsErb.template_class = Haml::SafeErubiTemplate
         else

data/lib/haml/util.rb

@@ -126,7 +126,7 @@ MSG
     def inspect_obj(obj)
       case obj
       when String
-        %Q!"#{obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]}}"!
+        %Q!"#{obj.gsub(/[\x00-\x7F]+/) {|s| s.dump[1...-1]}}"!
       when Symbol
         ":#{inspect_obj(obj.to_s)}"
       else

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.