muck-invites 0.1.6 → 0.1.7

data/README.rdoc

@@ -2,6 +2,11 @@
 Make it easy to let users invite other users.
 
 == Setup
+Be sure to include muck.js:
+  <%= javascript_include_tag %w{ muck.js } %>
+
+Include a link to initialize the invite process.  You might want to do this in a lightbox.
+  <%= link_to 'Invite Your Friends', new_invite_path, :class => 'invite_box' %>
 
 === Inviter model
 Add 'acts_as_muck_inviter' to the class that you wish to have do the inviting.  This is commonly the user model, but
@@ -36,4 +41,4 @@ Create an Invite model:
   end
 
 
-Copyright (c) 2009 Tatemae.com, released under the MIT license
+Copyright (c) 2009-2010 Tatemae.com, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/app/controllers/muck/invites_controller.rb

@@ -1,38 +1,36 @@
 class Muck::InvitesController < ApplicationController
-
   unloadable
-
   before_filter :login_required
-
+  
   def new
     flash.discard
     @page_title = t('muck.invites.new_invites', :app_name => GlobalConfig.application_name)
     respond_to do |format|
       format.html { render :template => 'invites/new' }
       format.pjs { render :template => 'invites/new', :layout => false }
+      format.js { render :template => 'invites/new', :layout => false }
     end
   end
 
   def get_contacts
-    success = true
+    @success = true
     begin
       @contacts = User.get_contacts(params[:get_contacts][:email], params[:get_contacts][:password])
       if @contacts.blank?
-        message = t('muck.invites.no_contacts_found')
-        success = false
+        @message = t('muck.invites.no_contacts_found')
+        @success = false
       end
     rescue Contacts::AuthenticationError => ex
-      success = false
-      message = ex.to_s
+      @success = false
+      @message = ex.to_s
     end    
     respond_to do |format|
       format.html do
-        flash[:error] = message if message
-        render :template => 'invites/_get_contacts'
-      end
-      format.json do
-        render :json => { :success => success, :message => message, :html => get_contacts_html }
+        flash[:error] = @message if @message
+        render :template => 'invites/get_contacts'
       end
+      format.json { render :json => { :success => @success, :message => @message, :contacts => @contacts.as_json } }
+      format.js { render :template => 'invites/get_contacts', :layout => false }
     end
   end
 
@@ -47,6 +45,7 @@ class Muck::InvitesController < ApplicationController
         redirect_to('/')
       end
       format.pjs { render :text => message }
+      format.js { render :text => message }
     end 
     
   rescue ActiveRecord::RecordInvalid => ex
@@ -59,15 +58,8 @@ class Muck::InvitesController < ApplicationController
     respond_to do |format|
       format.html { render :template => 'invites/new' }
       format.pjs { render :template => 'invites/new', :layout => false }
+      format.js { render :template => 'invites/new', :layout => false }
     end
   end
 
-  protected
-
-    def get_contacts_html
-      render_as_html do
-        render_to_string(:partial => 'invites/get_contacts')
-      end
-    end
-  
 end

data/app/views/invites/{_get_contacts.html.erb → _get_contacts.erb}

@@ -1,6 +1,6 @@
 <%= output_errors(t('muck.invites.problem_adding_invite'), {:class => 'help-box'}, @invite) %>
 <% if !@contacts.blank? -%>
-  <% custom_form_for(:invite_contacts, :url => {:action => 'create'}, :html => {:id => "invite-contacts-form", :name => 'invite-contacts-form'} ) do |f| -%>
+  <% custom_form_for(:invite_contacts, :url => {:action => 'create'}, :html => {:id => "invite-contacts-form", :name => 'invite-contacts-form', :class => 'ajax'} ) do |f| -%>
      <div id="contact-chooser">
        <div id="contact-chooser-list">
          <fieldset>

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

@@ -0,0 +1 @@
+<%= render :partial => 'invites/get_contacts' %>

data/app/views/invites/get_contacts.js.erb

@@ -0,0 +1,14 @@
+jQuery("#contacts-loading").hide();
+<% if @success -%>
+	jQuery("#contacts-chooser-wrapper").html("<%=escape_javascript(render(:partial => 'invites/get_contacts'))%>");
+	jQuery("#contacts-chooser-wrapper").show();
+	apply_ajax_forms();
+<% else -%>
+	<% if GlobalConfig.growl_enabled -%>
+	  jQuery.jGrowl.info(json.message);
+	<% else -%>
+	  jQuery("#notice-error").html('<%=escape_javascript(@message)%>');
+	  jQuery("#notice-error").show();
+	<% end -%>
+	jQuery("#get-contacts-form").show();
+<% end -%>

data/app/views/invites/{new.html.erb → new.erb}

@@ -4,7 +4,7 @@
   <div id="get-contacts-form">
     <% custom_form_for(:get_contacts, :url => get_contacts_invites_path,
                                     :html => {:id => "get-contacts-form", :name => 'get-contacts-form',
-                                    :class => 'get-contacts-form', :autocomplete => 'off'} ) do |f| -%>
+                                    :class => 'ajax get-contacts-form', :autocomplete => 'off'} ) do |f| -%>
       <%= f.text_field :email, { :label => t('muck.invites.your_email'),
                                  :tip => t('muck.invites.your_email_help')} -%>
       <%= f.password_field :password, { :label => t('muck.invites.email_password'),
@@ -25,26 +25,7 @@ jQuery(document).ready(function() {
     jQuery("#get-contacts-form").hide();
     jQuery("#contacts-loading").show();
     jQuery("#notice-error").hide();
-    var form = jQuery(this).parents('form');
-    jQuery.post(form.attr('action'), form.serialize() + '&format=json',
-    function(data){
-      var json = eval('(' + data + ')');
-      jQuery("#contacts-loading").hide();
-      if(!json.success){
-        <% if GlobalConfig.growl_enabled -%>
-          jQuery.jGrowl.info(json.message);
-        <% else -%>
-          jQuery("#notice-error").html(json.message);
-          jQuery("#notice-error").show();
-          jQuery("#get-contacts-form").show();
-        <% end -%>
-      } else {
-        jQuery("#contacts-chooser-wrapper").html(json.html);
-        jQuery("#contacts-chooser-wrapper").show();
-      }
-    });
-    return false;
   });
+  apply_ajax_forms();
 });
-</script>
-
+</script>

data/lib/active_record/acts/muck_invite.rb

@@ -19,7 +19,6 @@ module ActiveRecord
           named_scope :by_oldest, :order => "created_at ASC"
           named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
 
-
           include ActiveRecord::Acts::MuckInvite::InstanceMethods
           extend ActiveRecord::Acts::MuckInvite::SingletonMethods
           

data/lib/active_record/acts/muck_inviter.rb

@@ -68,7 +68,7 @@ module ActiveRecord
             end
           end 
         end
-
+        
         def inviters
           Invite.who_invited?(self.email)
         end

data/muck-invites.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-invites}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball, Joel Duffin"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-22}
   s.description = %q{The invite engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -27,8 +27,10 @@ Gem::Specification.new do |s|
      "app/views/invite_mailer/invite_notification.text.plain.erb",
      "app/views/invite_mailer/invited_joined_notification.text.html.erb",
      "app/views/invite_mailer/invited_joined_notification.text.plain.erb",
-     "app/views/invites/_get_contacts.html.erb",
-     "app/views/invites/new.html.erb",
+     "app/views/invites/_get_contacts.erb",
+     "app/views/invites/get_contacts.html.erb",
+     "app/views/invites/get_contacts.js.erb",
+     "app/views/invites/new.erb",
      "config/muck_invites_routes.rb",
      "db/migrate/20090928213532_create_invites.rb",
      "db/migrate/20091128170318_make_invites_polymorphic.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Justin Ball, Joel Duffin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -07:00
+date: 2010-03-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,8 +61,10 @@ files:
 - app/views/invite_mailer/invite_notification.text.plain.erb
 - app/views/invite_mailer/invited_joined_notification.text.html.erb
 - app/views/invite_mailer/invited_joined_notification.text.plain.erb
-- app/views/invites/_get_contacts.html.erb
-- app/views/invites/new.html.erb
+- app/views/invites/_get_contacts.erb
+- app/views/invites/get_contacts.html.erb
+- app/views/invites/get_contacts.js.erb
+- app/views/invites/new.erb
 - config/muck_invites_routes.rb
 - db/migrate/20090928213532_create_invites.rb
 - db/migrate/20091128170318_make_invites_polymorphic.rb