sassc 1.12.1 → 2.0.0

data/lib/sassc/util/normalized_map.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require "delegate"
+
+# A hash that normalizes its string keys while still allowing you to get back
+# to the original keys that were stored. If several different values normalize
+# to the same value, whichever is stored last wins.
+
+class SassC::Util::NormalizedMap
+
+  # Create a normalized map
+  def initialize(map = nil)
+    @key_strings = {}
+    @map = {}
+    map.each {|key, value| self[key] = value} if map
+  end
+
+  # Specifies how to transform the key.
+  # This can be overridden to create other normalization behaviors.
+  def normalize(key)
+    key.tr("-", "_")
+  end
+
+  # Returns the version of `key` as it was stored before
+  # normalization. If `key` isn't in the map, returns it as it was
+  # passed in.
+  # @return [String]
+  def denormalize(key)
+    @key_strings[normalize(key)] || key
+  end
+
+  # @private
+  def []=(k, v)
+    normalized = normalize(k)
+    @map[normalized] = v
+    @key_strings[normalized] = k
+    v
+  end
+
+  # @private
+  def [](k)
+    @map[normalize(k)]
+  end
+
+  # @private
+  def has_key?(k)
+    @map.has_key?(normalize(k))
+  end
+
+  # @private
+  def delete(k)
+    normalized = normalize(k)
+    @key_strings.delete(normalized)
+    @map.delete(normalized)
+  end
+
+  # @return [Hash] Hash with the keys as they were stored (before normalization).
+  def as_stored
+    SassC::Util.map_keys(@map) {|k| @key_strings[k]}
+  end
+
+  def empty?
+    @map.empty?
+  end
+
+  def values
+    @map.values
+  end
+
+  def keys
+    @map.keys
+  end
+
+  def each
+    @map.each {|k, v| yield(k, v)}
+  end
+
+  def size
+    @map.size
+  end
+
+  def to_hash
+    @map.dup
+  end
+
+  def to_a
+    @map.to_a
+  end
+
+  def map
+    @map.map {|k, v| yield(k, v)}
+  end
+
+  def dup
+    d = super
+    d.send(:instance_variable_set, "@map", @map.dup)
+    d
+  end
+
+  def sort_by
+    @map.sort_by {|k, v| yield k, v}
+  end
+
+  def update(map)
+    map = map.as_stored if map.is_a?(NormalizedMap)
+    map.each {|k, v| self[k] = v}
+  end
+
+  def method_missing(method, *args, &block)
+    @map.send(method, *args, &block)
+  end
+
+  def respond_to_missing?(method, include_private = false)
+    @map.respond_to?(method, include_private)
+  end
+
+end

data/lib/sassc/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
-  VERSION = "1.12.1"
+  VERSION = "2.0.0"
 end

data/lib/tasks/libsass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :libsass do
   desc "Compile libsass"
   task :compile do

data/sassc.gemspec

@@ -1,9 +1,11 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sassc/version'
+require "sassc/version"
 
 Gem::Specification.new do |spec|
+
   spec.name          = "sassc"
   spec.version       = SassC::VERSION
   spec.authors       = ["Ryan Boland"]
@@ -17,19 +19,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
+  spec.required_ruby_version = ">= 2.3.3"
+
   spec.require_paths = ["lib"]
 
   spec.extensions    = ["ext/Rakefile"]
 
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.5.1"
   spec.add_development_dependency "minitest-around"
   spec.add_development_dependency "test_construct"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler"
 
+  spec.add_dependency "rake"
   spec.add_dependency "ffi", "~> 1.9.6"
-  spec.add_dependency "sass", ">= 3.3.0"
 
   gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
@@ -42,4 +45,5 @@ Gem::Specification.new do |spec|
       end
     end
   end
+
 end

data/test/custom_importer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC

data/test/engine_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
@@ -224,7 +226,7 @@ CSS
     end
 
     def test_encoding_matches_input
-      input = "$size: 30px;"
+      input = String.new("$size: 30px;")
       input.force_encoding("UTF-8")
       output = Engine.new(input).render
       assert_equal input.encoding, output.encoding
@@ -257,13 +259,13 @@ CSS
     end
 
     def test_empty_template_returns_a_new_object
-      input = ''
+      input = String.new
       output = Engine.new(input).render
       assert input.object_id != output.object_id, 'empty template must return a new object'
     end
 
     def test_empty_template_encoding_matches_input
-      input = ''.force_encoding("ISO-8859-1")
+      input = String.new.force_encoding("ISO-8859-1")
       output = Engine.new(input).render
       assert_equal input.encoding, output.encoding
     end

data/test/error_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC

data/test/functions_test.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 require "stringio"
-require "sass/script"
 
 module SassC
   class FunctionsTest < MiniTest::Test
@@ -114,7 +115,7 @@ module SassC
       assert_sass <<-SCSS, <<-EXPECTED_CSS
         div { color: nice_color_argument(red); }
       SCSS
-        div { color: "red"; }
+        div { color: rgb(255, 0, 0); }
       EXPECTED_CSS
     end
 
@@ -197,8 +198,13 @@ module SassC
     end
 
     module Script::Functions
+
       def javascript_path(path)
-        Script::String.new("/js/#{path.value}", :string)
+        SassC::Script::Value::String.new("/js/#{path.value}", :string)
+      end
+
+      def stylesheet_path(path)
+        SassC::Script::Value::String.new("/css/#{path.value}", :identifier)
       end
 
       def no_return_path(path)
@@ -206,12 +212,12 @@ module SassC
       end
 
       def sass_return_path(path)
-        Script::String.new("#{path.value}", :string)
+        SassC::Script::Value::String.new("#{path.value}", :string)
       end
 
       def optional_arguments(path, optional = nil)
-        optional ||= Script::String.new("bar")
-        Script::String.new("#{path.value}/#{optional.value}", :string)
+        optional ||= SassC::Script::Value::String.new("bar")
+        SassC::Script::Value::String.new("#{path.value}/#{optional.value}", :string)
       end
 
       def function_that_raises_errors
@@ -222,44 +228,44 @@ module SassC
       end
 
       def nice_color_argument(color)
-        return Script::String.new(color.to_s, :string)
+        return SassC::Script::Value::String.new(color.to_s, :identifier)
       end
 
       def returns_a_color
-        return Script::Color.new(red: 0, green: 0, blue: 0)
+        return SassC::Script::Value::Color.new(red: 0, green: 0, blue: 0)
       end
 
       def returns_a_number
-        return Sass::Script::Value::Number.new(-312,'rem')
+        return SassC::Script::Value::Number.new(-312,'rem')
       end
 
       def returns_a_bool
-        return Sass::Script::Value::Bool.new(true)
+        return SassC::Script::Value::Bool.new(true)
       end
 
       def inspect_bool ( argument )
-        raise StandardError.new "passed value is not a Sass::Script::Value::Bool" unless argument.is_a? Sass::Script::Value::Bool
+        raise StandardError.new "passed value is not a Sass::Script::Value::Bool" unless argument.is_a? SassC::Script::Value::Bool
         return argument
       end
 
       def inspect_number ( argument )
-        raise StandardError.new "passed value is not a Sass::Script::Value::Number" unless argument.is_a? Sass::Script::Value::Number
+        raise StandardError.new "passed value is not a Sass::Script::Value::Number" unless argument.is_a? SassC::Script::Value::Number
         return argument
       end
 
       def inspect_map ( argument )
         argument.to_h.each_pair do |key, value|
-          raise StandardError.new "key #{key.inspect} is not a string" unless key.is_a? Sass::Script::Value::String
+          raise StandardError.new "key #{key.inspect} is not a string" unless key.is_a? SassC::Script::Value::String
 
           valueClass = case key.value
                          when 'string'
-                           Sass::Script::Value::String
+                           SassC::Script::Value::String
                          when 'number'
-                           Sass::Script::Value::Number
+                           SassC::Script::Value::Number
                          when 'color'
-                           Sass::Script::Value::Color
+                           SassC::Script::Value::Color
                          when 'map'
-                           Sass::Script::Value::Map
+                           SassC::Script::Value::Map
                        end
 
           raise StandardError.new "unknown key #{key.inspect}" unless valueClass
@@ -269,41 +275,29 @@ module SassC
       end
 
       def inspect_list(argument)
-        raise StandardError.new "passed value is not a Sass::Script::Value::List" unless argument.is_a? Sass::Script::Value::List
+        raise StandardError.new "passed value is not a Sass::Script::Value::List" unless argument.is_a? SassC::Script::Value::List
         return argument
       end
 
       def returns_sass_value
-        return Sass::Script::Value::Color.new(red: 0, green: 0, blue: 0)
+        return SassC::Script::Value::Color.new(red: 0, green: 0, blue: 0)
       end
 
       def returns_sass_map
-        key = Script::String.new("color", "string")
-        value = Sass::Script::Value::Color.new(red: 0, green: 0, blue: 0)
+        key = SassC::Script::Value::String.new("color", "string")
+        value = SassC::Script::Value::Color.new(red: 0, green: 0, blue: 0)
         values = {}
         values[key] = value
-        map = Sass::Script::Value::Map.new values
+        map = SassC::Script::Value::Map.new values
         return map
       end
 
       def returns_sass_list
-        numbers = [10, 20, 30].map do |n|
-          Sass::Script::Value::Number.new(n, '')
-        end
-
-        if Gem.loaded_specs['sass'].version < Gem::Version.create('3.5')
-          Sass::Script::Value::List.new(numbers, :space)
-        else
-          Sass::Script::Value::List.new(numbers, separator: :space)
-        end
+        numbers = [10, 20, 30].map { |n| SassC::Script::Value::Number.new(n, '') }
+        SassC::Script::Value::List.new(numbers, separator: :space)
       end
 
-      module Compass
-        def stylesheet_path(path)
-          Script::String.new("/css/#{path.value}", :identifier)
-        end
-      end
-      include Compass
     end
+
   end
 end

data/test/native_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
@@ -57,10 +59,6 @@ module SassC
         refute_equal 0, status
       end
 
-      def test_failed_compile_gives_error_message
-        skip
-      end
-
       def test_custom_function
         data_context = Native.make_data_context("foo { margin: foo(); }")
         context = Native.data_context_get_context(data_context)

data/test/output_style_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC

data/test/sass_2_scss_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "minitest/autorun"
 require "minitest/pride"
 require "minitest/around/unit"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 1.9.6
 description: Use libsass with Ruby!
 email:
 - ryan@tanookilabs.com
@@ -133,6 +119,7 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -334,8 +321,6 @@ files:
 - ext/libsass/win/libsass.vcxproj
 - ext/libsass/win/libsass.vcxproj.filters
 - lib/sassc.rb
-- lib/sassc/cache_stores.rb
-- lib/sassc/cache_stores/base.rb
 - lib/sassc/dependency.rb
 - lib/sassc/engine.rb
 - lib/sassc/error.rb
@@ -354,6 +339,13 @@ files:
 - lib/sassc/sass_2_scss.rb
 - lib/sassc/script.rb
 - lib/sassc/script/functions.rb
+- lib/sassc/script/value.rb
+- lib/sassc/script/value/bool.rb
+- lib/sassc/script/value/color.rb
+- lib/sassc/script/value/list.rb
+- lib/sassc/script/value/map.rb
+- lib/sassc/script/value/number.rb
+- lib/sassc/script/value/string.rb
 - lib/sassc/script/value_conversion.rb
 - lib/sassc/script/value_conversion/base.rb
 - lib/sassc/script/value_conversion/bool.rb
@@ -362,6 +354,8 @@ files:
 - lib/sassc/script/value_conversion/map.rb
 - lib/sassc/script/value_conversion/number.rb
 - lib/sassc/script/value_conversion/string.rb
+- lib/sassc/util.rb
+- lib/sassc/util/normalized_map.rb
 - lib/sassc/version.rb
 - lib/tasks/libsass.rb
 - sassc.gemspec
@@ -386,7 +380,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="