contacts_txt 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9abd4607e4765b8edaa26fa9880f4152f5187868ce84e11308fcc6b3918c734d
-  data.tar.gz: 39609f542c37597a33cb42723488431cbd19cfec2c873919d69581d5f5c9d2c1
+  metadata.gz: bf478e02d22813b059b002369a94120ffa7db0c98e7ee02f7eb5a7604f000e36
+  data.tar.gz: 0e220217e01429b1b35c059df1e8459100ee4003a618c8634dcafd09ca30baeb
 SHA512:
-  metadata.gz: e99e8c0f20abedcbc47487dceea18a24f6166c84ebb8bff71f9bbfbf064979e8e4fcb2343642a08f566863bebe9034d654aff136114a4652393fc93aee3f4504
-  data.tar.gz: b6524180f0d62331a283a181534ab742f050f7d228e10973ee4a7899e20ac70702b8d9927be103bbd04984866441f394f57d9203e12f68058a3bdb99832e1df7
+  metadata.gz: 71e031cd9bef37e5d93c634832d2ba450a17605cbbf5c088898a73b1678cb0c477bfce0eddfa60604c784805b3126bd8e1305ebc494e78927aea4024339e0752
+  data.tar.gz: 1d0686e575cd7242676541d2ad093a113c5ffd95666f56450d1139376d4d399ecd6c67e7b547f9118e02cc4f7e42620e93dd2752b550f445c43cab008d216a0c

data/lib/contacts_txt.rb

@@ -3,26 +3,27 @@
 # file: contacts_txt.rb
 
 require 'dynarex'
+require 'rxfreadwrite'
 
 
 class ContactsTxt
-  include RXFHelperModule
+  include RXFReadWriteModule
 
   attr_reader :to_s
-  
-  def initialize(src=nil, fields: %w(role organisation mobile 
-                 sms email dob tags address notes note mobile2 ), 
+
+  def initialize(src=nil, fields: %w(role organisation mobile
+                 sms email dob tags address notes note mobile2 ),
                  username: nil, password: nil, debug: false)
-    
+
     @debug = debug
     @fields  = %w(fullname firstname lastname tel) | fields
 
     txt, type = if src then
-      RXFHelper.read(src, username: username, password: password)
+      RXFReader.read(src, username: username, password: password)
     else
       ['', :unknown]
     end
-    
+
     case type
     when :file
       @path, @filename =  File.dirname(src), File.basename(src)
@@ -33,100 +34,100 @@ class ContactsTxt
     when :unknown
       @path, @filename = '.', 'contacts.txt'
     end
-    
+
     @dx = txt.lines.length > 1 ? import_to_dx(txt) : new_dx()
 
   end
-  
+
   def all()
     @dx.all
   end
-  
+
   def dx()
     @dx
   end
-  
+
   def find_by_id(id)
-    
+
     @dx.find_by_id id
-    
+
   end
-  
+
   def find_by_mobile(raw_number, countrycode='44')
 
     number = Regexp.new raw_number.sub(/^(?:0|#{countrycode})/,'').gsub(/[ -]*/,'')
-    
-    @dx.all.find {|x| x.mobile.gsub(/[ -]*/,'') =~ number }    
 
-  end  
-  
+    @dx.all.find {|x| x.mobile.gsub(/[ -]*/,'') =~ number }
+
+  end
+
   def find_by_name(s)
 
     # Appending a hashtag to the name can help with finding the specific record
-    # e.g. 'Peter#plumber' or 'Peter #plumber' 
-    
+    # e.g. 'Peter#plumber' or 'Peter #plumber'
+
     raw_name, tag = s.split('#',2).map(&:strip)
-    
+
     name = Regexp.new "\b#{raw_name}\b|#{raw_name}",  Regexp::IGNORECASE
     puts 'name: ' + name.inspect if @debug
-    
-    a = @dx.all.select do |x| 
+
+    a = @dx.all.select do |x|
       x.fullname =~ name or x.firstname =~ name or x.lastname =~ name
     end
-    
+
     if tag then
-      a.find {|x| x.tags.split.map(&:downcase).include? tag.downcase } 
+      a.find {|x| x.tags.split.map(&:downcase).include? tag.downcase }
     else
       a
     end
 
-  end  
-  
+  end
+
   def find_by_sms(raw_number, countrycode='44')
 
     number = Regexp.new raw_number\
         .sub(/^(?:0|#{countrycode})/,'').gsub(/[ -]*/,'')
-    
+
     @dx.all.find {|x| x.sms.gsub(/[ -]*/,'') =~ number \
-                  or x.mobile.gsub(/[ -]*/,'') =~ number }    
+                  or x.mobile.gsub(/[ -]*/,'') =~ number }
 
-  end  
-  
-  # find using the tel, mobile, or mobile2 fields 
+  end
+
+  # find using the tel, mobile, or mobile2 fields
   #
   def find_by_telno(raw_number)
 
     number = Regexp.new raw_number.gsub(/[ -]*/,'')
-    
+
     @dx.all.find do |x|
-            
+
       numbers = %i(tel mobile mobile2).map do |y|
         x.method(y).call.gsub(/[ -]*/,'') if x.respond_to? y
       end
-      
+
       puts 'numbers: ' + numbers.inspect if @debug
       numbers.grep(number).any?
     end
 
-  end    
+  end
 
   # returns a Dynarex object
-  #    
+  #
   def email_list()
     @dx.filter {|x| x.email.length > 0}
   end
-  
+
   def list_names()
-    
+
     @dx.all.inject([]) do |r, x|
       x.fullname.length >= 1 ? r << x.fullname : r
     end
 
   end
-  
+
   def mobile_list()
     @dx.filter {|x| x.mobile.length > 0}
-  end  
+  end
 
   def multi_tel_index()
 
@@ -137,7 +138,7 @@ class ContactsTxt
       end
       next unless tel
       "%s %s" % [x.fullname, x.method(tel).call]
-    end.compact 
+    end.compact
 
 
     # group by first name
@@ -152,8 +153,8 @@ class ContactsTxt
     c.each do |k, v|
 
       puts "k: %s v: %s" % [k, v]
-      v.concat(r2[k]) if r2[k]  
-      
+      v.concat(r2[k]) if r2[k]
+
     end
 
     h = c.sort.each {|k,v| v.uniq!}.to_h
@@ -170,9 +171,9 @@ class ContactsTxt
         out << "\n" + (name.length >= 29 ? name[0..26] + '...' : name)
         tel = (' ' + ' ' * (26 - phone.length)) + 't: ' + phone
         out <<  tel + "\n"
-        out << ('-' * 30) 
+        out << ('-' * 30)
 
-      end  
+      end
 
     end
 
@@ -181,17 +182,17 @@ class ContactsTxt
   end
 
   def save(filename=@filename)
-    
+
     s = dx_to_s(@dx)
     FileX.write File.join(@path, filename), s
     @dx.save File.join(@path, filename.sub(/\.txt$/,'.xml'))
-        
+
   end
-  
+
   def to_dx()
     @dx
   end
-  
+
   def to_s()
     dx_to_s @dx
   end
@@ -199,9 +200,9 @@ class ContactsTxt
   private
 
   def dx_to_s(dx)
-    
+
     rows = dx.all.map do |row|
-      
+
       h = row.to_h
 
       fullname = h.delete :fullname
@@ -211,11 +212,11 @@ class ContactsTxt
 
       ([fullname] + a.map {|x| x.join(': ') }).join("\n")
     end
-    
+
     "<?contacts fields='%s'?>\n\n%s" % [@fields, rows.join("\n\n")]
-    
+
   end
-  
+
   def import_to_dx(raw_s)
 
     s = if raw_s =~ /<?contacts / then
@@ -227,50 +228,50 @@ class ContactsTxt
         found = s2[/(?<=#{keyword}=['"])[^'"]+/]
         found ? r.merge(keyword.to_sym => found) : r
       end
-      
+
       h = {
-        fields: @fields.join(', '), 
-      }.merge attributes          
+        fields: @fields.join(', '),
+      }.merge attributes
 
-      @fields = h[:fields].split(/ *, */)      
+      @fields = h[:fields].split(/ *, */)
 
       if h[:root] then
-        "\n\n" + h[:root] + "\n" + 
+        "\n\n" + h[:root] + "\n" +
           raw_contacts.strip.lines.map {|line| '  ' + line}.join
       else
         raw_contacts
       end
-      
+
     else
-      
+
       raw_s.lstrip.lines[2..-1].join.strip
 
     end
 
     new_dx().import  "--+\n" + s.split(/\s+(?=^[\w\s\(\)]+$)/)\
-      .map {|x| 'fullname: ' + x }.join("\n")    
-    
+      .map {|x| 'fullname: ' + x }.join("\n")
+
   end
-  
+
   def new_dx()
-    
+
     Dynarex.new "contacts/contact(#{@fields.join ', '})"
-    
+
   end
 
 end
 
 class ContactsTxtAgent < ContactsTxt
-  
+
   def find_mobile_by_name(s)
-    
+
     result = find_by_name(s)
 
-    r = validate(result)  
-    
+    r = validate(result)
+
     numbers = [r.sms.empty? ? r.mobile : r.sms, r.mobile].uniq\
         .map {|x| x.sub(/\([^\)]+\)/,'').strip}
-    
+
     h = {}
     h[:msg] = if numbers.length > 1 then
       "The SMS number for %s is %s and the mobile number is %s" % \
@@ -285,30 +286,30 @@ class ContactsTxtAgent < ContactsTxt
     end
 
     h[:tags] = r.tags.to_s
-    h    
+    h
   end
-  
+
   def find_tel_by_name(s)
-    
+
     result = find_by_name(s)
-    r = validate(result)                    
-    
+    r = validate(result)
+
     h = {}
-    
+
     if r.tel.empty? then
       return find_mobile_by_name(s)
     else
       h[:msg] = "The telephone number for %s is %s" % [r.fullname, r.tel]
     end
-    
+
     h[:tags] = r.tags.to_s
-    h        
+    h
   end
 
   private
-  
+
   def validate(result)
-    
+
     case result.class.to_s
     when 'RecordX'
       result
@@ -316,8 +317,8 @@ class ContactsTxtAgent < ContactsTxt
       result.first
     when 'NilClass'
       return "I couldn't find that name."
-    end    
-    
+    end
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contacts_txt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwMTA1MTUxNjU1WhcN
-  MjEwMTA0MTUxNjU1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCjBEU5
-  87uGRPHAB6oJBWp9y6sv/xAllgf0n0JW2CVWO7AA7D6lY3ExRen5Xsj+fZbGvZNC
-  qljgtkY1TbBN7jDNtWXUKDG/wfkM6eqDoSMSWTiyGuVPtLQ8n9v9RwjLgtZjlsVk
-  Adn+QT/t2bhO7haxX/sVqIe215G1OljM7DNPx4eqLJx5D0WMhQyfYPn3Z0CV0cdV
-  Rz9cG64nCgCo88azMnhYKAEJrGlU+LTHvu84vaSFhyEm2uFpwMIFE+QhJ5HiWMl+
-  i3hhJyswv6L1SPf24e6UgYUwYwy5syeWvwfVnplt7OQr5HlBvoFpqTQEPGTBiHsE
-  tXUWZEUbvpgw9bSP5KBDFc8h8rHyMjl1t8FpsS5F41SgCLawSgouXOiE5nwAzND7
-  SYe09anLJ280DNCog4yQcLCH4CQFNJU8PY33sSkxD4Y0ymNlS0Zf7jAPWPaGHXLN
-  9rMG43G0W1C65EY8RsqtJljRI3BPQQ+LJZCXc/CZJ/otv3X0dAkIKiMJbRkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUwxyqw31/
-  OQZ4wD1Ueat8/DEscZUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTk0ODIwWhcN
+  MjMwMjIzMTk0ODIwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDlecEA
+  1V+ZCFfCwQwbOZ9S2Tn+ggDp85hVOoHZyfA+E6MMOShj1CE22RDfbyrAal+Z01C5
+  dol4wfM2s3x3QGwU/BhwoBs1el3beCkqEf86/bAfBMZ7TsxP8NcxeaQYxd4XUW52
+  f0UTA6EgM65L4F+K6vBWD76vjHwO6Z+hF9BrVVvifuT1jNykZ/PoDncs4nZaQKFP
+  yCtrrfjq9WOVG+ueHSm1+7rWqxBO2jH95Nlyfe2t2Q27gOz4hpcU6tyCGEb5Liz/
+  za+SUVNKbv8kxVBoQYYDMyHgZeS5YN1qlkxXSjSrUAIpp4eUHxaKMo6lTcXPXRPA
+  CezHTFC1cn276L80YXTj0Gw2Jp9On2AJXifKZ11nlOs+gBSS32r8UiqptAGe97Py
+  PotM+fYUjH7yunVnvsPIN+EC08vAhXCrMfFnvCuuyeSv8KKUFxmIeZE1Fn29MooE
+  Qd6QI6SJGWQ918Vj1NE4Lo/EKtgl5opL4cVPRzrH7yH82oyQiI/7NiemwrMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUaABOt2ER
+  TZ9I1b5uj7HkRf+YVr4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAOYA65DRMrJ9boX70+jES8O+2Rb6dRl2S7qOsNHqh
-  6ABXUYPSEFIg3TjxmOmoKqenfqH0EDv0nKmtCH3Sx7gYoClRgoAWXcVY+IAJV7RV
-  C2U68mMwEaFC4I1AazFH4QiU4KWVDRcSlXMDRHV4woccXl0DuKBKTR/P8d2Bb20Z
-  lB3lMzRWwCsVGeSNca3uIfxyP+kWU0c+rNV4wa6oE6+xC0aVkYZk4f2K7mk1D37V
-  +z1sDmCsb57rSch74/9Wenof/LnOUbUQth2NzJCdIreYaWR4maJEtHXHUq8glNsY
-  BivuQJVyHs/VvJ5b3/+l79zPdwOrPqZc3kSI4Pkd88ORXBwKjdSPi9elu1BmLU3M
-  vD5QednPC6Uz+TsskfllqEFDePfvEZbdIxgDeDjcodiGw1hVkvjsxrarBfqW/ozO
-  qmCJIuCwTOavNpNa1QrbiPivF5XoxOM1dEMfedK9qPxJhfovq0ZnfkMZW1R3/Qk7
-  N1r4i3xYGxWWiZWLrlorY10U
+  BgkqhkiG9w0BAQsFAAOCAYEABS1c63h+vQL2hjWs7BvQM6vFxp1T4RDvviUqLUBt
+  YAg1/vWquUZ0PVi+Hf9gAaSumDjBb7qbbkn3Y2j/aV7wpG/yFtBoknIqihp7oH7/
+  wqGlntx9baORy7chaaBRA4CB4gGUFQ0wYHCBrHmj9zvfFWXnnRoFa06JIHm2DmOB
+  41DwQiiLflNj4iYbLzNQSI5X0iRu3H8zcAp45HJNF2LBrY32b8U+4Uf1w9QOJ4Io
+  bXdjMDxNnHEj2+V2yaq4J8v0o/xEE0Qv2TEeXyiv2fvIRz5VsS3ayYv+rHVmxGuo
+  VuXOnyLlTUjeB0IakaSYdBFWW3uno+fds/mIBL9VtmZzPJ4UhirVs0t4GvftJ2oT
+  weBCjBPmFwYPtn66vFgOaUHK421yIA2FC+AQO/pOOSgngHz0pm08NMpcTeTaufKu
+  x9gWyaB0gatLOaqUuwj8jCICpzNLo20JZQyEav2hZDxdB1EQjxq9jZrMaxwW3lF/
+  zHoZFKaw47O+Nd14HCqMVZUt
   -----END CERTIFICATE-----
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -43,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.21
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.21
+        version: 1.9.6
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Reads a contacts.txt file