sassc 1.1.2 → 1.2.0

data/ext/libsass/util.cpp

@@ -262,21 +262,15 @@ namespace Sass {
   {
     bool ws = false;
     bool esc = false;
-    char inside_str = 0;
     string text = "";
-    for(auto i : str) {
+    for(const char& i : str) {
       if (!esc && i == '\\') {
         esc = true;
+        ws = false;
         text += i;
       } else if (esc) {
         esc = false;
-        text += i;
-      } else if (!inside_str && (i == '"' || i == '\'')) {
-        inside_str = i;
-        text += i;
-      } else if (inside_str) {
-        if (i == inside_str)
-          inside_str = false;
+        ws = false;
         text += i;
       } else if (
         i == ' ' ||
@@ -401,7 +395,7 @@ namespace Sass {
 
   }
 
-  string quote(const string& s, char q)
+  string quote(const string& s, char q, bool keep_linefeed_whitespace)
   {
 
     // autodetect with fallback to given quote
@@ -430,6 +424,10 @@ namespace Sass {
       if (cp == 10) {
         quoted.push_back('\\');
         quoted.push_back('a');
+        // we hope we can remove this flag once we figure out
+        // why ruby sass has these different output behaviors
+        if (keep_linefeed_whitespace)
+          quoted.push_back(' ');
       } else if (cp < 127) {
         quoted.push_back((char) cp);
       } else {

data/ext/libsass/util.hpp

@@ -21,7 +21,7 @@ namespace Sass {
   string comment_to_string(const string& text);
   string normalize_wspace(const string& str);
 
-  string quote(const string&, char q = 0);
+  string quote(const string&, char q = 0, bool keep_linefeed_whitespace = false);
   string unquote(const string&, char* q = 0);
   char detect_best_quotemark(const char* s, char qm = '"');
 

data/lib/sassc/engine.rb

@@ -77,9 +77,13 @@ module SassC
     end
 
     def output_style
-      style = @options.fetch(:style, :sass_style_nested).to_sym
-      raise InvalidStyleError unless Native::SassOutputStyle.symbols.include?(style)
-      style
+      @output_style ||= begin
+        style = @options.fetch(:style, :sass_style_nested).to_s
+        style = "sass_style_#{style}" unless style.include?("sass_style_")
+        style = style.to_sym
+        raise InvalidStyleError unless Native::SassOutputStyle.symbols.include?(style)
+        style
+      end
     end
 
     def load_paths

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 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.2.2", Native.version
+        assert_equal "3.2.4", Native.version
       end
     end
 

data/test/output_style_test.rb

@@ -91,6 +91,13 @@ CSS
     def test_compressed_output
       engine = Engine.new(input_scss, style: :sass_style_compressed)
       assert_equal <<-CSS, engine.render
+#main{color:#fff;background-color:#000}#main p{width:10em}.huge{font-size:10em;font-weight:bold;text-decoration:underline}
+      CSS
+    end
+
+    def test_short_output_style_names
+      engine = Engine.new(input_scss, style: :compressed)
+      assert_equal <<-CSS, engine.render
 #main{color:#fff;background-color:#000}#main p{width:10em}.huge{font-size:10em;font-weight:bold;text-decoration:underline}
       CSS
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake