muck-invites 3.1.1 → 3.3.0

data/README.rdoc

@@ -23,8 +23,12 @@ You can include muck-invites.css or copy and paste the styles and change them as
   <%= stylesheet_link_tag 'muck-invites' -%>
 
 Include a link to initialize the invite process.  You might want to do this in a lightbox.
+
+The simple version that simply asks for an email and password:
   <%= link_to 'Invite Your Friends', new_invite_path, :class => 'invite_box' %>
 
+The better method that uses oauth to talk to email services instead of asking for a password:
+  <%= link_to 'Invite Friends', compose_invites_path, :class => 'invite_box' %>
 
 === Oauth
 The invite system can use oauth where available to acquire contacts. To enable this functionality install the

data/Rakefile

@@ -52,16 +52,15 @@ begin
     gem.description = "The invite engine for the muck system."
     gem.authors = ["Justin Ball, Joel Duffin"]
     
-    gem.add_dependency "contacts"
+    gem.add_dependency "contacts", ">=1.2.4"
+    gem.add_dependency "muck-portablecontacts"
     gem.add_dependency "hpricot"
     gem.add_dependency "muck-engine"
+    gem.add_dependency "muck-auth", ">=3.5.1"
     gem.files.exclude 'test/**'
     gem.test_files.exclude 'test/**'
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.3.0

data/app/helpers/muck_invites_helper.rb

@@ -22,5 +22,40 @@ module MuckInvitesHelper
   def contact_container(contacts)
     render :partial => 'invites/contact_container', :locals => { :contacts => contacts }
   end
+  
+  def google_oauth_for(user)
+    user.authentications.find_by_provider('google')
+  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)
+    return unless google_oauth_for(user)
+    contacts = gmail_contacts(user, ignore_cache).collect{|contact| "'#{contact[:email]} (#{contact[:name]})'" }
+    "var gmail_contacts = [#{contacts.join(',')}];"
+  end
+  
+  def gmail_contacts(user, ignore_cache = false)
+    if @user_gmail_contacts && @user_gmail_contacts[user] && !ignore_cache
+      @user_gmail_contacts[user]
+    else
+      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|
+            {
+              :name => entry.xpath('xmlns:title').inner_html,
+              :email => entry.xpath('gd:email').attr('address').value
+            }
+          end
+        end
+        @user_gmail_contacts[user] = contacts
+      end
+    end
+  end
     
 end

data/app/views/invites/_contact_list.erb

@@ -2,8 +2,8 @@
  <% contacts.each_with_index do |contact,i| %>
    <tr class="contact <%= i%2==0 ? 'even' : 'odd' %>">
      <td class="cb"><input type="checkbox" value="<%= h(contact[1]) %>" name="emails[]"></td>
-     <td class="name"><%= contact[0] %></td>
-     <td class="email"><%= contact[1] %></td>
+     <td class="name"><%= contact[:name] %></td>
+     <td class="email"><%= contact[:email] %></td>
    </tr>
  <% end %>
 </table>

data/app/views/invites/_contact_list_gravatar.erb

@@ -2,10 +2,10 @@
 <table class="contacts-list">
  <% contacts.each_with_index do |contact,i| %>
    <tr class="contact <%= i%2==0 ? 'even' : 'odd' %>">
-     <td class="cb"><input type="checkbox" value="<%= h(contact[1]) %>" name="emails[]"></td>
-     <td class="icon"><%= image_tag(gravatar(contact[1], default_image, 20), :class => 'contact-list-image', :alt => contact[0]) %></td>
-     <td class="name"><%= contact[0] %></td>
-     <td class="email"><%= contact[1] %></td>
+     <td class="cb"><input type="checkbox" value="<%= contact[:email] %>" name="emails[]"></td>
+     <td class="icon"><%= image_tag(gravatar(contact[:email], default_image, 20), :class => 'contact-list-image', :alt => contact[:email]) %></td>
+     <td class="name"><%= contact[:name] %></td>
+     <td class="email"><%= contact[:email] %></td>
    </tr>
  <% end %>
 </table>

data/app/views/invites/_gmail_oauth.erb

@@ -1,10 +1,10 @@
 <% return unless logged_in? -%>
 <div id="gmail" class="invite-query">
-  <% if !current_user.google -%>
-    <p><a href="/oauth_consumers/google">Click to connect to your Gmail</a></p>
-  <% else -%>
+  <% if google_oauth_for(current_user) -%>
     <div class="contact-list">
-      <%= contact_container(gmail_contacts_as_array(current_user)) %>
-    </div>
+      <%= contact_container(gmail_contacts(current_user)) %>
+    </div>    
+  <% else -%>
+    <p><a href="/auth/google">Connect to Gmail</a></p>
   <% end -%>
 </div>

data/app/views/invites/_invite_compose.erb

@@ -21,11 +21,11 @@
       <div class="form-row">
         <label class="invite-email" for="emails">Emails</label>
         <p class="invite-email">Enter emails of friends to invite or select them above:</p>
-        <%= text_area_tag :emails, params[:emails] %>
+        <%= text_area_tag :emails, emails || params[:emails] %>
       </div>
       <div class="form-row">
         <label class="invite-message" for="message">Message</label>
-        <%= text_area_tag :message, params[:message] %>
+        <%= text_area_tag :message, message || params[:message] %>
       </div>
       <div class="form-row">
         <%= f.submit t('muck.invites.invite_button'), :class => "button invite-submit" %>
@@ -49,7 +49,7 @@ jQuery(document).ready(function() {
   
   apply_ajax_forms();
   
-  <% if current_user.google -%>
+  <% if google_oauth_for(current_user) -%>
   <%= gmail_contacts_for_auto_complete(current_user) %>
   jQuery("#emails").autocomplete(gmail_contacts, {
                minChars: 1,

data/app/views/invites/compose.erb

@@ -1 +1 @@
-<%= render :partial => 'invites/invite_compose' %>
+<%= render :partial => 'invites/invite_compose', :locals => { :message => nil, :emails => nil } %>

data/lib/muck-invites.rb

@@ -1,4 +1,5 @@
 require 'contacts'
+require 'portable_contacts'
 
 require 'muck-invites/config'
 require 'muck-invites/exceptions'

data/muck-invites.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-invites}
-  s.version = "3.1.1"
+  s.version = "3.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball, Joel Duffin"]
-  s.date = %q{2011-03-19}
+  s.date = %q{2011-04-25}
   s.description = %q{The invite engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -108,18 +108,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<contacts>, [">= 0"])
+      s.add_runtime_dependency(%q<contacts>, [">= 1.2.4"])
+      s.add_runtime_dependency(%q<muck-portablecontacts>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
+      s.add_runtime_dependency(%q<muck-auth>, [">= 3.5.1"])
     else
-      s.add_dependency(%q<contacts>, [">= 0"])
+      s.add_dependency(%q<contacts>, [">= 1.2.4"])
+      s.add_dependency(%q<muck-portablecontacts>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
+      s.add_dependency(%q<muck-auth>, [">= 3.5.1"])
     end
   else
-    s.add_dependency(%q<contacts>, [">= 0"])
+    s.add_dependency(%q<contacts>, [">= 1.2.4"])
+    s.add_dependency(%q<muck-portablecontacts>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])
+    s.add_dependency(%q<muck-auth>, [">= 3.5.1"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-invites
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 1
-  - 1
-  version: 3.1.1
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Justin Ball, Joel Duffin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -06:00
+date: 2011-04-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: muck-portablecontacts
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: muck-engine
+  name: hpricot
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +62,36 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: muck-engine
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: muck-auth
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 3
+        - 5
+        - 1
+        version: 3.5.1
+  type: :runtime
+  version_requirements: *id005
 description: The invite engine for the muck system.
 email: justin@tatemae.com
 executables: []