sass 3.2.8 → 3.2.9

data/VERSION

@@ -1 +1 @@
-3.2.8
+3.2.9

data/VERSION_DATE

@@ -1 +1 @@
-22 April 2013 19:59:23 UTC
+10 May 2013 23:56:29 UTC

data/lib/sass/plugin/compiler.rb

@@ -234,23 +234,7 @@ module Sass::Plugin
     def watch(individual_files = [])
       update_stylesheets(individual_files)
 
-      begin
-        require 'listen'
-      rescue LoadError => e
-        dir = Sass::Util.scope("vendor/listen/lib")
-        if $LOAD_PATH.include?(dir)
-          e.message << "\n" <<
-            if File.exists?(scope(".git"))
-              'Run "git submodule update --init" to get the recommended version.'
-            else
-              'Run "gem install listen" to get it.'
-            end
-          raise e
-        else
-          $LOAD_PATH.unshift dir
-          retry
-        end
-      end
+      load_listen!
 
       template_paths = template_locations # cache the locations
       individual_files_hash = individual_files.inject({}) do |h, files|
@@ -328,6 +312,43 @@ module Sass::Plugin
 
     private
 
+    def load_listen!
+      if defined?(gem)
+        begin
+          gem 'listen', '~> 0.7'
+          require 'listen'
+        rescue Gem::LoadError
+          dir = Sass::Util.scope("vendor/listen/lib")
+          $LOAD_PATH.unshift dir
+          begin
+            require 'listen'
+          rescue LoadError => e
+            e.message << "\n" <<
+              if File.exists?(scope(".git"))
+                'Run "git submodule update --init" to get the recommended version.'
+              else
+                'Run "gem install listen" to get it.'
+              end
+            raise e
+          end
+        end
+      else
+        begin
+          require 'listen'
+        rescue LoadError => e
+          dir = Sass::Util.scope("vendor/listen/lib")
+          if $LOAD_PATH.include?(dir)
+            raise e unless File.exists?(scope(".git"))
+            e.message << "\n" <<
+              'Run "git submodule update --init" to get the recommended version.'
+          else
+            $LOAD_PATH.unshift dir
+            retry
+          end
+        end
+      end
+    end
+
     def update_stylesheet(filename, css)
       dir = File.dirname(css)
       unless File.exists?(dir)

data/lib/sass/script/functions.rb

@@ -1423,6 +1423,19 @@ module Sass::Script
     end
     declare :if, [:condition, :if_true, :if_false]
 
+    # This function only exists as a workaround for IE7's [`content:counter`
+    # bug][bug]. It works identically to any other plain-CSS function, except it
+    # avoids adding spaces between the argument commas.
+    #
+    # [bug]: http://jes.st/2013/ie7s-css-breaking-content-counter-bug/
+    #
+    # @example
+    #   counter(item, ".") => counter(item,".")
+    def counter(*args)
+      Sass::Script::String.new("counter(#{args.map {|a| a.to_s(options)}.join(',')})")
+    end
+    declare :counter, [], :var_args => true
+
     private
 
     # This method implements the pattern of transforming a numeric value into

data/lib/sass/selector/simple_sequence.rb

@@ -171,7 +171,7 @@ module Sass
       def with_more_sources(sources)
         sseq = dup
         sseq.members = members.dup
-        sseq.sources.merge sources
+        sseq.sources = self.sources | sources
         sseq
       end
 

data/test/sass/extend_test.rb

@@ -1186,6 +1186,20 @@ SCSS
 
   # Regression Tests
 
+  def test_nested_extend_specificity
+    assert_equal <<CSS, render(<<SCSS)
+a :b, a :b:c {
+  a: b; }
+CSS
+%foo {a: b}
+
+a {
+  :b {@extend %foo}
+  :b:c {@extend %foo}
+}
+SCSS
+  end
+
   def test_nested_double_extend_optimization
     assert_equal <<CSS, render(<<SCSS)
 .parent1 .child {

data/test/sass/functions_test.rb

@@ -1037,6 +1037,12 @@ MSG
     assert_equal("2px", evaluate("if(null, 1px, 2px)"))
   end
 
+  def test_counter
+    assert_equal("counter(foo)", evaluate("counter(foo)"))
+    assert_equal('counter(item,".")', evaluate('counter(item, ".")'))
+    assert_equal('counter(item,".")', evaluate('counter(item,".")'))
+  end
+
   def test_keyword_args_rgb
     assert_equal(%Q{white}, evaluate("rgb($red: 255, $green: 255, $blue: 255)"))
   end
@@ -1105,7 +1111,9 @@ MSG
   private
 
   def evaluate(value)
-    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
+    result = perform(value)
+    assert_kind_of Sass::Script::Literal, result
+    return result.to_s
   end
 
   def perform(value)

data/test/sass/script_test.rb

@@ -543,6 +543,7 @@ SASS
   def resolve(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
+    assert_kind_of Sass::Script::Literal, val
     val.is_a?(Sass::Script::String) ? val.value : val.to_s
   end
 

data/vendor/listen/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.3 - February 24, 2013
+
+### Bug fix
+
+- [#88] Update wdm dependency. (fixed by [@mrbinky3000][])
+- [#78] Depend on latest rb-inotify. (fixed by [@mbj][])
+
 ## 0.7.2 - January 11, 2013
 
 ### Bug fix

data/vendor/listen/Gemfile

@@ -8,7 +8,7 @@ gem 'rake'
 
 gem 'rb-kqueue', '~> 0.2' if RbConfig::CONFIG['target_os'] =~ /freebsd/i
 gem 'rb-fsevent', '~> 0.9.1' if RbConfig::CONFIG['target_os'] =~ /darwin(1.+)?$/i
-gem 'rb-inotify', '~> 0.8.8', :github => 'mbj/rb-inotify' if RbConfig::CONFIG['target_os'] =~ /linux/i
+gem 'rb-inotify', '~> 0.9.0' if RbConfig::CONFIG['target_os'] =~ /linux/i
 gem 'wdm',        '~> 0.0.3' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
 
 group :development do

data/vendor/listen/lib/listen/adapters/darwin.rb

@@ -7,7 +7,7 @@ module Listen
       extend DependencyManager
 
       # Declare the adapter's dependencies
-      dependency 'rb-fsevent', '~> 0.9.1'
+      dependency 'rb-fsevent', '~> 0.9'
 
       LAST_SEPARATOR_REGEX = /\/$/
 

data/vendor/listen/lib/listen/adapters/linux.rb

@@ -7,7 +7,7 @@ module Listen
       extend DependencyManager
 
       # Declare the adapter's dependencies
-      dependency 'rb-inotify', '~> 0.8.8'
+      dependency 'rb-inotify', '~> 0.9'
 
       # Watched inotify events
       #

data/vendor/listen/lib/listen/adapters/windows.rb

@@ -9,7 +9,7 @@ module Listen
       extend DependencyManager
 
       # Declare the adapter's dependencies
-      dependency 'wdm', '~> 0.0.3'
+      dependency 'wdm', '~> 0.1'
 
       # Initializes the Adapter. See {Listen::Adapter#initialize} for more info.
       #

data/vendor/listen/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard