polyrex-links 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c19a57b19f29fe68ed02141780c528fcad7a458
-  data.tar.gz: 7b6c337aa34e83f6e8eb29b060b9bed8854d24bf
+SHA256:
+  metadata.gz: 86256bfb4e9270cadb10cb266ee9cb689f78acb29f8f59022cb97acb3765bc95
+  data.tar.gz: 489a261c8e3afb75dd57153fb1a8c16f38a9adf2e04876779fb9b2da5498b97e
 SHA512:
-  metadata.gz: 6153344d80dd0301dc24ac503c8d398cc5d656b312d687e222e2094767470a016268b70b34a6db55f3c8a5bbb4ec2a34b536904cf67018c3a66eeccfb672a0d9
-  data.tar.gz: f725ada1262e23a49a55919629408e26faf9dc48bff53cf98bb308c62607eb99bda5e3ea7d6cc2cb91787e81fdb019bfe7f196503728b9cbfabdc3c8b21a8bef
+  metadata.gz: 6ad0eabd37defceab3c1c97a57bf369f81d8c72d0dd224bedd577e569dc1b1acdeaa97afb644fb4f7bd6aa0cdfbc18f7c07c61c13e13c8202e237c41dbdd988c
+  data.tar.gz: 76a4f2e4ae7932449a2cfb80e8efe5966886af0623d584fe740721d0f7bd9ec00bd66bda549e33f07ae97d3132daa5ca34a49810cdcd8f2cdd392e7df8455f0b

data/lib/polyrex-links.rb

@@ -6,30 +6,67 @@ require 'polyrex'
 
 class PolyrexLinks < Polyrex
 
-  def initialize(x='links/link[name,url]', delimiter: ' # ', debug: false)
-    super(x)
+  def initialize(rawx='links/link[title,url]', delimiter: ' # ', debug: false)
+    
+    x, _ = RXFHelper.read(rawx)
+    obj = x.lstrip.sub(/<\?polyrex-links\?>/, 
+                  '<?polyrex schema="links/link[title,url]" delimiter=" # "?>')
+    puts 'obj: ' + x.inspect if debug
+    
+    super(obj)
     @delimiter = self.delimiter = delimiter
     @debug = debug
+    
+  end
+  
+  def find(s)
+    
+    found = find_by_link_title s
+    
+    if found then
+      
+      path = backtrack_path found 
+      [link(path.join('/')), path.join('/')]
+      
+    end
+    
+  end
+  
+  def migrate(raws)
+    
+    s, _ = RXFHelper.read(raws)
+    pl = PolyrexLinks.new("<?polyrex-links?>\n\n" + 
+                          s.sub(/<\?[^\?]+\?>/,'').lstrip)
+          
+    pl.each_recursive do |x|
+      link, linkpath = find(x.title)
+      x.url = link.url if link and link.url
+    end
+    
+    pl
+    
   end
   
   # Returns the Polyrex element for the given path
   #
   def link(s)
     
-    self.rxpath(s.split('/').map {|x| "link[name='%s']" % x}.join('/')).first
+    self.rxpath(s.split('/').map {|x| "link[title='%s']" % x}.join('/')).first
     
   end
   
   # Returns the url and remaining arguments for the given path
   #
   def locate(raw_path)
-    
+   
+    return nil if raw_path.nil? or raw_path.strip.empty?
     path = raw_path.sub(/^\//,'')
     a = path.split('/')
     a2 = []
     (a2 << a.clone; a.pop) while a.any?
-
-    mask = "records/link[summary/name='%s']"
+    return nil if a2.empty?
+    
+    mask = "records/link[summary/title='%s']"
     
     begin 
       c = a2.shift; xpath = c.map{|x| mask % x}.join + '/summary/url/text()'
@@ -57,8 +94,20 @@ class PolyrexLinks < Polyrex
     
   end
   
+  def to_s()
+    "<?polyrex-links?>\n\n" + super(header: false)
+  end
+  
   private
   
+  def backtrack_path(e, a5=[])
+
+    backtrack_path(e.parent, a5)  if e.parent?
+    a5 << e.title
+
+    return a5
+  end
+  
 
   def each_link()
 
@@ -68,7 +117,7 @@ class PolyrexLinks < Polyrex
       
         a.slice!(i..-1)
         a[i] = record
-        yield(a.map(&:name).join('/'), record.url) if block_given?
+        yield(a.map(&:title).join('/'), record.url) if block_given?
         
     end
              

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-links
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzIxMTQzNzQ3WhcN
-  MTkwMzIxMTQzNzQ3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUE5r+
-  CoqxqOOXr3v0GW1pe7qKUAwPKVr6xJQwZgP+oNWstt/uuQe9ohWT14DigR/GphUw
-  AOYEYXoy8qa5zzJV0q+LhS1OohliMQBG00vWXcHz9dMtVzcWp1xC68q3Tw9pM85g
-  mCyqcM2onmB/7CUISigY1zIS2acmihWSzFasaL29d5XNOwFzhkuQUEfL+f4m35An
-  nPuEY4HyEzA3d4acZOqV4O8bSYeiOu+M+aWdTE1wPUS150VtbR3jebyG9aWqsEad
-  rQpvmo56nae1bc51HWudEY9t+y2WoT1wWE8/7H0HfobR12adcGElv/4WsfoWnCaM
-  LEtkGqWVbEgiq/CbAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFJ49MMj/X0rEWIHq31oVALOAEwIJMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAGw2ftJrTxQ25tkByit/
-  6jJI/StiPRVHdsfDDJF0/1lcNjkVXPVkwix3n8MiCNp+OuKujk+EpuVAvzX/fFYG
-  3tXM/alEykb+dLL1/D+evWLCxwPQmIl1qLh52KACVwTp/va63ACH+ICFk/bcNq6d
-  rRrPR/O5Jgzz9cxTTNVNqkbKj+LccD5GG66AOuo+q6Ze4v7e4+5Iup/9UkG28W6n
-  CnRyuQWWBapZOCF9peyMD+3pcJQvTkpWdVl9DeLi9F7tnP6h9KYMAdjv/uanNgEg
-  BPwFsWAbLaLB8f5sRH9pSgr7gqm3ky2fSBk//wtYHz86+AKvwZ0E3pvp6FuWl5Az
-  iPQ=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjI3MTUxODE4WhcN
+  MjIwMjI3MTUxODE4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCdtqiT
+  0WUTjIB9AjlZAkqkD9DB5TTRiRmNEN1Hfq4mtVpj56axPBwoR7fuZJSutczmuy9K
+  avOwyfG5SZqqPGYAQspwg758CnP6c+rF29lMVYkoR8PiCryQK9tXBGPV33CS+T1k
+  4lQGttd8wgN55YSRkAtl/AuKmJr4zNFwY6kE0fwFWIBaw2grKJBrZUe2WTjBC4to
+  GIEP9/ehRvpiPDVsF6KY5QGPsGKDEBBPR/P5ChG6OuP5qv8wKUSw4eLMQbY81n+/
+  X2F/8FfpLGKjDboMMygHyWi+pJRiaSqzxB6WL5Q8bnIkelbw4LKhck5kWx0gl5cv
+  WLPtarEFK3Ac3kg9FzjsgvW/IJDKDn9TmYWsNKIqGj1j8vdc7sksfcch7rmKRIsD
+  zWoLCS+djhi0v2f8u9Yp5cJB0e6oyNHSkMUD44uefHAZOeT/u3kZvL6aOAjpS1A8
+  IaxkwwjginilyBHSpyPruxcNyiaDvJ/D+C7xzM5XbkbQzOwFf5Ml0UDwPgsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUke21GuFM
+  jVaog26Uc04gxKe1iCwwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAjIJYPq1LH/BCICN8vgvNFgGs21y/cfvb9xHYlzFW
+  rsugnb0Z/o4KFuR4F8JceTgBAhwCKnsXltjamYjw+VfcF/4KVtmgiFKjS35kTCu1
+  bTemc4gbHKjwz03kh35lDFD6sfqCumtifHBPNZjYXB3Nxlel+ECHLtj7NP4K14wJ
+  yu/k6V++dimd0zKocsIOSwuOUCbn9q3sXu0ZNippHdpyYtaj76BFURASv2xVj4KR
+  sIkI6KVVE15q6hrjxLInQX2GH6frDr6I6w7ltuDhI8I3TkW9C/W5vuoHyWCiG9qX
+  cBRqqQiCW7xMi8SCyoVCJydO3Js8E0gFrbg6R9XcsIt2yaktptXEcY4hm+yWlkJD
+  Nnidax6k9ikNRlpzL5AhDq6nRARm+7bJAr/4Ln3SswnLtXW6//WkQyReUJMDgRo9
+  5x/50O2gHQvmLgSVk8EsWqPZ6B8tMZ9h/ttCIkW33ewCmHrrxH9suuyqbC/SaiEf
+  2qE86MpuEcgDiX59WiP5GiBx
   -----END CERTIFICATE-----
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -38,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A convenient gem for retrieving a link from a hierarchical lookup table from