sass 3.2.12 → 3.2.13

data/CONTRIBUTING

@@ -1,3 +1,3 @@
 Contributions are welcomed. Please see the following sites for guidelines:
 
-  http://sass-lang.com/development.html#contributing
+  http://sass-lang.com/community#Contribute

data/README.md

@@ -57,7 +57,7 @@ Then any Sass files in `public/stylesheets/sass`
 will be compiled into CSS files in `public/stylesheets` on every request.
 
 To use Sass programmatically,
-check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
+check out the [YARD documentation](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#using_sass).
 
 ## Formatting
 
@@ -71,10 +71,10 @@ and get small stylesheets up and running quickly,
 particularly with the help of
 [the Compass style library](http://compass-style.org).
 
-[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
-[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
-[mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
-[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
+[vars]:    http://sass-lang.com/documentation/file.SASS_REFERENCE.html#variables_
+[nested]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#nested_rules
+[mixins]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#mixins
+[imports]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#import
 
 Sass has two syntaxes.
 The one presented here, known as "SCSS" (for "Sassy CSS"),
@@ -83,7 +83,7 @@ The other (older) syntax, known as the indented syntax or just "Sass",
 is whitespace-sensitive and indentation-based.
 For more information, see the [reference documentation][syntax].
 
-[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
+[syntax]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax
 
 To run the following examples and see the CSS they produce,
 put them in a file called `test.scss` and run `sass test.scss`.
@@ -152,7 +152,7 @@ You can even give them arguments.
     }
 
 A comprehensive list of features is available
-in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
+in the [Sass reference](http://sass-lang.com/documentation/file.SASS_REFERENCE.html).
 
 ## Executables
 

data/VERSION

@@ -1 +1 @@
-3.2.12
+3.2.13

data/VERSION_DATE

@@ -1 +1 @@
-05 October 2013 01:29:11 UTC
+20 December 2013 04:00:49 UTC

data/bin/sass

@@ -2,7 +2,11 @@
 # The command line Sass parser.
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require File.dirname(THIS_FILE) + '/../lib/sass'
+begin
+  require File.dirname(THIS_FILE) + '/../lib/sass'
+rescue LoadError
+  require 'sass'
+end
 require 'sass/exec'
 
 opts = Sass::Exec::Sass.new(ARGV)

data/bin/sass-convert

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require File.dirname(THIS_FILE) + '/../lib/sass'
+begin
+  require File.dirname(THIS_FILE) + '/../lib/sass'
+rescue LoadError
+  require 'sass'
+end
 require 'sass/exec'
 
 opts = Sass::Exec::SassConvert.new(ARGV)

data/bin/scss

@@ -2,7 +2,11 @@
 # The command line Sass parser.
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require File.dirname(THIS_FILE) + '/../lib/sass'
+begin
+  require File.dirname(THIS_FILE) + '/../lib/sass'
+rescue LoadError
+  require 'sass'
+end
 require 'sass/exec'
 
 opts = Sass::Exec::Scss.new(ARGV)

data/lib/sass/css.rb

@@ -293,7 +293,7 @@ module Sass
     def bubble_subject(root)
       root.children.each do |child|
         bubble_subject(child) if child.is_a?(Tree::RuleNode) || child.is_a?(Tree::DirectiveNode)
-        next unless child.is_a?(Tree::RuleNode)
+        next unless child.is_a?(Tree::RuleNode) && !child.children.empty?
         next unless child.children.all? do |c|
           next unless c.is_a?(Tree::RuleNode)
           first_simple_sel(c).is_a?(Sass::Selector::Parent) && first_sseq(c).subject?

data/lib/sass/importers/filesystem.rb

@@ -119,7 +119,7 @@ module Sass
         dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
 
         found = possible_files(remove_root(name)).map do |f, s|
-          path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{dir}/#{f}"
+          path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{escape_glob_characters(dir)}/#{f}"
           Dir[path].map do |full_path|
             full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
             [full_path, s]

data/lib/sass/plugin.rb

@@ -123,7 +123,8 @@ module Sass
   end
 end
 
-if defined?(ActionController)
+# On Rails 3+ the rails plugin is loaded at the right time in railtie.rb
+if defined?(ActionController) && !Sass::Util.ap_geq_3?
   require 'sass/plugin/rails'
 elsif defined?(Merb::Plugins)
   require 'sass/plugin/merb'

data/lib/sass/railtie.rb

@@ -5,5 +5,6 @@ if defined?(ActiveSupport) && Sass::Util.has?(:public_method, ActiveSupport, :on
   ActiveSupport.on_load(:before_configuration) do
     require 'sass'
     require 'sass/plugin'
+    require 'sass/plugin/rails'
   end
 end

data/lib/sass/script/funcall.rb

@@ -100,16 +100,17 @@ module Sass
         splat = @splat.perform(environment) if @splat
         if fn = environment.function(@name)
           keywords = Sass::Util.map_hash(@keywords) {|k, v| [k, v.perform(environment)]}
-          return perform_sass_fn(fn, args, keywords, splat)
+          return without_original(perform_sass_fn(fn, args, keywords, splat))
         end
 
         ruby_name = @name.tr('-', '_')
         args = construct_ruby_args(ruby_name, args, splat, environment)
 
         unless Functions.callable?(ruby_name)
-          opts(to_literal(args))
+          without_original(opts(to_literal(args)))
         else
-          opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
+          without_original(opts(Functions::EvaluationContext.new(environment.options).
+              send(ruby_name, *args)))
         end
       rescue ArgumentError => e
         message = e.message
@@ -170,6 +171,13 @@ module Sass
 
       private
 
+      def without_original(value)
+        return value unless value.is_a?(Number)
+        value = value.dup
+        value.original = nil
+        return value
+      end
+
       def construct_ruby_args(name, args, splat, environment)
         args += splat.to_a if splat
 

data/lib/sass/scss/parser.rb

@@ -324,6 +324,7 @@ module Sass
         return unless (str = tok(STRING)) || (uri = tok?(/url\(/i))
         if uri
           str = sass_script(:parse_string)
+          ss
           media = media_query_list
           ss
           return node(Tree::CssImportNode.new(str, media.to_a))

data/test/sass/css2sass_test.rb

@@ -265,6 +265,25 @@ CSS
 
   # Regressions
 
+  def test_empty_rule
+    assert_equal(<<SASS, css2sass(<<CSS))
+a
+SASS
+a {}
+CSS
+  end
+
+  def test_empty_rule_with_selector_combinator
+    assert_equal(<<SASS, css2sass(<<CSS))
+a
+  color: red
+  > b
+SASS
+a {color: red}
+a > b {}
+CSS
+  end
+
   def test_nesting_within_media
     assert_equal(<<SASS, css2sass(<<CSS))
 @media all

data/test/sass/script_test.rb

@@ -510,6 +510,30 @@ SASS
 
   # Regression Tests
 
+  def test_user_defined_function_forces_division
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 10px; }
+CSS
+@function foo()
+  @return 20px
+
+a
+  b: (foo() / 2)
+SASS
+
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 10px; }
+CSS
+@function foo()
+  @return 20px
+
+a
+  b: foo() / 2
+SASS
+end
+
   def test_funcall_has_higher_precedence_than_color_name
     assert_equal "teal(12)", resolve("teal(12)")
     assert_equal "tealbang(12)", resolve("tealbang(12)")

data/test/sass/scss/css_test.rb

@@ -505,13 +505,20 @@ SCSS
     assert_parses '@import url(foo.css);'
   end
 
-  def test_import_directive_with_media
+  def test_string_import_directive_with_media
     assert_parses '@import "foo.css" screen;'
     assert_parses '@import "foo.css" screen, print;'
     assert_parses '@import "foo.css" screen, print and (foo: 0);'
     assert_parses '@import "foo.css" screen, only print, screen and (foo: 0);'
   end
 
+  def test_url_import_directive_with_media
+    assert_parses '@import url("foo.css") screen;'
+    assert_parses '@import url("foo.css") screen, print;'
+    assert_parses '@import url("foo.css") screen, print and (foo: 0);'
+    assert_parses '@import url("foo.css") screen, only print, screen and (foo: 0);'
+  end
+
   def test_page_directive
     assert_parses <<SCSS
 @page {

data/test/sass/scss/scss_test.rb

@@ -270,6 +270,20 @@ SCSS
     assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
   end
 
+  def test_css_string_import_directive_with_media
+    assert_parses '@import "foo.css" screen;'
+    assert_parses '@import "foo.css" screen, print;'
+    assert_parses '@import "foo.css" screen, print and (foo: 0);'
+    assert_parses '@import "foo.css" screen, only print, screen and (foo: 0);'
+  end
+
+  def test_css_url_import_directive_with_media
+    assert_parses '@import url("foo.css") screen;'
+    assert_parses '@import url("foo.css") screen, print;'
+    assert_parses '@import url("foo.css") screen, print and (foo: 0);'
+    assert_parses '@import url("foo.css") screen, only print, screen and (foo: 0);'
+  end
+
   def test_media_import
     assert_equal("@import \"./fonts.sass\" all;\n", render("@import \"./fonts.sass\" all;"))
   end

metadata

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