sassc 2.2.1-x64-mingw32 → 2.3.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075ea4c5b934656424ea13431dddca99f1dcc328c5ab414dd41e5007dd80daa1
-  data.tar.gz: 5a0c1726b247d0fb43f74f80731b92d11386961de35aae676fba8d970d84dec9
+  metadata.gz: a6bc1ff62c2fab790b9ad7fb95bd254fcb68240d77550d2b8f15d458a6159284
+  data.tar.gz: d2e0f83641bda9242b3e470ebf915f177429fd1223b64ccf0287fe734513c389
 SHA512:
-  metadata.gz: 320cce2c07fdebae40d9793f3706bbfaa61ead47fb66c471987d2e9cc00b050349a4c82f8285d8b37e6680bcb5ce5d41933066ab5a30abb209b6e4ad06beef01
-  data.tar.gz: df3c28ec06726e8a7d94eee5afe0f0faee0db693049d07b5fa098a108f61c327a17f727eb680234ea452319c7e11d3aa9d79b57749e14cfc4971d3fe6d33f489
+  metadata.gz: 6b3f194e898c456a7bcf8e6be76ed0dc848bbd1d7e370f9aac689e4ccb3c5c93c43644ac61dfb81c660c83dda3b75a39d94668f9743d00900534234f999c51d9
+  data.tar.gz: 06ada6adeb32fddc828e45347b53172bc4dbe3ed7abf6d4b9c6725447c1baa8f93b09fe8f9c8bb289e9a4b3ca02b2e871848887ad09b5ebc7d24c6bad8009a07

data/.travis.yml

@@ -10,5 +10,6 @@ rvm:
   - 2.4.6
   - 2.5.5
   - 2.6.3
+  - truffleruby
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+- **2.3.0**
+  - [Fix rake gem:native task](https://github.com/sass/sassc-ruby/pull/196)
+  - [disable lto flag for darwin + nix](https://github.com/sass/sassc-ruby/pull/166)
+  - [Sort input file list](https://github.com/sass/sassc-ruby/pull/178)
+  - [Set appropriate encoding for source_map](https://github.com/sass/sassc-ruby/pull/152)
+  - [allow passing functions directly](https://github.com/sass/sassc-ruby/pull/162)
+  - [always dispose data context](https://github.com/sass/sassc-ruby/pull/161)
+  - [Update libsass to 3.6.3](https://github.com/sass/sassc-ruby/pull/164)
+  - [Restore strip symbols](https://github.com/sass/sassc-ruby/pull/184)
+  - [Default --march-tune-native to false](https://github.com/sass/sassc-ruby/pull/158)
+  - [Fix compile issue on Mac OS X](https://github.com/sass/sassc-ruby/pull/174)
+  - [Test on TruffleRuby in TravisCI](https://github.com/sass/sassc-ruby/pull/171)
+  - [Use RbConfig::MAKEFILE_CONFIG['DLEXT'] instead of hardcoding extensions](https://github.com/sass/sassc-ruby/pull/173)
 - **2.2.1**
   - [Fix LoadError on some non-rvm environments](https://github.com/sass/sassc-ruby/pull/156)
 - **2.2.0**

data/Rakefile

@@ -36,9 +36,7 @@ task 'gem:native' do
 
   # The RUBY_CC_VERSION here doesn't matter for the final package.
   # Only one version should be specified, as the shared library is Ruby-agnostic.
-  #
-  # g++-multilib is installed for 64->32-bit cross-compilation.
-  RakeCompilerDock.sh "sudo apt-get install -y g++-multilib && gem i rake bundler --no-document && bundle && "\
+  RakeCompilerDock.sh "gem i rake bundler --no-document && bundle && "\
                       "rake clean && rake cross native gem MAKE='nice make -j`nproc`' "\
                       "RUBY_CC_VERSION=2.6.0 CLEAN=1"
 end

data/lib/sassc/engine.rb

@@ -16,6 +16,7 @@ module SassC
     def initialize(template, options = {})
       @template = template
       @options = options
+      @functions = options.fetch(:functions, Script::Functions)
     end
 
     def render
@@ -37,7 +38,7 @@ module SassC
       Native.option_set_omit_source_map_url(native_options, true) if omit_source_map_url?
 
       import_handler.setup(native_options)
-      functions_handler.setup(native_options)
+      functions_handler.setup(native_options, functions: @functions)
 
       status = Native.compile_data_context(data_context)
 
@@ -54,11 +55,12 @@ module SassC
       @dependencies = Native.context_get_included_files(context)
       @source_map   = Native.context_get_source_map_string(context)
 
-      Native.delete_data_context(data_context)
-
       css.force_encoding(@template.encoding)
+      @source_map.force_encoding(@template.encoding) if @source_map.is_a?(String)
 
       return css unless quiet?
+    ensure
+      Native.delete_data_context(data_context) if data_context
     end
 
     def dependencies

data/lib/sassc/functions_handler.rb

@@ -6,24 +6,24 @@ module SassC
       @options = options
     end
 
-    def setup(native_options)
+    def setup(native_options, functions: Script::Functions)
       @callbacks = {}
       @function_names = {}
 
-      list = Native.make_function_list(Script.custom_functions.count)
+      list = Native.make_function_list(Script.custom_functions(functions: functions).count)
 
       # use an anonymous class wrapper to avoid mutations in a threaded environment
-      functions = Class.new do
+      functions_wrapper = Class.new do
         attr_accessor :options
-        include Script::Functions
+        include functions
       end.new
-      functions.options = @options
+      functions_wrapper.options = @options
 
-      Script.custom_functions.each_with_index do |custom_function, i|
+      Script.custom_functions(functions: functions).each_with_index do |custom_function, i|
         @callbacks[custom_function] = FFI::Function.new(:pointer, [:pointer, :pointer]) do |native_argument_list, cookie|
           begin
             function_arguments = arguments_from_native_list(native_argument_list)
-            result = functions.send(custom_function, *function_arguments)
+            result = functions_wrapper.send(custom_function, *function_arguments)
             to_native_value(result)
           rescue StandardError => exception
             # This rescues any exceptions that occur either in value conversion
@@ -32,7 +32,7 @@ module SassC
           end
         end
 
-        @function_names[custom_function] = Script.formatted_function_name(custom_function)
+        @function_names[custom_function] = Script.formatted_function_name(custom_function, functions: functions)
 
         callback = Native.make_function(
           @function_names[custom_function],

data/lib/sassc/native.rb

@@ -6,7 +6,7 @@ module SassC
   module Native
     extend FFI::Library
 
-    dl_ext = (RbConfig::CONFIG['host_os'] =~ /darwin/ ? 'bundle' : 'so')
+    dl_ext = RbConfig::MAKEFILE_CONFIG['DLEXT']
     begin
       ffi_lib File.expand_path("libsass.#{dl_ext}", __dir__)
     rescue LoadError # Some non-rvm environments don't copy a shared object over to lib/sassc

data/lib/sassc/script.rb

@@ -3,12 +3,12 @@
 module SassC
   module Script
 
-    def self.custom_functions
-      Functions.public_instance_methods
+    def self.custom_functions(functions: Functions)
+      functions.public_instance_methods
     end
 
-    def self.formatted_function_name(function_name)
-      params = Functions.instance_method(function_name).parameters
+    def self.formatted_function_name(function_name, functions: Functions)
+      params = functions.instance_method(function_name).parameters
       params = params.map { |param_type, name| "$#{name}#{': null' if param_type == :opt}" }.join(", ")
       return "#{function_name}(#{params})"
     end

data/lib/sassc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SassC
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

data/test/functions_test.rb

@@ -140,7 +140,7 @@ module SassC
 
       assert_match /Error: error in C function function_that_raises_errors/, exception.message
       assert_match /Intentional wrong thing happened somewhere inside the custom function/, exception.message
-      assert_equal "[SassC::FunctionsHandler] Intentional wrong thing happened somewhere inside the custom function", stderr_output
+      assert_match /\[SassC::FunctionsHandler\] Intentional wrong thing happened somewhere inside the custom function/, stderr_output
     end
 
     def test_function_that_returns_a_sass_value
@@ -201,6 +201,17 @@ module SassC
       end
     end
 
+    def test_pass_custom_functions_as_a_parameter
+      out = Engine.new("div { url: test-function(); }", {functions: ExternalFunctions}).render
+      assert_match /custom_function/, out
+    end
+
+    def test_pass_incompatible_type_to_custom_functions
+      assert_raises(TypeError) do
+        Engine.new("div { url: test-function(); }", {functions: Class.new}).render
+      end
+    end
+
     private
 
     def assert_sass(sass, expected_css)
@@ -319,5 +330,11 @@ module SassC
 
     end
 
+    module ExternalFunctions
+      def test_function
+        SassC::Script::Value::String.new("custom_function", :string)
+      end
+    end
+
   end
 end

data/test/native_test.rb

@@ -11,7 +11,7 @@ module SassC
 
     class General < MiniTest::Test
       def test_it_reports_the_libsass_version
-        assert_equal "3.6.1", Native.version
+        assert_equal "3.6.3", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: x64-mingw32
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -219,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Use libsass with Ruby!