mailkick 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76321359a2413e9e97430e88ffa1bdea99830e5e
-  data.tar.gz: 670f814ee9ed48dd9b538f9ed23be64616ab65ee
+  metadata.gz: 71a67112599c83fefbdd086151fcf834a24c217f
+  data.tar.gz: 609f546b4a4f6a3dc7a5878cb2e0bd2d344e1a97
 SHA512:
-  metadata.gz: b73507e59e778e21879cea81b8f8a566baf4f890ca96faadae085d291996ee61ca893d3edea51cea24ed85e0258cafaac5b59769d85dcb87895b39ca4082c055
-  data.tar.gz: fa53579ac51115bc51fd925bb293828756c732a60a30f8fca44ce6f2d6e1bc187a9529e4be17b6869dcfedc6d3ccdabb465f1b787b3d360c754dc9b0f5a00d6b
+  metadata.gz: 8d0392c53613b8580030f0b57c9b953cf4863d746200d92a2662abb16fd677017426cc4809ac122244b2d0facc92deb1ee021e191c1181f629179791404155b9
+  data.tar.gz: 99df02fda98d46cbf4cb1ed07c52f73f62f0f54e87e59e23146cc1250efb40c7e13138b810644c6d13735fde036c506063ec7dc80834cb6b6f863df989e1c600

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.1
+
+- Fixed errors with Rails 5+
+- Fixed errors with the latest version of Gibbon
+
 ## 0.2.0
 
 - Added support for Rails 5.1

data/README.md

@@ -109,7 +109,7 @@ Be sure `ENV["MANDRILL_APIKEY"]` is set.
 #### Mailchimp
 
 ```ruby
-gem 'gibbon'
+gem 'gibbon', '>= 2'
 ```
 
 Be sure `ENV["MAILCHIMP_API_KEY"]` and `ENV["MAILCHIMP_LIST_ID"]` are set.

data/app/models/mailkick/opt_out.rb

@@ -2,6 +2,6 @@ module Mailkick
   class OptOut < ActiveRecord::Base
     self.table_name = "mailkick_opt_outs"
 
-    belongs_to :user, polymorphic: true
+    belongs_to :user, ActiveRecord::VERSION::MAJOR >= 5 ? {polymorphic: true, optional: true} : {polymorphic: true}
   end
 end

data/lib/mailkick/service/mailchimp.rb

@@ -4,7 +4,7 @@ module Mailkick
   class Service
     class Mailchimp < Mailkick::Service
       def initialize(options = {})
-        @gibbon = ::Gibbon::API.new(options[:api_key] || ENV["MAILCHIMP_API_KEY"])
+        @gibbon = ::Gibbon::Request.new(api_key: options[:api_key] || ENV["MAILCHIMP_API_KEY"])
         @list_id = options[:list_id] || ENV["MAILCHIMP_LIST_ID"]
       end
 
@@ -14,11 +14,11 @@ module Mailkick
       end
 
       def unsubscribes
-        fetch(@gibbon.lists.members(id: @list_id, status: "unsubscribed"), "unsubscribe")
+        fetch(@gibbon.lists(@list_id).members.retrieve(params: {status: "unsubscribed"}).body["members"], "unsubscribe")
       end
 
       def spam_reports
-        fetch(@gibbon.lists.abuse_reports(id: @list_id), "spam")
+        fetch(@gibbon.lists(@list_id).abuse_reports.retrieve.body["abuse_reports"], "spam")
       end
 
       def self.discoverable?
@@ -28,9 +28,9 @@ module Mailkick
       protected
 
       def fetch(response, reason)
-        response["data"].map do |record|
+        response.map do |record|
           {
-            email: record["email"],
+            email: record["email_address"],
             time: ActiveSupport::TimeZone["UTC"].parse(record["timestamp_opt"] || record["date"]),
             reason: reason
           }

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/mailkick.gemspec

@@ -24,4 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "sendgrid_toolkit"
+  spec.add_development_dependency "mandrill-api"
+  spec.add_development_dependency "gibbon", ">= 2"
+  spec.add_development_dependency "mailgun-ruby"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sendgrid_toolkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mandrill-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gibbon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: mailgun-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Email subscriptions made easy
 email:
 - andrew@chartkick.com
@@ -135,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Email subscriptions made easy