sass 3.1.0.alpha.18 → 3.1.0.alpha.19

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.18
+3.1.0.alpha.19

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.18
+3.1.0.alpha.19

data/lib/sass.rb

@@ -43,17 +43,21 @@ module Sass
   # @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
   #
   # @overload compile_file(filename, options = {})
+  #   Return the compiled CSS rather than writing it to a file.
+  #
   #   @return [String] The compiled CSS.
   #
   # @overload compile_file(filename, css_filename, options = {})
+  #   Write the compiled CSS to a file.
+  #
   #   @param css_filename [String] The location to which to write the compiled CSS.
   def self.compile_file(filename, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}
-    css_filename ||= args.shift
-    options[:css_filename] = css_filename
+    css_filename = args.shift
     result = Sass::Engine.for_file(filename, options).render
     if css_filename
-      open(css_filename,"w") {|css_file| css_file.write(result) }
+      options[:css_filename] ||= css_filename
+      open(css_filename,"w") {|css_file| css_file.write(result)}
       nil
     else
       result

data/lib/sass/engine.rb

@@ -158,8 +158,8 @@ module Sass
       options[:line_comments] ||= options[:line_numbers]
 
       options[:load_paths] = options[:load_paths].map do |p|
-        next p unless p.is_a?(String)
-        options[:filesystem_importer].new(p)
+        next p unless p.is_a?(String) || (defined?(Pathname) && p.is_a?(Pathname))
+        options[:filesystem_importer].new(p.to_s)
       end
 
       # Backwards compatibility

data/lib/sass/less.rb

@@ -246,24 +246,43 @@ WARNING
       private
 
       LESS_TO_SASS_OPERATORS = {"-" => :minus, "+" => :plus, "*" => :times, "/" => :div, "=" => :single_eq}
+
       def _to_sass_tree(arr)
-        return Sass::Script::UnaryOperation.new(_to_sass_tree(arr[1..-1]), :minus) if arr[0] == "-"
-        _to_sass_tree2(*_sass_split(arr))
+        e, rest = _to_sass_tree_plus_minus_eq(arr)
+        until rest.empty?
+          e2, rest = _to_sass_tree_plus_minus_eq(rest)
+          e = Sass::Script::Operation.new(e, e2, :concat)
+        end
+        return e
       end
 
-      def _to_sass_tree2(first, rest)
-        return first if rest.empty?
-        if rest[0].is_a?(Operator)
+      def _to_sass_tree_plus_minus_eq(arr)
+        e, rest = _to_sass_tree_times_div(arr)
+        while rest[0] && rest[0].is_a?(Operator) && %w[+ - =].include?(rest[0])
           op = LESS_TO_SASS_OPERATORS[rest[0]]
-          if op == :times || op == :div
-            second, rest = _sass_split(rest[1..-1])
-            return _to_sass_tree2(Sass::Script::Operation.new(first, second, op), rest)
-          else
-            return Sass::Script::Operation.new(first, _to_sass_tree(rest[1..-1]), op)
-          end
+          e2, rest = _to_sass_tree_times_div(rest[1..-1])
+          e = Sass::Script::Operation.new(e, e2, op)
         end
+        return e, rest
+      end
 
-        Sass::Script::Operation.new(first, _to_sass_tree(rest), :concat)
+      def _to_sass_tree_times_div(arr)
+        e, rest = _to_sass_tree_unary(arr)
+        while rest[0] && rest[0].is_a?(Operator) && %w[* /].include?(rest[0])
+          op = LESS_TO_SASS_OPERATORS[rest[0]]
+          e2, rest = _to_sass_tree_unary(rest[1..-1])
+          e = Sass::Script::Operation.new(e, e2, op)
+        end
+        return e, rest
+      end
+
+      def _to_sass_tree_unary(arr)
+        if arr[0] == "-"
+          first, rest = _sass_split(arr[1..-1])
+          return Sass::Script::UnaryOperation.new(first, :minus), rest
+        else
+          return _sass_split(arr[0..-1])
+        end
       end
 
       def _sass_split(arr)

data/lib/sass/script/funcall.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), 'functions')
+require 'sass/script/functions'
+
 module Sass
   module Script
     # A SassScript parse node representing a function call.

data/lib/sass/script/parser.rb

@@ -130,7 +130,7 @@ module Sass
         [:times, :div, :mod],
       ]
 
-      ASSOCIATIVE = [:plus, :times]
+      ASSOCIATIVE = [:comma, :concat, :plus, :times]
 
       class << self
         # Returns an integer representing the precedence

data/test/sass/engine_test.rb

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 require 'stringio'
 require 'mock_importer'
+require 'pathname'
 
 module Sass::Script::Functions::UserFunctions
   def option(name)
@@ -545,6 +546,15 @@ CSS
     assert File.exists?(sassc_file)
   end
 
+  def test_sass_pathname_import
+    sassc_file = sassc_path("importee")
+    assert !File.exists?(sassc_file)
+    renders_correctly("import",
+      :style => :compact,
+      :load_paths => [Pathname.new(File.dirname(__FILE__) + "/templates")])
+    assert File.exists?(sassc_file)
+  end
+
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.

data/test/sass/functions_test.rb

@@ -14,7 +14,7 @@ module Sass::Script::Functions
   declare :only_var_args, [], :var_args => true
 
   def only_kw_args(kwargs)
-    Sass::Script::String.new("only-kw-args("+kwargs.keys.join(", ")+")")
+    Sass::Script::String.new("only-kw-args(" + kwargs.keys.sort.join(", ") + ")")
   end
   declare :only_kw_args, [], :var_kwargs => true
 end
