smailer 0.6.2 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b0ad9b68b1053871829e187454142b621a48935f
+  data.tar.gz: 5179717f9a0447996510e2f1dff7081b8d601245
+SHA512:
+  metadata.gz: 8ec561c47706b8b7271a2b73b4428db6cf3156bca66e93846329a6a0ffa83185fec6f961d7016800cdc6bfdc446fd9f3af17d609c92f14956f61626b869ba3ae
+  data.tar.gz: 2abf5eb90fa6042aba5412fe4631568ed27a907d126a358b4ce76f18467dd812281ff70cbe54e99ac23201b62da1517be0d3d937a9f5e52a7d167f1e5eff5ce5

data/README.md

@@ -2,7 +2,7 @@
 
 ## Intro
 
-This project is a simple mailer for newsletters, which implements simple queue processing, basic campaign management, [VERP support](http://en.wikipedia.org/wiki/Variable_envelope_return_path), bounce processing and auto-unsubscribe of invalid emails and aslo assists you in implementing unsubscribe links in the email messages.
+This project is a simple mailer for newsletters, which implements simple queue processing, basic campaign management, [VERP support](http://en.wikipedia.org/wiki/Variable_envelope_return_path), bounce processing and auto-unsubscribe of invalid emails and also assists you in implementing unsubscribe links in the email messages.
 
 It is intended to be used within a Rails project. It has been tested with Rails 3.0.x, Rails 3.1.0 and Rails 2.3.5.
 

data/lib/generators/smailer/migration_generator.rb

@@ -3,11 +3,17 @@ require "rails/generators/active_record"
 module Smailer
   class MigrationGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    extend ActiveRecord::Generators::Migration
+    unless Smailer::Compatibility.rails_4?
+      extend ActiveRecord::Generators::Migration
+    end
 
     desc "Create a migration file with definitions of the tables needed to run Smailer."
     source_root File.expand_path('../templates', __FILE__)
 
+    def self.next_migration_number(path)
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    end
+
     def generate_migration
       file_name       = 'create_smailer_tables'
 

data/lib/smailer/compatibility.rb

@@ -4,8 +4,16 @@ module Smailer
       Rails::VERSION::MAJOR == 3
     end
 
+    def self.rails_4?
+      Rails::VERSION::MAJOR == 4
+    end
+
+    def self.rails_3_or_4?
+      self.rails_3? || self.rails_4?
+    end
+
     def self.save_without_validation(object)
-      rails_3? ? object.save(:validate => false) : object.save(false)
+      rails_3_or_4? ? object.save(:validate => false) : object.save(false)
     end
   end
 end

data/lib/smailer/models/mail_campaign.rb

@@ -15,7 +15,9 @@ module Smailer
       validates_numericality_of :mailing_list_id, :unsubscribe_methods, :only_integer => true, :allow_nil => true
       validates_length_of :from, :subject, :maximum => 255, :allow_nil => true
 
-      attr_accessible :mailing_list_id, :from, :subject, :body_html, :body_text
+      unless Smailer::Compatibility.rails_4?
+        attr_accessible :mailing_list_id, :from, :subject, :body_html, :body_text
+      end
 
       def add_unsubscribe_method(method)
         self.unsubscribe_methods = (self.unsubscribe_methods || 0) | method

data/lib/smailer/models/mail_key.rb

@@ -8,7 +8,9 @@ module Smailer
       validates_uniqueness_of :key
       validates_length_of :email, :key, :maximum => 255
 
-      attr_accessible :email, :key
+      unless Smailer::Compatibility.rails_4?
+        attr_accessible :email, :key
+      end
 
       before_validation :set_key
       before_save :set_key

data/lib/smailer/models/mailing_list.rb

@@ -7,7 +7,9 @@ module Smailer
       validates_uniqueness_of :name
       validates_length_of :name, :maximum => 255
 
-      attr_accessible :name
+      unless Smailer::Compatibility.rails_4?
+        attr_accessible :name
+      end
     end
   end
 end

data/lib/smailer/models/property.rb

@@ -1,12 +1,18 @@
 module Smailer
   module Models
     class Property < ActiveRecord::Base
-      set_table_name 'smailer_properties'
+      if Smailer::Compatibility.rails_3_or_4?
+        self.table_name = 'smailer_properties'
+      else
+        set_table_name 'smailer_properties'
+      end
 
       validates_presence_of :name
       validates_uniqueness_of :name
 
-      attr_accessible :name, :value, :notes
+      unless Smailer::Compatibility.rails_4?
+        attr_accessible :name, :value, :notes
+      end
 
       @@cache_created_at = Time.now
 

data/lib/smailer/models/queued_mail.rb

@@ -11,7 +11,9 @@ module Smailer
       validates_numericality_of :mail_campaign_id, :retries, :only_integer => true, :allow_nil => true
       validates_length_of :to, :last_error, :maximum => 255, :allow_nil => true
 
-      attr_accessible :mail_campaign_id, :to
+      unless Smailer::Compatibility.rails_4?
+        attr_accessible :mail_campaign_id, :to
+      end
 
       delegate :from, :subject, :mailing_list, :to => :mail_campaign, :allow_nil => true
 

data/lib/smailer/tasks/send.rb

@@ -11,7 +11,7 @@ module Smailer
           raise "VERP is enabled, but a :return_path_domain option has not been specified or is blank."
         end
 
-        rails_delivery_method = if Compatibility.rails_3?
+        rails_delivery_method = if Smailer::Compatibility.rails_3_or_4?
           method = Rails.configuration.action_mailer.delivery_method
           [method, Rails.configuration.action_mailer.send("#{method}_settings")]
         else
@@ -29,18 +29,29 @@ module Smailer
         results = []
 
         # clean up any old locked items
-        Smailer::Models::QueuedMail.update_all({:locked => false}, ['locked = ? AND locked_at <= ?', true, 1.hour.ago.utc])
+        expired_locks_condition = ['locked = ? AND locked_at <= ?', true, 1.hour.ago.utc]
+        if Smailer::Compatibility.rails_3_or_4?
+          Smailer::Models::QueuedMail.where(expired_locks_condition).update_all(:locked => false)
+        else
+          Smailer::Models::QueuedMail.update_all({:locked => false}, expired_locks_condition)
+        end
 
         # load the queue items to process
         queue_sort_order = 'retries ASC, id ASC'
-        items_to_process = if Compatibility.rails_3?
+        items_to_process = if Smailer::Compatibility.rails_3_or_4?
           Smailer::Models::QueuedMail.where(:locked => false).order(queue_sort_order).limit(batch_size)
         else
           Smailer::Models::QueuedMail.all(:conditions => {:locked => false}, :order => queue_sort_order, :limit => batch_size)
         end
 
         # lock the queue items
-        Smailer::Models::QueuedMail.update_all({:locked => true, :locked_at => Time.now.utc}, {:id => items_to_process.map(&:id)})
+        lock_condition = {:id => items_to_process.map(&:id)}
+        lock_update = {:locked => true, :locked_at => Time.now.utc}
+        if Smailer::Compatibility.rails_3_or_4?
+          Smailer::Models::QueuedMail.where(lock_condition).update_all(lock_update)
+        else
+          Smailer::Models::QueuedMail.update_all(lock_update, lock_condition)
+        end
 
         items_to_process.each do |queue_item|
           # try to send the email

data/lib/smailer/version.rb

@@ -1,7 +1,7 @@
 module Smailer
   MAJOR = 0
   MINOR = 6
-  PATCH = 2
+  PATCH = 3
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: smailer
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors:
 - Dimitar Dimitrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70159511397240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70159511397240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70159511396580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70159511396580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bounce_email
-  requirement: &70159511395800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70159511395800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: A simple mailer for newsletters with basic campaign management, queue
   and unsubscribe support. To be used within Rails.
 email:
@@ -52,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -80,27 +88,25 @@ files:
 - smailer.gemspec
 homepage: http://github.com/mitio/smailer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: smailer
-rubygems_version: 1.8.11
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple newsletter mailer for Rails.
 test_files: []
-has_rdoc: