oreorenasass 3.4.4 → 3.4.5

data/lib/sass/util/multibyte_string_scanner.rb

@@ -1,9 +1,7 @@
 require 'strscan'
 
 if Sass::Util.ruby1_8?
-  # rubocop:disable ConstantName
   Sass::Util::MultibyteStringScanner = StringScanner
-  # rubocop:enable ConstantName
 else
   if Sass::Util.rbx?
     # Rubinius's StringScanner class implements some of its methods in terms of

data/lib/sass/util/subset_map.rb

@@ -59,7 +59,7 @@ module Sass
       #
       # In the worst case, this runs in `O(m*max(n, log m))` time,
       # where `n` is the size of `set`
-      # and `m` is the number of associations in the map.
+      # and `m` is the number of assocations in the map.
       # However, unless many keys in the map overlap with `set`,
       # `m` will typically be much smaller.
       #
@@ -72,8 +72,7 @@ module Sass
       # @see #[]
       def get(set)
         res = set.map do |k|
-          subsets = @hash[k]
-          next unless subsets
+          next unless subsets = @hash[k]
           subsets.map do |subenum, subset, index|
             next unless subset.subset?(set)
             [index, subenum]
@@ -84,7 +83,7 @@ module Sass
         res.uniq!
         res.sort!
         res.map! {|i, s| [@vals[i], s]}
-        res
+        return res
       end
 
       # Same as \{#get}, but doesn't return the subsets of the argument

data/lib/sass/util/test.rb

@@ -3,6 +3,7 @@ module Sass
     module Test
       def skip(msg = nil, bt = caller)
         super if defined?(super)
+        return
       end
     end
   end

data/lib/sass/version.rb

@@ -1,4 +1,8 @@
 require 'date'
+
+# This is necessary for loading Sass when Haml is required in Rails 3.
+# Once the split is complete, we can remove it.
+require File.dirname(__FILE__) + '/../sass'
 require 'sass/util'
 
 module Sass
@@ -7,13 +11,14 @@ module Sass
   # but its Git revision hash as well,
   # if it was installed from Git.
   module Version
+    include Sass::Util
+
     # Returns a hash representing the version of Sass.
     # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Fixnums.
     # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
     # The `:number` key is the major, minor, and teeny keys separated by periods.
-    # The `:date` key, which is not guaranteed to be defined, is the `DateTime`
-    #   at which this release was cut.
+    # The `:date` key, which is not guaranteed to be defined, is the [DateTime] at which this release was cut.
     # If Sass is checked out from Git, the `:rev` key will have the revision hash.
     # For example:
     #
@@ -42,14 +47,12 @@ module Sass
     #     }
     #
     # @return [{Symbol => String/Fixnum}] The version hash
-    # @comment
-    #   rubocop:disable ClassVars
     def version
       return @@version if defined?(@@version)
 
-      numbers = File.read(Sass::Util.scope('VERSION')).strip.split('.').
+      numbers = File.read(scope('VERSION')).strip.split('.').
         map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
-      name = File.read(Sass::Util.scope('VERSION_NAME')).strip
+      name = File.read(scope('VERSION_NAME')).strip
       @@version = {
         :major => numbers[0],
         :minor => numbers[1],
@@ -57,7 +60,7 @@ module Sass
         :name => name
       }
 
-      if (date = version_date)
+      if date = version_date
         @@version[:date] = date
       end
 
@@ -70,7 +73,7 @@ module Sass
       @@version[:number] = numbers.join('.')
       @@version[:string] = @@version[:number].dup
 
-      if (rev = revision_number)
+      if rev = revision_number
         @@version[:rev] = rev
         unless rev[0] == ?(
           @@version[:string] << "." << rev[0...7]
@@ -80,25 +83,24 @@ module Sass
       @@version[:string] << " (#{name})"
       @@version
     end
-    # rubocop:enable ClassVars
 
     private
 
     def revision_number
-      if File.exist?(Sass::Util.scope('REVISION'))
-        rev = File.read(Sass::Util.scope('REVISION')).strip
+      if File.exists?(scope('REVISION'))
+        rev = File.read(scope('REVISION')).strip
         return rev unless rev =~ /^([a-f0-9]+|\(.*\))$/ || rev == '(unknown)'
       end
 
-      return unless File.exist?(Sass::Util.scope('.git/HEAD'))
-      rev = File.read(Sass::Util.scope('.git/HEAD')).strip
+      return unless File.exists?(scope('.git/HEAD'))
+      rev = File.read(scope('.git/HEAD')).strip
       return rev unless rev =~ /^ref: (.*)$/
 
       ref_name = $1
-      ref_file = Sass::Util.scope(".git/#{ref_name}")
-      info_file = Sass::Util.scope(".git/info/refs")
-      return File.read(ref_file).strip if File.exist?(ref_file)
-      return unless File.exist?(info_file)
+      ref_file = scope(".git/#{ref_name}")
+      info_file = scope(".git/info/refs")
+      return File.read(ref_file).strip if File.exists?(ref_file)
+      return unless File.exists?(info_file)
       File.open(info_file) do |f|
         f.each do |l|
           sha, ref = l.strip.split("\t", 2)
@@ -106,12 +108,12 @@ module Sass
           return sha
         end
       end
-      nil
+      return nil
     end
 
     def version_date
-      return unless File.exist?(Sass::Util.scope('VERSION_DATE'))
-      DateTime.parse(File.read(Sass::Util.scope('VERSION_DATE')).strip)
+      return unless File.exists?(scope('VERSION_DATE'))
+      return DateTime.parse(File.read(scope('VERSION_DATE')).strip)
     end
   end
 

data/test/Gemfile

@@ -0,0 +1,3 @@
+source :gemcutter
+
+gem 'rake'

data/test/Gemfile.lock

@@ -0,0 +1,10 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.9.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake

data/test/sass/cache_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 
-class CacheTest < MiniTest::Test
+class CacheTest < Test::Unit::TestCase
   @@cache_dir = "tmp/file_cache"
 
   def setup
@@ -18,42 +18,42 @@ class CacheTest < MiniTest::Test
   def test_file_cache_writes_a_file
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_file_cache_reads_a_file
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     assert_kind_of Sass::Tree::RootNode, file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_file_cache_miss_returns_nil
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_sha_change_invalidates_cache_and_cleans_up
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "differentsha1")
-    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_version_change_invalidates_cache_and_cleans_up
     file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
-    assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
-    assert File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+    assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     real_version = Sass::VERSION
     begin
       Sass::VERSION.replace("a different version")
       assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
-      assert !File.exist?("#{@@cache_dir}/asdf/foo.scssc")
+      assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     ensure
       Sass::VERSION.replace(real_version)
     end
@@ -66,52 +66,17 @@ class CacheTest < MiniTest::Test
     assert_equal an_object, cache.retrieve("an_object", "")
   end
 
-  def test_cache_node_with_unmarshalable_option
-    engine_with_unmarshalable_options("foo {a: b + c}").to_tree
-  end
-
-  # Regression tests
-
-  def test_cache_mixin_def_splat_sass_node_with_unmarshalable_option
-    engine_with_unmarshalable_options(<<SASS, :syntax => :sass).to_tree
-=color($args...)
-  color: red
-SASS
-  end
-
-  def test_cache_mixin_def_splat_scss_node_with_unmarshalable_option
-    engine_with_unmarshalable_options(<<SCSS, :syntax => :scss).to_tree
-@mixin color($args...) {
-  color: red;
-}
-SCSS
-  end
-
-  def test_cache_function_splat_sass_node_with_unmarshalable_option
-    engine_with_unmarshalable_options(<<SASS, :syntax => :sass).to_tree
-@function color($args...)
-  @return red
-SASS
-  end
-
-  def test_cache_function_splat_scss_node_with_unmarshalable_option
-    engine_with_unmarshalable_options(<<SCSS, :syntax => :scss).to_tree
-@function color($args...) {
-  @return red;
-}
-SCSS
-  end
-
-  def test_cache_include_splat_sass_node_with_unmarshalable_option
-    engine_with_unmarshalable_options(<<SASS, :syntax => :sass).to_tree
-@include color($args..., $kwargs...)
-SASS
+  class Unmarshalable
+    def _dump(_)
+      raise 'Unmarshalable'
+    end
   end
 
-  def test_cache_include_splat_scss_node_with_unmarshalable_option
-    engine_with_unmarshalable_options(<<SCSS, :syntax => :scss).to_tree
-@include color($args..., $kwargs...);
-SCSS
+  def test_cache_node_with_unmarshalable_option
+    engine = Sass::Engine.new("foo {a: b + c}",
+      :syntax => :scss, :object => Unmarshalable.new, :filename => 'file.scss',
+      :importer => Sass::Importers::Filesystem.new(absolutize('templates')))
+    engine.to_tree
   end
 
   private
@@ -121,11 +86,4 @@ SCSS
       div { @include color(red); }
     SCSS
   end
-
-  def engine_with_unmarshalable_options(src, options={})
-    Sass::Engine.new(src, {
-      :syntax => :scss, :object => Class.new.new, :filename => 'file.scss',
-      :importer => Sass::Importers::Filesystem.new(absolutize('templates'))
-    }.merge(options))
-  end
 end

data/test/sass/callbacks_test.rb

@@ -26,7 +26,7 @@ module ClassLevelCallerBack
   end
 end
 
-class SassCallbacksTest < MiniTest::Test
+class SassCallbacksTest < Test::Unit::TestCase
   def test_simple_callback
     cb = CallerBack.new
     there = false

data/test/sass/conversion_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ConversionTest < MiniTest::Test
+class ConversionTest < Test::Unit::TestCase
   def test_basic
     assert_renders <<SASS, <<SCSS
 foo bar
@@ -499,29 +499,6 @@ foo
 SASS
   end
 
-  def test_loud_comment_containing_silent_comment
-    assert_scss_to_sass <<SASS, <<SCSS
-/*
- *// foo bar
-SASS
-/*
-// foo bar
-*/
-SCSS
-  end
-
-  def test_silent_comment_containing_loud_comment
-    assert_scss_to_sass <<SASS, <<SCSS
-// /*
-//  * foo bar
-//  */
-SASS
-// /*
-//  * foo bar
-//  */
-SCSS
-  end
-
   def test_immediately_preceding_comments
     assert_renders <<SASS, <<SCSS
 /* Foo
@@ -554,28 +531,6 @@ SASS
 SCSS
   end
 
-  def test_immediately_following_comments
-    assert_sass_to_scss <<SCSS, <<SASS
-.foobar {
-  // trailing comment
-  a: 1px;
-}
-SCSS
-.foobar // trailing comment
-  a: 1px
-SASS
-
-    assert_sass_to_scss <<SCSS, <<SASS
-.foobar {
-  // trailing comment
-  a: 1px;
-}
-SCSS
-.foobar  /* trailing comment */
-  a: 1px
-SASS
-  end
-
   def test_debug
     assert_renders <<SASS, <<SCSS
 foo
@@ -589,19 +544,6 @@ foo {
 SCSS
   end
 
-  def test_error
-    assert_renders <<SASS, <<SCSS
-foo
-  @error "oh no!"
-  bar: baz
-SASS
-foo {
-  @error "oh no!";
-  bar: baz;
-}
-SCSS
-  end
-
   def test_directive_without_children
     assert_renders <<SASS, <<SCSS
 foo
@@ -783,10 +725,6 @@ a
 c
   @each $str in foo, bar, baz, bang
     d: $str
-
-c
-  @each $key, $value in (foo: 1, bar: 2, baz: 3)
-    \#{$key}: $value
 SASS
 a {
   @each $number in 1px 2px 3px 4px {
@@ -799,12 +737,6 @@ c {
     d: $str;
   }
 }
-
-c {
-  @each $key, $value in (foo: 1, bar: 2, baz: 3) {
-    \#{$key}: $value;
-  }
-}
 SCSS
   end
 
@@ -1045,19 +977,6 @@ foo {
 SCSS
   end
 
-  def test_mixin_include_with_hyphen_conversion_keyword_arg
-    assert_renders <<SASS, <<SCSS
-foo
-  +foo-bar($a-b_c: val)
-  a: blip
-SASS
-foo {
-  @include foo-bar($a-b_c: val);
-  a: blip;
-}
-SCSS
-  end
-
   def test_argless_function_definition
     assert_renders <<SASS, <<SCSS
 @function foo()
@@ -1280,17 +1199,6 @@ $val: 20;
 SCSS
   end
 
-  def test_media_with_feature
-    assert_sass_to_scss <<SCSS, <<SASS
-@media screen and (-webkit-transform-3d) {
-  a: b;
-}
-SCSS
-@media screen and (-webkit-transform-3d)
-  a: b
-SASS
-  end
-
   def test_supports_with_expressions
     assert_renders <<SASS, <<SCSS
 $query: "(feature1: val)"
@@ -1439,7 +1347,7 @@ div
 SASS
   end
 
-  def test_loud_comment_conversion
+   def test_loud_comment_conversion
     assert_renders(<<SASS, <<SCSS)
 /*! \#{"interpolated"}
 SASS
@@ -1681,28 +1589,6 @@ SASS
 SCSS
   end
 
-  def test_mixin_var_kwargs
-    assert_scss_to_sass <<SASS, <<SCSS
-=foo($a: b, $c: d)
-  a: $a
-  c: $c
-
-.foo
-  +foo($list..., $map...)
-  +foo(pos, $list..., $kwd: val, $map...)
-SASS
-@mixin foo($a: b, $c: d) {
-  a: $a;
-  c: $c;
-}
-
-.foo {
-  @include foo($list..., $map...);
-  @include foo(pos, $list..., $kwd: val, $map...);
-}
-SCSS
-  end
-
   def test_function_var_args
     assert_scss_to_sass <<SASS, <<SCSS
 @function foo($args...)
@@ -1730,141 +1616,6 @@ SASS
 SCSS
   end
 
-  def test_function_var_kwargs
-    assert_scss_to_sass <<SASS, <<SCSS
-@function foo($a: b, $c: d)
-  @return foo
-
-.foo
-  a: foo($list..., $map...)
-  b: foo(pos, $list..., $kwd: val, $map...)
-SASS
-@function foo($a: b, $c: d) {
-  @return foo;
-}
-
-.foo {
-  a: foo($list..., $map...);
-  b: foo(pos, $list..., $kwd: val, $map...);
-}
-SCSS
-  end
-
-  def test_at_root
-    assert_scss_to_sass <<SASS, <<SCSS
-.foo
-  @at-root
-    .bar
-      a: b
-    .baz
-      c: d
-SASS
-.foo {
-  @at-root {
-    .bar {
-      a: b;
-    }
-    .baz {
-      c: d;
-    }
-  }
-}
-SCSS
-  end
-
-  def test_at_root_with_selector
-    assert_scss_to_sass <<SASS, <<SCSS
-.foo
-  @at-root .bar
-    a: b
-SASS
-.foo {
-  @at-root .bar {
-    a: b;
-  }
-}
-SCSS
-  end
-
-  def test_at_root_without
-    assert_scss_to_sass <<SASS, <<SCSS
-.foo
-  @at-root (without: media rule)
-    a: b
-SASS
-.foo {
-  @at-root (without: media rule) {
-    a: b;
-  }
-}
-SCSS
-  end
-
-  def test_at_root_with
-    assert_scss_to_sass <<SASS, <<SCSS
-.foo
-  @at-root (with: media rule)
-    a: b
-SASS
-.foo {
-  @at-root (with: media rule) {
-    a: b;
-  }
-}
-SCSS
-  end
-
-  def test_function_var_kwargs_with_list
-    assert_scss_to_sass <<SASS, <<SCSS
-@function foo($a: b, $c: d)
-  @return $a, $c
-
-.foo
-  a: foo($list..., $map...)
-SASS
-@function foo($a: b, $c: d) {
-  @return $a, $c;
-}
-
-.foo {
-  a: foo($list..., $map...);
-}
-SCSS
-  end
-
-  def test_keyframes
-    assert_renders(<<SASS, <<SCSS)
-@keyframes identifier
-  0%
-    top: 0
-    left: 0
-  30%
-    top: 50px
-  68%, 72%
-    left: 50px
-  100%
-    top: 100px
-    left: 100%
-SASS
-@keyframes identifier {
-  0% {
-    top: 0;
-    left: 0;
-  }
-  30% {
-    top: 50px;
-  }
-  68%, 72% {
-    left: 50px;
-  }
-  100% {
-    top: 100px;
-    left: 100%;
-  }
-}
-SCSS
-  end
-
   ## Regression Tests
 
   def test_list_in_args
@@ -1941,34 +1692,6 @@ foo {
 SCSS
   end
 
-  def test_keyword_arguments
-    assert_renders(<<SASS, <<SCSS, :dasherize => true)
-$foo: foo($dash-ed: 2px)
-SASS
-$foo: foo($dash-ed: 2px);
-SCSS
-    assert_scss_to_sass(<<SASS, <<SCSS, :dasherize => true)
-$foo: foo($dash-ed: 2px)
-SASS
-$foo: foo($dash_ed: 2px);
-SCSS
-    assert_sass_to_scss(<<SCSS, <<SASS, :dasherize => true)
-$foo: foo($dash-ed: 2px);
-SCSS
-$foo: foo($dash_ed: 2px)
-SASS
-    assert_renders(<<SASS, <<SCSS)
-$foo: foo($under_scored: 1px)
-SASS
-$foo: foo($under_scored: 1px);
-SCSS
-    assert_renders(<<SASS, <<SCSS)
-$foo: foo($dash-ed: 2px, $under_scored: 1px)
-SASS
-$foo: foo($dash-ed: 2px, $under_scored: 1px);
-SCSS
-  end
-
   def test_ambiguous_negation
     assert_renders(<<SASS, <<SCSS, :indent => '    ')
 foo
@@ -1986,23 +1709,6 @@ foo {
 SCSS
   end
 
-  def test_variable_with_global
-    assert_renders(<<SASS, <<SCSS)
-$var: 1
-
-foo
-  $var: 2 !global
-  $var: 3 !global !default
-SASS
-$var: 1;
-
-foo {
-  $var: 2 !global;
-  $var: 3 !global !default;
-}
-SCSS
-  end
-
   private
 
   def assert_sass_to_sass(sass, options = {})