@@ -629,9 +629,11 @@ MSG
   def test_only_var_args
     assert_equal "only-var-args(2px, 3px, 4px)", evaluate("only-var-args(1px, 2px, 3px)")
   end
+
   def test_only_kw_args
     assert_equal "only-kw-args(a, b, c)", evaluate("only-kw-args($a: 1, $b: 2, $c: 3)")
   end
+
   private
 
   def evaluate(value)

data/test/sass/less_conversion_test.rb

@@ -326,7 +326,14 @@ foo {
   d: 1 + 2 - 3 + 4;
   e: 1 / 2 - 3 / 4;
   f: 1 - 2 / 3 - 4;
-  g: 1 / 2 * 3 / 4; }
+  g: 1 / 2 * 3 / 4;
+  h: (1 + 2) * (3 + 4);
+  i: 1 * (2 + 3) * 4;
+  j: 1 - (2 + 2) - 4;
+  k: 1 + 2 - (3 + 4);
+  l: 1 / (2 - 3) / 4;
+  m: (1 - 2) / (3 - 4);
+  n: 1 / (2 * 3) / 4; }
 SCSS
 foo {
   a: 1 + 2 * 3 + 4;
@@ -335,7 +342,14 @@ foo {
   d: 1 + 2 - 3 + 4;
   e: 1 / 2 - 3 / 4;
   f: 1 - 2 / 3 - 4;
-  g: 1 / 2 * 3 / 4; }
+  g: 1 / 2 * 3 / 4;
+  h: (1 + 2) * (3 + 4);
+  i: 1 * (2 + 3) * 4;
+  j: 1 - (2 + 2) - 4;
+  k: 1 + 2 - (3 + 4);
+  l: 1 / (2 - 3) / 4;
+  m: (1 - 2) / (3 - 4);
+  n: 1 / (2 * 3) / 4; }
 LESS
   end
 
@@ -628,5 +642,12 @@ LESS
 end
 
 rescue LoadError => e
-puts "\nCouldn't require less, skipping some tests."
+  unless defined?(Gem)
+    begin
+      require 'rubygems'
+      retry
+    rescue Exception
+    end
+  end
+  puts "\nCouldn't require less, skipping some tests."
 end

data/test/sass/script_conversion_test.rb

@@ -124,25 +124,33 @@ RUBY
   end
 
   def self.assert_associative(op_name, sibling_name)
-    op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
-    sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
+    op = separator_for(op_name)
+    sibling = separator_for(sibling_name)
     class_eval <<RUBY
       def test_associative_#{op_name}_#{sibling_name} 
-        assert_renders "$foo #{op} $bar #{op} $baz"
+        assert_renders "$foo#{op}$bar#{op}$baz"
 
-        assert_equal "$foo #{op} $bar #{op} $baz",
-          render("$foo #{op} ($bar #{op} $baz)")
-        assert_equal "$foo #{op} $bar #{op} $baz",
-          render("($foo #{op} $bar) #{op} $baz")
+        assert_equal "$foo#{op}$bar#{op}$baz",
+          render("$foo#{op}($bar#{op}$baz)")
+        assert_equal "$foo#{op}$bar#{op}$baz",
+          render("($foo#{op}$bar)#{op}$baz")
 
-        assert_equal "$foo #{op} $bar #{sibling} $baz",
-          render("$foo #{op} ($bar #{sibling} $baz)")
-        assert_equal "$foo #{sibling} $bar #{op} $baz",
-          render("($foo #{sibling} $bar) #{op} $baz")
+        assert_equal "$foo#{op}$bar#{sibling}$baz",
+          render("$foo#{op}($bar#{sibling}$baz)")
+        assert_equal "$foo#{sibling}$bar#{op}$baz",
+          render("($foo#{sibling}$bar)#{op}$baz")
       end
 RUBY
   end
 
+  def self.separator_for(op_name)
+    case op_name
+    when :comma; ", "
+    when :concat; " "
+    else; " #{Sass::Script::Lexer::OPERATORS_REVERSE[op_name]} "
+    end
+  end
+
   def self.assert_non_associative(op_name, sibling_name)
     op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
     sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
@@ -174,6 +182,8 @@ RUBY
   test_precedence :plus, :div
   test_precedence :plus, :mod
 
+  assert_associative :comma, :concat
+  assert_associative :concat, :or
   assert_associative :plus, :minus
   assert_associative :times, :div
   assert_associative :times, :mod

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.18
+  version: 3.1.0.alpha.19
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -04:00
+date: 2010-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,16 +162,16 @@ files:
 - test/sass/plugin_test.rb
 - test/sass/extend_test.rb
 - test/sass/functions_test.rb
-- test/sass/cache_test.rb
 - test/sass/less_conversion_test.rb
-- test/sass/importer_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/util/subset_map_test.rb
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more_import.css
 - test/sass/more_templates/_more_partial.sass
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
-- test/sass/mock_importer.rb
+- test/sass/cache_test.rb
 - test/sass/results/alt.css
 - test/sass/results/basic.css
 - test/sass/results/compact.css
@@ -193,7 +193,7 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
-- test/sass/script_conversion_test.rb
+- test/sass/importer_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
@@ -234,8 +234,8 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
+- test/sass/mock_importer.rb
 - test/sass/test_helper.rb
-- test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb
 - test/test_helper.rb
 - extra/update_watch.rb
@@ -285,13 +285,13 @@ test_files:
 - test/sass/plugin_test.rb
 - test/sass/extend_test.rb
 - test/sass/functions_test.rb
-- test/sass/cache_test.rb
 - test/sass/less_conversion_test.rb
-- test/sass/importer_test.rb
 - test/sass/script_conversion_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/cache_test.rb
+- test/sass/importer_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb