Merge pull request #29 from rubenswieringa/number-support

Maps & numbers support

Author: bolandrm

.gitignore

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

lib/sassc/native/native_functions_api.rb

@@ -24,6 +24,24 @@ module Native
     # ADDAPI union Sass_Value* ADDCALL sass_make_color   (double r, double g, double b, double a);
     attach_function :sass_make_color, [:double, :double, :double, :double], :sass_value_ptr
 
+    # ADDAPI union Sass_Value* ADDCALL sass_make_map     (size_t len);
+    attach_function :sass_make_map, [:size_t], :sass_value_ptr
+
+    # ADDAPI void ADDCALL sass_map_set_key (union Sass_Value* v, size_t i, union Sass_Value*);
+    attach_function :sass_map_set_key, [:sass_value_ptr, :size_t, :sass_value_ptr], :void
+
+    # ADDAPI union Sass_Value* ADDCALL sass_map_get_key (const union Sass_Value* v, size_t i);
+    attach_function :sass_map_get_key, [:sass_value_ptr, :size_t], :sass_value_ptr
+
+    # ADDAPI void ADDCALL sass_map_set_value (union Sass_Value* v, size_t i, union Sass_Value*);
+    attach_function :sass_map_set_value, [:sass_value_ptr, :size_t, :sass_value_ptr], :void
+
+    # ADDAPI union Sass_Value* ADDCALL sass_map_get_value (const union Sass_Value* v, size_t i);
+    attach_function :sass_map_get_value, [:sass_value_ptr, :size_t], :sass_value_ptr
+
+    # 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_make_error   (const char* msg);
     attach_function :sass_make_error, [:string], :sass_value_ptr
 
@@ -37,6 +55,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,13 +10,31 @@ 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)
 
           argument = Script::Color.new([red, green, blue, alpha])
           argument.options = options
 
+          argument
+        when :sass_map
+          values = {}
+          length = Native::map_get_length native_value
+
+          (0..length-1).each do |index|
+            key = Native::map_get_key(native_value, index)
+            value = Native::map_get_value(native_value, index)
+            values[from_native(key, options)] = from_native(value, options)
+          end
+
+          argument = Sass::Script::Value::Map.new values
           argument
         else
           raise UnsupportedValue.new("Sass argument of type #{value_tag} unsupported")
@@ -29,6 +47,10 @@ def self.to_native(value)
           String.new(value).to_native
         when "Color"
           Color.new(value).to_native
+        when "Number"
+          Number.new(value).to_native
+        when "Map"
+          Map.new(value).to_native
         else
           raise UnsupportedValue.new("Sass return type #{value_name} unsupported")
         end
@@ -39,4 +61,6 @@ 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"
+require_relative "value_conversion/map"

lib/sassc/script/value_conversion/map.rb

@@ -0,0 +1,19 @@
+module SassC
+  module Script
+    module ValueConversion
+      class Map < Base
+        def to_native
+          hash = @value.to_h
+          native_map = Native::make_map( hash.size )
+          hash.each_with_index do |(key, value), index|
+            key   = ValueConversion.to_native key
+            value = ValueConversion.to_native value
+            Native::map_set_key(   native_map, index, key )
+            Native::map_set_value( native_map, index, value )
+          end
+          return native_map
+        end
+      end
+    end
+  end
+end

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: inspect-number(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
@@ -117,6 +133,23 @@ def test_function_that_returns_a_sass_value
       CSS
     end
 
+    def test_function_that_returns_a_sass_map
+      assert_sass <<-SCSS, <<-CSS
+        $my-map: returns-sass-map();
+        div { background: map-get( $my-map, color ); }
+      SCSS
+        div { background: black; }
+      CSS
+    end
+
+    def test_function_that_takes_a_sass_map
+      assert_sass <<-SCSS, <<-CSS
+        div { background-color: map-get( inspect-map(( color: black, number: 1.23px, string: "abc", map: ( x: 'y' ))), color ); }
+      SCSS
+        div { background-color: black; }
+      CSS
+    end
+
     private
 
     def assert_sass(sass, expected_css)
@@ -151,7 +184,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,10 +195,49 @@ 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 inspect_number ( argument )
+        raise StandardError.new "passed value is not a Sass::Script::Value::Number" unless argument.is_a? Sass::Script::Value::Number
+        return argument
+      end
+
+      def inspect_map ( argument )
+        argument.to_h.each_pair do |key, value|
+          raise StandardError.new "key #{key.inspect} is not a string" unless key.is_a? Sass::Script::Value::String
+
+          valueClass = case key.value
+                         when 'string'
+                           Sass::Script::Value::String
+                         when 'number'
+                           Sass::Script::Value::Number
+                         when 'color'
+                           Sass::Script::Value::Color
+                         when 'map'
+                           Sass::Script::Value::Map
+                       end
+
+          raise StandardError.new "unknown key #{key.inspect}" unless valueClass
+          raise StandardError.new "value for #{key.inspect} is not a #{valueClass}" unless value.is_a? valueClass
+        end
+        return argument
+      end
+
       def returns_sass_value
         return Sass::Script::Value::Color.new(red: 0, green: 0, blue: 0)
       end
 
+      def returns_sass_map
+        key = Script::String.new("color", "string")
+        value = Sass::Script::Value::Color.new(red: 0, green: 0, blue: 0)
+        values = {}
+        values[key] = value
+        map = Sass::Script::Value::Map.new values
+        return map
+      end
+
       module Compass
         def stylesheet_path(path)
           Script::String.new("/css/#{path.value}", :identifier)

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)