sassc 1.8.1 → 1.8.2

data/ext/libsass/src/util.cpp

@@ -6,15 +6,33 @@
 #include "constants.hpp"
 #include "utf8/checked.h"
 
+#include <cmath>
 #include <stdint.h>
 
 namespace Sass {
 
-  #define out_of_memory() do {                    \
-      fprintf(stderr, "Out of memory.\n");    \
-      exit(EXIT_FAILURE);                     \
+  #define out_of_memory() do {            \
+      std::cerr << "Out of memory.\n";    \
+      exit(EXIT_FAILURE);                 \
     } while (0)
 
+  double round(double val)
+  {
+    // work around some compiler issue
+    // cygwin has it not defined in std
+    using namespace std;
+
+    // This was later repatched in 3.4.20
+    // which is as yet unreleased.
+    // https://github.com/sass/sass/commit/4e3e1d5684cc29073a507578fc977434ff488c93
+    if (fmod(val, 1) - 0.5 > -0.00001) return std::ceil(val);
+    return ::round(val);
+
+    // Use this version once sass-spec is at 3.4.20
+    // if (fmod(val, 1) - 0.5 > -0.00001) return ::round(val);
+    // return value > 0 ? std::ceil(val) : std::floor(val);
+  }
+
   /* Sadly, sass_strdup is not portable. */
   char *sass_strdup(const char *str)
   {
@@ -49,8 +67,8 @@ namespace Sass {
   }
 
   // helper for safe access to c_ctx
-  const char* safe_str (const char* str) {
-    return str == NULL ? "" : str;
+  const char* safe_str (const char* str, const char* alt) {
+    return str == NULL ? alt : str;
   }
 
   void free_string_array(char ** arr) {
@@ -107,7 +125,7 @@ namespace Sass {
 
           // convert the extracted hex string to code point value
           // ToDo: Maybe we could do this without creating a substring
-          uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), nullptr, 16);
+          uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), NULL, 16);
 
           if (cp == 0) cp = 0xFFFD;
 
@@ -401,7 +419,7 @@ namespace Sass {
 
           // convert the extracted hex string to code point value
           // ToDo: Maybe we could do this without creating a substring
-          uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), nullptr, 16);
+          uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), NULL, 16);
 
           if (s[i + len] == ' ') ++ len;
 
@@ -571,7 +589,7 @@ namespace Sass {
       }
     }
 
-    bool isPrintable(Ruleset* r, Output_Style style) {
+    bool isPrintable(Ruleset* r, Sass_Output_Style style) {
       if (r == NULL) {
         return false;
       }
@@ -597,7 +615,7 @@ namespace Sass {
           }
         } else if (Comment* c = dynamic_cast<Comment*>(stm)) {
           // keep for uncompressed
-          if (style != COMPRESSED) {
+          if (style != SASS_STYLE_COMPRESSED) {
             hasDeclarations = true;
           }
           // output style compressed
@@ -618,17 +636,17 @@ namespace Sass {
       return false;
     }
 
-    bool isPrintable(String_Constant* s, Output_Style style)
+    bool isPrintable(String_Constant* s, Sass_Output_Style style)
     {
       return ! s->value().empty();
     }
 
-    bool isPrintable(String_Quoted* s, Output_Style style)
+    bool isPrintable(String_Quoted* s, Sass_Output_Style style)
     {
       return true;
     }
 
-    bool isPrintable(Declaration* d, Output_Style style)
+    bool isPrintable(Declaration* d, Sass_Output_Style style)
     {
       Expression* val = d->value();
       if (String_Quoted* sq = dynamic_cast<String_Quoted*>(val)) return isPrintable(sq, style);
@@ -636,7 +654,7 @@ namespace Sass {
       return true;
     }
 
-    bool isPrintable(Supports_Block* f, Output_Style style) {
+    bool isPrintable(Supports_Block* f, Sass_Output_Style style) {
       if (f == NULL) {
         return false;
       }
@@ -673,7 +691,7 @@ namespace Sass {
       return false;
     }
 
-    bool isPrintable(Media_Block* m, Output_Style style)
+    bool isPrintable(Media_Block* m, Sass_Output_Style style)
     {
       if (m == 0) return false;
       Block* b = m->block();
@@ -689,7 +707,7 @@ namespace Sass {
       return false;
     }
 
-    bool isPrintable(Block* b, Output_Style style) {
+    bool isPrintable(Block* b, Sass_Output_Style style) {
       if (b == NULL) {
         return false;
       }
@@ -702,7 +720,7 @@ namespace Sass {
         else if (typeid(*stm) == typeid(Comment)) {
           Comment* c = (Comment*) stm;
           // keep for uncompressed
-          if (style != COMPRESSED) {
+          if (style != SASS_STYLE_COMPRESSED) {
             return true;
           }
           // output style compressed

data/ext/libsass/src/util.hpp

@@ -4,15 +4,17 @@
 #include <vector>
 #include <string>
 #include <assert.h>
+#include "sass/base.h"
 #include "ast_fwd_decl.hpp"
 
 #define SASS_ASSERT(cond, msg) assert(cond && msg)
 
 namespace Sass {
 
+  double round(double val);
   char* sass_strdup(const char* str);
   double sass_atof(const char* str);
-  const char* safe_str(const char *);
+  const char* safe_str(const char *, const char* = "");
   void free_string_array(char **);
   char **copy_strings(const std::vector<std::string>&, char ***, int = 0);
   std::string string_escape(const std::string& str);
@@ -45,13 +47,13 @@ namespace Sass {
     std::string vecJoin(const std::vector<std::string>& vec, const std::string& sep);
     bool containsAnyPrintableStatements(Block* b);
 
-    bool isPrintable(Ruleset* r, Output_Style style = NESTED);
-    bool isPrintable(Supports_Block* r, Output_Style style = NESTED);
-    bool isPrintable(Media_Block* r, Output_Style style = NESTED);
-    bool isPrintable(Block* b, Output_Style style = NESTED);
-    bool isPrintable(String_Constant* s, Output_Style style = NESTED);
-    bool isPrintable(String_Quoted* s, Output_Style style = NESTED);
-    bool isPrintable(Declaration* d, Output_Style style = NESTED);
+    bool isPrintable(Ruleset* r, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(Supports_Block* r, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(Media_Block* r, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(Block* b, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(String_Constant* s, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(String_Quoted* s, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(Declaration* d, Sass_Output_Style style = SASS_STYLE_NESTED);
     bool isAscii(const char chr);
 
   }

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

data/lib/tasks/libsass.rb

@@ -17,6 +17,6 @@ namespace :libsass do
   end
 
   file "lib/libsass.so" => "Makefile" do
-    sh 'make lib/libsass.so LDFLAGS="-Wall -O2"'
+    sh 'make lib/libsass.so'
   end
 end

data/test/custom_importer_test.rb

@@ -58,6 +58,8 @@ CSS
     end
 
     def test_dependency_list
+      base = temp_dir("").to_s
+
       temp_dir("fonts")
       temp_dir("fonts/sub")
       temp_file("fonts/sub/sub_fonts.scss", "$font: arial;")
@@ -78,13 +80,13 @@ SCSS
       })
       engine.render
 
-      dependencies = engine.dependencies.map(&:filename)
+      dependencies = engine.dependencies.map(&:filename).map { |f| f.gsub(base, "") }
 
       assert_equal [
+        "/fonts/sub/sub_fonts.scss",
+        "/styles2.scss",
         "fonts/fonts.scss",
-        "fonts/sub/sub_fonts.scss",
-        "styles1.scss",
-        "styles2.scss"
+        "styles1.scss"
       ], dependencies
     end
 

data/test/engine_test.rb

@@ -93,6 +93,8 @@ CSS
     end
 
     def test_dependency_filenames_are_reported
+      base = temp_dir("").to_s
+
       temp_file("not_included.scss", "$size: 30px;")
       temp_file("import_parent.scss", "$size: 30px;")
       temp_file("import.scss", "@import 'import_parent'; $size: 30px;")
@@ -102,9 +104,9 @@ CSS
       engine.render
       deps = engine.dependencies
 
-      expected = ["import.scss", "import_parent.scss"]
-      assert_equal expected, deps.map { |dep| dep.options[:filename] }.sort
-      assert_equal expected, deps.map(&:filename).sort
+      expected = ["/import.scss", "/import_parent.scss"]
+      assert_equal expected, deps.map { |dep| dep.options[:filename].gsub(base, "") }.sort
+      assert_equal expected, deps.map { |dep| dep.filename.gsub(base, "") }.sort
     end
 
     def test_no_dependencies

data/test/functions_test.rb

@@ -1,5 +1,6 @@
 require_relative "test_helper"
 require "stringio"
+require "sass/script"
 
 module SassC
   class FunctionsTest < MiniTest::Test

data/test/native_test.rb

@@ -9,7 +9,7 @@ module SassC
 
     class General < MiniTest::Test
       def test_it_reports_the_libsass_version
-        assert_equal "3.3.1", Native.version
+        assert_equal "3.3.2", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -181,7 +181,7 @@ files:
 - ext/libsass/docs/contributing.md
 - ext/libsass/docs/custom-functions-internal.md
 - ext/libsass/docs/implementations.md
-- ext/libsass/docs/plugins.go
+- ext/libsass/docs/plugins.md
 - ext/libsass/docs/setup-environment.md
 - ext/libsass/docs/source-map-internals.md
 - ext/libsass/docs/trace.md
@@ -206,7 +206,6 @@ files:
 - ext/libsass/script/ci-install-compiler
 - ext/libsass/script/ci-install-deps
 - ext/libsass/script/ci-report-coverage
-- ext/libsass/script/coveralls-debug
 - ext/libsass/script/spec
 - ext/libsass/script/tap-driver
 - ext/libsass/script/tap-runner
@@ -282,11 +281,14 @@ files:
 - ext/libsass/src/sass.cpp
 - ext/libsass/src/sass2scss.cpp
 - ext/libsass/src/sass_context.cpp
+- ext/libsass/src/sass_context.hpp
 - ext/libsass/src/sass_functions.cpp
+- ext/libsass/src/sass_functions.hpp
 - 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/sass_values.hpp
 - ext/libsass/src/source_map.cpp
 - ext/libsass/src/source_map.hpp
 - ext/libsass/src/subset_map.hpp

data/ext/libsass/script/coveralls-debug

@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use JSON;
-use File::Slurp;
-my $json = JSON->new;
-my $file = read_file('coveralls.json', { binmode => ':utf8' });
-my $rv = $json->decode($file);
-my $sources = $rv->{'source_files'};
-print STDERR join ", ", keys %{$rv}, "\n";
-foreach my $source (sort {
-	$a->{'name'} cmp $b->{'name'}
-} @{$sources})
-{
-	my $sum = 0;
-	my $undefs = 0;
-	my $coverages = $source->{'coverage'};
-	foreach my $coverage (@{$coverages})
-	{
-		if (defined $coverage)
-		{ $sum += $coverage }
-		else { $undefs ++; }
-	}
-	if ($sum > 0)
-	{
-		print STDERR $source->{'name'};
-		print STDERR " [sum: $sum]";
-		print STDERR " [undefs: $undefs]";
-		print STDERR "\n";
-	}
-}