sassc 2.0.1 → 2.1.0.pre1

data/lib/sassc/engine.rb

@@ -132,8 +132,8 @@ module SassC
     end
 
     def load_paths
-      paths = @options[:load_paths]
-      paths.join(":") if paths
+      paths = (@options[:load_paths] || []) + SassC.load_paths
+      paths.join(File::PATH_SEPARATOR) unless paths.empty?
     end
   end
 end

data/lib/sassc/native.rb

@@ -8,7 +8,14 @@ module SassC
 
     spec = Gem.loaded_specs["sassc"]
     gem_root = spec.gem_dir
-    ffi_lib "#{gem_root}/ext/libsass/lib/libsass.so"
+
+    dl_ext = (RUBY_PLATFORM =~ /darwin/ ? 'bundle' : 'so')
+    ruby_version_so_path = "#{gem_root}/lib/sassc/#{RUBY_VERSION[/\d+.\d+/]}/libsass.#{dl_ext}"
+    if File.exist?(ruby_version_so_path)
+      ffi_lib ruby_version_so_path
+    else
+      ffi_lib "#{gem_root}/lib/sassc/libsass.#{dl_ext}"
+    end
 
     require_relative "native/sass_value"
 

data/lib/sassc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SassC
-  VERSION = "2.0.1"
+  VERSION = "2.1.0.pre1"
 end

data/sassc.gemspec

@@ -19,30 +19,38 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.required_ruby_version = ">= 2.3.3"
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.require_paths = ["lib"]
 
-  spec.extensions    = ["ext/Rakefile"]
+  spec.platform      = Gem::Platform::RUBY
+  spec.extensions    = ["ext/extconf.rb"]
 
   spec.add_development_dependency "minitest", "~> 5.5.1"
   spec.add_development_dependency "minitest-around"
   spec.add_development_dependency "test_construct"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "rake-compiler-dock"
 
-  spec.add_dependency "rake"
   spec.add_dependency "ffi", "~> 1.9"
 
   gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
-  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
-    Dir.chdir(submodule_path) do
-      submodule_relative_path = submodule_path.sub gem_dir, ""
-      # issue git ls-files in submodule's directory and
-      # prepend the submodule path to create absolute file paths
-      `git ls-files`.split($\).each do |filename|
-        spec.files << "#{submodule_relative_path}/#{filename}"
-      end
+
+  libsass_dir = File.join(gem_dir, 'ext', 'libsass')
+  if !File.directory?(libsass_dir)
+    $stderr.puts "Error: ext/libsass not checked out. Please run:\n\n"\
+                 "  git submodule update --init"
+    exit 1
+  end
+
+  Dir.chdir(libsass_dir) do
+    submodule_relative_path = File.join('ext', 'libsass')
+    `git ls-files`.split($\).each do |filename|
+      next if filename =~ %r{(^("?test|docs|script)/)|\.md$|\.yml$}
+      spec.files << File.join(submodule_relative_path, filename)
     end
   end
 

data/test/engine_test.rb

@@ -88,7 +88,7 @@ $var: 1;
 SCSS
       expected_output = <<-CSS
 .foo {
-  baz: 0.33333; }
+  baz: 0.3333333333; }
 CSS
       output = Engine.new(template).render
       assert_equal expected_output, output
@@ -198,6 +198,31 @@ SCSS
       ).render
     end
 
+    def test_global_load_paths
+      temp_dir("included_1")
+      temp_dir("included_2")
+
+      temp_file("included_1/import_parent.scss", "$s: 30px;")
+      temp_file("included_2/import.scss", "@import 'import_parent'; $size: $s;")
+      temp_file("styles.scss", "@import 'import.scss'; .hi { width: $size; }")
+
+      ::SassC.load_paths << "included_1"
+      ::SassC.load_paths << "included_2"
+
+      assert_equal ".hi {\n  width: 30px; }\n", Engine.new(
+        File.read("styles.scss"),
+      ).render
+      ::SassC.load_paths.clear
+    end
+
+    def test_env_load_paths
+      expected_load_paths = [ "included_1", "included_2" ]
+      ::SassC.instance_eval { @load_paths = nil }
+      ENV['SASS_PATH'] = expected_load_paths.join(File::PATH_SEPARATOR)
+      assert_equal expected_load_paths, ::SassC.load_paths
+      ::SassC.load_paths.clear
+    end
+
     def test_load_paths_not_configured
       temp_file("included_1/import_parent.scss", "$s: 30px;")
       temp_file("included_2/import.scss", "@import 'import_parent'; $size: $s;")

data/test/native_test.rb

@@ -11,7 +11,7 @@ module SassC
 
     class General < MiniTest::Test
       def test_it_reports_the_libsass_version
-        assert_equal "3.5.2", Native.version
+        assert_equal "3.6.0", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0.pre1
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -87,7 +87,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -113,7 +141,7 @@ email:
 - ryan@tanookilabs.com
 executables: []
 extensions:
-- ext/Rakefile
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -125,60 +153,19 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ext/Rakefile
+- ext/extconf.rb
 - ext/libsass/.editorconfig
 - ext/libsass/.gitattributes
-- ext/libsass/.github/CONTRIBUTING.md
-- ext/libsass/.github/ISSUE_TEMPLATE.md
 - 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.conf
-- ext/libsass/Readme.md
-- ext/libsass/SECURITY.md
-- ext/libsass/appveyor.yml
 - ext/libsass/configure.ac
 - ext/libsass/contrib/libsass.spec
 - ext/libsass/contrib/plugin.cpp
-- ext/libsass/docs/README.md
-- ext/libsass/docs/api-context-example.md
-- ext/libsass/docs/api-context-internal.md
-- ext/libsass/docs/api-context.md
-- ext/libsass/docs/api-doc.md
-- ext/libsass/docs/api-function-example.md
-- ext/libsass/docs/api-function-internal.md
-- ext/libsass/docs/api-function.md
-- ext/libsass/docs/api-importer-example.md
-- ext/libsass/docs/api-importer-internal.md
-- ext/libsass/docs/api-importer.md
-- ext/libsass/docs/api-value-example.md
-- ext/libsass/docs/api-value-internal.md
-- ext/libsass/docs/api-value.md
-- ext/libsass/docs/build-on-darwin.md
-- ext/libsass/docs/build-on-gentoo.md
-- ext/libsass/docs/build-on-windows.md
-- ext/libsass/docs/build-shared-library.md
-- ext/libsass/docs/build-with-autotools.md
-- ext/libsass/docs/build-with-makefiles.md
-- ext/libsass/docs/build-with-mingw.md
-- ext/libsass/docs/build-with-visual-studio.md
-- ext/libsass/docs/build.md
-- ext/libsass/docs/compatibility-plan.md
-- ext/libsass/docs/contributing.md
-- ext/libsass/docs/custom-functions-internal.md
-- ext/libsass/docs/dev-ast-memory.md
-- ext/libsass/docs/implementations.md
-- ext/libsass/docs/plugins.md
-- ext/libsass/docs/setup-environment.md
-- ext/libsass/docs/source-map-internals.md
-- ext/libsass/docs/trace.md
-- ext/libsass/docs/triage.md
-- ext/libsass/docs/unicode.md
-- ext/libsass/extconf.rb
 - ext/libsass/include/sass.h
 - ext/libsass/include/sass/base.h
 - ext/libsass/include/sass/context.h
@@ -190,23 +177,22 @@ files:
 - ext/libsass/m4/.gitkeep
 - ext/libsass/m4/m4-ax_cxx_compile_stdcxx_11.m4
 - ext/libsass/res/resource.rc
-- ext/libsass/script/bootstrap
-- ext/libsass/script/branding
-- ext/libsass/script/ci-build-libsass
-- ext/libsass/script/ci-build-plugin
-- ext/libsass/script/ci-install-compiler
-- ext/libsass/script/ci-install-deps
-- ext/libsass/script/ci-report-coverage
-- ext/libsass/script/spec
-- ext/libsass/script/tap-driver
-- ext/libsass/script/tap-runner
-- ext/libsass/script/test-leaks.pl
 - ext/libsass/src/GNUmakefile.am
 - ext/libsass/src/ast.cpp
 - ext/libsass/src/ast.hpp
+- ext/libsass/src/ast2c.cpp
+- ext/libsass/src/ast2c.hpp
 - ext/libsass/src/ast_def_macros.hpp
 - ext/libsass/src/ast_fwd_decl.cpp
 - ext/libsass/src/ast_fwd_decl.hpp
+- ext/libsass/src/ast_sel_cmp.cpp
+- ext/libsass/src/ast_sel_unify.cpp
+- ext/libsass/src/ast_selectors.cpp
+- ext/libsass/src/ast_selectors.hpp
+- ext/libsass/src/ast_supports.cpp
+- ext/libsass/src/ast_supports.hpp
+- ext/libsass/src/ast_values.cpp
+- ext/libsass/src/ast_values.hpp
 - ext/libsass/src/b64/cencode.h
 - ext/libsass/src/b64/encode.h
 - ext/libsass/src/backtrace.cpp
@@ -215,6 +201,8 @@ files:
 - ext/libsass/src/base64vlq.hpp
 - ext/libsass/src/bind.cpp
 - ext/libsass/src/bind.hpp
+- ext/libsass/src/c2ast.cpp
+- ext/libsass/src/c2ast.hpp
 - ext/libsass/src/c99func.c
 - ext/libsass/src/cencode.c
 - ext/libsass/src/check_nesting.cpp
@@ -243,8 +231,22 @@ files:
 - 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/fn_colors.cpp
+- ext/libsass/src/fn_colors.hpp
+- ext/libsass/src/fn_lists.cpp
+- ext/libsass/src/fn_lists.hpp
+- ext/libsass/src/fn_maps.cpp
+- ext/libsass/src/fn_maps.hpp
+- ext/libsass/src/fn_miscs.cpp
+- ext/libsass/src/fn_miscs.hpp
+- ext/libsass/src/fn_numbers.cpp
+- ext/libsass/src/fn_numbers.hpp
+- ext/libsass/src/fn_selectors.cpp
+- ext/libsass/src/fn_selectors.hpp
+- ext/libsass/src/fn_strings.cpp
+- ext/libsass/src/fn_strings.hpp
+- ext/libsass/src/fn_utils.cpp
+- ext/libsass/src/fn_utils.hpp
 - ext/libsass/src/inspect.cpp
 - ext/libsass/src/inspect.hpp
 - ext/libsass/src/json.cpp
@@ -291,8 +293,6 @@ files:
 - ext/libsass/src/subset_map.cpp
 - 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_value.cpp
 - ext/libsass/src/to_value.hpp
 - ext/libsass/src/units.cpp
@@ -305,15 +305,10 @@ files:
 - ext/libsass/src/utf8_string.hpp
 - ext/libsass/src/util.cpp
 - ext/libsass/src/util.hpp
+- ext/libsass/src/util_string.cpp
+- ext/libsass/src/util_string.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
-- ext/libsass/test/test_specificity.cpp
-- ext/libsass/test/test_subset_map.cpp
-- ext/libsass/test/test_superselector.cpp
-- ext/libsass/test/test_unification.cpp
 - ext/libsass/version.sh
 - ext/libsass/win/libsass.sln
 - ext/libsass/win/libsass.sln.DotSettings
@@ -357,7 +352,6 @@ files:
 - lib/sassc/util.rb
 - lib/sassc/util/normalized_map.rb
 - lib/sassc/version.rb
-- lib/tasks/libsass.rb
 - sassc.gemspec
 - test/custom_importer_test.rb
 - test/engine_test.rb
@@ -380,12 +374,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: 2.0.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.7.6

data/ext/Rakefile

@@ -1,3 +0,0 @@
-require_relative '../lib/tasks/libsass'
-
-task default: 'libsass:compile'

data/ext/libsass/.github/CONTRIBUTING.md

@@ -1,65 +0,0 @@
-# Contributing to LibSass
-
-:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
-
-The following is a set of guidelines for contributing to LibSass, which is hosted in the [Sass Organization](https://github.com/sass) on GitHub.
-These are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request.
-
-LibSass is a library that implements a [sass language][8] compiler. As such it does not directly interface with end users (frontend developers).
-For direct contributions to the LibSass code base you will need to have at least a rough idea of C++, we will not lie about that.
-But there are other ways to contribute to the progress of LibSass. All contributions are done via github pull requests.
-
-You can also contribute to the LibSass [documentation][9] or provide additional [spec tests][10] (and we will gladly point you in the
-direction for corners that lack test coverage). Foremost we rely on good and concise bug reports for issues the spec tests do not yet catch.
-
-## Precheck: My Sass isn't compiling
-- [ ] Check if you can reproduce the issue via [SourceMap Inspector][5] (updated regularly).
-- [ ] Validate official ruby sass compiler via [SassMeister][6] produces your expected result.
-- [ ] Search for similar issue in [LibSass][1] and [node-sass][2] (include closed tickets)
-- [ ] Optionally test your code directly with [sass][7] or [sassc][3] ([installer][4])
-
-## Precheck: My build/install fails
-- [ ] Problems with building or installing libsass should be directed to implementors first!
-- [ ] Except for issues directly verified via sassc or LibSass own build (make/autotools9
-
-## Craft a meaningfull error report
-- [ ] Include the version of libsass and the implementor (i.e. node-sass or sassc)
-- [ ] Include information about your operating system and environment (i.e. io.js)
-- [ ] Either create a self contained sample that shows your issue ...
-- [ ] ... or provide it as a fetchable (github preferred) archive/repo
-- [ ] ... and include a step by step list of command to get all dependencies
-- [ ] Make it clear if you use indented or/and scss syntax
-
-## My error is hiding in a big code base
-1. we do not have time to support your code base!
-2. to fix occuring issues we need precise bug reports
-3. the more precise you are, the faster we can help you
-4. lazy reports get overlooked even when exposing serious bugs
-5. it's not hard to do, it only takes time
-- [ ] Make sure you saved the current state (i.e. commit to git)
-- [ ] Start by uncommenting blocks in the initial source file
-- [ ] Check if the problem is still there after each edit
-- [ ] Repeat until the problem goes away
-- [ ] Inline imported files as you go along
-- [ ] Finished once you cannot remove more
-- [ ] The emphasis is on the word "repeat" ...
-
-## What makes a code test case
-
-Important is that someone else can get the test case up and running to reproduce it locally. For this
-we urge you to verify that your sample yields the expected result by testing it via [SassMeister][6]
-or directly via ruby sass or node-sass (or any other libsass implementor) before submitting your bug
-report. Once you verified all of the above, you may use the template below to file your bug report.
-
-
-[1]: https://github.com/sass/libsass/issues?utf8=%E2%9C%93&q=is%3Aissue
-[2]: https://github.com/sass/node-sass/issues?utf8=%E2%9C%93&q=is%3Aissue
-[3]: https://github.com/sass/sassc
-[4]: http://libsass.ocbnet.ch/installer/
-[5]: http://libsass.ocbnet.ch/srcmap/
-[6]: http://www.sassmeister.com/
-[7]: https://rubygems.org/gems/sass
-
-[8]: http://sass-lang.com/
-[9]: https://github.com/sass/libsass/tree/master/docs
-[10]: https://github.com/sass/sass-spec

data/ext/libsass/.github/ISSUE_TEMPLATE.md

@@ -1,54 +0,0 @@
-[todo]: # (Title: Be as meaningful as possible)
-[todo]: # (Title: Try to use 60 or less chars)
-
-[todo]: # (This is only a template!)
-[todo]: # (remove unneeded bits)
-[todo]: # (use github preview!)
-
-## input.scss
-
-[todo]: # (always test and report with scss syntax)
-[todo]: # (use sass only when results differ from scss)
-
-```scss
-test {
-  content: bar
-}
-```
-
-## Actual results
-
-[todo]: # (update version info!)
-
-[libsass 3.X.y][1]
-```css
-test {
-  content: bar; }
-```
-
-## Expected result
-
-[todo]: # (update version info!)
-
-ruby sass 3.X.y
-```css
-test {
-  content: bar; }
-```
-
-[todo]: # (update version info!)
-[todo]: # (example for node-sass!)
-
-version info:
-```cmd
-$ node-sass --version
-node-sass       3.X.y   (Wrapper)       [JavaScript]
-libsass         3.X.y   (Sass Compiler) [C/C++]
-```
-
-[todo]: # (Go to http://libsass.ocbnet.ch/srcmap)
-[todo]: # (Enter your SCSS code and hit compile)
-[todo]: # (Click `bookmark` and replace the url)
-[todo]: # (link is used in actual results above)
-
-[1]: http://libsass.ocbnet.ch/srcmap/#dGVzdCB7CiAgY29udGVudDogYmFyOyB9Cg==