simplevpim 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b8411e8323eb6df94ad8219a0789d71be6cb187fc0ac271c3cc3fe8bece742
-  data.tar.gz: 784fcd0808daa9bcef34deb53c4295235f82ea8777ae54548b3f59932330f3f0
+  metadata.gz: bc71394c9c0159ee90f983faf40cc4890fd2795b1cc6cc33ba07aa4a26b6f656
+  data.tar.gz: 377e95b34be82c92a221c424614e06232daa11375a045684b2b472b85755ec98
 SHA512:
-  metadata.gz: cf3c0f93a8b533b12b6529736c6c31a336c12d52d41b3ed8ac288f03d55c05ff41b47ba7b5993506548b970fedfb067c8875d28e8049df7180811a6c9ac32e46
-  data.tar.gz: dc942fd4b16ed70e20f9f75faf121019d09c79f52cf5782b4bbf7c66143fe737a5e287431daaaf6c20012ae87f552653700763be604a4328310981cc8554c17e
+  metadata.gz: f6a379e565b4f0d502997692ff94557b1a306d3645a3bae9ff4a28bc45cb2fc8d14c0b084c98aab710e218286f4e242a61f0d725cb24449fb76e9402ee5cb865
+  data.tar.gz: f753230325b437765ebf0ce01f36991238f98846ef60a760c253a998e0b286d7fa03db15bea4608c94d340d7c813ac55de4c08a08087de6bff9046176e7e75ac

data/lib/simplevpim.rb

@@ -11,20 +11,53 @@ require 'unichron'
 
 
 class SimpleVpim
+  using ColouredText
 
   attr_reader :to_vcard, :to_vevent, :to_xml
+  
+  a = %i(firstname lastname name tel addr email)
+  Contact = Struct.new(*a)
+  Event = Struct.new(*%i(title summary start end location description))  
+
+  def initialize(rawobj, debug: false)
+    
+    @debug = debug
 
-  def initialize(s)
+    obj = if block_given? then
+      
+      if rawobj == :event then
+                
+        e = Event.new
+        yield e
+        e.to_h
+        
+      elsif rawobj == :contact then
 
-    kvx = Kvx.new(s)
+        puts 'inside contact' if @debug
+        c = Contact.new
+        yield c
+        c.to_h        
+        
+      end
+      
+    else
+      
+      rawobj
+      
+    end
+    
+    puts 'obj: ' + obj.inspect if @debug
+    
+    kvx = Kvx.new(obj, debug: false)
+    
     @h = kvx.to_h
 
-    if s.lstrip =~ /# vcard/ and @h[:name] then
+    if @h[:name] or @h[:firstname] or @h[:lastname] then
       
       @to_vcard = make_vcard @h
       @to_xml = vcard_xml @h      
       
-    elsif @h[:title] or @h[:summary]
+    elsif @h[:start]
       
       @to_vevent = make_vevent @h
       @to_xml = vevent_xml kvx.to_xml
@@ -70,6 +103,11 @@ class SimpleVpim
   end
     
   def make_vcard(h)
+    
+    if @debug then
+      puts 'inside make_vcard'.info 
+      puts 'h: ' + h.inspect
+    end
 
     card = Vpim::Vcard::Maker.make2 do |maker|
       
@@ -82,8 +120,23 @@ class SimpleVpim
 
       prefix = h[:prefix]
       suffix = h[:suffix]
-      
-      firstname, middlename, surname, fullname = extract_names(h[:name])
+
+      if h[:name] then
+        
+        firstname, middlename, surname, fullname = extract_names(h[:name])
+        
+      elsif h[:firstname] or h[:lastname]
+        
+        firstname = h[:firstname] if h[:firstname]
+        surname = h[:lastname] if h[:lastname]
+        
+        fullname = if h[:fullname] then
+          h[:fullname]
+        else
+          [firstname, surname].compact.join(' ')
+        end
+        
+      end
       
       maker.add_name do |name|
         name.prefix = prefix if prefix
@@ -108,6 +161,17 @@ class SimpleVpim
           maker.add_email(eh) { |e| e.location = 'home' } if eh
         end
       end
+
+
+      # -- address ------------------------------
+      
+      adr = h[:addr]
+      puts ('adr: ' + adr.inspect).debug if @debug
+      if adr then
+        maker.add_addr do |addr|
+          addr.street = adr
+        end
+      end
       
       # -- urls ---------------------------------
       
@@ -333,7 +397,22 @@ EOF
     prefix = h[:prefix]
     suffix = h[:suffix]
     
-    firstname, middlename, surname, fullname = extract_names(h[:name])    
+    if h[:name] then
+      
+      firstname, middlename, surname, fullname = extract_names(h[:name])
+      
+    elsif h[:firstname] or h[:lastname]
+      
+      firstname = h[:firstname] if h[:firstname]
+      surname = h[:lastname] if h[:lastname]
+      
+      fullname = if h[:fullname] then
+        h[:fullname]
+      else
+        [firstname, surname].compact.join(' ')
+      end
+      
+    end
     
     xml = RexleBuilder.new
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplevpim
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   dBpGyLXPFeCV5Z8rWY+S891OLL3UPvcmIiolU7aaNSwvXBGLesCCH6TrIdhw4q2z
   pM4lNlA3G8w+xUHw/9AE8V6p
   -----END CERTIFICATE-----
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hlt