pxindex 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 734c93bfeb579db8039881909574a503747336f34ba3a66ceca7a89441e0b4ca
-  data.tar.gz: a940f38f6d511ed008328a0b314d9c41915af8e20705a2f167abe5b272a52235
+  metadata.gz: 1668eb3de6636f0cf6ee89fd247de311c2a5564c48de17a46049663a7748e2cf
+  data.tar.gz: '018283918b471eb3ec25193a1fc5e07b523caedacb5dc633f34ba8974c8f3b13'
 SHA512:
-  metadata.gz: d52628ae2564c1757d29fa6f6c258d4baf7941d3350d6539a416636b2caae61b432d8edd067690541f059afb0910ac26fa0e85f65a9477eb2ee341181db74534
-  data.tar.gz: e9b3486ce29f3961e547f656f242cd96dbd1ba63061d92595e88c830b8c2d895092bd57734c678eb266de802330176abc2968d20bc16fdff240d4b8105d5d037
+  metadata.gz: 646bed272d796dc7fbcde32f82b7326ff896bea9bbeb095befe83d71bdad634ef953534072aa26c1f30078f43dfd6fb4c025288206ed5f6d20076838626c03fa
+  data.tar.gz: 26666a0d64048cbbf39616581a009ade96f9101d197398bf2f5cded6c14aee8aa3f3a09860aaf81b40d98070a2d0a915feb204edefb0a88035cdf11e41d13c0d

data/lib/pxindex.rb

@@ -5,7 +5,7 @@
 require 'nokogiri'
 require 'pxindex-builder'
 require 'polyrex-headings'
-
+require 'rxfreader'
 
 
 class PxIndex
@@ -13,8 +13,8 @@ class PxIndex
   def initialize(raw_s=nil, debug: false, allsorted: false, indexsorted: false)
 
     @allsorted, @indexsorted = allsorted, indexsorted
-    @debug = debug    
-    
+    @debug = debug
+
     read raw_s if raw_s
 
   end
@@ -22,140 +22,140 @@ class PxIndex
   # Returns a PxIndexBuilder object which can build from am index or phrases
   #
   def import(s)
-    
+
     read(PxIndexBuilder.new(s, debug: @debug).to_s)
-    
+
   end
-  
+
   def parent()
     @rs.first
   end
 
   def q?(s)
-    
+
     return @a.last if s == @s
     puts '@s : ' + @s.inspect if @debug
     puts 's: ' + s.inspect if @debug
-    
-    # @s is used to store the previous string input to compare it with 
+
+    # @s is used to store the previous string input to compare it with
     # the new string input
-    
+
     if (s.length - @s.length).abs >= 1 or s[0..-2] != @s then
-      
-      @s = s      
+
+      @s = s
 
       @rs = @px.records.flat_map(&:records)
-      
+
       s2 = ''
-      
+
       @a = s.chars.map do |x|
 
         s2 += x
         found = search_records(s2, @rs)
-        
+
         break if not found
         found
-        
+
       end
 
       return @a ? @a.last  : nil
-      
+
     end
-  
+
     return []
-  
+
   end
 
   alias query q?
-  
+
   def build_html()
-    
+
     @px.each_recursive do |x, parent|
-      
+
       if x.is_a? Entry then
-        
+
         trail = parent.attributes[:trail]
         s = x.title.gsub(/ +/,'-')
         x.attributes[:trail] = trail.nil? ? s : trail + '/' + s
-        
+
       end
-      
+
     end
 
     doc  = Nokogiri::XML(@px.to_xml)
     xsl  = Nokogiri::XSLT(xslt())
 
     html_doc = Rexle.new(xsl.transform(doc).to_s)
-        
-    html_doc.root.css('.atopic').each do |e|      
-      
+
+    html_doc.root.css('.atopic').each do |e|
+
       puts 'e: ' + e.parent.parent.xml.inspect if @debug
-      
+
       href = e.attributes[:href]
       if href.empty? or href[0] == '!' then
-        
+
         if block_given? then
-          
+
           yield(e)
-          
+
         else
-          
+
           e.attributes[:href] = '#' + e.attributes[:trail].split('/')\
               .last.downcase
-          
+
         end
       end
     end
-    
+
     html_doc.xml(pretty: true, declaration: false)
-    
+
   end
-  
+
   def to_px()
     @px
   end
-  
+
   def to_s()
     @raw_px
   end
 
   private
-  
+
   def read(raw_s)
-    
-    s, _ = RXFHelper.read raw_s
-    
+
+    s, _ = RXFReader.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|      
+
+    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   
+    @px = PolyrexHeadings.new(@raw_px).to_polyrex
     @rs = @px.records.flat_map()
 
     @s = ''
-    @a = []    
+    @a = []
   end
 
   def search_records(raw_s, rs=@rs)
-    
+
     puts 'raw_s : ' + raw_s.inspect if @debug
-    
+
     if raw_s[-1] == ' ' then
 
       child_records = rs.flat_map(&:records)
-      
+
       if child_records.length > 0 then
         @rs = child_records
         return child_records
@@ -165,67 +165,67 @@ class PxIndex
     end
 
     keywords = raw_s.split(/ /)
-    
+
     s = keywords.length > 1 ? keywords.last : raw_s
-    
-    a = rs.select {|x| x.title[0..s.length-1] == s}    
-    
+
+    a = rs.select {|x| x.title[0..s.length-1] == s}
+
     if @debug then
-      puts 'a: ' + a.inspect 
+      puts 'a: ' + a.inspect
       if a.any? then
         puts 'a.map ' + a.map(&:title).inspect
       end
-    end    
-    
+    end
+
     if a.any?  then
-      
+
       @rs = a
-      
+
     else
 
       return nil unless keywords.length > 1
-      
+
       r = rs
 
       if r.any? then
-        
-        @rs = r                
+
+        @rs = r
         search_records(s, rs)
-        
+
       else
-        
+
         return nil
-        
+
       end
-      
+
     end
 
   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| 
+
+    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
-      
+
       r = (@allsorted ? sort(obj) : obj).map {|x| treeize(x, indent+1)}.join("\n")
       puts 'r: ' + r.inspect if @debug
       r
@@ -237,7 +237,7 @@ class PxIndex
     end
   end
 
-  
+
   def xslt()
 <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -283,8 +283,8 @@ class PxIndex
 </xsl:template>
 
 
-</xsl:stylesheet>    
+</xsl:stylesheet>
 EOF
-  end  
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxindex
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzE0MjEwMzUxWhcN
-  MTkwMzE0MjEwMzUxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjAGJU
-  TtLHBA8kLkGItpBBYflhiLbF0zNnLqg+DWs/73aI1hZLkFVoQA5/Mjq4YnC/4NPY
-  g8ZXddJ6v9kitiDByucN/6oZnS91CGmS1umm2IRorXVl48cMzx/GO96f7uh8pf7l
-  5VR2Rzb0hJyXu0f9GYdaBe1jVbNdupYSHFdpxW3QRPK+QUiz/0l3qlcmruDmpCsI
-  hqbFQ8OJS3SLhs3uEl2hqQvS8ijZQaGzOT9vnQVYRELBzBTv42YLyc28E7yRbGfK
-  uevJOPVG/XUEcmp6TuVvc46ZWXb/nyyPodjkEavZibUi2hB7+uMDuA0w/R8A5CHG
-  MubZkWqInhFzGfupAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFOhfK0sNndycIhAs8HMtP/FRjAifMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAAroYSMOhaICSkEuGHWH
-  UEm5PquvRm0uBLj5zMqG2sEPdzdH0LdR0Ta4n6lCEo1nZ+v2RtKhKGZ+F8z7fI8v
-  fp9AGztXcKpguspH/WkOxfFOxQG91gMBNDV/5Zhl/2/JMM2lSt64iz12qZPqvDWa
-  n7Yk5vUX3gcZnfRl34Q5g+irPcjvBRMvYtcGdGR9S5rFoRBIwL11Air5U3W1A59m
-  WtDnRyUCYAhLf/9oAoeeFNFp1H13yw2yiO+upixRUEt6pqQFl3++eDh82JS/2nqL
-  IIkRAfg3vUhmtNQu26Gsi9aZcJAGPKIjdRuYc9oyiGpJv0cQ02HBGRUXnoKS7XYT
-  QDc=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTUzMzE5WhcN
+  MjMwMjIzMTUzMzE5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDWmjYL
+  IR4zoF/hk/SSxW9ZZzMGjubXOClxkkl2RGOAZ5oGgZeD6YdMMor9B73meQTMpxM+
+  EMmGBnZmKzdEhvBoDxNI2UWIOCwqyfFKT2Ze+1q5vaBK0TFDjjkKxUnRKNiRO5hM
+  JCHn7Bd+V1Tgnb4nRACYQPKFG0625tiDkd089e6tBrVNFABu+YW5sC7rzV8/XXJ7
+  7M36D+ItmQiDf0UlA8wCC0StjAgaM6bf7IHwSVJWpM065U+oTmujZ9rcZ2VuIzw2
+  ZQ+h/94kA56xj+2XKWGSmQk6mUZ4HP6z34+ZzQU+YN/fxtT1aISbvAZZ8lGYwQG4
+  RG9D87HMPCW3Q8SaKhzinA8rvhcFHRe9WJoHn6ulpK0jOGM9u7Du5V1uNV9PItK+
+  YxfZ+a6dQ6hSZRcYpNubYu5dp12AIX/8Du1qjMhvsk7mFsGzkJ4NvtwtmIqc3qP5
+  hXIZIIMpwGZ4xmpWLjg3vqu1gnVc5p+2vngvSxrkngufYF9ZDEq7u4uGf8kCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUZ3pWGV05
+  7oGraWfSUYyZHLGZH1swJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEABVd3ECVIm82hELIIyaVOsQ8ZdxVmCI5isFhjalJo
+  upTEFiZsS/KOTaycNi5U0K72E540R/MB6opipy58heaVh/ie+aPhrI5ct5aOu/RG
+  fIh2wiyDTshvCcGWjwWevePD/VaeFEBoSaim8ockSx5TISpIFrodxErcqvKySntb
+  4mOS6YHEQsAC0/C7Ub9s7HY6ArJtuOqL4gmX4OrxwbSZATqz2LVtckKWweCnyo7m
+  4sVS12iJ0rgRvnnhyehZu6ByXw8MVb3kWWG6jknwaWRj5B2fZffle9kZwIuZMd/R
+  cReZ9fcYojHfZw/h5kYBkCLA0pHhob+WtF1zY2TUfi6g6NTVRPaCyMZcxY+EAiGY
+  2zF4H0zwaFRpQPz7UD7JUDgbXZaVGEMWULk6GFFC+sQ3k7OwsnaBUiFc0YI/i6eI
+  tOVtEJTcR/mCCj9KJXJqr+WfYnPrHMAUTU1yY/yIYUC3PRK4iCVNABYrrx1/knM5
+  P80D+02gWIUT41dw6mBHO32N
   -----END CERTIFICATE-----
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1s
+        version: 1.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1s
+        version: 1.13.3
 - !ruby/object:Gem::Dependency
   name: pxindex-builder
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +66,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,29 +76,29 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: polyrex-headings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.3.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -118,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Experimental gem to facilitate a keyword search, by querying a Polyrex document