Merge branch 'master' into roman/dependency

Author: bolandrm

.travis.yml

@@ -3,8 +3,8 @@ language: ruby
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "bundle exec rake test"
 rvm:
-  - 2.2.0
   - 2.3.3
-  - 2.4.0
+  - 2.4.4
+  - 2.5.1
 notifications:
   email: false

CODE_OF_CONDUCT.md

@@ -0,0 +1,10 @@
+Sass is more than a technology; Sass is driven by the community of individuals
+that power its development and use every day. As a community, we want to embrace
+the very differences that have made our collaboration so powerful, and work
+together to provide the best environment for learning, growing, and sharing of
+ideas. It is imperative that we keep Sass a fun, welcoming, challenging, and
+fair place to play.
+
+[The full community guidelines can be found on the Sass website.][link]
+
+[link]: http://sass-lang.com/community-guidelines

README.md

@@ -2,11 +2,11 @@
 
 Use `libsass` with Ruby!
 
-This gem combines the speed of `libsass`, the [Sass C implementation](https://github.com/sass/libsass), with the ease of use of the original [Ruby Sass](https://github.com/sass/sass) library.
+This gem combines the speed of `libsass`, the [Sass C implementation](https://github.com/sass/libsass), with the ease of use of the original [Ruby Sass](https://github.com/sass/ruby-sass) library.
 
 ### libsass Version
 
-[3.4.1](https://github.com/sass/libsass/releases/tag/3.4.1)
+[3.5.2](https://github.com/sass/libsass/releases/tag/3.5.2)
 
 ## Installation
 
@@ -48,7 +48,17 @@ This gem is maintained by [Ryan Boland](https://ryanboland.com)
 and [awesome contributors](https://github.com/bolandrm/sassc-ruby/graphs/contributors).
 
 ## Changelog
-
+- **1.12.1**
+  - [Downgrade to libsass 3.5.2 to fix css imports](https://github.com/sass/sassc-ruby/pull/81)
+- **1.12.0**
+  - [Update Libsass to 3.5.4](https://github.com/sass/sassc-ruby/pull/78)
+  - [bundler is a development dependency](https://github.com/sass/sassc-ruby/pull/51)
+- **1.11.4**
+  - Fix `Value::List` related issue with sass 3.5.0
+- **1.11.3**
+  - [Require Sass::Deprecation module](https://github.com/sass/sassc-ruby/pull/68)
+- **1.11.2**
+  - [Update to libsass 3.4.3](https://github.com/sass/sassc-ruby/pull/65)
 - **1.11.1**
   - [Update to libsass 3.4.1](https://github.com/sass/sassc-ruby/pull/61)
 - **1.11.0**

ext/libsass

@@ -28,6 +28,12 @@ module Script
 end
 
 require 'sass/util'
+
+begin
+  require 'sass/deprecation'
+rescue LoadError
+end
+
 require 'sass/script/value/base'
 require 'sass/script/value/string'
 require 'sass/script/value/color'
@@ -40,4 +46,4 @@ module Script
 SassC::Script::Value::Color = Sass::Script::Value::Color
 
 SassC::Script::Bool = Sass::Script::Value::Bool
-SassC::Script::Value::Bool = Sass::Script::Value::Bool
+SassC::Script::Value::Bool = Sass::Script::Value::Bool

lib/sassc/script.rb

@@ -47,7 +47,12 @@ def self.from_native(native_value, options)
             native_item = Native::list_get_value(native_value, index)
             from_native(native_item, options)
           end
-          Sass::Script::Value::List.new(items, :space)
+
+          if Gem.loaded_specs['sass'].version < Gem::Version.create('3.5')
+            Sass::Script::Value::List.new(items, :space)
+          else
+            Sass::Script::Value::List.new(items, separator: :space)
+          end
         else
           raise UnsupportedValue.new("Sass argument of type #{value_tag} unsupported")
         end

lib/sassc/script/value_conversion.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.11.1"
+  VERSION = "1.12.1"
 end

lib/sassc/version.rb

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest-around"
   spec.add_development_dependency "test_construct"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "bundler"
 
   spec.add_dependency "rake"
-  spec.add_dependency "bundler"
   spec.add_dependency "ffi", "~> 1.9.6"
   spec.add_dependency "sass", ">= 3.3.0"
 
@@ -43,4 +43,3 @@ Gem::Specification.new do |spec|
     end
   end
 end
-

sassc.gemspec

@@ -267,5 +267,16 @@ def test_empty_template_encoding_matches_input
       output = Engine.new(input).render
       assert_equal input.encoding, output.encoding
     end
+
+    def test_import_plain_css
+      temp_file("test.css", ".something{color: red}")
+      expected_output = <<-CSS
+.something {
+  color: red; }
+      CSS
+
+      output = Engine.new("@import 'test'").render
+      assert_equal expected_output, output
+    end
   end
 end

test/engine_test.rb

@@ -290,7 +290,12 @@ def returns_sass_list
         numbers = [10, 20, 30].map do |n|
           Sass::Script::Value::Number.new(n, '')
         end
-        Sass::Script::Value::List.new(numbers, :space)
+
+        if Gem.loaded_specs['sass'].version < Gem::Version.create('3.5')
+          Sass::Script::Value::List.new(numbers, :space)
+        else
+          Sass::Script::Value::List.new(numbers, separator: :space)
+        end
       end
 
       module Compass