yaml-search-diff 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c8d977451539a04e29673ecd6c5fc7b14f2523ddacba5b818dfaaf6d37ab0d
-  data.tar.gz: b534be13e379921eee993728ad8018567736542ff31904ebe5ec41c0079b2e41
+  metadata.gz: 0a964579c858c001a695e4e8980610a173e8a9ecda23314d6176ae4bc479b7f5
+  data.tar.gz: 3f433f709a403a3b763acd73e284fee83af3ab56ea6274fe5a49026c6a739c75
 SHA512:
-  metadata.gz: e7cf20666840ea29c9427b308c527c8f7b9632539f3b6c9c29d5996cb88e4b591a2f180927dc62c1317433ba6e16c8074fc5c44e776e21357ac33a1452368757
-  data.tar.gz: 4254b55411edb43987487a5c9d3b5028f9806fbc7640db7873ce1ab66042692ba7ee866b4174e332a66b428b3f2659c6412568d692ef3fee25df8b02e351a8c2
+  metadata.gz: c1f90c9aade7f5d77e35fa7ae1b6b793f0289adb5efb6d23520c6f40754719565f24fdcc5e83f165d57b9e164e86a5b4c1f395c21f5163a12c331bd802bbe818
+  data.tar.gz: c9449015aa16aea33c8dacc2c4b0013d423b88ae9aaf45db7a21c16c49da21d78fbaa57a50caaf5a97ad0c08a74e72f9808c0d75c5b3517ec433bcb7d8433f3c

data/bin/ysdiff

@@ -17,7 +17,8 @@ invalid_files << file_1 unless yml_1.is_a?(Hash)
 invalid_files << file_2 unless yml_2.is_a?(Hash)
 
 if invalid_files.empty?
-  puts YamlSearchDiff.run(key: key, yml_1: yml_1, yml_2: yml_2)
+  ysdiff = YamlSearchDiff.new
+  puts ysdiff.run(key: key, yml_1: yml_1, yml_2: yml_2)
 else
   STDERR.puts "Couldn't parse following files as Hash: #{invalid_files.join(', ')}"
   exit 1

data/lib/yaml_search_diff.rb

@@ -2,76 +2,82 @@ require 'yaml'
 require 'diffy'
 
 class YamlSearchDiff
-  class << self
-    def run(key:, yml_1:, yml_2:)
-      return "" unless yml_1.is_a?(Hash) && yml_2.is_a?(Hash)
 
-      searched_1 = key.include?(':') ? search_dig(key, yml_1) : search(key, yml_1)
-      searched_2 = key.include?(':') ? search_dig(key, yml_2) : search(key, yml_2)
+  def initialize
+    @scalar_scanner = Psych::ScalarScanner.new(Psych::ClassLoader.new)
+  end
 
-      Diffy::Diff.new(
-        YAML.dump(searched_1),
-        YAML.dump(searched_2)
-      )
-    end
+  def run(key:, yml_1:, yml_2:)
+    return "" unless yml_1.is_a?(Hash) && yml_2.is_a?(Hash)
 
-    private
+    searched_1 = key.include?(':') ? search_dig(key, yml_1) : search(key, yml_1)
+    searched_2 = key.include?(':') ? search_dig(key, yml_2) : search(key, yml_2)
 
-      def search(key, yml)
-        searched = catch(:has_key) { dfs(yml, key) }
-        sort_yml(searched)
-      end
+    Diffy::Diff.new(
+      YAML.dump(searched_1),
+      YAML.dump(searched_2)
+    )
+  end
 
-      def search_dig(key, yml)
-        splitted_keys = key.split(':')
-        first_key = splitted_keys.first
+  private
 
-        searched = catch(:has_key) { dfs(yml, first_key) }
-        digged = searched.dig(*splitted_keys[1..])
+    def search(key, yml)
+      tokenized_key = @scalar_scanner.tokenize(key)
+      searched = catch(:has_key) { dfs(yml, tokenized_key) }
+      sort_yml(searched)
+    end
 
-        sort_yml(digged)
-      end
+    def search_dig(key, yml)
+      tokenized_keys = key.split(':').map {|k| @scalar_scanner.tokenize(k) }
+      return sort_yml(yml) if tokenized_keys.size.zero?
 
-      def dfs(hash, key)
-        keys = hash.keys.sort_by(&:to_s)
-        keys.each do |k|
-          throw :has_key, hash[k] if k == key
-          dfs(hash[k], key) if hash[k].is_a?(Hash)
-        end
-        {}
+      first_key = tokenized_keys.first
+
+      searched = catch(:has_key) { dfs(yml, first_key) }
+      digged = searched.dig(*tokenized_keys[1..])
+
+      sort_yml(digged)
+    end
+
+    def dfs(hash, key)
+      keys = hash.keys.sort_by(&:to_s)
+      keys.each do |k|
+        throw :has_key, hash[k] if k == key
+        dfs(hash[k], key) if hash[k].is_a?(Hash)
       end
+      {}
+    end
 
-      def sort_yml(yml)
-        if yml.is_a?(Hash)
-          nested_sort_hash(yml)
-        elsif yml.is_a?(Array)
-          nested_sort_array(yml)
-        else
-          yml
-        end
+    def sort_yml(yml)
+      if yml.is_a?(Hash)
+        nested_sort_hash(yml)
+      elsif yml.is_a?(Array)
+        nested_sort_array(yml)
+      else
+        yml
       end
+    end
 
-      def nested_sort_hash(hash)
-        hash.each do |k, v|
-          if v.is_a?(Hash)
-            hash[k] = nested_sort_hash(v)
-          elsif v.is_a?(Array)
-            hash[k] = nested_sort_array(v)
-          end
+    def nested_sort_hash(hash)
+      hash.each do |k, v|
+        if v.is_a?(Hash)
+          hash[k] = nested_sort_hash(v)
+        elsif v.is_a?(Array)
+          hash[k] = nested_sort_array(v)
         end
-        hash.sort_by { |k, v| k.to_s }.to_h
       end
+      hash.sort_by { |k, v| k.to_s }.to_h
+    end
 
-      def nested_sort_array(array)
-        array.each_with_index do |v, i|
-          if v.is_a?(Hash)
-            array[i] = nested_sort_hash(v)
-          elsif v.is_a?(Array)
-            array[i] = nested_sort_array(v)
-          end
+    def nested_sort_array(array)
+      array.each_with_index do |v, i|
+        if v.is_a?(Hash)
+          array[i] = nested_sort_hash(v)
+        elsif v.is_a?(Array)
+          array[i] = nested_sort_array(v)
         end
-        array.sort_by(&:to_s)
       end
-  end
+      array.sort_by(&:to_s)
+    end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-search-diff
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Natsuki Inoue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy