haml 3.0.12 → 3.0.13

data/Rakefile

@@ -97,7 +97,7 @@ task :release_elpa do
   haml_unchanged = mode_unchanged?(:haml, version)
   sass_unchanged = mode_unchanged?(:sass, version)
   next if haml_unchanged && sass_unchanged
-  raise "haml-mode.el and sass-mode.el are out of sync." if haml_unchanged ^ sass_unchanged
+  raise "haml-mode.el and sass-mode.el are out of sync." if (!!haml_unchanged) ^ (!!sass_unchanged)
 
   if sass_unchanged && File.read(scope("extra/sass-mode.el")).
       include?(";; Package-Requires: ((haml-mode #{sass_unchanged.inspect}))")

data/VERSION

@@ -1 +1 @@
-3.0.12
+3.0.13

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 3.0.10
+;; Version: 3.0.13
 ;; 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: 3.0.10
+;; Version: 3.0.13
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "3.0.10"))
+;; Package-Requires: ((haml-mode "3.0.13"))
 
 ;;; Commentary:
 
@@ -43,11 +43,12 @@
   :group 'sass)
 
 (defvar sass-non-block-openers
-  '("^ *:[^ \t]+[ \t]+[^ \t]"
-    "^ *[^ \t:]+[ \t]*[=:][ \t]*[^ \t]")
-  "A list of regexps that match lines of Sass that don't open blocks.
-That is, a Sass line that can't have text nested beneath it
-should be matched by a regexp in this list.")
+  '("^.*,$" ;; Continued selectors
+    "^ *@\\(extend\\|debug\\|warn\\|include\\|import\\)" ;; Single-line mixins
+    "^ *[$!]" ;; Variables
+    )
+  "A list of regexps that match lines of Sass that couldn't have
+text nested beneath them.")
 
 ;; Font lock
 
@@ -195,8 +196,8 @@ LIMIT is the limit of the search."
 (defun sass-indent-p ()
   "Return non-nil if the current line can have lines nested beneath it."
   (loop for opener in sass-non-block-openers
-        unless (looking-at opener) return t
-        return nil))
+        if (looking-at opener) return nil
+        finally return t))
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.sass$" . sass-mode))

data/lib/haml/exec.rb

@@ -317,6 +317,9 @@ END
         opts.on('-I', '--load-path PATH', 'Add a sass import path.') do |path|
           @options[:for_engine][:load_paths] << path
         end
+        opts.on('-r', '--require LIB', 'Require a Ruby library before running Sass.') do |lib|
+          require lib
+        end
         opts.on('--cache-location PATH', 'The path to put cached Sass files. Defaults to .sass-cache.') do |loc|
           @options[:for_engine][:cache_location] = loc
         end

data/lib/haml/railtie.rb

@@ -1,29 +1,21 @@
+if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
+  raise <<ERROR
+Haml and Sass no longer support Rails 3 versions before beta 4.
+  Please upgrade to Rails 3.0.0.beta4 or later.
+ERROR
+end
+
 # 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) do
-    if Rails.application
+  ActiveSupport.on_load(:before_initialize) do
+    require 'sass'
+    require 'sass/plugin'
+
+    # Haml requires AV, but Sass doesn't
+    ActiveSupport.on_load(:action_view) do
       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

@@ -441,6 +441,7 @@ MSG
     # @raise [ArgumentError] if the document declares an unknown encoding
     def check_haml_encoding(str, &block)
       return check_encoding(str, &block) if ruby1_8?
+      str = str.dup if str.frozen?
 
       bom, encoding = parse_haml_magic_comment(str)
       if encoding; str.force_encoding(encoding)

data/lib/sass/engine.rb

@@ -509,16 +509,7 @@ WARNING
       # If value begins with url( or ",
       # it's a CSS @import rule and we don't want to touch it.
       if directive == "import"
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
-          :line => @line + 1) unless line.children.empty?
-        if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
-            !match.post_match.strip.empty? && match.post_match.strip[0] != ?,
-          return Tree::DirectiveNode.new("@import #{value}")
-        end
-        value.split(/,\s*/).map do |f|
-          f = $1 || $2 || $3 if f =~ Sass::SCSS::RX::STRING || f =~ Sass::SCSS::RX::URI
-          Tree::ImportNode.new(f)
-        end
+        parse_import(line, value)
       elsif directive == "mixin"
         parse_mixin_definition(line)
       elsif directive == "include"
@@ -597,6 +588,32 @@ WARNING
       nil
     end
 
+    def parse_import(line, value)
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
+        :line => @line + 1) unless line.children.empty?
+
+      if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
+          match.offset(0).first == 0 && !match.post_match.strip.empty? &&
+          match.post_match.strip[0] != ?,
+        # @import "filename" media-type
+        return Tree::DirectiveNode.new("@import #{value}")
+      end
+
+      value.split(/,\s*/).map do |f|
+        if f =~ Sass::SCSS::RX::URI
+          # All url()s are literal CSS @imports
+          next Tree::DirectiveNode.new("@import #{f}")
+        elsif f =~ Sass::SCSS::RX::STRING
+          f = $1 || $2
+        end
+
+        # http:// URLs are always literal CSS imports
+        next Tree::DirectiveNode.new("@import url(#{f})") if f =~ /^http:\/\//
+
+        Tree::ImportNode.new(f)
+      end
+    end
+
     MIXIN_DEF_RE = /^(?:=|@mixin)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_definition(line)
       name, arg_string = line.text.scan(MIXIN_DEF_RE).first

data/lib/sass/plugin.rb

@@ -265,5 +265,10 @@ module Sass
   end
 end
 
-require 'sass/plugin/rails' if defined?(ActionController)
-require 'sass/plugin/merb'  if defined?(Merb::Plugins)
+if defined?(ActionController)
+  require 'sass/plugin/rails'
+elsif defined?(Merb::Plugins)
+  require 'sass/plugin/merb'
+else
+  require 'sass/plugin/generic'
+end

data/lib/sass/plugin/configuration.rb

@@ -117,12 +117,7 @@ module Sass
     #   The location of the CSS file that was deleted.
     define_callback :deleting_css
 
-    @options = {
-      :css_location       => './public/stylesheets',
-      :always_update      => false,
-      :always_check       => true,
-      :full_exception     => true
-    }
+    @options = {:full_exception => true}
 
     # An options hash.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
@@ -215,7 +210,9 @@ module Sass
       return if options[:template_location].is_a?(Array)
       options[:template_location] =
         case options[:template_location]
-        when nil; [[File.join(options[:css_location], 'sass'), options[:css_location]]]
+        when nil
+          css_location = options[:css_location] || './public/stylesheets'
+          [[File.join(css_location, 'sass'), css_location]]
         when String; [[options[:template_location], options[:css_location]]]
         else; options[:template_location].to_a
         end

data/lib/sass/plugin/generic.rb

@@ -0,0 +1,15 @@
+# The reason some options are declared here rather than in sass/plugin/configuration.rb
+# is that otherwise they'd clobber the Rails-specific options.
+# Since Rails' options are lazy-loaded in Rails 3,
+# they're reverse-merged with the default options
+# so that user configuration is preserved.
+# This means that defaults that differ from Rails'
+# must be declared here.
+
+unless defined?(Sass::GENERIC_LOADED)
+  Sass::GENERIC_LOADED = true
+
+  Sass::Plugin.options.merge!(:css_location   => './public/stylesheets',
+                              :always_update  => false,
+                              :always_check   => true)
+end

data/lib/sass/plugin/rails.rb

@@ -1,13 +1,4 @@
 unless defined?(Sass::RAILS_LOADED)
-  if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
-    Haml::Util.haml_warn(<<WARNING)
-DEPRECATION WARNING:
-Haml/Sass support for Rails 3 versions before beta 4 is deprecated,
-  and will be removed in Haml/Sass 3.0.13.
-  Please upgrade to Rails 3.0.0.beta4 or later.
-WARNING
-  end
-
   Sass::RAILS_LOADED = true
 
   # Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
@@ -21,17 +12,7 @@ WARNING
   if defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
-    if Rails.application.instance_variable_get('@app')
-      # The application has already been built,
-      # so we need to hack the middleware in
-      Rails.application.instance_variable_set('@app',
-        Sass::Plugin::Rack.new(Rails.application.app))
-    else
-      # The application hasn't been built yet,
-      # so we can just add Sass::Plugin::Rack
-      # to the pending middleware stack.
-      Rails.configuration.middleware.use(Sass::Plugin::Rack)
-    end
+    Rails.configuration.middleware.use(Sass::Plugin::Rack)
   elsif defined?(ActionController::Dispatcher) &&
       defined?(ActionController::Dispatcher.middleware)
     # Rails >= 2.3

data/lib/sass/script/lexer.rb

@@ -92,7 +92,7 @@ module Sass
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
         :bool => /(true|false)\b/,
-        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + '(?:\b|$)')})})},
+        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|$)")})})},
         :op => %r{(#{Regexp.union(*OP_NAMES)})},
       }
 
@@ -292,7 +292,7 @@ MESSAGE
       end
 
       def special_fun
-        return unless str1 = scan(/(calc|expression|progid:[a-z\.]*)\(/i)
+        return unless str1 = scan(/((-[\w-]+-)?calc|expression|progid:[a-z\.]*)\(/i)
         str2, _ = Haml::Shared.balance(@scanner, ?(, ?), 1)
         c = str2.count("\n")
         old_line = @line

data/lib/sass/scss/parser.rb

@@ -200,13 +200,13 @@ module Sass
 
       def import_directive
         @expected = "string or url()"
-        arg = tok(STRING) || tok!(URI)
+        arg = tok(STRING) || (uri = tok!(URI))
         path = @scanner[1] || @scanner[2] || @scanner[3]
         ss
 
         media = str {media_query_list}.strip
 
-        if !media.strip.empty? || use_css_import?
+        if uri || path =~ /^http:\/\// || !media.strip.empty? || use_css_import?
           return node(Sass::Tree::DirectiveNode.new("@import #{arg} #{media}".strip))
         end
 
@@ -381,6 +381,17 @@ module Sass
         sel.to_a
       end
 
+      def selector_comma_sequence
+        return unless sel = _selector
+        selectors = [sel]
+        while tok(/,/)
+          ws = str{ss}
+          selectors << expr!(:_selector)
+          selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members) if ws.include?("\n")
+        end
+        Selector::CommaSequence.new(selectors)
+      end
+
       def _selector
         # The combinator here allows the "> E" hack
         return unless val = combinator || simple_selector_sequence
@@ -533,12 +544,12 @@ MESSAGE
       end
 
       def negation
-        return unless tok(NOT)
+        return unless name = tok(NOT) || tok(MOZ_ANY)
         ss
         @expected = "selector"
-        sel = element_name || id_selector || class_selector || attrib || expr!(:pseudo)
+        sel = selector_comma_sequence
         tok!(/\)/)
-        Selector::Negation.new(sel)
+        Selector::SelectorPseudoClass.new(name[1...-1], sel)
       end
 
       def declaration
@@ -722,7 +733,7 @@ MESSAGE
         :interp_ident => "identifier",
         :interp_name => "identifier",
         :expr => "expression (e.g. 1px, bold)",
-        :_selector => "selector",
+        :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
       }
 

data/lib/sass/scss/rx.rb

@@ -109,6 +109,7 @@ module Sass
       # Custom
       HEXCOLOR = /\#[0-9a-fA-F]+/
       INTERP_START = /#\{/
+      MOZ_ANY = quote(":-moz-any(", Regexp::IGNORECASE)
 
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/

data/lib/sass/scss/static_parser.rb

@@ -17,14 +17,8 @@ module Sass
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
       def parse_selector(filename)
         init_scanner!
-        selectors = [expr!(:_selector)]
-        while tok(/,/)
-          ws = str{ss}
-          selectors << expr!(:_selector)
-          selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members) if ws.include?("\n")
-        end
+        seq = expr!(:selector_comma_sequence)
         expected("selector") unless @scanner.eos?
-        seq = Selector::CommaSequence.new(selectors)
         seq.line = @line
         seq.filename = filename
         seq

data/lib/sass/selector.rb

@@ -332,21 +332,29 @@ module Sass
       end
     end
 
-    # A negation pseudoclass selector (e.g. `:not(.foo)`).
-    class Negation < Simple
-      # The selector to negate.
+    # A pseudoclass selector whose argument is itself a selector
+    # (e.g. `:not(.foo)` or `:-moz-all(.foo, .bar)`).
+    class SelectorPseudoClass < Simple
+      # The name of the pseudoclass.
       #
-      # @return [Selector]
+      # @return [String]
+      attr_reader :name
+
+      # The selector argument.
+      #
+      # @return [Selector::Sequence]
       attr_reader :selector
 
-      # @param [Selector] The selector to negate
-      def initialize(selector)
+      # @param [String] The name of the pseudoclass
+      # @param [Selector::Sequence] The selector argument
+      def initialize(name, selector)
+        @name = name
         @selector = selector
       end
 
       # @see Selector#to_a
       def to_a
-        [":not("] + @selector.to_a + [")"]
+        [":", @name, "("] + @selector.to_a + [")"]
       end
     end
   end

data/lib/sass/selector/comma_sequence.rb

@@ -61,6 +61,13 @@ module Sass
         members.map {|m| m.inspect}.join(", ")
       end
 
+      # @see Simple#to_a
+      def to_a
+        arr = Haml::Util.intersperse(@members.map {|m| m.to_a}, ", ").flatten
+        arr.delete("\n")
+        arr
+      end
+
       private
 
       def _hash

data/lib/sass/selector/simple.rb

@@ -78,10 +78,10 @@ module Sass
         return sels if sels.any? {|sel2| eql?(sel2)}
         sels_with_ix = Haml::Util.enum_with_index(sels)
         _, i =
-          if self.is_a?(Pseudo) || self.is_a?(Negation)
+          if self.is_a?(Pseudo) || self.is_a?(SelectorPseudoClass)
             sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && sels.last.type == :element}
           else
-            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(Negation)}
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(SelectorPseudoClass)}
           end
         return sels + [self] unless i
         return sels[0...i] + [self] + sels[i..-1]

data/test/haml/helper_test.rb

@@ -165,7 +165,7 @@ HAML
 
   def test_content_tag_error_wrapping
     def @base.protect_against_forgery?; false; end
-    error_class = Haml::Util.ap_geq?("3.0.0.beta4") ? "field_with_errors" : "fieldWithErrors"
+    error_class = Haml::Util.ap_geq_3? ? "field_with_errors" : "fieldWithErrors"
     assert_equal(<<HTML, render(<<HAML, :action_view))
 <form action="" method="post">
   <div class="#{error_class}"><label for="post_error_field">Error field</label></div>
@@ -315,7 +315,7 @@ HAML
   end
 
   def test_indented_capture
-    prior = Haml::Util.ap_geq?("3.0.0.beta4") ? "" : "  \n"
+    prior = Haml::Util.ap_geq_3? ? "" : "  \n"
     assert_equal("#{prior}  Foo\n  ", @base.render(:inline => "  <% res = capture do %>\n  Foo\n  <% end %><%= res %>"))
   end
 

data/test/sass/conversion_test.rb

@@ -671,11 +671,15 @@ SCSS
     assert_renders <<SASS, <<SCSS
 @import foo
 
+@import url(bar.css)
+
 foo
   bar: baz
 SASS
 @import "foo";
 
+@import url(bar.css);
+
 foo {
   bar: baz; }
 SCSS
@@ -683,11 +687,15 @@ SCSS
     assert_renders <<SASS, <<SCSS
 @import foo.css
 
+@import url(bar.css)
+
 foo
   bar: baz
 SASS
 @import "foo.css";
 
+@import url(bar.css);
+
 foo {
   bar: baz; }
 SCSS
@@ -695,7 +703,6 @@ SCSS
 
   def test_import_as_directive_in_sass
     assert_equal "@import foo.css\n", to_sass('@import "foo.css"')
-    assert_equal "@import foo.css\n", to_sass('@import url(foo.css)')
   end
 
   def test_import_as_directive_in_scss

data/test/sass/engine_test.rb

@@ -487,8 +487,21 @@ CSS
   end
 
   def test_css_import
-    assert_equal("@import url(./fonts.css) screen;\n", render("@import url(./fonts.css) screen"))
-    assert_equal("@import \"./fonts.css\" screen;\n", render("@import \"./fonts.css\" screen"))
+    assert_equal("@import url(./fonts.css);\n", render("@import \"./fonts.css\""))
+  end
+
+  def test_media_import
+    assert_equal("@import \"./fonts.sass\" all;\n",
+      render("@import \"./fonts.sass\" all"))
+  end
+
+  def test_http_import
+    assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
+      render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
+  end
+
+  def test_url_import
+    assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass)"))
   end
 
   def test_sass_import

data/test/sass/script_test.rb

@@ -390,6 +390,18 @@ SASS
       'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
   end
 
+  def test_color_prefixed_identifier
+    assert_equal "tealbang", resolve("tealbang")
+    assert_equal "teal-bang", resolve("teal-bang")
+  end
+
+  def test_op_prefixed_identifier
+    assert_equal "notbang", resolve("notbang")
+    assert_equal "not-bang", resolve("not-bang")
+    assert_equal "or-bang", resolve("or-bang")
+    assert_equal "and-bang", resolve("and-bang")
+  end
+
   private
 
   def resolve(str, opts = {}, environment = env)

data/test/sass/scss/css_test.rb

@@ -382,7 +382,10 @@ SCSS
   def test_calc_function
     assert_parses <<SCSS
 foo {
-  a: 12px calc(100%/3 - 2*1em - 2*1px); }
+  a: 12px calc(100%/3 - 2*1em - 2*1px);
+  b: 12px -moz-calc(100%/3 - 2*1em - 2*1px);
+  b: 12px -webkit-calc(100%/3 - 2*1em - 2*1px);
+  b: 12px -foobar-calc(100%/3 - 2*1em - 2*1px); }
 SCSS
   end
 
@@ -703,6 +706,18 @@ SCSS
 
     assert_selector_parses(':not(:hover)')
     assert_selector_parses(':not(:nth-child(2n + 3))')
+
+    # Not technically allowed, but what the heck
+    assert_selector_parses(':not(:not(#foo))')
+    assert_selector_parses(':not(a#foo.bar)')
+    assert_selector_parses(':not(#foo .bar > baz)')
+    assert_selector_parses(':not(h1, h2, h3)')
+  end
+
+  def test_moz_any_selector
+    assert_selector_parses(':-moz-any(h1, h2, h3)')
+    assert_selector_parses(':-moz-any(.foo)')
+    assert_selector_parses(':-moz-any(foo bar, .baz > .bang)')
   end
 
   def test_namespaced_selectors

data/test/sass/scss/scss_test.rb

@@ -212,11 +212,24 @@ SCSS
   def test_css_import_directive
     assert_equal "@import url(foo.css);\n", render('@import "foo.css";')
     assert_equal "@import url(foo.css);\n", render("@import 'foo.css';")
-    assert_equal "@import url(foo.css);\n", render('@import url("foo.css");')
-    assert_equal "@import url(foo.css);\n", render("@import url('foo.css');")
+    assert_equal "@import url(\"foo.css\");\n", render('@import url("foo.css");')
+    assert_equal "@import url('foo.css');\n", render("@import url('foo.css');")
     assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
   end
 
+  def test_media_import
+    assert_equal("@import \"./fonts.sass\" all;\n", render("@import \"./fonts.sass\" all;"))
+  end
+
+  def test_http_import
+    assert_equal("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";\n",
+      render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";"))
+  end
+
+  def test_url_import
+    assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass);"))
+  end
+
   def test_block_comment_in_script
     assert_equal <<CSS, render(<<SCSS)
 foo {

data/test/sass/templates/import.sass

@@ -4,7 +4,7 @@ $preconst: hello
   pre-mixin: here
 
 @import importee.sass, scss_importee, "basic.sass", basic.css, ../results/complex.css
-@import url(partial.sass)
+@import partial.sass
 
 nonimported
   :myconst $preconst

data/test/test_helper.rb

@@ -65,7 +65,7 @@ class Test::Unit::TestCase
   end
 
   def form_for_calling_convention(name)
-    return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq?("3.0.0.beta3")
+    return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq_3?
     return ":#{name}, @#{name}"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 12
-  version: 3.0.12
+  - 13
+  version: 3.0.13
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +146,7 @@ files:
 - lib/sass/plugin/staleness_checker.rbc
 - lib/sass/plugin/staleness_checker.rb
 - lib/sass/plugin/configuration.rbc
+- lib/sass/plugin/generic.rb
 - lib/sass/environment.rb
 - lib/sass/callbacks.rb
 - lib/sass/selector/simple_sequence.rb