deepsort 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91873c564f0e7ef2c0a2aaf0cb97d4e900eac69c6d5873191034c0e13da97df
-  data.tar.gz: 398113a81fc4d0130c6ec9bc3823c712028f29ef6f55e7717615bb32a87c2458
+  metadata.gz: a8c27c10ad9644800ef6081ce5e83244c86ec6903abf5512e833cb17fc1ff64b
+  data.tar.gz: 4a5653a28d8def5fe5e4fea9e3b19c19dbcbee4458e9591d2f8e52b22fc7f945
 SHA512:
-  metadata.gz: 6fadea71e40c94f706a146f3452a1a66730ce42468d60aeae6ded483214fd634d025d32517eb338ccc219021fe4e1c5d888e7d95322400b6e048759b4bfc942d
-  data.tar.gz: ac98a6eae285ef8ac23d922c5943af7643d1c7fe966a23eea47a2c7c5a4507cc6d7d85afd974af115de4bcea5e9a2c6f292bbe8ee19be07a5314a21ffde46b71
+  metadata.gz: b40d744e34ad545c518aaed6cc08ec28b4cae8755e91c8d0083e53160e9d8f847299ae09e916fb487252d87206742ce6f9bfb5e663a34f319e8b3f354f732c88
+  data.tar.gz: 685db91e06d32153cebe13005ff462f58bcbc4d873f4121b8baa7a7d349d0212a374bb8a6f8208fc5426b9b6a87928fc33cccdd34d5cc1dfd4acc0f283d22d02

data/lib/deepmerge.rb

@@ -21,7 +21,7 @@ module DeepMerge
   # inject this method into the Hash class to add deep merge functionality to Hashes
   module DeepMergeHash
     def deep_merge(other)
-      merge(other) do |key, oldval, newval|
+      merge(other) do |_key, oldval, newval|
         if oldval.respond_to? :deep_merge
           oldval.deep_merge(newval)
         else
@@ -31,7 +31,7 @@ module DeepMerge
     end
 
     def deep_merge!(other)
-      merge!(other) do |key, oldval, newval|
+      merge!(other) do |_key, oldval, newval|
         if oldval.respond_to? :deep_merge!
           oldval.deep_merge!(newval)
         else

data/lib/deepsort.rb

@@ -16,77 +16,80 @@
 module DeepSort
   # inject this method into the Array class to add deep sort functionality to Arrays
   module DeepSortArray
-    def deep_sort
-      deep_sort_by { |obj| obj }
+    def deep_sort(options = {})
+      deep_sort_by(options) { |obj| obj }
     end
 
-    def deep_sort!
-      deep_sort_by! { |obj| obj }
+    def deep_sort!(options = {})
+      deep_sort_by!(options) { |obj| obj }
     end
 
-    def deep_sort_by(&block)
-      self.map do |value|
-        if value.respond_to? :deep_sort_by
-          value.deep_sort_by(&block)
+    def deep_sort_by(options = {}, &block)
+      array = self.map do |value|
+        if value.respond_to?(:deep_sort_by)
+          value.deep_sort_by(options, &block)
         else
           value
         end
-      end.sort_by(&block)
+      end
+      options[:array] == false ? array : array.sort_by(&block)
     end
 
-    def deep_sort_by!(&block)
-      self.map! do |value|
-        if value.respond_to? :deep_sort_by!
-          value.deep_sort_by!(&block)
+    def deep_sort_by!(options = {}, &block)
+      array = self.map! do |value|
+        if value.respond_to?(:deep_sort_by!)
+          value.deep_sort_by!(options, &block)
         else
           value
         end
-      end.sort_by!(&block)
+      end
+      options[:array] == false ? array : array.sort_by!(&block)
     end
   end
 
   # inject this method into the Hash class to add deep sort functionality to Hashes
   module DeepSortHash
-    def deep_sort
-      deep_sort_by { |obj| obj }
+    def deep_sort(options = {})
+      deep_sort_by(options) { |obj| obj }
     end
 
-    def deep_sort!
-      deep_sort_by! { |obj| obj }
+    def deep_sort!(options = {})
+      deep_sort_by!(options) { |obj| obj }
     end
 
-    def deep_sort_by(&block)
-      Hash[self.map do |key, value|
-        [if key.respond_to? :deep_sort_by
-          key.deep_sort_by(&block)
+    def deep_sort_by(options = {}, &block)
+      hash = self.map do |key, value|
+        [if key.respond_to?(:deep_sort_by)
+          key.deep_sort_by(options, &block)
         else
           key
         end,
 
-        if value.respond_to? :deep_sort_by
-          value.deep_sort_by(&block)
+        if value.respond_to?(:deep_sort_by)
+          value.deep_sort_by(options, &block)
         else
           value
         end]
+      end
 
-      end.sort_by(&block)]
+      Hash[options[:hash] == false ? hash : hash.sort_by(&block)]
     end
 
-    def deep_sort_by!(&block)
-      replace(Hash[self.map do |key, value|
-        [if key.respond_to? :deep_sort_by!
-          key.deep_sort_by!(&block)
+    def deep_sort_by!(options = {}, &block)
+      hash = self.map do |key, value|
+        [if key.respond_to?(:deep_sort_by!)
+          key.deep_sort_by!(options, &block)
         else
           key
         end,
 
-        if value.respond_to? :deep_sort_by!
-          value.deep_sort_by!(&block)
+        if value.respond_to?(:deep_sort_by!)
+          value.deep_sort_by!(options, &block)
         else
           value
         end]
-
-      end.sort_by(&block)])
+      end
+      replace(Hash[options[:hash] == false ? hash : hash.sort_by!(&block)])
     end
 
     # comparison for hashes is ill-defined. this performs array or string comparison if the normal comparison fails.
@@ -101,9 +104,9 @@ Hash.send(:include, DeepSort::DeepSortHash)
 
 # and if you don't like calling member methods on objects, these two functions do it for you.
 # if the object cannot be deep sorted, it will simply return the sorted object or the object itself if sorting isn't available.
-def deep_sort(obj)
+def deep_sort(obj, options = {})
   if obj.respond_to? :deep_sort
-    obj.deep_sort
+    obj.deep_sort(options)
   elsif obj.respond_to? :sort
     obj.sort
   else
@@ -112,9 +115,9 @@ def deep_sort(obj)
 end
 
 # similar to the deep_sort method, but performs the deep sort in place
-def deep_sort!(obj)
+def deep_sort!(obj, options = {})
   if obj.respond_to? :deep_sort!
-    obj.deep_sort!
+    obj.deep_sort!(options)
   elsif obj.respond_to? :sort!
     obj.sort!
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepsort
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Mark Crossen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies: []
 description: Recursively sort nested ruby Arrays and Hashes + deepmerge
 email: markcrossen@studentbody.byu.edu