dothash 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 590537e3612fab0548b995256f5d5643bb389623
4
- data.tar.gz: f2cf1b402a47d35de414b3a9924cfbc4f1937ea4
3
+ metadata.gz: a4407f726c2e756b296a9b8dc864ea6053a59c11
4
+ data.tar.gz: 094191c6ac7554a71ed122a8f8809d2e674cd2c8
5
5
  SHA512:
6
- metadata.gz: 1b3492e36e382a228405b3a633b6c2324db71d01c7bfbb200671f743e6784b2d8a9f54781510c34a8652ba36b59448e3d1a1d4810273c5b8618f4ca241f36b3b
7
- data.tar.gz: 2a4f3fd31dd6959c2e90dee1724eee0dc78f3b4c9f8a1ceba52deaf2be12b40c43008673faec6fe911de8ae6e09861d804b27fbe4ffcfea137fef55e4fbb7f97
6
+ metadata.gz: cf1d2d027be1bd3cfb567a13d49aedf138312f30682f19effd95358291028a79f403742f8e7fe149b8de8910a9e0db71d2a7bba26825acd58f55a534ced6bebe
7
+ data.tar.gz: 83a44a64c20ab7dce984b7b6d073ee5963775bf9a23b85dfe3a09257309ab51eee0c3a295999e6e964c5cc17a34315d4332081468529fa942d750812eca76dcd
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ === 2.0.1 (2016.10.05)
2
+
3
+ * remove unused code
4
+
1
5
  === 2.0.0 (2016.10.05)
2
6
 
3
7
  * add conversion from opposite direction
data/lib/dothash/hash.rb CHANGED
@@ -55,10 +55,8 @@ module Dothash
55
55
  merger = proc do |_key, v1, v2|
56
56
  if v1.is_a?(::Hash) && v2.is_a?(::Hash)
57
57
  v1.merge(v2, &merger)
58
- elsif v1.is_a?(::Array) && v2.is_a?(::Array)
59
- v1 | v2
60
58
  else
61
- [:undefined, nil, :nil].include?(v2) ? v1 : v2
59
+ v2
62
60
  end
63
61
  end
64
62
  first.merge!(second.to_h, &merger)
@@ -18,5 +18,5 @@
18
18
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
19
19
 
20
20
  module Dothash
21
- VERSION = "2.0.0".freeze
21
+ VERSION = "2.0.1".freeze
22
22
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dothash
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Szymon Kopciewski