Merge pull request #113 from glebm/jruby

JRuby Compatibility

Author: bolandrm

.travis.yml

@@ -15,6 +15,7 @@ gemfile:
 rvm:
   - 2.4.4
   - 2.5.1
+  - jruby
 
 notifications:
   email: false

lib/sassc/rails/template.rb

@@ -32,7 +32,7 @@ def call(input)
           environment: input[:environment],
           dependencies: context.metadata[:dependency_paths]
         }
-      }.merge(config_options) { |*args| safe_merge(*args) }
+      }.merge!(config_options) { |key, left, right| safe_merge(key, left, right) }
 
       engine = ::SassC::Engine.new(input[:data], options)
 
@@ -70,9 +70,9 @@ def line_comments?
       Rails.application.config.sass.line_comments
     end
 
-    def safe_merge(key, left, right)
+    def safe_merge(_key, left, right)
       if [left, right].all? { |v| v.is_a? Hash }
-        left.merge(right) { |*args| safe_merge *args }
+        left.merge(right) { |k, l, r| safe_merge(k, l, r) }
       elsif [left, right].all? { |v| v.is_a? Array }
         (left + right).uniq
       else