sassc 2.1.0.pre2 → 2.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cded5a763843c824e5d515d37545e852120a63d187b39d8214c7fe002f9c57a4
-  data.tar.gz: cda45eb98106cfaba4ae9c21fe3016af2239d330bdadc8fe4a1f86acde5da078
+  metadata.gz: c292d43734810782d28442d9ce558bd6d15f8c1726f9f9cf7ab734e60154616a
+  data.tar.gz: 10fdd3957c9e01b3e4eff3c7485af87a1acfdba6fd704cca71e1473dd115941e
 SHA512:
-  metadata.gz: d85b37901cc1ed34a21d2e9a4ab2ceb1fcb94bd70354a0b4f1640fe76b1301b088616db73ed8dd79d51a74e1341c1a39fcf60feb11400bb7a0820d9aee6bf2a4
-  data.tar.gz: 49ee4ffcf2c78f6be513af3b549ac1a09f89b1c4e64e57c807a33da5edad0663c8e5053f1ae0dd701e62bd487405f746bf8da1cdb4c4555186b3bf355efdc201
+  metadata.gz: 42faa474b08b2f1a561097698ea879dc3760bb4d0554d33e2f4f2250ca2f72f13c41e8d1c130905258846e64eba6d6e6f17d3fac747e216adcff9dc13be0c394
+  data.tar.gz: 0aa4d3f26dfe102fcff5863a352ef60527467ccff6590338db20bf3c653dc1059bc7bfb28b4b90222341d412da94924a75f878cb373f21dfdc5d4b1abb034317

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+- **2.1.0.pre3**
+  - [extconf.rb: Always write VERSION if we have .git](https://github.com/sass/sassc-ruby/pull/131)
+  - [Update libsass to 3.6.1](https://github.com/sass/sassc-ruby/pull/130)
 - **2.1.0.pre2**
   - [Reduce Ruby warnings](https://github.com/sass/sassc-ruby/pull/124)
   - [prefer equal? to determine object identity](https://github.com/sass/sassc-ruby/pull/122)

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.6.0](https://github.com/sass/libsass/releases/3.6.0)
+[3.6.1](https://github.com/sass/libsass/releases/3.6.1)
 
 ## Installation
 

data/Rakefile

@@ -43,7 +43,7 @@ task 'gem:native' do
                       "RUBY_CC_VERSION=2.6.0 CLEAN=1"
 end
 
-CLEAN.include 'tmp', 'pkg', 'lib/sassc/libsass.so', 'ext/libsass/VERSION',
+CLEAN.include 'tmp', 'pkg', 'lib/sassc/libsass.{so,bundle}', 'ext/libsass/VERSION',
               'ext/*.{o,so,bundle}', 'ext/Makefile'
 
 desc "Run all tests"

data/ext/extconf.rb

@@ -38,13 +38,12 @@ $CFLAGS.gsub!(/[\s+](-ansi|-std=[^\s]+)/, '')
 dir_config 'libsass'
 
 libsass_version = Dir.chdir(libsass_dir) do
-  if File.exist?('VERSION')
-    File.read('VERSION').chomp
-  elsif File.exist?('.git')
+  if File.exist?('.git')
     ver = %x[git describe --abbrev=4 --dirty --always --tags].chomp
     File.write('VERSION', ver)
     ver
   end
+  File.read('VERSION').chomp if File.exist?('VERSION')
 end
 
 if libsass_version

data/ext/libsass/VERSION

@@ -1 +1 @@
-3.6.0
+3.6.1

data/ext/libsass/include/sass/base.h

@@ -17,6 +17,12 @@
   #endif
 #endif
 
+// Work around lack of `noexcept` keyword support in VS2013
+#if defined(_MSC_VER) && (_MSC_VER <= 1800) && !defined(_ALLOW_KEYWORD_MACROS)
+#define _ALLOW_KEYWORD_MACROS 1
+#define noexcept throw( )
+#endif
+
 #include <stddef.h>
 #include <stdbool.h>
 

data/ext/libsass/src/ast.cpp

@@ -184,7 +184,7 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
 
   Bubble::Bubble(ParserState pstate, Statement_Obj n, Statement_Obj g, size_t t)
-  : Statement(pstate, Statement::BUBBLE, t), node_(n), group_end_(g == 0)
+  : Statement(pstate, Statement::BUBBLE, t), node_(n), group_end_(g == nullptr)
   { }
   Bubble::Bubble(const Bubble* ptr)
   : Statement(ptr),
@@ -834,7 +834,7 @@ namespace Sass {
   }
 
   bool At_Root_Block::exclude_node(Statement_Obj s) {
-    if (expression() == 0)
+    if (expression() == nullptr)
     {
       return s->statement_type() == Statement::RULESET;
     }

data/ext/libsass/src/ast.hpp

@@ -312,7 +312,7 @@ namespace Sass {
     bool empty() const                     { return list_.empty(); }
     bool has(Expression_Obj k) const          { return elements_.count(k) == 1; }
     Expression_Obj at(Expression_Obj k) const;
-    bool has_duplicate_key() const         { return duplicate_key_ != 0; }
+    bool has_duplicate_key() const         { return duplicate_key_ != nullptr; }
     Expression_Obj get_duplicate_key() const  { return duplicate_key_; }
     const ExpressionMap elements() { return elements_; }
     Hashed& operator<<(std::pair<Expression_Obj, Expression_Obj> p)

data/ext/libsass/src/expand.cpp

@@ -104,7 +104,7 @@ namespace Sass {
     bool has_parent_selector = false;
     for (size_t i = 0, L = selector_stack.size(); i < L && !has_parent_selector; i++) {
       Selector_List_Obj ll = selector_stack.at(i);
-      has_parent_selector = ll != 0 && ll->length() > 0;
+      has_parent_selector = ll != nullptr && ll->length() > 0;
     }
 
     Selector_List_Obj sel = r->selector();
@@ -614,7 +614,7 @@ namespace Sass {
 
 
     Selector_List_Obj contextualized = Cast<Selector_List>(s->perform(&eval));
-    if (contextualized == false) return;
+    if (contextualized == nullptr) return;
     for (auto complex_sel : contextualized->elements()) {
       Complex_Selector_Obj c = complex_sel;
       if (!c->head() || c->tail()) {

data/ext/libsass/src/file.cpp

@@ -13,9 +13,8 @@
 #else
 # include <unistd.h>
 #endif
-#include <iostream>
-#include <fstream>
 #include <cctype>
+#include <cstdio>
 #include <vector>
 #include <algorithm>
 #include <sys/stat.h>
@@ -462,21 +461,27 @@ namespace Sass {
         // just convert from unsigned char*
         char* contents = (char*) pBuffer;
       #else
+        // Read the file using `<cstdio>` instead of `<fstream>` for better portability.
+        // The `<fstream>` header initializes `<locale>` and this buggy in GCC4/5 with static linking.
+        // See:
+        // https://www.spinics.net/lists/gcchelp/msg46851.html
+        // https://github.com/sass/sassc-ruby/issues/128
         struct stat st;
         if (stat(path.c_str(), &st) == -1 || S_ISDIR(st.st_mode)) return 0;
-        std::ifstream file(path.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
-        char* contents = 0;
-        if (file.is_open()) {
-          size_t size = file.tellg();
-          // allocate an extra byte for the null char
-          // and another one for edge-cases in lexer
-          contents = (char*) malloc((size+2)*sizeof(char));
-          file.seekg(0, std::ios::beg);
-          file.read(contents, size);
-          contents[size+0] = '\0';
-          contents[size+1] = '\0';
-          file.close();
+        FILE* fd = std::fopen(path.c_str(), "rb");
+        if (fd == nullptr) return nullptr;
+        const std::size_t size = st.st_size;
+        char* contents = static_cast<char*>(malloc(st.st_size + 2 * sizeof(char)));
+        if (std::fread(static_cast<void*>(contents), 1, size, fd) != size) {
+          free(contents);
+          return nullptr;
         }
+        if (std::fclose(fd) != 0) {
+          free(contents);
+          return nullptr;
+        }
+        contents[size] = '\0';
+        contents[size + 1] = '\0';
       #endif
       std::string extension;
       if (path.length() > 5) {

data/ext/libsass/src/inspect.cpp

@@ -1060,7 +1060,7 @@ namespace Sass {
 
     for (size_t i = 0, L = g->length(); i < L; ++i) {
       if (!in_wrapped && i == 0) append_indentation();
-      if ((*g)[i] == 0) continue;
+      if ((*g)[i] == nullptr) continue;
       schedule_mapping(g->at(i)->last());
       // add_open_mapping((*g)[i]->last());
       (*g)[i]->perform(this);

data/ext/libsass/src/memory/SharedPtr.hpp

@@ -3,8 +3,10 @@
 
 #include "sass/base.h"
 
+#include <cstddef>
 #include <iostream>
 #include <string>
+#include <type_traits>
 #include <vector>
 
 namespace Sass {
@@ -185,6 +187,100 @@ namespace Sass {
     T* detach() { return static_cast<T*>(SharedPtr::detach()); }
   };
 
-}
+  // Comparison operators, based on:
+  // https://en.cppreference.com/w/cpp/memory/unique_ptr/operator_cmp
+
+  template<class T1, class T2>
+  bool operator==(const SharedImpl<T1>& x, const SharedImpl<T2>& y) {
+    return x.ptr() == y.ptr();
+  }
+
+  template<class T1, class T2>
+  bool operator!=(const SharedImpl<T1>& x, const SharedImpl<T2>& y) {
+    return x.ptr() != y.ptr();
+  }
+
+  template<class T1, class T2>
+  bool operator<(const SharedImpl<T1>& x, const SharedImpl<T2>& y) {
+    using CT = typename std::common_type<T1*, T2*>::type;
+    return std::less<CT>()(x.get(), y.get());
+  }
+
+  template<class T1, class T2>
+  bool operator<=(const SharedImpl<T1>& x, const SharedImpl<T2>& y) {
+    return !(y < x);
+  }
+
+  template<class T1, class T2>
+  bool operator>(const SharedImpl<T1>& x, const SharedImpl<T2>& y) {
+    return y < x;
+  }
+
+  template<class T1, class T2>
+  bool operator>=(const SharedImpl<T1>& x, const SharedImpl<T2>& y) {
+    return !(x < y);
+  }
+
+  template <class T>
+  bool operator==(const SharedImpl<T>& x, std::nullptr_t) noexcept {
+    return x.isNull();
+  }
+
+  template <class T>
+  bool operator==(std::nullptr_t, const SharedImpl<T>& x) noexcept {
+    return x.isNull();
+  }
+
+  template <class T>
+  bool operator!=(const SharedImpl<T>& x, std::nullptr_t) noexcept {
+    return !x.isNull();
+  }
+
+  template <class T>
+  bool operator!=(std::nullptr_t, const SharedImpl<T>& x) noexcept {
+    return !x.isNull();
+  }
+
+  template <class T>
+  bool operator<(const SharedImpl<T>& x, std::nullptr_t) {
+    return std::less<T*>()(x.get(), nullptr);
+  }
+
+  template <class T>
+  bool operator<(std::nullptr_t, const SharedImpl<T>& y) {
+    return std::less<T*>()(nullptr, y.get());
+  }
+
+  template <class T>
+  bool operator<=(const SharedImpl<T>& x, std::nullptr_t) {
+    return !(nullptr < x);
+  }
+
+  template <class T>
+  bool operator<=(std::nullptr_t, const SharedImpl<T>& y) {
+    return !(y < nullptr);
+  }
+
+  template <class T>
+  bool operator>(const SharedImpl<T>& x, std::nullptr_t) {
+    return nullptr < x;
+  }
+
+  template <class T>
+  bool operator>(std::nullptr_t, const SharedImpl<T>& y) {
+    return y < nullptr;
+  }
+
+  template <class T>
+  bool operator>=(const SharedImpl<T>& x, std::nullptr_t) {
+    return !(x < nullptr);
+  }
+
+  template <class T>
+  bool operator>=(std::nullptr_t, const SharedImpl<T>& y) {
+    return !(nullptr < y);
+  }
+
+}  // namespace Sass
 
 #endif

data/ext/libsass/src/parser.cpp

@@ -2488,7 +2488,7 @@ namespace Sass {
   Supports_Condition_Obj Parser::parse_supports_condition_in_parens(bool parens_required)
   {
     Supports_Condition_Obj interp = parse_supports_interpolation();
-    if (interp != 0) return interp;
+    if (interp != nullptr) return interp;
 
     if (!lex < exactly <'('> >()) {
       if (parens_required) {

data/ext/libsass/src/util.cpp

@@ -627,9 +627,9 @@ namespace Sass {
 
     bool isPrintable(Media_Block* m, Sass_Output_Style style)
     {
-      if (m == 0) return false;
+      if (m == nullptr) return false;
       Block_Obj b = m->block();
-      if (b == 0) return false;
+      if (b == nullptr) return false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
         if (Cast<Directive>(stm)) return true;

data/lib/sassc/version.rb

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

data/sassc.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   end
 
   # Write a VERSION file for non-binary gems (for `SassC::Native.version`).
-  if !File.exist?(File.join(libsass_dir, 'VERSION'))
+  if File.exist?(File.join(libsass_dir, '.git'))
     libsass_version = Dir.chdir(libsass_dir) do
       %x[git describe --abbrev=4 --dirty --always --tags].chomp
     end

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.6.0", Native.version
+        assert_equal "3.6.1", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre2
+  version: 2.1.0.pre3
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest