sass-embedded 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 604bb4648958324aedb4a486c281994eb04bc6a2e685e946c07e62ca83ded8ed
-  data.tar.gz: 14730abcf938ee7fe9410a1f0055292c6abf95c95a1a7ab2c6f0d7dc3f2893c8
+  metadata.gz: 8152265aec1c4adf4ec89b826191a97f202b14bf86cf4093e679f8c24cd2d5af
+  data.tar.gz: 7b0d5d870ed38bf59562f617ad75cf2a3085704e0cc802989d21e15e9f14ee9b
 SHA512:
-  metadata.gz: 629f7ec2916c32f7821153b47c4c6ebeba09d3995d89273113e9b2ebdb0d477eca9f4ae027fd5144e4b6bdc52c83d2eedc9ca8edcac3d1ea6b79f5f86d528f04
-  data.tar.gz: 2b89c4871759f23a1c3e69d53ca61b1a8e45804435e0d84800beec43aa2bc860c707e3a5d10910e855cbf9d3fece3de658c97739b491b26a1c6aba43dec94fa9
+  metadata.gz: 0d037a1fe518298f2976d99d947544642325fa763315e539115422fb78b0f185d35f6c3b97cb97ec373ae04b70984f772f3915ec35974a450095e1f5f3366d88
+  data.tar.gz: 3844e6926954c302259f55a609e2e63a971c472580026ada05d13753dbebb4fb7bc4a13299c47b93a643b9fceaf742063e8a8b7b78f4ae541408eb4041e877b0

data/ext/sass_embedded/extconf.rb

@@ -65,7 +65,7 @@ end
 def download_protoc
   repo = "protocolbuffers/protobuf"
 
-  tag = URI.open('https://github.com/protocolbuffers/protobuf/releases/latest') { |file|
+  tag = URI.open("https://github.com/#{repo}/releases/latest") { |file|
     File.basename file.base_uri.to_s
   }
 

data/lib/sass.rb

@@ -3,9 +3,9 @@
 module Sass
   # The global include_paths for Sass files. This is meant for plugins and
   # libraries to register the paths to their Sass stylesheets to that they may
-  # be `@imported`. This includes path is used by every instance of
-  # {Sass::Embedded::Compiler}. They are lower-precedence than any includes
-  # paths passed in via the `:includes_paths` option.
+  # be `@imported`. This include path is used by every instance of
+  # {Sass::Embedded::Compiler}. They are lower-precedence than any include
+  # paths passed in via the `:include_paths` option.
   #
   # If the `SASS_PATH` environment variable is set,
   # the initial value of `include_paths` will be initialized based on that.
@@ -16,11 +16,11 @@ module Sass
   #   Sass.include_paths << File.dirname(__FILE__ + '/sass')
   # @return [Array<String, Pathname>]
   def self.include_paths
-    @includes_paths ||= if ENV['SASS_PATH']
-                      ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
-                    else
-                      []
-                    end
+    @include_paths ||= if ENV['SASS_PATH']
+                         ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
+                       else
+                         []
+                       end
   end
 
   def self.render options

data/lib/sass/embedded/compiler.rb

@@ -60,7 +60,7 @@ module Sass
         importers = (options[:importer] ? [
           Sass::EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new( :importer_id => 0 )
         ] : []).concat(
-          Sass.include_paths.concat(options[:include_paths] || [])
+          (options[:include_paths] || []).concat(Sass.include_paths)
           .map { |path| Sass::EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
             :path => File.absolute_path(path)
           )}

data/lib/sass/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 

data/test/compiler_test.rb

@@ -163,14 +163,12 @@ SCSS
     end
 
     def test_global_include_paths
-      skip 'race condition in test'
-
       temp_dir("included_1")
       temp_dir("included_2")
 
       temp_file("included_1/import_parent.scss", "$s: 30px;")
-      temp_file("included_2/import.scss", "@use 'import_parent'; $size: $s;")
-      temp_file("styles.scss", "@use 'import.scss'; .hi { width: $size; }")
+      temp_file("included_2/import.scss", "@use 'import_parent' as *; $size: $s;")
+      temp_file("styles.scss", "@use 'import.scss' as *; .hi { width: $size; }")
 
       ::Sass.include_paths << "included_1"
       ::Sass.include_paths << "included_2"
@@ -179,12 +177,14 @@ SCSS
     end
 
     def test_env_include_paths
-      skip 'race condition in test'
-
       expected_include_paths = [ "included_3", "included_4" ]
+
       ::Sass.instance_eval { @include_paths = nil }
+
       ENV['SASS_PATH'] = expected_include_paths.join(File::PATH_SEPARATOR)
-      assert_equal expected_include_paths, ::Sass.include_paths
+
+      assert_equal expected_include_paths, Sass.include_paths
+
       ::Sass.include_paths.clear
     end
 
@@ -192,8 +192,8 @@ SCSS
       temp_dir("included_5")
       temp_dir("included_6")
       temp_file("included_5/import_parent.scss", "$s: 30px;")
-      temp_file("included_6/import.scss", "@use 'import_parent'; $size: $s;")
-      temp_file("styles.scss", "@use 'import.scss'; .hi { width: $size; }")
+      temp_file("included_6/import.scss", "@use 'import_parent' as *; $size: $s;")
+      temp_file("styles.scss", "@use 'import.scss' as *; .hi { width: $size; }")
 
       assert_raises(CompilationError) do
         render(File.read("styles.scss"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - なつき