pxindex 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ef7141d18c5db60d4c2e131b69947b5bf6a2578
-  data.tar.gz: 6c17a92099097c02ccf69fa4970d194b02c8272c
+  metadata.gz: aa8e72a6b88709e91b08b64c3b69a6555d0bde8b
+  data.tar.gz: e7f0839043b1ed3db016c13e298bb7c19b3e9c66
 SHA512:
-  metadata.gz: 0473b8c93e09b00b6c75d1b3781edef5d5d3b12214e79f1b3f22bf0efe79e69e82b84c1880bd92c83e21fdb729e6f25a2989d350549287c8f798af2f2d284c1e
-  data.tar.gz: ce0144aa5711d952561badc5deb999789505f6af2a5ac1beb6f59b658605323f9d3e224f3ac02249ff3af1376bda7793580e7f1f5ad7caefe6a36d8b19027519
+  metadata.gz: 377ef810ad44ba95317d470f74bef51f3e40cf4b02ae7e6429f2baaa92e549dad20f4efbe30befa1838c0ae640dee92df67e7f93cc86f46d8ca91f96907b8a2c
+  data.tar.gz: 9c506a295da08a6e25a029dbec93b00889868204ba39f95931af74820ce97f9fb316796c0f7f68240caf48d55b55194e7a4e19add4006ac7e3dce31ce666f7de

data/lib/pxindex.rb

@@ -13,25 +13,24 @@ class PxIndex
     s, _ = RXFHelper.read raw_s
 
     @px = PolyrexHeadings.new(s).to_polyrex   
-    @stack = [@px.records]
+    @rs = @px.records
 
     @s = ''
-    @result = nil
 
   end
 
   def q?(s)
 
-    if s.length > @s.length + 1 or s[0..-2] != @s then
+    if (s.length - @s.length).abs > 1 or s[0..-2] != @s then
 
-      @stack = [@px.records]
+      @rs = @px.records
       
       s2 = ''
       
       a = s.chars.map do |x|
 
         s2 += x
-        found = search_records(s2, @stack)
+        found = search_records(s2, @rs)
         
         break if not found
         found
@@ -44,7 +43,7 @@ class PxIndex
         
     i = s.length-1
 
-    records = search_records(s, @stack)
+    records = search_records(s, @rs)
 
     @s = s
     
@@ -57,38 +56,45 @@ class PxIndex
 
   private
 
-  def search_records(raw_s, stack=@stack)
-        
-    return @result if raw_s[-1] == ' '
-    keywords = raw_s.split(/ /)
+  def search_records(raw_s, rs=@rs)
     
-    s = if keywords.length > 1 then
+    
+    if raw_s[-1] == ' ' then
 
-      r = stack.last.flat_map(&:records)
-      stack << r if r.any?
-      
-      keywords.last
+      child_records = rs.flat_map(&:records)
       
-    else
-      raw_s
+      if child_records.length > 0 then
+        @rs = child_records
+        return child_records
+      else
+        return nil
+      end
     end
+
+    keywords = raw_s.split(/ /)
+    
+    s = keywords.length > 1 ? keywords.last : raw_s
     
-    a = stack.last.select {|x| x.title[0..s.length-1] == s}
+    a = rs.select {|x| x.title[0..s.length-1] == s}    
     
-    if a.any? then
+    if s.length == 1 and a.any? and keywords.length < 2 then
+      a = a.first.records
+    end
+    
+    if a.any?  then
       
-      stack << a
-      #@result = a.map(&:title)
-      @result = a
+      @rs = a
       
     else
 
-      r = stack.last.flat_map(&:records)
+      return nil unless keywords.length > 1
+      
+      r = rs.flat_map(&:records)
 
       if r.any? then
         
-        stack << r                
-        search_records(s, stack)
+        @rs = r                
+        search_records(s, rs)
         
       else
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxindex
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   MrilunBr0ny9pMGbDRKeTfgMh9LinxPgD3BjXqZ78prB3LDxWO8kA/yDt5sLGSiq
   n8uRSvQvGormuQ==
   -----END CERTIFICATE-----
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-headings