haml 3.0.0.rc.5 → 3.0.0

data/Rakefile

@@ -70,11 +70,10 @@ end
 # We also need to get rid of this file after packaging.
 at_exit { File.delete(scope('REVISION')) rescue nil }
 
-desc "Install Haml as a gem."
+desc "Install Haml as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do
-  sudo = RUBY_PLATFORM =~ /win32|mingw/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
-  sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
+  sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end
 
 desc "Release a new Haml package to Rubyforge."

data/VERSION

@@ -1 +1 @@
-3.0.0.rc.5
+3.0.0

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.21
+;; Version: 3.0.0
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html

data/extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.21
+;; Version: 3.0.0
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "2.2.21"))
+;; Package-Requires: ((haml-mode "3.0.0"))
 
 ;;; Commentary:
 

data/lib/haml/html.rb

@@ -279,6 +279,18 @@ module Haml
           end
         end
 
+        if self.next && self.next.text? && self.next.content =~ /\A[^\s]/
+          if self.previous.nil? || self.previous.text? &&
+              (self.previous.content =~ /[^\s]\Z/ ||
+               self.previous.content =~ /\A\s*\Z/ && self.previous.previous.nil?)
+            nuke_outer_whitespace = true
+          else
+            output << "- succeed #{self.next.content.slice!(/\A[^\s]+/).dump} do\n"
+            tabs += 1
+            output << tabulate(tabs)
+          end
+        end
+
         output << "%#{name}" unless name == 'div' &&
           (static_id?(options) ||
            static_classname?(options) &&
@@ -300,6 +312,7 @@ module Haml
           output << haml_attributes(options) if attr_hash.length > 0
         end
 
+        output << ">" if nuke_outer_whitespace
         output << "/" if empty? && !etag
 
         if children && children.size == 1

data/lib/sass/script/functions.rb

@@ -217,6 +217,7 @@ module Sass::Script
     # @param blue [Number]
     #   A number between 0 and 255 inclusive,
     #   or between 0% and 100% inclusive
+    # @see #rgba
     # @return [Color]
     def rgb(red, green, blue)
       assert_type red, :Number
@@ -235,6 +236,7 @@ module Sass::Script
         end)
     end
 
+    # @see #rgb
     # @overload rgba(red, green, blue, alpha)
     #   Creates a {Color} object from red, green, and blue values,
     #   as well as an alpha channel indicating opacity.
@@ -291,6 +293,7 @@ module Sass::Script
     # @param lightness [Number] The lightness of the color.
     #   Must be between `0%` and `100%`, inclusive
     # @return [Color] The resulting color
+    # @see #hsla
     # @raise [ArgumentError] if `saturation` or `lightness` are out of bounds
     def hsl(hue, saturation, lightness)
       hsla(hue, saturation, lightness, Number.new(1))
@@ -309,6 +312,7 @@ module Sass::Script
     # @param alpha [Number] The opacity of the color.
     #   Must be between 0 and 1, inclusive
     # @return [Color] The resulting color
+    # @see #hsl
     # @raise [ArgumentError] if `saturation`, `lightness`, or `alpha` are out of bounds
     def hsla(hue, saturation, lightness, alpha)
       assert_type hue, :Number
@@ -368,6 +372,7 @@ module Sass::Script
     #
     # @param color [Color]
     # @return [Number] between 0deg and 360deg
+    # @see #adjust_hue
     # @raise [ArgumentError] if `color` isn't a color
     def hue(color)
       assert_type color, :Color
@@ -382,6 +387,8 @@ module Sass::Script
     #
     # @param color [Color]
     # @return [Number] between 0% and 100%
+    # @see #saturate
+    # @see #desaturate
     # @raise [ArgumentError] if `color` isn't a color
     def saturation(color)
       assert_type color, :Color
@@ -396,6 +403,8 @@ module Sass::Script
     #
     # @param color [Color]
     # @return [Number] between 0% and 100%
+    # @see #lighten
+    # @see #darken
     # @raise [ArgumentError] if `color` isn't a color
     def lightness(color)
       assert_type color, :Color
@@ -411,6 +420,8 @@ module Sass::Script
     # @overload def alpha(color)
     # @param color [Color]
     # @return [Number]
+    # @see #opacify
+    # @see #transparentize
     # @raise [ArgumentError] If `color` isn't a color
     def alpha(*args)
       if args.all? do |a|
@@ -429,6 +440,8 @@ module Sass::Script
     #
     # @param color [Color]
     # @return [Number]
+    # @see #opacify
+    # @see #transparentize
     # @raise [ArgumentError] If `color` isn't a color
     def opacity(color)
       assert_type color, :Color
@@ -447,6 +460,7 @@ module Sass::Script
     # @param color [Color]
     # @param amount [Number]
     # @return [Color]
+    # @see #transparentize
     # @raise [ArgumentError] If `color` isn't a color,
     #   or `number` isn't a number between 0 and 1
     def opacify(color, amount)
@@ -466,6 +480,7 @@ module Sass::Script
     # @param color [Color]
     # @param amount [Number]
     # @return [Color]
+    # @see #opacify
     # @raise [ArgumentError] If `color` isn't a color,
     #   or `number` isn't a number between 0 and 1
     def transparentize(color, amount)
@@ -485,6 +500,7 @@ module Sass::Script
     # @param color [Color]
     # @param amount [Number]
     # @return [Color]
+    # @see #darken
     # @raise [ArgumentError] If `color` isn't a color,
     #   or `number` isn't a number between 0% and 100%
     def lighten(color, amount)
@@ -503,6 +519,7 @@ module Sass::Script
     # @param color [Color]
     # @param amount [Number]
     # @return [Color]
+    # @see #lighten
     # @raise [ArgumentError] If `color` isn't a color,
     #   or `number` isn't a number between 0% and 100%
     def darken(color, amount)
@@ -521,6 +538,7 @@ module Sass::Script
     # @param color [Color]
     # @param amount [Number]
     # @return [Color]
+    # @see #desaturate
     # @raise [ArgumentError] If `color` isn't a color,
     #   or `number` isn't a number between 0% and 100%
     def saturate(color, amount)
@@ -539,6 +557,7 @@ module Sass::Script
     # @param color [Color]
     # @param amount [Number]
     # @return [Color]
+    # @see #saturate
     # @raise [ArgumentError] If `color` isn't a color,
     #   or `number` isn't a number between 0% and 100%
     def desaturate(color, amount)

data/lib/sass/scss/parser.rb

@@ -340,9 +340,11 @@ module Sass
           @use_property_exception, false
         begin
           decl = declaration
-          # We want an exception if it's not there,
-          # but we don't want to consume if it is
-          tok!(/[;}]/) unless tok?(/[;}]/)
+          unless decl && decl.has_children
+            # We want an exception if it's not there,
+            # but we don't want to consume if it is
+            tok!(/[;}]/) unless tok?(/[;}]/)
+          end
           return decl
         rescue Sass::SyntaxError => decl_err
         end

data/test/haml/html2haml_test.rb

@@ -246,6 +246,39 @@ HTML
     assert_equal("%p # foo bar #", render("<p># foo bar #</p>"))
   end
 
+  def test_comma_post_tag
+    assert_equal(<<HAML.rstrip, render(<<HTML))
+#foo
+  %span> Foo
+  ,
+  %span bar
+  Foo
+  %span> bar
+  ,
+  %span baz
+HAML
+<div id="foo">
+  <span>Foo</span>, <span>bar</span>
+  Foo<span>bar</span>, <span>baz</span>
+</div>
+HTML
+  end
+
+  def test_comma_post_tag_with_text_before
+    assert_equal(<<HAML.rstrip, render(<<HTML))
+#foo
+  Batch
+  - succeed "," do
+    %span Foo
+  %span Bar
+HAML
+<div id="foo">
+  Batch
+  <span>Foo</span>, <span>Bar</span>
+</div>
+HTML
+  end
+
   begin
     require 'haml/html/erb'
     include ErbTests

data/test/sass/scss/scss_test.rb

@@ -430,6 +430,28 @@ foo {
 SCSS
   end
 
+  def test_several_namespace_properties
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  bar: baz;
+  bang-bip: 1px;
+  bang-bop: bar;
+  buzz-fram: "foo";
+  buzz-frum: moo; }
+CSS
+foo {
+  bar: baz;
+  bang: {
+    bip: 1px;
+    bop: bar;}
+  buzz: {
+    fram: "foo";
+    frum: moo;
+  }
+}
+SCSS
+  end
+
   def test_nested_namespace_properties
     assert_equal <<CSS, render(<<SCSS)
 foo {

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  - 5
-  version: 3.0.0.rc.5
+  version: 3.0.0
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -07:00
+date: 2010-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -371,13 +369,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: haml