sassc-embedded 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa48bc9c63a5d180324a991c7b8ceb33889b158d96a46260d7426c393406ecd
-  data.tar.gz: 66e8b53ea62239dbcc8ddfb00a41b332d9569384b0275df0f0e572d3c4bb091c
+  metadata.gz: 5243561e8643bea221f2541af3faf2e00fb28c4d54842ee582f97f3e9784275d
+  data.tar.gz: cfc193f4fbf98a125bd410578d228612ccd2974e76f40668366a389333ae1020
 SHA512:
-  metadata.gz: 533e3f95958424301761fd4c599c59717c008307d0aea4fcdd2a12d89684369f590b8e003044ee967a8ac6aa21207eae530188802bd2c5c1a6a9c2efbf7e1289
-  data.tar.gz: a93ac934bd5229337a3a4daa2740624fd2d1e19c8b37764bc98cdb51f43ce964544487be3b184a962ca8c8f4c17061763d6bafb2f3daacd668c02af7e3e863ab
+  metadata.gz: 92f34277c63720d77ebf60655e50472d26a5511dbd4d3f67a2dbf35ec459decd97764f1e6f72efcceca09c1fcb067ca4763690b287326f7f13383d930711ea3d
+  data.tar.gz: 2369e12515b4609d0c38ccca4493b94eba2255783046dbaa1611ef21fb97e5ac8f6de5d8aac6ef3fea266642e5e0cf117407881c6e58f7a6328bcfc13d40f7ac

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/lib/sassc/embedded.rb

@@ -98,11 +98,7 @@ module SassC
 
       source_map_dir = File.dirname(source_map_file || '')
 
-      if output_path
-        data['file'] = Util::URI_PARSER.escape(
-          relative_path(source_map_dir, output_path)
-        )
-      end
+      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:'
@@ -112,7 +108,7 @@ module SassC
         end
       end
 
-      -JSON.generate(data)
+      JSON.generate(data)
     end
 
     def post_process_css(css)
@@ -121,13 +117,11 @@ module SassC
         url = if source_map_embed?
                 "data:application/json;base64,#{Base64.strict_encode64(@source_map)}"
               else
-                Util::URI_PARSER.escape(
-                  relative_path(File.dirname(output_path || ''), 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)
@@ -170,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
 
@@ -229,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
@@ -239,20 +233,17 @@ module SassC
         end
 
         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))
           @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(
@@ -282,6 +273,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
@@ -304,7 +350,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(
@@ -315,7 +361,7 @@ module SassC
                        when :space
                          ' '
                        else
-                         raise ArgumentError
+                         raise UnsupportedValue, "Sass list separator #{value.separator} unsupported"
                        end,
             bracketed: value.bracketed
           )
@@ -336,62 +382,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 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.1
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.1
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.0.2
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.0.2
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []