sass-embedded 0.13.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c9d477f0de8ecd58a168476206d8284b840b10df7c1cea367cd553cce11054
-  data.tar.gz: 32c45918de0b8fe090c421c0cde9ef50c5499e0272a3e43bbe173485ed10d089
+  metadata.gz: 8b1ad905f18295ab48835d21b1e6a9c644a860154b37531eeaae2f50f16f70e9
+  data.tar.gz: 229fe63046318d8ce512683d11e3868e8c70d6b28897badeb74be7757ff63e7e
 SHA512:
-  metadata.gz: e8f4a1e589659b8e811f757bfee50f821bb5b295c43ccf77c382f6c6e028ff7c160ba310204538c5792cce2512a99a580df51703ddd738399fca61db05bbd672
-  data.tar.gz: 975a2d4257ec8a72c1bd4056902c748e8eda4b5c0e4d62f13c8cd01e2e76f5f55d93b849bd273621f82ad8732d171da63c79afd0e30340041f12c752cf2f9db3
+  metadata.gz: 20bc3d260f0ac7bd9473351b7f59a08ccd1de7720afc56c027c83025924b7c986335994a4b257344e8c8435c11b5248de2d1dd512cf5e499d85eeddd1166f260
+  data.tar.gz: 5cd706afea71314dc85b47d58f3d4cb9f7ecc82a0a1ed72fc8afc5f772bd98022a8026b62eb490b7c2d9c74c1045d7edb945736078e5195f8c93f858d3f6cc7f

data/ext/sass/extconf.rb

@@ -7,10 +7,61 @@ require 'mkmf'
 require 'open-uri'
 require_relative '../../lib/sass/embedded/compiler/path'
 require_relative '../../lib/sass/embedded/compiler/requirements'
-require_relative '../../lib/sass/embedded/platform'
 
 module Sass
   class Embedded
+    module Platform
+      OS = case RbConfig::CONFIG['host_os'].downcase
+           when /linux/
+             'linux'
+           when /darwin/
+             'darwin'
+           when /freebsd/
+             'freebsd'
+           when /netbsd/
+             'netbsd'
+           when /openbsd/
+             'openbsd'
+           when /dragonfly/
+             'dragonflybsd'
+           when /sunos|solaris/
+             'solaris'
+           when *Gem::WIN_PATTERNS
+             'windows'
+           else
+             RbConfig::CONFIG['host_os'].downcase
+           end
+
+      OSVERSION = RbConfig::CONFIG['host_os'].gsub(/[^\d]/, '').to_i
+
+      CPU = RbConfig::CONFIG['host_cpu']
+
+      ARCH = case CPU.downcase
+             when /amd64|x86_64|x64/
+               'x86_64'
+             when /i\d86|x86|i86pc/
+               'i386'
+             when /ppc64|powerpc64/
+               'powerpc64'
+             when /ppc|powerpc/
+               'powerpc'
+             when /sparcv9|sparc64/
+               'sparcv9'
+             when /arm64|aarch64/ # MacOS calls it "arm64", other operating systems "aarch64"
+               'aarch64'
+             when /^arm/
+               if OS == 'darwin' # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
+                 'aarch64'
+               else
+                 'arm'
+               end
+             else
+               RbConfig::CONFIG['host_cpu']
+             end
+    end
+
+    private_constant :Platform
+
     # The dependency downloader. This downloads all the dependencies during gem
     # installation. The companion Makefile then unpacks all downloaded
     # dependencies. By default it downloads the release of each dependency

data/lib/sass/embedded/compile_context.rb

@@ -34,7 +34,7 @@ module Sass
         @path = path
         @source = source
 
-        @importer = importer
+        @importer = to_struct(importer)
         @load_paths = load_paths
         @syntax = syntax
         @url = url
@@ -48,14 +48,14 @@ module Sass
         @functions = functions.transform_keys do |key|
           key.to_s.split('(')[0].chomp
         end
-        @importers = importers
+        @importers = importers.map do |obj|
+          to_struct(obj)
+        end
 
         @alert_ascii = alert_ascii
         @alert_color = alert_color
 
-        %i[debug warn].each do |sym|
-          instance_variable_set("@#{sym}".to_sym, get_method(logger, sym))
-        end
+        @logger = to_struct(logger)
 
         @quiet_deps = quiet_deps
         @verbose = verbose
@@ -115,26 +115,26 @@ module Sass
       def log(event)
         case event.type
         when :DEBUG
-          if @debug.nil?
-            Kernel.warn(event.formatted)
+          if @logger.respond_to? :debug
+            @logger.debug(event.message, span: Logger::SourceSpan.from_proto(event.span))
           else
-            @debug.call(event.message, span: Logger::SourceSpan.from_proto(event.span))
+            Kernel.warn(event.formatted)
           end
         when :DEPRECATION_WARNING
-          if @warn.nil?
-            Kernel.warn(event.formatted)
+          if @logger.respond_to? :warn
+            @logger.warn(event.message, deprecation: true,
+                                        span: Logger::SourceSpan.from_proto(event.span),
+                                        stack: event.stack_trace)
           else
-            @warn.call(event.message, deprecation: true,
-                                      span: Logger::SourceSpan.from_proto(event.span),
-                                      stack: event.stack_trace)
+            Kernel.warn(event.formatted)
           end
         when :WARNING
-          if @warn.nil?
-            Kernel.warn(event.formatted)
+          if @logger.respond_to? :warn
+            @logger.warn(event.message, deprecation: false,
+                                        span: Logger::SourceSpan.from_proto(event.span),
+                                        stack: event.stack_trace)
           else
-            @warn.call(event.message, deprecation: false,
-                                      span: Logger::SourceSpan.from_proto(event.span),
-                                      stack: event.stack_trace)
+            Kernel.warn(event.formatted)
           end
         end
       end
@@ -145,7 +145,7 @@ module Sass
           string: unless @source.nil?
                     EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
                       source: @source,
-                      url: @url,
+                      url: @url&.to_s,
                       syntax: to_proto_syntax(@syntax),
                       importer: @importer.nil? ? nil : to_proto_importer(@importer, @importers.length)
                     )
@@ -162,9 +162,8 @@ module Sass
       end
 
       def canonicalize_response(canonicalize_request)
-        importer = importer_with_id(canonicalize_request.importer_id)
-        url = get_method(importer, :canonicalize).call canonicalize_request.url,
-                                                       from_import: canonicalize_request.from_import
+        importer = importer_of_id canonicalize_request.importer_id
+        url = importer.canonicalize(canonicalize_request.url, from_import: canonicalize_request.from_import)&.to_s
 
         EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
           id: canonicalize_request.id,
@@ -178,15 +177,15 @@ module Sass
       end
 
       def import_response(import_request)
-        importer = importer_with_id(import_request.importer_id)
-        importer_result = get_method(importer, :load).call import_request.url
+        importer = importer_of_id import_request.importer_id
+        importer_result = to_struct importer.load(import_request.url)
 
         EmbeddedProtocol::InboundMessage::ImportResponse.new(
           id: import_request.id,
           success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-            contents: get_attr(importer_result, :contents),
-            syntax: to_proto_syntax(get_attr(importer_result, :syntax)),
-            source_map_url: get_attr(importer_result, :source_map_url)
+            contents: importer_result.contents,
+            syntax: to_proto_syntax(importer_result.syntax),
+            source_map_url: importer_result.respond_to?(:source_map_url) ? importer_result.source_map_url&.to_s : nil
           )
         )
       rescue StandardError => e
@@ -197,9 +196,8 @@ module Sass
       end
 
       def file_import_response(file_import_request)
-        file_importer = importer_with_id(file_import_request.importer_id)
-        file_url = get_method(file_importer, :find_file_url).call file_import_request.url,
-                                                                  from_import: file_import_request.from_import
+        importer = importer_of_id file_import_request.importer_id
+        file_url = importer.find_file_url(file_import_request.url, from_import: file_import_request.from_import)&.to_s
 
         raise "file_url must be a file: URL, was \"#{file_url}\"" if !file_url.nil? && !file_url.start_with?('file:')
 
@@ -254,8 +252,8 @@ module Sass
       end
 
       def to_proto_importer(importer, id)
-        is_importer = get_method(importer, :canonicalize) && get_method(importer, :load)
-        is_file_importer = get_method(importer, :find_file_url)
+        is_importer = importer.respond_to?(:canonicalize) && importer.respond_to?(:load)
+        is_file_importer = importer.respond_to?(:find_file_url)
 
         if is_importer && !is_file_importer
           EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
@@ -284,7 +282,7 @@ module Sass
         proto_importers
       end
 
-      def importer_with_id(id)
+      def importer_of_id(id)
         if id == @importers.length
           @importer
         else
@@ -292,30 +290,22 @@ module Sass
         end
       end
 
-      def get_method(obj, sym)
-        sym = sym.to_sym
-        if obj.respond_to? sym
-          obj.method(sym)
-        elsif obj.respond_to? :[]
-          if obj[sym].respond_to? :call
-            obj[sym]
-          elsif obj[sym.to_s].respond_to? :call
-            obj[sym.to_s]
-          end
-        end
-      end
+      def to_struct(obj)
+        return obj unless obj.is_a? Hash
 
-      def get_attr(obj, sym)
-        sym = sym.to_sym
-        if obj.respond_to? sym
-          obj.method(sym).call
-        elsif obj.respond_to? :[]
-          if obj[sym]
-            obj[sym]
-          elsif obj[sym.to_s]
-            obj[sym.to_s]
+        struct = Object.new
+        obj.each do |key, value|
+          if value.respond_to? :call
+            struct.define_singleton_method key.to_sym do |*args, **kwargs|
+              value.call(*args, **kwargs)
+            end
+          else
+            struct.define_singleton_method key.to_sym do
+              value
+            end
           end
         end
+        struct
       end
     end
   end

data/lib/sass/embedded/compiler/path.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../platform'
-
 module Sass
   class Embedded
     class Compiler
       PATH = File.absolute_path(
-        "../../../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
+        "../../../../ext/sass/sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__
       )
     end
   end

data/lib/sass/embedded/render.rb

@@ -3,7 +3,7 @@
 require 'base64'
 require 'json'
 require 'pathname'
-require_relative 'url'
+require 'uri'
 
 module Sass
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
@@ -309,11 +309,17 @@ module Sass
         raise result if result.is_a? StandardError
 
         if result&.key? :contents
-          @importer_results[canonical_url] = ImporterResult.new(result[:contents], :scss)
+          @importer_results[canonical_url] = {
+            contents: result[:contents],
+            syntax: :scss
+          }
           canonical_url
         elsif result&.key? :file
           canonical_url = Url.path_to_file_url(File.absolute_path(result[:file]))
-          @importer_results[canonical_url] = ImporterResult.new(File.read(result[:file]), :scss)
+          @importer_results[canonical_url] = {
+            contents: File.read(result[:file]),
+            syntax: :scss
+          }
           canonical_url
         end
       end
@@ -323,6 +329,35 @@ module Sass
       end
     end
 
+    # @deprecated
+    # The {Url} module.
+    module Url
+      # The {::URI::Parser} that is in consistent with RFC 2396 (URI Generic Syntax) and dart:core library.
+      URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+
+      FILE_SCHEME = 'file://'
+
+      private_constant :URI_PARSER, :FILE_SCHEME
+
+      module_function
+
+      def path_to_file_url(path)
+        if File.absolute_path? path
+          URI_PARSER.escape "#{FILE_SCHEME}#{Gem.win_platform? ? '/' : ''}#{path}"
+        else
+          URI_PARSER.escape path
+        end
+      end
+
+      def file_url_to_path(url)
+        if url.start_with? FILE_SCHEME
+          URI_PARSER.unescape url[(FILE_SCHEME.length + (Gem.win_platform? ? 1 : 0))..]
+        else
+          URI_PARSER.unescape url
+        end
+      end
+    end
+
     private_constant :LegacyImporter
   end
 end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.13.2'
+    VERSION = '0.15.0'
   end
 end

data/lib/sass/embedded.rb

@@ -2,11 +2,9 @@
 
 require_relative 'compile_error'
 require_relative 'compile_result'
-require_relative 'importer_result'
 require_relative 'embedded/channel'
 require_relative 'embedded/compile_context'
-require_relative 'embedded/render'
-require_relative 'embedded/url'
+require_relative 'embedded/render' # deprecated
 require_relative 'embedded/version'
 require_relative 'embedded/version_context'
 require_relative 'logger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.15.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -175,16 +175,11 @@ files:
 - lib/sass/embedded/compiler/path.rb
 - lib/sass/embedded/compiler/requirements.rb
 - lib/sass/embedded/observer.rb
