haml 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169c5e7e9f3fc9b45bf286035641b324218cd9e8
-  data.tar.gz: 7042e872b1f8d5dd9c02a14ddfb1c74b12f350ca
+  metadata.gz: 00b001616cbcf722d8dd8f3e4a99d7895d1ce34b
+  data.tar.gz: b87d0bfe9067818b38abf03b6c0d3128cb9f4fb6
 SHA512:
-  metadata.gz: c8f15703b302c90f429d23f1c1441c47fa81a68887fcaa3a6e01de719253aa3f8380eb21cac73731de49ef54d2a1e1d5bf9308436a96af4548aec7241ceb986e
-  data.tar.gz: fe401f4715c695be27a04ee9d12acf6a776dafc89e8a7bad4e09916805cab2a03186ab6b509a6215a9d5a943f60607710a5f3c9529f54885cd7b43b55f6fc254
+  metadata.gz: a0872b7e36195c11d167e066ab51c8006d9c4f50130caa2947f058897c57b2960d619ecee6379782fbbd1a4c908d588c3895ad5a4a24bf5ba90f216272005b14
+  data.tar.gz: 2271653d27a61a75e130fed6dad51e02ebed14e61123448731c910b21e679fc8bb64d3fa5ea55604a1354c7b66dd907ba5e03a8fe6c53dcb484fb79ab1a607b6

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Haml Changelog
 
-=======
+## 4.0.6
+
+Released on Dec 1, 2014 ([diff](https://github.com/haml/haml/compare/4.0.5...4.0.6)).
+
+
+* Fix warning on Ruby 1.8.7 "regexp has invalid interval" (thanks [Elia Schito](https://github.com/elia)).
+
 ## 4.0.5
 
 Released on Jan 7, 2014 ([diff](https://github.com/haml/haml/compare/4.0.4...4.0.5)).

data/lib/haml/parser.rb

@@ -83,7 +83,7 @@ module Haml
     DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)\s*([^ ]+)?/i
 
     # The Regex that matches a literal string or symbol value
-    LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?!\\|\#{|\#@|\#\$|\2).|\\.)*\2/
+    LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?!\\|\#\{|\#@|\#\$|\2).|\\.)*\2/
 
     def initialize(template, options)
       # :eod is a special end-of-document marker

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
 end

data/test/helper_test.rb

@@ -140,16 +140,16 @@ HAML
   def test_form_tag
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
-    assert_equal(<<HTML, render(<<HAML, :action_view))
-<form accept-charset="UTF-8" action="foo" method="post">#{rails_form_opener}
-  <p>bar</p>
-  <strong>baz</strong>
-</form>
-HTML
+
+    rendered = render(<<HAML, :action_view)
 = form_tag 'foo' do
   %p bar
   %strong baz
 HAML
+    fragment = Nokogiri::HTML.fragment(rendered)
+    assert_equal 'foo', fragment.css('form').first.attributes['action'].to_s
+    assert_equal 'bar', fragment.css('form p').first.text.strip
+    assert_equal 'baz', fragment.css('form strong').first.text.strip
   end
 
   def test_pre
@@ -244,11 +244,10 @@ HAML
 
   def test_form_tag_in_helper_with_string_block
     def @base.protect_against_forgery?; false; end
-    assert_equal(<<HTML, render(<<HAML, :action_view))
-<form accept-charset="UTF-8" action="/foo" method="post">#{rails_form_opener}bar</form>
-HTML
-= wacky_form
-HAML
+    rendered = render('= wacky_form', :action_view)
+    fragment = Nokogiri::HTML.fragment(rendered)
+    assert_equal 'bar', fragment.text.strip
+    assert_equal '/foo', fragment.css('form').first.attributes['action'].to_s
   end
 
   def test_haml_tag_name_attribute_with_id

data/test/test_helper.rb

@@ -65,10 +65,6 @@ class MiniTest::Unit::TestCase
     Haml::Util.silence_warnings(&block)
   end
 
-  def rails_form_opener
-    '<div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>'
-  end
-
   def assert_raises_message(klass, message)
     yield
   rescue Exception => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -124,7 +124,6 @@ files:
 - lib/haml/template.rb
 - lib/haml/template/options.rb
 - lib/haml/template/plugin.rb
-- lib/haml/temple.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
 - test/engine_test.rb
@@ -137,7 +136,6 @@ files:
 - test/gemfiles/Gemfile.rails-3.1.x
 - test/gemfiles/Gemfile.rails-3.2.x
 - test/gemfiles/Gemfile.rails-4.0.x
-- test/gemfiles/Gemfile.rails-4.0.x.lock
 - test/helper_test.rb
 - test/markaby/standard.mab
 - test/mocks/article.rb
@@ -230,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.

data/lib/haml/temple.rb

@@ -1,85 +0,0 @@
-require 'haml'
-require 'temple'
-
-module Haml
-
-  module Temple
-
-    module Expressions
-      def on_plain
-        [:static, "\n" + value[:text]]
-      end
-
-      def on_root
-        [:multi]
-      end
-
-      def on_doctype
-        [:html, :doctype, value[:version] || 5]
-      end
-
-      def on_tag
-        exp = [:html, :tag, value[:name], [:html, :attrs]]
-        if value[:value] && value[:value] != ""
-          if value[:parse]
-            exp.push << [:dynamic, value[:value]]
-          else
-            exp.push << [:static, value[:value]]
-          end
-        end
-
-        if attribs = value[:attributes]
-          attribs.each do |key, value|
-            exp.last << [:html, :attr, key, [:static, value]]
-          end
-        end
-
-        exp
-      end
-    end
-
-    class Parser
-      def initialize(*args)
-        @options = Options.new
-      end
-
-      def call(haml)
-        parser = ::Haml::Parser.new(haml, @options)
-        tree = parser.parse.tap {|x| p x; puts '-' * 10}
-        compile(tree).tap {|x| p x; puts '-' * 10}
-      end
-
-      private
-
-      def compile(node)
-        exp = node.to_temple
-        return exp if node.children.empty?
-        if node.children.length == 1
-          exp.push compile(node.children[0])
-        else
-          exp.push [:multi, *node.children.map {|c| compile(c)}]
-        end
-        exp
-      end
-    end
-
-    class Engine < ::Temple::Engine
-      use ::Haml::Temple::Parser
-      html :Pretty
-      filter :ControlFlow
-      generator :ArrayBuffer
-    end
-  end
-
-  class Parser::ParseNode
-    include ::Haml::Temple::Expressions
-
-    def to_temple
-      begin
-        send "on_#{type}"
-      end
-    end
-  end
-end
-
-Haml::Temple::Template = Temple::Templates::Tilt(Haml::Temple::Engine, :register_as => :haml)

data/test/gemfiles/Gemfile.rails-4.0.x.lock

@@ -1,101 +0,0 @@
-PATH
-  remote: ../../..
-  specs:
-    rails (4.0.0.beta1)
-      actionmailer (= 4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      activerecord (= 4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0.beta1)
-      sprockets-rails (~> 2.0.0.rc4)
-
-PATH
-  remote: /Users/norman/work/haml
-  specs:
-    haml (4.0.3)
-      tilt
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      mail (~> 2.5.3)
-    actionpack (4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      builder (~> 3.1.0)
-    activerecord (4.0.0.beta1)
-      activemodel (= 4.0.0.beta1)
-      activerecord-deprecated_finders (~> 0.0.3)
-      activesupport (= 4.0.0.beta1)
-      arel (~> 4.0.0.beta1)
-    activerecord-deprecated_finders (0.0.3)
-    activesupport (4.0.0.beta1)
-      i18n (~> 0.6.2)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.33)
-    arel (4.0.0)
-    atomic (1.1.9)
-    builder (3.1.4)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.4)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.4)
-    multi_json (1.7.3)
-    nokogiri (1.5.9)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.17.0, < 2.0)
-    rake (10.0.4)
-    rbench (0.2.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.9.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0.rc4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.0)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3.0)
-  haml!
-  minitest
-  nokogiri
-  rails (~> 4.0.0.beta1)!
-  rbench