sass 3.4.25 → 3.5.0.pre.rc.1

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -2,154 +2,144 @@
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../../test_helper'
 
-unless Sass::Util.ruby1_8?
-  class MultibyteStringScannerTest < MiniTest::Test
-    def setup
-      @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
-    end
-
-    def test_initial
-      assert_scanner_state 0, 0, nil, nil
-    end
-
-    def test_check
-      assert_equal 'cö', @scanner.check(/../)
-      assert_scanner_state 0, 0, 2, 3
-      assert_equal 0, @scanner.pos
-      assert_equal 0, @scanner.pos
-      assert_equal 2, @scanner.matched_size
-      assert_equal 3, @scanner.byte_matched_size
-    end
-
-    def test_check_until
-      assert_equal 'cölorfü', @scanner.check_until(/f./)
-      assert_scanner_state 0, 0, 2, 3
-    end
-
-    def test_getch
-      assert_equal 'c', @scanner.getch
-      assert_equal 'ö', @scanner.getch
-      assert_scanner_state 2, 3, 1, 2
-    end
-
-    def test_match?
-      assert_equal 2, @scanner.match?(/../)
-      assert_scanner_state 0, 0, 2, 3
-    end
-
-    def test_peek
-      assert_equal 'cö', @scanner.peek(2)
-      assert_scanner_state 0, 0, nil, nil
-    end
-
-    def test_rest_size
-      assert_equal 'cö', @scanner.scan(/../)
-      assert_equal 6, @scanner.rest_size
-    end
-
-    def test_scan
-      assert_equal 'cö', @scanner.scan(/../)
-      assert_scanner_state 2, 3, 2, 3
-    end
-
-    def test_scan_until
-      assert_equal 'cölorfü', @scanner.scan_until(/f./)
-      assert_scanner_state 7, 9, 2, 3
-    end
-
-    def test_skip
-      assert_equal 2, @scanner.skip(/../)
-      assert_scanner_state 2, 3, 2, 3
-    end
-
-    def test_skip_until
-      assert_equal 7, @scanner.skip_until(/f./)
-      assert_scanner_state 7, 9, 2, 3
-    end
-
-    def test_set_pos
-      @scanner.pos = 7
-      assert_scanner_state 7, 9, nil, nil
-      @scanner.pos = 6
-      assert_scanner_state 6, 7, nil, nil
-      @scanner.pos = 1
-      assert_scanner_state 1, 1, nil, nil
-    end
-
-    def test_reset
-      @scanner.scan(/../)
-      @scanner.reset
-      assert_scanner_state 0, 0, nil, nil
-    end
-
-    def test_scan_full
-      assert_equal 'cö', @scanner.scan_full(/../, true, true)
-      assert_scanner_state 2, 3, 2, 3
-
-      @scanner.reset
-      assert_equal 'cö', @scanner.scan_full(/../, false, true)
-      assert_scanner_state 0, 0, 2, 3
-
-      @scanner.reset
-      assert_nil @scanner.scan_full(/../, true, false)
-      assert_scanner_state 2, 3, 2, 3
-
-      @scanner.reset
-      assert_nil @scanner.scan_full(/../, false, false)
-      assert_scanner_state 0, 0, 2, 3
-    end
-
-    def test_search_full
-      assert_equal 'cölorfü', @scanner.search_full(/f./, true, true)
-      assert_scanner_state 7, 9, 2, 3
-
-      @scanner.reset
-      assert_equal 'cölorfü', @scanner.search_full(/f./, false, true)
-      assert_scanner_state 0, 0, 2, 3
-
-      @scanner.reset
-      assert_nil @scanner.search_full(/f./, true, false)
-      assert_scanner_state 7, 9, 2, 3
-
-      @scanner.reset
-      assert_nil @scanner.search_full(/f./, false, false)
-      assert_scanner_state 0, 0, 2, 3
-    end
-
-    def test_set_string
-      @scanner.scan(/../)
-      @scanner.string = 'föóbâr'
-      assert_scanner_state 0, 0, nil, nil
-    end
-
-    def test_terminate
-      @scanner.scan(/../)
-      @scanner.terminate
-      assert_scanner_state 8, 10, nil, nil
-    end
-
-    def test_unscan
-      @scanner.scan(/../)
-      @scanner.scan_until(/f./)
-      @scanner.unscan
-      assert_scanner_state 2, 3, nil, nil
-    end
-
-    private
-
-    def assert_scanner_state(pos, byte_pos, matched_size, byte_matched_size)
-      assert_equal pos, @scanner.pos, 'pos'
-      assert_equal byte_pos, @scanner.byte_pos, 'byte_pos'
-      if matched_size.nil?
-        assert_nil @scanner.matched_size, 'matched_size'
-      else
-        assert_equal matched_size, @scanner.matched_size, 'matched_size'
-      end
-      if byte_matched_size.nil?
-        assert_nil @scanner.byte_matched_size, 'byte_matched_size'
-      else
-        assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
-      end
-    end
+class MultibyteStringScannerTest < MiniTest::Test
+  def setup
+    @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
+  end
+
+  def test_initial
+    assert_scanner_state 0, 0, nil, nil
+  end
+
+  def test_check
+    assert_equal 'cö', @scanner.check(/../)
+    assert_scanner_state 0, 0, 2, 3
+    assert_equal 0, @scanner.pos
+    assert_equal 0, @scanner.pos
+    assert_equal 2, @scanner.matched_size
+    assert_equal 3, @scanner.byte_matched_size
+  end
+
+  def test_check_until
+    assert_equal 'cölorfü', @scanner.check_until(/f./)
+    assert_scanner_state 0, 0, 2, 3
+  end
+
+  def test_getch
+    assert_equal 'c', @scanner.getch
+    assert_equal 'ö', @scanner.getch
+    assert_scanner_state 2, 3, 1, 2
+  end
+
+  def test_match?
+    assert_equal 2, @scanner.match?(/../)
+    assert_scanner_state 0, 0, 2, 3
+  end
+
+  def test_peek
+    assert_equal 'cö', @scanner.peek(2)
+    assert_scanner_state 0, 0, nil, nil
+  end
+
+  def test_rest_size
+    assert_equal 'cö', @scanner.scan(/../)
+    assert_equal 6, @scanner.rest_size
+  end
+
+  def test_scan
+    assert_equal 'cö', @scanner.scan(/../)
+    assert_scanner_state 2, 3, 2, 3
+  end
+
+  def test_scan_until
+    assert_equal 'cölorfü', @scanner.scan_until(/f./)
+    assert_scanner_state 7, 9, 2, 3
+  end
+
+  def test_skip
+    assert_equal 2, @scanner.skip(/../)
+    assert_scanner_state 2, 3, 2, 3
+  end
+
+  def test_skip_until
+    assert_equal 7, @scanner.skip_until(/f./)
+    assert_scanner_state 7, 9, 2, 3
+  end
+
+  def test_set_pos
+    @scanner.pos = 7
+    assert_scanner_state 7, 9, nil, nil
+    @scanner.pos = 6
+    assert_scanner_state 6, 7, nil, nil
+    @scanner.pos = 1
+    assert_scanner_state 1, 1, nil, nil
+  end
+
+  def test_reset
+    @scanner.scan(/../)
+    @scanner.reset
+    assert_scanner_state 0, 0, nil, nil
+  end
+
+  def test_scan_full
+    assert_equal 'cö', @scanner.scan_full(/../, true, true)
+    assert_scanner_state 2, 3, 2, 3
+
+    @scanner.reset
+    assert_equal 'cö', @scanner.scan_full(/../, false, true)
+    assert_scanner_state 0, 0, 2, 3
+
+    @scanner.reset
+    assert_nil @scanner.scan_full(/../, true, false)
+    assert_scanner_state 2, 3, 2, 3
+
+    @scanner.reset
+    assert_nil @scanner.scan_full(/../, false, false)
+    assert_scanner_state 0, 0, 2, 3
+  end
+
+  def test_search_full
+    assert_equal 'cölorfü', @scanner.search_full(/f./, true, true)
+    assert_scanner_state 7, 9, 2, 3
+
+    @scanner.reset
+    assert_equal 'cölorfü', @scanner.search_full(/f./, false, true)
+    assert_scanner_state 0, 0, 2, 3
+
+    @scanner.reset
+    assert_nil @scanner.search_full(/f./, true, false)
+    assert_scanner_state 7, 9, 2, 3
+
+    @scanner.reset
+    assert_nil @scanner.search_full(/f./, false, false)
+    assert_scanner_state 0, 0, 2, 3
+  end
+
+  def test_set_string
+    @scanner.scan(/../)
+    @scanner.string = 'föóbâr'
+    assert_scanner_state 0, 0, nil, nil
+  end
+
+  def test_terminate
+    @scanner.scan(/../)
+    @scanner.terminate
+    assert_scanner_state 8, 10, nil, nil
+  end
+
+  def test_unscan
+    @scanner.scan(/../)
+    @scanner.scan_until(/f./)
+    @scanner.unscan
+    assert_scanner_state 2, 3, nil, nil
+  end
+
+  private
+
+  def assert_scanner_state(pos, byte_pos, matched_size, byte_matched_size)
+    assert_equal pos, @scanner.pos, 'pos'
+    assert_equal byte_pos, @scanner.byte_pos, 'byte_pos'
+    assert_equal matched_size, @scanner.matched_size, 'matched_size'
+    assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
   end
 end

data/test/sass/util_test.rb

@@ -10,14 +10,6 @@ class UtilTest < MiniTest::Test
     assert(File.exist?(scope("Rakefile")))
   end
 
-  def test_to_hash
-    assert_equal({
-        :foo => 1,
-        :bar => 2,
-        :baz => 3
-      }, to_hash([[:foo, 1], [:bar, 2], [:baz, 3]]))
-  end
-
   def test_map_keys
     assert_equal({
         "foo" => 1,
@@ -52,7 +44,6 @@ class UtilTest < MiniTest::Test
   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,
       powerset([]))
     assert_equal([[].to_set, [1].to_set].to_set,
@@ -139,13 +130,6 @@ class UtilTest < MiniTest::Test
       lcs([-5, 3, 2, 8], [-4, 1, 8]) {|a, b| (a - b).abs <= 1 && [a, b].max})
   end
 
-  def test_group_by_to_a
-    assert_equal([[1, [1, 3, 5, 7]], [0, [2, 4, 6, 8]]],
-      group_by_to_a(1..8) {|i| i % 2})
-    assert_equal([[1, [1, 4, 7, 10]], [2, [2, 5, 8, 11]], [0, [3, 6, 9, 12]]],
-      group_by_to_a(1..12) {|i| i % 3})
-  end
-
   def test_subsequence
     assert(subsequence?([1, 2, 3], [1, 2, 3]))
     assert(subsequence?([1, 2, 3], [1, :a, 2, :b, 3]))
@@ -180,32 +164,12 @@ class UtilTest < MiniTest::Test
     $stderr = old_stderr
   end
 
-  def test_has
-    assert(has?(:instance_method, String, :chomp!))
-    assert(has?(:private_instance_method, Sass::Engine, :parse_interp))
-  end
-
-  def test_enum_with_index
-    assert_equal(%w[foo0 bar1 baz2],
-      enum_with_index(%w[foo bar baz]).map {|s, i| "#{s}#{i}"})
-  end
-
-  def test_enum_cons
-    assert_equal(%w[foobar barbaz],
-      enum_cons(%w[foo bar baz], 2).map {|s1, s2| "#{s1}#{s2}"})
-  end
-
   def test_extract
     arr = [1, 2, 3, 4, 5]
     assert_equal([1, 3, 5], extract!(arr) {|e| e % 2 == 1})
     assert_equal([2, 4], arr)
   end
 
-  def test_ord
-    assert_equal(102, ord("f"))
-    assert_equal(98, ord("bar"))
-  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]]))

data/test/test_helper.rb

@@ -93,6 +93,45 @@ class MiniTest::Test
   else
     flunk "Expected exception on line #{line}, none raised"
   end
+
+  def assert_sass_to_sass(sass, options: {})
+    assert_equal(sass.rstrip, to_sass(sass, options).rstrip,
+      "Expected Sass to transform to itself")
+  end
+
+  def assert_scss_to_sass(sass, scss, options: {})
+    assert_equal(sass.rstrip, to_sass(scss, options.merge(:syntax => :scss)).rstrip,
+      "Expected SCSS to transform to Sass")
+  end
+
+  def assert_scss_to_scss(scss, source: scss, options: {})
+    assert_equal(scss.rstrip, to_scss(source, options.merge(:syntax => :scss)).rstrip,
+      "Expected SCSS to transform to #{scss == source ? 'itself' : 'SCSS'}")
+  end
+
+  def assert_sass_to_scss(scss, sass, options: {})
+    assert_equal(scss.rstrip, to_scss(sass, options).rstrip,
+      "Expected Sass to transform to SCSS")
+  end
+
+  def assert_converts(sass, scss, options: {})
+    assert_sass_to_sass(sass, options: options)
+    assert_scss_to_sass(sass, scss, options: options)
+    assert_scss_to_scss(scss, options: options)
+    assert_sass_to_scss(scss, sass, options: options)
+  end
+
+  def to_sass(scss, options = {})
+    Sass::Util.silence_sass_warnings do
+      Sass::Engine.new(scss, options).to_tree.to_sass(options)
+    end
+  end
+
+  def to_scss(sass, options = {})
+    Sass::Util.silence_sass_warnings do
+      Sass::Engine.new(sass, options).to_tree.to_scss(options)
+    end
+  end
 end
 
 module PublicApiLinter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.25
+  version: 3.5.0.pre.rc.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,36 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: sass-listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
-  type: :development
+        version: 3.0.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +94,6 @@ files:
 - bin/sass
 - bin/sass-convert
 - bin/scss
-- extra/sass-spec-ref.sh
 - extra/update_watch.rb
 - init.rb
 - lib/sass.rb
@@ -92,7 +105,6 @@ files:
 - lib/sass/cache_stores/null.rb
 - lib/sass/callbacks.rb
 - lib/sass/css.rb
-- lib/sass/deprecation.rb
 - lib/sass/engine.rb
 - lib/sass/environment.rb
 - lib/sass/error.rb
@@ -124,7 +136,6 @@ files:
 - lib/sass/script.rb
 - lib/sass/script/css_lexer.rb
 - lib/sass/script/css_parser.rb
-- lib/sass/script/css_variable_warning.rb
 - lib/sass/script/functions.rb
 - lib/sass/script/lexer.rb
 - lib/sass/script/parser.rb
@@ -144,7 +155,9 @@ files:
 - lib/sass/script/value/arg_list.rb
 - lib/sass/script/value/base.rb
 - lib/sass/script/value/bool.rb
+- lib/sass/script/value/callable.rb
 - lib/sass/script/value/color.rb
+- lib/sass/script/value/function.rb
 - lib/sass/script/value/helpers.rb
 - lib/sass/script/value/list.rb
 - lib/sass/script/value/map.rb
@@ -207,10 +220,8 @@ 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
@@ -251,7 +262,6 @@ files:
 - test/sass/results/if.css
 - test/sass/results/import.css
 - test/sass/results/import_charset.css
-- test/sass/results/import_charset_1_8.css
 - test/sass/results/import_charset_ibm866.css
 - test/sass/results/import_content.css
 - test/sass/results/line_numbers.css
@@ -301,7 +311,6 @@ files:
 - test/sass/templates/if.sass
 - test/sass/templates/import.sass
 - test/sass/templates/import_charset.sass
-- test/sass/templates/import_charset_1_8.sass
 - test/sass/templates/import_charset_ibm866.sass
 - test/sass/templates/import_content.sass
 - test/sass/templates/importee.less
@@ -341,42 +350,6 @@ files:
 - test/sass/util_test.rb
 - test/sass/value_helpers_test.rb
 - test/test_helper.rb
-- vendor/listen/CHANGELOG.md
-- vendor/listen/CONTRIBUTING.md
-- vendor/listen/Gemfile
-- vendor/listen/Guardfile
-- vendor/listen/LICENSE
-- vendor/listen/README.md
-- vendor/listen/Rakefile
-- vendor/listen/Vagrantfile
-- vendor/listen/lib/listen.rb
-- vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen/adapters/bsd.rb
-- vendor/listen/lib/listen/adapters/darwin.rb
-- vendor/listen/lib/listen/adapters/linux.rb
-- vendor/listen/lib/listen/adapters/polling.rb
-- vendor/listen/lib/listen/adapters/windows.rb
-- vendor/listen/lib/listen/directory_record.rb
-- vendor/listen/lib/listen/listener.rb
-- vendor/listen/lib/listen/turnstile.rb
-- vendor/listen/lib/listen/version.rb
-- vendor/listen/listen.gemspec
-- vendor/listen/spec/listen/adapter_spec.rb
-- vendor/listen/spec/listen/adapters/bsd_spec.rb
-- vendor/listen/spec/listen/adapters/darwin_spec.rb
-- vendor/listen/spec/listen/adapters/linux_spec.rb
-- vendor/listen/spec/listen/adapters/polling_spec.rb
-- vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/directory_record_spec.rb
-- vendor/listen/spec/listen/listener_spec.rb
-- vendor/listen/spec/listen/turnstile_spec.rb
-- vendor/listen/spec/listen_spec.rb
-- vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/support/adapter_helper.rb
-- vendor/listen/spec/support/directory_record_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
-- vendor/listen/spec/support/listeners_helper.rb
-- vendor/listen/spec/support/platform_helper.rb
 homepage: http://sass-lang.com/
 licenses:
 - MIT
@@ -389,12 +362,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: sass
 rubygems_version: 2.4.8