oreorenasass 3.4.4 → 3.4.5

data/test/sass/templates/scss_import.scss

@@ -3,8 +3,7 @@ $preconst: hello;
 @mixin premixin {pre-mixin: here}
 
 @import "importee.sass", "scss_importee", "basic.sass", "basic.css", "../results/complex.css";
-@import "part\
-ial.sass";
+@import "partial.sass";
 
 nonimported {
   myconst: $preconst;

data/test/sass/test_helper.rb

@@ -1,7 +1,7 @@
 test_dir = File.dirname(__FILE__)
 $:.unshift test_dir unless $:.include?(test_dir)
 
-class MiniTest::Test
+class Test::Unit::TestCase
   def absolutize(file)
     File.expand_path("#{File.dirname(__FILE__)}/#{file}")
   end

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
 unless Sass::Util.ruby1_8?
-  class MultibyteStringScannerTest < MiniTest::Test
+  class MultibyteStringScannerTest < Test::Unit::TestCase
     def setup
       @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
     end

data/test/sass/util/subset_map_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../test_helper'
 
-class SubsetMapTest < MiniTest::Test
+class SubsetMapTest < Test::Unit::TestCase
   def setup
     @ssm = Sass::Util::SubsetMap.new
     @ssm[Set[1, 2]] = "Foo"
@@ -44,7 +44,7 @@ class SubsetMapTest < MiniTest::Test
   end
 
   def test_empty_key_set
-    assert_raises(ArgumentError) {@ssm[Set[]] = "Fail"}
+    assert_raise(ArgumentError) {@ssm[Set[]] = "Fail"}
   end
 
   def test_empty_key_get

data/test/sass/util_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 require 'tmpdir'
 
-class UtilTest < MiniTest::Test
+class UtilTest < Test::Unit::TestCase
   include Sass::Util
 
   def test_scope
@@ -42,15 +42,6 @@ class UtilTest < MiniTest::Test
       }, map_hash({:foo => 1, :bar => 2, :baz => 3}) {|k, v| [k.to_s, v.to_s]})
   end
 
-  def test_map_hash_with_normalized_map
-    map = NormalizedMap.new("foo-bar" => 1, "baz_bang" => 2)
-    result = map_hash(map) {|k, v| [k, v.to_s]}
-    assert_equal("1", result["foo-bar"])
-    assert_equal("1", result["foo_bar"])
-    assert_equal("2", result["baz-bang"])
-    assert_equal("2", result["baz_bang"])
-  end
-
   def test_powerset
     return unless Set[Set[]] == Set[Set[]] # There's a bug in Ruby 1.8.6 that breaks nested set equality
     assert_equal([[].to_set].to_set,
@@ -79,15 +70,6 @@ class UtilTest < MiniTest::Test
       merge_adjacent_strings([str, " ", str, " ", str, :bang, str, " ", str, 12]))
   end
 
-  def test_replace_subseq
-    assert_equal([1, 2, :a, :b, 5],
-      replace_subseq([1, 2, 3, 4, 5], [3, 4], [:a, :b]))
-    assert_equal([1, 2, 3, 4, 5],
-      replace_subseq([1, 2, 3, 4, 5], [3, 4, 6], [:a, :b]))
-    assert_equal([1, 2, 3, 4, 5],
-      replace_subseq([1, 2, 3, 4, 5], [4, 5, 6], [:a, :b]))
-  end
-
   def test_intersperse
     assert_equal(["foo", " ", "bar", " ", "baz"],
       intersperse(%w[foo bar baz], " "))
@@ -220,13 +202,6 @@ class UtilTest < MiniTest::Test
     assert_equal([1, 2, 3, 4], flatten([[[1], 2], [3], 4], 2))
   end
 
-  def test_flatten_vertically
-    assert_equal([1, 2, 3], flatten_vertically([1, 2, 3]))
-    assert_equal([1, 3, 5, 2, 4, 6], flatten_vertically([[1, 2], [3, 4], [5, 6]]))
-    assert_equal([1, 2, 4, 3, 5, 6], flatten_vertically([1, [2, 3], [4, 5, 6]]))
-    assert_equal([1, 4, 6, 2, 5, 3], flatten_vertically([[1, 2, 3], [4, 5], 6]))
-  end
-
   def test_set_hash
     assert(set_hash(Set[1, 2, 3]) == set_hash(Set[3, 2, 1]))
     assert(set_hash(Set[1, 2, 3]) == set_hash(Set[1, 2, 3]))
@@ -329,15 +304,6 @@ class UtilTest < MiniTest::Test
     def foo
       Sass::Util.abstract(self)
     end
-    def old_method
-      Sass::Util.deprecated(self)
-    end
-    def old_method_with_custom_message
-      Sass::Util.deprecated(self, "Call FooBar#new_method instead.")
-    end
-    def self.another_old_method
-      Sass::Util.deprecated(self)
-    end
   end
 
   def test_abstract
@@ -345,57 +311,6 @@ class UtilTest < MiniTest::Test
       "UtilTest::FooBar must implement #foo") {FooBar.new.foo}
   end
 
-  def test_deprecated
-    assert_warning("DEPRECATION WARNING: UtilTest::FooBar#old_method will be removed in a future version of Sass.") { FooBar.new.old_method }
-    assert_warning(<<WARNING) { FooBar.new.old_method_with_custom_message }
-DEPRECATION WARNING: UtilTest::FooBar#old_method_with_custom_message will be removed in a future version of Sass.
-Call FooBar#new_method instead.
-WARNING
-    assert_warning("DEPRECATION WARNING: UtilTest::FooBar.another_old_method will be removed in a future version of Sass.") { FooBar.another_old_method }
-  end
-
-  def test_json_escape_string
-    assert_json_string "", ""
-    alphanum = (("0".."9").to_a).concat(("a".."z").to_a).concat(("A".."Z").to_a).join
-    assert_json_string alphanum, alphanum
-    assert_json_string "'\"\\'", "'\\\"\\\\'"
-    assert_json_string "\b\f\n\r\t", "\\b\\f\\n\\r\\t"
-  end
-
-  def assert_json_string(source, target)
-    assert_equal target, json_escape_string(source)
-  end
-
-  def test_json_value_of
-    assert_json_value 0, "0"
-    assert_json_value(-42, "-42")
-    assert_json_value 42, "42"
-    assert_json_value true, "true"
-    assert_json_value false, "false"
-    assert_json_value "", "\"\""
-    assert_json_value "\"\"", "\"\\\"\\\"\""
-    assert_json_value "Multi\nLine\rString", "\"Multi\\nLine\\rString\""
-    assert_json_value [1, "some\nstr,ing", false, nil], "[1,\"some\\nstr,ing\",false,null]"
-  end
-
-  def assert_json_value(source, target)
-    assert_equal target, json_value_of(source)
-  end
-
-  def test_vlq
-    assert_equal "A", encode_vlq(0)
-    assert_equal "e", encode_vlq(15)
-    assert_equal "gB", encode_vlq(16)
-    assert_equal "wH", encode_vlq(120)
-  end
-
-  def assert_vlq_encodes(int, vlq)
-    vlq_from_decimal_array = decimal_array.map {|d| encode_vlq(d)}.join
-    decimal_array_from_vlq = decode_vlq(vlq)
-    assert_equal vlq, vlq_from_decimal_array
-    assert_equal decimal_array, decimal_array_from_vlq
-  end
-
   def test_atomic_writes
     # when using normal writes, this test fails about 90% of the time.
     filename = File.join(Dir.tmpdir, "test_atomic")

data/test/test_helper.rb

@@ -1,50 +1,35 @@
 lib_dir = File.dirname(__FILE__) + '/../lib'
 
-require 'minitest/autorun'
+require 'test/unit'
 require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'sass'
 require 'mathn' if ENV['MATHN'] == 'true'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
-
-Sass.tests_running = true
-
-if defined?(Encoding)
-  $-w, w = false, $-w
-  Encoding.default_external = 'UTF-8'
-  $-w = w
-end
+Encoding.default_external = 'UTF-8' if defined?(Encoding)
 
 module Sass::Script::Functions
   def option(name)
-    Sass::Script::Value::String.new(@options[name.value.to_sym].to_s)
+    Sass::Script::String.new(@options[name.value.to_sym].to_s)
   end
 end
 
-class MiniTest::Test
+class Test::Unit::TestCase
   def munge_filename(opts = {})
-    opts[:filename] ||= filename_for_test(opts[:syntax] || :sass)
-    opts[:sourcemap_filename] ||= sourcemap_filename_for_test
-    opts
+    return if opts.has_key?(:filename)
+    opts[:filename] = filename_for_test(opts[:syntax] || :sass)
   end
 
-  def test_name
-    caller.
+  def filename_for_test(syntax = :sass)
+    test_name = caller.
       map {|c| Sass::Util.caller_info(c)[2]}.
       compact.
       map {|c| c.sub(/^(block|rescue) in /, '')}.
       find {|c| c =~ /^test_/}
-  end
-
-  def filename_for_test(syntax = :sass)
     "#{test_name}_inline.#{syntax}"
   end
 
-  def sourcemap_filename_for_test(syntax = :sass)
-    "#{test_name}_inline.css.map"
-  end
-
   def clean_up_sassc
     path = File.dirname(__FILE__) + "/../.sass-cache"
     FileUtils.rm_r(path) if File.exist?(path)
@@ -93,17 +78,3 @@ class MiniTest::Test
     flunk "Expected exception on line #{line}, none raised"
   end
 end
-
-module PublicApiLinter
-  def lint_api(api_class, duck_type_class)
-    define_method :test_lint_instance do
-      assert lint_instance.is_a?(duck_type_class)
-    end
-    api_class.instance_methods.each do |meth|
-      define_method :"test_has_#{meth}" do
-        assert lint_instance.respond_to?(meth),
-          "#{duck_type_class.name} does not implement #{meth}"
-      end
-    end
-  end
-end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: oreorenasass
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
-- Natalie Weizenbaum
+- Nathan Weizenbaum
 - Chris Eppstein
 - Hampton Catlin
 autorequire: 
@@ -40,20 +40,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.9
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description: |2
         Sass makes CSS fun again. Sass is an extension of CSS3, adding
         nested rules, variables, mixins, selector inheritance, and more.
@@ -92,10 +78,6 @@ files:
 - lib/sass/environment.rb
 - lib/sass/error.rb
 - lib/sass/exec.rb
-- lib/sass/exec/base.rb
-- lib/sass/exec/sass_convert.rb
-- lib/sass/exec/sass_scss.rb
-- lib/sass/features.rb
 - lib/sass/importers.rb
 - lib/sass/importers/base.rb
 - lib/sass/importers/filesystem.rb
@@ -115,34 +97,26 @@ files:
 - lib/sass/repl.rb
 - lib/sass/root.rb
 - lib/sass/script.rb
+- lib/sass/script/arg_list.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/color.rb
 - lib/sass/script/css_lexer.rb
 - lib/sass/script/css_parser.rb
+- lib/sass/script/funcall.rb
 - lib/sass/script/functions.rb
+- lib/sass/script/interpolation.rb
 - lib/sass/script/lexer.rb
+- lib/sass/script/list.rb
+- lib/sass/script/literal.rb
+- lib/sass/script/node.rb
+- lib/sass/script/null.rb
+- lib/sass/script/number.rb
+- lib/sass/script/operation.rb
 - lib/sass/script/parser.rb
-- lib/sass/script/tree.rb
-- lib/sass/script/tree/funcall.rb
-- lib/sass/script/tree/interpolation.rb
-- lib/sass/script/tree/list_literal.rb
-- lib/sass/script/tree/literal.rb
-- lib/sass/script/tree/map_literal.rb
-- lib/sass/script/tree/node.rb
-- lib/sass/script/tree/operation.rb
-- lib/sass/script/tree/selector.rb
-- lib/sass/script/tree/string_interpolation.rb
-- lib/sass/script/tree/unary_operation.rb
-- lib/sass/script/tree/variable.rb
-- lib/sass/script/value.rb
-- lib/sass/script/value/arg_list.rb
-- lib/sass/script/value/base.rb
-- lib/sass/script/value/bool.rb
-- lib/sass/script/value/color.rb
-- lib/sass/script/value/helpers.rb
-- lib/sass/script/value/list.rb
-- lib/sass/script/value/map.rb
-- lib/sass/script/value/null.rb
-- lib/sass/script/value/number.rb
-- lib/sass/script/value/string.rb
+- lib/sass/script/string.rb
+- lib/sass/script/string_interpolation.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/variable.rb
 - lib/sass/scss.rb
 - lib/sass/scss/css_parser.rb
 - lib/sass/scss/parser.rb
@@ -153,17 +127,11 @@ files:
 - lib/sass/selector.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
-- lib/sass/selector/pseudo.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/simple.rb
 - lib/sass/selector/simple_sequence.rb
 - lib/sass/shared.rb
-- lib/sass/source/map.rb
-- lib/sass/source/position.rb
-- lib/sass/source/range.rb
-- lib/sass/stack.rb
 - lib/sass/supports.rb
-- lib/sass/tree/at_root_node.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/content_node.rb
@@ -171,13 +139,11 @@ files:
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
 - lib/sass/tree/each_node.rb
-- lib/sass/tree/error_node.rb
 - lib/sass/tree/extend_node.rb
 - lib/sass/tree/for_node.rb
 - lib/sass/tree/function_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
-- lib/sass/tree/keyframe_rule_node.rb
 - lib/sass/tree/media_node.rb
 - lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/mixin_node.rb
@@ -201,21 +167,18 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/util.rb
-- lib/sass/util/cross_platform_random.rb
 - lib/sass/util/multibyte_string_scanner.rb
-- lib/sass/util/normalized_map.rb
-- lib/sass/util/ordered_hash.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/util/test.rb
 - lib/sass/version.rb
 - rails/init.rb
+- test/Gemfile
+- test/Gemfile.lock
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/compiler_test.rb
 - test/sass/conversion_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/data/hsl-rgb.txt
-- test/sass/encoding_test.rb
 - test/sass/engine_test.rb
 - test/sass/exec_test.rb
 - test/sass/extend_test.rb
@@ -266,8 +229,6 @@ files:
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
 - test/sass/scss/test_helper.rb
-- test/sass/source_map_test.rb
-- test/sass/superselector_test.rb
 - test/sass/templates/_cached_import_option_partial.scss
 - test/sass/templates/_double_import_loop2.sass
 - test/sass/templates/_filename_fn_import.scss
@@ -328,10 +289,8 @@ files:
 - test/sass/templates/warn_imported.sass
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb
-- test/sass/value_helpers_test.rb
 - test/test_helper.rb
 homepage: http://sass-lang.com/
 licenses:
@@ -358,13 +317,9 @@ signing_key:
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
-- test/sass/encoding_test.rb
 - test/sass/exec_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
-- test/sass/value_helpers_test.rb
-- test/sass/superselector_test.rb
 - test/sass/plugin_test.rb
 - test/sass/conversion_test.rb
 - test/sass/script_test.rb
@@ -380,7 +335,5 @@ test_files:
 - test/sass/logger_test.rb
 - test/sass/util_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/source_map_test.rb
 - test/sass/css2sass_test.rb
-- test/sass/compiler_test.rb
 has_rdoc: false

data/lib/sass/exec/base.rb

@@ -1,187 +0,0 @@
-require 'optparse'
-
-module Sass::Exec
-  # The abstract base class for Sass executables.
-  class Base
-    # @param args [Array<String>] The command-line arguments
-    def initialize(args)
-      @args = args
-      @options = {}
-    end
-
-    # Parses the command-line arguments and runs the executable.
-    # Calls `Kernel#exit` at the end, so it never returns.
-    #
-    # @see #parse
-    def parse!
-      # rubocop:disable RescueException
-      begin
-        parse
-      rescue Exception => e
-        raise e if @options[:trace] || e.is_a?(SystemExit)
-
-        $stderr.print "#{e.class}: " unless e.class == RuntimeError
-        $stderr.puts "#{e.message}"
-        $stderr.puts "  Use --trace for backtrace."
-        exit 1
-      end
-      exit 0
-      # rubocop:enable RescueException
-    end
-
-    # Parses the command-line arguments and runs the executable.
-    # This does not handle exceptions or exit the program.
-    #
-    # @see #parse!
-    def parse
-      @opts = OptionParser.new(&method(:set_opts))
-      @opts.parse!(@args)
-
-      process_result
-
-      @options
-    end
-
-    # @return [String] A description of the executable
-    def to_s
-      @opts.to_s
-    end
-
-    protected
-
-    # Finds the line of the source template
-    # on which an exception was raised.
-    #
-    # @param exception [Exception] The exception
-    # @return [String] The line number
-    def get_line(exception)
-      # SyntaxErrors have weird line reporting
-      # when there's trailing whitespace
-      if exception.is_a?(::SyntaxError)
-        return (exception.message.scan(/:(\d+)/).first || ["??"]).first
-      end
-      (exception.backtrace[0].scan(/:(\d+)/).first || ["??"]).first
-    end
-
-    # Tells optparse how to parse the arguments
-    # available for all executables.
-    #
-    # This is meant to be overridden by subclasses
-    # so they can add their own options.
-    #
-    # @param opts [OptionParser]
-    def set_opts(opts)
-      Sass::Util.abstract(this)
-    end
-
-    # Set an option for specifying `Encoding.default_external`.
-    #
-    # @param opts [OptionParser]
-    def encoding_option(opts)
-      encoding_desc = if Sass::Util.ruby1_8?
-                        'Does not work in Ruby 1.8.'
-                      else
-                        'Specify the default encoding for input files.'
-                      end
-      opts.on('-E', '--default-encoding ENCODING', encoding_desc) do |encoding|
-        if Sass::Util.ruby1_8?
-          $stderr.puts "Specifying the encoding is not supported in ruby 1.8."
-          exit 1
-        else
-          Encoding.default_external = encoding
-        end
-      end
-    end
-
-    # Processes the options set by the command-line arguments. In particular,
-    # sets `@options[:input]` and `@options[:output]` to appropriate IO streams.
-    #
-    # This is meant to be overridden by subclasses
-    # so they can run their respective programs.
-    def process_result
-      input, output = @options[:input], @options[:output]
-      args = @args.dup
-      input ||=
-        begin
-          filename = args.shift
-          @options[:filename] = filename
-          open_file(filename) || $stdin
-        end
-      @options[:output_filename] = args.shift
-      output ||= @options[:output_filename] || $stdout
-      @options[:input], @options[:output] = input, output
-    end
-
-    COLORS = {:red => 31, :green => 32, :yellow => 33}
-
-    # Prints a status message about performing the given action,
-    # colored using the given color (via terminal escapes) if possible.
-    #
-    # @param name [#to_s] A short name for the action being performed.
-    #   Shouldn't be longer than 11 characters.
-    # @param color [Symbol] The name of the color to use for this action.
-    #   Can be `:red`, `:green`, or `:yellow`.
-    def puts_action(name, color, arg)
-      return if @options[:for_engine][:quiet]
-      printf color(color, "%11s %s\n"), name, arg
-      STDOUT.flush
-    end
-
-    # Same as `Kernel.puts`, but doesn't print anything if the `--quiet` option is set.
-    #
-    # @param args [Array] Passed on to `Kernel.puts`
-    def puts(*args)
-      return if @options[:for_engine][:quiet]
-      Kernel.puts(*args)
-    end
-
-    # Wraps the given string in terminal escapes
-    # causing it to have the given color.
-    # If terminal esapes aren't supported on this platform,
-    # just returns the string instead.
-    #
-    # @param color [Symbol] The name of the color to use.
-    #   Can be `:red`, `:green`, or `:yellow`.
-    # @param str [String] The string to wrap in the given color.
-    # @return [String] The wrapped string.
-    def color(color, str)
-      raise "[BUG] Unrecognized color #{color}" unless COLORS[color]
-
-      # Almost any real Unix terminal will support color,
-      # so we just filter for Windows terms (which don't set TERM)
-      # and not-real terminals, which aren't ttys.
-      return str if ENV["TERM"].nil? || ENV["TERM"].empty? || !STDOUT.tty?
-      "\e[#{COLORS[color]}m#{str}\e[0m"
-    end
-
-    def write_output(text, destination)
-      if destination.is_a?(String)
-        open_file(destination, 'w') {|file| file.write(text)}
-      else
-        destination.write(text)
-      end
-    end
-
-    private
-
-    def open_file(filename, flag = 'r')
-      return if filename.nil?
-      flag = 'wb' if @options[:unix_newlines] && flag == 'w'
-      file = File.open(filename, flag)
-      return file unless block_given?
-      yield file
-      file.close
-    end
-
-    def handle_load_error(err)
-      dep = err.message[/^no such file to load -- (.*)/, 1]
-      raise err if @options[:trace] || dep.nil? || dep.empty?
-      $stderr.puts <<MESSAGE
-Required dependency #{dep} not found!
-    Run "gem install #{dep}" to get it.
-  Use --trace for backtrace.
-MESSAGE
-      exit 1
-    end
-  end
-end