oreorenasass 3.4.4 → 3.4.5

data/test/sass/importer_test.rb

@@ -1,57 +1,36 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
-require 'mock_importer'
-require 'sass/plugin'
 
-class ImporterTest < MiniTest::Test
+require 'sass/plugin'
 
+class ImporterTest < Test::Unit::TestCase
+  
   class FruitImporter < Sass::Importers::Base
     def find(name, context = nil)
-      fruit = parse(name)
-      return unless fruit
-      color = case fruit
-      when "apple"
-        "red"
-      when "orange"
-        "orange"
-      else
-        "blue"
-      end
-      contents = %Q{
-        $#{fruit}-color: #{color} !default;
-        @mixin #{fruit} {
-          color: $#{fruit}-color;
+      if name =~ %r{fruits/(\w+)(\.s[ac]ss)?}
+        fruit = $1
+        color = case $1
+        when "apple"
+          "red"
+        when "orange"
+          "orange"
+        else
+          "blue"
+        end
+        contents = %Q{
+          $#{fruit}-color: #{color} !default;
+          @mixin #{fruit} {
+            color: $#{fruit}-color;
+          }
         }
-      }
-      Sass::Engine.new(contents, :filename => name, :syntax => :scss, :importer => self)
+        Sass::Engine.new(contents, :filename => name, :syntax => :scss, :importer => self)
+      end
     end
 
     def key(name, context)
       [self.class.name, name]
     end
-
-    def public_url(name, sourcemap_directory = nil)
-      "http://#{parse(name)}.example.com/style.scss"
-    end
-
-    private
-
-    def parse(name)
-      name[%r{fruits/(\w+)(\.s[ac]ss)?}, 1]
-    end
-  end
-
-  class NoPublicUrlImporter < FruitImporter
-    def public_url(name, sourcemap_directory = nil)
-      nil
-    end
-
-    private
-
-    def parse(name)
-      name[%r{ephemeral/(\w+)(\.s[ac]ss)?}, 1]
-    end
   end
 
   # This class proves that you can override the extension scheme for importers
@@ -198,205 +177,6 @@ CSS
     )
   end
 
-  def test_source_map_with_only_css_uri_supports_public_url_imports
-    fruit_importer = FruitImporter.new
-
-    options = {
-      :filename => 'fruits/orange',
-      :importer => fruit_importer,
-      :syntax => :scss
-    }
-
-    engine = Sass::Engine.new(<<SCSS, options)
-.orchard {
-  color: blue;
-}
-SCSS
-
-    _, sourcemap = engine.render_with_sourcemap('sourcemap_uri')
-    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri')
-{
-"version": 3,
-"mappings": "AAAA,QAAS;EACP,KAAK,EAAE,IAAI",
-"sources": ["http://orange.example.com/style.scss"],
-"names": [],
-"file": "css_uri"
-}
-JSON
-  end
-
-  def test_source_map_with_only_css_uri_can_have_no_public_url
-    ephemeral_importer = NoPublicUrlImporter.new
-    mock_importer = MockImporter.new
-    def mock_importer.public_url(name, sourcemap_directory = nil)
-      "source_uri"
-    end
-
-    options = {
-      :filename => filename_for_test,
-      :sourcemap_filename => sourcemap_filename_for_test,
-      :importer => mock_importer,
-      :syntax => :scss,
-      :load_paths => [ephemeral_importer],
-      :cache => false
-    }
-
-    engine = Sass::Engine.new(<<SCSS, options)
-@import "ephemeral/orange";
-.orange {
-  @include orange;
-}
-SCSS
-
-    css_output, sourcemap = engine.render_with_sourcemap('sourcemap_uri')
-    assert_equal <<CSS.strip, css_output.strip
-.orange {
-  color: orange; }
-
-/*# sourceMappingURL=sourcemap_uri */
-CSS
-    map = sourcemap.to_json(:css_uri => 'css_uri')
-    assert_equal <<JSON.strip, map
-{
-"version": 3,
-"mappings": "AACA,OAAQ",
-"sources": ["source_uri"],
-"names": [],
-"file": "css_uri"
-}
-JSON
-  end
-
-  def test_source_map_with_only_css_uri_falls_back_to_file_uris
-    file_system_importer = Sass::Importers::Filesystem.new('.')
-    options = {
-      :filename => filename_for_test(:scss),
-      :sourcemap_filename => sourcemap_filename_for_test,
-      :importer => file_system_importer,
-      :syntax => :scss
-    }
-
-    engine = Sass::Engine.new(<<SCSS, options)
-.foo {a: b}
-SCSS
-
-    _, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
-
-    uri = Sass::Util.file_uri_from_path(Sass::Util.absolute_path(filename_for_test(:scss)))
-    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri')
-{
-"version": 3,
-"mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
-"sources": ["#{uri}"],
-"names": [],
-"file": "css_uri"
-}
-JSON
-  end
-
-  def test_source_map_with_css_uri_and_css_path_falls_back_to_file_uris
-    file_system_importer = Sass::Importers::Filesystem.new('.')
-    options = {
-      :filename => filename_for_test(:scss),
-      :sourcemap_filename => sourcemap_filename_for_test,
-      :importer => file_system_importer,
-      :syntax => :scss
-    }
-
-    engine = Sass::Engine.new(<<SCSS, options)
-.foo {a: b}
-SCSS
-
-    _, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
-
-    uri = Sass::Util.file_uri_from_path(Sass::Util.absolute_path(filename_for_test(:scss)))
-    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')
-{
-"version": 3,
-"mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
-"sources": ["#{uri}"],
-"names": [],
-"file": "css_uri"
-}
-JSON
-  end
-
-  def test_source_map_with_css_uri_and_sourcemap_path_supports_filesystem_importer
-    file_system_importer = Sass::Importers::Filesystem.new('.')
-    css_uri = 'css_uri'
-    sourcemap_path = 'map/style.map'
-    options = {
-      :filename => 'sass/style.scss',
-      :sourcemap_filename => sourcemap_path,
-      :importer => file_system_importer,
-      :syntax => :scss
-    }
-
-    engine = Sass::Engine.new(<<SCSS, options)
-.foo {a: b}
-SCSS
-
-    rendered, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
-
-
-    rendered, sourcemap = engine.render_with_sourcemap('http://map.example.com/map/style.map')
-    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => css_uri, :sourcemap_path => sourcemap_path)
-{
-"version": 3,
-"mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
-"sources": ["../sass/style.scss"],
-"names": [],
-"file": "css_uri"
-}
-JSON
-  end
-
-  def test_source_map_with_css_path_and_sourcemap_path_supports_file_system_importer
-    file_system_importer = Sass::Importers::Filesystem.new('.')
-    sass_path = 'sass/style.scss'
-    css_path = 'static/style.css'
-    sourcemap_path = 'map/style.map'
-    options = {
-      :filename => sass_path,
-      :sourcemap_filename => sourcemap_path,
-      :importer => file_system_importer,
-      :syntax => :scss
-    }
-
-    engine = Sass::Engine.new(<<SCSS, options)
-.foo {a: b}
-SCSS
-
-    _, sourcemap = engine.render_with_sourcemap('http://map.example.com/map/style.map')
-    assert_equal <<JSON.strip, sourcemap.to_json(:css_path => css_path, :sourcemap_path => sourcemap_path)
-{
-"version": 3,
-"mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
-"sources": ["../sass/style.scss"],
-"names": [],
-"file": "../static/style.css"
-}
-JSON
-  end
-
-  def test_render_with_sourcemap_requires_filename
-    file_system_importer = Sass::Importers::Filesystem.new('.')
-    engine = Sass::Engine.new(".foo {a: b}", :syntax => :scss, :importer => file_system_importer)
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {engine.render_with_sourcemap('sourcemap_url')}
-Error generating source map: couldn't determine public URL for the source stylesheet.
-  No filename is available so there's nothing for the source map to link to.
-MESSAGE
-  end
-
-  def test_render_with_sourcemap_requires_importer_with_public_url
-    class_importer = ClassImporter.new({"pear" => "color: green;"}, {"pear" => Time.now})
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {class_importer.find("pear", {}).render_with_sourcemap('sourcemap_url')}
-Error generating source map: couldn't determine public URL for "pear".
-  Without a public URL, there's nothing for the source map to link to.
-  Custom importers should define the #public_url method.
-MESSAGE
-  end
-
   def fixture_dir
     File.join(File.dirname(__FILE__), "fixtures")
   end
@@ -407,6 +187,6 @@ MESSAGE
 
   def test_absolute_files_across_template_locations
     importer = Sass::Importers::Filesystem.new(absolutize 'templates')
-    refute_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
+    assert_not_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
   end
 end

data/test/sass/logger_test.rb

@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 
-class LoggerTest < MiniTest::Test
+class LoggerTest < Test::Unit::TestCase
 
   class InterceptedLogger < Sass::Logger::Base
 

data/test/sass/more_results/more_import.css

@@ -24,6 +24,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/plugin_test.rb

@@ -7,17 +7,17 @@ require 'fileutils'
 module Sass::Script::Functions
   def filename
     filename = options[:filename].gsub(%r{.*((/[^/]+){4})}, '\1')
-    Sass::Script::Value::String.new(filename)
+    Sass::Script::String.new(filename)
   end
 
   def whatever
     custom = options[:custom]
     whatever = custom && custom[:whatever]
-    Sass::Script::Value::String.new(whatever || "incorrect")
+    Sass::Script::String.new(whatever || "incorrect")
   end
 end
 
-class SassPluginTest < MiniTest::Test
+class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{
     complex script parent_ref import scss_import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
@@ -113,7 +113,7 @@ class SassPluginTest < MiniTest::Test
     File.open(tempfile_loc('bork1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
-Error: Undefined variable: "$bork".
+Syntax error: Undefined variable: "$bork".
         on line 2 of #{template_loc('bork1')}
 
 1: bork
@@ -129,7 +129,7 @@ CSS
     File.open(tempfile_loc('bork5')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...7].join("\n"))
 /*
-Error: Undefined variable: "$bork".
+Syntax error: Undefined variable: "$bork".
         on line 3 of #{template_loc('bork5')}
 
 1: bork
@@ -146,7 +146,7 @@ CSS
     File.open(tempfile_loc('single_import_loop')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
 /*
-Error: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
+Syntax error: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
 CSS
     end
   end
@@ -157,9 +157,9 @@ CSS
     File.open(tempfile_loc('double_import_loop1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
 /*
-Error: An @import loop has been found:
-           #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
-           #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
+Syntax error: An @import loop has been found:
+                  #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
+                  #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
 CSS
     end
   end
@@ -170,8 +170,8 @@ CSS
     File.open(tempfile_loc('subdir/import_up1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...5].join("\n"))
 /*
-Error: File to import not found or unreadable: ../subdir/import_up3.scss.
-       Load path: #{template_loc}
+Syntax error: File to import not found or unreadable: ../subdir/import_up3.scss.
+              Load path: #{template_loc}
         on line 1 of #{template_loc 'subdir/import_up2'}
         from line 1 of #{template_loc 'subdir/import_up1'}
 CSS
@@ -183,7 +183,7 @@ CSS
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork1'))
-    assert_raises(Sass::SyntaxError) {check_for_updates!}
+    assert_raise(Sass::SyntaxError) {check_for_updates!}
   ensure
     Sass::Plugin.options[:full_exception] = old_full_exception
   end
@@ -209,7 +209,7 @@ CSS
   end
 
   def test_doesnt_render_partials
-    assert !File.exist?(tempfile_loc('_partial'))
+    assert !File.exists?(tempfile_loc('_partial'))
   end
 
   def test_template_location_array
@@ -261,6 +261,17 @@ WARNING
 
   # Callbacks
 
+  def test_updating_stylesheets_callback
+    # Should run even when there's nothing to update
+    Sass::Plugin.options[:template_location] = nil
+    assert_callback :updating_stylesheets, []
+  end
+
+  def test_updating_stylesheets_callback_with_never_update
+    Sass::Plugin.options[:never_update] = true
+    assert_no_callback :updating_stylesheets
+  end
+
   def test_updated_stylesheet_callback_for_updated_template
     Sass::Plugin.options[:always_update] = false
     touch 'basic'
@@ -507,7 +518,7 @@ WARNING
   def template_loc(name = nil, prefix = nil)
     if name
       scss = absolutize "#{prefix}templates/#{name}.scss"
-      File.exist?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
+      File.exists?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
     else
       absolutize "#{prefix}templates"
     end
@@ -537,8 +548,7 @@ WARNING
       :always_update => true,
       :never_update => false,
       :full_exception => true,
-      :cache_store => @@cache_store,
-      :sourcemap => :none
+      :cache_store => @@cache_store
     )
     Sass::Plugin.options.merge!(overrides)
   end

data/test/sass/results/compact.css

@@ -1,4 +1,4 @@
-#main { width: 15em; color: #0000ff; }
+#main { width: 15em; color: blue; }
 #main p { border-style: dotted; /* Nested comment More nested stuff */ border-width: 2px; }
 #main .cool { width: 100px; }
 

data/test/sass/results/complex.css

@@ -1,4 +1,4 @@
-body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: #fff; background: url(/images/global_bg.gif); }
+body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: white; background: url(/images/global_bg.gif); }
 
 #page { width: 900px; margin: 0 auto; background: #440008; border-top-width: 5px; border-top-style: solid; border-top-color: #ff8500; }
 
@@ -16,8 +16,8 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 #menu { clear: both; text-align: right; height: 20px; border-bottom: 5px solid #006b95; background: #00a4e4; }
 #menu .contests ul { margin: 0 5px 0 0; padding: 0; }
-#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: #fff; background: #00a4e4; }
-#menu .contests a:link, #menu .contests a:visited { color: #fff; text-decoration: none; font-weight: bold; }
+#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: white; background: #00a4e4; }
+#menu .contests a:link, #menu .contests a:visited { color: white; text-decoration: none; font-weight: bold; }
 #menu .contests a:hover { text-decoration: underline; }
 
 #content { clear: both; }
@@ -81,6 +81,6 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 img { border: none; }
 
-button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: #fff; border: none; background: url(/images/btn_short.gif) no-repeat; }
+button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: white; border: none; background: url(/images/btn_short.gif) no-repeat; }
 
 table { border-collapse: collapse; }