haml 3.0.2 → 3.0.3

data/Rakefile

@@ -382,7 +382,7 @@ rails_versions << "v2.0.5" if RUBY_VERSION =~ /^1\.8/
 
 def test_rails_version(version)
   Dir.chdir "test/rails" do
-    `git checkout #{version}`
+    sh %{git checkout #{version}}
   end
   puts "Testing Rails #{version}"
   Rake::Task['test'].reenable
@@ -392,14 +392,14 @@ end
 namespace :test do
   desc "Test all supported versions of rails. This takes a while."
   task :rails_compatibility do
-    `rm -rf test/rails`
+    sh %{rm -rf test/rails}
     puts "Checking out rails. Please wait."
-    system("git clone git://github.com/rails/rails.git test/rails") rescue nil
+    sh %{git clone git://github.com/rails/rails.git test/rails}
     begin
       rails_versions.each {|version| test_rails_version version}
 
       puts "Checking out rails_xss. Please wait."
-      system("git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss")
+      sh %{git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss}
       test_rails_version(rails_versions.find {|s| s =~ /^v2\.3/})
     ensure
       `rm -rf test/rails`

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/haml/railtie.rb

@@ -1,11 +1,29 @@
-# This file is here to integrate with Rails 3,
-# since there's no better way to do so as of 14 March 2010.
-# Yehuda promises there will be soon,
-# and once there is we should switch to that.
-
 # Rails 3.0.0.beta.2+
 if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
   require 'haml/template/options'
   require 'sass/plugin/configuration'
-  ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
+  ActiveSupport.on_load(:action_view) do
+    if Rails.application
+      Haml.init_rails(binding)
+    else
+      # I can't believe we have to do this, but we do.
+      # Rails 3's lovely lazy-loading means that it's possible to load ActionView
+      # before the application has even begin loading.
+      # This means that Rails.root doesn't exist yet.
+      # So if the application isn't loaded, we use this arcane initializer stuff
+      # to load Haml/Sass *after* the application loads.
+      #
+      # Of course, it's also possible that the application is loaded before ActionView,
+      # so we can't *just* rely on this method of loading.
+      #
+      # Ugh.
+      module Haml
+        class Railtie < Rails::Railtie
+          initializer :haml do
+            Haml.init_rails(binding)
+          end
+        end
+      end
+    end
+  end
 end

data/lib/haml/util.rb

@@ -260,7 +260,10 @@ module Haml
     #
     # @return [String, nil]
     def rails_root
-      return Rails.root.to_s if defined?(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)
       return nil
     end

data/lib/sass/plugin/merb.rb

@@ -25,6 +25,13 @@ unless defined?(Sass::MERB_LOADED)
   Sass::Plugin.options.merge!(config)
 
   require 'sass/plugin/rack'
-  # Merb::Config is used in Merb >= 1.1.0
-  (Merb::Config[:app] || Merb::Config).use Sass::Plugin::Rack
+  class Sass::Plugin::MerbBootLoader < Merb::BootLoader
+    after Merb::BootLoader::RackUpApplication
+
+    def self.run
+      # Apparently there's no better way than this to add Sass
+      # to Merb's Rack stack.
+      Merb::Config[:app] = Sass::Plugin::Rack.new(Merb::Config[:app])
+    end
+  end
 end

data/lib/sass/script/lexer.rb

@@ -273,6 +273,9 @@ module Sass
 
       def color
         return unless s = scan(REGULAR_EXPRESSIONS[:color])
+        raise Sass::SyntaxError.new(<<MESSAGE) unless s.size == 4 || s.size == 7
+Colors must have either three or six digits: '#{s}'
+MESSAGE
         value = s.scan(/^#(..?)(..?)(..?)$/).first.
           map {|num| num.ljust(2, num).to_i(16)}
         [:color, Script::Color.new(value)]

data/lib/sass/script/parser.rb

@@ -271,7 +271,7 @@ RUBY
       def arglist
         return unless e = interpolation
         return [e] unless try_tok(:comma)
-        [e, *arglist]
+        [e, *assert_expr(:arglist)]
       end
 
       def raw
@@ -333,6 +333,7 @@ RUBY
       EXPR_NAMES = {
         :string => "string",
         :default => "expression (e.g. 1px, bold)",
+        :arglist => "mixin argument",
       }
 
       def assert_expr(name)

data/lib/sass/scss/rx.rb

@@ -107,13 +107,17 @@ module Sass
       NOT = quote(":not(", Regexp::IGNORECASE)
 
       # Custom
-      HEXCOLOR = /\#[0-9a-fA-F]{3}(?:[0-9a-fA-F]{3})?/
+      HEXCOLOR = /\#[0-9a-fA-F]+/
       INTERP_START = /#\{/
 
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
-      STATIC_VALUE = /(#{NMCHAR}|#{STRING1_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|\.[0-9]|\!important)+(?=[;}])/i
+      # Can't use IDENT here, because it seems to take exponential time on 1.8.
+      # We could use it for 1.9 only, but I don't want to introduce a cross-version
+      # behavior difference.
+      # There aren't really any plain-CSS single-character identifiers anyway.
+      STATIC_VALUE = /(-?#{NMSTART}#{NMCHAR}+|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
 
       STATIC_SELECTOR = /(#{NMCHAR}|\s|[,>+*]|[:#.]#{NMSTART})+(?=[{])/i
     end

data/test/haml/helper_test.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
-require 'haml/template'
 
 class ActionView::Base
   def nested_tag
@@ -388,7 +387,7 @@ MESSAGE
     render("- something_that_uses_haml_concat")
     assert false, "Expected Haml::Error"
   rescue Haml::Error => e
-    assert_equal 13, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
+    assert_equal 12, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
   end
 
   class ActsLikeTag

data/test/haml/template_test.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
-require 'haml/template'
 require 'sass/plugin'
 require File.dirname(__FILE__) + '/mocks/article'
 

data/test/linked_rails.rb

@@ -5,11 +5,18 @@ if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
+  $:.unshift linked_rails + '/railties/lib'
 end
 require 'rubygems'
 require 'action_controller'
 require 'action_view'
 
+begin
+  # Necessary for Rails 3
+  require 'rails'
+rescue LoadError
+end
+
 ActionController::Base.logger = Logger.new(nil)
 
 # Load plugins from test/plugins.

data/test/sass/script_test.rb

@@ -303,6 +303,19 @@ SASS
     assert_equal "0.5", resolve("$var", {}, env("var" => eval("1px/2px")))
   end
 
+  def test_colors_with_wrong_number_of_digits
+    assert_raise(Sass::SyntaxError,
+      "Colors must have either three or six digits: '#0'") {eval("#0")}
+    assert_raise(Sass::SyntaxError,
+      "Colors must have either three or six digits: '#12'") {eval("#12")}
+    assert_raise(Sass::SyntaxError,
+      "Colors must have either three or six digits: '#abcd'") {eval("#abcd")}
+    assert_raise(Sass::SyntaxError,
+      "Colors must have either three or six digits: '#abcdE'") {eval("#abcdE")}
+    assert_raise(Sass::SyntaxError,
+      "Colors must have either three or six digits: '#abcdEFA'") {eval("#abcdEFA")}
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/css_test.rb

@@ -390,7 +390,7 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: -0.5em;
-  b: 0.5em;
+  b: +0.5em;
   c: -foo(12px);
   d: +foo(12px); }
 CSS

data/test/sass/scss/scss_test.rb

@@ -87,13 +87,15 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: 3;
-  b: foobar;
-  c: 12px; }
+  b: -1;
+  c: foobar;
+  d: 12px; }
 CSS
 foo {
   a: 1 + 2;
-  b: foo + bar;
-  c: floor(12.3px); }
+  b: 1 - 2;
+  c: foo + bar;
+  d: floor(12.3px); }
 SCSS
   end
 
@@ -1022,6 +1024,20 @@ $value : bip;
 foo {
   bar: -moz-\#{$value};
 }
+SCSS
+  end
+
+  def test_extra_comma_in_mixin_arglist_error
+    assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
+Invalid CSS after "@include foo(bar, ": expected mixin argument, was ")"
+MESSAGE
+@mixin foo($a1, $a2) {
+  baz: $a1 $a2;
+}
+
+.bar {
+  @include foo(bar, );
+}
 SCSS
   end
 end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
 
+require 'haml/template'
 Haml::Template.options[:ugly] = false
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency