newsly 0.3.0 → 0.3.1

data/app/controllers/newsly/newsletters_controller.rb

@@ -12,6 +12,9 @@ module Newsly
     end
 
     def show
+      if Resque.size(:newsletter) > 0 || Resque.size(:mail) > 0
+        @queues_working = true
+      end
     end
 
     def new

data/app/models/newsly/recipient.rb

@@ -0,0 +1,4 @@
+module Newsly
+  class Recipient < ActiveRecord::Base
+  end
+end

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

@@ -4,7 +4,10 @@
 		<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?%>
+		<% if @queues_working %>
+			<div class="notice">Some workers are still working, delivering disabled for now! Please reload later!</div>
+
+		<% elsif !@newsletter.sent? and @newsletter.persisted?%>
 			<% if Newsly.recipient_groups.count > 0 %>
 				<li class="groups">
 					<form id="groupform" class="groupform">
@@ -12,7 +15,7 @@
 						<ul>
 							<% @max_batch_size = 0 %>
 							<% for group in Newsly.recipient_groups %>
-								<% @group_count = group[1].call.count %>
+								<% @group_count = group[1].call(@newsletter.id).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%>" data-max="<%= @group_count %>"/>
@@ -23,8 +26,7 @@
 					</form>
 				</li>
 				<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" />
+					<input type="text" data-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">

data/app/workers/newsly/newsletter_batch_sender.rb

@@ -2,7 +2,7 @@ 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.get_newsletter_receipient_group(recipient_group.to_sym).call(newsletter_id).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

data/app/workers/newsly/newsletter_sender.rb

@@ -3,7 +3,7 @@ module Newsly
 	  @queue = :newsletter
 	  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.get_newsletter_receipient_group(group.to_sym).call(newsletter_id).find_each(:batch_size => 1000) do |resource|
 	        Newsly::Mailer.async_deliver.build_newsletter(newsletter_id, resource.send(Newsly.resource_email_column), resource.to_liquid)
 	      end
     	end

data/db/migrate/20111006122345_create_newsly_recipients.rb

@@ -0,0 +1,9 @@
+class CreateNewslyRecipients < ActiveRecord::Migration
+  def change
+    create_table :newsly_recipients do |t|
+    	t.newsletter_id :integer
+    	t.email					:string
+      t.timestamps
+    end
+  end
+end

data/lib/newsly/version.rb

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

data/public/javascripts/newsletters.js

@@ -19,9 +19,11 @@ jQuery(document).ready(function($) {
     $('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($('#batch_size').val() > parseInt($('#batch_size').attr('data-max'))){ alert('Batch size cant be over group count!'); return false;}
       if(recipient_groups.length == 1){
         var newsletter_id = $("#newsletter").attr('data-id');
         var answer = prompt('Are you sure? Type "BATCH"');
@@ -33,7 +35,8 @@ jQuery(document).ready(function($) {
             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);
+              $(".deliverbutton").remove();
+              $('.groups').remove();
             }
           });
         } 
@@ -84,19 +87,17 @@ jQuery(document).ready(function($) {
     });
 
     $('#groupform input[type=checkbox]').change(function(){
-      if(get_recipient_groups().length > 0){
+      group_length = get_recipient_groups().length;
+      if(group_length > 0){
         $('.deliverbutton').show();
+        if(group_length > 1){
+          $('li.range').hide();
+        }
         set_batch_size();
       } else {
         $('.deliverbutton').hide();      
       }
     });
-
-    $('#batch_size').change(function(e){
-      $('#batch_size_preview').html($(this).val());
-    });
-
-    set_batch_size();
   }; 
 
 });
@@ -105,10 +106,7 @@ jQuery(document).ready(function($) {
 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);
+  $('#batch_size').attr('data-max', max_batch_size);
 }
 
 var get_recipient_groups = function(){
@@ -131,11 +129,4 @@ var get_maximum_batch_size = function(){
   });
   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

@@ -248,7 +248,7 @@ form{
 .aloha-sidebar-handle, .aloha-sidebar-bar{
   display: none;
 }
-#flash{
+#flash, .flash{
   float: left;
   width: 100%;
   background: #feb;
@@ -256,22 +256,17 @@ form{
   padding: 10px 0;
   display: none;
 }
-
-#batch_size_preview{
+.notice{
+  background: #c00;
+  color: #fff;
+  font-size: 0.9em;
   float: left;
-  background: #feb;
-  padding: 1px 5px;
-  border-radius: 5px;
-  font-size: 0.85em;
-  margin-bottom: 10px;
-  width: 20%;
-  text-align: center;
+  padding: 10px;
+  margin: 10px 0;
 }
 #batch_size{
-  float: right;
-  width: 70%;
   padding: 0;
-  margin-top: 5px;
+  margin: 5px 0;
 }
 li.deliverbutton{
   display: none;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsly
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153344680 !ruby/object:Gem::Requirement
+  requirement: &2165539980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153344680
+  version_requirements: *2165539980
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2153344200 !ruby/object:Gem::Requirement
+  requirement: &2165539440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153344200
+  version_requirements: *2165539440
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &2153343700 !ruby/object:Gem::Requirement
+  requirement: &2165538860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153343700
+  version_requirements: *2165538860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153343260 !ruby/object:Gem::Requirement
+  requirement: &2165538360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153343260
+  version_requirements: *2165538360
 - !ruby/object:Gem::Dependency
   name: resque-async_deliver
-  requirement: &2153342800 !ruby/object:Gem::Requirement
+  requirement: &2165537860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153342800
+  version_requirements: *2165537860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153342360 !ruby/object:Gem::Requirement
+  requirement: &2165537320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153342360
+  version_requirements: *2165537320
 - !ruby/object:Gem::Dependency
   name: letter_opener
-  requirement: &2153341920 !ruby/object:Gem::Requirement
+  requirement: &2165536780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153341920
+  version_requirements: *2165536780
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &2153341460 !ruby/object:Gem::Requirement
+  requirement: &2165536280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153341460
+  version_requirements: *2165536280
 description: Manage mailer templates via wysiwyg and liquid. Uses mercury editor for
   now. And send out newsletters.
 email:
@@ -115,6 +115,7 @@ files:
 - app/helpers/newsly/application_helper.rb
 - app/mailers/newsly/mailer.rb
 - app/models/newsly/newsletter.rb
+- app/models/newsly/recipient.rb
 - app/models/newsly/template.rb
 - app/views/layouts/newsly/application.html.erb
 - app/views/layouts/newsly/mailer.html.erb
@@ -135,6 +136,7 @@ files:
 - db/migrate/20110927120903_add_text_body_fields.rb
 - db/migrate/20110929142039_remove_text_body_fields.rb
 - db/migrate/20111004085523_add_fields_to_newsletter.rb
+- db/migrate/20111006122345_create_newsly_recipients.rb
 - lib/newsly/engine.rb
 - lib/newsly/version.rb
 - lib/newsly.rb