soar_xt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a63b7998ae8fd91a721ee65c5a472c74db493057
-  data.tar.gz: 82e75d0a54da9598193ee11c46b49f2d1ae2f982
+  metadata.gz: 25af9d72347cdf3329b070c8ea7b3abc712b4d66
+  data.tar.gz: 08773559ff64e489767df343cb73c09185b9efac
 SHA512:
-  metadata.gz: 0ae7a7a2a5ee2320e1d2b3436688e2d1bda84fa1d7b8dd4afa85463ee296917412ab76e840b459b1efcaabc3b0f4a9e034912fc20228599046749f28fc31e01a
-  data.tar.gz: 9fab66eb595e25f52132cbb5eeb81983121cb05de021b3ac9598e9697b9fd72eb30050a193ef09f7c81de1ae3b33d581c84b502279ed1bda1f613b7d910a1600
+  metadata.gz: d8ab982055a4ce8695a92574b3a0d8023ce38961f4cb18f9611f983187053e7b28eabede9b1e0b54be93dc4423d673bca3293f5d1ece356cec6e3f8e87d10ace
+  data.tar.gz: d35a50ec02233eb8663c58487bc77e0372e27a569ae5bccf2beeffe83664d34cae70178b9e551febfec2cbfe79d22f276824998de3a04dd26e3845dcc0aed127

data/lib/soar_xt/soar_extend_hash.rb

@@ -1,36 +1,13 @@
 class ::Hash
-  def self.deep_merge(first, second)
-    # result = first
-    if first.is_a?(Hash) and (second.is_a?(Hash))
-      result = first.merge(second)
-#     elsif first.is_a?(Array) and second.is_a?(Array)
-#       return first + second
-#     else
-#       return second
-    end
-    first.each do |first_key, first_value|
-      second.each do |second_key, second_value|
-        if (first_key == second_key)
-          if first_value.is_a?(Hash) and (second_value.is_a?(Hash))
-            result[first_key] = Hash::deep_merge(first_value, second_value)
-          elsif first_value.is_a?(Array) and (second_value.is_a?(Array))
-            result[first_key] = first_value + second_value
-          else
-            puts "tbd"
-#             result[first_key] = second_value
-          end        
-        end
+  def self.deep_merge(a, b)
+    a.dup.merge(b) do |_,x,y|
+      if (x.is_a?(Hash) && y.is_a?(Hash))
+        deep_merge(x,y)
+      elsif x.is_a?(Array) && (y.is_a?(Array))
+        x + y
+      else
+        y
       end
-    end     
-    result
+    end
   end
-
-#   def self.value_has_hash?(value)
-#     return nil if not value.is_a?(Hash)
-#     keys = []
-#     value.each do |k, v|
-#       keys << k if v.is_a?(Hash)
-#     end
-#     keys
-  # end
 end

data/lib/soar_xt/version.rb

@@ -1,3 +1,3 @@
 module SoarXt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_xt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler