proxy_pac_rb 0.6.2 → 0.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/proxy_pac_rb.rb +1 -0
  4. data/lib/proxy_pac_rb/proxy_pac_compressor.rb +1 -1
  5. data/lib/proxy_pac_rb/version.rb +1 -1
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d154b5675381cbe1bd4471167f75e6543281b0e0
4
- data.tar.gz: 32f4619187d1ba5ee507ed58b64a758386bf85ac
3
+ metadata.gz: 24bafa433b12280ef1cf464b80dcfc526af68921
4
+ data.tar.gz: 795b75ad216d6d06c15733a634517518278a24b8
5
5
  SHA512:
6
- metadata.gz: 11b1a9e8920fd7621c580b3b068dcdc50c89f8866b51dde375f78de577c123e2b073421efd279170647fcc687128199480bf29a20355edaafa11c74b936486ed
7
- data.tar.gz: 2b32fc13ad9cd62f4b9ce426a9ff63d8b13221b9e50f290e926f2f43b40028f7b8537e256f36d56972d761cd5d0cafc672872e61fe8d90eaf3045ff3d4543ab0
6
+ metadata.gz: 8c398973e36c7dc579995ccef36758000e8917838d11f587fa2647e637611867cca285c681013b29de815291e3080e6b975c04714b2c018d2bb3d7688f597f39
7
+ data.tar.gz: bbda3eb42ad78cb204123994fcb1378208085103eb876c3b2296a77efb0f1b317ae4185b29a5fc384aa373308e91bf4e9450152094ca39e341a846ae6c395486
data/Gemfile.lock CHANGED
@@ -22,7 +22,7 @@ GIT
22
22
  PATH
23
23
  remote: .
24
24
  specs:
25
- proxy_pac_rb (0.6.1)
25
+ proxy_pac_rb (0.6.3)
26
26
  activesupport (~> 4.1)
27
27
  addressable (~> 2.3.8)
28
28
  uglifier (~> 2.7.1)
data/lib/proxy_pac_rb.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'active_support/core_ext/object/blank'
2
2
  require 'active_support/core_ext/string/strip'
3
3
  require 'active_support/core_ext/string/filters'
4
+ require 'active_support/core_ext/hash/deep_merge'
4
5
  require 'addressable/uri'
5
6
  require 'ipaddr'
6
7
  require 'thor'
data/lib/proxy_pac_rb/proxy_pac_compressor.rb CHANGED
@@ -60,7 +60,7 @@ module ProxyPacRb
60
60
  # keep_fargs: false, # Preserve unused function arguments
61
61
  # keep_fnames: true # Preserve function names
62
62
  }
63
- }.merge options
63
+ }.deep_merge options
64
64
 
65
65
  @options = opts
66
66
  end
data/lib/proxy_pac_rb/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # encoding: utf-8
2
2
  # ProxyPacRb
3
3
  module ProxyPacRb
4
- VERSION = '0.6.2'
4
+ VERSION = '0.6.3'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: proxy_pac_rb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.2
4
+ version: 0.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dennis Günnewig