sassc-embedded 0.1.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0520ad895979ec3c36838b7fdf5bac2430c923f873358606e49eb72f70776109
-  data.tar.gz: 2b60642cceca432904ad4f1cd0ab43f2501164e54a33e5e964758b80f29a3828
+  metadata.gz: 5243561e8643bea221f2541af3faf2e00fb28c4d54842ee582f97f3e9784275d
+  data.tar.gz: cfc193f4fbf98a125bd410578d228612ccd2974e76f40668366a389333ae1020
 SHA512:
-  metadata.gz: 873f6c9d78221ad59c2e34f46d384496967e83480878a8e2db71de7166f2d6ec46ab960ca64f010ce7002736bfd6cea0b3a4b57f8eb7c7d020b655a77e132ba6
-  data.tar.gz: 354510f0d6a528603e3ac1aa3f32c3cb97fb166555508577e115375e4b30a34f889220fea4cd4d4eee95bbbc4c88ec62458d877535539836acb83a1bf7faaba2
+  metadata.gz: 92f34277c63720d77ebf60655e50472d26a5511dbd4d3f67a2dbf35ec459decd97764f1e6f72efcceca09c1fcb067ca4763690b287326f7f13383d930711ea3d
+  data.tar.gz: 2369e12515b4609d0c38ccca4493b94eba2255783046dbaa1611ef21fb97e5ac8f6de5d8aac6ef3fea266642e5e0cf117407881c6e58f7a6328bcfc13d40f7ac

data/README.md

@@ -19,7 +19,7 @@ gem install sassc-embedded
 This polyfill utilizes `sass-embedded` to allow you to compile SCSS or SASS syntax to CSS. To compile, use a `SassC::Engine`, e.g.:
 
 ``` ruby
-require 'sassc/embedded'
+require 'sassc-embedded'
 
 SassC::Engine.new(sass, style: :compressed).render
 ```

data/lib/sassc/embedded/version.rb

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

data/lib/sassc/embedded.rb

@@ -46,14 +46,17 @@ module SassC
       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
@@ -228,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(
@@ -271,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
@@ -293,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(
@@ -304,7 +361,7 @@ module SassC
                        when :space
                          ' '
                        else
-                         raise ArgumentError
+                         raise UnsupportedValue, "Sass list separator #{value.separator} unsupported"
                        end,
             bracketed: value.bracketed
           )
@@ -325,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
@@ -389,10 +391,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 +406,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: 0.1.3
+  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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/0.1.3
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v0.1.3
+  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: []