newsly 0.2.1 → 0.3.0

data/app/controllers/newsly/newsletters_controller.rb

@@ -34,7 +34,6 @@ module Newsly
 
     def deliver
       if params[:answer] == "DELIVER"
-        #Newsly::NewsletterSender.perform(@newsletter.id, params[:recipient_groups])
         Resque.enqueue(Newsly::NewsletterSender, @newsletter.id, params[:recipient_groups])
         @newsletter.sent = true
         @newsletter.save
@@ -44,6 +43,17 @@ module Newsly
       end
     end
 
+    def deliver_batch
+      if params[:answer] == "BATCH"
+        Resque.enqueue(Newsly::NewsletterBatchSender, @newsletter.id, params[:recipient_group], params[:batch_size])
+        @newsletter.batch_sent = true
+        @newsletter.save
+        render :text => "BATCH DELIVERED"        
+      else
+        render :text => "WARNING! Not sent, did you answer correctly?"
+      end  
+    end
+
     def destroy
       @newsletter.destroy
       redirect_to newsletters_url

data/app/models/newsly/newsletter.rb

@@ -6,6 +6,17 @@ module Newsly
   	def render(options={})
   		Liquid::Template.parse(self.body).render options
   	end
+
+  	def draft?
+  		self.sent? || self.batch_sent? ? false : true
+  	end
+
+  	#TODO, make nicer!
+  	def status
+  		return "draft" if self.draft?
+  		return "sent" if self.sent?
+  		return "batch" if self.batch_sent?
+  	end
   	
   end
 end

data/app/views/newsly/newsletters/_sidebar.html.erb

@@ -1,28 +1,37 @@
 <div id="sidebar">
 	<ul class="links">
+		<li><%= link_to '<em>☜</em> Back'.html_safe, newsletters_path %></li>	
+		<li class="button">
+			<%= link_to "<em>❖</em>Send test".html_safe, send_test_newsletter_path(@newsletter), :id => "send_test"%>
+		</li>
 		<% if !@newsletter.sent? and @newsletter.persisted?%>
-			<li class="button">
-				<%= link_to "<em>❖</em>Send test".html_safe, send_test_newsletter_path(@newsletter), :id => "send_test"%>
-			</li>
 			<% if Newsly.recipient_groups.count > 0 %>
 				<li class="groups">
 					<form id="groupform" class="groupform">
+						<h3>Recipient Groups</h3>
 						<ul>
+							<% @max_batch_size = 0 %>
 							<% for group in Newsly.recipient_groups %>
+								<% @group_count = group[1].call.count %>
+								<% @max_batch_size = @max_batch_size + @group_count %>
 								<li>
-									<input type="checkbox" name="<%=group[0].to_s%>" value="<%=group[0].to_s%>" id="group_<%=group[0].to_s%>" />
-									<label for="group_<%=group[0].to_s%>"><%= group[0].to_s.humanize %> (<%= group[1].call.count %>)</label>
+									<input type="checkbox" name="<%=group[0].to_s%>" value="<%=group[0].to_s%>" id="group_<%=group[0].to_s%>" data-max="<%= @group_count %>"/>
+									<label for="group_<%=group[0].to_s%>"><%= group[0].to_s.humanize %> (<span class="count"><%= @group_count %></span>)</label>
 								</li>
 							<% end %>
 						</ul>
 					</form>
 				</li>
-				<li class="button">
-					<%= link_to "<em>✈</em>Deliver!".html_safe, deliver_newsletter_path(@newsletter), :id => "deliver"%>			
+				<li class="button range deliverbutton">
+					<span id="batch_size_preview"></span>
+					<input type="range" min="0" value="0" max="<%= @max_batch_size %>" id="batch_size" />
+					<%= link_to "<em>✈</em>Deliver Batch!".html_safe, deliver_batch_newsletter_path(@newsletter), :id => "deliver_batch"%>
+				</li>
+				<li class="button deliverbutton">
+					<%= link_to "<em>✈</em>Deliver All!".html_safe, deliver_newsletter_path(@newsletter), :id => "deliver"%>
 				</li>
 			<% end %>
 		<% end %>
-		<li><%= link_to '<em>☜</em> Back'.html_safe, newsletters_path %></li>
 	</ul>
 	<div id="saved"></div>	
 </div>

data/app/views/newsly/newsletters/index.html.erb

