sassc 2.2.1 → 2.4.0

data/ext/libsass/src/util_string.hpp

@@ -1,19 +1,73 @@
 #ifndef SASS_UTIL_STRING_H
 #define SASS_UTIL_STRING_H
 
+#include "sass.hpp"
 #include <string>
 
 namespace Sass {
-namespace Util {
+  namespace Util {
 
-std::string rtrim(const std::string& str);
+    // ##########################################################################
+    // Special case insensitive string matcher. We can optimize
+    // the more general compare case quite a bit by requiring
+    // consumers to obey some rules (lowercase and no space).
+    // - `literal` must only contain lower case ascii characters
+    // there is one edge case where this could give false positives
+    // test could contain a (non-ascii) char exactly 32 below literal
+    // ##########################################################################
+    bool equalsLiteral(const char* lit, const sass::string& test);
 
-std::string normalize_newlines(const std::string& str);
-std::string normalize_underscores(const std::string& str);
-std::string normalize_decimals(const std::string& str);
-char opening_bracket_for(char closing_bracket);
-char closing_bracket_for(char opening_bracket);
+    // ###########################################################################
+    // Returns [name] without a vendor prefix.
+    // If [name] has no vendor prefix, it's returned as-is.
+    // ###########################################################################
+    sass::string unvendor(const sass::string& name);
 
-}  // namespace Sass
+    sass::string rtrim(sass::string str);
+    sass::string normalize_newlines(const sass::string& str);
+    sass::string normalize_underscores(const sass::string& str);
+    sass::string normalize_decimals(const sass::string& str);
+    char opening_bracket_for(char closing_bracket);
+    char closing_bracket_for(char opening_bracket);
+
+    // Locale-independent ASCII character routines.
+
+    inline bool ascii_isalpha(unsigned char c) {
+      return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
+    }
+
+    inline bool ascii_isdigit(unsigned char c) {
+      return (c >= '0' && c <= '9');
+    }
+
+    inline bool ascii_isalnum(unsigned char c) {
+      return ascii_isalpha(c) || ascii_isdigit(c);
+    }
+
+    inline bool ascii_isascii(unsigned char c) { return c < 128; }
+
+    inline bool ascii_isxdigit(unsigned char c) {
+      return ascii_isdigit(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+    }
+
+    inline bool ascii_isspace(unsigned char c) {
+      return c == ' ' || c == '\t' || c == '\v' || c == '\f' || c == '\r' || c == '\n';
+    }
+
+    inline char ascii_tolower(unsigned char c) {
+      if (c >= 'A' && c <= 'Z') return c + 32;
+      return c;
+    }
+
+    void ascii_str_tolower(sass::string* s);
+
+    inline char ascii_toupper(unsigned char c) {
+      if (c >= 'a' && c <= 'z') return c - 32;
+      return c;
+    }
+
+    void ascii_str_toupper(sass::string* s);
+
+  }  // namespace Sass
 }  // namespace Util
 #endif  // SASS_UTIL_STRING_H

data/ext/libsass/src/values.cpp

@@ -32,7 +32,7 @@ namespace Sass {
       const List* l = Cast<List>(val);
       union Sass_Value* list = sass_make_list(l->size(), l->separator(), l->is_bracketed());
       for (size_t i = 0, L = l->length(); i < L; ++i) {
-        Expression_Obj obj = l->at(i);
+        ExpressionObj obj = l->at(i);
         auto val = ast_node_to_sass_value(obj);
         sass_list_set_value(list, i, val);
       }
@@ -42,7 +42,7 @@ namespace Sass {
     {
       const Map* m = Cast<Map>(val);
       union Sass_Value* map = sass_make_map(m->length());
-      size_t i = 0; for (Expression_Obj key : m->keys()) {
+      size_t i = 0; for (ExpressionObj key : m->keys()) {
         sass_map_set_key(map, i, ast_node_to_sass_value(key));
         sass_map_set_value(map, i, ast_node_to_sass_value(m->at(key)));
         ++ i;
@@ -78,17 +78,17 @@ namespace Sass {
     switch (sass_value_get_tag(val)) {
       case SASS_NUMBER:
         return SASS_MEMORY_NEW(Number,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_number_get_value(val),
                                sass_number_get_unit(val));
       case SASS_BOOLEAN:
         return SASS_MEMORY_NEW(Boolean,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_boolean_get_value(val));
       case SASS_COLOR:
         // ToDo: allow to also use HSLA colors!!
         return SASS_MEMORY_NEW(Color_RGBA,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_color_get_r(val),
                                sass_color_get_g(val),
                                sass_color_get_b(val),
@@ -96,15 +96,15 @@ namespace Sass {
       case SASS_STRING:
         if (sass_string_is_quoted(val)) {
           return SASS_MEMORY_NEW(String_Quoted,
-                                 ParserState("[C-VALUE]"),
+                                 SourceSpan("[C-VALUE]"),
                                  sass_string_get_value(val));
         }
         return SASS_MEMORY_NEW(String_Constant,
-                                 ParserState("[C-VALUE]"),
+                                 SourceSpan("[C-VALUE]"),
                                  sass_string_get_value(val));
       case SASS_LIST: {
         List* l = SASS_MEMORY_NEW(List,
-                                  ParserState("[C-VALUE]"),
+                                  SourceSpan("[C-VALUE]"),
                                   sass_list_get_length(val),
                                   sass_list_get_separator(val));
         for (size_t i = 0, L = sass_list_get_length(val); i < L; ++i) {
@@ -114,7 +114,7 @@ namespace Sass {
         return l;
       }
       case SASS_MAP: {
-        Map* m = SASS_MEMORY_NEW(Map, ParserState("[C-VALUE]"));
+        Map* m = SASS_MEMORY_NEW(Map, SourceSpan("[C-VALUE]"));
         for (size_t i = 0, L = sass_map_get_length(val); i < L; ++i) {
           *m << std::make_pair(
             sass_value_to_ast_node(sass_map_get_key(val, i)),
@@ -123,14 +123,14 @@ namespace Sass {
         return m;
       }
       case SASS_NULL:
-        return SASS_MEMORY_NEW(Null, ParserState("[C-VALUE]"));
+        return SASS_MEMORY_NEW(Null, SourceSpan("[C-VALUE]"));
       case SASS_ERROR:
         return SASS_MEMORY_NEW(Custom_Error,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_error_get_message(val));
       case SASS_WARNING:
         return SASS_MEMORY_NEW(Custom_Warning,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_warning_get_message(val));
       default: break;
     }

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
@@ -34,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)
@@ -53,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,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.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
@@ -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.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.2.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -164,6 +164,7 @@ files:
 - ext/libsass/include/sass/values.h
 - ext/libsass/include/sass/version.h
 - ext/libsass/include/sass2scss.h
+- ext/libsass/src/MurmurHash2.hpp
 - ext/libsass/src/ast.cpp
 - ext/libsass/src/ast.hpp
 - ext/libsass/src/ast2c.cpp
@@ -171,8 +172,11 @@ files:
 - ext/libsass/src/ast_def_macros.hpp
 - ext/libsass/src/ast_fwd_decl.cpp
 - ext/libsass/src/ast_fwd_decl.hpp
+- ext/libsass/src/ast_helpers.hpp
 - ext/libsass/src/ast_sel_cmp.cpp
+- ext/libsass/src/ast_sel_super.cpp
 - ext/libsass/src/ast_sel_unify.cpp
+- ext/libsass/src/ast_sel_weave.cpp
 - ext/libsass/src/ast_selectors.cpp
 - ext/libsass/src/ast_selectors.hpp
 - ext/libsass/src/ast_supports.cpp
@@ -201,6 +205,7 @@ files:
 - ext/libsass/src/context.hpp
 - ext/libsass/src/cssize.cpp
 - ext/libsass/src/cssize.hpp
+- ext/libsass/src/dart_helpers.hpp
 - ext/libsass/src/debug.hpp
 - ext/libsass/src/debugger.hpp
 - ext/libsass/src/emitter.cpp
@@ -211,10 +216,13 @@ files:
 - ext/libsass/src/error_handling.hpp
 - ext/libsass/src/eval.cpp
 - ext/libsass/src/eval.hpp
+- ext/libsass/src/eval_selectors.cpp
 - ext/libsass/src/expand.cpp
 - ext/libsass/src/expand.hpp
-- ext/libsass/src/extend.cpp
-- ext/libsass/src/extend.hpp
+- ext/libsass/src/extender.cpp
+- ext/libsass/src/extender.hpp
+- ext/libsass/src/extension.cpp
+- ext/libsass/src/extension.hpp
 - ext/libsass/src/file.cpp
 - ext/libsass/src/file.hpp
 - ext/libsass/src/fn_colors.cpp
@@ -243,18 +251,23 @@ files:
 - ext/libsass/src/listize.cpp
 - ext/libsass/src/listize.hpp
 - ext/libsass/src/mapping.hpp
-- ext/libsass/src/memory/SharedPtr.cpp
-- ext/libsass/src/memory/SharedPtr.hpp
-- ext/libsass/src/node.cpp
-- ext/libsass/src/node.hpp
+- ext/libsass/src/memory.hpp
+- ext/libsass/src/memory/allocator.cpp
+- ext/libsass/src/memory/allocator.hpp
+- ext/libsass/src/memory/config.hpp
+- ext/libsass/src/memory/memory_pool.hpp
+- ext/libsass/src/memory/shared_ptr.cpp
+- ext/libsass/src/memory/shared_ptr.hpp
 - ext/libsass/src/operation.hpp
 - ext/libsass/src/operators.cpp
 - ext/libsass/src/operators.hpp
+- ext/libsass/src/ordered_map.hpp
 - ext/libsass/src/output.cpp
 - ext/libsass/src/output.hpp
 - ext/libsass/src/parser.cpp
 - ext/libsass/src/parser.hpp
-- ext/libsass/src/paths.hpp
+- ext/libsass/src/parser_selectors.cpp
+- ext/libsass/src/permutate.hpp
 - ext/libsass/src/plugins.cpp
 - ext/libsass/src/plugins.hpp
 - ext/libsass/src/position.cpp
@@ -270,14 +283,16 @@ files:
 - ext/libsass/src/sass_context.hpp
 - ext/libsass/src/sass_functions.cpp
 - ext/libsass/src/sass_functions.hpp
-- ext/libsass/src/sass_util.cpp
-- ext/libsass/src/sass_util.hpp
 - ext/libsass/src/sass_values.cpp
 - ext/libsass/src/sass_values.hpp
+- ext/libsass/src/settings.hpp
+- ext/libsass/src/source.cpp
+- ext/libsass/src/source.hpp
+- ext/libsass/src/source_data.hpp
 - ext/libsass/src/source_map.cpp
 - ext/libsass/src/source_map.hpp
-- ext/libsass/src/subset_map.cpp
-- ext/libsass/src/subset_map.hpp
+- ext/libsass/src/stylesheet.cpp
+- ext/libsass/src/stylesheet.hpp
 - ext/libsass/src/to_value.cpp
 - ext/libsass/src/to_value.hpp
 - ext/libsass/src/units.cpp
@@ -302,7 +317,6 @@ files:
 - lib/sassc/import_handler.rb
 - lib/sassc/importer.rb
 - 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
@@ -360,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Use libsass with Ruby!