simplevpim 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e116739e24cfa7b20d15764009774d4cfc3db8ec
-  data.tar.gz: d1c28d8d02ba2c2120f674f6c8607af324471038
+  metadata.gz: bcae27bf883093ae36bdf11dcb6e62efa04a0dde
+  data.tar.gz: f5dda97fbdee5c8162a049609bbf28afdfe2661d
 SHA512:
-  metadata.gz: ad2c2c324de9e922d4a38b99acd9f7d0b31f08e27f4e952b60419713c192ab3c2f7880feae3804ef4a1150a0b3e600ff3479082873be5bfd37afacf9d92b168f
-  data.tar.gz: f4f77f4564800bed0238bc15e7f251665fb478c23f97f2a1c921441c1ee474024ceb3e33c4a949cf79b865d373cc0ec546edb8e819c1f886fefb04a3e3474a5c
+  metadata.gz: 7f3044e889a98a4fdd2e945a96b0d4e2dcbf1ad5c03ad09083d42f80b42b14dad24f64e8af95f38898e6e3d6128ff211be83bbd6186516b8c54d494c1c22a892
+  data.tar.gz: 7e227671a4f8317eb9c375f17f88d29c335d9654726913d183be7a9fc7dc1c598b1217ef9ce114d675eaf27039f6090f124452e84b985081e1212488740dcc21

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-ZU�1��~¾�_�}�ݼ�#�d�s�v?K��d��p�0R�+�4E߬1.�L<��ӎ�.�
�4W�2�S�,f8h5�dda襧�'㑝����q:BPS�A�[^�kG81z���o�1��8�;�#�cqd��������4�FT�@Eqj�O�N�^4!���*4�
-�>��=�9;�!�����0Е��١Wm��#��
+��ޡ-A�#0)z����A7D��E_���,����Wk㝄�9F���W��n>BSg��D4�~�@J��9�(jH��q�*��-�4,,t��c�j�����gX:/���QUB}�6C4?�n-1��|���M���U3������Zm�te
e�Z.�?��W�w+��R!����З	p�|m���� īR���yFc>��L�}W���-�Z���^8����]�΂P��N��HI��/m�~_JՈ�7�ۢ�

data/lib/simplevpim.rb

@@ -19,9 +19,9 @@ class SimpleVpim
     end
 
   end
-
-  private
-
+  
+  alias to_vcf to_vcard
+    
   def make_vcard(h)
 
     prefix = h[:prefix]
@@ -46,6 +46,14 @@ class SimpleVpim
     end
 
     card = Vpim::Vcard::Maker.make2 do |maker|
+      
+      def  maker.add(field_name, value, params={})        
+        
+        field = Vpim::DirectoryInfo::Field.create field_name, value, params
+        add_field field
+        
+      end
+      
       maker.add_name do |name|
         name.prefix = prefix if prefix
         name.given = firstname
@@ -54,11 +62,25 @@ class SimpleVpim
         name.fullname = fullname if fullname
       end
 
+      # -- email -----------------------------
+      
       e = h[:email]
-      eh = h[:email][:home]
-      ew = h[:email][:work]
-      maker.add_email(ew) { |e| e.location = 'work' } if ew
-      maker.add_email(eh) { |e| e.location = 'home' } if eh
+      
+      if e then
+        
+        if e.is_a? String then
+          maker.add_email e
+        else
+          eh = h[:email][:home]
+          ew = h[:email][:work]
+          maker.add_email(ew) { |e| e.location = 'work' } if ew
+          maker.add_email(eh) { |e| e.location = 'home' } if eh
+        end
+      end
+      
+      # -- urls ---------------------------------
+      
+      h[:url] ||= h[:urls]
       
       if h[:url] then
         
@@ -68,11 +90,48 @@ class SimpleVpim
           
           # unfortunately vPim doesn't use a block with the add_url method
           #maker.add_url (h[:url][:work]){|e| e.location = 'work'} if h[:url][:work]
+          
           h[:url][:items].each {|url| maker.add_url url }
           
         end
         
       end
+      
+      # -- photos
+      
+      maker.add_photo {|photo| photo.link = h[:photo] } if h[:photo]
+      
+      # -- telephone
+      
+      tel = h[:tel]
+      
+      if tel then
+      
+        if tel.is_a? String then
+          
+          maker.add_tel tel
+          
+        else
+          th = h[:tel][:home]
+          tw = h[:tel][:work]
+          maker.add_tel(tw) { |e| e.location = 'work' } if tw
+          maker.add_tel(th) { |e| e.location = 'home' } if th
+        end
+      end
+      
+      # -- categories ------------      
+      maker.add 'CATEGORIES', h[:categories].split(/\s*,\s*/) if h[:categories]
+      
+      # -- source ------------      
+      maker.add 'SOURCE', h[:source] if h[:source]
+
+      # -- Twitter ------------      
+      maker.add 'X-TWITTER', h[:twitter] if h[:twitter]
+      
+      # -- XMPP
+      xmpp = h[:jabber] || h[:xmpp]
+      maker.add 'X-JABBER', xmpp, 'TYPE' => 'im' if xmpp
+      
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplevpim
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   h7sjjIWKCtgcFF+5Gf5AtJf6C0PlDSh7mc8uoo2XSef/GV6YvwUrQbPtFakM7LDs
   a3f37q6Z/UCE6w==
   -----END CERTIFICATE-----
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-config