simplevpim 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a4ecaf25cd2da91062608edeb5d707740f3b99
-  data.tar.gz: 0a8ff1910d5ba683478653bb73f5cdfe4ec09a25
+  metadata.gz: 418c06275af606d7754e0061c3c96bb452c1921e
+  data.tar.gz: 0e82a7d06f54bf31d125932a95ad58dbce6d2888
 SHA512:
-  metadata.gz: 958f5b2413c2708e6e89b1ccc36f784f6d9af8351e02cbda3ff778e77bd4f56b00875cb4ae9d9852261591bf57516ecd5012485e420765f3727a40f3f8f203e5
-  data.tar.gz: c268adf5375878c81a29cb16b8e523a831f072beceabcd14cbaaea50999f5eb7b405927b6eb5f0fd4bea1c4737a4177418e9557290022672c588928f72b481f3
+  metadata.gz: 3e6ef971d29b5e4cbf885b43a771e29067f8086c329d41db3da84008ae3a0de96beb1a8e5a233524165cc63962390174a46d03e3993c1c43a9b083b3a6fff9a8
+  data.tar.gz: 6baa1158bba41c7103094620e0c2ada911a04cf69450994432959cbf1988dff29dc6e3142f4247cae6b562dd197edcfc09fcd8a407bd47667f030b6519e24fbe

data/lib/simplevpim.rb

@@ -6,7 +6,7 @@ require 'hlt'
 require 'nokogiri'
 require 'vpim/vcard'
 require 'rexle-builder'
-require 'simple-config'
+require 'kvx'
 
 
 class SimpleVpim
@@ -15,7 +15,7 @@ class SimpleVpim
 
   def initialize(s)
 
-    @h = SimpleConfig.new(s).to_h
+    @h = Kvx.new(s).to_h
 
     if @h[:name] then
       @to_vcard = make_vcard @h
@@ -293,11 +293,10 @@ EOF
   end
   
   def make_xcard(xml)
-    
-    lib = File.dirname(__FILE__)    
+    #lib = File.dirname(__FILE__)
+    lib = 'http://rorbuilder.info/r/ruby/simplevpim'
     xsl = open(lib + '/xcard.xsl','UserAgent' => 'SimplevPim').read
     doc = Nokogiri::XML(xml)
-    
     xslt  = Nokogiri::XSLT(xsl)
     xslt.transform(doc).to_s    
   end
@@ -399,4 +398,4 @@ EOF
     Rexle.new(a)
   end
 
-end
+end

data/lib/simplevpim.rb~

@@ -15,7 +15,7 @@ class SimpleVpim
 
   def initialize(s)
 
-    @h = SimpleConfig.new(s).to_h
+    @h = Kvx.new(s).to_h
 
     if @h[:name] then
       @to_vcard = make_vcard @h
@@ -246,7 +246,9 @@ EOF
     lname = Rexle::Element.new('span')
     lname.attributes[:class] = 'family-name'
     lname.text = surname
-    e.add_element lname    
+    e.add_element lname
+    
+    
     
     doc.at_css('.photo').delete unless h[:photo]
     doc.css('.tel').each(&:delete) unless h[:tel]
@@ -254,6 +256,7 @@ EOF
     doc.css('.label').each(&:delete) unless h[:label]
     
     if h[:email].is_a? String then
+      
       e = doc.at_css '.email'
       e.text = 'Email:'
       alink = Rexle::Element.new('a')
@@ -261,13 +264,37 @@ EOF
       alink.attributes[:href] = 'mailto:' + h[:email]
       alink.text = h[:email]
       e.add_element alink
+      
+    elsif h[:email].is_a? Hash then
+      
+      node = doc.at_css('.email')
+     
+      h[:email].reverse_each do |k,v|
+        e = node.clone
+        type = Rexle::Element.new('span')
+        type.attributes[:class] = 'type'
+        type.text = k.capitalize
+        e.add_element type
+        e.add_text ' Email:'
+        alink = Rexle::Element.new('a')
+        alink.attributes[:class] = 'value'
+        alink.attributes[:href] = 'mailto:' + v
+        alink.text = v
+        e.add_element alink      
+        
+        node.insert_after e
+      end
+      node.delete
+
     end
-    [doc, h]
+    
+    doc.xml pretty: true, declaration: false
     
   end
   
   def make_xcard(xml)
-    lib = File.dirname(__FILE__)
+    #lib = File.dirname(__FILE__)
+    lib = 'http://rorbuilder.info/r/ruby/simplevpim'
     xsl = open(lib + '/xcard.xsl','UserAgent' => 'SimplevPim').read
     doc = Nokogiri::XML(xml)
     xslt  = Nokogiri::XSLT(xsl)
@@ -371,4 +398,4 @@ EOF
     Rexle.new(a)
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplevpim
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,28 @@ cert_chain:
   h7sjjIWKCtgcFF+5Gf5AtJf6C0PlDSh7mc8uoo2XSef/GV6YvwUrQbPtFakM7LDs
   a3f37q6Z/UCE6w==
   -----END CERTIFICATE-----
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: simple-config
+  name: kvx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: vpim
   requirement: !ruby/object:Gem::Requirement
@@ -79,20 +79,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -119,20 +119,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A simple wrapper for the vPim gem