@@ -5,9 +5,11 @@
 	  <tbody>
 			<% @newsletters.each do |newsletter| %>
 			  <tr>
-			    <td class="<%= newsletter.sent? ? "sent": "draft" %>"><%= newsletter.sent? ? t("sent"): t("draft") %></td>
+			    <td class="<%= newsletter.status%>"><%= newsletter.status %></td>
 			    <td class="title"><%= link_to newsletter.title, newsletter %></td>
-			    <td class="action"><%= link_to 'Destroy', newsletter, confirm: 'Are you sure?', method: :delete if !newsletter.sent?%></td>
+			    <td class="action">
+			    	<%= link_to 'Destroy', newsletter, confirm: 'Are you sure?', method: :delete if newsletter.draft? %>
+			    </td>
 			  </tr>
 			<% end %>
 		</tbody>

data/app/workers/newsly/newsletter_batch_sender.rb

@@ -0,0 +1,11 @@
+module Newsly
+	class NewsletterBatchSender
+	  @queue = :newsletter
+	  def self.perform(newsletter_id, recipient_group, batch_size)
+	    Newsly.get_newsletter_receipient_group(recipient_group.to_sym).call.limit(batch_size).each do |resource|
+	      Newsly::Mailer.async_deliver.build_newsletter(newsletter_id, resource.send(Newsly.resource_email_column), resource.to_liquid)
+	    end
+    end
+
+	end
+end

data/app/workers/newsly/newsletter_sender.rb

@@ -4,7 +4,7 @@ module Newsly
 	  def self.perform(newsletter_id, recipient_groups)
       for group in recipient_groups
 	      Newsly.get_newsletter_receipient_group(group.to_sym).call.find_each(:batch_size => 1000) do |resource|
-	        Newsly::Mailer.build_newsletter(newsletter_id, resource.send(Newsly.resource_email_column), resource.to_liquid).deliver
+	        Newsly::Mailer.async_deliver.build_newsletter(newsletter_id, resource.send(Newsly.resource_email_column), resource.to_liquid)
 	      end
     	end
 

data/config/routes.rb

@@ -4,6 +4,7 @@ Newsly::Engine.routes.draw do
 		member do
 			put 'send_test'
 			put 'deliver'
+			put 'deliver_batch'
 		end
 	end
 

data/db/migrate/20111004085523_add_fields_to_newsletter.rb

@@ -0,0 +1,5 @@
+class AddFieldsToNewsletter < ActiveRecord::Migration
+  def change
+  	add_column :newsly_newsletters,	:batch_sent, :integer
+  end
+end

data/lib/newsly.rb

@@ -1,6 +1,7 @@
 require "newsly/engine"
 require "resque"
 require "liquid"
+require "resque-async_deliver"
 
 module Newsly
 

data/lib/newsly/version.rb

@@ -1,3 +1,3 @@
 module Newsly
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/public/javascripts/newsletters.js

@@ -1,68 +1,141 @@
 jQuery(document).ready(function($) {
 
-
   if (top.Mercury) {
-  window.Mercury = top.Mercury;
-  Mercury.PageEditor.prototype.save = function() {
-    var data = this.serialize();
-    var newsletter_id = $("#newsletter").attr('data-id');
-    $.ajax({
-      url:  $("#newsletter").attr('data-url'),
-      type: 'POST',
-      data: {newsletter: {title: data.title.value, body: data.body.value}, '_method': 'PUT'},
-      success: function(data){
-        $('#saved').html(data);
+    window.Mercury = top.Mercury;
+    Mercury.PageEditor.prototype.save = function() {
+      var data = this.serialize();
+      var newsletter_id = $("#newsletter").attr('data-id');
+      $.ajax({
+        url:  $("#newsletter").attr('data-url'),
+        type: 'POST',
+        data: {newsletter: {title: data.title.value, body: data.body.value}, '_method': 'PUT'},
+        success: function(data){
+          $('#saved').html(data);
+        }
+      });
+    }
+    
+
+    $('a#deliver_batch').click(function(e){
+      e.preventDefault();
+      top.Mercury.trigger('action', {action: 'save'});
+      var url = $(this).attr('href');
+      var recipient_groups = get_recipient_groups();
+      if($('#batch_size').val() <= 0){ alert('Batch size cant be 0!'); return false;}
+      if(recipient_groups.length == 1){
+        var newsletter_id = $("#newsletter").attr('data-id');
+        var answer = prompt('Are you sure? Type "BATCH"');
+        var batch_size = parseInt($('#batch_size').val());
+        if(answer == "BATCH"){
+          $.ajax({
+            url:  url,        
+            type: 'POST',
+            data: {'_method': 'PUT', 'answer': answer, 'recipient_group': recipient_groups[0], 'batch_size': batch_size},
+            success: function(data){
+              $("#flash").html(data).show().hide("fade", {}, 1000);
+              calculate_group_count(recipient_groups[0], batch_size);
+            }
+          });
+        } 
+      } else{
+        alert('You have to select 1 (one) group to send to!');
       }
     });
-  }};
 
-  $('a#deliver').click(function(e){
-  	e.preventDefault();
-    top.Mercury.trigger('action', {action: 'save'});
-    
-    var recipient_groups = [];
+    $('a#deliver').click(function(e){
+    	e.preventDefault();
+      top.Mercury.trigger('action', {action: 'save'});
+      var url = $(this).attr('href');    
+      var recipient_groups = get_recipient_groups();
+      if(recipient_groups.length > 0){
+        var newsletter_id = $("#newsletter").attr('data-id');
+        var answer = prompt('Are you sure? Type "DELIVER"');
+        if(answer == "DELIVER"){
+          $.ajax({
+            url:  url,        
+            type: 'POST',
+            data: {'_method': 'PUT', 'answer': answer, 'recipient_groups[]': recipient_groups},
+            success: function(data){
+              $("#flash").html(data).show().hide("fade", {}, 1000);
+              $(".deliverbutton").remove();
+              $('.groups').remove();
+            }
+          });
+        } 
+      } else{
+        alert('You have to select atleast one group to send to!');
+      }
+    });
 
-    $('#groupform input[type=checkbox]').each(function(){
-      if($(this).is(':checked')){
-        recipient_groups.push($(this).val());
+    $('a#send_test').click(function(e){
+    	e.preventDefault();
+      top.Mercury.trigger('action', {action: 'save'});    
+  	 	var newsletter_id = $("#newsletter").attr('data-id');
+      var url = $(this).attr('href');    
+      var to = prompt('to what email?');
+    	$.ajax({
+        url:  url,
+  			type: 'POST',
+  			data: {'_method': "PUT", 'to': to},
+  			success: function(data){
+  				$("#flash").html(data).show().hide("fade", {}, 1000);
+  			}
+  		});	
+    });
+
+    $('#groupform input[type=checkbox]').change(function(){
+      if(get_recipient_groups().length > 0){
+        $('.deliverbutton').show();
+        set_batch_size();
+      } else {
+        $('.deliverbutton').hide();      
       }
     });
-    
-    if(recipient_groups.length > 0){
-      var newsletter_id = $("#newsletter").attr('data-id');
-      var answer = prompt('Are you sure? Type "DELIVER"');
-      var url = $(this).attr('href');
-      if(answer == "DELIVER"){
-        $.ajax({
-          url:  url,        
-          type: 'POST',
-          data: {'_method': 'PUT', 'answer': answer, 'recipient_groups[]': recipient_groups},
-          success: function(data){
-            $("#flash").html(data).show().hide("fade", {}, 1000);
-            $("#deliver").remove();
-            $('.groups').remove();
-          }
-        });
-      } 
-    } else{
-      alert('You have to select atleast one group to send to!');
+
+    $('#batch_size').change(function(e){
+      $('#batch_size_preview').html($(this).val());
+    });
+
+    set_batch_size();
+  }; 
+
+});
+
+
+var set_batch_size = function(){
+  max_batch_size = get_maximum_batch_size();
+  $('#batch_size').val(0);
+  $('#batch_size_preview').html($('#batch_size').val());
+  $('#batch_size').attr('max', max_batch_size);
+  $('#batch_size').attr('min', 0);
+  $('#batch_size').val(0);
+}
+
+var get_recipient_groups = function(){
+  var recipient_groups = [];
+
+  $('#groupform input[type=checkbox]').each(function(){
+    if($(this).is(':checked')){
+      recipient_groups.push($(this).val());
     }
   });
+  return recipient_groups;
+}
 
-  $('a#send_test').click(function(e){
-  	e.preventDefault();
-    top.Mercury.trigger('action', {action: 'save'});    
-	 	var newsletter_id = $("#newsletter").attr('data-id');
-    var url = $(this).attr('href');    
-    var to = prompt('to what email?');
-  	$.ajax({
-      url:  url,
-			type: 'POST',
-			data: {'_method': "PUT", 'to': to},
-			success: function(data){
-				$("#flash").html(data).show().hide("fade", {}, 1000);
-			}
-		});	
+var get_maximum_batch_size = function(){
+  var max_size = 0;
+  $('#groupform input[type=checkbox]').each(function(){
+    if($(this).is(':checked')){
+      max_size = max_size + parseInt($(this).attr('data-max'));
+    }
   });
+  console.log('MAXIMUM SIZE '+ max_size);  
+  return max_size; 
+}
 
-});
+var calculate_group_count = function(groupname, batch_size){
+  new_max_size = parseInt($('#group_'+groupname).attr('data-max')) - batch_size;
+  $('#group_'+groupname).attr('data-max', new_max_size);
+  $('label[for=group_'+groupname+'] .count').html(new_max_size);
+  set_batch_size();
+}

data/public/stylesheets/application.css

@@ -72,7 +72,7 @@ a:hover {
 	table{
 		width: 100%;
 	}
-	td.draft, td.sent{
+	td.draft, td.sent, td.batch{
 		width: 20px;
 	}
 	td.action{
@@ -95,6 +95,11 @@ td.sent{
 	background: green;
 	font-size: 11px;
 }
+td.batch{
+  color: #fff;
+  background: orange;
+  font-size: 11px; 
+}
 table tr:nth-child(2n+2){
 	background: #eee;
 }
@@ -250,4 +255,24 @@ form{
   text-align: center;
   padding: 10px 0;
   display: none;
+}
+
+#batch_size_preview{
+  float: left;
+  background: #feb;
+  padding: 1px 5px;
+  border-radius: 5px;
+  font-size: 0.85em;
+  margin-bottom: 10px;
+  width: 20%;
+  text-align: center;
+}
+#batch_size{
+  float: right;
+  width: 70%;
+  padding: 0;
+  margin-top: 5px;
+}
+li.deliverbutton{
+  display: none;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161779420 !ruby/object:Gem::Requirement
+  requirement: &2153344680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161779420
+  version_requirements: *2153344680
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2161778980 !ruby/object:Gem::Requirement
+  requirement: &2153344200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161778980
+  version_requirements: *2153344200
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &2161778160 !ruby/object:Gem::Requirement
+  requirement: &2153343700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161778160
+  version_requirements: *2153343700
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2161777640 !ruby/object:Gem::Requirement
+  requirement: &2153343260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161777640
+  version_requirements: *2153343260
+- !ruby/object:Gem::Dependency
+  name: resque-async_deliver
+  requirement: &2153342800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153342800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2161776020 !ruby/object:Gem::Requirement
+  requirement: &2153342360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161776020
+  version_requirements: *2153342360
 - !ruby/object:Gem::Dependency
   name: letter_opener
-  requirement: &2161775600 !ruby/object:Gem::Requirement
+  requirement: &2153341920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161775600
+  version_requirements: *2153341920
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &2161775180 !ruby/object:Gem::Requirement
+  requirement: &2153341460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161775180
+  version_requirements: *2153341460
 description: Manage mailer templates via wysiwyg and liquid. Uses mercury editor for
   now. And send out newsletters.
 email:
@@ -115,6 +126,7 @@ files:
 - app/views/newsly/snippets/index.html.erb
 - app/views/newsly/templates/index.html.erb
 - app/views/newsly/templates/show.html.erb
+- app/workers/newsly/newsletter_batch_sender.rb
 - app/workers/newsly/newsletter_sender.rb
 - config/routes.rb
 - db/migrate/20110907161522_create_newsly_newsletters.rb
@@ -122,6 +134,7 @@ files:
 - db/migrate/20110926113235_add_draft_column_to_templates.rb
 - db/migrate/20110927120903_add_text_body_fields.rb
 - db/migrate/20110929142039_remove_text_body_fields.rb
+- db/migrate/20111004085523_add_fields_to_newsletter.rb
 - lib/newsly/engine.rb
 - lib/newsly/version.rb
 - lib/newsly.rb