haml-edge 3.1.11 → 3.1.12

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.11
+3.1.12

data/VERSION

@@ -1 +1 @@
-3.1.11
+3.1.12

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/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/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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.11
+  version: 3.1.12
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -04:00
+date: 2010-05-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency