proxy_pac_rb 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d154b5675381cbe1bd4471167f75e6543281b0e0
-  data.tar.gz: 32f4619187d1ba5ee507ed58b64a758386bf85ac
+  metadata.gz: 24bafa433b12280ef1cf464b80dcfc526af68921
+  data.tar.gz: 795b75ad216d6d06c15733a634517518278a24b8
 SHA512:
-  metadata.gz: 11b1a9e8920fd7621c580b3b068dcdc50c89f8866b51dde375f78de577c123e2b073421efd279170647fcc687128199480bf29a20355edaafa11c74b936486ed
-  data.tar.gz: 2b32fc13ad9cd62f4b9ce426a9ff63d8b13221b9e50f290e926f2f43b40028f7b8537e256f36d56972d761cd5d0cafc672872e61fe8d90eaf3045ff3d4543ab0
+  metadata.gz: 8c398973e36c7dc579995ccef36758000e8917838d11f587fa2647e637611867cca285c681013b29de815291e3080e6b975c04714b2c018d2bb3d7688f597f39
+  data.tar.gz: bbda3eb42ad78cb204123994fcb1378208085103eb876c3b2296a77efb0f1b317ae4185b29a5fc384aa373308e91bf4e9450152094ca39e341a846ae6c395486

data/Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 PATH
   remote: .
   specs:
-    proxy_pac_rb (0.6.1)
+    proxy_pac_rb (0.6.3)
       activesupport (~> 4.1)
       addressable (~> 2.3.8)
       uglifier (~> 2.7.1)

data/lib/proxy_pac_rb.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/string/filters'
+require 'active_support/core_ext/hash/deep_merge'
 require 'addressable/uri'
 require 'ipaddr'
 require 'thor'

data/lib/proxy_pac_rb/proxy_pac_compressor.rb

@@ -60,7 +60,7 @@ module ProxyPacRb
           # keep_fargs: false,     # Preserve unused function arguments
           # keep_fnames: true     # Preserve function names
         }
-      }.merge options
+      }.deep_merge options
 
       @options = opts
     end

data/lib/proxy_pac_rb/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # ProxyPacRb
 module ProxyPacRb
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Dennis Günnewig