liquid-ext 3.3.3 → 3.3.4

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b441e2d24a96f2b999f9fd53387a53904fc55118
4
- data.tar.gz: 15ba419376efa34ae5f56b9cf4d8be039b7a74ca
3
+ metadata.gz: a3330de9528c970169abfbd513e19604f46377c4
4
+ data.tar.gz: 69ace14c510d43eeed3eed326d40305a2e52d9b4
5
5
  SHA512:
6
- metadata.gz: be90a05134e695c4b06bcc4d890cc779627242a7cfd955b1ca8c8ee70b16bc9d4aeb8c4512c1b6f083639e7172d4708fd9f4b87d0561f0257abaaf3ed79a4e00
7
- data.tar.gz: 7c06927de68a4f5b2ad7c1142f4d18b856b537ceea2fbdab3cb392c70759eda2e10be058115ccfdb38f69bc1e792662d88c385ecd16e93852b90d223a7c0768c
6
+ metadata.gz: c28e3851e8a23f17d8b4f50bd96afb3fbb1eaa9d490f950116dd26128daf3d79b264f63ecaea2108faf1de3738dc056d2e603857ca0668aa0adcf5af993b520a
7
+ data.tar.gz: dcbfb51b912c9279cdf9ec1a19bf4c2d452ddf8da62331f6824df4560a8f41fe8473bb4994083f5e58f9e51017ff4525b1e3e2b39d8eecf8193fbf90ac74520a
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- liquid-ext (3.3.3)
4
+ liquid-ext (3.3.4)
5
5
  activesupport
6
6
  erubis
7
7
  jmx4r
@@ -6,8 +6,8 @@ class Hash
6
6
  # Recursively merge +other_hash+ into +self+ and return the new hash.
7
7
  def deep_merge(other_hash)
8
8
  self.merge(other_hash) do |key, oldval, newval|
9
- oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
10
- newval = newval.to_hash if newval.respond_to?(:to_hash)
9
+ oldval = oldval.to_hash if oldval.respond_to?(:to_hash) && !oldval.is_a?(Array)
10
+ newval = newval.to_hash if newval.respond_to?(:to_hash) && !newval.is_a?(Array)
11
11
  oldval.is_a?(Hash) && newval.is_a?(Hash) ? oldval.deep_merge(newval) : newval
12
12
  end
13
13
  end
data/liquid-ext.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |spec|
4
4
  spec.name = "liquid-ext"
5
- spec.version = "3.3.3"
5
+ spec.version = "3.3.4"
6
6
  spec.authors = ["LiquidM, Inc."]
7
7
  spec.email = ["opensource@liquidm.com"]
8
8
  spec.description = %q{Ruby core extensions and helper libraries}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: liquid-ext
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.3
4
+ version: 3.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - LiquidM, Inc.