structurebutcher 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db853d50c1ba07f0bc5a4e4d990c4586b4ba17d5
-  data.tar.gz: 337b870faf1fad12a15767be0b246958286442da
+  metadata.gz: 5b581968778508a6fbd6650c20392804565bc182
+  data.tar.gz: ccf15aae7b2359db457c26b1e29a982c03be9833
 SHA512:
-  metadata.gz: b694dce96c8783c94d473fdb581f56b504c4d181985e0bfcf7061cb7b7f5eb5eaad9f1c6f0a627c2a3d9a1f7d09c11647a35c5a1de8a07d43262bcb93af3ee0e
-  data.tar.gz: 592094360fa418d177bc3e7dbede2832978d16cfa8a17cbfdd07f740e62e472b611d9b5b8a45852125fc2a249814408224178b44d0ca1c043f25957dd2d256b7
+  metadata.gz: 38403b8d12fbadab67caff911f57cf7e1db0e967446880ef08e8d597a71a0558f61f417e6dc69b1bcd85bea5da110c5ee92daf3d17f50878ec1f1ab59a81968a
+  data.tar.gz: 7664251c48a41de02468c795614f02f5c3b6b7702e1cedd4ba613b39d608893d2f281e19eaba7c74ede01485867c11f34a3263dcb7c2c05590410243338b56e4

data/lib/structurebutcher.rb

@@ -10,18 +10,6 @@ require 'base64'
 #amputovat, implantovat
 #amputate, implantate
 
-class Hash
-  def sort_by_key(recursive = false, &block)
-    self.keys.sort(&block).reduce({}) do |seed, key|
-      seed[key] = self[key]
-      if recursive && seed[key].is_a?(Hash)
-        seed[key] = seed[key].sort_by_key(true, &block)
-      end
-      seed
-    end
-  end
-end
-
 class StructureButcher
     def split_escape(str)
         output = []
@@ -85,7 +73,7 @@ class StructureButcher
 
         storer = StructureButcher::Storer.new
 
-        storer.save_structure(body.sort_by_key(true), body_file, "yaml")
+        storer.save_structure(body, body_file, "yaml")
     end
 
     def implantate_struct_into_file(body_file, slot, part_struct)
@@ -102,7 +90,7 @@ class StructureButcher
         butcher.implantate(body, slot, part_struct)
 
         storer = StructureButcher::Storer.new
-        storer.save_structure(body.sort_by_key(true), body_file, "yaml")
+        storer.save_structure(body, body_file, "yaml")
     end
 end
 
@@ -216,6 +204,15 @@ class StructureButcher::Storer
     end
 
     def save_structure(structure, filename, format)
-        File.write(filename, structure_in_format(structure, format))
+        sorted_structure = {}
+        structure.keys.each do |key|
+            value = structure[key]
+            if value.is_a?(Hash)
+                sorted_structure[key] = Hash[value.sort]
+            else
+                sorted_structure[key] = value
+            end
+        end
+        File.write(filename, structure_in_format(Hash[sorted_structure.sort], format))
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structurebutcher
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Miroslav Tynovsky