simplevpim 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837294bf422fd83d5713759e1983df1d04b6843557790a89f041c1aea5e81469
-  data.tar.gz: ce99d263776326cdac99f6831b1c8ce4bcc7f54d25d828175c215bfd9ba263ba
+  metadata.gz: 4c64a906a46262925ae97e53b4183fa9676e84203993cf25b06853f7a031b873
+  data.tar.gz: e5339040fa708cffaad3a5798ff77bf742ddace8d4664ce2b52cfd1a7ab339e1
 SHA512:
-  metadata.gz: b412cde4385b238ad9073e93d8be7346f2bd600b9d44d90297250f34ba670209fefbb97915dc8b7dfa55114a0c47e95213f0355494c11eb82409994be6191900
-  data.tar.gz: 97ef6fedf467824363b642147202d6cacaea03700d0492bd15969483ebf690891480da634cf8eea859676d9d6252bb7d9d8b2456bd4aa9ea4c6d800c7103ea97
+  metadata.gz: 348c5891cbc99b82be316829e787a3ffd4225981be0ae35bafaad28e6e7f49dcc122e448f4cd30e9cfb843ac3ff239a4000c1d1d23ab309747bf6dd9062c5bfd
+  data.tar.gz: bc0068f15c03f2416a47f6b46769c7878d804029c7441315eac3b288a84cbd8d1a7d4c928b1de21f00cf8491246e6781ca331867c169ad4f2c9cfbfc5c1204a3

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 ---------------------------------
       
@@ -320,12 +384,14 @@ EOF
   end
   
   def make_xcard(xml)
-    #lib = File.dirname(__FILE__)
-    lib = 'http://a0.jamesrobertson.me.uk/rorb/r/ruby/simplevpim'
-    xsl = open(lib + '/xcard.xsl','UserAgent' => 'SimplevPim').read
+
+    lib = File.dirname(__FILE__)
+    xsl = File.read File.join(lib,'xcard.xsl')
+
     doc = Nokogiri::XML(xml)
     xslt  = Nokogiri::XSLT(xsl)
     xslt.transform(doc).to_s    
+
   end
   
   def vcard_xml(h)
@@ -333,7 +399,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.0
+  version: 0.5.4
 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-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hlt
@@ -77,6 +77,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.11.11
+- !ruby/object:Gem::Dependency
+  name: unichron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
-summary: A simple wrapper for the vPim gem
+summary: A simple wrapper for the vPim gem.
 test_files: []