smailer 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597184be6e340a90a5aec0c7d877ebaeae878071
-  data.tar.gz: be0274a57ca1f64b01398ca45b2bab0ae770aba5
+  metadata.gz: ebecfeedfc09ce5e112ec8d1b0ef54b2cf555987
+  data.tar.gz: eeca779d20eb280c7bd70c404bf9d8f7fbef33b7
 SHA512:
-  metadata.gz: 34a053d61e746507658a348e6f2f59a0d82a49b5e7ddae10648f5f9399f5a24fa7d9a3fc4c6e09db24beac000bcea155d8a9c62a70851d898377667c3711c779
-  data.tar.gz: 9747adc90ed4c575516df92f07aae7edc7a943b882d34e50d66c6cf1e0891720a252f1eeeb0cef4736501475b350936092126c12b063a086f5120f8330f8ae06
+  metadata.gz: 6e0b47c7ac4523f2f5a5c9e026eb75c4b077d1960311a9e1a3bdd893fa6f9b4544e6a44280b7a9b11389eb524f91adaf5c7460fcd5300f6b0772d86e9a742812
+  data.tar.gz: e839bd72c3e76adb2cf2d2464c925a27f1033a1c400d8f67b1aef345d1f1723b256960a17218a46800287a09505759dceed0e2f36969e38dd214b6c4f4957825

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Version v0.8.3
+
+- Fixes Rails 5 compatibility by properly detecting when not to use
+  `attr_accessible`.
+
+No special actions are required to upgrade from v0.8.1.
+
 ## Version v0.8.2
 
 - Fixes broken unsubscribe and tracking links (broken by improper unique

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smailer (0.8.1)
+    smailer (0.8.3)
       bounce_email (~> 0.2)
       mail (~> 2.3)
 
@@ -198,3 +198,6 @@ DEPENDENCIES
   smailer!
   spork
   sqlite3
+
+BUNDLED WITH
+   1.12.5

data/README.md

@@ -12,7 +12,7 @@ It has been tested with Rails 3.0.x, Rails 3.1.0 and Rails 2.3.5.
 
 Note: for Rails 3.0.x, you will probably need to use Smailer 0.5.x, because of a version incompatibility with the `mail` Gem.
 
-It should work with Rails 4 as well, but it hasn't been tested extensively there. Testing and PRs for Rails 4 compatibility are welcome. See [this issue](https://github.com/livebg/smailer/issues/16) for more info.
+It should work with Rails 4 and 5 as well, but it hasn't been tested extensively there. Testing and PRs for Rails 4 and 5 compatibility are welcome. See [this issue](https://github.com/livebg/smailer/issues/16) for more info.
 
 ## Install
 

data/generators/smailer/templates/migration.rb.erb

@@ -0,0 +1 @@
+../../../lib/generators/smailer/templates/migration.rb.erb

data/lib/smailer/compatibility.rb

@@ -2,6 +2,10 @@ module Smailer
   module Compatibility
     extend self
 
+    def rails_2?
+      Rails::VERSION::MAJOR == 2
+    end
+
     def rails_3?
       Rails::VERSION::MAJOR == 3
     end
@@ -14,6 +18,10 @@ module Smailer
       rails_3? || rails_4?
     end
 
+    def has_attr_accessible?
+      rails_2? || rails_3?
+    end
+
     def save_without_validation(object)
       rails_3_or_4? ? object.save(:validate => false) : object.save(false)
     end

data/lib/smailer/models/mail_campaign.rb

@@ -20,7 +20,7 @@ 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
 
-      unless Smailer::Compatibility.rails_4?
+      if Smailer::Compatibility.has_attr_accessible?
         attr_accessible :mailing_list_id, :from, :reply_to, :subject, :body_html, :body_text
       end
 

data/lib/smailer/models/mail_key.rb

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

data/lib/smailer/models/mailing_list.rb

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

data/lib/smailer/models/property.rb

@@ -10,7 +10,7 @@ module Smailer
       validates_presence_of :name
       validates_uniqueness_of :name
 
-      unless Smailer::Compatibility.rails_4?
+      if Smailer::Compatibility.has_attr_accessible?
         attr_accessible :name, :value, :notes
       end
 

data/lib/smailer/models/queued_mail.rb

@@ -15,7 +15,7 @@ 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
 
-      unless Smailer::Compatibility.rails_4?
+      if Smailer::Compatibility.has_attr_accessible?
         attr_accessible :mail_campaign, :mail_campaign_id, :to, :from, :reply_to, :subject, :body_html, :body_text, :require_uniqueness
       end
 

data/lib/smailer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smailer
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Dimitar Dimitrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: smailer
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A simple newsletter mailer for Rails.

data/generators/smailer/templates/migration.rb.erb

@@ -1,117 +0,0 @@
-class CreateSmailerTables < ActiveRecord::Migration
-  def self.up
-    create_table "finished_mails", :force => :cascade do |t|
-      t.integer  "mail_campaign_id"
-      t.string   "from"
-      t.string   "to"
-      t.string   "subject"
-      t.text     "body_html"
-      t.integer  "retries"
-      t.datetime "last_retry_at"
-      t.string   "last_error"
-      t.datetime "sent_at"
-      t.integer  "status"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.text     "body_text"
-      t.boolean  "opened",           :default => false, :null => false
-      t.string   "key"
-    end
-
-    add_index "finished_mails", ["key"], :name => "index_finished_mails_on_key", :unique => true
-    add_index "finished_mails", ["mail_campaign_id", "status"], :name => "index_finished_mails_on_mail_campain_id_and_status"
-    add_index "finished_mails", ["to", "mail_campaign_id"], :name => "index_finished_mails_on_to_and_mail_campaign_id"
-
-    create_table "mail_attachments", :force => :cascade do |t|
-      t.string   "filename",                      :null => false
-      t.string   "path",             :limit => 2048
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer  "mail_template_id"
-    end
-
-    add_index "mail_attachments", ["mail_template_id"], :name => "index_mail_attachments_on_mail_template_id"
-
-    create_table "mail_campaigns", :force => :cascade do |t|
-      t.integer  "mailing_list_id"
-      t.integer  "unsubscribe_methods"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer  "sent_mails_count",    :default => 0, :null => false
-      t.integer  "opened_mails_count",  :default => 0, :null => false
-    end
-
-    add_index "mail_campaigns", ["mailing_list_id"], :name => "index_mail_campaigns_on_mailing_list_id"
-
-    create_table "mail_keys", :force => :cascade do |t|
-      t.string   "email"
-      t.string   "key"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    add_index "mail_keys", ["email"], :name => "index_mail_keys_on_email", :unique => true
-    add_index "mail_keys", ["key"], :name => "index_mail_keys_on_key", :unique => true
-
-    create_table "mail_templates", :force => :cascade do |t|
-      t.integer  "mail_campaign_id"
-      t.integer  "queued_mail_id"
-      t.string   "from"
-      t.string   "subject"
-      t.text     "body_html"
-      t.text     "body_text"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "reply_to"
-    end
-
-    add_index "mail_templates", ["mail_campaign_id"], :name => "index_mail_templates_on_mail_campaign_id"
-    add_index "mail_templates", ["queued_mail_id"], :name => "index_mail_templates_on_queued_mail_id"
-
-    create_table "mailing_lists", :force => :cascade do |t|
-      t.string   "name"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    create_table "queued_mails", :force => :cascade do |t|
-      t.integer  "mail_campaign_id"
-      t.string   "to"
-      t.integer  "retries",            :default => 0,     :null => false
-      t.datetime "last_retry_at"
-      t.string   "last_error"
-      t.boolean  "locked",             :default => false, :null => false
-      t.datetime "locked_at"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "key"
-      t.boolean  "require_uniqueness", :default => true
-    end
-
-    add_index "queued_mails", ["locked", "locked_at"], :name => "index_queued_mails_on_locked_and_locked_at"
-    add_index "queued_mails", ["locked", "retries", "id"], :name => "index_queued_mails_on_locked_retries_and_id"
-    add_index "queued_mails", ["mail_campaign_id", "to", "require_uniqueness"], :name => "index_queued_mails_uniqueness_for_to", :unique => true
-    add_index "queued_mails", ["retries", "locked"], :name => "index_queued_mails_on_retries_and_locked"
-
-    create_table "smailer_properties", :force => :cascade do |t|
-      t.string   "name"
-      t.text     "value"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "notes"
-    end
-
-    add_index "smailer_properties", ["name"], :name => "index_smailer_properties_on_name", :unique => true
-  end
-
-  def self.down
-    drop_table :smailer_properties
-    drop_table :mail_keys
-    drop_table :finished_mails
-    drop_table :queued_mails
-    drop_table :mail_attachments
-    drop_table :mail_campaigns
-    drop_table :mail_templates
-    drop_table :mailing_lists
-  end
-end