jac 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/jac/merger.rb +4 -1
- data/lib/jac/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: abf3569d2fb47cb67052f221901ec95dce674530bae550bb03ac1bfdffe8b280
|
|
4
|
+
data.tar.gz: 4c2af63e4ebadd9a94c204c2148c5ac4311a6e296cf28adac44489ecaa7ebb0b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 99a846e3fda2bc644fc7eb648d9c658a27273e1a610fc5cbb9097a462f32a3fe24854015fb43278e649e3bec6696602fe83f67b9cbaecfd01c175d049f6799f5
|
|
7
|
+
data.tar.gz: 6e04956c036e6289ddb897a13b5e44dee8ff9d10cd13b3b768a3a49611e274e6df6ac63f1cf47b55c08dac00758f46c80c4752cb9b4a29dec89c861e3d8384d1
|
data/lib/jac/merger.rb
CHANGED
|
@@ -24,7 +24,10 @@ module Jac
|
|
|
24
24
|
# @param [Hash] other values
|
|
25
25
|
# @return [Hash] updated base hash
|
|
26
26
|
def merge!(base, other)
|
|
27
|
-
base.merge!(other, &method(:resolve_values))
|
|
27
|
+
# base.merge!(other, &method(:resolve_values))
|
|
28
|
+
base.merge!(other) do |key, base_value, other_value|
|
|
29
|
+
resolve_values(key, base_value, other_value)
|
|
30
|
+
end
|
|
28
31
|
end
|
|
29
32
|
|
|
30
33
|
# @param [Object] _key
|
data/lib/jac/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: jac
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- ilya.arkhanhelsky
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-
|
|
11
|
+
date: 2018-09-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: Profile based configuration lib
|
|
14
14
|
email: ilya.arkhanhelsky@vizor-games.com
|
|
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
41
41
|
version: '0'
|
|
42
42
|
requirements: []
|
|
43
43
|
rubyforge_project:
|
|
44
|
-
rubygems_version: 2.7.
|
|
44
|
+
rubygems_version: 2.7.7
|
|
45
45
|
signing_key:
|
|
46
46
|
specification_version: 4
|
|
47
47
|
summary: Just Another Configuration Lib
|