sassc 1.7.1 → 1.8.0.pre1

data/lib/sassc/import_handler.rb

@@ -24,7 +24,7 @@ module SassC
     def import_function
       @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)
+        parent_path = Native::import_get_imp_path(last_import)
 
         imports = [*@importer.imports(path, parent_path)]
         imports_to_native(imports)

data/lib/sassc/native/native_functions_api.rb

@@ -100,9 +100,9 @@ module SassC
     # 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*);
-    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_imp_path (struct Sass_Import*);
+    attach_function :sass_import_get_imp_path, [:sass_import_ptr], :string
+    # ADDAPI const char* ADDCALL sass_import_get_abs_path (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*);

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.7.1"
+  VERSION = "1.8.0.pre1"
 end

data/test/custom_importer_test.rb

@@ -80,13 +80,10 @@ SCSS
 
       dependencies = engine.dependencies.map(&:filename)
 
-      # TODO: this behavior is kind of weird (styles1.scss is not included)
-      # not sure why.
-
       assert_equal [
         "fonts/fonts.scss",
         "fonts/sub/sub_fonts.scss",
-        "styles",
+        "styles1.scss",
         "styles2.scss"
       ], dependencies
     end

data/test/functions_test.rb

@@ -141,8 +141,9 @@ module SassC
         Script::String.new("#{path.value}", :string)
       end
 
-      def optional_arguments(path, optional = "bar")
-        Script::String.new("#{path.value}/#{optional}", :string)
+      def optional_arguments(path, optional = nil)
+        optional ||= Script::String.new("bar")
+        Script::String.new("#{path.value}/#{optional.value}", :string)
       end
 
       def function_that_raises_errors

data/test/native_test.rb

@@ -9,13 +9,13 @@ module SassC
 
     class General < MiniTest::Test
       def test_it_reports_the_libsass_version
-        assert_equal "3.2.5", Native.version
+        assert_equal "3.3.0-beta3", Native.version
       end
     end
 
     class DataContext < MiniTest::Test
       def teardown
-        Native.delete_data_context(@data_context)
+        Native.delete_data_context(@data_context) if @data_context
       end
 
       def test_compile_status_is_zero_when_successful
@@ -58,6 +58,7 @@ module SassC
       end
 
       def test_failed_compile_gives_error_message
+        skip
       end
 
       def test_custom_function
@@ -106,7 +107,7 @@ module SassC
       include TempFileTest
 
       def teardown
-        Native.delete_file_context(@file_context)
+        Native.delete_file_context(@file_context) if @file_context
       end
 
       def test_compile_status_is_zero_when_successful

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0.pre1
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,105 +143,30 @@ files:
 - ext/libsass/.gitignore
 - ext/libsass/.travis.yml
 - ext/libsass/COPYING
+- ext/libsass/GNUmakefile.am
 - ext/libsass/INSTALL
 - ext/libsass/LICENSE
 - ext/libsass/Makefile
-- ext/libsass/Makefile.am
+- ext/libsass/Makefile.conf
 - ext/libsass/Readme.md
 - ext/libsass/SECURITY.md
 - ext/libsass/appveyor.yml
-- ext/libsass/ast.cpp
-- ext/libsass/ast.hpp
-- ext/libsass/ast_def_macros.hpp
-- ext/libsass/ast_factory.hpp
-- ext/libsass/ast_fwd_decl.hpp
-- ext/libsass/b64/cencode.h
-- ext/libsass/b64/encode.h
-- ext/libsass/backtrace.hpp
-- ext/libsass/base64vlq.cpp
-- ext/libsass/base64vlq.hpp
-- ext/libsass/bind.cpp
-- ext/libsass/bind.hpp
-- ext/libsass/cencode.c
-- ext/libsass/color_names.hpp
 - ext/libsass/configure.ac
-- ext/libsass/constants.cpp
-- ext/libsass/constants.hpp
-- ext/libsass/context.cpp
-- ext/libsass/context.hpp
-- ext/libsass/contextualize.cpp
-- ext/libsass/contextualize.hpp
-- ext/libsass/contextualize_eval.cpp
-- ext/libsass/contextualize_eval.hpp
 - ext/libsass/contrib/libsass.spec
 - ext/libsass/contrib/plugin.cpp
-- ext/libsass/cssize.cpp
-- ext/libsass/cssize.hpp
-- ext/libsass/debug.hpp
-- ext/libsass/debugger.hpp
-- ext/libsass/emitter.cpp
-- ext/libsass/emitter.hpp
-- ext/libsass/environment.hpp
-- ext/libsass/error_handling.cpp
-- ext/libsass/error_handling.hpp
-- ext/libsass/eval.cpp
-- ext/libsass/eval.hpp
-- ext/libsass/expand.cpp
-- ext/libsass/expand.hpp
 - ext/libsass/extconf.rb
-- ext/libsass/extend.cpp
-- ext/libsass/extend.hpp
-- ext/libsass/file.cpp
-- ext/libsass/file.hpp
-- ext/libsass/functions.cpp
-- ext/libsass/functions.hpp
-- ext/libsass/inspect.cpp
-- ext/libsass/inspect.hpp
-- ext/libsass/json.cpp
-- ext/libsass/json.hpp
-- ext/libsass/kwd_arg_macros.hpp
-- ext/libsass/lexer.cpp
-- ext/libsass/lexer.hpp
-- ext/libsass/listize.cpp
-- ext/libsass/listize.hpp
+- ext/libsass/include/sass.h
+- ext/libsass/include/sass/base.h
+- ext/libsass/include/sass/context.h
+- ext/libsass/include/sass/functions.h
+- ext/libsass/include/sass/interface.h
+- ext/libsass/include/sass/values.h
+- ext/libsass/include/sass/version.h
+- ext/libsass/include/sass/version.h.in
+- ext/libsass/include/sass2scss.h
 - ext/libsass/m4/.gitkeep
-- ext/libsass/mapping.hpp
-- ext/libsass/memory_manager.hpp
-- ext/libsass/node.cpp
-- ext/libsass/node.hpp
-- ext/libsass/operation.hpp
-- ext/libsass/output.cpp
-- ext/libsass/output.hpp
-- ext/libsass/parser.cpp
-- ext/libsass/parser.hpp
-- ext/libsass/paths.hpp
-- ext/libsass/plugins.cpp
-- ext/libsass/plugins.hpp
-- ext/libsass/position.cpp
-- ext/libsass/position.hpp
-- ext/libsass/posix/getopt.c
-- ext/libsass/posix/getopt.h
-- ext/libsass/prelexer.cpp
-- ext/libsass/prelexer.hpp
-- ext/libsass/remove_placeholders.cpp
-- ext/libsass/remove_placeholders.hpp
+- ext/libsass/m4/m4-ax_cxx_compile_stdcxx_11.m4
 - ext/libsass/res/resource.rc
-- ext/libsass/sass.cpp
-- ext/libsass/sass.h
-- ext/libsass/sass2scss.cpp
-- ext/libsass/sass2scss.h
-- ext/libsass/sass_context.cpp
-- ext/libsass/sass_context.h
-- ext/libsass/sass_functions.cpp
-- ext/libsass/sass_functions.h
-- ext/libsass/sass_interface.cpp
-- ext/libsass/sass_interface.h
-- ext/libsass/sass_util.cpp
-- ext/libsass/sass_util.hpp
-- ext/libsass/sass_values.cpp
-- ext/libsass/sass_values.h
-- ext/libsass/sass_version.h
-- ext/libsass/sass_version.h.in
 - ext/libsass/script/bootstrap
 - ext/libsass/script/branding
 - ext/libsass/script/ci-build-libsass
@@ -252,10 +177,105 @@ files:
 - ext/libsass/script/spec
 - ext/libsass/script/tap-driver
 - ext/libsass/script/tap-runner
-- ext/libsass/source_map.cpp
-- ext/libsass/source_map.hpp
-- ext/libsass/subset_map.hpp
-- ext/libsass/support/libsass.pc.in
+- ext/libsass/src/GNUmakefile.am
+- ext/libsass/src/ast.cpp
+- ext/libsass/src/ast.hpp
+- ext/libsass/src/ast_def_macros.hpp
+- ext/libsass/src/ast_factory.hpp
+- ext/libsass/src/ast_fwd_decl.hpp
+- ext/libsass/src/b64/cencode.h
+- ext/libsass/src/b64/encode.h
+- ext/libsass/src/backtrace.hpp
+- ext/libsass/src/base64vlq.cpp
+- ext/libsass/src/base64vlq.hpp
+- ext/libsass/src/bind.cpp
+- ext/libsass/src/bind.hpp
+- ext/libsass/src/c99func.c
+- ext/libsass/src/cencode.c
+- ext/libsass/src/color_maps.cpp
+- ext/libsass/src/color_maps.hpp
+- ext/libsass/src/constants.cpp
+- ext/libsass/src/constants.hpp
+- ext/libsass/src/context.cpp
+- ext/libsass/src/context.hpp
+- ext/libsass/src/cssize.cpp
+- ext/libsass/src/cssize.hpp
+- ext/libsass/src/debug.hpp
+- ext/libsass/src/debugger.hpp
+- ext/libsass/src/emitter.cpp
+- ext/libsass/src/emitter.hpp
+- ext/libsass/src/environment.cpp
+- ext/libsass/src/environment.hpp
+- ext/libsass/src/error_handling.cpp
+- ext/libsass/src/error_handling.hpp
+- ext/libsass/src/eval.cpp
+- ext/libsass/src/eval.hpp
+- ext/libsass/src/expand.cpp
+- ext/libsass/src/expand.hpp
+- ext/libsass/src/extend.cpp
+- ext/libsass/src/extend.hpp
+- ext/libsass/src/file.cpp
+- ext/libsass/src/file.hpp
+- ext/libsass/src/functions.cpp
+- ext/libsass/src/functions.hpp
+- ext/libsass/src/inspect.cpp
+- ext/libsass/src/inspect.hpp
+- ext/libsass/src/json.cpp
+- ext/libsass/src/json.hpp
+- ext/libsass/src/kwd_arg_macros.hpp
+- ext/libsass/src/lexer.cpp
+- ext/libsass/src/lexer.hpp
+- ext/libsass/src/listize.cpp
+- ext/libsass/src/listize.hpp
+- ext/libsass/src/mapping.hpp
+- ext/libsass/src/memory_manager.cpp
+- ext/libsass/src/memory_manager.hpp
+- ext/libsass/src/node.cpp
+- ext/libsass/src/node.hpp
+- ext/libsass/src/operation.hpp
+- ext/libsass/src/output.cpp
+- ext/libsass/src/output.hpp
+- ext/libsass/src/parser.cpp
+- ext/libsass/src/parser.hpp
+- ext/libsass/src/paths.hpp
+- ext/libsass/src/plugins.cpp
+- ext/libsass/src/plugins.hpp
+- ext/libsass/src/position.cpp
+- ext/libsass/src/position.hpp
+- ext/libsass/src/prelexer.cpp
+- ext/libsass/src/prelexer.hpp
+- ext/libsass/src/remove_placeholders.cpp
+- ext/libsass/src/remove_placeholders.hpp
+- ext/libsass/src/sass.cpp
+- ext/libsass/src/sass2scss.cpp
+- ext/libsass/src/sass_context.cpp
+- ext/libsass/src/sass_functions.cpp
+- ext/libsass/src/sass_interface.cpp
+- ext/libsass/src/sass_util.cpp
+- ext/libsass/src/sass_util.hpp
+- ext/libsass/src/sass_values.cpp
+- ext/libsass/src/source_map.cpp
+- ext/libsass/src/source_map.hpp
+- ext/libsass/src/subset_map.hpp
+- ext/libsass/src/support/libsass.pc.in
+- ext/libsass/src/to_c.cpp
+- ext/libsass/src/to_c.hpp
+- ext/libsass/src/to_string.cpp
+- ext/libsass/src/to_string.hpp
+- ext/libsass/src/to_value.cpp
+- ext/libsass/src/to_value.hpp
+- ext/libsass/src/units.cpp
+- ext/libsass/src/units.hpp
+- ext/libsass/src/utf8.h
+- ext/libsass/src/utf8/checked.h
+- ext/libsass/src/utf8/core.h
+- ext/libsass/src/utf8/unchecked.h
+- ext/libsass/src/utf8_string.cpp
+- ext/libsass/src/utf8_string.hpp
+- ext/libsass/src/util.cpp
+- ext/libsass/src/util.hpp
+- ext/libsass/src/values.cpp
+- ext/libsass/src/values.hpp
 - ext/libsass/test/test_node.cpp
 - ext/libsass/test/test_paths.cpp
 - ext/libsass/test/test_selector_difference.cpp
@@ -263,24 +283,11 @@ files:
 - ext/libsass/test/test_subset_map.cpp
 - ext/libsass/test/test_superselector.cpp
 - ext/libsass/test/test_unification.cpp
-- ext/libsass/to_c.cpp
-- ext/libsass/to_c.hpp
-- ext/libsass/to_string.cpp
-- ext/libsass/to_string.hpp
-- ext/libsass/units.cpp
-- ext/libsass/units.hpp
-- ext/libsass/utf8.h
-- ext/libsass/utf8/checked.h
-- ext/libsass/utf8/core.h
-- ext/libsass/utf8/unchecked.h
-- ext/libsass/utf8_string.cpp
-- ext/libsass/utf8_string.hpp
-- ext/libsass/util.cpp
-- ext/libsass/util.hpp
 - ext/libsass/version.sh
-- ext/libsass/win/libsass.filters
 - ext/libsass/win/libsass.sln
+- ext/libsass/win/libsass.targets
 - ext/libsass/win/libsass.vcxproj
+- ext/libsass/win/libsass.vcxproj.filters
 - lib/sassc.rb
 - lib/sassc/cache_stores.rb
 - lib/sassc/cache_stores/base.rb
@@ -332,9 +339,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/ext/libsass/Makefile.am

@@ -1,146 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-
-AM_COPT = -Wall -O2
-AM_COVLDFLAGS =
-
-if ENABLE_COVERAGE
-	AM_COPT = -O0 --coverage
-	AM_COVLDFLAGS += -lgcov
-endif
-
-AM_CFLAGS =   $(AM_COPT)
-AM_CXXFLAGS = $(AM_COPT)
-AM_LDFLAGS =  $(AM_COPT) $(AM_COVLDFLAGS)
-
-if COMPILER_IS_MINGW32
-  AM_CXXFLAGS += -std=gnu++0x
-else
-  AM_CXXFLAGS += -std=c++0x
-endif
-
-EXTRA_DIST = \
-	COPYING \
-	INSTALL \
-	LICENSE \
-	Readme.md
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = support/libsass.pc
-
-lib_LTLIBRARIES = libsass.la
-
-libsass_la_SOURCES = \
-	ast_fwd_decl.hpp ast_def_macros.hpp \
-	kwd_arg_macros.hpp memory_manager.hpp \
-	position.cpp position.hpp \
-	operation.hpp \
-	subset_map.hpp mapping.hpp \
-	color_names.hpp backtrace.hpp \
-	cencode.c b64/cencode.h b64/encode.h \
-	token.hpp environment.hpp \
-	paths.hpp debug.hpp \
-	utf8.h utf8/core.h \
-	utf8/checked.h utf8/unchecked.h \
-	ast.cpp ast.hpp \
-	base64vlq.cpp base64vlq.hpp \
-	bind.cpp bind.hpp \
-	constants.cpp constants.hpp \
-	context.cpp context.hpp \
-	contextualize.cpp contextualize.hpp \
-	contextualize_eval.cpp contextualize_eval.hpp \
-	error_handling.cpp error_handling.hpp \
-	eval.cpp eval.hpp \
-	expand.cpp expand.hpp \
-	extend.cpp extend.hpp \
-	cssize.cpp cssize.hpp \
-	listize.cpp listize.hpp \
-	file.cpp file.hpp \
-	functions.cpp functions.hpp \
-	inspect.cpp inspect.hpp \
-	lexer.cpp lexer.hpp \
-	node.cpp node.hpp \
-	json.cpp json.hpp \
-	emitter.cpp emitter.hpp \
-	output.cpp output.hpp \
-	parser.cpp parser.hpp \
-	plugins.cpp plugins.hpp \
-	prelexer.cpp prelexer.hpp \
-	remove_placeholders.cpp remove_placeholders.hpp \
-	sass.cpp sass.h \
-	sass_util.cpp sass_util.hpp \
-	sass_values.cpp sass_values.h \
-	sass_context.cpp sass_context.h \
-	sass_functions.cpp sass_functions.h \
-	sass_interface.cpp sass_interface.h \
-	sass2scss.cpp sass2scss.h \
-	source_map.cpp source_map.hpp \
-	to_c.cpp to_c.hpp \
-	to_string.cpp to_string.hpp \
-	units.cpp units.hpp \
-	utf8_string.cpp utf8_string.hpp \
-	util.cpp util.hpp
-
-libsass_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 0:9:0
-
-include_HEADERS = sass2scss.h sass_context.h sass_functions.h sass_values.h sass.h sass_version.h
-
-if ENABLE_TESTS
-
-noinst_PROGRAMS = tester
-
-tester_LDADD = libsass.la
-tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
-SASSC_VERSION=`cd "$(SASS_SASSC_PATH)" && ./version.sh`
-tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(SASSC_VERSION)\""
-tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(SASSC_VERSION)\""
-tester_LDFLAGS = $(AM_LDFLAGS) -no-install
-
-if ENABLE_COVERAGE
-nodist_EXTRA_tester_SOURCES = non-existent-file-to-force-CXX-linking.cxx
-nodist_EXTRA_libsass_la_SOURCES = non-existent-file-to-force-CXX-linking.cxx
-endif
-
-SASS_SASSC_PATH ?= sassc
-SASS_SPEC_PATH ?= sass-spec
-
-TESTS = \
-	$(SASS_SPEC_PATH)/spec/basic \
-	$(SASS_SPEC_PATH)/spec/css \
-	$(SASS_SPEC_PATH)/spec/extend-tests \
-	$(SASS_SPEC_PATH)/spec/extends \
-	$(SASS_SPEC_PATH)/spec/libsass \
-	$(SASS_SPEC_PATH)/spec/libsass-closed-issues \
-	$(SASS_SPEC_PATH)/spec/maps \
-	$(SASS_SPEC_PATH)/spec/misc \
-	$(SASS_SPEC_PATH)/spec/regressions \
-	$(SASS_SPEC_PATH)/spec/scss \
-	$(SASS_SPEC_PATH)/spec/scss-tests \
-	$(SASS_SPEC_PATH)/spec/types
-
-SASS_TEST_FLAGS =
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver
-AM_LOG_FLAGS = -c ./tester --ignore-todo $(LOG_FLAGS)
-if USE_TAP
-	AM_LOG_FLAGS += -t
-	SASS_TEST_FLAGS += -t | tapout
-	LOG_COMPILER = ./script/tap-runner $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-else
-	LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-endif
-
-SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester$(EXEEXT)
-
-test:
-	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
-
-test_build:
-	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
-
-test_full:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
-
-test_issues:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS)
-
-endif