From dae1bb5655514d79c463478213e5262732a5a76b Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 17 Nov 2018 09:07:30 +0000 Subject: [PATCH] JRuby Compatibility 1. Test on JRuby. 2. Fix #92. --- .travis.yml | 1 + lib/sassc/rails/template.rb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b5eaa5..612fade 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ gemfile: rvm: - 2.4.4 - 2.5.1 + - jruby notifications: email: false diff --git a/lib/sassc/rails/template.rb b/lib/sassc/rails/template.rb index e5cf6c7..3a5d92f 100644 --- a/lib/sassc/rails/template.rb +++ b/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