sassc 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1ddb620763b2dad7308dd18a9c91c82192162d
-  data.tar.gz: c533165c997f081c2736e299e5de9da5bfe59d3b
+  metadata.gz: b426c4e47a4d6d041b25565605d6fe708847faaa
+  data.tar.gz: 36fd1baaa0ba7aaeb6b9100ee60aaeea8fa3d974
 SHA512:
-  metadata.gz: addcd9ccee78f7b39e7c8931fbae374c19dee6601c14553255f3cc665c51985614c0b6a8abc223d3391b61f82170b296e64205693016fc71dd73c951f94b1a6b
-  data.tar.gz: 29f40e46fd1713286196044415f168b1e3b7c07169f54f9c564ef528d5d70357325bcdf27164018b94a88a974116e7dfe0be514b5099826b43070e83eb1a57e4
+  metadata.gz: 54261aec807408c986d337a75e9051062ea0d5cb45affc510285a310cc5b0d95b6d1b810afe24f9e9d0f4762a6f2bbf3615ebbabc51a9bac5d26ac08a41fe0c4
+  data.tar.gz: 8264a970a2f76968e9eab211983c0f2c09c5f5a2ed634891146f239c25a5db7d8aa0bfa2a970e4136b1568dff97613e51e20578b112436cdffd10fa3e5db54c3

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.2.2](https://github.com/sass/libsass/releases/tag/3.2.2)
+[3.2.5](https://github.com/sass/libsass/releases/tag/3.2.5)
 
 ## Usage
 
@@ -23,14 +23,13 @@ Additionally, you can use `SassC::Sass2Scss` to convert Sass syntax to Scss synt
 ### Project Setup
 
 1. Clone repo
-2. Install dependencies - `bundle install`
-3. Initialize the libsass submodule - `bundle exec rake submodule`
-4. Run the tests - `bundle exec rake test`
+1. Install dependencies - `bundle install`
+1. Run the tests - `bundle exec rake test`
 
 ### Code Changes
 
 1. Fork it ( https://github.com/[my-github-username]/sassc/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`) - try to include tests
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Commit your changes (`git commit -am 'Add some feature'`) - try to include tests
+1. Push to the branch (`git push origin my-new-feature`)
+1. Create a new Pull Request

data/Rakefile

@@ -4,22 +4,12 @@ rescue LoadError
   puts 'Cannot load bundler/gem_tasks'
 end
 
-task default: :prepare
+require 'tasks/libsass'
 
-task prepare: "ext/lib/libsass.so"
+task default: :test
 
-file "ext/lib/libsass.so" do
-  gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
-  cd "ext/libsass"
-  sh 'make lib/libsass.so LDFLAGS="-Wall -O2"'
-  cd gem_dir
-end
-
-task test: :prepare do
+desc "Run all tests"
+task test: 'libsass:compile' do
   $LOAD_PATH.unshift('lib', 'test')
   Dir.glob('./test/**/*_test.rb') { |f| require f }
 end
-
-task :submodule do
-  sh "git submodule update --init"
-end

data/ext/Rakefile

@@ -0,0 +1,3 @@
+require_relative '../lib/tasks/libsass'
+
+task default: 'libsass:compile'

data/ext/libsass/SECURITY.md

@@ -0,0 +1,10 @@
+Serious about security
+======================
+
+The LibSass team recognizes the important contributions the security research
+community can make. We therefore encourage reporting security issues with the
+code contained in this repository.
+
+If you believe you have discovered a security vulnerability, please report it at
+https://hackerone.com/libsass instead of GitHub.
+

data/ext/libsass/cssize.cpp

@@ -423,8 +423,10 @@ namespace Sass {
         else
         {
           List* mq = merge_media_queries(static_cast<Media_Block*>(b->node()), static_cast<Media_Block*>(parent));
-          static_cast<Media_Block*>(b->node())->media_queries(mq);
-          ss = b->node();
+          if (mq->length()) {
+            static_cast<Media_Block*>(b->node())->media_queries(mq);
+            ss = b->node();
+          }
         }
 
         if (!ss) continue;

data/ext/libsass/debugger.hpp

@@ -203,8 +203,8 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << (block->is_interpolated() ? " [is_interpolated]": " -")
     << endl;
-    debug_ast(block->feature(), ind + " f) ");
-    debug_ast(block->value(), ind + " v) ");
+    debug_ast(block->feature(), ind + " feature) ");
+    debug_ast(block->value(), ind + " value) ");
 
   } else if (dynamic_cast<Media_Query*>(node)) {
     Media_Query* block = dynamic_cast<Media_Query*>(node);
@@ -452,10 +452,10 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << ind << "Map " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [Hashed]" << endl;
-    // for (auto i : expression->elements()) {
-    //   debug_ast(i.first, ind + " key: ");
-    //   debug_ast(i.second, ind + " val: ");
-    // }
+    for (auto i : expression->elements()) {
+      debug_ast(i.first, ind + " key: ");
+      debug_ast(i.second, ind + " val: ");
+    }
   } else if (dynamic_cast<List*>(node)) {
     List* expression = dynamic_cast<List*>(node);
     cerr << ind << "List " << expression;
@@ -499,7 +499,9 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
   } else if (dynamic_cast<String_Constant*>(node)) {
     String_Constant* expression = dynamic_cast<String_Constant*>(node);
     cerr << ind << "String_Constant " << expression;
-    cerr << " " << expression->concrete_type() <<
+    if (expression->concrete_type()) {
+      cerr << " " << expression->concrete_type();
+    }
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) cerr << " [delayed]";

data/ext/libsass/eval.cpp

@@ -393,16 +393,24 @@ namespace Sass {
   Expression* Eval::operator()(Map* m)
   {
     if (m->is_expanded()) return m;
+
+    // make sure we're not starting with duplicate keys.
+    // the duplicate key state will have been set in the parser phase.
+    if (m->has_duplicate_key()) {
+      To_String to_string(&ctx);
+      error("Duplicate key \"" + m->get_duplicate_key()->perform(&to_string) + "\" in map " + m->perform(&to_string) + ".", m->pstate());
+    }
+
     Map* mm = new (ctx.mem) Map(m->pstate(),
                                   m->length());
     for (auto key : m->keys()) {
-      *mm << std::make_pair(key->perform(this), m->at(key)->perform(this));
+      *mm << std::make_pair(key->perform(this), m->at(key)->perform(this));;
     }
 
-    // check for duplicate keys
+    // check the evaluated keys aren't duplicates.
     if (mm->has_duplicate_key()) {
       To_String to_string(&ctx);
-      error("Duplicate key \"" + mm->get_duplicate_key()->perform(&to_string) + "\" in map " + m->perform(&to_string) + ".", m->pstate());
+      error("Duplicate key \"" + mm->get_duplicate_key()->perform(&to_string) + "\" in map " + mm->perform(&to_string) + ".", mm->pstate());
     }
 
     mm->is_expanded(true);
@@ -790,6 +798,10 @@ namespace Sass {
                                       zero);
         break;
       case Textual::HEX: {
+        if (t->value().substr(0, 1) != "#") {
+          result = new (ctx.mem) String_Constant(t->pstate(), t->value());
+          break;
+        }
         string hext(t->value().substr(1)); // chop off the '#'
         if (hext.length() == 6) {
           string r(hext.substr(0,2));
@@ -923,6 +935,7 @@ namespace Sass {
     } else if (str->quote_mark()) {
       str->quote_mark('*');
     }
+    str->is_delayed(true);
     return str;
   }
 
@@ -997,8 +1010,16 @@ namespace Sass {
   {
     Expression* feature = e->feature();
     feature = (feature ? feature->perform(this) : 0);
+    if (feature && dynamic_cast<String_Quoted*>(feature)) {
+      feature = new (ctx.mem) String_Constant(feature->pstate(),
+                                              dynamic_cast<String_Quoted*>(feature)->value());
+    }
     Expression* value = e->value();
     value = (value ? value->perform(this) : 0);
+    if (value && dynamic_cast<String_Quoted*>(value)) {
+      value = new (ctx.mem) String_Constant(value->pstate(),
+                                            dynamic_cast<String_Quoted*>(value)->value());
+    }
     return new (ctx.mem) Media_Query_Expression(e->pstate(),
                                                 feature,
                                                 value,
@@ -1102,8 +1123,10 @@ namespace Sass {
       } break;
 
       case Expression::STRING: {
-        return unquote(static_cast<String_Constant*>(lhs)->value()) ==
-               unquote(static_cast<String_Constant*>(rhs)->value());
+        string slhs = static_cast<String_Quoted*>(lhs)->value();
+        string srhs = static_cast<String_Quoted*>(rhs)->value();
+        return unquote(slhs) == unquote(srhs) &&
+               (!(is_quoted(slhs) || is_quoted(srhs)) || slhs[0] == srhs[0]);
       } break;
 
       case Expression::LIST: {

data/ext/libsass/functions.cpp

@@ -221,9 +221,9 @@ namespace Sass {
       double w2 = 1 - w1;
 
       return new (ctx.mem) Color(pstate,
-                                 std::floor(w1*color1->r() + w2*color2->r()),
-                                 std::floor(w1*color1->g() + w2*color2->g()),
-                                 std::floor(w1*color1->b() + w2*color2->b()),
+                                 std::round(w1*color1->r() + w2*color2->r()),
+                                 std::round(w1*color1->g() + w2*color2->g()),
+                                 std::round(w1*color1->b() + w2*color2->b()),
                                  color1->a()*p + color2->a()*(1-p));
     }
 
@@ -1051,8 +1051,8 @@ namespace Sass {
       Number* least = 0;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
         Number* xi = dynamic_cast<Number*>(arglist->value_at_index(i));
+        if (!xi) error("`" + string(sig) + "` only takes numeric arguments", pstate);
         if (least) {
-          if (!xi) error("`" + string(sig) + "` only takes numeric arguments", pstate);
           if (lt(xi, least, ctx)) least = xi;
         } else least = xi;
       }
@@ -1066,8 +1066,8 @@ namespace Sass {
       Number* greatest = 0;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
         Number* xi = dynamic_cast<Number*>(arglist->value_at_index(i));
+        if (!xi) error("`" + string(sig) + "` only takes numeric arguments", pstate);
         if (greatest) {
-          if (!xi) error("`" + string(sig) + "` only takes numeric arguments", pstate);
           if (lt(greatest, xi, ctx)) greatest = xi;
         } else greatest = xi;
       }

data/ext/libsass/inspect.cpp

@@ -582,6 +582,8 @@ namespace Sass {
       hexlet << hex << setw(2) << static_cast<unsigned long>(b);
     }
 
+    if (want_short && !c->is_delayed()) name = "";
+
     // retain the originally specified color definition if unchanged
     if (name != "") {
       ss << name;

data/ext/libsass/parser.cpp

@@ -85,6 +85,8 @@ namespace Sass {
       }
     }
 
+    bool semicolon = false;
+    string(error_message);
     lex< optional_spaces >();
     Selector_Lookahead lookahead_result;
     while (position < end) {
@@ -97,14 +99,16 @@ namespace Sass {
             (*root) << new (ctx.mem) Import_Stub(pstate, imp->files()[i]);
           }
         }
-        if (!lex< one_plus< exactly<';'> > >()) error("top-level @import directive must be terminated by ';'", pstate);
+        semicolon = true;
+        error_message = "top-level @import directive must be terminated by ';'";
       }
       else if (peek< kwd_mixin >() || peek< kwd_function >()) {
         (*root) << parse_definition();
       }
       else if (peek< variable >()) {
         (*root) << parse_assignment();
-        if (!lex< one_plus< exactly<';'> > >()) error("top-level variable binding must be terminated by ';'", pstate);
+        semicolon = true;
+        error_message = "top-level variable binding must be terminated by ';'";
       }
       /*else if (peek< sequence< optional< exactly<'*'> >, alternatives< identifier_schema, identifier >, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
         (*root) << parse_propset();
@@ -112,7 +116,10 @@ namespace Sass {
       else if (peek< kwd_include >() /* || peek< exactly<'+'> >() */) {
         Mixin_Call* mixin_call = parse_mixin_call();
         (*root) << mixin_call;
-        if (!mixin_call->block() && !lex< one_plus< exactly<';'> > >()) error("top-level @include directive must be terminated by ';'", pstate);
+        if (!mixin_call->block()) {
+          semicolon = true;
+          error_message = "top-level @include directive must be terminated by ';'";
+        }
       }
       else if (peek< kwd_if_directive >()) {
         (*root) << parse_if_directive();
@@ -137,15 +144,18 @@ namespace Sass {
       }
       else if (peek< kwd_warn >()) {
         (*root) << parse_warning();
-        if (!lex< one_plus< exactly<';'> > >()) error("top-level @warn directive must be terminated by ';'", pstate);
+        semicolon = true;
+        error_message = "top-level @warn directive must be terminated by ';'";
       }
       else if (peek< kwd_err >()) {
         (*root) << parse_error();
-        if (!lex< one_plus< exactly<';'> > >()) error("top-level @error directive must be terminated by ';'", pstate);
+        semicolon = true;
+        error_message = "top-level @error directive must be terminated by ';'";
       }
       else if (peek< kwd_dbg >()) {
         (*root) << parse_debug();
-        if (!lex< one_plus< exactly<';'> > >()) error("top-level @debug directive must be terminated by ';'", pstate);
+        semicolon = true;
+        error_message = "top-level @debug directive must be terminated by ';'";
       }
       // ignore the @charset directive for now
       else if (lex< exactly< charset_kwd > >()) {
@@ -155,7 +165,10 @@ namespace Sass {
       else if (peek< at_keyword >()) {
         At_Rule* at_rule = parse_at_rule();
         (*root) << at_rule;
-        if (!at_rule->block() && !lex< one_plus< exactly<';'> > >()) error("top-level directive must be terminated by ';'", pstate);
+        if (!at_rule->block()){
+          semicolon = true;
+          error_message = "top-level directive must be terminated by ';'";
+        }
       }
       else if ((lookahead_result = lookahead_for_selector(position)).found) {
         (*root) << parse_ruleset(lookahead_result);
@@ -168,6 +181,11 @@ namespace Sass {
         if (position >= end) break;
         error("invalid top-level expression", after_token);
       }
+      if (semicolon) {
+        if (!lex< one_plus< exactly<';'> > >() && peek_css< optional_css_whitespace >() != end)
+        { error(error_message, pstate); }
+        semicolon = false;
+      }
       lex< optional_spaces >();
     }
     block_stack.pop_back();
@@ -636,7 +654,7 @@ namespace Sass {
     seq->media_block(last_media_block);
     seq->last_block(block_stack.back());
     bool sawsomething = false;
-    if (lex< exactly<'&'> >()) {
+    if (lex_css< exactly<'&'> >()) {
       // check if we have a parent selector on the root level block
       if (block_stack.back() && block_stack.back()->is_root()) {
         //error("Base-level rules cannot contain the parent-selector-referencing character '&'.", pstate);
@@ -985,6 +1003,7 @@ namespace Sass {
     }
     else if (lex< sequence< optional< exactly<'*'> >, identifier > >()) {
       prop = new (ctx.mem) String_Quoted(pstate, lexed);
+      prop->is_delayed(true);
     }
     else {
       error("invalid property name", pstate);
@@ -1086,12 +1105,6 @@ namespace Sass {
       (*map) << make_pair(key, value);
     }
 
-    // Check was moved to eval step
-    // if (map->has_duplicate_key()) {
-    //   To_String to_string(&ctx);
-    //   error("Duplicate key \"" + map->get_duplicate_key()->perform(&to_string) + "\" in map " + map->perform(&to_string) + ".", pstate);
-    // }
-
     ParserState ps = map->pstate();
     ps.offset = pstate - ps + pstate.offset;
     map->pstate(ps);
@@ -1174,7 +1187,7 @@ namespace Sass {
                exactly<ellipsis>,
                default_flag,
                global_flag
-           > >(position))
+           > >(position)) && peek_css< optional_css_whitespace >() != end
     ) {
       (*space_list) << parse_disjunction();
     }
@@ -1453,6 +1466,14 @@ namespace Sass {
     return schema;
   }
 
+  String_Constant* Parser::parse_static_expression()
+  {
+    if (peek< sequence< number, optional_spaces, exactly<'/'>, optional_spaces, number > >()) {
+      return parse_static_value();
+    }
+    return 0;
+  }
+
   String_Constant* Parser::parse_static_value()
   {
     lex< static_value >();
@@ -1461,7 +1482,7 @@ namespace Sass {
     --position;
 
     String_Constant* str_node = new (ctx.mem) String_Constant(pstate, str.time_wspace());
-    // str_node->is_delayed(true);
+    str_node->is_delayed(true);
     return str_node;
   }
 
@@ -1555,8 +1576,12 @@ namespace Sass {
       }
       else if (lex< interpolant >()) {
         Token insides(Token(lexed.begin + 2, lexed.end - 1));
-        Expression* interp_node = Parser::from_token(insides, ctx, pstate).parse_list();
-        interp_node->is_interpolant(true);
+        Expression* interp_node;
+        Parser p = Parser::from_token(insides, ctx, pstate);
+        if (!(interp_node = p.parse_static_expression())) {
+          interp_node = p.parse_list();
+          interp_node->is_interpolant(true);
+        }
         (*schema) << interp_node;
       }
       else if (lex< exactly<'%'> >()) {
@@ -2135,7 +2160,6 @@ namespace Sass {
            (q = peek< sequence< pseudo_prefix, identifier > >(p))  ||
            (q = peek< percentage >(p))                             ||
            (q = peek< dimension >(p))                              ||
-           (q = peek< variable >(p))                            ||
            (q = peek< quoted_string >(p))                          ||
            (q = peek< exactly<'*'> >(p))                           ||
            (q = peek< exactly<'('> >(p))                           ||

data/ext/libsass/parser.hpp

@@ -241,6 +241,7 @@ namespace Sass {
     Function_Call_Schema* parse_function_call_schema();
     String* parse_interpolated_chunk(Token, bool constant = false);
     String* parse_string();
+    String_Constant* parse_static_expression();
     String_Constant* parse_static_value();
     String* parse_ie_property();
     String* parse_ie_keyword_arg();

data/ext/libsass/sass_functions.cpp

@@ -88,6 +88,9 @@ extern "C" {
     return (Sass_Importer_List) calloc(length + 1, sizeof(Sass_Importer_Entry));
   }
 
+  Sass_Importer_Entry ADDCALL sass_importer_get_list_entry(Sass_Importer_List list, size_t idx) { return list[idx]; }
+  void ADDCALL sass_importer_set_list_entry(Sass_Importer_List list, size_t idx, Sass_Importer_Entry cb) { list[idx] = cb; }
+
   // Creator for sass custom importer return argument list
   Sass_Import_List ADDCALL sass_make_import_list(size_t length)
   {

data/lib/sassc/functions_handler.rb

@@ -10,25 +10,45 @@ module SassC
 
       list = Native.make_function_list(Script.custom_functions.count)
 
-      functs = FunctionWrapper.extend(Script::Functions)
-      functs.options = @options
+      functions = FunctionWrapper.extend(Script::Functions)
+      functions.options = @options
 
       Script.custom_functions.each_with_index do |custom_function, i|
-        @callbacks[custom_function] = FFI::Function.new(:pointer, [:pointer, :pointer]) do |s_args, cookie|
-          length = Native.list_get_length(s_args)
+        @callbacks[custom_function] = FFI::Function.new(:pointer, [:pointer, :pointer]) do |native_argument_list, cookie|
+          native_argument_list_length = Native.list_get_length(native_argument_list)
+          custom_function_arguments = []
+          error_tag = nil
 
-          v = Native.list_get_value(s_args, 0)
-          v = Native.string_get_value(v).dup
+          (0...native_argument_list_length).each do |i|
+            native_value = Native.list_get_value(native_argument_list, i)
 
-          s = Script::String.new(Script::String.unquote(v), Script::String.type(v))
+            case value_tag = Native.value_get_tag(native_value)
+            when :sass_null
+              # no-op
+            when :sass_string
+              native_string = Native.string_get_value(native_value)
+              argument = Script::String.new(Script::String.unquote(native_string), Script::String.type(native_string))
 
-          value = functs.send(custom_function, s)
+              custom_function_arguments << argument
+            else
+              error_tag = error("Sass argument of type #{value_tag} unsupported")
+              break
+            end
+          end
+
+          next error_tag if error_tag
 
-          if value
-            value = Script::String.new(Script::String.unquote(value.to_s), value.type)
-            value.to_native
-          else
-            Script::String.new("").to_native
+          begin
+            value = functions.send(custom_function, *custom_function_arguments)
+
+            if value
+              value = Script::String.new(Script::String.unquote(value.to_s), value.type)
+              value.to_native
+            else
+              Script::String.new("").to_native
+            end
+          rescue StandardError => exception
+            error(exception.message)
           end
         end
 
@@ -48,6 +68,21 @@ module SassC
 
     private
 
+    def error(message)
+      value = Native::SassValue.new
+      value[:unknown] = Native::SassUnknown.new
+
+      error = Native::SassError.new
+      error[:tag] = :sass_error
+
+      Native.error_set_message(error, Native.native_string(message))
+      $stderr.puts "[SassC::FunctionsHandler] #{message}"
+
+      value[:unknown][:tag] = :sass_error
+      value[:error] = error
+      value.pointer
+    end
+
     class FunctionWrapper
       class << self
         attr_accessor :options

data/lib/sassc/native.rb

@@ -48,7 +48,8 @@ module SassC
     end
 
     def self.native_string(string)
-      string += "\0"
+      string = string.to_s
+      string << "\0"
       data = Native::LibC.malloc(string.bytesize)
       data.write_string(string)
       data

data/lib/sassc/native/native_functions_api.rb

@@ -19,6 +19,7 @@ module SassC
 
     # ADDAPI enum Sass_Tag ADDCALL sass_value_get_tag (const union Sass_Value* v);
     attach_function :sass_value_get_tag, [:sass_value_ptr], SassTag
+    attach_function :sass_value_is_null, [:sass_value_ptr], :bool
 
     # ADDAPI const char* ADDCALL sass_string_get_value (const union Sass_Value* v);
     attach_function :sass_string_get_value, [:sass_value_ptr], :string
@@ -28,6 +29,11 @@ module SassC
     attach_function :sass_list_get_length, [:sass_value_ptr], :size_t
     attach_function :sass_list_get_value, [:sass_value_ptr, :size_t], :sass_value_ptr
 
+    # ADDAPI char* ADDCALL sass_error_get_message (const union Sass_Value* v);
+    # ADDAPI void ADDCALL sass_error_set_message (union Sass_Value* v, char* msg);
+    attach_function :sass_error_get_message, [:sass_value_ptr], :string
+    attach_function :sass_error_set_message, [:sass_value_ptr, :pointer], :void
+
     # Getters for custom function descriptors
     # ADDAPI const char* ADDCALL sass_function_get_signature (Sass_C_Function_Callback fn);
     # ADDAPI Sass_C_Function ADDCALL sass_function_get_function (Sass_C_Function_Callback fn);

data/lib/sassc/native/sass_value.rb

@@ -71,12 +71,12 @@ module SassC
 
     class SassError < FFI::Struct
       layout :tag, SassTag,
-             :messsage, :string
+             :message, :string
     end
 
     class SassWarning < FFI::Struct
       layout :tag, SassTag,
-             :messsage, :string
+             :message, :string
     end
 
     class SassValue # < FFI::Union

data/lib/sassc/script.rb

@@ -8,10 +8,9 @@ module SassC
 
     def self.formatted_function_name(function_name)
       params = Functions.instance_method(function_name).parameters
-      params = params.select { |param| param[0] == :req }
-                     .map(&:first)
-                     .map { |p| "$#{p}" }
+      params = params.map { |param_type, name| "$#{name}#{': null' if param_type == :opt}" }
                      .join(", ")
+
       "#{function_name}(#{params})"
     end
   end

data/lib/sassc/script/string.rb

@@ -66,12 +66,12 @@ module SassC
       def self.unquote(contents)
         s = contents.dup
 
-        case contents[0,1]
+        case contents[0, 1]
         when "'", '"', '`'
           s[0] = ''
         end
 
-        case contents[-1,1]
+        case contents[-1, 1]
         when "'", '"', '`'
           s[-1] = ''
         end

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/tasks/libsass.rb

@@ -0,0 +1,21 @@
+namespace :libsass do
+  desc "Compile libsass"
+  task compile: "ext/libsass/lib/libsass.so"
+
+  file "ext/libsass/.git" do
+    sh "git submodule update --init"
+  end
+
+  file "ext/libsass/lib/libsass.so" => "ext/libsass/.git" do
+    libsass_path = ""
+    if Dir.pwd.end_with?('/ext')
+      libsass_path = "libsass"
+    else
+      libsass_path = "ext/libsass"
+    end
+
+    cd libsass_path do
+      sh 'make lib/libsass.so LDFLAGS="-Wall -O2"'
+    end
+  end
+end

data/sassc.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib", "ext"]
 
-  spec.extensions    = ["Rakefile"]
+  spec.require_paths = ["lib"]
+
+  spec.extensions    = ["ext/Rakefile"]
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.5.1"

data/test/functions_test.rb

@@ -1,34 +1,16 @@
 require_relative "test_helper"
+require "stringio"
 
 module SassC
   class FunctionsTest < MiniTest::Test
     include FixtureHelper
 
-    SassString = Struct.new(:value, :type) do
-      def to_s
-        value
-      end
+    def setup
+      @real_stderr, $stderr = $stderr, StringIO.new
     end
 
-    module Script::Functions
-      def javascript_path(path)
-        Script::String.new("/js/#{path.value}", :string)
-      end
-
-      def no_return_path(path)
-        nil
-      end
-
-      def sass_return_path(path)
-        return SassString.new("'#{path.value}'", :string)
-      end
-
-      module Compass
-        def stylesheet_path(path)
-          Script::String.new("/css/#{path.value}", :identifier)
-        end
-      end
-      include Compass
+    def teardown
+      $stderr = @real_stderr
     end
 
     def test_functions_may_return_sass_string_type
@@ -70,5 +52,89 @@ div {
   url: url(); }
       EOS
     end
+
+    def test_function_with_optional_arguments
+      engine = Engine.new("div {url: optional_arguments('first'); url: optional_arguments('second', 'qux')}")
+      assert_equal <<-EOS, engine.render
+div {
+  url: "first/bar";
+  url: "second/qux"; }
+      EOS
+    end
+
+    def test_function_with_unsupported_tag
+      engine = Engine.new("div {url: function_with_unsupported_tag(red);}")
+
+      exception = assert_raises(SassC::SyntaxError) do
+        engine.render
+      end
+
+      assert_equal "Error: error in C function function_with_unsupported_tag: Sass argument of type sass_color unsupported\n\n       Backtrace:\n       \tstdin:1, in function `function_with_unsupported_tag`\n       \tstdin:1\n        on line 1 of stdin\n>> div {url: function_with_unsupported_tag(red);}\n   ----------^\n", exception.message
+
+      assert_equal "[SassC::FunctionsHandler] Sass argument of type sass_color unsupported", stderr_output
+    end
+
+    def test_function_with_error
+      engine = Engine.new("div {url: function_that_raises_errors();}")
+      exception = assert_raises(SassC::SyntaxError) do
+        engine.render
+      end
+
+      assert_equal "Error: error in C function function_that_raises_errors: Intentional wrong thing happened somewhere inside the custom function
+
+       Backtrace:
+       \tstdin:1, in function `function_that_raises_errors`
+       \tstdin:1
+        on line 1 of stdin
+>> div {url: function_that_raises_errors();}
+   ----------^
+", exception.message
+
+      assert_equal "[SassC::FunctionsHandler] Intentional wrong thing happened somewhere inside the custom function", stderr_output
+    end
+
+    private
+
+    SassString = Struct.new(:value, :type) do
+      def to_s
+        value
+      end
+    end
+
+    module Script::Functions
+      def javascript_path(path)
+        Script::String.new("/js/#{path.value}", :string)
+      end
+
+      def no_return_path(path)
+        nil
+      end
+
+      def sass_return_path(path)
+        return SassString.new("'#{path.value}'", :string)
+      end
+
+      def optional_arguments(path, optional = "bar")
+        return SassString.new("#{path}/#{optional}", :string)
+      end
+
+      def function_that_raises_errors()
+        raise StandardError, "Intentional wrong thing happened somewhere inside the custom function"
+      end
+
+      def function_with_unsupported_tag(color)
+      end
+
+      module Compass
+        def stylesheet_path(path)
+          Script::String.new("/css/#{path.value}", :identifier)
+        end
+      end
+      include Compass
+    end
+
+    def stderr_output
+      $stderr.string.gsub("\u0000\n", '')
+    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.2.4", Native.version
+        assert_equal "3.2.5", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ email:
 - bolandryanm@gmail.com
 executables: []
 extensions:
-- Rakefile
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -123,6 +123,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/Rakefile
 - ext/libsass/.editorconfig
 - ext/libsass/.gitattributes
 - ext/libsass/.gitignore
@@ -133,6 +134,7 @@ files:
 - ext/libsass/Makefile
 - ext/libsass/Makefile.am
 - ext/libsass/Readme.md
+- ext/libsass/SECURITY.md
 - ext/libsass/appveyor.yml
 - ext/libsass/ast.cpp
 - ext/libsass/ast.hpp
@@ -288,6 +290,7 @@ files:
 - lib/sassc/script/functions.rb
 - lib/sassc/script/string.rb
 - lib/sassc/version.rb
+- lib/tasks/libsass.rb
 - sassc.gemspec
 - test/custom_importer_test.rb
 - test/engine_test.rb
@@ -305,7 +308,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="