haml 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f839cdb94174ba8781070c63c81802476e784313
-  data.tar.gz: 95438da1cb7cd8137a2d5d6a838c126530165797
+  metadata.gz: 1516ce57a2223bbb3e48b98b360ee5afd000187c
+  data.tar.gz: 4684ec8a3d54757e1b42f3431e5972a99fc3ed3d
 SHA512:
-  metadata.gz: 8bf0fb1e2b30d0c6b0fb02bc26ce4e994a3a806fcc2a3e46f8ef4b4ef850642b3e85cbfe5660b174bddd44d04e72facceefb2c2229eb57abc5ca32bd8305790d
-  data.tar.gz: 23439f7250b7c914333b0702a9eade9c96a7bbf123e5df44c6099c826263bd69e3986ab5343f2c8cf7bc1a68644283a4a46685c8cbd750680ee4ec9b01b4ec62
+  metadata.gz: 815057d4871feeff8fdb368b55d640444fa730f06ef8a0344fcc8f9e23e8d17d444057d2a09531249a2a3905d848c4da4ba0be478a0429b9b1296e7bfe8fb0b4
+  data.tar.gz: d72bf87bad6fdf37a18291cb19dfccbb6a4d10aed7151be5c4461925bf4bddc45fe01dd8eab6c561a936c727e19c0d57017abe3628a2adb56ddcc5d7706e5e08

data/.travis.yml

@@ -8,14 +8,15 @@ rvm:
   - 2.2.7
   - 2.1.10
   - 2.0.0
-  - jruby-9.1.8.0
+  - jruby-9.1.12.0
   - rbx-3
 gemfile:
-  - test/gemfiles/Gemfile.rails-4.0.x
-  - test/gemfiles/Gemfile.rails-4.1.x
-  - test/gemfiles/Gemfile.rails-4.2.x
-  - test/gemfiles/Gemfile.rails-5.0.x
   - test/gemfiles/Gemfile.rails-5.1.x
+  - test/gemfiles/Gemfile.rails-5.0.x
+  - 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
@@ -34,5 +35,6 @@ matrix:
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
   allow_failures:
     - rvm: rbx-3
+    - gemfile: test/gemfiles/Gemfile.rails-edge
   fast_finish: true
 script: "bundle exec rake submodules test"

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Haml Changelog
 
+## 5.0.2
+
+Released on August 1, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.2...v5.0.1)).
+
+* 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)
+
 ## 5.0.1
 
 Released on May 3, 2017
@@ -19,7 +31,9 @@ Breaking Changes
 * Haml now requires Ruby 2.0.0 or above.
 * Rails 3 is no longer supported, matching the official
   [Maintenance Policy for Ruby on Rails](http://weblog.rubyonrails.org/2013/2/24/maintenance-policy-for-ruby-on-rails/).
+  Use Haml 4 if you want to use Rails 3.
   (Tee Parham)
+* Remove `:ugly` option ([#894](https://github.com/haml/haml/pull/894))
 * The `haml` command's debug option (`-d`) no longer executes the Haml code, but
   rather checks the generated Ruby syntax for errors.
 * Drop parser/compiler accessor from `Haml::Engine`. Modify `Haml::Engine#initialize` options

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 gemspec
 
+gem "m"
 gem "pry"
 
 group :docs do

data/README.md

@@ -42,12 +42,6 @@ To use Haml with Rails, simply add Haml to your Gemfile and run `bundle`.
 gem 'haml'
 ~~~
 
-Haml 5 will require Rails version 4.0 or later. If you are using Rails 3.x, you should use Haml version 4.0.x:
-
-~~~ruby
-gem 'haml', '~> 4.0.5'
-~~~
-
 If you'd like to replace Rails's Erb-based generators with Haml, add
 [haml-rails](https://github.com/indirect/haml-rails) to your Gemfile as well.
 

data/REFERENCE.md

@@ -1120,8 +1120,8 @@ is compiled to
       <p>I <strong>really</strong> prefer <em>raspberry</em> jam.</p>
     </div>
 
-Currently, filters ignore the {Haml::Options#escape_html `:escape_html`} option.
-This means that `#{}` interpolation within filters is never HTML-escaped.
+Note that `#{}` interpolation within filters is HTML-escaped if you specify
+{Haml::Options#escape_html `:escape_html`} option.
 
 The functionality of some filters such as Markdown can be provided by many
 different libraries. Usually you don't have to worry about this - you can just
@@ -1144,9 +1144,9 @@ Surrounds the filtered text with CDATA tags.
 
 ### `:coffee` {#coffee-filter}
 
-Compiles the filtered text to Javascript using Coffeescript. You can also
-reference this filter as `:coffeescript`. This filter is implemented using
-Tilt.
+Compiles the filtered text to JavaScript in `<script>` tag using CoffeeScript.
+You can also reference this filter as `:coffeescript`. This filter is
+implemented using Tilt.
 
 ### `:css` {#css-filter}
 
@@ -1174,7 +1174,7 @@ option} to control when CDATA tags are added.
 
 ### `:less` {#less-filter}
 
-Parses the filtered text with [Less](http://lesscss.org/) to produce CSS output.
+Parses the filtered text with [Less](http://lesscss.org/) to produce CSS output in `<style>` tag.
 This filter is implemented using Tilt.
 
 ### `:markdown` {#markdown-filter}
@@ -1217,12 +1217,13 @@ template.
 ### `:sass` {#sass-filter}
 
 Parses the filtered text with [Sass](http://sass-lang.com/) to produce CSS
-output. This filter is implemented using Tilt.
+output in `<style>` tag. This filter is implemented using Tilt.
 
 ### `:scss` {#scss-filter}
 
 Parses the filtered text with Sass like the `:sass` filter, but uses the newer
-SCSS syntax to produce CSS output. This filter is implemented using Tilt.
+SCSS syntax to produce CSS output in `<style>` tag. This filter is implemented
+using Tilt.
 
 ### `:textile` {#textile-filter}
 

data/Rakefile

@@ -4,13 +4,19 @@ require "bundler/gem_tasks"
 
 task :default => :test
 
-#FIXME: Redefining :test task to run each test in isolated process.
+# FIXME: Redefining :test task to run test/options_test.rb in isolated process since it depends on whether Rails is loaded or not.
 # Remove this task when we finished changing escape_html option to be true by default.
-task :test do
-  test_files = Dir.glob('test/**/*_test.rb').reject { |f| f.start_with?('test/gemfiles/vendor/bundle') }
-  test_files.all? do |file|
-    sh(Gem.ruby, '-w', '-I/lib', '-Itest', file)
-  end || raise('Failures')
+isolated_test = Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = %w[test/options_test.rb]
+  t.warning = true
+  t.verbose = true
+end
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = Dir['test/*_test.rb'] + Dir['test/haml-spec/*_test.rb'] - isolated_test.file_list
+  t.warning = true
+  t.verbose = true
 end
 
 CLEAN.replace %w(pkg doc coverage .yardoc test/haml vendor)

data/haml.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
   end
   spec.homepage    = 'http://haml.info/'
   spec.has_rdoc    = false
-  spec.test_files  = Dir["test/**/*_test.rb"]
   spec.license     = "MIT"
 
   spec.required_ruby_version = '>= 2.0.0'

data/lib/haml/attribute_compiler.rb

@@ -16,12 +16,6 @@ module Haml
           value
         end
       end
-
-      # Key's substring before a hyphen. This is necessary because values with the same
-      # base_key can conflict by Haml::AttributeBuidler#build_data_keys.
-      def base_key
-        key.split('-', 2).first
-      end
     end
 
     # Returns a script to render attributes on runtime.
@@ -62,14 +56,28 @@ module Haml
       attribute_values = build_attribute_values(attributes, parsed_hashes)
       AttributeBuilder.verify_attribute_names!(attribute_values.map(&:key))
 
-      values_by_base_key = attribute_values.group_by(&:base_key)
-      [:multi, *values_by_base_key.keys.sort.map { |base_key|
-        compile_attribute_values(values_by_base_key[base_key])
+      [:multi, *group_values_for_sort(attribute_values).map { |value_group|
+        compile_attribute_values(value_group)
       }]
     end
 
     private
 
+    # Build array of grouped values whose sort order may go back and forth, which is also sorted with key name.
+    # This method needs to group values with the same start because it can be changed in `Haml::AttributeBuidler#build_data_keys`.
+    # @param values [Array<Haml::AttributeCompiler::AttributeValue>]
+    # @return [Array<Array<Haml::AttributeCompiler::AttributeValue>>]
+    def group_values_for_sort(values)
+      sorted_values = values.sort_by(&:key)
+      [].tap do |value_groups|
+        until sorted_values.empty?
+          key = sorted_values.first.key
+          value_group, sorted_values = sorted_values.partition { |v| v.key.start_with?(key) }
+          value_groups << value_group
+        end
+      end
+    end
+
     # Returns array of AttributeValue instances from static attributes and dynamic_attributes. For each key,
     # the values' order in returned value is preserved in the same order as Haml::Buffer#attributes's merge order.
     #
@@ -89,9 +97,9 @@ module Haml
       end
     end
 
-    # Compiles attribute values with the same base_key to Temple expression.
+    # Compiles attribute values with the similar key to Temple expression.
     #
-    # @param values [Array<AttributeValue>] `base_key`'s results are the same. `key`'s result may differ.
+    # @param values [Array<AttributeValue>] whose `key`s are partially or fully the same from left.
     # @return [Array] Temple expression
     def compile_attribute_values(values)
       if values.map(&:key).uniq.size == 1

data/lib/haml/buffer.rb

@@ -159,7 +159,7 @@ module Haml
     # @since Haml 4.0.1
     # @private
     def fix_textareas!(input)
-      return input unless toplevel? && input.include?('<textarea'.freeze)
+      return input unless input.include?('<textarea'.freeze)
 
       pattern = /<(textarea)([^>]*)>(\n|&#x000A;)(.*?)<\/textarea>/im
       input.gsub!(pattern) do |s|

data/lib/haml/compiler.rb

@@ -287,11 +287,11 @@ module Haml
         text = "(#{text}).strip"
       end
       if opts[:preserve_tag]
-        text = "::Haml::Helpers.preserve(#{text})"
+        text = "_hamlout.fix_textareas!(::Haml::Helpers.preserve(#{text}))"
       elsif opts[:preserve_script]
-        text = "::Haml::Helpers.find_and_preserve(#{text}, _hamlout.options[:preserve])"
+        text = "_hamlout.fix_textareas!(::Haml::Helpers.find_and_preserve(#{text}, _hamlout.options[:preserve]))"
       end
-      "_hamlout.fix_textareas!(#{text});"
+      "#{text};"
     end
 
     def push_generated_script(text)

data/lib/haml/exec.rb

@@ -301,6 +301,11 @@ END
           engine = ::Haml::Engine.new(template, @options[:for_engine])
 
           if @options[:check_syntax]
+            error = validate_ruby(engine.precompiled)
+            if error
+              puts error.message.split("\n").first
+              exit 1
+            end
             puts "Syntax OK"
             return
           end
@@ -333,7 +338,7 @@ END
 
       def validate_ruby(code)
         begin
-          eval("BEGIN {return nil}; #{code}")
+          eval("BEGIN {return nil}; #{code}", binding, @options[:filename])
         rescue ::SyntaxError # Not to be confused with Haml::SyntaxError
           $!
         end

data/lib/haml/filters.rb

@@ -282,7 +282,7 @@ RUBY
       def compile(compiler, text)
         return if compiler.options[:suppress_eval]
         compiler.instance_eval do
-          push_silent <<-FIRST.tr("\n", ';') + text + <<-LAST.tr("\n", ';')
+          push_silent "#{<<-FIRST.tr("\n", ';')}#{text}#{<<-LAST.tr("\n", ';')}"
             begin
               haml_io = StringIO.new(_hamlout.buffer, 'a')
           FIRST

data/lib/haml/generator.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 module Haml
   # Ruby code generator, which is a limited version of Temple::Generator.
   # Limit methods since Haml doesn't need most of them.

data/lib/haml/helpers.rb

@@ -206,7 +206,7 @@ MESSAGE
 
         if result.count("\n") > 1
           result.gsub!("\n", "\n  ")
-          result = "\n  #{result.strip!}\n"
+          result = "\n  #{result.strip}\n"
         else
           result.strip!
         end

data/lib/haml/helpers/action_view_mods.rb

@@ -58,11 +58,15 @@ module ActionView
         preserve = haml_buffer.options.fetch(:preserve, %w[textarea pre code]).include?(name.to_s)
 
         if block_given? && block_is_haml?(block) && preserve
-          return content_tag_without_haml(name, *args) {preserve(&block)}
+          return content_tag_without_haml(name, *args) do
+            haml_buffer.fix_textareas!(Haml::Helpers.preserve(&block)).html_safe
+          end
         end
 
         content = content_tag_without_haml(name, *args, &block)
-        content = Haml::Helpers.preserve(content) if preserve && content
+        if preserve && content
+          content = haml_buffer.fix_textareas!(Haml::Helpers.preserve(content)).html_safe
+        end
         content
       end
 

data/lib/haml/parser.rb

@@ -668,7 +668,7 @@ module Haml
       return attributes_hash, rest, last_line
     end
 
-    # @return [Array<Hash,String,nil>] - [static_attributs (Hash), dynamic_attributes (nil or String starting with `{` and ending with `}`)]
+    # @return [Array<Hash,String,nil>] - [static_attributes (Hash), dynamic_attributes (nil or String starting with `{` and ending with `}`)]
     # @return [String] rest
     # @return [Integer] last_line
     def parse_new_attributes(text)

data/lib/haml/sass_rails_filter.rb

@@ -6,7 +6,7 @@ module Haml
     class SassRailsTemplate < ::Sass::Rails::SassTemplate
       if Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new('3.0.0')
         def render(scope=Object.new, locals={}, &block)
-          environment = ::Sprockets::Railtie.build_environment(Rails.application)
+          environment = ::Sprockets::Railtie.build_environment(::Rails.application)
           scope = environment.context_class.new(
             environment: environment,
             filename: "/",

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -157,15 +157,6 @@ files:
 - lib/haml/temple_line_counter.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
-- test/attribute_parser_test.rb
-- test/engine_test.rb
-- test/filters_test.rb
-- test/helper_test.rb
-- test/options_test.rb
-- test/parser_test.rb
-- test/template_test.rb
-- test/temple_line_counter_test.rb
-- test/util_test.rb
 - yard/default/.gitignore
 - yard/default/fulldoc/html/css/common.sass
 - yard/default/layout/html/footer.erb
@@ -189,18 +180,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
-test_files:
-- test/attribute_parser_test.rb
-- test/engine_test.rb
-- test/filters_test.rb
-- test/helper_test.rb
-- test/options_test.rb
-- test/parser_test.rb
-- test/template_test.rb
-- test/temple_line_counter_test.rb
-- test/util_test.rb
+test_files: []
 has_rdoc: false

data/test/attribute_parser_test.rb

@@ -1,105 +0,0 @@
-require 'test_helper'
-
-class AttributeParserTeset < Haml::TestCase
-  describe '.parse' do
-    def assert_parse(expected, haml)
-      actual = Haml::AttributeParser.parse(haml)
-      if expected.nil?
-        assert_nil actual
-      else
-        assert_equal expected, actual
-      end
-    end
-
-    if Haml::AttributeParser.available?
-      it { assert_parse(nil, '') }
-      it { assert_parse({}, '{}') }
-
-      describe 'invalid hash' do
-        it { assert_parse(nil, '{hash}') }
-        it { assert_parse(nil, '{hash, foo: bar}') }
-        it { assert_parse(nil, '{ {hash} }') }
-        it { assert_parse(nil, '{ { hash, foo: bar } }') }
-        it { assert_parse(nil, '{}.merge({})') }
-      end
-
-      describe 'non single hash' do
-        it { assert_parse(nil, '{ a: 0 };{}') }
-        it { assert_parse(nil, '{ a: 0 }[nil] = {}') }
-      end
-
-      describe 'dynamic key' do
-        it { assert_parse(nil, '{foo => bar}') }
-        it { assert_parse(nil, '{[] => bar}') }
-        it { assert_parse(nil, '{[1,2,3] => bar}') }
-      end
-
-      describe 'foo: bar' do
-        it { assert_parse({ '_' => '1' }, '{_:1,}') }
-        it { assert_parse({ 'foo' => 'bar' }, '{ foo:  bar }') }
-        it { assert_parse({ 'a' => 'b', 'c' => ':d' }, '{a: b, c: :d}') }
-        it { assert_parse({ 'a' => '[]', 'c' => '"d"' }, '{a: [], c: "d"}') }
-      end
-
-      describe ':foo => bar' do
-        it { assert_parse({ 'foo' => ':bar' }, '{  :foo   =>  :bar  }') }
-        it { assert_parse({ '_' => '"foo"' }, '{:_=>"foo"}') }
-        it { assert_parse({ 'a' => '[]', 'c' => '""', 'b' => '"#{3}"' }, '{:a => [], c: "", :b => "#{3}"}') }
-        it { assert_parse(nil, '{:"f#{o}o" => bar}') }
-        it { assert_parse(nil, '{:"#{f}oo" => bar}') }
-        it { assert_parse(nil, '{:"#{foo}" => bar}') }
-      end
-
-      describe '"foo" => bar' do
-        it { assert_parse({ 'foo' => '[1]' }, '{"foo"=>[1]}') }
-        it { assert_parse({ 'foo' => 'nya' }, "{ 'foo' => nya }") }
-        it { assert_parse({ 'foo' => 'bar' }, '{%q[foo] => bar }') }
-        it { assert_parse({ 'foo' => '[1]' }, ' { "foo"=>[1] } ') }
-        it { assert_parse({ 'foo' => 'nya' }, " {  'foo' => nya } ") }
-        it { assert_parse({ 'foo' => 'bar' }, ' { %q[foo] => bar } ') }
-        it { assert_parse(nil, '{"f#{o}o" => bar}') }
-        it { assert_parse(nil, '{"#{f}oo" => bar}') }
-        it { assert_parse(nil, '{"#{foo}" => bar}') }
-        it { assert_parse({ 'f#{o}o' => 'bar' }, '{ %q[f#{o}o] => bar }') }
-        it { assert_parse({ 'f#{o}o' => 'bar' }, '{ %q[f#{o}o] => bar,  }') }
-        it { assert_parse(nil, '%Q[f#{o}o] => bar ') }
-      end
-
-      describe 'string interpolation' do
-        it { assert_parse({ 'foo' => %q["#{bar baz, '/abc/'}"] }, %q[{foo: "#{bar baz, '/abc/'}"}]) }
-      end
-
-      describe 'multi lines' do
-        it { assert_parse({ 'a' => 'b', 'c' => 'd' }, "{a: b,\nc: d}") }
-      end
-
-      if RUBY_VERSION >= '2.2.0'
-        describe '"foo": bar' do
-          it { assert_parse({ 'foo' => '()' }, '{"foo":()}') }
-          it { assert_parse({ 'foo' => 'nya' }, " {'foo': nya} ") }
-          it { assert_parse({ 'foo' => '()' }, ' { "foo":() , }') }
-          it { assert_parse({ 'foo' => 'nya' }, " {  'foo': nya , }") }
-          it { assert_parse(nil, '{"f#{o}o": bar}') }
-          it { assert_parse(nil, '{"#{f}oo": bar}') }
-          it { assert_parse(nil, '{"#{foo}": bar}') }
-        end
-      end
-
-      describe 'nested array' do
-        it { assert_parse({ 'foo' => '[1,2,]' }, '{foo: [1,2,],}') }
-        it { assert_parse({ 'foo' => '[1,2,[3,4],5]' }, '{foo: [1,2,[3,4],5],}') }
-        it { assert_parse({ 'foo' => '[1,2,[3,4],5]', 'bar' => '[[1,2],]'}, '{foo: [1,2,[3,4],5],bar: [[1,2],],}') }
-      end
-
-      describe 'nested hash' do
-        it { assert_parse({ 'foo' => '{ }', 'bar' => '{}' }, '{foo: { }, bar: {}}') }
-        it { assert_parse({ 'foo' => '{ bar: baz, hoge: fuga, }' }, '{foo: { bar: baz, hoge: fuga, }, }') }
-        it { assert_parse({ 'data' => '{ confirm: true, disable: false }', 'hello' => '{ world: foo, }' }, '{data: { confirm: true, disable: false }, :hello => { world: foo, },}') }
-      end
-
-      describe 'nested method' do
-        it { assert_parse({ 'foo' => 'bar(a, b)', 'hoge' => 'piyo(a, b,)' }, '{ foo: bar(a, b), hoge: piyo(a, b,), }') }
-      end
-    end
-  end
-end