oreorenasass 3.4.4 → 3.4.5

data/lib/sass/util/ordered_hash.rb

@@ -1,192 +0,0 @@
-# Copyright (c) 2005-2013 David Heinemeier Hansson
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# This class was copied from an old version of ActiveSupport.
-class OrderedHash < ::Hash
-  # In MRI the Hash class is core and written in C. In particular, methods are
-  # programmed with explicit C function calls and polymorphism is not honored.
-  #
-  # For example, []= is crucial in this implementation to maintain the @keys
-  # array but hash.c invokes rb_hash_aset() originally. This prevents method
-  # reuse through inheritance and forces us to reimplement stuff.
-  #
-  # For instance, we cannot use the inherited #merge! because albeit the algorithm
-  # itself would work, our []= is not being called at all by the C code.
-
-  def initialize(*args)
-    super
-    @keys = []
-  end
-
-  def self.[](*args)
-    ordered_hash = new
-
-    if args.length == 1 && args.first.is_a?(Array)
-      args.first.each do |key_value_pair|
-        next unless key_value_pair.is_a?(Array)
-        ordered_hash[key_value_pair[0]] = key_value_pair[1]
-      end
-
-      return ordered_hash
-    end
-
-    unless args.size.even?
-      raise ArgumentError.new("odd number of arguments for Hash")
-    end
-
-    args.each_with_index do |val, ind|
-      next if ind.odd?
-      ordered_hash[val] = args[ind + 1]
-    end
-
-    ordered_hash
-  end
-
-  def initialize_copy(other)
-    super
-    # make a deep copy of keys
-    @keys = other.keys
-  end
-
-  def []=(key, value)
-    @keys << key unless has_key?(key)
-    super
-  end
-
-  def delete(key)
-    if has_key? key
-      index = @keys.index(key)
-      @keys.delete_at index
-    end
-    super
-  end
-
-  def delete_if
-    super
-    sync_keys!
-    self
-  end
-
-  def reject!
-    super
-    sync_keys!
-    self
-  end
-
-  def reject
-    dup.reject! {|h, k| yield h, k}
-  end
-
-  def keys
-    @keys.dup
-  end
-
-  def values
-    @keys.map {|key| self[key]}
-  end
-
-  def to_hash
-    self
-  end
-
-  def to_a
-    @keys.map {|key| [key, self[key]]}
-  end
-
-  def each_key
-    return to_enum(:each_key) unless block_given?
-    @keys.each {|key| yield key}
-    self
-  end
-
-  def each_value
-    return to_enum(:each_value) unless block_given?
-    @keys.each {|key| yield self[key]}
-    self
-  end
-
-  def each
-    return to_enum(:each) unless block_given?
-    @keys.each {|key| yield [key, self[key]]}
-    self
-  end
-
-  def each_pair
-    return to_enum(:each_pair) unless block_given?
-    @keys.each {|key| yield key, self[key]}
-    self
-  end
-
-  alias_method :select, :find_all
-
-  def clear
-    super
-    @keys.clear
-    self
-  end
-
-  def shift
-    k = @keys.first
-    v = delete(k)
-    [k, v]
-  end
-
-  def merge!(other_hash)
-    if block_given?
-      other_hash.each {|k, v| self[k] = key?(k) ? yield(k, self[k], v) : v}
-    else
-      other_hash.each {|k, v| self[k] = v}
-    end
-    self
-  end
-
-  alias_method :update, :merge!
-
-  def merge(other_hash)
-    if block_given?
-      dup.merge!(other_hash) {|k, v1, v2| yield k, v1, v2}
-    else
-      dup.merge!(other_hash)
-    end
-  end
-
-  # When replacing with another hash, the initial order of our keys must come from the other hash --
-  # ordered or not.
-  def replace(other)
-    super
-    @keys = other.keys
-    self
-  end
-
-  def invert
-    OrderedHash[to_a.map! {|key_value_pair| key_value_pair.reverse}]
-  end
-
-  def inspect
-    "#<OrderedHash #{super}>"
-  end
-
-  private
-
-  def sync_keys!
-    @keys.delete_if {|k| !has_key?(k)}
-  end
-end

data/test/sass/compiler_test.rb

@@ -1,232 +0,0 @@
-#!/usr/bin/env ruby
-require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../test_helper'
-require 'sass/plugin'
-require 'sass/plugin/compiler'
-
-class CompilerTest < MiniTest::Test
-  class FakeListener
-    attr_accessor :options
-    attr_accessor :directories
-    attr_reader :start_called
-    attr_reader :thread
-
-    def initialize(*args, &on_filesystem_event)
-      self.options = args.last.is_a?(Hash) ? args.pop : {}
-      self.directories = args
-      @on_filesystem_event = on_filesystem_event
-      @start_called = false
-      reset_events!
-    end
-
-    def fire_events!(*args)
-      @on_filesystem_event.call(@modified, @added, @removed)
-      reset_events!
-    end
-
-    def changed(filename)
-      @modified << File.expand_path(filename)
-    end
-
-    def added(filename)
-      @added << File.expand_path(filename)
-    end
-
-    def removed(filename)
-      @removed << File.expand_path(filename)
-    end
-
-    def on_start!(&run_during_start)
-      @run_during_start = run_during_start
-    end
-
-    # used for Listen < 2.0
-    def start!
-      @run_during_start.call(self) if @run_during_start
-    end
-
-    # used for Listen >= 2.0
-    def start
-      @thread = Thread.new {@run_during_start.call(self) if @run_during_start}
-    end
-
-    def stop
-    end
-
-    def reset_events!
-      @modified = []
-      @added = []
-      @removed = []
-    end
-  end
-
-  module MockWatcher
-    attr_accessor :run_during_start
-    attr_accessor :update_stylesheets_times
-    attr_accessor :update_stylesheets_called_with
-    attr_accessor :deleted_css_files
-
-    def fake_listener
-      @fake_listener
-    end
-
-    def update_stylesheets(individual_files)
-      @update_stylesheets_times ||= 0
-      @update_stylesheets_times += 1
-      (@update_stylesheets_called_with ||= []) << individual_files
-    end
-
-    def try_delete_css(css_filename)
-      (@deleted_css_files ||= []) << css_filename
-    end
-
-    private
-    def create_listener(*args, &on_filesystem_event)
-      if Sass::Util.listen_geq_2?
-        options = args.pop if args.last.is_a?(Hash)
-        args.map do |dir|
-          @fake_listener = FakeListener.new(*args, &on_filesystem_event)
-          @fake_listener.on_start!(&run_during_start)
-          @fake_listener
-        end
-      else
-        @fake_listener = FakeListener.new(*args, &on_filesystem_event)
-        @fake_listener.on_start!(&run_during_start)
-        @fake_listener
-      end
-    end
-  end
-
-  def test_initialize
-    watcher
-  end
-
-  def test_watch_starts_the_listener
-    start_called = false
-    c = watcher do |listener|
-      start_called = true
-    end
-    c.watch
-    assert start_called, "start! was not called"
-  end
-
-  def test_sass_callbacks_fire_from_listener_events
-    c = watcher do |listener|
-      listener.changed "changed.scss"
-      listener.added "added.scss"
-      listener.removed "removed.scss"
-      listener.fire_events!
-    end
-
-    modified_fired = false
-    c.on_template_modified do |sass_file|
-      modified_fired = true
-      assert_equal "changed.scss", sass_file
-    end
-
-    added_fired = false
-    c.on_template_created do |sass_file|
-      added_fired = true
-      assert_equal "added.scss", sass_file
-    end
-
-    removed_fired = false
-    c.on_template_deleted do |sass_file|
-      removed_fired = true
-      assert_equal "removed.scss", sass_file
-    end
-
-    c.watch
-
-    assert_equal 2, c.update_stylesheets_times
-    assert modified_fired
-    assert added_fired
-    assert removed_fired
-  end
-
-  def test_removing_a_sass_file_removes_corresponding_css_file
-    c = watcher do |listener|
-      listener.removed "remove_me.scss"
-      listener.fire_events!
-    end
-
-    c.watch
-
-    assert_equal "./remove_me.css", c.deleted_css_files.first
-  end
-
-  def test_an_importer_can_watch_an_image
-    image_importer = Sass::Importers::Filesystem.new(".")
-    class << image_importer
-      def watched_file?(filename)
-        filename =~ /\.png$/
-      end
-    end
-    c = watcher(:load_paths => [image_importer]) do |listener|
-      listener.changed "image.png"
-      listener.fire_events!
-    end
-
-    modified_fired = false
-    c.on_template_modified do |f|
-      modified_fired = true
-      assert_equal "image.png", f
-    end
-
-    c.watch
-
-    assert_equal 2, c.update_stylesheets_times
-    assert modified_fired
-  end
-
-  def test_watching_specific_files_and_one_is_deleted
-    directories = nil
-    c = watcher do |listener|
-      directories = listener.directories
-      listener.removed File.expand_path("./foo.scss")
-      listener.fire_events!
-    end
-    c.watch([[File.expand_path("./foo.scss"), File.expand_path("./foo.css"), nil]])
-    assert directories.include?(File.expand_path(".")), directories.inspect
-    assert_equal File.expand_path("./foo.css"), c.deleted_css_files.first, "the corresponding css file was not deleted"
-    assert_equal [], c.update_stylesheets_called_with[1], "the sass file should not have been compiled"
-  end
-
-  def test_watched_directories_are_dedupped
-    directories = nil
-    c = watcher(:load_paths => [".", "./foo", "."]) do |listener|
-      directories = listener.directories
-    end
-    c.watch
-    assert_equal [File.expand_path(".")], directories
-  end
-
-  def test_a_changed_css_in_a_watched_directory_does_not_force_a_compile
-    c = watcher do |listener|
-      listener.changed "foo.css"
-      listener.fire_events!
-    end
-
-    c.on_template_modified do |f|
-      assert false, "Should not have been called"
-    end
-
-    c.watch
-
-    assert_equal 1, c.update_stylesheets_times
-  end
-
-  private
-
-  def default_options
-    {:template_location => [[".","."]]}
-  end
-
-  def watcher(options = {}, &run_during_start)
-    options = default_options.merge(options)
-    watcher = Sass::Plugin::Compiler.new(options)
-    watcher.extend(MockWatcher)
-    watcher.run_during_start = run_during_start
-    watcher
-  end
-end

data/test/sass/encoding_test.rb

@@ -1,219 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
-require 'sass/util/test'
-
-class EncodingTest < MiniTest::Test
-  include Sass::Util::Test
-
-  def test_encoding_error
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    render("foo\nbar\nb\xFEaz".force_encoding("utf-8"))
-    assert(false, "Expected exception")
-  rescue Sass::SyntaxError => e
-    assert_equal(3, e.sass_line)
-    assert_equal('Invalid UTF-8 character "\xFE"', e.message)
-  end
-
-  def test_ascii_incompatible_encoding_error
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    template = "foo\nbar\nb_z".encode("utf-16le")
-    template[9] = "\xFE".force_encoding("utf-16le")
-    render(template)
-    assert(false, "Expected exception")
-  rescue Sass::SyntaxError => e
-    assert_equal(3, e.sass_line)
-    assert_equal('Invalid UTF-16LE character "\xFE"', e.message)
-  end
-
-  def test_prefers_charset_to_ruby_encoding
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_renders_encoded(<<CSS, <<SASS.encode("IBM866").force_encoding("UTF-8"))
-@charset "UTF-8";
-fЖЖ {
-  a: b; }
-CSS
-@charset "ibm866"
-fЖЖ
-  a: b
-SASS
-  end
-
-  def test_uses_ruby_encoding_without_charset
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_renders_encoded(<<CSS, <<SASS.encode("IBM866"))
-@charset "UTF-8";
-тАЬ {
-  a: b; }
-CSS
-тАЬ
-  a: b
-SASS
-  end
-
-  def test_multibyte_charset_without_bom_declared_as_binary
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    engine = Sass::Engine.new(<<SASS.encode("UTF-16LE").force_encoding("BINARY"))
-@charset "utf-16le"
-fóó
-  a: b
-SASS
-    # Since multibyte encodings' @charset declarations aren't
-    # ASCII-compatible, we have to interpret the files as UTF-8 which will
-    # inevitably fail.
-    assert_raise_message(Sass::SyntaxError, "Invalid UTF-8 character \"\\xF3\"") {engine.render}
-  end
-
-  def test_multibyte_charset_without_bom_declared_as_utf_8
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    engine = Sass::Engine.new(<<SASS.encode("UTF-16LE").force_encoding("UTF-8"))
-@charset "utf-16le"
-fóó
-  a: b
-SASS
-    # Since multibyte encodings' @charset declarations aren't
-    # ASCII-compatible, we have to interpret the files as UTF-8 which will
-    # inevitably fail.
-    assert_raise_message(Sass::SyntaxError, "Invalid UTF-8 character \"\\xF3\"") {engine.render}
-  end
-
-  def test_utf_16le_with_bom
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_renders_encoded(<<CSS, <<SASS.encode("UTF-16LE").force_encoding("BINARY"))
-@charset "UTF-8";
-fóó {
-  a: b; }
-CSS
-\uFEFFfóó
-  a: b
-SASS
-  end
-
-  def test_utf_16be_with_bom
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_renders_encoded(<<CSS, <<SASS.encode("UTF-16BE").force_encoding("BINARY"))
-@charset "UTF-8";
-fóó {
-  a: b; }
-CSS
-\uFEFFfóó
-  a: b
-SASS
-  end
-
-  def test_utf_8_with_bom
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_renders_encoded(<<CSS, <<SASS.force_encoding("BINARY"))
-@charset "UTF-8";
-fóó {
-  a: b; }
-CSS
-\uFEFFfóó
-  a: b
-SASS
-  end
-
-  def test_charset_with_multibyte_encoding
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    engine = Sass::Engine.new(<<SASS)
-@charset "utf-32be"
-fóó
-  a: b
-SASS
-    # The charset declaration is just false here, so we should get an
-    # encoding error.
-    assert_raise_message(Sass::SyntaxError, "Invalid UTF-32BE character \"\\xC3\"") {engine.render}
-  end
-
-  def test_charset_with_special_case_encoding
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    # For some reason, a file with an ASCII-compatible UTF-16 charset
-    # declaration is specced to be parsed as UTF-8.
-    assert_renders_encoded(<<CSS, <<SASS.force_encoding("BINARY"))
-@charset "UTF-8";
-fóó {
-  a: b; }
-CSS
-@charset "utf-16"
-fóó
-  a: b
-SASS
-  end
-
-  def test_compressed_output_uses_bom
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_equal("\uFEFFfóó{a:b}\n", render(<<SASS, :style => :compressed))
-fóó
-  a: b
-SASS
-  end
-
-  def test_newline_normalization
-    assert_equal("/* foo\nbar\nbaz\nbang\nqux */\n",
-      render("/* foo\nbar\r\nbaz\fbang\rqux */", :syntax => :scss))
-  end
-
-  def test_null_normalization
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-    
-    assert_equal(<<CSS, render("/* foo\x00bar\x00baz */", :syntax => :scss))
-#{"@charset \"UTF-8\";\n" unless Sass::Util.ruby1_8?
-}/* foo�bar�baz */
-CSS
-  end
-
-  # Regression
-
-  def test_multibyte_prop_name
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_equal(<<CSS, render(<<SASS))
-@charset "UTF-8";
-#bar {
-  cölor: blue; }
-CSS
-#bar
-  cölor: blue
-SASS
-  end
-
-  def test_multibyte_and_interpolation
-    return skip "Can't be run on Ruby 1.8." if Sass::Util.ruby1_8?
-
-    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
-#bar {
-  background: a 0%; }
-CSS
-#bar {
-  // 
-  background: \#{a} 0%;
-}
-SCSS
-  end
-
-  private
-
-  def assert_renders_encoded(css, sass)
-    result = render(sass)
-    assert_equal css.encoding, result.encoding
-    assert_equal css, result
-  end
-
-  def render(sass, options = {})
-    munge_filename options
-    Sass::Engine.new(sass, options).render
-  end
-end