sassc 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a212192b55be4390eb3420aefcbb2b9c0240852
-  data.tar.gz: 24aa593a9b043f454dd0da299cc18572eb480bee
+  metadata.gz: 993be013b98cbdeb9f4a4bcb1839cbd5438e0812
+  data.tar.gz: 5bb1391019da6ae3c231116248d1fdfe8ab06c84
 SHA512:
-  metadata.gz: e04ff420d46edf08fc4cf3a330d35f0212ddf294e6228e20768d86c9cc9ef628863477e34e3f143c2fd546a9979781701a3c991d44cb8c908f6062eceef6c1ca
-  data.tar.gz: 2a356fd1f4f954d4cd8a60c9e79eba076398d60afa48822fe12f51edf58738ea79bf83f4eb60dcb07395d9ebcdba7a937277f4e6d6a59bb37e0561633c4816fd
+  metadata.gz: 9c516bab484b989c7c560ed4463ade3f4064ed3206a3eb58d43ae062a81778543b243c9f4531eb676b995fcd5062bf7d8ea44c9296afd2c6221040fbcf584cc7
+  data.tar.gz: 81a118cc6d8d05814a6a740666e1b3c968cb1ee654d9132655cf0a6a866a9626ef9f70b979afe461ef1144d687b5a556b55b83c1eb805a684423115b9bd61800

data/lib/sassc.rb

@@ -4,6 +4,7 @@ end
 require_relative "sassc/version"
 require_relative "sassc/native"
 require_relative "sassc/engine"
+require_relative "sassc/importer"
 require_relative "sassc/script"
 require_relative "sassc/cache_stores"
 require_relative "sassc/dependency"

data/lib/sassc/engine.rb

@@ -16,6 +16,8 @@ module SassC
       Native.option_set_input_path(options, filename) if filename
       Native.option_set_include_path(options, load_paths)
 
+      importer.setup(options) if importer
+
       status = Script.setup_custom_functions(options, @options) do
         Native.compile_data_context(data_context)
       end
@@ -53,6 +55,16 @@ module SassC
       @options[:syntax] && @options[:syntax].to_sym == :sass
     end
 
+    def importer
+      @importer ||= begin
+        if @options[:importer]
+          @options[:importer].new
+        else
+          nil
+        end
+      end
+    end
+
     def load_paths
       paths = @options[:load_paths]
       paths.join(":") if paths

data/lib/sassc/import_handler.rb

@@ -0,0 +1,4 @@
+module SassC
+  class ImportHandler
+  end
+end

data/lib/sassc/importer.rb

@@ -0,0 +1,57 @@
+module SassC
+  class Importer
+    def imports(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)]
+        self.class.imports_to_native(imports)
+      end
+
+      callback = SassC::Native.make_importer(@function, nil)
+      SassC::Native.option_set_importer(native_options, callback)
+    end
+
+    def self.empty_imports
+      SassC::Native.make_import_list(0)
+    end
+
+    def self.imports_to_native(imports)
+      import_list = SassC::Native.make_import_list(imports.size)
+
+      imports.each_with_index do |import, i|
+        source = import.source ? native_string(import.source) : nil
+        source_map_path = nil
+
+        entry = SassC::Native.make_import_entry(import.path, source, source_map_path)
+        SassC::Native.import_set_list_entry(import_list, i, entry)
+      end
+
+      import_list
+    end
+
+    def self.native_string(string)
+      string += "\0"
+      data = SassC::Native::LibC.malloc(string.size)
+      data.write_string(string)
+      data
+    end
+
+    class Import
+      attr_accessor :path, :source, :source_map_path
+
+      def initialize(path, source: nil, source_map_path: nil)
+        @path = path
+        @source = source
+        @source_map_path = source_map_path
+      end
+
+      def to_s
+        "Import: #{path} #{source} #{source_map_path}"
+      end
+    end
+  end
+end

data/lib/sassc/native.rb

@@ -19,11 +19,17 @@ module SassC
     typedef :pointer, :sass_c_function_callback_ptr
     typedef :pointer, :sass_value_ptr
 
+    typedef :pointer, :sass_import_list_ptr
+    typedef :pointer, :sass_importer
+    typedef :pointer, :sass_import_ptr
+
     callback :sass_c_function, [:pointer, :pointer], :pointer
+    callback :sass_c_import_function, [:pointer, :pointer, :pointer], :pointer
 
     require_relative "native/sass_input_style"
     require_relative "native/sass_output_style"
     require_relative "native/string_list"
+    require_relative "native/lib_c"
 
     # Remove the redundant "sass_" from the beginning of every method name
     def self.attach_function(*args)

data/lib/sassc/native/lib_c.rb

@@ -0,0 +1,19 @@
+module SassC
+  module Native
+    module LibC
+      extend FFI::Library
+      ffi_lib FFI::Library::LIBC
+
+      # memory allocators
+      attach_function :malloc, [:size_t], :pointer
+      # attach_function :calloc, [:size_t], :pointer
+      # attach_function :valloc, [:size_t], :pointer
+      # attach_function :realloc, [:pointer, :size_t], :pointer
+      # attach_function :free, [:pointer], :void
+
+      # memory movers
+      # attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
+      # attach_function :bcopy, [:pointer, :pointer, :size_t], :void
+    end
+  end
+end

data/lib/sassc/native/native_context_api.rb

@@ -98,6 +98,7 @@ module SassC
     # ADDAPI void ADDCALL sass_option_set_include_path (struct Sass_Options* options, const char* include_path);
     # ADDAPI void ADDCALL sass_option_set_source_map_file (struct Sass_Options* options, const char* source_map_file);
     # ADDAPI void ADDCALL sass_option_set_c_functions (struct Sass_Options* options, Sass_C_Function_List c_functions);
+    # ADDAPI void ADDCALL sass_option_set_importer (struct Sass_Options* options, Sass_C_Import_Callback importer);
     attach_function :sass_option_set_precision, [:sass_options_ptr, :int], :void
     attach_function :sass_option_set_output_style, [:sass_options_ptr, SassOutputStyle], :void
     attach_function :sass_option_set_source_comments, [:sass_options_ptr, :bool], :void
@@ -111,7 +112,7 @@ module SassC
     attach_function :sass_option_set_include_path, [:sass_options_ptr, :string], :void
     attach_function :sass_option_set_source_map_file, [:sass_options_ptr, :string], :void
     attach_function :sass_option_set_c_functions, [:sass_options_ptr, :pointer], :void
-    # ADDAPI void ADDCALL sass_option_set_importer (struct Sass_Options* options, Sass_C_Import_Callback importer);
+    attach_function :sass_option_set_importer, [:sass_options_ptr, :sass_importer], :void
 
     # Getter for context
     # ADDAPI const char* ADDCALL sass_context_get_output_string (struct Sass_Context* ctx);

data/lib/sassc/native/native_functions_api.rb

@@ -36,10 +36,47 @@ module SassC
     attach_function :sass_function_get_function, [:sass_c_function_callback_ptr], :sass_c_function
     attach_function :sass_function_get_cookie, [:sass_c_function_callback_ptr], :pointer
 
+    # Creators for custom importer callback (with some additional pointer)
+    # The pointer is mostly used to store the callback into the actual binding
+    # ADDAPI Sass_C_Import_Callback ADDCALL sass_make_importer (Sass_C_Import_Fn, void* cookie);
+    attach_function :sass_make_importer, [:sass_c_import_function, :pointer], :sass_importer
 
-    #callback :sass_c_function, [SassValue.ptr, :pointer], SassValue.ptr
-    Callback = FFI::Function.new(:pointer, [:pointer, :pointer]) do |s_args, cookie|
-      SassC::Native.make_number(43, "px")
-    end
+    # Getters for import function descriptors
+    # ADDAPI Sass_C_Import_Fn ADDCALL sass_import_get_function (Sass_C_Import_Callback fn);
+    # ADDAPI void* ADDCALL sass_import_get_cookie (Sass_C_Import_Callback fn);
+
+    # Deallocator for associated memory
+    # ADDAPI void ADDCALL sass_delete_importer (Sass_C_Import_Callback fn);
+
+    # Creator for sass custom importer return argument list
+    # ADDAPI struct Sass_Import** ADDCALL sass_make_import_list (size_t length);
+    attach_function :sass_make_import_list, [:size_t], :sass_import_list_ptr
+
+    # Creator for a single import entry returned by the custom importer inside the list
+    # ADDAPI struct Sass_Import* ADDCALL sass_make_import_entry (const char* path, char* source, char* srcmap);
+    # ADDAPI struct Sass_Import* ADDCALL sass_make_import (const char* path, const char* base, char* source, char* srcmap);
+    attach_function :sass_make_import_entry, [:string, :pointer, :pointer], :sass_import_ptr
+
+    # Setters to insert an entry into the import list (you may also use [] access directly)
+    # Since we are dealing with pointers they should have a guaranteed and fixed size
+    # ADDAPI void ADDCALL sass_import_set_list_entry (struct Sass_Import** list, size_t idx, struct Sass_Import* entry);
+    attach_function :sass_import_set_list_entry, [:sass_import_list_ptr, :size_t, :sass_import_ptr], :void
+    # ADDAPI struct Sass_Import* ADDCALL sass_import_get_list_entry (struct Sass_Import** list, size_t idx);
+
+    # Getters for import entry
+    # ADDAPI const char* ADDCALL sass_import_get_path (struct Sass_Import*);
+    # 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
+    # ADDAPI const char* ADDCALL sass_import_get_srcmap (struct Sass_Import*);
+    # Explicit functions to take ownership of these items
+    # The property on our struct will be reset to NULL
+    # ADDAPI char* ADDCALL sass_import_take_source (struct Sass_Import*);
+    # ADDAPI char* ADDCALL sass_import_take_srcmap (struct Sass_Import*);
+
+    # Deallocator for associated memory (incl. entries)
+    # ADDAPI void ADDCALL sass_delete_import_list (struct Sass_Import**);
+    # Just in case we have some stray import structs
+    # ADDAPI void ADDCALL sass_delete_import (struct Sass_Import*);
   end
 end

data/lib/sassc/script.rb

@@ -32,6 +32,7 @@ module SassC
           value = functs.send(custom_function, s)
 
           if value
+            value = String.new(String.unquote(value.to_s), value.type)
             value.to_native
           else
             String.new("").to_native

data/lib/sassc/version.rb

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

data/test/custom_importer_test.rb

@@ -0,0 +1,87 @@
+require_relative "test_helper"
+
+class FunctionsTest < SassCTest
+  class CustomImporter < SassC::Importer
+    def imports(path)
+      if path =~ /styles/
+        [
+          Import.new("#{path}1.scss", source: "$var1: #000;"),
+          Import.new("#{path}2.scss")
+        ]
+      else
+        Import.new(path)
+      end
+    end
+  end
+
+  class NoFilesImporter < SassC::Importer
+    def imports(path)
+      []
+    end
+  end
+
+  def around
+    within_construct do |construct|
+      @construct = construct
+      yield
+    end
+
+    @construct = nil
+  end
+
+  def test_custom_importer_works
+    @construct.file("styles2.scss", ".hi { color: $var1; }")
+    @construct.file("fonts.scss", ".font { color: $var1; }")
+
+    data = <<SCSS
+@import "styles";
+@import "fonts";
+SCSS
+
+    engine = SassC::Engine.new(data, {
+      importer: CustomImporter
+    })
+
+    assert_equal <<CSS, engine.render
+.hi {
+  color: #000; }
+
+.font {
+  color: #000; }
+CSS
+  end
+
+  def test_dependency_list
+    @construct.file("styles2.scss", ".hi { color: $var1; }")
+    @construct.file("fonts.scss", ".font { color: $var1; }")
+
+    data = <<SCSS
+@import "styles";
+@import "fonts";
+SCSS
+
+    engine = SassC::Engine.new(data, {
+      importer: CustomImporter
+    })
+    engine.render
+
+    dependencies = engine.dependencies.map(&:options).map { |o| o[:filename] }
+
+    # TODO: this behavior is kind of weird (styles1.scss is not included)
+    # not sure why.
+
+    assert_equal [
+      "fonts.scss",
+      "styles",
+      "styles2.scss"
+    ], dependencies
+  end
+
+  def test_custom_importer_works_with_no_files
+    engine = SassC::Engine.new("@import 'fake.scss';", {
+      importer: NoFilesImporter
+    })
+
+    assert_equal "", engine.render
+  end
+end

data/test/functions_test.rb

@@ -1,6 +1,12 @@
 require_relative "test_helper"
 
 class FunctionsTest < SassCTest
+  SassString = Struct.new(:value, :type) do
+    def to_s
+      value
+    end
+  end
+
   module ::SassC::Script::Functions
     def javascript_path(path)
       ::SassC::Script::String.new("/js/#{path.value}", :string)
@@ -10,6 +16,10 @@ class FunctionsTest < SassCTest
       nil
     end
 
+    def sass_return_path(path)
+      return SassString.new("'#{path.value}'", :string)
+    end
+
     module Compass
       def stylesheet_path(path)
         ::SassC::Script::String.new("/css/#{path.value}", :identifier)
@@ -18,9 +28,18 @@ class FunctionsTest < SassCTest
     include Compass
   end
 
+  def test_functions_may_return_sass_string_type
+    engine = ::SassC::Engine.new("div {url: url(sass_return_path('foo.svg'));}")
+
+    assert_equal <<-EOS, engine.render
+div {
+  url: url("foo.svg"); }
+      EOS
+  end
+
   def test_functions_work
     filename = fixture_path('paths.scss')
-    assert data = File.read(filename)
+    data = File.read(filename)
 
     engine = ::SassC::Engine.new(data, {
       filename: filename,
@@ -44,9 +63,6 @@ div {
   end
 
   def test_function_with_no_return_value
-    filename = fixture_path('paths.scss')
-    assert data = File.read(filename)
-
     engine = ::SassC::Engine.new("div {url: url(no-return-path('foo.svg'));}")
 
     assert_equal <<-EOS, engine.render

data/test/native_test.rb

@@ -57,9 +57,13 @@ module NativeTest
 
       random_thing = FFI::MemoryPointer.from_string("hi")
 
+      funct = FFI::Function.new(:pointer, [:pointer, :pointer]) do |s_args, cookie|
+        SassC::Native.make_number(43, "px")
+      end
+
       callback = SassC::Native.make_function(
         "foo()",
-        SassC::Native::Callback,
+        funct,
         random_thing
       )
 
@@ -71,7 +75,7 @@ module NativeTest
 
       first_list_entry = SassC::Native.function_get_list_entry(list, 0)
       assert_equal SassC::Native.function_get_function(first_list_entry),
-                   SassC::Native::Callback
+                   funct
       assert_equal SassC::Native.function_get_signature(first_list_entry),
                    "foo()"
       assert_equal SassC::Native.function_get_cookie(first_list_entry),
@@ -164,5 +168,38 @@ module NativeTest
       assert_match /import_parent.scss/, included_files[1]
       assert_match /styles.scss/, included_files[2]
     end
+
+    def test_custom_importer
+      @construct.file("not_included.scss", "$size: $var + 25;")
+      @construct.file("styles.scss", "@import 'import.scss'; .hi { width: $size; }")
+
+      @file_context = SassC::Native.make_file_context("styles.scss")
+      context = SassC::Native.file_context_get_context(@file_context)
+      options = SassC::Native.context_get_options(context)
+
+      funct = FFI::Function.new(:pointer, [:pointer, :pointer, :pointer]) do |url, prev, cookie|
+        list = SassC::Native.make_import_list(2)
+
+        str = "$var: 5px;\0"
+        data = SassC::Native::LibC.malloc(str.size)
+        data.write_string(str)
+
+        entry0 = SassC::Native.make_import_entry("fake_includ.scss", data, nil)
+        entry1 = SassC::Native.make_import_entry("not_included.scss", nil, nil)
+        SassC::Native.import_set_list_entry(list, 0, entry0)
+        SassC::Native.import_set_list_entry(list, 1, entry1)
+        list
+      end
+
+      callback = SassC::Native.make_importer(funct, nil)
+
+      SassC::Native.option_set_importer(options, callback)
+
+      status = SassC::Native.compile_file_context(@file_context)
+      assert_equal 0, status
+
+      css = SassC::Native.context_get_output_string(context)
+      assert_equal SAMPLE_CSS_OUTPUT, css
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -244,7 +244,10 @@ files:
 - lib/sassc/dependency.rb
 - lib/sassc/engine.rb
 - lib/sassc/error.rb
+- lib/sassc/import_handler.rb
+- lib/sassc/importer.rb
 - lib/sassc/native.rb
+- lib/sassc/native/lib_c.rb
 - lib/sassc/native/native_context_api.rb
 - lib/sassc/native/native_functions_api.rb
 - lib/sassc/native/sass_input_style.rb
@@ -256,6 +259,7 @@ files:
 - lib/sassc/script/string.rb
 - lib/sassc/version.rb
 - sassc.gemspec
+- test/custom_importer_test.rb
 - test/engine_test.rb
 - test/fixtures/paths.scss
 - test/functions_test.rb
@@ -287,6 +291,7 @@ signing_key:
 specification_version: 4
 summary: Use libsass with Ruby!
 test_files:
+- test/custom_importer_test.rb
 - test/engine_test.rb
 - test/fixtures/paths.scss
 - test/functions_test.rb