sassc 2.1.0.pre3-x64-mingw32 → 2.4.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc812093352e00086bbb17d7c21812f7d8fcde65cd084edad9e5bd49b9c7d1a3
-  data.tar.gz: 5ae96371242246a65816f4f9dc94956209809be45e93ad03b64d03bbb358338c
+  metadata.gz: aef021ba77abb64065e3844904e2f3c700111053b41d2ce9c9676c21e2ee6d51
+  data.tar.gz: e93a85d27b94d6c677106ef3defffab897557021b99b4dbbfd8fd2737aa709f1
 SHA512:
-  metadata.gz: 6939e244dbbfaed8edcadac2b8d753bade503ed8c007665b42b421db048b251709e240a625af7328b2513dbcd41a649c66f225e6f0dc4412629404bcde927c27
-  data.tar.gz: bb281865210e1ff68ebb3c9d00d1a86eb137925e19f5a673045780e04d13b3965b24af1b331e2e2ab9cd18159e6c948449074dc08a48979f6a4ba3ab6e20ee0f
+  metadata.gz: b633d7d402a16a8141b862d2412606c86ed9d400e2792e8446afa781d33c4a8f42748605c44ac3ed6535a2976342c2f13fba39ff6e26c40a3d8655fd18e3f630
+  data.tar.gz: 1e9a403743c64c4e27f4383a76e4eba0ca34187873a9614be1a2ce4ed1f92ede70b5b26156172c7ad49d599a7d7e0748c08eabebd35f74e5d71a157efc16c313

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+- **2.4.0**
+  - [Update libsass to 3.6.4](https://github.com/sass/sassc-ruby/pull/199)
+  - [Use FFI::MemoryPointer instead of libc's malloc()](https://github.com/sass/sassc-ruby/pull/205)
+  - [Test against Ruby 2.7.0](https://github.com/sass/sassc-ruby/pull/193)
+
+- **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**
+  - [Do not build precompiled gems for Linux](https://github.com/sass/sassc-ruby/pull/145)
+- **2.1.0**
+  - Equivalent to 2.1.0.pre3
 - **2.1.0.pre3**
   - [extconf.rb: Always write VERSION if we have .git](https://github.com/sass/sassc-ruby/pull/131)
   - [Update libsass to 3.6.1](https://github.com/sass/sassc-ruby/pull/130)

data/Rakefile

@@ -18,7 +18,7 @@ Rake::ExtensionTask.new('libsass', gem_spec) do |ext|
   ext.ext_dir = 'ext'
   ext.lib_dir = 'lib/sassc'
   ext.cross_compile = true
-  ext.cross_platform = %w[x86-mingw32 x64-mingw32 x86-linux x86_64-linux]
+  ext.cross_platform = %w[x86-mingw32 x64-mingw32]
 
   # Link C++ stdlib statically when building binary gems.
   ext.cross_config_options << '--enable-static-stdlib'
@@ -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 && bundle && gem i rake --no-document && "\
+  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,20 +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)
 
-      functions = FunctionWrapper.extend(Script::Functions)
-      functions.options = @options
+      # use an anonymous class wrapper to avoid mutations in a threaded environment
+      functions_wrapper = Class.new do
+        attr_accessor :options
+        include functions
+      end.new
+      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
@@ -28,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],
@@ -65,11 +69,5 @@ module SassC
       $stderr.puts "[SassC::FunctionsHandler] #{message}"
       Native.make_error(message)
     end
-
-    class FunctionWrapper
-      class << self
-        attr_accessor :options
-      end
-    end
   end
 end

data/lib/sassc/native.rb

@@ -6,8 +6,12 @@ module SassC
   module Native
     extend FFI::Library
 
-    dl_ext = (RbConfig::CONFIG['host_os'] =~ /darwin/ ? 'bundle' : 'so')
-    ffi_lib File.expand_path("libsass.#{dl_ext}", __dir__)
+    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
+      ffi_lib File.expand_path("libsass.#{dl_ext}", "#{__dir__}/../../ext")
+    end
 
     require_relative "native/sass_value"
 
@@ -30,7 +34,6 @@ module SassC
     require_relative "native/sass_input_style"
     require_relative "native/sass_output_style"
     require_relative "native/string_list"
-    require_relative "native/lib_c"
 
     # Remove the redundant "sass_" from the beginning of every method name
     def self.attach_function(*args)
@@ -49,10 +52,9 @@ module SassC
     end
 
     def self.native_string(string)
-      string = "#{string}\0"
-      data = Native::LibC.malloc(string.bytesize)
-      data.write_string(string)
-      data
+      m = FFI::MemoryPointer.from_string(string)
+      m.autorelease = false
+      m
     end
 
     require_relative "native/native_context_api"

data/lib/sassc/script.rb

@@ -3,14 +3,12 @@
 module SassC
   module Script
 
-    def self.custom_functions
-      Functions.instance_methods.select do |function|
-        Functions.public_method_defined?(function)
-      end
+    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.1.0.pre3"
+  VERSION = "2.4.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
@@ -185,6 +185,33 @@ module SassC
       CSS
     end
 
+    def test_concurrency
+      10.times do
+        threads = []
+        10.times do |i|
+          threads << Thread.new(i) do |id|
+            out = Engine.new("div { url: inspect_options(); }", {test_key1: 'test_value', test_key2: id}).render
+            assert_match /test_key1/, out
+            assert_match /test_key2/, out
+            assert_match /test_value/, out
+            assert_match /#{id}/, out
+          end
+        end
+        threads.each(&:join)
+      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)
@@ -279,6 +306,10 @@ module SassC
         return argument
       end
 
+      def inspect_options
+        SassC::Script::Value::String.new(self.options.inspect, :string)
+      end
+
       def returns_sass_value
         return SassC::Script::Value::Color.new(red: 0, green: 0, blue: 0)
       end
@@ -299,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.4", Native.version
       end
     end
 
@@ -185,9 +185,9 @@ module SassC
         funct = FFI::Function.new(:pointer, [:pointer, :pointer, :pointer]) do |url, prev, cookie|
           list = Native.make_import_list(2)
 
-          str = "$var: 5px;\0"
-          data = Native::LibC.malloc(str.size)
-          data.write_string(str)
+          str = "$var: 5px;"
+          data = FFI::MemoryPointer.from_string(str)
+          data.autorelease = false
 
           entry0 = Native.make_import_entry("fake_includ.scss", data, nil)
           entry1 = Native.make_import_entry("not_included.scss", nil, nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre3
+  version: 2.4.0
 platform: x64-mingw32
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -161,7 +161,6 @@ files:
 - lib/sassc/importer.rb
 - lib/sassc/libsass.so
 - lib/sassc/native.rb
-- lib/sassc/native/lib_c.rb
 - lib/sassc/native/native_context_api.rb
 - lib/sassc/native/native_functions_api.rb
 - lib/sassc/native/sass2scss_api.rb
@@ -215,12 +214,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      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!

data/lib/sassc/native/lib_c.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module SassC
-  module Native
-    module LibC
-      extend FFI::Library
-      ffi_lib FFI::Library::LIBC
-
-      # memory allocators
-      attach_function :malloc, [:size_t], :pointer
-      # attach_function :calloc, [:size_t], :pointer
-      # attach_function :valloc, [:size_t], :pointer
-      # attach_function :realloc, [:pointer, :size_t], :pointer
-      # attach_function :free, [:pointer], :void
-
-      # memory movers
-      # attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
-      # attach_function :bcopy, [:pointer, :pointer, :size_t], :void
-    end
-  end
-end