Add support for numbers in functions

Author: Ruben Swieringa

.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.rvmrc
 /Gemfile.lock
 /_yardoc/
 /coverage/

lib/sassc/native/native_functions_api.rb

@@ -37,6 +37,12 @@ module Native
     # ADDAPI bool ADDCALL sass_string_is_quoted(const union Sass_Value* v);
     attach_function :sass_string_is_quoted, [:sass_value_ptr], :bool
 
+    # ADDAPI const char* ADDCALL sass_number_get_value (const union Sass_Value* v);
+    attach_function :sass_number_get_value, [:sass_value_ptr], :double
+
+    # ADDAPI const char* ADDCALL sass_number_get_unit (const union Sass_Value* v);
+    attach_function :sass_number_get_unit, [:sass_value_ptr], :string
+
     def self.string_get_type(native_value)
       string_is_quoted(native_value) ? :string : :identifier
     end

lib/sassc/script/value_conversion.rb

@@ -10,6 +10,12 @@ def self.from_native(native_value, options)
           type = Native.string_get_type(native_value)
           argument = Script::String.new(value, type)
 
+          argument
+        when :sass_number
+          value = Native.number_get_value(native_value)
+          unit = Native.number_get_unit(native_value)
+          argument = Sass::Script::Value::Number.new(value, unit)
+
           argument
         when :sass_color
           red, green, blue, alpha = Native.color_get_r(native_value), Native.color_get_g(native_value), Native.color_get_b(native_value), Native.color_get_a(native_value)
@@ -29,6 +35,8 @@ def self.to_native(value)
           String.new(value).to_native
         when "Color"
           Color.new(value).to_native
+        when "Number"
+          Number.new(value).to_native
         else
           raise UnsupportedValue.new("Sass return type #{value_name} unsupported")
         end
@@ -39,4 +47,5 @@ def self.to_native(value)
 
 require_relative "value_conversion/base"
 require_relative "value_conversion/string"
+require_relative "value_conversion/number"
 require_relative "value_conversion/color"

lib/sassc/script/value_conversion/number.rb

@@ -0,0 +1,11 @@
+module SassC
+  module Script
+    module ValueConversion
+      class Number < Base
+        def to_native
+          Native::make_number(@value.value, @value.numerator_units.first)
+        end
+      end
+    end
+  end
+end

test/functions_test.rb

@@ -64,6 +64,22 @@ def test_function_that_returns_a_color
       CSS
     end
 
+    def test_function_that_returns_a_number
+      assert_sass <<-SCSS, <<-CSS
+        div { width: returns-a-number(); }
+      SCSS
+        div { width: -312rem; }
+      CSS
+    end
+
+    def test_function_that_takes_a_number
+      assert_sass <<-SCSS, <<-CSS
+        div { display: returns-arg(42.1px); }
+      SCSS
+        div { display: 42.1px; }
+      CSS
+    end
+
     def test_function_with_optional_arguments
       assert_sass <<-SCSS, <<-EXPECTED_CSS
         div {
@@ -87,14 +103,14 @@ def test_functions_may_accept_sass_color_type
     end
 
     def test_function_with_unsupported_tag
-      engine = Engine.new("div {url: function_with_unsupported_tag(1);}")
+      engine = Engine.new("div {url: function_with_unsupported_tag(());}")
 
       exception = assert_raises(SassC::SyntaxError) do
         engine.render
       end
 
-      assert_match /Sass argument of type sass_number unsupported/, exception.message
-      assert_equal "[SassC::FunctionsHandler] Sass argument of type sass_number unsupported", stderr_output
+      assert_match /Sass argument of type sass_list unsupported/, exception.message
+      assert_equal "[SassC::FunctionsHandler] Sass argument of type sass_list unsupported", stderr_output
     end
 
     def test_function_with_error
@@ -151,7 +167,7 @@ def function_that_raises_errors
         raise StandardError, "Intentional wrong thing happened somewhere inside the custom function"
       end
 
-      def function_with_unsupported_tag(number)
+      def function_with_unsupported_tag(value)
       end
 
       def nice_color_argument(color)
@@ -162,6 +178,14 @@ def returns_a_color
         return Script::Color.new(red: 0, green: 0, blue: 0)
       end
 
+      def returns_a_number
+        return Sass::Script::Value::Number.new(-312,'rem')
+      end
+
+      def returns_arg ( arg )
+        return arg
+      end
+
       def returns_sass_value
         return Sass::Script::Value::Color.new(red: 0, green: 0, blue: 0)
       end

test/native_test.rb

@@ -96,6 +96,10 @@ def test_custom_function
         assert_equal :sass_string, Native.value_get_tag(string)
         assert_equal "hello", Native.string_get_value(string)
 
+        number = Native.make_number(123.4, "rem")
+        assert_equal 123.4, Native.number_get_value(number)
+        assert_equal "rem", Native.number_get_unit(number)
+
         Native.compile_data_context(data_context)
 
         css = Native.context_get_output_string(context)