dlister 0.0.1 → 0.0.2

data/lib/dlister/dir_list.rb

@@ -46,22 +46,29 @@ module Dlister
     end
 
     def entry_sort entries
-      order = [:directory, :executable, :file, :link, :invalid_link]
+      entries.sort do |a, b|
+        sort_precendence a, b
+      end
+    end
+
+    def sort_precendence a, b
+      order = [:directory, :executable, :file, :link, :invalid_link, :not_found]
 
-      entries.sort do |(entry_a, attr_a), (entry_b, attr_b)|
-        rtype_a, rtype_b = attr_a[:real_type], attr_b[:real_type]
+      entry_a, attr_a = a
+      entry_b, attr_b = b
 
-        rtype_sort = order.index(rtype_a) <=> order.index(rtype_b)
+      rtype_a, rtype_b = attr_a[:real_type], attr_b[:real_type]
 
-        if rtype_sort == 0 then
-          if entry_a =~ /^\d/ && entry_b =~ /^\d/ then
-            entry_a.to_i <=> entry_b.to_i
-          else
-            entry_a <=> entry_b
-          end
+      rtype_sort = order.index(rtype_a) <=> order.index(rtype_b)
+
+      if rtype_sort == 0 then
+        if entry_a =~ /^\d/ && entry_b =~ /^\d/ then
+          entry_a.to_i <=> entry_b.to_i
         else
-          rtype_sort
+          entry_a <=> entry_b
         end
+      else
+        rtype_sort
       end
     end
 

data/lib/dlister/version.rb

@@ -1,3 +1,3 @@
 module Dlister
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dlister
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: