mail_manager 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629cb0adeedd16a50516d77a801d98a355d3c4f1
-  data.tar.gz: 1257352173175de86d30db19ddfbe1890b342ebb
+  metadata.gz: 8b444aa191cc3f0026ee9f5934f8ff6d64e7a2a5
+  data.tar.gz: d8f188339a7d1e3799348b560348c182cbdd9d9b
 SHA512:
-  metadata.gz: bcb81576b3fd8311480e663386bb4537f51fe56d66eb574c1867fe1972aab6dff8d5e00ffbc51537dcb5c2ca4ba94f15fda0b65dcc51effa3715afedb0af9f6f
-  data.tar.gz: c9f26c7e02ead7da06cbac09e31785ed14d4457c52d41768d049e410d523b5c3d437ced9e33a60b40021b0e9aa518a7e6bf42d39ef46bac915b7c41a1dbcfd4c
+  metadata.gz: bab64c443443b55a2e3b0158c46a4971b37c6b45926ea91acd8e90c8b807d6e43c145c01e908e47c3c3f2bc394c62c2bad7f7ea8cd91f9a492b0de852d4ec220
+  data.tar.gz: 7ad7d02707c79454a10c0b2d9b18c8f5d507576f773df76e689589019797c4d3ed16406dd4e053e8012c13293796f0ed66c9277644f017ccc1dddd89861ed923

data/README.md

@@ -3,6 +3,8 @@ Mail Manager
 
 The goal of this project will be to create a plugin for use in any site which will provide an interface to manage mailing lists, scheduling of email mailings, subscribe/unsubscribe from lists by contacts, and view reports of bounces and possible track views of emails. Currently, only one list is supported for subscribe/unsubscribe by contact. An interface is available to provide mailable objects from other plugins.
 
+See the latest docs at the [Homepage](http://ireachnews.com) or the [Wiki](https://github.com/LoneStarInternet/mail_manager/wiki)
+
 Requirements
 ------------
 * Rails 3.2.x (currently tested with rails 3.2.21)

data/app/models/mail_manager/mailing.rb

@@ -53,7 +53,7 @@ module MailManager
     def deliver
       Rails.logger.info "Starting to Process Mailing '#{subject}' ID:#{id}"
       Lock.with_lock("mail_mgr_mailing_send[#{id}]") do |lock|
-        unless status.to_s.eql?('scheduled')
+        unless can_run?
           raise Exception.new("Mailing was not scheduled when job tried to run!")
         end
         unless scheduled_at <= Time.now
@@ -210,6 +210,10 @@ module MailManager
     def can_cancel?
        ['pending','scheduled','processing'].include?(status.to_s)
     end
+
+    def can_run?
+       ['scheduled','processing'].include?(status.to_s)
+    end
   
     def can_schedule?
       ['pending'].include?(status.to_s) && scheduled_at.present?
@@ -230,7 +234,7 @@ module MailManager
     end
   
     def mailing_jobs
-      Delayed::Job.where("handler like ?","%MailManager::Mailing%#{subject}%")
+      Delayed::Job.where("handler like ?","%MailManager::Mailing% id: #{self.id}\n%")
     end
 
     def cancel

data/app/views/mail_manager/mailings/index.html.erb

@@ -20,11 +20,12 @@
       <% if mailing.can_edit? %>
 			<%= link_to 'Edit', mail_manager.edit_mailing_path(mailing), :class => 'button' %>
 			<% if mailing.can_schedule? %>
-			<%= link_to 'Schedule', mail_manager.schedule_mailing_path(mailing), :method => :put, :class => 'button', :confirm => "Are you sure you want to start the mailing at #{l(mailing.scheduled_at) rescue "N/A"}?" %>
-			<% elsif mailing.can_cancel? %>
-			<%= link_to 'Cancel', mail_manager.cancel_mailing_path(mailing), :method => :put, :class => 'button', :id => "cancel_mailing_#{mailing.id}" %>
-          <% end %>
+			<%= link_to 'Schedule', mail_manager.schedule_mailing_path(mailing), :method => :put, :class => 'button', :id => "schedule_mailing_#{mailing.id}", :confirm => "Are you sure you want to start the mailing at #{l(mailing.scheduled_at) rescue "N/A"}?" %>
 			<% end %>
+      <% end %>
+			<% if mailing.can_cancel? %>
+			<%= link_to 'Cancel', mail_manager.cancel_mailing_path(mailing), :method => :put, :class => 'button', :id => "cancel_mailing_#{mailing.id}" %>
+      <% end %>
       <% if mailing.messages.size > 0 %>
 			<%= link_to 'Messages', mail_manager.mailing_messages_path(mailing), :class => 'button' %>
       <% end %>

data/lib/mail_manager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/lib/tasks/mail_manager.rake

@@ -13,6 +13,10 @@ def get_config(env,filename='config/mail_manager.yml')
 end
 
 namespace :mail_manager do
+  desc "Upgrade tasks" do
+    Rake::Task['mail_manager:import_migrations'].invoke
+    Rake::Task['db:migrate'].invoke
+  end
   desc "Add mlm defaults to config/mail_manager.yml"
   task :default_app_config, :table_prefix do |t,args|
     Rails.logger.warn "Adding defaults to config/mail_manager.yml"

data/mail_manager.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |gem|
   gem.name          = "mail_manager"
   gem.version       = MailManager::VERSION
   gem.authors       = ["Lone Star Internet"]
-  gem.email         = ["biz@lone-star.net"]
+  gem.email         = ["biz@lone-star.net", 'chauboldt@lone-star.net']
   gem.licenses      = ["MIT"]
   gem.description   = %q{Manages the delivery of mailable items. Handles bounces, unsubscribe, opt-in, etc.}
   gem.summary       = %q{Mailing list management tool}
-  gem.homepage      = "http://ireach.com"
+  gem.homepage      = "http://ireachnews.com"
 
   gem.add_dependency "rails", "~>3.2"
   gem.add_dependency 'jquery-rails', "~>3.1"

data/spec/test_app/db/structure.sql

@@ -13,7 +13,7 @@ CREATE TABLE `delayed_jobs` (
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),
   KEY `delayed_jobs_priority` (`priority`,`run_at`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 
 CREATE TABLE `mail_manager_bounces` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -43,7 +43,7 @@ CREATE TABLE `mail_manager_contacts` (
   `login_token` varchar(255) DEFAULT NULL,
   `login_token_created_at` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `mail_manager_mailables` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -91,7 +91,7 @@ CREATE TABLE `mail_manager_mailings` (
   `messages_count` int(11) DEFAULT '0',
   `deleted_at` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
 
 CREATE TABLE `mail_manager_messages` (
   `id` int(11) NOT NULL AUTO_INCREMENT,

data/spec/test_app/spec/features/mail_manager/mailing_spec.rb

@@ -27,7 +27,7 @@ RSpec.feature MailManager::Mailing, type: :feature do
       click_link "Schedule"
       expect(page).to have_content "Mailing scheduled"
       @mailing = MailManager::Mailing.find(@mailing)
-      expect(@mailing.status).to eq "scheduled"
+       expect(@mailing.status).to eq "scheduled"
       expect(Delayed::Job.count).to eq 1
       and_it "can then be cancelled and its job removed" do
         mailing2 = FactoryGirl.create(:mailing)

data/spec/test_app/spec/models/mail_manager/mailing_spec.rb

@@ -10,6 +10,16 @@ RSpec.describe MailManager::Mailing do
     Delayed::Worker.delay_jobs = false
     ActionMailer::Base.deliveries.clear
   end
+  it "allows a processing mailing to run(for resetting a failed job)" do
+    mailing = MailManager::Mailing.create(valid_attributes)
+    mailing.change_status(:processing)
+    expect(mailing.can_run?).to be true
+  end
+  it "allows a processing mailing to run(for resetting a failed job)" do
+    mailing = MailManager::Mailing.create(valid_attributes)
+    mailing.change_status(:processing)
+    expect(mailing.can_run?).to be true
+  end
   it "sets its initial status properly" do
     attributes = valid_attributes
     attributes.delete('status')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_manager
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Lone Star Internet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,6 +196,7 @@ description: Manages the delivery of mailable items. Handles bounces, unsubscrib
   opt-in, etc.
 email:
 - biz@lone-star.net
+- chauboldt@lone-star.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -484,7 +485,7 @@ files:
 - spec/test_app/spec/views/users/index.html.erb_spec.rb
 - spec/test_app/spec/views/users/new.html.erb_spec.rb
 - spec/test_app/spec/views/users/show.html.erb_spec.rb
-homepage: http://ireach.com
+homepage: http://ireachnews.com
 licenses:
 - MIT
 metadata: {}