-- lib/sass/embedded/platform.rb
 - lib/sass/embedded/protocol_error.rb
 - lib/sass/embedded/render.rb
-- lib/sass/embedded/url.rb
 - lib/sass/embedded/version.rb
 - lib/sass/embedded/version_context.rb
 - lib/sass/embedded_protocol.rb
-- lib/sass/file_importer.rb
-- lib/sass/importer.rb
-- lib/sass/importer_result.rb
 - lib/sass/logger.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
@@ -192,8 +187,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.13.2
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.13.2
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.15.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.15.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass/embedded/platform.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    module Platform
-      OS = case RbConfig::CONFIG['host_os'].downcase
-           when /linux/
-             'linux'
-           when /darwin/
-             'darwin'
-           when /freebsd/
-             'freebsd'
-           when /netbsd/
-             'netbsd'
-           when /openbsd/
-             'openbsd'
-           when /dragonfly/
-             'dragonflybsd'
-           when /sunos|solaris/
-             'solaris'
-           when /mingw|mswin/
-             'windows'
-           else
-             RbConfig::CONFIG['host_os'].downcase
-           end
-
-      OSVERSION = RbConfig::CONFIG['host_os'].gsub(/[^\d]/, '').to_i
-
-      CPU = RbConfig::CONFIG['host_cpu']
-
-      ARCH = case CPU.downcase
-             when /amd64|x86_64|x64/
-               'x86_64'
-             when /i\d86|x86|i86pc/
-               'i386'
-             when /ppc64|powerpc64/
-               'powerpc64'
-             when /ppc|powerpc/
-               'powerpc'
-             when /sparcv9|sparc64/
-               'sparcv9'
-             when /arm64|aarch64/ # MacOS calls it "arm64", other operating systems "aarch64"
-               'aarch64'
-             when /^arm/
-               if OS == 'darwin'   # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
-                 'aarch64'
-               else
-                 'arm'
-               end
-             else
-               RbConfig::CONFIG['host_cpu']
-             end
-    end
-  end
-end

data/lib/sass/embedded/url.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'uri'
-
-module Sass
-  class Embedded
-    # The {Url} module.
-    module Url
-      # The {::URI::Parser} that is in consistent with RFC 2396 (URI Generic Syntax) and dart:core library.
-      URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
-
-      FILE_SCHEME = 'file://'
-
-      private_constant :URI_PARSER, :FILE_SCHEME
-
-      module_function
-
-      def path_to_file_url(path)
-        if File.absolute_path? path
-          URI_PARSER.escape "#{FILE_SCHEME}#{Platform::OS == 'windows' ? File::SEPARATOR : ''}#{path}"
-        else
-          URI_PARSER.escape path
-        end
-      end
-
-      def file_url_to_path(url)
-        if url.start_with? FILE_SCHEME
-          URI_PARSER.unescape url[(FILE_SCHEME.length + (Platform::OS == 'windows' ? 1 : 0))..]
-        else
-          URI_PARSER.unescape url
-        end
-      end
-    end
-  end
-end

data/lib/sass/file_importer.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # The {FileImporter} interface.
-  class FileImporter
-    def find_file_url(url, from_import:) # rubocop:disable Lint/UnusedMethodArgument
-      raise NotImplementedError, 'FileImporter#find_file_url must be implemented'
-    end
-  end
-end

data/lib/sass/importer.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # The {Importer} interface.
-  class Importer
-    def canonicalize(url) # rubocop:disable Lint/UnusedMethodArgument
-      raise NotImplementedError, 'Importer#canonicalize must be implemented'
-    end
-
-    def load(canonical_url) # rubocop:disable Lint/UnusedMethodArgument
-      raise NotImplementedError, 'Importer#load must be implemented'
-    end
-  end
-end

data/lib/sass/importer_result.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # The {ImporterResult} of {Importer#load}.
-  class ImporterResult
-    attr_reader :contents, :syntax, :source_map_url
-
-    def initialize(contents, syntax, source_map_url = nil)
-      @contents = contents
-      @syntax = syntax
-      @source_map_url = source_map_url
-    end
-  end
-end