sassc 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bbf189c8dd82c9e7a55454104b1ccdd03590bf0
-  data.tar.gz: 2cee2d1a55a747b4e873079e184964c84bee4fdd
+  metadata.gz: 2003bd0fdc35ac8281c0f203771b9e88e3554ce6
+  data.tar.gz: 4181ece117d80e29ff8abf55805fc8e7710e3c3f
 SHA512:
-  metadata.gz: a8128f57ef6fcafe9faacc7998411590c028b4946f60faddea2c9154885206707784cf20dcfabc254bb25bc47c10334e338019625ed4050f42136b32e495115e
-  data.tar.gz: 4870de37197958d7bdbfa4b95d3f7574da5754ff93148c4f1d0a7a9c42b8070b85d28f4faa4158537b2dd2464bb7c62a11285c99a9ab118e64502e622ddabdd3
+  metadata.gz: 44ff8a7c1c903405f2124f670b5277fee9f47bd4f61c5c429524b1812a8c3497fd1f4c0ca6812bc886b4414bdeb70846f3a69aef2d0cfd124c5cc30c2e332773
+  data.tar.gz: cc5690cb269eaa0408ae7c5b6f72aa71b11530357a72b930f3bfcae95ef56df708b97ba1a0c7af6e806802479023e4a306e22ae3758fac656bec84dbb270b494

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.4.0](https://github.com/sass/libsass/releases/tag/3.4.0)
+[3.4.1](https://github.com/sass/libsass/releases/tag/3.4.1)
 
 ## Installation
 
@@ -49,6 +49,8 @@ and [awesome contributors](https://github.com/bolandrm/sassc-ruby/graphs/contrib
 
 ## Changelog
 
+- **1.11.1**
+  - [Update to libsass 3.4.1](https://github.com/sass/sassc-ruby/pull/61)
 - **1.11.0**
   - [Add support for lists in functions](https://github.com/sass/sassc-ruby/pull/55)
   - [Update to libsass 3.4.0](https://github.com/sass/sassc-ruby/pull/57)

data/ext/libsass/src/expand.cpp

@@ -611,18 +611,29 @@ namespace Sass {
   {
     if (CommaSequence_Selector* extender = dynamic_cast<CommaSequence_Selector*>(selector())) {
       Selector* s = e->selector();
-      if (Selector_Schema* schema = dynamic_cast<Selector_Schema*>(s)) {
-        if (schema->has_parent_ref()) s = eval(schema);
+      CommaSequence_Selector* sl = NULL;
+      // check if we already have a valid selector list
+      if ((sl = dynamic_cast<CommaSequence_Selector*>(s))) {}
+      // convert selector schema to a selector list
+      else if (Selector_Schema* schema = dynamic_cast<Selector_Schema*>(s)) {
+        if (schema->has_real_parent_ref()) {
+          sl = eval(schema);
+        } else {
+          selector_stack.push_back(0);
+          sl = eval(schema);
+          sl->remove_parent_selectors();
+          selector_stack.pop_back();
+        }
       }
-      if (CommaSequence_Selector* sl = dynamic_cast<CommaSequence_Selector*>(s)) {
-        for (Sequence_Selector* cs : *sl) {
-          if (cs != NULL && cs->head() != NULL) {
-            cs->head()->media_block(media_block_stack.back());
-          }
+      // abort on invalid selector
+      if (sl == NULL) return NULL;
+      for (Sequence_Selector* cs : *sl) {
+        if (cs != NULL && cs->head() != NULL) {
+          cs->head()->media_block(media_block_stack.back());
         }
       }
       selector_stack.push_back(0);
-      expand_selector_list(s, extender);
+      expand_selector_list(sl, extender);
       selector_stack.pop_back();
     }
     return 0;

data/ext/libsass/src/functions.cpp

@@ -1016,20 +1016,30 @@ namespace Sass {
         String_Constant* s = ARG("$string", String_Constant);
         double start_at = ARG("$start-at", Number)->value();
         double end_at = ARG("$end-at", Number)->value();
+        String_Quoted* ss = dynamic_cast<String_Quoted*>(s);
 
         std::string str = unquote(s->value());
 
         size_t size = utf8::distance(str.begin(), str.end());
-        if (end_at <= size * -1.0 && size > 1) {
-          end_at += size;
-          if (end_at == 0) end_at = 1;
+
+        if (!dynamic_cast<Number*>(env["$end-at"])) {
+          end_at = -1;
+        }
+
+        if (end_at == 0 || (end_at + size) < 0) {
+          if (ss && ss->quote_mark()) newstr = quote("");
+          return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, newstr);
         }
+
         if (end_at < 0) {
           end_at += size + 1;
           if (end_at == 0) end_at = 1;
         }
         if (end_at > size) { end_at = (double)size; }
-        if (start_at < 0) { start_at += size + 1; }
+        if (start_at < 0) {
+          start_at += size + 1;
+          if (start_at < 0)  start_at = 0;
+        }
         else if (start_at == 0) { ++ start_at; }
 
         if (start_at <= end_at)

data/ext/libsass/src/units.cpp

@@ -44,9 +44,9 @@ namespace Sass {
   const double resolution_conversion_factors[3][3] =
   {
              /*  dpi        dpcm       dppx     */
-    /* dpi  */ { 1,         2.54,      96       },
-    /* dpcm */ { 1/2.54,    1,         96/2.54  },
-    /* dppx */ { 1/96.0,    2.54/96,   1        }
+    /* dpi  */ { 1,         1/2.54,    1/96.0   },
+    /* dpcm */ { 2.54,      1,         2.54/96  },
+    /* dppx */ { 96,        96/2.54,   1        }
   };
 
   UnitClass get_unit_type(UnitType unit)

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.11.0"
+  VERSION = "1.11.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.4.0", Native.version
+        assert_equal "3.4.1", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake