sassc 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f13097a5a3ad307a313cbe5e042460b96cc56d02
-  data.tar.gz: 5ebc6f97d3066bfecd7c8334a2e1b1b6d51e90d0
+  metadata.gz: 91b3f5152e03b21d9b101c9ee37e998565a900fe
+  data.tar.gz: a872b4b0599925f217186897efa68c68e536837c
 SHA512:
-  metadata.gz: de32bd0766e935adce472e86769b7a8c71aae7e5ed81af6a810d8cd3dcbc08df44b2e4db4e8bca01e45a179a4f203f0c0fa7622e5dab307d36e1fcd21606a130
-  data.tar.gz: fbc161e22ee1159e5b118687199bc6289b0b8eb1e981e807eb576e4ce1d571cf4f39751d6cb3be0cc02652272e192c87434ac21f19f7cd515b37b9b89b379f1b
+  metadata.gz: f81496b861e719e6aad4efb4fa392ced9503967a155e405680d278b5d10c8add33f1a4bcc2bd97d3bbce847d447ce9171e9c6762776ec0fd0d6ac217d64a6ec7
+  data.tar.gz: c3093d1aae7a2f0ffd6c192d5e6d198f75be5e2a6d8b9d094e33bd167b23ccbc6346858dd922bf4a17620cb890cf4ac7e246c660eea82fb8daaa79581717f22c

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.3.0](https://github.com/sass/libsass/releases/tag/3.3.0)
+[3.3.1](https://github.com/sass/libsass/releases/tag/3.3.1)
 
 ## Usage
 
@@ -25,6 +25,8 @@ and [awesome contributors](https://github.com/bolandrm/sassc-ruby/graphs/contrib
 
 ## Changelog
 
+- **1.8.1**
+  - Update to Libsass 3.3.1
 - **1.8.0**
   - Update to Libsass 3.3.0
 - **1.8.0.pre2**

data/ext/libsass/include/sass2scss.h

@@ -1,3 +1,9 @@
+/**
+ * sass2scss
+ * Licensed under the MIT License
+ * Copyright (c) Marcel Greter
+ */
+
 #ifndef SASS2SCSS_H
 #define SASS2SCSS_H
 
@@ -29,11 +35,11 @@
 #include <iostream>
 
 #ifndef SASS2SCSS_VERSION
-#define SASS2SCSS_VERSION "1.0.3"
+// Hardcode once the file is copied from
+// https://github.com/mgreter/sass2scss
+#define SASS2SCSS_VERSION "1.0.5"
 #endif
 
-// using std::string
-
 // add namespace for c++
 namespace Sass
 {
@@ -111,4 +117,4 @@ extern "C" {
 } // __cplusplus defined.
 #endif
 
-#endif
+#endif

data/ext/libsass/src/bind.cpp

@@ -125,7 +125,7 @@ namespace Sass {
             // maybe we have another list as argument
             List* ls = dynamic_cast<List*>(a->value());
             // skip any list completely if empty
-            if (ls && ls->empty()) continue;
+            if (ls && ls->empty() && a->is_rest_argument()) continue;
             // flatten all nested arglists
             if (ls && ls->is_arglist()) {
               for (size_t i = 0, L = ls->size(); i < L; ++i) {

data/ext/libsass/src/constants.cpp

@@ -127,7 +127,6 @@ namespace Sass {
     extern const char hyphen[]          = "-";
     extern const char ellipsis[]        = "...";
     // extern const char url_space_chars[] = " \t\r\n\f";
-    extern const char escape_chars[]    = " -~"; // need to include unicode spaces too
     // type names
     extern const char numeric_name[]    = "numeric value";
     extern const char number_name[]     = "number";

data/ext/libsass/src/constants.hpp

@@ -129,7 +129,6 @@ namespace Sass {
     extern const char hyphen[];
     extern const char ellipsis[];
     // extern const char url_space_chars[];
-    extern const char escape_chars[];
 
     // type names
     extern const char numeric_name[];

data/ext/libsass/src/eval.cpp

@@ -1325,6 +1325,12 @@ namespace Sass {
     if (ltype == Expression::NULL_VAL) error("Invalid null operation: \"null plus "+quote(unquote(rstr), '"')+"\".", lhs.pstate());
     if (rtype == Expression::NULL_VAL) error("Invalid null operation: \""+quote(unquote(lstr), '"')+" plus null\".", rhs.pstate());
 
+    if (ltype == Expression::NUMBER && sep == "/" && rtype == Expression::STRING)
+    {
+      return SASS_MEMORY_NEW(mem, String_Constant, lhs.pstate(),
+        lhs.to_string() + sep + rhs.to_string());
+    }
+
     if ( (ltype == Expression::STRING || sep == "") &&
          (sep != "/" || !rqstr || !rqstr->quote_mark())
     ) {
@@ -1439,7 +1445,8 @@ namespace Sass {
   {
     To_String to_string;
     // the parser will look for a brace to end the selector
-    std::string result_str(s->contents()->perform(this)->perform(&to_string) + "{");
+    std::string result_str(s->contents()->perform(this)->perform(&to_string));
+    result_str = unquote(Util::rtrim(result_str)) + "{";
     Parser p = Parser::from_c_str(result_str.c_str(), ctx, s->pstate());
     return operator()(p.parse_selector_list(exp.block_stack.back()->is_root()));
   }

data/ext/libsass/src/functions.cpp

@@ -1588,17 +1588,17 @@ namespace Sass {
       List* arglist = SASS_MEMORY_NEW(ctx.mem, List, *ARG("$args", List));
 
       Arguments* args = SASS_MEMORY_NEW(ctx.mem, Arguments, pstate);
-      std::string full_name(name + "[f]");
-      Definition* def = d_env.has(full_name) ? static_cast<Definition*>((d_env)[full_name]) : 0;
-      Parameters* params = def ? def->parameters() : 0;
-      size_t param_size = params ? params->length() : 0;
+      // std::string full_name(name + "[f]");
+      // Definition* def = d_env.has(full_name) ? static_cast<Definition*>((d_env)[full_name]) : 0;
+      // Parameters* params = def ? def->parameters() : 0;
+      // size_t param_size = params ? params->length() : 0;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
         Expression* expr = arglist->value_at_index(i);
-        if (params && params->has_rest_parameter()) {
-          Parameter* p = param_size > i ? (*params)[i] : 0;
-          List* list = dynamic_cast<List*>(expr);
-          if (list && p && !p->is_rest_parameter()) expr = (*list)[0];
-        }
+        // if (params && params->has_rest_parameter()) {
+        //   Parameter* p = param_size > i ? (*params)[i] : 0;
+        //   List* list = dynamic_cast<List*>(expr);
+        //   if (list && p && !p->is_rest_parameter()) expr = (*list)[0];
+        // }
         if (arglist->is_arglist()) {
           Argument* arg = dynamic_cast<Argument*>((*arglist)[i]);
           *args << SASS_MEMORY_NEW(ctx.mem, Argument,

data/ext/libsass/src/lexer.cpp

@@ -93,6 +93,13 @@ namespace Sass {
       return unsigned(chr) > 41 && unsigned(chr) < 127;
     }
 
+    // check if char is within a reduced ascii range
+    // valid for escaping (copied from Ruby Sass)
+    bool is_escapable_character(const char& chr)
+    {
+      return unsigned(chr) > 31 && unsigned(chr) < 127;
+    }
+
     // Match word character (look ahead)
     bool is_character(const char& chr)
     {
@@ -115,6 +122,7 @@ namespace Sass {
     const char* punct(const char* src) { return is_punct(*src) ? src + 1 : 0; }
     const char* character(const char* src) { return is_character(*src) ? src + 1 : 0; }
     const char* uri_character(const char* src) { return is_uri_character(*src) ? src + 1 : 0; }
+    const char* escapable_character(const char* src) { return is_escapable_character(*src) ? src + 1 : 0; }
 
     // Match multiple ctype characters.
     const char* spaces(const char* src) { return one_plus<space>(src); }

data/ext/libsass/src/lexer.hpp

@@ -35,6 +35,7 @@ namespace Sass {
     bool is_nonascii(const char& src);
     bool is_character(const char& src);
     bool is_uri_character(const char& src);
+    bool escapable_character(const char& src);
 
     // Match a single ctype predicate.
     const char* space(const char* src);
@@ -47,6 +48,7 @@ namespace Sass {
     const char* nonascii(const char* src);
     const char* character(const char* src);
     const char* uri_character(const char* src);
+    const char* escapable_character(const char* src);
 
     // Match multiple ctype characters.
     const char* spaces(const char* src);

data/ext/libsass/src/prelexer.cpp

@@ -91,6 +91,8 @@ namespace Sass {
                unicode,
                exactly<'-'>,
                exactly<'_'>,
+               NONASCII,
+               ESCAPE,
                escape_seq
              >(src);
     }
@@ -104,6 +106,8 @@ namespace Sass {
                unicode,
                exactly<'-'>,
                exactly<'_'>,
+               NONASCII,
+               ESCAPE,
                escape_seq
              >(src);
     }
@@ -944,8 +948,10 @@ namespace Sass {
         UUNICODE,
         sequence<
           exactly<'\\'>,
-          NONASCII,
-          class_char< escape_chars >
+          alternatives<
+            NONASCII,
+            escapable_character
+          >
         >
       >(src);
     }

data/ext/libsass/src/sass2scss.cpp

@@ -1,3 +1,9 @@
+/**
+ * sass2scss
+ * Licensed under the MIT License
+ * Copyright (c) Marcel Greter
+ */
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS
 #define _CRT_NONSTDC_NO_DEPRECATE
@@ -26,8 +32,6 @@
 // our own header
 #include "sass2scss.h"
 
-// using std::string
-
 // add namespace for c++
 namespace Sass
 {
@@ -609,15 +613,16 @@ namespace Sass
 				sass.substr(pos_left, 8) != "@content"
 			) {
 
-				// try to find a colon in the current line, but only ...
-				size_t pos_colon = sass.find_first_not_of(":", pos_left);
-				// assertion for valid result
+				// probably a selector anyway
+				converter.selector = true;
+				// try to find first colon in the current line
+				size_t pos_colon = sass.find_first_of(":", pos_left);
+				// assertion that we have a colon
 				if (pos_colon != std::string::npos)
 				{
-					// ... after the first word (skip begining colons)
-					pos_colon = sass.find_first_of(":", pos_colon);
-					// it is a selector if there was no colon found
-					converter.selector = pos_colon == std::string::npos;
+					// it is not a selector if we have a space after a colon
+					if (sass[pos_colon+1] == ' ') converter.selector = false;
+					if (sass[pos_colon+1] == '	') converter.selector = false;
 				}
 
 			}

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 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.0", Native.version
+        assert_equal "3.3.1", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake