sassc-embedded 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0678b3173a808bb49c1772c1188fa5401989602679332cda0b016d98252dfe
-  data.tar.gz: 280d458c11585dcdfe5915ad55a2079b323d6b520dd54c6b4f716fcddcfd8c3c
+  metadata.gz: 653470aa52eea5c7abe494d8ac3580ac2b5d7c1029286586751a73faf74aa55c
+  data.tar.gz: 99e69744a6cbc30974008b302929cb3eea966645ec9c199667180ce944eb58b3
 SHA512:
-  metadata.gz: a636e215cd5db491aedf47b256b6f4111e14933a8ac299b74001a18a90e5d4f8b27f554a5667d419b28b7c5fa4288ef03ec4263dd0388b1aedc8698b357b5c4e
-  data.tar.gz: da72a50497341ff4a461e9d0f946a885eb516a18961b25a68176b2abf5e82116077bc92d0e57a34b7c6d33f6b0e7304b7d66333d7f21e7ac961b412062e19465
+  metadata.gz: 73f16f7eb7fae394d7ff2d7e98ae451e13caa17fc89cb89f55a17e572f869389c5d202ef0c0327610d00aaafcfeb9a8e5e610b0463c71d5ba0bf088a3f4af6c9
+  data.tar.gz: '03942b1cc4f56e4b84402143bf85f5d97dae0a7f3b89d43c1b5dc246526856c5a6cc5936609362c5eb8d584a5a2054c34624a37dec7724f9cbec530e931fc1bb'

data/README.md

@@ -29,8 +29,13 @@ See [rubydoc.info/gems/sassc](https://rubydoc.info/gems/sassc) for full API docu
 ## Behavioral Differences from SassC Ruby
 
 1. Option `:style => :nested` behaves as `:expanded`.
+
 2. Option `:style => :compact` behaves as `:compressed`.
+
 3. Option `:precision` is ignored.
+
 4. Option `:line_comments` is ignored.
-5. Argument `parent_path` in `Importer#imports` is set to value of option `:filename`.
-6. See [the dart-sass documentation](https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass) for other differences.
+
+5. In `Importer#imports(path, parent_path)`, argument `path` is set to absolute path, and argument `parent_path` is set to value of option `:filename`.
+
+See [the dart-sass documentation](https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass) for other differences.

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.0.0'
+    VERSION = '1.0.3'
   end
 end

data/lib/sassc/embedded.rb

@@ -39,21 +39,24 @@ module SassC
       @dependencies = result.loaded_urls
                             .filter { |url| url.start_with?('file:') && url != file_url }
                             .map { |url| Util.file_url_to_path(url) }
-      @source_map   = post_process_source_map(result.source_map)
+      @source_map = post_process_source_map(result.source_map)
 
       return post_process_css(result.css) unless quiet?
     rescue ::Sass::CompileError => e
       line = e.span&.start&.line
       line += 1 unless line.nil?
       path = Util.file_url_to_path(e.span&.url)
-      path = relative_path(Dir.pwd, path)
+      path = relative_path(Dir.pwd, path) unless path.nil?
       raise SyntaxError.new(e.message, filename: path, line: line)
     end
 
     private
 
     def output_path
-      @options[:output_path]
+      @output_path ||= @options.fetch(
+        :output_path,
+        ("#{File.basename(filename, File.extname(filename))}.css" if filename)
+      )
     end
 
     def file_url
@@ -93,17 +96,19 @@ module SassC
 
       data = JSON.parse(source_map)
 
-      data['file'] = URI::DEFAULT_PARSER.escape(output_path) if output_path
+      source_map_dir = File.dirname(source_map_file || '')
+
+      data['file'] = Util::URI_PARSER.escape(relative_path(source_map_dir, output_path)) if output_path
 
       data['sources'].map! do |source|
         if source.start_with? 'file:'
-          relative_path(Dir.pwd, Util.file_url_to_path(source))
+          relative_path(source_map_dir, Util.file_url_to_path(source))
         else
           source
         end
       end
 
-      -JSON.generate(data)
+      JSON.generate(data)
     end
 
     def post_process_css(css)
@@ -112,15 +117,15 @@ module SassC
         url = if source_map_embed?
                 "data:application/json;base64,#{Base64.strict_encode64(@source_map)}"
               else
-                URI::DEFAULT_PARSER.escape(source_map_file)
+                Util::URI_PARSER.escape(relative_path(File.dirname(output_path || ''), source_map_file))
               end
         css += "\n/*# sourceMappingURL=#{url} */"
       end
-      -css
+      css
     end
 
     def relative_path(from, to)
-      Pathname.new(to).relative_path_from(Pathname.new(from)).to_s
+      Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
     end
   end
 
@@ -159,7 +164,7 @@ module SassC
 
     def arguments_from_native_list(native_argument_list)
       native_argument_list.map do |embedded_value|
-        Script::ValueConversion.from_native embedded_value
+        Script::ValueConversion.from_native embedded_value, @options
       end
     end
 
@@ -218,7 +223,7 @@ module SassC
           return canonical_url
         end
 
-        canonical_url = "sass-importer-shim:#{canonical_url}"
+        canonical_url = "sassc-embedded:#{canonical_url}"
 
         imports = @importer.imports path, @importer.options[:filename]
         unless imports.is_a? Array
@@ -227,25 +232,25 @@ module SassC
           imports = [imports]
         end
 
+        dirname = File.dirname(@importer.options.fetch(:filename, 'stdin'))
         contents = imports.map do |import|
-          import_path = File.absolute_path(import.path)
-          import_url = Util.path_to_file_url(import_path)
+          import_url = Util.path_to_file_url(File.absolute_path(import.path, dirname))
           @importer_results[import_url] = if import.source
                                             {
                                               contents: import.source,
                                               syntax: case import.path
-                                                      when /\.scss$/i
-                                                        :scss
                                                       when /\.sass$/i
                                                         :indented
                                                       when /\.css$/i
                                                         :css
                                                       else
-                                                        raise ArgumentError
+                                                        :scss
                                                       end,
                                               source_map_url: if import.source_map_path
                                                                 Util.path_to_file_url(
-                                                                  File.absolute_path(import.source_map_path, path)
+                                                                  File.absolute_path(
+                                                                    import.source_map_path, dirname
+                                                                  )
                                                                 )
                                                               end
                                             }
@@ -271,6 +276,61 @@ module SassC
 
   module Script
     module ValueConversion
+      def self.from_native(value, options)
+        case value
+        when ::Sass::Value::Null::NULL
+          nil
+        when ::Sass::Value::Boolean
+          ::SassC::Script::Value::Bool.new(value.to_bool)
+        when ::Sass::Value::Color
+          if value.instance_eval { defined? @hue }
+            ::SassC::Script::Value::Color.new(
+              hue: value.hue,
+              saturation: value.saturation,
+              lightness: value.lightness,
+              alpha: value.alpha
+            )
+          else
+            ::SassC::Script::Value::Color.new(
+              red: value.red,
+              green: value.green,
+              blue: value.blue,
+              alpha: value.alpha
+            )
+          end
+        when ::Sass::Value::List
+          ::SassC::Script::Value::List.new(
+            value.to_a.map { |element| from_native(element, options) },
+            separator: case value.separator
+                       when ','
+                         :comma
+                       when ' '
+                         :space
+                       else
+                         raise UnsupportedValue, "Sass list separator #{value.separator} unsupported"
+                       end,
+            bracketed: value.bracketed?
+          )
+        when ::Sass::Value::Map
+          ::SassC::Script::Value::Map.new(
+            value.contents.to_a.to_h { |k, v| [from_native(k, options), from_native(v, options)] }
+          )
+        when ::Sass::Value::Number
+          ::SassC::Script::Value::Number.new(
+            value.value,
+            value.numerator_units,
+            value.denominator_units
+          )
+        when ::Sass::Value::String
+          ::SassC::Script::Value::String.new(
+            value.text,
+            value.quoted? ? :string : :identifier
+          )
+        else
+          raise UnsupportedValue, "Sass argument of type #{value.class.name.split('::').last} unsupported"
+        end
+      end
+
       def self.to_native(value)
         case value
         when nil
@@ -293,7 +353,7 @@ module SassC
               alpha: value.alpha
             )
           else
-            raise ArgumentError
+            raise UnsupportedValue, "Sass color mode #{value.instance_eval { @mode }} unsupported"
           end
         when ::SassC::Script::Value::List
           ::Sass::Value::List.new(
@@ -304,7 +364,7 @@ module SassC
                        when :space
                          ' '
                        else
-                         raise ArgumentError
+                         raise UnsupportedValue, "Sass list separator #{value.separator} unsupported"
                        end,
             bracketed: value.bracketed
           )
@@ -325,62 +385,7 @@ module SassC
             quoted: value.type != :identifier
           )
         else
-          raise ArgumentError
-        end
-      end
-
-      def self.from_native(value)
-        case value
-        when ::Sass::Value::Null::NULL
-          nil
-        when ::Sass::Value::Boolean
-          ::SassC::Script::Value::Bool.new(value.to_bool)
-        when ::Sass::Value::Color
-          if value.instance_eval { defined? @hue }
-            ::SassC::Script::Value::Color.new(
-              hue: value.hue,
-              saturation: value.saturation,
-              lightness: value.lightness,
-              alpha: value.alpha
-            )
-          else
-            ::SassC::Script::Value::Color.new(
-              red: value.red,
-              green: value.green,
-              blue: value.blue,
-              alpha: value.alpha
-            )
-          end
-        when ::Sass::Value::List
-          ::SassC::Script::Value::List.new(
-            value.to_a.map { |element| from_native(element) },
-            separator: case value.separator
-                       when ','
-                         :comma
-                       when ' '
-                         :space
-                       else
-                         raise ArgumentError
-                       end,
-            bracketed: value.bracketed?
-          )
-        when ::Sass::Value::Map
-          ::SassC::Script::Value::Map.new(
-            value.contents.to_a.to_h { |k, v| [from_native(k), from_native(v)] }
-          )
-        when ::Sass::Value::Number
-          ::SassC::Script::Value::Number.new(
-            value.value,
-            value.numerator_units,
-            value.denominator_units
-          )
-        when ::Sass::Value::String
-          ::SassC::Script::Value::String.new(
-            value.text,
-            value.quoted? ? :string : :identifier
-          )
-        else
-          raise ArgumentError
+          raise UnsupportedValue, "Sass return type #{value.class.name.split('::').last} unsupported"
         end
       end
     end
@@ -389,10 +394,12 @@ module SassC
   module Util
     module_function
 
+    URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+
     def file_url_to_path(url)
       return if url.nil?
 
-      path = URI::DEFAULT_PARSER.unescape(URI.parse(url).path)
+      path = URI_PARSER.unescape(URI.parse(url).path)
       path = path[1..] if Gem.win_platform? && path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
       path
     end
@@ -402,7 +409,7 @@ module SassC
 
       path = File.absolute_path(path)
       path = "/#{path}" unless path.start_with? '/'
-      URI::File.build([nil, URI::DEFAULT_PARSER.escape(path)]).to_s
+      URI::File.build([nil, URI_PARSER.escape(path)]).to_s
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.0.0
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.0
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.0.3
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.3
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []