sassc 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b426c4e47a4d6d041b25565605d6fe708847faaa
-  data.tar.gz: 36fd1baaa0ba7aaeb6b9100ee60aaeea8fa3d974
+  metadata.gz: 0f19dcd28af296ad0c551e0daecbc3664ea4f2c5
+  data.tar.gz: d59cb88bcf48437ee1973c72db482a0bcdbafba9
 SHA512:
-  metadata.gz: 54261aec807408c986d337a75e9051062ea0d5cb45affc510285a310cc5b0d95b6d1b810afe24f9e9d0f4762a6f2bbf3615ebbabc51a9bac5d26ac08a41fe0c4
-  data.tar.gz: 8264a970a2f76968e9eab211983c0f2c09c5f5a2ed634891146f239c25a5db7d8aa0bfa2a970e4136b1568dff97613e51e20578b112436cdffd10fa3e5db54c3
+  metadata.gz: 43a8b1b9b66f099ffc77547c6d53f540510c7a712e8c727fc307dcadfd69c17e39d943120e76bd4dfb004842b8465a73bba1381546edc78d20d3d5556c342f6f
+  data.tar.gz: 42f028720b8ed0d9a35551c00b288ffa591598f13e4f0fab7094c420ac5772c702ddd6c907ce88af07ff1b03f4b41d06cda77cf7ec2b5eeb5d8418a076cf8b2b

data/lib/sassc/engine.rb

@@ -23,6 +23,7 @@ module SassC
       Native.option_set_input_path(native_options, filename) if filename
       Native.option_set_include_path(native_options, load_paths)
       Native.option_set_output_style(native_options, output_style_enum)
+      Native.option_set_source_comments(native_options, true) if line_comments?
 
       import_handler.setup(native_options)
       functions_handler.setup(native_options)
@@ -64,6 +65,10 @@ module SassC
       @options[:syntax] && @options[:syntax].to_sym == :sass
     end
 
+    def line_comments?
+      @options[:line_comments]
+    end
+
     def import_handler
       @import_handler ||= ImportHandler.new(@options)
     end

data/lib/sassc/error.rb

@@ -1,3 +1,5 @@
+require 'sass/error'
+
 module SassC
   class SyntaxError < StandardError; end
   class NotRenderedError < StandardError; end

data/lib/sassc/functions_handler.rb

@@ -29,6 +29,13 @@ module SassC
               native_string = Native.string_get_value(native_value)
               argument = Script::String.new(Script::String.unquote(native_string), Script::String.type(native_string))
 
+              custom_function_arguments << 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
+
               custom_function_arguments << argument
             else
               error_tag = error("Sass argument of type #{value_tag} unsupported")

data/lib/sassc/native/native_functions_api.rb

@@ -24,6 +24,19 @@ module SassC
     # ADDAPI const char* ADDCALL sass_string_get_value (const union Sass_Value* v);
     attach_function :sass_string_get_value, [:sass_value_ptr], :string
 
+    # ADDAPI double ADDCALL sass_color_get_r (const union Sass_Value* v);
+    # ADDAPI void ADDCALL sass_color_set_r (union Sass_Value* v, double r);
+    # ADDAPI double ADDCALL sass_color_get_g (const union Sass_Value* v);
+    # ADDAPI void ADDCALL sass_color_set_g (union Sass_Value* v, double g);
+    # ADDAPI double ADDCALL sass_color_get_b (const union Sass_Value* v);
+    # ADDAPI void ADDCALL sass_color_set_b (union Sass_Value* v, double b);
+    # ADDAPI double ADDCALL sass_color_get_a (const union Sass_Value* v);
+    # ADDAPI void ADDCALL sass_color_set_a (union Sass_Value* v, double a);
+    ['r', 'g', 'b', 'a'].each do |color_channel|
+      attach_function "sass_color_get_#{color_channel}".to_sym, [:sass_value_ptr], :double
+      attach_function "sass_color_set_#{color_channel}".to_sym, [:sass_value_ptr, :double], :void
+    end
+
     # ADDAPI size_t ADDCALL sass_list_get_length(const union Sass_Value* v)
     # ADDAPI union Sass_Value* ADDCALL sass_list_get_value (const union Sass_Value* v, size_t i);
     attach_function :sass_list_get_length, [:sass_value_ptr], :size_t

data/lib/sassc/script.rb

@@ -18,3 +18,12 @@ end
 
 require_relative "script/functions"
 require_relative "script/string"
+
+module Sass
+  module Script
+  end
+end
+
+require 'sass/util'
+require 'sass/script/value/base'
+require_relative "script/color"

data/lib/sassc/script/color.rb

@@ -0,0 +1,11 @@
+require 'sass/script/value/color'
+
+module SassC
+  module Script
+    class Color < ::Sass::Script::Value::Color
+      def to_native
+        Native::make_string(to_s)
+      end
+    end
+  end
+end

data/lib/sassc/version.rb

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

data/sassc.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler"
   spec.add_dependency "ffi", "~> 1.9.6"
+  spec.add_dependency "sass", ">= 3.3.0"
 
   gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|

data/test/engine_test.rb

@@ -8,6 +8,20 @@ module SassC
       Engine.new(data).render
     end
 
+    def test_line_comments
+      template = <<-SCSS
+.foo {
+  baz: bang; }
+      SCSS
+      expected_output = <<-CSS
+/* line 1, stdin */
+.foo {
+  baz: bang; }
+      CSS
+      output = Engine.new(template, line_comments: true).render
+      assert_equal expected_output, output
+    end
+
     def test_one_line_comments
       assert_equal <<CSS, render(<<SCSS)
 .foo {

data/test/functions_test.rb

@@ -62,16 +62,24 @@ div {
       EOS
     end
 
+    def test_functions_may_accept_sass_color_type
+      engine = Engine.new("div { color: nice_color_argument(red); }")
+      assert_equal <<-EOS, engine.render
+div {
+  color: "red"; }
+      EOS
+    end
+
     def test_function_with_unsupported_tag
-      engine = Engine.new("div {url: function_with_unsupported_tag(red);}")
+      engine = Engine.new("div {url: function_with_unsupported_tag(1);}")
 
       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 "Error: error in C function function_with_unsupported_tag: Sass argument of type sass_number 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(1);}\n   ----------^\n", exception.message
 
-      assert_equal "[SassC::FunctionsHandler] Sass argument of type sass_color unsupported", stderr_output
+      assert_equal "[SassC::FunctionsHandler] Sass argument of type sass_number unsupported", stderr_output
     end
 
     def test_function_with_error
@@ -122,7 +130,11 @@ div {
         raise StandardError, "Intentional wrong thing happened somewhere inside the custom function"
       end
 
-      def function_with_unsupported_tag(color)
+      def function_with_unsupported_tag(number)
+      end
+
+      def nice_color_argument(color)
+        return Script::String.new(color.to_s, :string)
       end
 
       module Compass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.6
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 description: Use libsass with Ruby!
 email:
 - bolandryanm@gmail.com
@@ -287,6 +301,7 @@ files:
 - lib/sassc/native/string_list.rb
 - lib/sassc/sass_2_scss.rb
 - lib/sassc/script.rb
+- lib/sassc/script/color.rb
 - lib/sassc/script/functions.rb
 - lib/sassc/script/string.rb
 - lib/sassc/version.rb