json-merge 1.0.0 → 1.1.1
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 +4 -4
- checksums.yaml.gz.sig +0 -0
- data/CHANGELOG.md +75 -1
- data/README.md +240 -144
- data/lib/json/merge/conflict_resolver.rb +173 -86
- data/lib/json/merge/emitter.rb +42 -62
- data/lib/json/merge/node_wrapper.rb +35 -7
- data/lib/json/merge/smart_merger.rb +1 -0
- data/lib/json/merge/version.rb +1 -1
- data/lib/json/merge.rb +12 -0
- data.tar.gz.sig +0 -0
- metadata +12 -12
- metadata.gz.sig +0 -0
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: json-merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter H. Boling
|
|
@@ -43,40 +43,40 @@ dependencies:
|
|
|
43
43
|
requirements:
|
|
44
44
|
- - "~>"
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: '
|
|
46
|
+
version: '5.0'
|
|
47
47
|
- - ">="
|
|
48
48
|
- !ruby/object:Gem::Version
|
|
49
|
-
version:
|
|
49
|
+
version: 5.0.2
|
|
50
50
|
type: :runtime
|
|
51
51
|
prerelease: false
|
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
|
53
53
|
requirements:
|
|
54
54
|
- - "~>"
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
|
-
version: '
|
|
56
|
+
version: '5.0'
|
|
57
57
|
- - ">="
|
|
58
58
|
- !ruby/object:Gem::Version
|
|
59
|
-
version:
|
|
59
|
+
version: 5.0.2
|
|
60
60
|
- !ruby/object:Gem::Dependency
|
|
61
61
|
name: ast-merge
|
|
62
62
|
requirement: !ruby/object:Gem::Requirement
|
|
63
63
|
requirements:
|
|
64
64
|
- - "~>"
|
|
65
65
|
- !ruby/object:Gem::Version
|
|
66
|
-
version: '
|
|
66
|
+
version: '4.0'
|
|
67
67
|
- - ">="
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
|
-
version:
|
|
69
|
+
version: 4.0.4
|
|
70
70
|
type: :runtime
|
|
71
71
|
prerelease: false
|
|
72
72
|
version_requirements: !ruby/object:Gem::Requirement
|
|
73
73
|
requirements:
|
|
74
74
|
- - "~>"
|
|
75
75
|
- !ruby/object:Gem::Version
|
|
76
|
-
version: '
|
|
76
|
+
version: '4.0'
|
|
77
77
|
- - ">="
|
|
78
78
|
- !ruby/object:Gem::Version
|
|
79
|
-
version:
|
|
79
|
+
version: 4.0.4
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
81
|
name: version_gem
|
|
82
82
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -294,10 +294,10 @@ licenses:
|
|
|
294
294
|
- MIT
|
|
295
295
|
metadata:
|
|
296
296
|
homepage_uri: https://json-merge.galtzo.com/
|
|
297
|
-
source_code_uri: https://github.com/kettle-rb/json-merge/tree/v1.
|
|
298
|
-
changelog_uri: https://github.com/kettle-rb/json-merge/blob/v1.
|
|
297
|
+
source_code_uri: https://github.com/kettle-rb/json-merge/tree/v1.1.1
|
|
298
|
+
changelog_uri: https://github.com/kettle-rb/json-merge/blob/v1.1.1/CHANGELOG.md
|
|
299
299
|
bug_tracker_uri: https://github.com/kettle-rb/json-merge/issues
|
|
300
|
-
documentation_uri: https://www.rubydoc.info/gems/json-merge/1.
|
|
300
|
+
documentation_uri: https://www.rubydoc.info/gems/json-merge/1.1.1
|
|
301
301
|
funding_uri: https://github.com/sponsors/pboling
|
|
302
302
|
wiki_uri: https://github.com/kettle-rb/json-merge/wiki
|
|
303
303
|
news_uri: https://www.railsbling.com/tags/json-merge
|
metadata.gz.sig
CHANGED
|
Binary file
|