sass-embedded 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c998b528ffddfc218f32dbefa09559dbdf519cf8a430f8dc9a58d4cae8a7b2a
-  data.tar.gz: 84bb150040b3e01d68b7673f00ab08041deb98e357cb653a01ca99e40569f553
+  metadata.gz: 8b1ad905f18295ab48835d21b1e6a9c644a860154b37531eeaae2f50f16f70e9
+  data.tar.gz: 229fe63046318d8ce512683d11e3868e8c70d6b28897badeb74be7757ff63e7e
 SHA512:
-  metadata.gz: cb4dd021d2dfd85b652dcf88c523e106c84a8ebcfa8e158c02f5a8b43aa4fc852b506dd39b33cf83766253be59bb084b7612a49165883eca4062c9c17b5f1a25
-  data.tar.gz: d804392b2bc53fccba57c2d68c86f9118ffe80c24c854cea62b462738185634d59af4e41fc8ea86fabe0db120e16133d15bb3f2822ad3064c1c4e7c467796871
+  metadata.gz: 20bc3d260f0ac7bd9473351b7f59a08ccd1de7720afc56c027c83025924b7c986335994a4b257344e8c8435c11b5248de2d1dd512cf5e499d85eeddd1166f260
+  data.tar.gz: 5cd706afea71314dc85b47d58f3d4cb9f7ecc82a0a1ed72fc8afc5f772bd98022a8026b62eb490b7c2d9c74c1045d7edb945736078e5195f8c93f858d3f6cc7f

data/lib/sass/embedded/compile_context.rb

@@ -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)
                     )
@@ -163,8 +163,7 @@ module Sass
 
       def canonicalize_response(canonicalize_request)
         importer = importer_of_id canonicalize_request.importer_id
-        url = importer.canonicalize canonicalize_request.url,
-                                    from_import: canonicalize_request.from_import
+        url = importer.canonicalize(canonicalize_request.url, from_import: canonicalize_request.from_import)&.to_s
 
         EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
           id: canonicalize_request.id,
@@ -186,7 +185,7 @@ module Sass
           success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
             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 : nil
+            source_map_url: importer_result.respond_to?(:source_map_url) ? importer_result.source_map_url&.to_s : nil
           )
         )
       rescue StandardError => e
@@ -198,8 +197,7 @@ module Sass
 
       def file_import_response(file_import_request)
         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
+        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:')
 

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.14.0'
+    VERSION = '0.15.0'
   end
 end

data/lib/sass/embedded.rb

@@ -4,11 +4,9 @@ require_relative 'compile_error'
 require_relative 'compile_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 'importer_result'
 require_relative 'logger'
 
 module Sass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - なつき
@@ -177,13 +177,9 @@ files:
 - lib/sass/embedded/observer.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
@@ -191,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.14.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.14.0
+  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/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}#{Gem.win_platform? ? 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 + (Gem.win_platform? ? 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