muck-invites 3.3.2 → 3.3.3

data/VERSION

@@ -1 +1 @@
-3.3.2
+3.3.3

data/app/helpers/muck_invites_helper.rb

@@ -27,6 +27,10 @@ module MuckInvitesHelper
     user.authentications.find_by_provider('google')
   end
    
+ def yahoo_oauth_for(user)
+   user.authentications.find_by_provider('yahoo')
+ end
+ 
   # Generates a javascript array of emails from gmail.  Values will be
   # put into a variable named 'gmail_contacts'
   def gmail_contacts_for_auto_complete(user, ignore_cache = false)
@@ -35,15 +39,19 @@ module MuckInvitesHelper
     "var gmail_contacts = [#{contacts.join(',')}];"
   end
   
+  def service_contacts(user, ignore_cache = false)
+    self.gmail_contacts(user, ignore_cache) + self.yahoo_contacts(user, ignore_cache)
+  end
+  
   def gmail_contacts(user, ignore_cache = false)
     if @user_gmail_contacts && @user_gmail_contacts[user] && !ignore_cache
       @user_gmail_contacts[user]
     else
+      contacts = []
       google = google_oauth_for(user)
       if google
         @user_gmail_contacts ||= {}
         result = google.access_token.get('https://www.google.com/m8/feeds/contacts/default/full?max-results=10000')
-        contacts = []
         if result.code == '200'
           xml_doc = Nokogiri::XML(result.body) {|config| config.options = Nokogiri::XML::ParseOptions::STRICT }
           contacts = xml_doc.xpath('//xmlns:entry').map do |entry|
@@ -55,7 +63,63 @@ module MuckInvitesHelper
         end
         @user_gmail_contacts[user] = contacts
       end
+      contacts
     end
   end
-    
+  
+  def yahoo_contacts(user, ignore_cache = false)
+    if @user_yahoo_contacts && @user_yahoo_contacts[user] && !ignore_cache
+      @user_yahoo_contacts[user]
+    else
+      contacts = []
+      yahoo = yahoo_oauth_for(user)
+      if yahoo
+        @user_yahoo_contacts ||= {}
+        begin
+          result = yahoo.access_token.get("http://social.yahooapis.com/v1/user/#{yahoo.uid}/contacts?format=json&count=max")
+        rescue OAuth::Problem => ex
+          return contacts
+        end
+        if result.code == '200'
+          json = ActiveSupport::JSON.decode(result.body) 
+          contacts = parse_yahoo_contacts(json) 
+        end
+        @user_yahoo_contacts[user] = contacts
+      end
+      contacts
+    end
+  end
+  
+  
+  def parse_yahoo_contacts(json)  
+    contacts = []
+
+    return contacts if json['contacts']['contact'].nil?  
+
+    json['contacts']['contact'].each do |contact|   
+
+      name = nil  
+      email = nil  
+
+      contact['fields'].each do |field|  
+        field['type']  
+
+        if field['type'] == 'name'  
+          name = "#{field['value']['givenName']} #{field['value']['familyName']}"  
+        end   
+
+        if field['type'] == 'email'  
+          email = field['value']  
+        end  
+      end  
+
+      if(email)  
+        name ||= email
+        contacts << { :name => name, :email => email}        
+      end  
+    end  
+
+    contacts  
+  end
+      
 end

data/app/views/invites/_contacts_from_services.html.erb

@@ -0,0 +1,9 @@
+<% return unless logged_in? -%>
+<% if google_oauth_for(current_user) || yahoo_oauth_for(current_user) -%>
+  <p><%=translate('muck.invites.select_emails') %></p>
+  <div id="contacts-from-services" class="invite-query">
+    <div class="contact-list">
+      <%= contact_container(service_contacts(current_user)) %>
+    </div>  
+  </div>
+<% end -%>

data/app/views/invites/_invite_compose.erb

@@ -13,10 +13,7 @@
   -->
   <div id="invite-contents">
     <%= invite_ajax_message_container %>
-    <% if google_oauth_for(current_user) -%>
-      <p><%=translate('muck.invites.select_emails') %></p>
-      <%= render :partial => 'invites/gmail_oauth' %>
-    <% end -%>
+    <%= render :partial => 'invites/contacts_from_services' %>
     <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'yahoo', :title => 'Yahoo' } %>
     <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'windows', :title => 'Windows Live' } %>
     <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'aol', :title => 'AOL' } %>

data/app/views/invites/_yahoo_oauth.html.erb

@@ -0,0 +1,10 @@
+<% return unless logged_in? -%>
+<div id="yahoo" class="invite-query">
+  <% if yahoo_oauth_for(current_user) -%>
+    <div class="contact-list">
+      <%= contact_container(yahoo_contacts(current_user)) %>
+    </div>    
+  <% else -%>
+    <p><a href="/auth/google">Connect to Yahoo</a></p>
+  <% end -%>
+</div>

data/muck-invites.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-invites}
-  s.version = "3.3.2"
+  s.version = "3.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball, Joel Duffin"]
@@ -30,12 +30,14 @@ Gem::Specification.new do |s|
     "app/views/invites/_contact_container.erb",
     "app/views/invites/_contact_list.erb",
     "app/views/invites/_contact_list_gravatar.erb",
+    "app/views/invites/_contacts_from_services.html.erb",
     "app/views/invites/_contacts_loading.erb",
     "app/views/invites/_contacts_query.erb",
     "app/views/invites/_gmail_oauth.erb",
     "app/views/invites/_invite_compose.erb",
     "app/views/invites/_invite_scripts.erb",
     "app/views/invites/_invite_standard.erb",
+    "app/views/invites/_yahoo_oauth.html.erb",
     "app/views/invites/compose.erb",
     "app/views/invites/create.erb",
     "app/views/invites/create.html.erb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-invites
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 3
-  - 2
-  version: 3.3.2
+  - 3
+  version: 3.3.3
 platform: ruby
 authors: 
 - Justin Ball, Joel Duffin
@@ -117,12 +117,14 @@ files:
 - app/views/invites/_contact_container.erb
 - app/views/invites/_contact_list.erb
 - app/views/invites/_contact_list_gravatar.erb
+- app/views/invites/_contacts_from_services.html.erb
 - app/views/invites/_contacts_loading.erb
 - app/views/invites/_contacts_query.erb
 - app/views/invites/_gmail_oauth.erb
 - app/views/invites/_invite_compose.erb
 - app/views/invites/_invite_scripts.erb
 - app/views/invites/_invite_standard.erb
+- app/views/invites/_yahoo_oauth.html.erb
 - app/views/invites/compose.erb
 - app/views/invites/create.erb
 - app/views/invites/create.html.erb