json_updater 0.4.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1369c256030d09acbe23c4e948b7e933bc37edcd8d7af20d27ccd9ded600ad19
-  data.tar.gz: 6dc9e09847b8d7ef18059c9037620ab743d40e4009d0a00522f180b94d70f484
+  metadata.gz: '03919c8c7fdd121ba254617667f1d16314256e7812bb6a23a1ed812a53349075'
+  data.tar.gz: 001606fc1801c386330ca2c7e300bbb79d389cce73be949228536f481e71f6fa
 SHA512:
-  metadata.gz: 9cbe6d11c86ef64586cf2693db4bc1f7f486e8b12ad6a8c3a1724b9bb598d94d6736c7d92071d71c2f1a5d389378db63c1ab3dec26087c4b9c1476de912b5429
-  data.tar.gz: fc8b7cc124aa5c789f263f2d1d9ac8a0b8208da2a8cb0b381c6eec2e561983eeb418dcd6e8870ce65c5177bdeb4493daf4ff2e6fcfb9d7e79de9483034ccd433
+  metadata.gz: 870b7922ad8be4abe52bf81a4277a41fec0f4d56a92861a506b1d57d76c283ed6d703fbf26fdeaf38e0c0313e9d019e37c02a0727049a5db57474efa50aba478
+  data.tar.gz: f2b296fcd83f1103be462d6de461ab1e07fc7346ea2d47c9f51d8022d84ec3194cfc9431b1921e12fece36460c5c059059c0709f47e78e40beb42fa71cb66326

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_updater (0.4.1)
+    json_updater (1.0.0)
       json
 
 GEM

data/bin/json_updater

@@ -6,7 +6,7 @@ arg1 = JsonUpdater::JsonValidator.new(ARGV[0])
 arg2 = JsonUpdater::JsonValidator.new(ARGV[1])
 
 if arg1.valid? && arg2.valid?
-  JsonUpdater::UpdateService.update_json(ARGV[0], ARGV[1])
+  JsonUpdater::UpdateService.update_json(etalon_file_path: ARGV[0], changable_file_path: ARGV[1])
 else
   puts arg1.messages
   puts arg2.messages

data/lib/json_updater/json_full_builder.rb

@@ -2,19 +2,19 @@
 
 module JsonUpdater
   class JsonFullBuilder
-    attr_reader :json_etalon, :json_changeble
+    attr_reader :json_etalon, :json_changeable
 
-    def self.build(json_changeble, json_etalon)
-      new(json_changeble, json_etalon).build
+    def self.build(json_changeable:, json_etalon:)
+      new(json_changeable: json_changeable, json_etalon: json_etalon).build
     end
 
-    def initialize(json_changeble, json_etalon)
-      @json_changeble = json_changeble
-      @json_etalon    = json_etalon
+    def initialize(json_changeable:, json_etalon:)
+      @json_changeable = json_changeable
+      @json_etalon = json_etalon
     end
 
     def build
-      recursion_updation(json_changeble, json_etalon)
+      recursion_updation(json_changeable, json_etalon)
     end
 
     private
@@ -25,10 +25,12 @@ module JsonUpdater
           mutation_json[etalon_field_key] = dive_inside(mutation_json[etalon_field_key], etalon_field_value)
         end
       end
-      JsonTypeDetector.detect_type(mutation_json).build(mutation_json, inner_json_etalon)
+      JsonTypeDetector.detect_type(mutation_json).build(json_changeable: mutation_json, json_etalon: inner_json_etalon)
     end
 
     def dive_inside(mutation_field_value, etalon_field_value)
+      return etalon_field_value unless hash_or_array?(mutation_field_value)
+
       case etalon_field_value
       when Hash
         recursion_updation(mutation_field_value, etalon_field_value)

data/lib/json_updater/json_structure_updater.rb

@@ -4,11 +4,11 @@ module JsonUpdater
   class JsonStructureUpdater
     attr_reader :json_etalon, :json_changeable
 
-    def self.update_json(json_changeable, json_etalon)
-      new(json_changeable, json_etalon).update_json
+    def self.update_json(json_changeable:, json_etalon:)
+      new(json_changeable: json_changeable, json_etalon: json_etalon).update_json
     end
 
-    def initialize(json_changeable, json_etalon)
+    def initialize(json_changeable:, json_etalon:)
       @json_changeable = json_changeable
       @json_etalon     = json_etalon.dup
     end

