deep_sort 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9b855a4e11c26b3e2457ace5526499257ab6f3
-  data.tar.gz: 467acbe09f058c085db9d474f219e94c04afb90a
+  metadata.gz: 81628694ecb8fc9d940f5eb522df36d5e7d2404a
+  data.tar.gz: 6b4ac16178c3d8d91adfd72cab177752e3a6d748
 SHA512:
-  metadata.gz: 54c30b41f01880c8f709154524cd2d4a4a6728a5b498ad0cd7172700a4880621ec44410c67a76304e55c378b49ef058f1c1c4a81f441713ce13c65dec845d65c
-  data.tar.gz: 1a1aca25d50c37431d79c59af8ac947e98597cf651fe1194863afd9e4c2f8e47c0dd5cb8e981481886b43d55323a9ba2b54c95ad4838d17527c9762f8df9b35d
+  metadata.gz: 56dc5281a15a70d8fefc8731903014eb1c0c30adc58a11c117e7dc9fe8db09b269bb636b92cba1668ed7ee8033f17e9732208cef7f866b6ffadbe48606ab5046
+  data.tar.gz: 6bc041e786bd01a272b86bc3dda4440f9c40d70bcebdec7b151150e8e168984e439b6779280c0207237dcb3de10ec037f7aade977e05c09e9e49bdaca63cd3ba

data/lib/deep_sort.rb

@@ -1,20 +1,15 @@
 require 'deep_sort/version'
-require 'deep_sort/array'
-require 'deep_sort/hash'
+require 'deep_sort/array_ext'
+require 'deep_sort/hash_ext'
 
 module DeepSort
   def deep_sort(obj, options = {})
-    case obj
-    when Array
-      DeepSort::Array.deep_sort(obj, options)
-    when Hash
-      DeepSort::Hash.deep_sort(obj, options)
-    when Enumerable
-      if options[:sort_enum]
-        DeepSort::Array.deep_sort(obj.to_a, options)
-      else
-        obj
-      end
+    if obj.is_a?(Array)
+      DeepSort::ArrayExt.deep_sort(obj, options)
+    elsif obj.is_a?(Hash)
+      DeepSort::HashExt.deep_sort(obj, options)
+    elsif options[:sort_enum] and obj.is_a?(Enumerable)
+      DeepSort::ArrayExt.deep_sort(obj.to_a, options)
     else
       obj
     end

data/lib/deep_sort/array_ext.rb

@@ -0,0 +1,24 @@
+module DeepSort::ArrayExt
+  def deep_sort!(options = {})
+    new_array = self.deep_sort(options)
+    self.replace(new_array)
+  end
+
+  def deep_sort(options)
+    DeepSort::ArrayExt.deep_sort(self, options)
+  end
+
+  def self.deep_sort(array, options = {})
+    array.map {|value|
+      if value.is_a?(Array)
+        DeepSort::ArrayExt.deep_sort(value, options)
+      elsif value.is_a?(Hash)
+        DeepSort::HashExt.deep_sort(value, options)
+      elsif options[:sort_enum] and value.is_a?(Enumerable)
+        DeepSort::ArrayExt.deep_sort(value.to_a, options)
+      else
+        value
+      end
+    }.sort_by(&:to_s)
+  end
+end

data/lib/deep_sort/enum_ext.rb

@@ -1,5 +1,5 @@
 module Enumerable
   def deep_sort
-    DeepSort::Array.deep_sort(self.to_a, sort_enum: true)
+    DeepSort::ArrayExt.deep_sort(self.to_a, sort_enum: true)
   end
 end

data/lib/deep_sort/extend.rb

@@ -1,9 +1,9 @@
 require 'deep_sort/enum_ext'
 
 class Array
-  prepend DeepSort::Array
+  prepend DeepSort::ArrayExt
 end
 
 class Hash
-  prepend DeepSort::Hash
+  prepend DeepSort::HashExt
 end

data/lib/deep_sort/hash_ext.rb

@@ -0,0 +1,30 @@
+module DeepSort::HashExt
+  def deep_sort!(options = {})
+    new_hash = self.deep_sort(options)
+    self.replace(new_hash)
+  end
+
+  def deep_sort(options = {})
+    DeepSort::HashExt.deep_sort(self, options)
+  end
+
+  def self.deep_sort(hash, options = {})
+    new_hash = {}
+
+    hash.keys.sort_by(&:to_s).each do |key|
+      value = hash[key]
+
+      if value.is_a?(Array)
+        value = DeepSort::ArrayExt.deep_sort(value, options)
+      elsif value.is_a?(Hash)
+        value = DeepSort::HashExt.deep_sort(value, options)
+      elsif options[:sort_enum] and value.is_a?(Enumerable)
+        value = DeepSort::ArrayExt.deep_sort(value.to_a, options)
+      end
+
+      new_hash[key] = value
+    end
+
+    new_hash
+  end
+end

data/lib/deep_sort/version.rb

@@ -1,3 +1,3 @@
 module DeepSort
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_sort
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - winebarrel
@@ -84,10 +84,10 @@ files:
 - bin/setup
 - deep_sort.gemspec
 - lib/deep_sort.rb
-- lib/deep_sort/array.rb
+- lib/deep_sort/array_ext.rb
 - lib/deep_sort/enum_ext.rb
 - lib/deep_sort/extend.rb
-- lib/deep_sort/hash.rb
+- lib/deep_sort/hash_ext.rb
 - lib/deep_sort/version.rb
 homepage: https://github.com/winebarrel/deep_sort
 licenses:

data/lib/deep_sort/array.rb

@@ -1,27 +0,0 @@
-module DeepSort::Array
-  def deep_sort!(options = {})
-    new_array = self.deep_sort(options)
-    self.replace(new_array)
-  end
-
-  def deep_sort(options)
-    DeepSort::Array.deep_sort(self, options)
-  end
-
-  def self.deep_sort(array, options = {})
-    array.map {|value|
-      case value
-      when Array, Hash
-        DeepSort.deep_sort(value, options)
-      when Enumerable
-        if options[:sort_enum]
-          DeepSort.deep_sort(value.to_a, options)
-        else
-          value
-        end
-      else
-        value
-      end
-    }.sort_by(&:to_s)
-  end
-end

data/lib/deep_sort/hash.rb

@@ -1,31 +0,0 @@
-module DeepSort::Hash
-  def deep_sort!(options = {})
-    new_hash = self.deep_sort(options)
-    self.replace(new_hash)
-  end
-
-  def deep_sort(options = {})
-    DeepSort::Hash.deep_sort(self, options)
-  end
-
-  def self.deep_sort(hash, options = {})
-    new_hash = {}
-
-    hash.keys.sort_by(&:to_s).each do |key|
-      value = hash[key]
-
-      case value
-      when Array, Hash
-        value = DeepSort.deep_sort(value, options)
-      when Enumerable
-        if options[:sort_enum]
-          value = DeepSort.deep_sort(value.to_a, options)
-        end
-      end
-
-      new_hash[key] = value
-    end
-
-    new_hash
-  end
-end