contacts_txt 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bfbcc863a75bd8144abe428442d84759fb9ed61
-  data.tar.gz: f38289dd6ae53b64723e845a29f9599ec431cd23
+  metadata.gz: 36a091366cefe47c3b1f63b8e884266504b6cb2e
+  data.tar.gz: 87e0c7b7ca9357aa61eab4ead1fd703fc6f649a1
 SHA512:
-  metadata.gz: 5fa29dd794ce47737787aa0dfa1c54ab9256847d4736e614ca80bfe9c049e0144617b52551d3df92b1376b2a7a902f13f4735a1aa7ed82b5909be37fdb88350e
-  data.tar.gz: b925502e458d9c0682903d9f429cdd388f2423846bbfe1d2fe80791d3d165004dbe4dac6e8cf9232c19278537282cffcd4a79a77aab3756c2f58e880234272de
+  metadata.gz: 1dccaa1c491cc9a1d586d74a3c32b849b6e4f94dcbb126b6a1118ea0c7fdc728e4edaafad93aeaf7bdc5c9e1528dee089904b7e5be51d4ada102de92324a6268
+  data.tar.gz: 5b5a9da840d7c2c0c5c0766954a83a5d724ec33956f6beca927eb31f4cc6add131d3f8395810c3bea9211da7e01178b1a443bc1f83ae905300863c641cb16b60

data/lib/contacts_txt.rb

@@ -9,16 +9,27 @@ class ContactsTxt
 
   attr_reader :to_s
   
-  def initialize(raw_filename='contacts.txt', path: File.dirname(raw_filename), \
-                        fields: %w(mobile email dob tags address notes))
-    @fields  = %w(fullname firstname lastname tel) | fields
+  def initialize(src=nil, fields: %w(mobile email dob tags address notes), 
+                 username: nil, password: nil)
     
-    @path = path    
-    @filename =  path == '.' ? raw_filename : File.basename(raw_filename)
+    @fields  = %w(fullname firstname lastname tel) | fields
 
-    fpath = File.join(path, @filename)
+    txt, type = if src then
+      RXFHelper.read(src, username: username, password: password)
+    else
+      ['', :unknown]
+    end
     
-    @dx = File.exists?(fpath) ? import_to_dx(File.read(fpath)) : new_dx()
+    case type
+    when :file
+      @path, @filename =  File.dirname(src), File.basename(src)
+    when :url
+      @path, @filename = '.', File.basename(src)
+    when :unknown
+      @path, @filename = '.', 'contacts.txt'
+    end
+    
+    @dx = txt.lines.length > 1 ? import_to_dx(txt) : new_dx()
 
   end
   
@@ -50,7 +61,7 @@ class ContactsTxt
 
   private
 
-  def dx_to_s(dx, title: File.basename(@filename))
+  def dx_to_s(dx)
     
     rows = dx.all.map do |row|
       
@@ -64,16 +75,43 @@ class ContactsTxt
       ([fullname] + a.map {|x| x.join(': ') }).join("\n")
     end
     
-    "%s\n%s\n\n%s" % [title, '=' * title.length, rows.join("\n\n")]
+    "<?contacts fields='%s'?>\n\n%s" % [@fields, rows.join("\n\n")]
     
   end
   
   def import_to_dx(raw_s)
 
-    s = raw_s.lstrip.lines[2..-1].join.strip.\
-               split(/\s+(?=^[\w\s]+$)/).map {|x| 'fullname: ' + x }.join("\n")
+    s = if raw_s =~ /<?contacts / then
+
+      raw_contacts = raw_s.clone
+      s2 = raw_contacts.slice!(/<\?contacts [^>]+\?>/)
+
+      attributes = %w(fields delimiter id).inject({}) do |r, keyword|
+        found = s2[/(?<=#{keyword}=['"])[^'"]+/]
+        found ? r.merge(keyword.to_sym => found) : r
+      end
+      
+      h = {
+        fields: @fields.join(', '), 
+      }.merge attributes          
+
+      @fields = h[:fields].split(/ *, */)      
+
+      if h[:root] then
+        "\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
+    new_dx().import  "--+\n" + s.split(/\s+(?=^[\w\s]+$)/)\
+      .map {|x| 'fullname: ' + x }.join("\n")    
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contacts_txt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Ebw/4t8+mfs6ivuW6xdj3SlqhEXlfJ83mZuvJ3LtQteR5p0R8DSLcTXMkOrWD6wC
   07GXbdChvjqXQg==
   -----END CERTIFICATE-----
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -42,7 +42,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.17
+        version: 1.7.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.17
+        version: 1.7.26
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Reads a contacts.txt file