sassc 1.9.0 → 1.10.0

data/ext/libsass/src/util.cpp

@@ -12,11 +12,6 @@
 
 namespace Sass {
 
-  #define out_of_memory() do {            \
-      std::cerr << "Out of memory.\n";    \
-      exit(EXIT_FAILURE);                 \
-    } while (0)
-
   double round(double val, size_t precision)
   {
     // https://github.com/sass/sass/commit/4e3e1d5684cc29073a507578fc977434ff488c93
@@ -28,16 +23,6 @@ namespace Sass {
     return ::round(val);
   }
 
-  /* Sadly, sass_strdup is not portable. */
-  char *sass_strdup(const char *str)
-  {
-    char *ret = (char*) malloc(strlen(str) + 1);
-    if (ret == NULL)
-      out_of_memory();
-    strcpy(ret, str);
-    return ret;
-  }
-
   /* Locale unspecific atof function. */
   double sass_atof(const char *str)
   {
@@ -50,7 +35,7 @@ namespace Sass {
       if(found != NULL){
         // substitution is required. perform the substitution on a copy
         // of the string. This is slower but it is thread safe.
-        char *copy = sass_strdup(str);
+        char *copy = sass_copy_c_string(str);
         *(copy + (found - str)) = separator;
         double res = atof(copy);
         free(copy);
@@ -118,7 +103,10 @@ namespace Sass {
       }
       out.push_back(i);
     }
-    if (esc) out += '\\';
+    // happens when parsing does not correctly skip
+    // over escaped sequences for ie. interpolations
+    // one example: foo\#{interpolate}
+    // if (esc) out += '\\';
     return out;
   }
 
@@ -473,7 +461,7 @@ namespace Sass {
       bool hasPrintableChildBlocks = false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement* stm = (*b)[i];
-        if (dynamic_cast<At_Rule*>(stm)) {
+        if (dynamic_cast<Directive*>(stm)) {
           return true;
         } else if (dynamic_cast<Has_Block*>(stm)) {
           Block* pChildBlock = ((Has_Block*)stm)->block();
@@ -540,7 +528,7 @@ namespace Sass {
           // is NULL, then that means there was never a wrapping selector and it is printable (think of a top level media block with
           // a declaration in it).
         }
-        else if (typeid(*stm) == typeid(Declaration) || typeid(*stm) == typeid(At_Rule)) {
+        else if (typeid(*stm) == typeid(Declaration) || typeid(*stm) == typeid(Directive)) {
           hasDeclarations = true;
         }
         else if (dynamic_cast<Has_Block*>(stm)) {
@@ -565,15 +553,53 @@ namespace Sass {
       if (b == 0) return false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement* stm = (*b)[i];
-        if (typeid(*stm) == typeid(At_Rule)) return true;
-        if (typeid(*stm) == typeid(Declaration)) return true;
-        if (Has_Block* child = dynamic_cast<Has_Block*>(stm)) {
-          if (isPrintable(child->block(), style)) return true;
+        if (typeid(*stm) == typeid(Directive)) return true;
+        else if (typeid(*stm) == typeid(Declaration)) return true;
+        else if (typeid(*stm) == typeid(Comment)) {
+          Comment* c = (Comment*) stm;
+          if (isPrintable(c, style)) {
+            return true;
+          }
+        }
+        else if (typeid(*stm) == typeid(Ruleset)) {
+          Ruleset* r = (Ruleset*) stm;
+          if (isPrintable(r, style)) {
+            return true;
+          }
+        }
+        else if (typeid(*stm) == typeid(Supports_Block)) {
+          Supports_Block* f = (Supports_Block*) stm;
+          if (isPrintable(f, style)) {
+            return true;
+          }
+        }
+        else if (typeid(*stm) == typeid(Media_Block)) {
+          Media_Block* m = (Media_Block*) stm;
+          if (isPrintable(m, style)) {
+            return true;
+          }
+        }
+        else if (dynamic_cast<Has_Block*>(stm) && isPrintable(((Has_Block*)stm)->block(), style)) {
+          return true;
         }
       }
       return false;
     }
 
+    bool isPrintable(Comment* c, Sass_Output_Style style)
+    {
+      // keep for uncompressed
+      if (style != COMPRESSED) {
+        return true;
+      }
+      // output style compressed
+      if (c->is_important()) {
+        return true;
+      }
+      // not printable
+      return false;
+    };
+
     bool isPrintable(Block* b, Sass_Output_Style style) {
       if (b == NULL) {
         return false;
@@ -581,17 +607,12 @@ namespace Sass {
 
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement* stm = (*b)[i];
-        if (typeid(*stm) == typeid(Declaration) || typeid(*stm) == typeid(At_Rule)) {
+        if (typeid(*stm) == typeid(Declaration) || typeid(*stm) == typeid(Directive)) {
           return true;
         }
         else if (typeid(*stm) == typeid(Comment)) {
           Comment* c = (Comment*) stm;
-          // keep for uncompressed
-          if (style != COMPRESSED) {
-            return true;
-          }
-          // output style compressed
-          if (c->is_important()) {
+          if (isPrintable(c, style)) {
             return true;
           }
         }

data/ext/libsass/src/util.hpp

@@ -12,8 +12,12 @@
 
 namespace Sass {
 
+  #define out_of_memory() do {            \
+      std::cerr << "Out of memory.\n";    \
+      exit(EXIT_FAILURE);                 \
+    } while (0)
+
   double round(double val, size_t precision = 0);
-  char* sass_strdup(const char* str);
   double sass_atof(const char* str);
   const char* safe_str(const char *, const char* = "");
   void free_string_array(char **);
@@ -46,6 +50,7 @@ namespace Sass {
     bool isPrintable(Ruleset* r, Sass_Output_Style style = NESTED);
     bool isPrintable(Supports_Block* r, Sass_Output_Style style = NESTED);
     bool isPrintable(Media_Block* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(Comment* b, Sass_Output_Style style = NESTED);
     bool isPrintable(Block* b, Sass_Output_Style style = NESTED);
     bool isPrintable(String_Constant* s, Sass_Output_Style style = NESTED);
     bool isPrintable(String_Quoted* s, Sass_Output_Style style = NESTED);

data/ext/libsass/win/libsass.targets

@@ -5,7 +5,6 @@
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\base.h" />
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\context.h" />
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\functions.h" />
-    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\interface.h" />
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\values.h" />
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h" />
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h.in" />
@@ -97,7 +96,6 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\prelexer.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\remove_placeholders.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass.cpp" />
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_interface.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_context.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_functions.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_util.cpp" />

data/ext/libsass/win/libsass.vcxproj.filters

@@ -34,9 +34,6 @@
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\functions.h">
       <Filter>Include Headers</Filter>
     </ClInclude>
-    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\interface.h">
-      <Filter>Include Headers</Filter>
-    </ClInclude>
     <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\values.h">
       <Filter>Include Headers</Filter>
     </ClInclude>
@@ -302,9 +299,6 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_interface.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_context.cpp">
       <Filter>Sources</Filter>
     </ClCompile>

data/lib/sassc/engine.rb

@@ -40,7 +40,10 @@ module SassC
 
       if status != 0
         message = Native.context_get_error_message(context)
-        raise SyntaxError.new(message)
+        filename = Native.context_get_error_file(context)
+        line = Native.context_get_error_line(context)
+
+        raise SyntaxError.new(message, filename: filename, line: line)
       end
 
       css = Native.context_get_output_string(context)

data/lib/sassc/error.rb

@@ -1,9 +1,31 @@
+require 'pathname'
 require 'sass/error'
 
 module SassC
   class BaseError < StandardError; end
-  class SyntaxError < BaseError; end
   class NotRenderedError < BaseError; end
   class InvalidStyleError < BaseError; end
   class UnsupportedValue < BaseError; end
+
+  # When dealing with SyntaxErrors,
+  # it's important to provide filename and line number information.
+  # This will be used in various error reports to users, including backtraces;
+  class SyntaxError < BaseError
+    def initialize(message, filename: nil, line: nil)
+      @filename = filename
+      @line = line
+      super(message)
+    end
+
+    def backtrace
+      return nil if super.nil?
+      sass_backtrace + super
+    end
+
+    # The backtrace of the error within Sass files.
+    def sass_backtrace
+      return [] unless @filename && @line
+      ["#{@filename}:#{@line}"]
+    end
+  end
 end

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/test/error_test.rb

@@ -0,0 +1,27 @@
+require_relative "test_helper"
+
+module SassC
+  class ErrorTest < MiniTest::Test
+    def render(data, opts={})
+      Engine.new(data, opts).render
+    end
+
+    def test_first_backtrace_is_sass
+      filename = "app/assets/stylesheets/application.scss"
+
+      begin
+        template = <<-SCSS
+.foo {
+  baz: bang;
+  padding top: 10px;
+}
+      SCSS
+
+        render(template, filename: filename)
+      rescue SassC::SyntaxError => err
+        expected = "#{filename}:3"
+        assert_equal expected, err.backtrace.first
+      end
+    end
+  end
+end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -192,7 +192,6 @@ files:
 - 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
@@ -285,7 +284,6 @@ files:
 - 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
@@ -355,6 +353,7 @@ files:
 - sassc.gemspec
 - test/custom_importer_test.rb
 - test/engine_test.rb
+- test/error_test.rb
 - test/fixtures/paths.scss
 - test/functions_test.rb
 - test/native_test.rb
@@ -381,13 +380,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Use libsass with Ruby!
 test_files:
 - test/custom_importer_test.rb
 - test/engine_test.rb
+- test/error_test.rb
 - test/fixtures/paths.scss
 - test/functions_test.rb
 - test/native_test.rb

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

@@ -1,105 +0,0 @@
-#ifndef SASS_C_INTERFACE_H
-#define SASS_C_INTERFACE_H
-
-// the API in this header has been deprecated
-// please use the new API from sass/context.h
-
-#include <stddef.h>
-#include <stdbool.h>
-#include <sass/base.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// Please ensure there are no null values.
-// Thar be dragons.
-struct sass_options {
-  // Output style for the generated css code
-  // A value from above SASS_STYLE_* constants
-  int output_style;
-  // If you want inline source comments
-  bool source_comments;
-  // Path to source map file
-  // Enables the source map generating
-  // Used to create sourceMappingUrl
-  const char* source_map_file;
-  // Disable sourceMappingUrl in css output
-  bool omit_source_map_url;
-  // embed sourceMappingUrl as data uri
-  bool source_map_embed;
-  // embed include contents in maps
-  bool source_map_contents;
-  // Pass-through as sourceRoot property
-  const char* source_map_root;
-  // Treat source_string as sass (as opposed to scss)
-  bool is_indented_syntax_src;
-  // Colon-separated list of paths
-  // Semicolon-separated on Windows
-  const char* include_paths;
-  const char* plugin_paths;
-  // String to be used for indentation
-  const char* indent;
-  // String to be used to for line feeds
-  const char* linefeed;
-  // Precision for outputting fractional numbers
-  int precision;
-};
-
-struct sass_context {
-  const char* input_path;
-  const char* output_path;
-  char* source_string;
-  char* output_string;
-  char* source_map_string;
-  struct sass_options options;
-  int error_status;
-  char* error_message;
-  Sass_Function_List c_functions;
-  char** included_files;
-  int num_included_files;
-};
-
-struct sass_file_context {
-  const char* input_path;
-  const char* output_path;
-  char* output_string;
-  char* source_map_string;
-  struct sass_options options;
-  int error_status;
-  char* error_message;
-  Sass_Function_List c_functions;
-  char** included_files;
-  int num_included_files;
-};
-
-struct sass_folder_context {
-  const char* search_path;
-  const char* output_path;
-  struct sass_options options;
-  int error_status;
-  char* error_message;
-  Sass_Function_List c_functions;
-  char** included_files;
-  int num_included_files;
-};
-
-struct sass_context* sass_new_context (void);
-struct sass_file_context* sass_new_file_context (void);
-struct sass_folder_context* sass_new_folder_context (void);
-
-void sass_free_context (struct sass_context* ctx);
-void sass_free_file_context (struct sass_file_context* ctx);
-void sass_free_folder_context(struct sass_folder_context* ctx);
-
-int sass_compile (struct sass_context* ctx);
-int sass_compile_file (struct sass_file_context* ctx);
-int sass_compile_folder (struct sass_folder_context* ctx);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif