sassc 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad45627d03b8a1fd2af2611ee17707a4a94044d
-  data.tar.gz: d42900beb5d5397a574d3324d9f51d7781cc91d7
+  metadata.gz: c9080673dad2273d4097ecd900db41e63dea013a
+  data.tar.gz: 46faf54ba57c07110d44de98d32fed6e486fa840
 SHA512:
-  metadata.gz: 216cd8e87be576dc9095bf6f66ddfa6167bbfea1f4b194600eeb711788041d5ce0b5902bb5f596b37262623d30994ea84fb1fdf3bbc619d761bdc1cae82686ac
-  data.tar.gz: c12edbb1d070bc4080ade7360fdf1f4a5d1f9460894f1255f68a48448858b687cdfd55454cc54a61f23a0517de2da3521b9dffd5ca11ce67bf5eb47d00272acd
+  metadata.gz: 1186759b3cea8bd98914dce75264a0eab73ee53ec842719153bf6045c6673177106cf772ef7042f0c4ebc5c0f0079c77aeee7510938fb9a1363a015021537a7c
+  data.tar.gz: 59adf72cd185db6cd9d517b7677386b42c3ef8da593a13a8e5889c1a44b4aacb6cfd7499442764b588d2f4e463c08009a1aa22babc551a2a4f8638053d55f5f2

data/lib/sassc/import_handler.rb

@@ -22,7 +22,10 @@ module SassC
     private
 
     def import_function
-      @import_function ||= FFI::Function.new(:pointer, [:string, :string, :pointer]) do |path, parent_path, cookie|
+      @import_function ||= FFI::Function.new(:pointer, [:string, :pointer, :pointer]) do |path, importer_entry, compiler|
+        last_import = Native::compiler_get_last_import(compiler)
+        parent_path = Native::import_get_path(last_import)
+
         imports = [*@importer.imports(path, parent_path)]
         imports_to_native(imports)
       end

data/lib/sassc/native/native_context_api.rb

@@ -138,5 +138,8 @@ module SassC
     def self.context_get_included_files(*args)
       return_string_array _context_get_included_files(*args)
     end
+
+    # ADDAPI Sass_Import_Entry ADDCALL sass_compiler_get_last_import(struct Sass_Compiler* compiler);
+    attach_function :sass_compiler_get_last_import, [:pointer], :pointer
   end
 end

data/lib/sassc/native/native_functions_api.rb

@@ -65,6 +65,7 @@ module SassC
 
     # Getters for import entry
     # ADDAPI const char* ADDCALL sass_import_get_path (struct Sass_Import*);
+    attach_function :sass_import_get_path, [:sass_import_ptr], :string
     # ADDAPI const char* ADDCALL sass_import_get_base (struct Sass_Import*);
     # ADDAPI const char* ADDCALL sass_import_get_source (struct Sass_Import*);
     attach_function :sass_import_get_source, [:sass_import_ptr], :string

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/custom_importer_test.rb

@@ -29,6 +29,12 @@ module SassC
       end
     end
 
+    class ParentImporter < Importer
+      def imports(path, parent_path)
+        Import.new("name.scss", source: ".#{parent_path} { color: red; }")
+      end
+    end
+
     def test_custom_importer_works
       temp_file("styles2.scss", ".hi { color: $var1; }")
       temp_file("fonts.scss", ".font { color: $var1; }")
@@ -106,7 +112,15 @@ CSS
     end
 
     def test_parent_path_is_accessible
-      skip "TBD"
+      engine = Engine.new("@import 'parent.scss';", {
+        importer: ParentImporter,
+        filename: "import-parent-filename.scss"
+      })
+
+      assert_equal <<CSS, engine.render
+.import-parent-filename.scss {
+  color: red; }
+CSS
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ryan Boland