pxindex 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18376538812d5683a94b7c731aa1ddb65b1a43ab
-  data.tar.gz: 1ca021e792789d8392ce19d933796c3f4abc4903
+  metadata.gz: 7180ae0be92aec1948a8592f67fd96c6138ac5a3
+  data.tar.gz: 040f39f96f57dd9554bd16292f21ea22a1a551db
 SHA512:
-  metadata.gz: 4333b7f85887ae277f49a422b5f9a482440c8d966fe7db59f23d908e39a6c8cf1904a0268be88a097694cffec28d427421bb6bc8d95283e8c0cf99ed04ea9850
-  data.tar.gz: bd597f64135de19380d0020c23b28e8036bc46187d8dcf088f145001644876bd5bbc3f7982635dc623788beef7045fa56f7a11fd1a135e82ac8dcfdaa489071b
+  metadata.gz: 91b355f5c224817cada42a6ae93d57c7287cbddb1a1d04d5f5e1e16c9741a13f82c84626f499030bc6fb1864c5481ade05e78aa34b76aa1888d0d7507b8daa54
+  data.tar.gz: 682442727286c7e103d833345ad3916f7b29ec07aeacac41c665a2e6fdd19666ef791c2d97541cc6a7b754c6abbc6c685b3647bfae39e6fc4feabf1dc6fe16e1

data/lib/pxindex.rb

@@ -2,41 +2,28 @@
 
 # file: pxindex.rb
 
+require 'pxindex-builder'
 require 'polyrex-headings'
 
 
+
 class PxIndex
 
-  def initialize(raw_s, debug: false, allsorted: false, indexsorted: false)
+  def initialize(raw_s=nil, debug: false, allsorted: false, indexsorted: false)
 
-    @sorted = allsorted    
+    @allsorted, @indexsorted = allsorted, indexsorted
     @debug = debug    
     
-    s, _ = RXFHelper.read raw_s
-    
-    lines = s.lines
+    read raw_s if raw_s
 
-    header = []
-    header << lines.shift until lines[0].strip.empty?
+  end
+
+  # Returns a PxIndexBuilder object which can build from am index or phrases
+  #
+  def import(s)
     
-    a = LineTree.new(lines.join.gsub(/^# [a-z]\n/,'')).to_a
-    a2 = a.group_by {|x| x.first[0] }.sort.to_a
+    read(PxIndexBuilder.new(s, debug: @debug).to_s)
     
-    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   
-    @rs = @px.records
-
-    @s = ''
-    @a = []
-
-
   end
   
   def parent()
@@ -56,7 +43,7 @@ class PxIndex
       
       @s = s      
 
-      @rs = @px.records
+      @rs = @px.records.flat_map(&:records)
       
       s2 = ''
       
@@ -89,6 +76,33 @@ class PxIndex
   end
 
   private
+  
+  def read(raw_s)
+    
+    s, _ = RXFHelper.read raw_s
+    
+    lines = s.lines
+
+    header = []
+    header << lines.shift until lines[0].strip.empty?
+    
+    a = LineTree.new(lines.join.gsub(/^# [a-z]\n/,'')).to_a
+    a2 = a.group_by {|x| x.first[0] }.sort.to_a
+    
+    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   
+    @rs = @px.records.flat_map()
+
+    @s = ''
+    @a = []    
+  end
 
   def search_records(raw_s, rs=@rs)
     
@@ -120,7 +134,7 @@ class PxIndex
     end
     
     if s.length == 1 and a.any? and keywords.length < 2 then
-      a = a.first.records
+      #a = a.first.records
     end
     
     if a.any?  then
@@ -131,7 +145,7 @@ class PxIndex
 
       return nil unless keywords.length > 1
       
-      r = rs.flat_map(&:records)
+      r = rs #.flat_map(&:records)
 
       if r.any? then
         
@@ -168,7 +182,7 @@ class PxIndex
 
     if obj.is_a? Array then
       
-      r = (@sorted ? sort(obj) : obj).map {|x| treeize(x, indent+1)}.join("\n")
+      r = (@allsorted ? sort(obj) : obj).map {|x| treeize(x, indent+1)}.join("\n")
       puts 'r: ' + r.inspect if @debug
       r
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxindex
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,8 +30,28 @@ cert_chain:
   IIkRAfg3vUhmtNQu26Gsi9aZcJAGPKIjdRuYc9oyiGpJv0cQ02HBGRUXnoKS7XYT
   QDc=
   -----END CERTIFICATE-----
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pxindex-builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: polyrex-headings
   requirement: !ruby/object:Gem::Requirement