sass-embedded 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105fb9a8f27198dc74d89911ec31eafc40e7cf786a9567d993f584c956169014
-  data.tar.gz: e381b1d5c74d5356dfa9c6085bc7f6ed088259c90a80051dc22cbdf975fc1642
+  metadata.gz: 29224ce0b935055ad1b8a1bea0f0177d0c80ec51edcbf9fc6ad31036cbf93e30
+  data.tar.gz: 88ccf669d8cc196923c5dbbf3c488be00b22b39a6b59e18bad5bd3b3b6292981
 SHA512:
-  metadata.gz: a33ebf10f59766f644e2c88be19ea2aa72bb78a45684f65092be5c386d977437f928fa5d63a9dde96d31f777e72a6a30b36be8959a22dbc4da02c090278ff01d
-  data.tar.gz: '096e8913f2d9d4f402625d2f479e68ca772fffeaa8135ef078538af43052765753339fe9c1e3f378464f8d26d5dcffb113f2783754cd17bb24e097343a12b8fb'
+  metadata.gz: 8bfc272b296c6182dd638bc68864b8e1cdfee4f3fc3f5983ec3a870fe2506c30af87ef5477f2f62ef384ec2a22686971ed3941a74134335ecb5e47a951b45a4c
+  data.tar.gz: 49d1c4cae407da60e0831eefcce86522e5cb3403aef1d20bbc7d4cb093c814472a9143b043fee3293a18042e6464aa5195d279eef0eac21e2ce7bb5783652636

data/README.md

@@ -1,6 +1,6 @@
 # Embedded Sass Host for Ruby
 
-[![build](https://github.com/ntkme/embedded-host-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ntkme/embedded-host-ruby/actions/workflows/build.yml)
+[![build](https://github.com/ntkme/sass-embedded-host-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ntkme/sass-embedded-host-ruby/actions/workflows/build.yml)
 [![gem](https://badge.fury.io/rb/sass-embedded.svg)](https://rubygems.org/gems/sass-embedded)
 
 This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass-embedded-protocol).
@@ -20,7 +20,7 @@ The Ruby API provides two entrypoints for compiling Sass to CSS.
 - `Sass.compile` takes a path to a Sass file and return the result of compiling that file to CSS.
 
 ``` ruby
-require 'sass'
+require 'sass-embedded'
 
 result = Sass.compile('style.scss')
 puts result.css
@@ -29,7 +29,7 @@ puts result.css
 - `Sass.compile_string` takes a string that represents the contents of a Sass file and return the result of compiling that file to CSS.
 
 ``` ruby
-require 'sass'
+require 'sass-embedded'
 
 result = Sass.compile_string('h1 { font-size: 40px; }')
 puts result.css

data/ext/sass/Rakefile

@@ -63,45 +63,54 @@ module FileUtils
         sh 'unzip', '-od', dest, archive
       end
     else
-      raise "Unknown archive format #{archive}"
+      raise ArgumentError, "Unknown archive format #{archive}"
     end
   end
 
-  def fetch(uri_or_path, dest = nil)
-    require 'open-uri'
+  def fetch(source_uri, dest_path = nil)
+    require 'rubygems/remote_fetcher'
 
-    begin
-      uri = URI.parse(uri_or_path)
-      path = URI::DEFAULT_PARSER.unescape(uri.path)
-      if uri.instance_of?(URI::File) || uri.instance_of?(URI::Generic)
-        path = path.delete_prefix('/') if Gem.win_platform? && !File.file?(path)
-        raise unless File.file?(path)
+    unless source_uri.is_a?(URI::Generic)
+      begin
+        source_uri = URI.parse(source_uri)
+      rescue StandardError
+        source_uri = URI.parse(URI::DEFAULT_PARSER.escape(source_uri.to_s))
       end
-    rescue StandardError
-      raise unless File.file?(uri_or_path)
+    end
+
+    scheme = source_uri.scheme
+    source_path = URI::DEFAULT_PARSER.unescape(source_uri.path || source_uri.opaque)
 
-      uri = nil
-      path = uri_or_path
+    if Gem.win_platform? && scheme =~ /^[a-z]$/i && !source_path.include?(':')
+      source_path = "#{scheme}:#{source_path}"
+      scheme = nil
     end
 
-    dest = File.basename(path) if dest.nil?
+    dest_path = File.basename(source_path) if dest_path.nil?
 
-    if uri.nil? || uri.instance_of?(URI::File) || uri.instance_of?(URI::Generic)
-      cp path, dest
-    elsif uri.respond_to?(:open)
-      Rake.rake_output_message "curl -fsSLo #{dest} -- #{uri}" if Rake::FileUtilsExt.verbose_flag
-      unless Rake::FileUtilsExt.nowrite_flag
-        uri.open do |stream|
-          File.binwrite(dest, stream.read)
-        end
+    case scheme
+    when nil, 'file'
+      if Gem.win_platform? && source_path[0].chr == '/' && source_path[1].chr =~ /[a-z]/i && source_path[2].chr == ':'
+        source_path = source_path[1..]
       end
+      cp source_path, dest_path
     else
-      raise
+      fetcher = Gem::RemoteFetcher.fetcher
+      symbol = "fetch_#{scheme}".to_sym
+      raise ArgumentError, "Unsupported URI scheme #{scheme}" unless fetcher.respond_to?(symbol)
+
+      if Rake::FileUtilsExt.verbose_flag
+        redacted_uri = Gem::RemoteFetcher::FetchError.new('', source_uri).uri
+        Rake.rake_output_message "fetch #{redacted_uri}"
+      end
+
+      unless Rake::FileUtilsExt.nowrite_flag
+        data = fetcher.public_send(symbol, source_uri)
+        Gem.write_binary(dest_path, data)
+      end
     end
 
-    dest
-  rescue StandardError
-    raise IOError, "Failed to fetch #{uri_or_path}"
+    dest_path
   end
 end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/sass/embedded.rb

@@ -16,7 +16,58 @@ require_relative 'embedded/version'
 require_relative 'logger'
 require_relative 'value'
 
+# The Sass module.
+#
+# This communicates with Embedded Dart Sass using the Embedded Sass protocol.
+#
+# @example
+#   Sass.compile('style.scss')
+#
+# @example
+#   Sass.compile_string('h1 { font-size: 40px; }')
 module Sass
+  class << self
+    # Compiles the Sass file at +path+ to CSS.
+    # @param (see Embedded#compile)
+    # @return (see Embedded#compile)
+    # @raise (see Embedded#compile)
+    # @see Embedded#compile
+    def compile(path, **kwargs)
+      instance.compile(path, **kwargs)
+    end
+
+    # Compiles a stylesheet whose contents is +source+ to CSS.
+    # @param (see Embedded#compile_string)
+    # @return (see Embedded#compile_string)
+    # @raise (see Embedded#compile_string)
+    # @see Embedded#compile_string
+    def compile_string(source, **kwargs)
+      instance.compile_string(source, **kwargs)
+    end
+
+    # @param (see Embedded#info)
+    # @return (see Embedded#info)
+    # @raise (see Embedded#info)
+    # @see Embedded#info
+    def info
+      instance.info
+    end
+
+    private
+
+    def instance
+      if defined? @instance
+        @instance = Embedded.new if @instance.closed?
+      else
+        @instance = Embedded.new
+        at_exit do
+          @instance.close
+        end
+      end
+      @instance
+    end
+  end
+
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
   # its own communication {Channel} with a dedicated compiler process.
   #

data/lib/sass-embedded.rb

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative 'sass'
+require_relative 'sass/embedded'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -123,7 +123,6 @@ files:
 - ext/sass/package.json
 - ext/sass/unzip.vbs
 - lib/sass-embedded.rb
-- lib/sass.rb
 - lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
 - lib/sass/embedded.rb
@@ -160,8 +159,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.1.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.1.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.2.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.2.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'sass/embedded'
-
-# The Sass module.
-#
-# This communicates with Embedded Dart Sass using the Embedded Sass protocol.
-#
-# @example
-#   Sass.compile('style.scss')
-#
-# @example
-#   Sass.compile_string('h1 { font-size: 40px; }')
-module Sass
-  class << self
-    # Compiles the Sass file at +path+ to CSS.
-    # @param (see Embedded#compile)
-    # @return (see Embedded#compile)
-    # @raise (see Embedded#compile)
-    # @see Embedded#compile
-    def compile(path, **kwargs)
-      instance.compile(path, **kwargs)
-    end
-
-    # Compiles a stylesheet whose contents is +source+ to CSS.
-    # @param (see Embedded#compile_string)
-    # @return (see Embedded#compile_string)
-    # @raise (see Embedded#compile_string)
-    # @see Embedded#compile_string
-    def compile_string(source, **kwargs)
-      instance.compile_string(source, **kwargs)
-    end
-
-    # @param (see Embedded#info)
-    # @return (see Embedded#info)
-    # @raise (see Embedded#info)
-    # @see Embedded#info
-    def info
-      instance.info
-    end
-
-    private
-
-    def instance
-      if defined? @instance
-        @instance = Embedded.new if @instance.closed?
-      else
-        @instance = Embedded.new
-        at_exit do
-          @instance.close
-        end
-      end
-      @instance
-    end
-  end
-end