sassc 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993be013b98cbdeb9f4a4bcb1839cbd5438e0812
-  data.tar.gz: 5bb1391019da6ae3c231116248d1fdfe8ab06c84
+  metadata.gz: c779167157d51896c8f2f389090e3bbdf10ad30d
+  data.tar.gz: 744962a099ec22bd66708d7954d3561f422e5a9e
 SHA512:
-  metadata.gz: 9c516bab484b989c7c560ed4463ade3f4064ed3206a3eb58d43ae062a81778543b243c9f4531eb676b995fcd5062bf7d8ea44c9296afd2c6221040fbcf584cc7
-  data.tar.gz: 81a118cc6d8d05814a6a740666e1b3c968cb1ee654d9132655cf0a6a866a9626ef9f70b979afe461ef1144d687b5a556b55b83c1eb805a684423115b9bd61800
+  metadata.gz: 0c122bd12dc2c6ffa15b85d9ed1b0045a1419d7fbd2ad67220e3d332dea6b3fdfe725dd9d143f6680068ee033c41c066f70a30893483c7e757595d79ae9be2f9
+  data.tar.gz: 6a0be2aeab3aa77e953861f328a9e09cffefefc8ef0521ca24e01e3d2e5493c9eca37d6b57c410764a9bd74c9f4a2e8715f672ddedfc18e557ea2c243552d5f4

data/lib/sassc/engine.rb

@@ -10,15 +10,15 @@ module SassC
     def render
       data_context = Native.make_data_context(@template)
       context = Native.data_context_get_context(data_context)
-      options = Native.context_get_options(context)
+      native_options = Native.context_get_options(context)
 
-      Native.option_set_is_indented_syntax_src(options, true) if sass?
-      Native.option_set_input_path(options, filename) if filename
-      Native.option_set_include_path(options, load_paths)
+      Native.option_set_is_indented_syntax_src(native_options, true) if sass?
+      Native.option_set_input_path(native_options, filename) if filename
+      Native.option_set_include_path(native_options, load_paths)
 
-      importer.setup(options) if importer
+      importer.setup(native_options) if importer
 
-      status = Script.setup_custom_functions(options, @options) do
+      status = Script.setup_custom_functions(native_options, @options) do
         Native.compile_data_context(data_context)
       end
 
@@ -58,7 +58,7 @@ module SassC
     def importer
       @importer ||= begin
         if @options[:importer]
-          @options[:importer].new
+          @options[:importer].new(@options)
         else
           nil
         end

data/lib/sassc/importer.rb

@@ -1,13 +1,15 @@
 module SassC
   class Importer
-    def imports(path)
+    attr_reader :options
+
+    def imports(path, parent_path)
       # A custom importer must override this method.
       raise NotImplementedError
     end
 
     def setup(native_options)
-      @function = FFI::Function.new(:pointer, [:string, :pointer, :pointer]) do |path, prev, cookie|
-        imports = [*imports(path)]
+      @function = FFI::Function.new(:pointer, [:string, :string, :pointer]) do |path, parent_path, cookie|
+        imports = [*imports(path, parent_path)]
         self.class.imports_to_native(imports)
       end
 
@@ -15,6 +17,10 @@ module SassC
       SassC::Native.option_set_importer(native_options, callback)
     end
 
+    def initialize(options)
+      @options = options
+    end
+
     def self.empty_imports
       SassC::Native.make_import_list(0)
     end

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/custom_importer_test.rb

@@ -2,7 +2,7 @@ require_relative "test_helper"
 
 class FunctionsTest < SassCTest
   class CustomImporter < SassC::Importer
-    def imports(path)
+    def imports(path, parent_path)
       if path =~ /styles/
         [
           Import.new("#{path}1.scss", source: "$var1: #000;"),
@@ -15,11 +15,17 @@ class FunctionsTest < SassCTest
   end
 
   class NoFilesImporter < SassC::Importer
-    def imports(path)
+    def imports(path, parent_path)
       []
     end
   end
 
+  class OptionsImporter < SassC::Importer
+    def imports(path, parent_path)
+      Import.new("name.scss", source: options[:custom_option_source])
+    end
+  end
+
   def around
     within_construct do |construct|
       @construct = construct
@@ -84,4 +90,20 @@ SCSS
 
     assert_equal "", engine.render
   end
+
+  def test_custom_importer_can_access_sassc_options
+    engine = SassC::Engine.new("@import 'fake.scss';", {
+      importer: OptionsImporter,
+      custom_option_source: ".test { width: 30px; }"
+    })
+
+    assert_equal <<CSS, engine.render
+.test {
+  width: 30px; }
+CSS
+  end
+
+  def test_parent_path_is_accessible
+    skip "TBD"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake