sassc 1.10.1 → 1.11.0

data/ext/libsass/src/units.hpp

@@ -77,7 +77,9 @@ namespace Sass {
         ss << "Incompatible units: ";
         ss << "'" << unit_to_string(a) << "' and ";
         ss << "'" << unit_to_string(b) << "'";
-        msg = ss.str().c_str();
+        // hold on to string on stack!
+        std::string str(ss.str());
+        msg = str.c_str();
       }
       virtual const char* what() const throw()
       {

data/ext/libsass/src/util.cpp

@@ -145,13 +145,20 @@ namespace Sass {
     return out;
   }
 
-  // bell character is replaces with space
+  // bell characters are replaced with spaces
+  void newline_to_space(std::string& str)
+  {
+    std::replace(str.begin(), str.end(), '\n', ' ');
+  }
+
+  // bell characters are replaced with spaces
+  // also eats spaces after line-feeds (ltrim)
   std::string string_to_output(const std::string& str)
   {
     std::string out("");
     bool lf = false;
     for (auto i : str) {
-      if (i == 10) {
+      if (i == '\n') {
         out += ' ';
         lf = true;
       } else if (!(lf && isspace(i))) {
@@ -214,7 +221,7 @@ namespace Sass {
     return quote_mark;
   }
 
-  std::string unquote(const std::string& s, char* qd, bool keep_utf8_sequences)
+  std::string unquote(const std::string& s, char* qd, bool keep_utf8_sequences, bool strict)
   {
 
     // not enough room for quotes
@@ -267,7 +274,7 @@ namespace Sass {
           // assert invalid code points
           if (cp == 0) cp = 0xFFFD;
           // replace bell character
-          // if (cp == 10) cp = 32;
+          // if (cp == '\n') cp = 32;
 
           // use a very simple approach to convert via utf8 lib
           // maybe there is a more elegant way; maybe we shoud
@@ -292,6 +299,9 @@ namespace Sass {
       //   error("Unescaped delimiter in string to unquote found. [" + s + "]", ParserState("[UNQUOTE]"));
       // }
       else {
+        if (strict && !skipped) {
+          if (s[i] == q) return s;
+        }
         skipped = false;
         unq.push_back(s[i]);
       }
@@ -330,7 +340,7 @@ namespace Sass {
       int cp = utf8::next(it, end);
 
       // in case of \r, check if the next in sequence
-      // is \n and then advance the iterator.
+      // is \n and then advance the iterator and skip \r
       if (cp == '\r' && it < end && utf8::peek_next(it, end) == '\n') {
         cp = utf8::next(it, end);
       }
@@ -451,7 +461,7 @@ namespace Sass {
 
       Block* b = r->block();
 
-      bool hasSelectors = static_cast<Selector_List*>(r->selector())->length() > 0;
+      bool hasSelectors = static_cast<CommaSequence_Selector*>(r->selector())->length() > 0;
 
       if (!hasSelectors) {
         return false;
@@ -463,6 +473,8 @@ namespace Sass {
         Statement* stm = (*b)[i];
         if (dynamic_cast<Directive*>(stm)) {
           return true;
+        } else if (Declaration* d = dynamic_cast<Declaration*>(stm)) {
+          return isPrintable(d, style);
         } else if (dynamic_cast<Has_Block*>(stm)) {
           Block* pChildBlock = ((Has_Block*)stm)->block();
           if (isPrintable(pChildBlock, style)) {
@@ -477,8 +489,6 @@ namespace Sass {
           if (c->is_important()) {
             hasDeclarations = c->is_important();
           }
-        } else if (Declaration* d = dynamic_cast<Declaration*>(stm)) {
-          return isPrintable(d, style);
         } else {
           hasDeclarations = true;
         }
@@ -516,19 +526,13 @@ namespace Sass {
 
       Block* b = f->block();
 
-//      bool hasSelectors = f->selector() && static_cast<Selector_List*>(f->selector())->length() > 0;
+//      bool hasSelectors = f->selector() && static_cast<CommaSequence_Selector*>(f->selector())->length() > 0;
 
       bool hasDeclarations = false;
       bool hasPrintableChildBlocks = false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement* stm = (*b)[i];
-        if (!stm->is_hoistable()) {
-          // If a statement isn't hoistable, the selectors apply to it. If there are no selectors (a selector list of length 0),
-          // then those statements aren't considered printable. That means there was a placeholder that was removed. If the selector
-          // 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(Directive)) {
+        if (typeid(*stm) == typeid(Declaration) || typeid(*stm) == typeid(Directive)) {
           hasDeclarations = true;
         }
         else if (dynamic_cast<Has_Block*>(stm)) {

data/ext/libsass/src/util.hpp

@@ -26,9 +26,10 @@ namespace Sass {
   std::string evacuate_escapes(const std::string& str);
   std::string string_to_output(const std::string& str);
   std::string comment_to_string(const std::string& text);
+  void newline_to_space(std::string& str);
 
   std::string quote(const std::string&, char q = 0);
-  std::string unquote(const std::string&, char* q = 0, bool keep_utf8_sequences = false);
+  std::string unquote(const std::string&, char* q = 0, bool keep_utf8_sequences = false, bool strict = true);
   char detect_best_quotemark(const char* s, char qm = '"');
 
   bool is_hex_doublet(double n);

data/ext/libsass/win/libsass.targets

@@ -18,6 +18,7 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\base64vlq.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\bind.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\b64\cencode.h" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\check_nesting.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\color_maps.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\constants.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\context.hpp" />
@@ -71,6 +72,7 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\bind.cpp" />
     <ClCompile Condition="$(VisualStudioVersion) &lt; 14.0" Include="$(LIBSASS_SRC_DIR)\c99func.c" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\cencode.c" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\check_nesting.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\color_maps.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\constants.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\context.cpp" />

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

@@ -66,6 +66,9 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\bind.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\check_nesting.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\color_maps.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -224,6 +227,9 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\cencode.c">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\check_nesting.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\color_maps.cpp">
       <Filter>Sources</Filter>
     </ClCompile>

data/lib/sassc/engine.rb

@@ -32,6 +32,7 @@ module SassC
       Native.option_set_source_map_file(native_options, source_map_file) if source_map_file
       Native.option_set_source_map_embed(native_options, true) if source_map_embed?
       Native.option_set_source_map_contents(native_options, true) if source_map_contents?
+      Native.option_set_omit_source_map_url(native_options, true) if omit_source_map_url?
 
       import_handler.setup(native_options)
       functions_handler.setup(native_options)
@@ -98,6 +99,10 @@ module SassC
       @options[:source_map_contents]
     end
 
+    def omit_source_map_url?
+      @options[:omit_source_map_url]
+    end
+
     def source_map_file
       @options[:source_map_file]
     end

data/lib/sassc/native/native_functions_api.rb

@@ -26,7 +26,10 @@ module SassC
 
     # ADDAPI union Sass_Value* ADDCALL sass_make_map     (size_t len);
     attach_function :sass_make_map, [:size_t], :sass_value_ptr
-    
+
+    # ADDAPI union Sass_Value* ADDCALL sass_make_list     (size_t len, enum Sass_Separator sep)
+    attach_function :sass_make_list, [:size_t, SassSeparator], :sass_value_ptr
+
     # ADDAPI union Sass_Value* ADDCALL sass_make_boolean (boolean val);
     attach_function :sass_make_boolean, [:bool], :sass_value_ptr
 
@@ -45,6 +48,15 @@ module SassC
     # ADDAPI size_t ADDCALL sass_map_get_length (const union Sass_Value* v);
     attach_function :sass_map_get_length, [:sass_value_ptr], :size_t
 
+    # ADDAPI union Sass_Value* ADDCALL sass_list_get_value (const union Sass_Value* v, size_t i);
+    attach_function :sass_list_get_value, [:sass_value_ptr, :size_t], :sass_value_ptr
+
+    # ADDAPI void ADDCALL sass_list_set_value (union Sass_Value* v, size_t i, union Sass_Value* value);
+    attach_function :sass_list_set_value, [:sass_value_ptr, :size_t, :sass_value_ptr], :void
+
+    # ADDAPI size_t ADDCALL sass_list_get_length (const union Sass_Value* v);
+    attach_function :sass_list_get_length, [:sass_value_ptr], :size_t
+
     # ADDAPI union Sass_Value* ADDCALL sass_make_error   (const char* msg);
     attach_function :sass_make_error, [:string], :sass_value_ptr
 

data/lib/sassc/script/value_conversion.rb

@@ -41,6 +41,13 @@ module SassC
 
           argument = Sass::Script::Value::Map.new values
           argument
+        when :sass_list
+          length = Native::list_get_length(native_value)
+          items = (0...length).map do |index|
+            native_item = Native::list_get_value(native_value, index)
+            from_native(native_item, options)
+          end
+          Sass::Script::Value::List.new(items, :space)
         else
           raise UnsupportedValue.new("Sass argument of type #{value_tag} unsupported")
         end
@@ -56,6 +63,8 @@ module SassC
           Number.new(value).to_native
         when "Map"
           Map.new(value).to_native
+        when "List"
+          List.new(value).to_native
         when "Bool"
           Bool.new(value).to_native
         else
@@ -71,4 +80,5 @@ require_relative "value_conversion/string"
 require_relative "value_conversion/number"
 require_relative "value_conversion/color"
 require_relative "value_conversion/map"
-require_relative "value_conversion/bool"
+require_relative "value_conversion/list"
+require_relative "value_conversion/bool"

data/lib/sassc/script/value_conversion/list.rb

@@ -0,0 +1,23 @@
+module SassC
+  module Script
+    module ValueConversion
+      SEPARATORS = {
+        space: :sass_space,
+        comma: :sass_comma
+      }
+
+      class List < Base
+        def to_native
+          list = @value.to_a
+          sep = SEPARATORS.fetch(@value.separator)
+          native_list = Native::make_list(list.size, sep)
+          list.each_with_index do |item, index|
+            native_item = ValueConversion.to_native(item)
+            Native::list_set_value(native_list, index, native_item)
+          end
+          native_list
+        end
+      end
+    end
+  end
+end

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.10.1"
+  VERSION = "1.11.0"
 end

data/test/engine_test.rb

@@ -154,8 +154,8 @@ SCSS
 \t\t"@import 'admin/text-color';\\n\\np {\\n  padding: 20px;\\n}\\n",
 \t\t"p {\\n  color: red;\\n}\\n"
 \t],
-\t"mappings": "ACAA,AAAA,CAAC,CAAC;EACA,KAAK,EAAE,GAAI,GACZ;;ADAD,AAAA,CAAC,CAAC;EACA,OAAO,EAAE,IAAK,GACf",
-\t"names": []
+\t"names": [],
+\t"mappings": "ACAA,AAAA,CAAC,CAAC;EACA,KAAK,EAAE,GAAG,GACX;;ADAD,AAAA,CAAC,CAAC;EACA,OAAO,EAAE,IAAI,GACd"
 }
 MAP
     end
@@ -166,6 +166,22 @@ MAP
       assert_raises(NotRenderedError) { engine.source_map }
     end
 
+    def test_omit_source_map_url
+      temp_file('style.scss', <<SCSS)
+p {
+  padding: 20px;
+}
+SCSS
+      engine = Engine.new(File.read('style.scss'), {
+        source_map_file: "style.scss.map",
+        source_map_contents: true,
+        omit_source_map_url: true
+      })
+      output = engine.render
+
+      refute_match /sourceMappingURL/, output
+    end
+
     def test_load_paths
       temp_dir("included_1")
       temp_dir("included_2")

data/test/functions_test.rb

@@ -119,6 +119,7 @@ module SassC
     end
 
     def test_function_with_unsupported_tag
+      skip('What are other unsupported tags?')
       engine = Engine.new("div {url: function_with_unsupported_tag(());}")
 
       exception = assert_raises(SassC::SyntaxError) do
@@ -166,6 +167,23 @@ module SassC
       CSS
     end
 
+    def test_function_that_returns_a_sass_list
+      assert_sass <<-SCSS, <<-CSS
+        $my-list: returns-sass-list();
+        div { width: nth( $my-list, 2 ); }
+      SCSS
+        div { width: 20; }
+      CSS
+    end
+
+    def test_function_that_takes_a_sass_list
+      assert_sass <<-SCSS, <<-CSS
+        div { width: nth(inspect-list((10 20 30)), 2); }
+      SCSS
+        div { width: 20; }
+      CSS
+    end
+
     private
 
     def assert_sass(sass, expected_css)
@@ -250,6 +268,11 @@ module SassC
         return argument
       end
 
+      def inspect_list(argument)
+        raise StandardError.new "passed value is not a Sass::Script::Value::List" unless argument.is_a? Sass::Script::Value::List
+        return argument
+      end
+
       def returns_sass_value
         return Sass::Script::Value::Color.new(red: 0, green: 0, blue: 0)
       end
@@ -263,6 +286,13 @@ module SassC
         return map
       end
 
+      def returns_sass_list
+        numbers = [10, 20, 30].map do |n|
+          Sass::Script::Value::Number.new(n, '')
+        end
+        Sass::Script::Value::List.new(numbers, :space)
+      end
+
       module Compass
         def stylesheet_path(path)
           Script::String.new("/css/#{path.value}", :identifier)

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,6 +140,8 @@ files:
 - ext/Rakefile
 - ext/libsass/.editorconfig
 - ext/libsass/.gitattributes
+- ext/libsass/.github/CONTRIBUTING.md
+- ext/libsass/.github/ISSUE_TEMPLATE.md
 - ext/libsass/.gitignore
 - ext/libsass/.travis.yml
 - ext/libsass/COPYING
@@ -223,6 +225,8 @@ files:
 - ext/libsass/src/bind.hpp
 - ext/libsass/src/c99func.c
 - ext/libsass/src/cencode.c
+- ext/libsass/src/check_nesting.cpp
+- ext/libsass/src/check_nesting.hpp
 - ext/libsass/src/color_maps.cpp
 - ext/libsass/src/color_maps.hpp
 - ext/libsass/src/constants.cpp
@@ -345,6 +349,7 @@ files:
 - lib/sassc/script/value_conversion/base.rb
 - lib/sassc/script/value_conversion/bool.rb
 - lib/sassc/script/value_conversion/color.rb
+- lib/sassc/script/value_conversion/list.rb
 - lib/sassc/script/value_conversion/map.rb
 - lib/sassc/script/value_conversion/number.rb
 - lib/sassc/script/value_conversion/string.rb
@@ -380,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Use libsass with Ruby!