haml 3.0.17 → 3.0.18

data/README.md

@@ -29,8 +29,9 @@ For more information on these commands, check out
     haml --help
     sass --help
 
-To install Haml and Sass as a Rails plugin,
-just run `haml --rails path/to/rails/app`
+To install Haml and Sass in Rails 2,
+just add `config.gem "haml"` to `config/environment.rb`.
+In Rails 3, add `gem "haml"` to your Gemfile instead.
 and both Haml and Sass will be installed.
 Views with the `.html.haml` extension will automatically use Haml.
 Sass is a little more complicated;

data/VERSION

@@ -1 +1 @@
-3.0.17
+3.0.18

data/lib/haml/exec.rb

@@ -207,7 +207,7 @@ END
               "haml --rails will no longer work in the next version of #{@name}.", "")
           elsif File.exists?(env) && File.open(env) {|env| env.grep(/config\.gem/)}
             puts("haml --rails isn't needed for Rails 2.1 or greater.",
-              "Add 'gem \"haml\"' to config/environment.rb instead.", "",
+              "Add 'config.gem \"haml\"' to config/environment.rb instead.", "",
               "haml --rails will no longer work in the next version of #{@name}.", "")
           end
 
@@ -294,6 +294,10 @@ END
                             'Locations are set like --watch.') do
           @options[:update] = true
         end
+        opts.on('--stop-on-error', 'If a file fails to compile, exit immediately.',
+                                   'Only meaningful for --watch and --update.') do
+          @options[:stop_on_error] = true
+        end
         opts.on('-t', '--style NAME',
                 'Output style. Can be nested (default), compact, compressed, or expanded.') do |name|
           @options[:for_engine][:style] = name.to_sym
@@ -426,7 +430,7 @@ MSG
         ::Sass::Plugin.on_creating_directory {|dirname| puts_action :directory, :green, dirname}
         ::Sass::Plugin.on_deleting_css {|filename| puts_action :delete, :yellow, filename}
         ::Sass::Plugin.on_compilation_error do |error, _, _|
-          raise error unless error.is_a?(::Sass::SyntaxError)
+          raise error unless error.is_a?(::Sass::SyntaxError) && !@options[:stop_on_error]
           had_error = true
           puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"
         end

data/lib/haml/helpers.rb

@@ -442,7 +442,8 @@ MESSAGE
       text = rest.shift.to_s unless [Symbol, Hash, NilClass].any? {|t| rest.first.is_a? t}
       flags = []
       flags << rest.shift while rest.first.is_a? Symbol
-      name, attrs = merge_name_and_attributes(name.to_s, rest.shift || {})
+      attrs = Haml::Util.map_keys(rest.shift || {}) {|key| key.to_s}
+      name, attrs = merge_name_and_attributes(name.to_s, attrs)
 
       attributes = Haml::Precompiler.build_attributes(haml_buffer.html?,
                                                       haml_buffer.options[:attr_wrapper],
@@ -551,8 +552,7 @@ MESSAGE
       return name, attributes_hash unless name =~ /^(.+?)?([\.#].*)$/
 
       return $1 || "div", Buffer.merge_attrs(
-        Precompiler.parse_class_and_id($2),
-        Haml::Util.map_keys(attributes_hash) {|key| key.to_s})
+        Precompiler.parse_class_and_id($2), attributes_hash)
     end
 
     # Runs a block of code with the given buffer as the currently active buffer.

data/lib/haml/precompiler.rb

@@ -534,8 +534,8 @@ END
       result = attributes.collect do |attr, value|
         next if value.nil?
 
-        value = filter_and_join(value, ' ') if attr == :class
-        value = filter_and_join(value, '_') if attr == :id
+        value = filter_and_join(value, ' ') if attr == 'class'
+        value = filter_and_join(value, '_') if attr == 'id'
 
         if value == true
           next " #{attr}" if is_html
@@ -561,8 +561,10 @@ END
     end
 
     def self.filter_and_join(value, separator)
+      return "" if value == ""
       value = [value] unless value.is_a?(Array)
-      return value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
+      value = value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
+      return !value.empty? && value
     end
 
     def prerender_tag(name, self_close, attributes)

data/lib/haml/util.rb

@@ -231,6 +231,44 @@ module Haml
       info
     end
 
+    # Returns whether one version string represents a more recent version than another.
+    #
+    # @param v1 [String] A version string.
+    # @param v2 [String] Another version string.
+    # @return [Boolean]
+    def version_gt(v1, v2)
+      # Construct an array to make sure the shorter version is padded with nil
+      Array.new([v1.length, v2.length].max).zip(v1.split("."), v2.split(".")) do |_, p1, p2|
+        p1 ||= "0"
+        p2 ||= "0"
+        release1 = p1 =~ /^[0-9]+$/
+        release2 = p2 =~ /^[0-9]+$/
+        if release1 && release2
+          # Integer comparison if both are full releases
+          p1, p2 = p1.to_i, p2.to_i
+          next if p1 == p2
+          return p1 > p2
+        elsif !release1 && !release2
+          # String comparison if both are prereleases
+          next if p1 == p2
+          return p1 > p2
+        else
+          # If only one is a release, that one is newer
+          return release1
+        end
+      end
+    end
+
+    # Returns whether one version string represents the same or a more
+    # recent version than another.
+    #
+    # @param v1 [String] A version string.
+    # @param v2 [String] Another version string.
+    # @return [Boolean]
+    def version_geq(v1, v2)
+      version_gt(v1, v2) || !version_gt(v2, v1)
+    end
+
     # Silence all output to STDERR within a block.
     #
     # @yield A block in which no output will be printed to STDERR
@@ -269,8 +307,8 @@ module Haml
     #
     # @return [String, nil]
     def rails_root
-      if defined?(Rails.root)
-        return Rails.root.to_s if Rails.root
+      if defined?(::Rails.root)
+        return ::Rails.root.to_s if ::Rails.root
         raise "ERROR: Rails.root is nil!"
       end
       return RAILS_ROOT.to_s if defined?(RAILS_ROOT)
@@ -283,7 +321,7 @@ module Haml
     #
     # @return [String, nil]
     def rails_env
-      return Rails.env.to_s if defined?(Rails.root)
+      return ::Rails.env.to_s if defined?(::Rails.env)
       return RAILS_ENV.to_s if defined?(RAILS_ENV)
       return nil
     end
@@ -308,7 +346,7 @@ module Haml
       return false unless defined?(ActionPack) && defined?(ActionPack::VERSION) &&
         defined?(ActionPack::VERSION::STRING)
 
-      ActionPack::VERSION::STRING >= version
+      version_geq(ActionPack::VERSION::STRING, version)
     end
 
     # Returns an ActionView::Template* class.

data/lib/sass/scss/parser.rb

@@ -212,8 +212,18 @@ module Sass
       end
 
       def import_directive
-        @expected = "string or url()"
-        arg = tok(STRING) || (uri = tok!(URI))
+        values = []
+
+        loop do
+          values << expr!(:import_arg)
+          break if use_css_import? || !tok(/,\s*/)
+        end
+
+        return values
+      end
+
+      def import_arg
+        return unless arg = tok(STRING) || (uri = tok!(URI))
         path = @scanner[1] || @scanner[2] || @scanner[3]
         ss
 
@@ -318,7 +328,7 @@ module Sass
       def block_contents(node, context)
         block_given? ? yield : ss_comments(node)
         node << (child = block_child(context))
-        while tok(/;/) || (child && child.has_children)
+        while tok(/;/) || has_children?(child)
           block_given? ? yield : ss_comments(node)
           node << (child = block_child(context))
         end
@@ -330,6 +340,12 @@ module Sass
         variable || directive || declaration_or_ruleset
       end
 
+      def has_children?(child_or_array)
+        return false unless child_or_array
+        return child_or_array.last.has_children if child_or_array.is_a?(Array)
+        return child_or_array.has_children
+      end
+
       # This is a nasty hack, and the only place in the parser
       # that requires backtracking.
       # The reason is that we can't figure out if certain strings
@@ -747,6 +763,7 @@ MESSAGE
         :expr => "expression (e.g. 1px, bold)",
         :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
+        :import_arg => "file to import (string or url())",
       }
 
       TOK_NAMES = Haml::Util.to_hash(

data/lib/sass/tree/node.rb

@@ -84,14 +84,18 @@ module Sass
 
       # Appends a child to the node.
       #
-      # @param child [Tree::Node] The child node
+      # @param child [Tree::Node, Array<Tree::Node>] The child node or nodes
       # @raise [Sass::SyntaxError] if `child` is invalid
       # @see #invalid_child?
       def <<(child)
         return if child.nil?
-        check_child! child
-        self.has_children = true
-        @children << child
+        if child.is_a?(Array)
+          child.each {|c| self << c}
+        else
+          check_child! child
+          self.has_children = true
+          @children << child
+        end
       end
 
       # Raises an error if the given child node is invalid.

data/test/haml/engine_test.rb

@@ -148,7 +148,7 @@ MESSAGE
     assert_equal("<p class='b css'>foo</p>\n", render("%p.css{:class => %w[css b]} foo")) # merge uniquely
     assert_equal("<p class='a b c d'>foo</p>\n", render("%p{:class => [%w[a b], %w[c d]]} foo")) # flatten
     assert_equal("<p class='a b'>foo</p>\n", render("%p{:class => [:a, :b] } foo")) # stringify
-    assert_equal("<p class=''>foo</p>\n", render("%p{:class => [nil, false] } foo")) # strip falsey
+    assert_equal("<p>foo</p>\n", render("%p{:class => [nil, false] } foo")) # strip falsey
     assert_equal("<p class='a'>foo</p>\n", render("%p{:class => :a} foo")) # single stringify
     assert_equal("<p>foo</p>\n", render("%p{:class => false} foo")) # single falsey
     assert_equal("<p class='a b html'>foo</p>\n", render("%p(class='html'){:class => %w[a b]} foo")) # html attrs
@@ -159,7 +159,7 @@ MESSAGE
     assert_equal("<p id='css_a_b'>foo</p>\n", render("%p#css{:id => %w[a b]} foo")) # merge with css
     assert_equal("<p id='a_b_c_d'>foo</p>\n", render("%p{:id => [%w[a b], %w[c d]]} foo")) # flatten
     assert_equal("<p id='a_b'>foo</p>\n", render("%p{:id => [:a, :b] } foo")) # stringify
-    assert_equal("<p id=''>foo</p>\n", render("%p{:id => [nil, false] } foo")) # strip falsey
+    assert_equal("<p>foo</p>\n", render("%p{:id => [nil, false] } foo")) # strip falsey
     assert_equal("<p id='a'>foo</p>\n", render("%p{:id => :a} foo")) # single stringify
     assert_equal("<p>foo</p>\n", render("%p{:id => false} foo")) # single falsey
     assert_equal("<p id='html_a_b'>foo</p>\n", render("%p(id='html'){:id => %w[a b]} foo")) # html attrs

data/test/haml/helper_test.rb

@@ -259,6 +259,11 @@ HAML
     assert_equal("<p id='c_a_b'>foo</p>\n", render("- haml_tag 'p#c', 'foo', :id => %w[a b]"))
   end
 
+  def test_haml_tag_with_data_hash
+    assert_equal("<p data-baz='data-baz' data-foo='bar'>foo</p>\n",
+      render("- haml_tag :p, 'foo', :data => {:foo => 'bar', :baz => true}"))
+  end
+
   def test_haml_tag_non_autoclosed_tags_arent_closed
     assert_equal("<p></p>\n", render("- haml_tag :p"))
   end

data/test/haml/util_test.rb

@@ -217,6 +217,29 @@ class UtilTest < Test::Unit::TestCase
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
   end
 
+  def test_version_gt
+    assert_version_gt("2.0.0", "1.0.0")
+    assert_version_gt("1.1.0", "1.0.0")
+    assert_version_gt("1.0.1", "1.0.0")
+    assert_version_gt("1.0.0", "1.0.0.rc")
+    assert_version_gt("1.0.0.1", "1.0.0.rc")
+    assert_version_gt("1.0.0.rc", "0.9.9")
+    assert_version_gt("1.0.0.beta", "1.0.0.alpha")
+
+    assert_version_eq("1.0.0", "1.0.0")
+    assert_version_eq("1.0.0", "1.0.0.0")
+  end
+
+  def assert_version_gt(v1, v2)
+    #assert(version_gt(v1, v2), "Expected #{v1} > #{v2}")
+    assert(!version_gt(v2, v1), "Expected #{v2} < #{v1}")
+  end
+
+  def assert_version_eq(v1, v2)
+    assert(!version_gt(v1, v2), "Expected #{v1} = #{v2}")
+    assert(!version_gt(v2, v1), "Expected #{v2} = #{v1}")
+  end
+
   def test_def_static_method
     klass = Class.new
     def_static_method(klass, :static_method, [:arg1, :arg2],

data/test/sass/results/scss_import.css

@@ -12,4 +12,20 @@ body { font: Arial; background: blue; }
 
 midrule { inthe: middle; }
 
+scss { imported: yes; }
+
+body { font: Arial; background: blue; }
+
+#page { width: 700px; height: 100; }
+#page #header { height: 300px; }
+#page #header h1 { font-size: 50px; color: blue; }
+
+#content.user.show #container.top #column.left { width: 100px; }
+#content.user.show #container.top #column.right { width: 600px; }
+#content.user.show #container.bottom { background: brown; }
+
+@import url(basic.css);
+@import url(../results/complex.css);
+#foo { background-color: #bbaaff; }
+
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/templates/scss_import.scss

@@ -2,7 +2,8 @@ $preconst: hello;
 
 @mixin premixin {pre-mixin: here}
 
-@import "importee.sass";
+@import "importee.sass", "scss_importee", "basic.sass", "basic.css", "../results/complex.css";
+@import "partial.sass";
 
 nonimported {
   myconst: $preconst;

data/test/test_helper.rb

@@ -76,7 +76,15 @@ class Test::Unit::TestCase
 
   def rails_form_opener
     return '' unless Haml::Util.ap_geq?("3.0.0.rc")
-    return '<div style="margin:0;padding:0;display:inline"><input name="_snowman" type="hidden" value="&#9731;" /></div>'
+    if Haml::Util.ap_geq?("3.0.0.rc2")
+      encoding = 'utf8'
+      char = '&#x2713;'
+    else
+      encoding = '_snowman'
+      char = '&#9731;'
+    end
+    return '<div style="margin:0;padding:0;display:inline"><input name="' + encoding +
+      '" type="hidden" value="' + char + '" /></div>'
   end
 
   def assert_raise_message(klass, message)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.0.17
+  hash: 35
+  prerelease: false
+  segments: 
+  - 3
+  - 0
+  - 18
+  version: 3.0.18
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,29 +17,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: maruku
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 5
+        - 9
         version: 0.5.9
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML\n      that's designed to express the structure of XHTML or XML documents\n      in a non-repetitive, elegant, easy way,\n      using indentation rather than closing tags\n      and allowing Ruby to be embedded with ease.\n      It was originally envisioned as a plugin for Ruby on Rails,\n      but it can function as a stand-alone templating engine.\n"
 email: haml@googlegroups.com
 executables: 
@@ -44,13 +62,8 @@ executables:
 - sass-convert
 extensions: []
 
-extra_rdoc_files: 
-- VERSION
-- MIT-LICENSE
-- README.md
-- VERSION_NAME
-- REVISION
-- CONTRIBUTING
+extra_rdoc_files: []
+
 files: 
 - rails/init.rb
 - lib/sass.rb
@@ -339,33 +352,32 @@ homepage: http://haml-lang.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --title
-- Haml
-- --main
-- README.rdoc
-- --exclude
-- lib/haml/buffer.rb
-- --line-numbers
-- --inline-source
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.