pxindex 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 371f60b99e6c9076ba7ba40b9babee5fb14de322
-  data.tar.gz: c49e053bbf77f5fc898d2c3091b034c8e7804f48
+  metadata.gz: 0b34bf0b175a8b4cb95208c4c24b8615a9aed40c
+  data.tar.gz: 3f4549f119fd31fa145dc6650133599ccb98ae08
 SHA512:
-  metadata.gz: 127ff27b3a45a9dc8b45628d980c632bdc9e80ce40ab1944fcdacfef06031720dd95db190de82a7298f4d60c20b5955ecfd1cf56fdf5966fc5d4931cc7a5c241
-  data.tar.gz: 660e95f01e0750bab4e4830b2f6511f00fd4cecd7339a266778be0526b2823a9bf22222c4b5f65df26f34c21823a5a957a04da55d8763dfda3f201209abcfba5
+  metadata.gz: 8b12644b4df55c7df9987f4b2cb90ac22e6374b686efbabb0afd28fbaf7b11190c3b2b4a274da0201fe8d421b394cefd8dd0ed805f451bf45a38f75e2f24bf20
+  data.tar.gz: 904d998fd6a740e957582e3d63b9bbf4ec4d42ea8766ff0a0dda15cc0fd159e379274004e5fe79a660d238982d162367c2d862d74993abf982b22a60893bd469

data/lib/pxindex.rb

@@ -7,8 +7,11 @@ require 'polyrex-headings'
 
 class PxIndex
 
-  def initialize(raw_s, debug: false)
+  def initialize(raw_s, debug: false, allsorted: false, indexsorted: false)
 
+    @sorted = allsorted    
+    @debug = debug    
+    
     s, _ = RXFHelper.read raw_s
     
     lines = s.lines
@@ -19,8 +22,12 @@ class PxIndex
     a = LineTree.new(lines.join.gsub(/^# [a-z]\n/,'')).to_a
     a2 = a.group_by {|x| x.first[0] }.to_a
     
-    s2 =  a2.map {|x| '# ' + x[0] + "\n\n" + treeize(x[-1]) }.join("\n\n")
-
+    s2 =  a2.map do |x|      
+      '# ' + x[0] + "\n\n" + \
+          treeize(allsorted || indexsorted ? sort(x[-1]) : x[-1])
+    end.join("\n\n")
+    
+    puts 's2: ' + s2.inspect if @debug
     @raw_px = header.join + "\n" + s2
 
     @px = PolyrexHeadings.new(@raw_px).to_polyrex   
@@ -28,7 +35,7 @@ class PxIndex
 
     @s = ''
     @a = []
-    @debug = debug
+
 
   end
   
@@ -141,11 +148,29 @@ class PxIndex
 
   end
   
+  def sort(a)
+    puts 'sorting ... a: ' + a.inspect if @debug
+    return sort_children(a) if a.first.is_a? String
+    
+    r = a.sort_by do |x| 
+      next unless x[0].is_a? String
+      x[0]
+    end
+    puts 'after sort: ' + r.inspect if @debug
+    r
+  end
+  
+  def sort_children(a)
+    [a[0]] + a[1..-1].sort_by {|x| x[0]}
+  end
+  
   def treeize(obj, indent=-2)
 
     if obj.is_a? Array then
-
-      obj.map {|x| treeize(x, indent+1)}.join("\n")
+      
+      r = (@sorted ? sort(obj) : obj).map {|x| treeize(x, indent+1)}.join("\n")
+      puts 'r: ' + r.inspect if @debug
+      r
 
     else
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxindex
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson