sass 3.2.0.alpha.104 → 3.2.0.alpha.236

data/test/sass/functions_test.rb

@@ -76,7 +76,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_hsl_checks_bounds
     assert_error_message("Saturation -114 must be between 0% and 100% for `hsl'", "hsl(10, -114, 12)");
-    assert_error_message("Lightness 256 must be between 0% and 100% for `hsl'", "hsl(10, 10, 256%)");
+    assert_error_message("Lightness 256% must be between 0% and 100% for `hsl'", "hsl(10, 10, 256%)");
   end
 
   def test_hsl_checks_types
@@ -94,7 +94,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_hsla_checks_bounds
     assert_error_message("Saturation -114 must be between 0% and 100% for `hsla'", "hsla(10, -114, 12, 1)");
-    assert_error_message("Lightness 256 must be between 0% and 100% for `hsla'", "hsla(10, 10, 256%, 0)");
+    assert_error_message("Lightness 256% must be between 0% and 100% for `hsla'", "hsla(10, 10, 256%, 0)");
     assert_error_message("Alpha channel -0.1 must be between 0 and 1 for `hsla'", "hsla(10, 10, 10, -0.1)");
     assert_error_message("Alpha channel 1.1 must be between 0 and 1 for `hsla'", "hsla(10, 10, 10, 1.1)");
   end
@@ -189,24 +189,24 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgb_tests_bounds
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(256, 1, 1)")
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 256, 1)")
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 1, 256)")
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 256, 257)")
-    assert_error_message("Color value -1 must be between 0 and 255 inclusive for `rgb'",
+    assert_error_message("Color value -1 must be between 0 and 255 for `rgb'",
       "rgb(-1, 1, 1)")
   end
 
   def test_rgb_test_percent_bounds
-    assert_error_message("Color value 100.1% must be between 0% and 100% inclusive for `rgb'",
+    assert_error_message("Color value 100.1% must be between 0% and 100% for `rgb'",
       "rgb(100.1%, 0, 0)")
-    assert_error_message("Color value -0.1% must be between 0% and 100% inclusive for `rgb'",
+    assert_error_message("Color value -0.1% must be between 0% and 100% for `rgb'",
       "rgb(0, -0.1%, 0)")
-    assert_error_message("Color value 101% must be between 0% and 100% inclusive for `rgb'",
+    assert_error_message("Color value 101% must be between 0% and 100% for `rgb'",
       "rgb(0, 0, 101%)")
   end
 
@@ -224,19 +224,19 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgb_tests_bounds
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(256, 1, 1, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 256, 1, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 1, 256, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 256, 257, 0.3)")
-    assert_error_message("Color value -1 must be between 0 and 255 inclusive for `rgba'",
+    assert_error_message("Color value -1 must be between 0 and 255 for `rgba'",
       "rgba(-1, 1, 1, 0.3)")
-    assert_error_message("Alpha channel -0.2 must be between 0 and 1 inclusive for `rgba'",
+    assert_error_message("Alpha channel -0.2 must be between 0 and 1 for `rgba'",
       "rgba(1, 1, 1, -0.2)")
-    assert_error_message("Alpha channel 1.2 must be between 0 and 1 inclusive for `rgba'",
+    assert_error_message("Alpha channel 1.2 must be between 0 and 1 for `rgba'",
       "rgba(1, 1, 1, 1.2)")
   end
 
@@ -733,15 +733,15 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_change_color_argument_errors
     # Range
-    assert_error_message("Saturation must be between 0 and 100 for `change-color'",
+    assert_error_message("Saturation 101% must be between 0% and 100% for `change-color'",
       "change-color(blue, $saturation: 101%)")
-    assert_error_message("Lightness must be between 0 and 100 for `change-color'",
+    assert_error_message("Lightness 101% must be between 0% and 100% for `change-color'",
       "change-color(blue, $lightness: 101%)")
-    assert_error_message("Red value must be between 0 and 255 for `change-color'",
+    assert_error_message("Red value -1 must be between 0 and 255 for `change-color'",
       "change-color(blue, $red: -1)")
-    assert_error_message("Green value must be between 0 and 255 for `change-color'",
+    assert_error_message("Green value 256 must be between 0 and 255 for `change-color'",
       "change-color(blue, $green: 256)")
-    assert_error_message("Blue value must be between 0 and 255 for `change-color'",
+    assert_error_message("Blue value 500 must be between 0 and 255 for `change-color'",
       "change-color(blue, $blue: 500)")
 
     # Unknown argument
@@ -871,6 +871,7 @@ MSG
     assert_equal("bool", evaluate("type-of(true)"))
     assert_equal("color", evaluate("type-of(#fff)"))
     assert_equal("color", evaluate("type-of($value: #fff)"))
+    assert_equal("null", evaluate("type-of(null)"))
   end
 
   def test_unit
@@ -1011,6 +1012,7 @@ MSG
   def test_if
     assert_equal("1px", evaluate("if(true, 1px, 2px)"))
     assert_equal("2px", evaluate("if(false, 1px, 2px)"))
+    assert_equal("2px", evaluate("if(null, 1px, 2px)"))
   end
 
   def test_keyword_args_rgb
@@ -1023,23 +1025,47 @@ MSG
   end
 
   def test_keyword_args_rgba_with_extra_args
-    assert_equal(%Q{rgba(255, 255, 255, 0.5)}, evaluate("rgba($red: 255, $green: 255, $blue: 255, $alpha: 0.5, $extra: error)"))
+    evaluate("rgba($red: 255, $green: 255, $blue: 255, $alpha: 0.5, $extra: error)")
+    flunk("Expected exception")
   rescue Sass::SyntaxError => e
-    assert_equal("Function rgba doesn't take an argument named $extra", e.message)
+    assert_equal("Function rgba doesn't have an argument named $extra", e.message)
   end
 
   def test_keyword_args_must_have_signature
     evaluate("no-kw-args($fake: value)")
+    flunk("Expected exception")
   rescue Sass::SyntaxError => e
     assert_equal("Function no_kw_args doesn't support keyword arguments", e.message)
   end
 
   def test_keyword_args_with_missing_argument
     evaluate("rgb($red: 255, $green: 255)")
+    flunk("Expected exception")
   rescue Sass::SyntaxError => e
     assert_equal("Function rgb requires an argument named $blue", e.message)
   end
 
+  def test_keyword_args_with_extra_argument
+    evaluate("rgb($red: 255, $green: 255, $blue: 255, $purple: 255)")
+    flunk("Expected exception")
+  rescue Sass::SyntaxError => e
+    assert_equal("Function rgb doesn't have an argument named $purple", e.message)
+  end
+
+  def test_keyword_args_with_positional_and_keyword_argument
+    evaluate("rgb(255, 255, 255, $red: 255)")
+    flunk("Expected exception")
+  rescue Sass::SyntaxError => e
+    assert_equal("Function rgb was passed argument $red both by position and by name", e.message)
+  end
+
+  def test_keyword_args_with_keyword_before_positional_argument
+    evaluate("rgb($red: 255, 255, 255)")
+    flunk("Expected exception")
+  rescue Sass::SyntaxError => e
+    assert_equal("Positional arguments must come before keyword arguments", e.message)
+  end
+
   def test_only_var_args
     assert_equal "only-var-args(2px, 3px, 4px)", evaluate("only-var-args(1px, 2px, 3px)")
   end
@@ -1048,6 +1074,12 @@ MSG
     assert_equal "only-kw-args(a, b, c)", evaluate("only-kw-args($a: 1, $b: 2, $c: 3)")
   end
 
+  ## Regression Tests
+
+  def test_saturation_bounds
+    assert_equal "#fbfdff", evaluate("hsl(hue(#fbfdff), saturation(#fbfdff), lightness(#fbfdff))")
+  end
+
   private
 
   def evaluate(value)

data/test/sass/script_test.rb

@@ -21,13 +21,13 @@ class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise_message(ArgumentError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise_message(ArgumentError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
+    assert_raise_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise_message(ArgumentError, "Red value 256 must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
   def test_color_checks_rgba_input
-    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes
@@ -263,6 +263,10 @@ SASS
     assert_equal "false", resolve("false")
   end
 
+  def test_null
+    assert_equal "", resolve("null")
+  end
+
   def test_boolean_ops
     assert_equal "true", resolve("true and true")
     assert_equal "true", resolve("false or true")
@@ -281,6 +285,18 @@ SASS
     assert_equal "false", resolve("false and 1")
     assert_equal "2", resolve("2 or 3")
     assert_equal "3", resolve("2 and 3")
+
+    assert_equal "true", resolve("null or true")
+    assert_equal "true", resolve("true or null")
+    assert_equal "", resolve("null or null")
+    assert_equal "", resolve("null and true")
+    assert_equal "", resolve("true and null")
+    assert_equal "", resolve("null and null")
+
+    assert_equal "true", resolve("not null")
+
+    assert_equal "1", resolve("null or 1")
+    assert_equal "", resolve("null and 1")
   end
 
   def test_arithmetic_ops
@@ -326,6 +342,37 @@ SASS
     assert_equal "false", resolve("3 <= 2")
   end
 
+  def test_null_ops
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null plus 1".') {eval("null + 1")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null minus 1".') {eval("null - 1")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null times 1".') {eval("null * 1")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null div 1".') {eval("null / 1")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null mod 1".') {eval("null % 1")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "1 plus null".') {eval("1 + null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "1 minus null".') {eval("1 - null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "1 times null".') {eval("1 * null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "1 div null".') {eval("1 / null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "1 mod null".') {eval("1 % null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "1 gt null".') {eval("1 > null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null lt 1".') {eval("null < 1")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: "null plus null".') {eval("null + null")}
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid null operation: ""foo" plus null".') {eval("foo + null")}
+  end
+
   def test_equals
     assert_equal("true", resolve('"foo" == $foo', {},
         env("foo" => Sass::Script::String.new("foo"))))
@@ -424,6 +471,15 @@ SASS
     assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}
   end
 
+  def test_list_with_nulls
+    assert_equal "1, 2, 3", resolve("1, 2, null, 3")
+    assert_equal "1 2 3", resolve("1 2 null 3")
+    assert_equal "1, 2, 3", resolve("1, 2, 3, null")
+    assert_equal "1 2 3", resolve("1 2 3 null")
+    assert_equal "1, 2, 3", resolve("null, 1, 2, 3")
+    assert_equal "1 2 3", resolve("null 1 2 3")
+  end
+
   def test_deep_argument_error_not_unwrapped
     assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
   end

data/test/sass/scss/scss_test.rb

@@ -850,6 +850,16 @@ $zzz: zzz;
 SCSS
   end
 
+  def test_selector_interpolation_at_attr_end
+    assert_equal <<CSS, render(<<SCSS)
+[foo=zzz] {
+  a: b; }
+CSS
+$zzz: zzz;
+[foo=\#{$zzz}] { a: b; }
+SCSS
+  end
+
   def test_selector_interpolation_at_dashes
     assert_equal <<CSS, render(<<SCSS)
 div {

data/vendor/listen/CHANGELOG.md

@@ -1,8 +1,23 @@
+## 0.4.2 - May 1, 2012
+
+### Bug fixes
+
+- [#21](https://github.com/guard/listen/issues/21): Issues when listening to changes in relative paths. (reported by [@akerbos][], fixed by [@Maher4Ever][])
+- [#27](https://github.com/guard/listen/issues/27): Wrong reports for files modifications. (reported by [@cobychapple][], fixed by [@Maher4Ever][])
+- Fix segmentation fault when profiling on Windows. ([@Maher4Ever][])
+- Fix redundant watchers on Windows. ([@Maher4Ever][])
+
+### Improvements
+
+- [#17](https://github.com/guard/listen/issues/17): Use regexp-patterns with the `ignore` method instead of supplying paths. (reported by [@fny][], added by [@Maher4Ever][])
+- Speed improvement when listening to changes in directories with ignored paths. ([@Maher4Ever][])
+- Added `.rbx` and `.svn` to ignored directories. ([@Maher4Ever][])
+
 ## 0.4.1 - April 15, 2012
 
 ### Bug fixes
 
-- [#18](https://github.com/guard/listen/issues/18): Listener crashes when removing directories with nested paths (reported by [@daemonza][], fixed by [@Maher4Ever][])
+- [#18]((https://github.com/guard/listen/issues/18): Listener crashes when removing directories with nested paths. (reported by [@daemonza][], fixed by [@Maher4Ever][])
 
 ## 0.4.0 - April 9, 2012
 
@@ -70,3 +85,6 @@
 [@thibaudgg]: https://github.com/thibaudgg
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@daemonza]: https://github.com/daemonza
+[@akerbos]: https://github.com/akerbos
+[@fny]: https://github.com/fny
+[@cobychapple]: https://github.com/cobychapple

data/vendor/listen/README.md

@@ -10,7 +10,7 @@ The Listen gem listens to file modifications and notifies you about the changes.
 * Automatic fallback to polling if OS-specific adapter doesn't work.
 * Detects files modification, addidation and removal.
 * Checksum comparaison for modifications made under the same second.
-* Allows ignoring paths and supplying filters for better results.
+* Allows supplying regexp-patterns to ignore and filter paths for better results.
 * Tested on all Ruby environments via [travis-ci](http://travis-ci.org/guard/listen).
 
 ## Install
@@ -26,18 +26,18 @@ There are **two ways** to use Listen:
 1. Call `Listen.to` with either a single directory or multiple directories, then define the `change` callback in a block.
 2. Create a `listener` object and use it in an (ARel style) chainable way.
 
-Feel free to give your feeback via [Listen issues](https://github.com/guard/listener/issues)
+Feel free to give your feeback via [Listen issues](https://github.com/guard/listen/issues)
 
 ### Block API
 
 ``` ruby
 # Listen to a single directory.
-Listen.to('dir/path/to/listen', filter: /.*\.rb/, ignore: '/ignored/path') do |modified, added, removed|
+Listen.to('dir/path/to/listen', filter: /\.rb$/, ignore: %r{ignored/path/}) do |modified, added, removed|
   # ...
 end
 
 # Listen to multiple directories.
-Listen.to('dir/to/awesome_app', 'dir/to/other_app', filter: /.*\.rb/, latency: 0.1) do |modified, added, removed|
+Listen.to('dir/to/awesome_app', 'dir/to/other_app', filter: /\.rb$/, latency: 0.1) do |modified, added, removed|
   # ...
 end
 ```
@@ -46,8 +46,8 @@ end
 
 ``` ruby
 listener = Listen.to('dir/path/to/listen')
-listener = listener.ignore('/ignored/path')
-listener = listener.filter(/.*\.rb/)
+listener = listener.ignore(%r{^ignored/path/})
+listener = listener.filter(/\.rb$/)
 listener = listener.latency(0.5)
 listener = listener.force_polling(true)
 listener = listener.polling_fallback_message(false)
@@ -59,8 +59,8 @@ listener.start # blocks execution!
 
 ``` ruby
 Listen.to('dir/path/to/listen')
-      .ignore('/ignored/path')
-      .filter(/.*\.rb/)
+      .ignore(%r{^ignored/path/})
+      .filter(/\.rb$/)
       .latency(0.5)
       .force_polling(true)
       .polling_fallback_message('custom message')
@@ -99,7 +99,7 @@ For an easier access, the `Listen.to` method can also be used to create a multi-
 
 ``` ruby
 listener = Listen.to('app/css', 'app/js')
-                 .ignore('vendor') # both js/vendor and css/vendor will be ignored
+                 .ignore(%r{^vendor/}) # both js/vendor and css/vendor will be ignored
                  .change(&assets_callback)
 
 listener.start # blocks execution!
@@ -184,15 +184,18 @@ end
 These options can be set through `Listen.to` params or via methods (see the "Object" API)
 
 ```ruby
-:filter => /.*\.rb/, /.*\.coffee/              # Filter files to listen to via a regexps list.
+:filter => /\.rb$/, /\.coffee$/                # Filter files to listen to via a regexps list.
                                                # default: none
 
-:ignore => 'path1', 'path2'                    # Ignore a list of paths (root directory or sub-dir)
-                                               # default: '.bundle', '.git', '.DS_Store', 'log', 'tmp', 'vendor'
+:ignore => %r{app/CMake/}, /\.pid$/            # Ignore a list of paths (root directory or sub-dir)
+                                               # default: See DEFAULT_IGNORED_DIRECTORIES and DEFAULT_IGNORED_EXTENSIONS in Listen::DirectoryRecord
 
 :latency => 0.5                                # Set the delay (**in seconds**) between checking for changes
                                                # default: 0.1 sec (1.0 sec for polling)
 
+:relative_paths => true                        # Enable the use of relative paths in the callback.
+                                               # default: false
+
 :force_polling => true                         # Force the use of the polling adapter
                                                # default: none
 
@@ -200,6 +203,18 @@ These options can be set through `Listen.to` params or via methods (see the "Obj
                                                # default: "WARNING: Listen fallen back to polling, learn more at https://github.com/guard/listen#fallback."
 ```
 
+### The patterns for filtering and ignoring paths
+
+Just like the unix convention of beginning absolute paths with the
+directory-separator (forward slash `/` in unix) and with no prefix for relative paths,
+Listen doesn't prefix relative paths (to the watched directory) with a directory-separator.
+
+Therefore make sure _NOT_ to prefix your regexp-patterns for filtering or ignoring paths
+with a directory-separator, otherwise they won't work as expected.
+
+As an example: to ignore the `build` directory in a C-project, use `%r{build/}`
+and not `%r{/build/}`.
+
 ### Non-blocking listening to changes
 
 Starting a listener blocks the current thread by default. That means any code after the

data/vendor/listen/lib/listen/adapter.rb

@@ -83,6 +83,14 @@ module Listen
       @turnstile.signal # ensure no thread is blocked
     end
 
+    # Returns whether the adapter is statred or not
+    #
+    # @return [Boolean] whether the adapter is started or not
+    #
+    def started?
+      @stop.nil? ? false : !@stop
+    end
+
     # Blocks the main thread until the poll thread
     # calls the callback.
     #
@@ -129,7 +137,7 @@ module Listen
     ensure
       Thread.kill(t) if t
       FileUtils.rm(test_file) if File.exists?(test_file)
-      adapter.stop
+      adapter.stop if adapter && adapter.started?
     end
 
     private

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

@@ -1,22 +1,33 @@
 module Listen
   module Adapters
 
-    # Watched INotify EVENTS
-    #
-    # @see http://www.tin.org/bin/man.cgi?section=7&topic=inotify
-    # @see https://github.com/nex3/rb-inotify/blob/master/lib/rb-inotify/notifier.rb#L99-L177
-    #
-    EVENTS = %w[recursive attrib close modify move create delete delete_self move_self]
-
     # Listener implementation for Linux `inotify`.
     #
     class Linux < Adapter
 
+      # Watched inotify events
+      #
+      # @see http://www.tin.org/bin/man.cgi?section=7&topic=inotify
+      # @see https://github.com/nex3/rb-inotify/blob/master/lib/rb-inotify/notifier.rb#L99-L177
+      #
+      EVENTS = %w[recursive attrib close modify move create delete delete_self move_self]
+
+      # The message to show when the limit of inotify watchers is not enough
+      #
+      INOTIFY_LIMIT_MESSAGE = <<-EOS.gsub(/^\s*/, '')
+        Listen error: unable to monitor directories for changes.
+
+        Please head to https://github.com/guard/listen/wiki/Increasing-the-amount-of-inotify-watchers
+        for information on how to solve this issue.
+      EOS
+
       # Initializes the Adapter. See {Listen::Adapter#initialize} for more info.
       #
       def initialize(directories, options = {}, &callback)
         super
         @worker = init_worker
+      rescue Errno::ENOSPC
+        abort(INOTIFY_LIMIT_MESSAGE)
       end
 
       # Starts the adapter.