muck-shares 3.1.1 → 3.2.0

data/Rakefile

@@ -55,6 +55,7 @@ begin
     gem.add_dependency "muck-users"
     gem.add_dependency "muck-activities"
     gem.add_dependency "muck-comments"
+    gem.add_dependency "muck-invites"
     gem.files.exclude 'test/**'
     gem.test_files.exclude 'test/**'
   end

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.2.0

data/app/controllers/muck/email_shares_controller.rb

@@ -0,0 +1,51 @@
+class Muck::EmailSharesController < ApplicationController
+  
+  before_filter :login_required
+  
+  def new
+    flash.discard
+    @emails = params[:emails]
+    @message = CGI.unescape(params[:message] || '')
+    @subject = CGI.unescape(params[:subject] || '')
+    respond_to do |format|
+      format.html { render :template => 'email_shares/new', :layout => 'popup' }
+      format.pjs { render :template => 'email_shares/new', :layout => false }
+      format.js { render :template => 'email_shares/new', :layout => false }
+    end
+  end
+  
+  def create
+    if params[:emails].blank?
+      @result = t('muck.shares.emails_empty')
+    elsif params[:message].blank?
+      @result = t('muck.shares.message_empty')
+    else
+      @emails = params[:emails]
+      @emails = @emails.join(', ') if @emails.is_a?(Array)
+      @emails = @emails.split(/[, ]/) if !@emails.is_a?(Array)
+      @emails = @emails.find_all { |email| !email.blank? }
+      @emails = @emails.flatten.collect { |email| email.strip }
+      check_emails = []
+      subject = params[:subject]
+      message = params[:message]
+      @emails.each do |email|
+        if !check_emails.include?(email)
+          check_emails << email
+          response = ShareMailer.share_email(current_user, email, subject, message).deliver
+        end
+      end
+      @emails = @emails.join(',')
+      @result = t('muck.shares.share_email_success', :emails => @emails)
+      @success = true
+    end
+    respond_to do |format|
+      format.html do
+        flash[:notice] = @result
+        render :template => 'email_shares/new', :layout => 'popup'
+      end
+      format.pjs { render :template => 'email_shares/create', :layout => false  }
+      format.js { render :template => 'email_shares/create', :layout => false }
+    end 
+  end
+  
+end

data/app/helpers/muck_shares_helper.rb

@@ -26,4 +26,8 @@ module MuckSharesHelper
     user.shares.find(:all, :conditions => ['uri = ?', uri])
   end
   
+  def share_ajax_message_container
+    output_message_container('share-messages', 'share-messages-container')
+  end
+  
 end

data/app/mailers/share_mailer.rb

@@ -0,0 +1,12 @@
+class ShareMailer < ActionMailer::Base
+
+  def share_email(user, email, subject, message)
+    @message = message
+    @user = user
+    mail(:to => email, :from => user.email, :subject => subject) do |format|
+      format.html
+      format.text
+    end
+  end
+  
+end

data/app/views/email_shares/create.erb

@@ -0,0 +1,8 @@
+jQuery('#share-messages-container').html("<%= escape_javascript(@result) %>");
+jQuery('#share-messages-container').show();
+jQuery('.wait-button').show();
+jQuery('.waiting').hide();
+<% if @success -%>
+  jQuery('#emails').val('');
+  jQuery('#message').val('');
+<% end -%>

data/app/views/email_shares/new.erb

@@ -0,0 +1,29 @@
+<div id="compose-email-share">
+  <%= output_errors('', {:class => 'help-box'}) %>
+  <%= share_ajax_message_container %>
+  <div id="invite-email-share">
+    <%= render :partial => 'invites/contacts_from_services' %>
+  </div>
+  <div id="email-share">
+    <%= muck_form_for(:email_share, :url => {:action => 'create'}, :html => {:id => "email-share-contacts-form", :name => 'email-share-contacts-form', :class => 'ajax'} ) do |f| -%>
+      <div id="share-emails" class="form-row">
+        <label class="email-share-email" for="emails"><%=translate('muck.shares.emails') %></label>
+        <p class="email-share-email"><%=translate('muck.shares.email_friends_prompt') %></p>
+        <%= text_area_tag :emails, @emails %>
+      </div>
+      <div id="share-subject" class="form-row">
+        <label class="email-share-subject" for="subject"><%=translate('muck.shares.subject_label') %></label>
+        <%= text_field_tag :subject, @subject %>
+      </div>
+      <div id="share-message" class="form-row">
+        <label class="email-share-message" for="message"><%=translate('muck.shares.message_label') %></label>
+        <%= text_area_tag :message, @message %>
+      </div>
+      <div class="form-row">
+        <%= f.submit t('muck.shares.email_share_button'), :class => "button email-share-submit wait-button" %>
+        <div class="waiting" style="display:none;"><%=translate('muck.shares.share_wait') %></div>        
+      </div>
+    <% end -%>
+  </div>
+</div>
+<%= render :partial => 'invites/invite_scripts' %>

data/app/views/share_mailer/share_email.html.erb

@@ -0,0 +1,2 @@
+<p>From <%= @user.display_name %>:</p>
+<p><%= @message %></p>

data/app/views/share_mailer/share_email.text.erb

@@ -0,0 +1,2 @@
+From <%= @user.display_name %>:
+<%= @message %>

data/app/views/shares/_form.erb

@@ -13,7 +13,7 @@
       <%= f.text_area :message, { :label => t('muck.shares.message'),
                                   :class => 'min' } %>
     </div>
-    <%= capture(f, &block) %>
+    <%= capture(f, &block) if block -%>
     <div class="button form-row">
       <%= f.submit t('muck.shares.add_share_button'), :class => "button share-submit", :id => "share_submit_#{share.dom_id}" %>
     </div>

data/config/locales/en.yml

@@ -1,21 +1,32 @@
-en:
-  muck:
-    shares:
-      cant_delete_share: "You don't have permission to delete that share"
-      share_removed: "Share successfully removed."
+--- 
+en: 
+  muck: 
+    shares: 
+      add_share: Share
+      uri: Url
+      share_removed: Share successfully removed.
+      create_success: Successfully shared page
+      new_share: Share a Link
+      title: Title
+      cancel_share_button: Cancel
+      share_title: Share This Link
       create_error: "Could not create the share: %{errors}"
-      create_success: "Successfully shared page"
-      add_share: "Share"
-      add_share_button: "Share"
-      adding_share: "Sharing page..."
-      cancel_share_button: "Cancel"
-      new_share: "Share a Link"
-      problem_adding_share: "There was a problem adding your share"
-      title: "Title"
-      uri: "Url"
-      message: "Message"
-      login_prompt: "Login to share"
-      share_title: "Share This Link"
-      share_activity_content: "shared %{link}.  %{message}"
-    activity_templates:
-      share: Shares
+      adding_share: Sharing page...
+      problem_adding_share: There was a problem adding your share
+      share_via_email_title: Share
+      emails: Emails
+      add_share_button: Share
+      cant_delete_share: You don't have permission to delete that share
+      login_prompt: Login to share
+      subject_label: Subject
+      message: Message
+      share_activity_content: shared %{link}.  %{message}
+      message_label: Message
+      email_friends_prompt: "Email of friends to share with:"
+      email_share_button: Send
+      emails_empty: You didn't specify any emails
+      message_empty: You didn't specify a message
+      share_email_success: "Emails have been sent to: %{emails}"
+      share_wait: Please Wait....
+    activity_templates: 
+      share: Shares

data/config/routes.rb

@@ -6,4 +6,6 @@ Rails.application.routes.draw do
     resources :shares, :controller => 'muck/shares'
   end
   
+  resources :email_shares, :controller => 'muck/email_shares'
+  
 end

data/muck-shares.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-shares}
-  s.version = "3.1.1"
+  s.version = "3.2.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-02-12}
+  s.date = %q{2011-05-06}
   s.description = %q{The share engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -20,9 +20,15 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/controllers/muck/email_shares_controller.rb",
     "app/controllers/muck/shares_controller.rb",
     "app/helpers/muck_shares_helper.rb",
+    "app/mailers/share_mailer.rb",
     "app/views/activity_templates/_share.erb",
+    "app/views/email_shares/create.erb",
+    "app/views/email_shares/new.erb",
+    "app/views/share_mailer/share_email.html.erb",
+    "app/views/share_mailer/share_email.text.erb",
     "app/views/shares/_form.erb",
     "app/views/shares/_share.erb",
     "app/views/shares/destroy.js.erb",
@@ -86,11 +92,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tatemae/muckshares}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{The share engine for the muck system}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -98,17 +103,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<muck-users>, [">= 0"])
       s.add_runtime_dependency(%q<muck-activities>, [">= 0"])
       s.add_runtime_dependency(%q<muck-comments>, [">= 0"])
+      s.add_runtime_dependency(%q<muck-invites>, [">= 0"])
     else
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<muck-users>, [">= 0"])
       s.add_dependency(%q<muck-activities>, [">= 0"])
       s.add_dependency(%q<muck-comments>, [">= 0"])
+      s.add_dependency(%q<muck-invites>, [">= 0"])
     end
   else
     s.add_dependency(%q<muck-engine>, [">= 0"])
     s.add_dependency(%q<muck-users>, [">= 0"])
     s.add_dependency(%q<muck-activities>, [">= 0"])
     s.add_dependency(%q<muck-comments>, [">= 0"])
+    s.add_dependency(%q<muck-invites>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-shares
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 3
-  - 1
-  - 1
-  version: 3.1.1
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -07:00
+date: 2011-05-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: muck-invites
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: The share engine for the muck system.
 email: justin@tatemae.com
 executables: []
@@ -88,9 +102,15 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/muck/email_shares_controller.rb
 - app/controllers/muck/shares_controller.rb
 - app/helpers/muck_shares_helper.rb
+- app/mailers/share_mailer.rb
 - app/views/activity_templates/_share.erb
+- app/views/email_shares/create.erb
+- app/views/email_shares/new.erb
+- app/views/share_mailer/share_email.html.erb
+- app/views/share_mailer/share_email.text.erb
 - app/views/shares/_form.erb
 - app/views/shares/_share.erb
 - app/views/shares/destroy.js.erb
@@ -181,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: The share engine for the muck system