aeden-contacts 0.2.16 → 0.2.18

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 16
+:patch: 18
 :major: 0

data/lib/contacts/google.rb

@@ -249,7 +249,7 @@ module Contacts
           content_node = entry / 'atom:content'
           
           service_id = id_node ? id_node.inner_text : nil
-          name = title_node ? title_node.inner_text : nil
+          name = title_node ? title_node.inner_html : nil
           
           contact = Contact.new(nil, name)
           contact.service_id = service_id
@@ -268,13 +268,13 @@ module Contacts
           end
           phone_nodes.each do |n|
             contact.phones << {
-              'value' => n.inner_text,
+              'value' => n.inner_html,
               'type' => (type_map[n['rel']] || 'other').to_s
             }
           end
           address_nodes.each do |n|
             contact.addresses << {
-              'formatted' => n.inner_text,
+              'formatted' => n.inner_html,
               'type' => (type_map[n['rel']] || 'other').to_s
             }
           end
@@ -287,14 +287,14 @@ module Contacts
               
               contact.organizations << {
                 'type' => 'job',
-                'name' => org_name ? org_name.inner_text : '',
-                'title' => org_title ? org_title.inner_text : '',
-                'department' => org_department ? org_department.inner_text : '',
-                'description' => org_description ? org_description.inner_text : ''
+                'name' => org_name ? org_name.inner_html : '',
+                'title' => org_title ? org_title.inner_html : '',
+                'department' => org_department ? org_department.inner_html : '',
+                'description' => org_description ? org_description.inner_html : ''
               }
             end
           end
-          contact.note = content_node ? content_node.inner_text : ''
+          contact.note = content_node ? content_node.inner_html : ''
           
           contacts_found << contact
         end

data/lib/contacts/windows_live.rb

@@ -50,7 +50,7 @@ module Contacts
   #
   class WindowsLive
     CONFIG_FILE = File.dirname(__FILE__) + '/../config/contacts.yml'
-
+    attr_accessor :wll
     # Initialize a new WindowsLive object.
     #    
     # ==== Paramaters
@@ -90,6 +90,10 @@ module Contacts
       @consent_token = @wll.processConsent(consent)
     end
     
+    def process_consent_token(consent_token)
+      @wll.processConsentToken consent_token
+    end
+        
     # This method return the user's contacts inside an Array in the following
     # format:
     #
@@ -104,7 +108,11 @@ module Contacts
     # the redirection POST from Windows Live
     #
     def contacts(consent)
-      process_consent(consent)
+      if consent.is_a? WindowsLiveLogin::ConsentToken
+        @consent_token = consent
+      else
+        process_consent(consent)
+      end
       contacts_xml = access_live_contacts_api()
       contacts_list = WindowsLive.parse_xml(contacts_xml)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aeden-contacts
 version: !ruby/object:Gem::Version 
-  version: 0.2.16
+  version: 0.2.18
 platform: ruby
 authors: 
 - "Mislav Marohni\xC6\x92\xC3\xA1"