data/lib/json_updater/json_type_detector.rb

@@ -2,14 +2,14 @@
 
 module JsonUpdater
   class JsonTypeDetector
-    attr_reader :json_changeble
+    attr_reader :json_changeable
 
-    def self.detect_type(json_changeble)
-      new(json_changeble).detect_type
+    def self.detect_type(json_changeable)
+      new(json_changeable).detect_type
     end
 
-    def initialize(json_changeble)
-      @json_changeble = json_changeble
+    def initialize(json_changeable)
+      @json_changeable = json_changeable
     end
 
     def detect_type
@@ -23,11 +23,11 @@ module JsonUpdater
     private
 
     def one_level_json?
-      json_changeble.is_a?(Hash)
+      json_changeable.is_a?(Hash)
     end
 
     def one_level_json_array?
-      json_changeble.is_a?(Array)
+      json_changeable.is_a?(Array)
     end
   end
 end

data/lib/json_updater/one_level_json_array_builder.rb

@@ -2,20 +2,20 @@
 
 module JsonUpdater
   class OneLevelJsonArrayBuilder
-    attr_reader :json_etalon, :json_changeble
+    attr_reader :json_etalon, :json_changeable
 
-    def self.build(json_changeble, json_etalon)
-      new(json_changeble, json_etalon).build
+    def self.build(json_changeable:, json_etalon:)
+      new(json_changeable: json_changeable, json_etalon: json_etalon).build
     end
 
-    def initialize(json_changeble, json_etalon)
-      @json_changeble = json_changeble
-      @json_etalon    = json_etalon
+    def initialize(json_changeable:, json_etalon:)
+      @json_changeable = json_changeable
+      @json_etalon = json_etalon
     end
 
     def build
-      json_changeble.map do |json_item|
-        JsonStructureUpdater.update_json(json_item, json_etalon)
+      json_changeable.map do |json_item|
+        JsonStructureUpdater.update_json(json_changeable: json_item, json_etalon: json_etalon)
       end
     end
   end

data/lib/json_updater/one_level_json_builder.rb

@@ -2,8 +2,8 @@
 
 module JsonUpdater
   class OneLevelJsonBuilder
-    def self.build(json_changeble, json_etalon)
-      JsonStructureUpdater.update_json(json_changeble, json_etalon)
+    def self.build(json_changeable:, json_etalon:)
+      JsonStructureUpdater.update_json(json_changeable: json_changeable, json_etalon: json_etalon)
     end
   end
 end

data/lib/json_updater/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonUpdater
-  VERSION = '0.4.1'
+  VERSION = '1.0.0'
 end

data/lib/json_updater.rb

@@ -13,17 +13,17 @@ require 'json_updater/json_validator'
 
 module JsonUpdater
   class UpdateService
-    attr_reader :changable_file_path, :json_changeble, :json_etalon
+    attr_reader :changeable_file_path, :json_changeable, :json_etalon
 
-    def self.update_json(changable_file_path, etalon_file_path)
-      new(changable_file_path, etalon_file_path).update_json
+    def self.update_json(changeable_file_path:, etalon_file_path:)
+      new(changeable_file_path: changeable_file_path, etalon_file_path: etalon_file_path).update_json
     end
 
-    def initialize(changable_file_path, etalon_file_path)
-      @changable_file_path = changable_file_path
+    def initialize(changeable_file_path:, etalon_file_path:)
+      @changeable_file_path = changeable_file_path
 
-      @json_changeble = JSON.parse(File.open(changable_file_path).read)
-      @json_etalon    = JSON.parse(File.open(etalon_file_path).read)
+      @json_changeable = JSON.parse(File.open(changeable_file_path).read)
+      @json_etalon = JSON.parse(File.open(etalon_file_path).read)
     end
 
     def update_json
@@ -33,7 +33,7 @@ module JsonUpdater
     private
 
     def rewrite_file
-      File.open(changable_file_path, 'w') { |file| file.write(output_json) }
+      File.open(changeable_file_path, 'w') { |file| file.write(output_json) }
     end
 
     def output_json
@@ -41,7 +41,7 @@ module JsonUpdater
     end
 
     def updated_json
-      JsonUpdater::JsonFullBuilder.build(json_changeble, json_etalon)
+      JsonUpdater::JsonFullBuilder.build(json_changeable: json_changeable, json_etalon: json_etalon)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_updater
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Vladislav Hilko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json