devise_mailjet 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e54b0e5430f9fd1e5c9fedc92190caffbe4adfb
-  data.tar.gz: f3964d2f000ff3bcad2f68da8676b02608a1137f
+  metadata.gz: 492f65b3aeb563982e0e48a9cb77e57ecc0aaf4e
+  data.tar.gz: 1ba5a15c05396b6ce73247577c0137460ea26743
 SHA512:
-  metadata.gz: cd182ae9e33c74538caba2d7cc94594b95d2efdbf456720cf2385c746314275e9bae02bf7f71a7f009beaad98683283254b44ec726a7c8b3fffbdb52444b12cb
-  data.tar.gz: eb1f2aecffd249046e3704765a90ac5cf635e4bb92508e0ff81c26012cd18d037dd2aaa19a36573852be3d5fcbdeef74be0ed768bf6468658d58bcec6ef926c7
+  metadata.gz: 4a0ee5f2e82ad2b1d0af00eae4be25bfabc685e38ff5bfc6c6f9fa05c05549615142735d82715e2c7d5084026b2ecb2eb77bfe52f3c480de0d325706a2e95ece
+  data.tar.gz: e089c81e6f926f559475957326f7f3a100479d25da915de6d21f01f7dd52d58fafd0be60322c2f79494c8d08ef8df472dd9cfe964851935148d1c1d9b2766a61

data/README.rdoc

@@ -16,13 +16,12 @@ In your Gemfile, add devise_mailjet after devise:
 In your User model, add :mailjet to the devise call and make :join_mailing_list accessible:
 
   devise :database_authenticatable, ..., :mailjet
-  attr_accessible :join_mailing_list
+  attr_accessor :join_mailing_list
 
 In your devise initializer (config/initializers/devise.rb), set your API key and mailing list name:
 
   Devise.mailjet_api_key = 'your_api_key'
   Devise.mailing_list_name = 'List Name'
-  Devise.double_opt_in = false  
   Devise.send_welcome_email = false  
 
 If you are using the default Devise registration views, the Join Mailing List checkbox is added automatically, if not,
@@ -100,4 +99,4 @@ View our {contributors}[https://github.com/zedalaye/devise_mailjet/contributors]
 
 == Copyright
 
-Copyright (c) 2011 {Justin Cunningham}[http://littlebitofcode.com] and 2014 {Pierre Yager}[http://levosgien.net]. See MIT_LICENSE for details.
+Copyright (c) 2011 {Justin Cunningham}[http://littlebitofcode.com] and 2014 {Pierre Yager}[http://levosgien.net]. See MIT_LICENSE for details.

data/devise_mailjet.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   {
-    'rails'  => '~> 4.1',
-    'devise' => '~> 3.3',
-    'devise-bootstrap-views' => '~> 0.0',
-    'mailjet' => '~> 1.0'
+    'rails'  => '< 5.2',
+    'devise' => '< 5.0',
+    'devise-bootstrap-views' => '< 1.0',
+    'mailjet' => '< 2.0'
   }.each do |lib, version|
     s.add_runtime_dependency(lib, *version)
   end

data/lib/devise_mailjet.rb

@@ -31,3 +31,7 @@ end
 Devise.add_module :mailjet, :model => 'devise_mailjet/model'
 
 require 'devise_mailjet/mailjet_list_api_mapper'
+
+if defined?(Sidekiq::Worker)
+  require 'devise_mailjet/mailjet_worker'
+end

data/lib/devise_mailjet/mailjet_list_api_mapper.rb

@@ -4,28 +4,24 @@ module Devise
   module Models
     module Mailjet
       class MailjetListApiMapper
-        LISTS_CACHE_KEY = "devise_mailjet/lists"
-        CONTACTS_CACHE_KEY = "devise_mailjet/contacts"
-
-        # looks the name up in the cache.  if it doesn't find it, looks it up using the api and saves it to the cache
+        # find the list using the mailjet API and save it to a memory cache
         def list_name_to_id(list_name)
-          load_cached_lists
+          @lists ||= {}
           unless @lists.has_key?(list_name)
-            list = mailjet_list.first(name: list_name)
-            list = mailjet_list.create(name: list_name) if list.nil?
-            @lists[list_name] = list.id
-            save_cached_lists
+            l = ::Mailjet::Contactslist.all(name: list_name, limit: 1).first
+            l = ::Mailjet::Contactslist.create(name: list_name) unless l && l.name == list_name
+            @lists[list_name] = l.id
           end
           @lists[list_name]
         end
 
+        # find the contact using the mailjet API and save it to a memory cache
         def contact_email_to_id(email)
-          load_cached_contacts
+          @contacts ||= {}
           unless @contacts.has_key?(email)
-            contact = mailjet_contact.find(email) # email is a valid key for finding contact resources
-            contact = mailjet_contact.create(email: email) if contact.nil?
-            @contacts[email] = contact.id
-            save_cached_contacts
+            c = ::Mailjet::Contact.find(email) # email is a valid key for finding contact resources
+            c = ::Mailjet::Contact.create(email: email) unless c && c.email == email
+            @contacts[email] = c.id
           end
           @contacts[email]
         end
@@ -37,25 +33,23 @@ module Devise
         def subscribe_to_lists(list_names, email)
           walk_recipients(list_names, email) do |lr, list_id, contact_id|
             if lr.nil?
-              mailjet_rcpt.create('ListID' => list_id, 'ContactID' => contact_id, is_active: true)
+              ::Mailjet::Listrecipient.create('ListID' => list_id, 'ContactID' => contact_id, is_active: true)
             elsif lr.is_unsubscribed
-              lr.is_unsubscribed = false
-              lr.is_active = true
-              lr.save
+              lr.update_attributes(is_unsubscribed: false, is_active: true)
             end
           end
+        rescue ::Mailjet::ApiError
+          # ignore
         end
 
         # unsubscribe the user from the named mailing list(s).  list_names can be the name of one list, or an array of
         # several.
         def unsubscribe_from_lists(list_names, email)
           walk_recipients(list_names, email) do |lr, _, _|
-            if lr && !lr.is_unsubscribed
-              lr.is_unsubscribed = true
-              lr.is_active = false
-              lr.save
-            end
+            lr.update_attributes(is_unsubscribed: true, is_active: false) if lr && !lr.is_unsubscribed
           end
+        rescue ::Mailjet::ApiError
+          # ignore
         end
 
         class ListLookupError < RuntimeError; end
@@ -67,47 +61,10 @@ module Devise
           list_names = [list_names] unless list_names.is_a?(Array)
           list_names.each do |list_name|
             list_id = list_name_to_id(list_name)
-            lr = mailjet_rcpt.first('ContactsList' => list_id, 'Contact' =>  contact_id)
+            lr = ::Mailjet::Listrecipient.all('ContactsList' => list_id, 'Contact' =>  contact_id, limit: 1).first
             yield lr, list_id, contact_id if block_given?
           end
         end
-
-        # load the list from the cache
-        def load_cached_lists
-          @lists ||= Rails.cache.fetch(LISTS_CACHE_KEY) do
-            {}
-          end.dup
-        end
-
-        # save the modified list back to the cache
-        def save_cached_lists
-          Rails.cache.write(LISTS_CACHE_KEY, @lists)
-        end
-
-        # load contacts from the cache
-        def load_cached_contacts
-          @contacts ||= Rails.cache.fetch(CONTACTS_CACHE_KEY) do
-            {}
-          end.dup
-        end
-
-        # save the modified contacts back to the cache
-        def save_cached_contacts
-          Rails.cache.write(CONTACTS_CACHE_KEY, @contacts)
-        end
-
-        # the mailjet api helpers
-        def mailjet_contact
-          ::Mailjet::Contact
-        end
-
-        def mailjet_list
-          ::Mailjet::Contactslist
-        end
-
-        def mailjet_rcpt
-          ::Mailjet::Listrecipient
-        end
       end
     end
   end

data/lib/devise_mailjet/mailjet_worker.rb

@@ -0,0 +1,26 @@
+module Devise
+  module Models
+    module Mailjet
+      class MailjetWorker
+        include Sidekiq::Worker
+
+        def perform(action, list_names, email, config)
+          if config.is_a?(Hash)
+            ::Mailjet.configure do |c|
+              c.api_key      = config['api_key']
+              c.secret_key   = config['secret_key']
+              c.default_from = config['default_from']
+            end
+          end
+
+          mapper = MailjetListApiMapper.new
+          if action == 'subscribe'
+            mapper.subscribe_to_lists(list_names, email)
+          elsif action == 'unsubscribe'
+            mapper.unsubscribe_from_lists(list_names, email)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/devise_mailjet/model.rb

@@ -54,31 +54,53 @@ module Devise
 
       # Add the user to the mailjet list with the specified name
       def add_to_mailjet_list(list_name)
-        mapper = mailjet_list_mapper.respond_to?(:delay) ? mailjet_list_mapper.delay : mailjet_list_mapper
-        # options = self.respond_to?(:mailjet_list_subscribe_options) ? mailjet_list_subscribe_options : {}
-        mapper.subscribe_to_lists(list_name, self.email)
+        if defined?(Sidekiq::Worker)
+          MailjetWorker.perform_async(:subscribe, list_name, self.email, mailjet_config)
+        else
+          mapper = mailjet_list_mapper.respond_to?(:delay) ? mailjet_list_mapper.delay : mailjet_list_mapper
+          # options = self.respond_to?(:mailjet_list_subscribe_options) ? mailjet_list_subscribe_options : {}
+          mapper.subscribe_to_lists(list_name, self.email)
+        end
       end
 
       # remove the user from the mailjet list with the specified name
       def remove_from_mailjet_list(list_name)
-        mapper = mailjet_list_mapper.respond_to?(:delay) ? mailjet_list_mapper.delay : mailjet_list_mapper
-        mapper.unsubscribe_from_lists(list_name, self.email)
+        if defined?(Sidekiq::Worker)
+          MailjetWorker.perform_async(:unsubscribe, list_name, self.email, mailjet_config)
+        else
+          mapper = mailjet_list_mapper.respond_to?(:delay) ? mailjet_list_mapper.delay : mailjet_list_mapper
+          mapper.unsubscribe_from_lists(list_name, self.email)
+        end
       end
 
       # Commit the user to the mailing list if they have selected to join
       def commit_mailing_list_join
-        add_to_mailjet_list(mailjet_lists_to_join) if self.join_mailing_list
+        if self.join_mailing_list
+          add_to_mailjet_list(mailjet_lists_to_join)
+        else
+          remove_from_mailjet_list(mailjet_lists_to_join)
+        end
       end
 
       # mapper that helps convert list names to mailjet ids
       def mailjet_list_mapper
-        @@mailjet_list_mapper ||= MailjetListApiMapper.new
+        @@mailjet_list_api_mapper ||= MailjetListApiMapper.new
       end
 
       module ClassMethods
         Devise::Models.config(self, :mailing_list_name)
         Devise::Models.config(self, :mailing_list_opt_in_by_default)
       end
+
+      private
+
+      def mailjet_config
+        {
+            'api_key'      => ::Mailjet.config.api_key,
+            'secret_key'   => ::Mailjet.config.secret_key,
+            'default_from' => ::Mailjet.config.default_from
+        }
+      end
     end
   end
 end

data/lib/devise_mailjet/version.rb

@@ -1,3 +1,3 @@
 module DeviseMailjet
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_mailjet
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Justin Cunningham
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: devise-bootstrap-views
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mailjet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: Devise MailJet adds a MailJet option to devise that easily enables users
   to join your mailing list when they create an account.
 email:
@@ -86,6 +86,7 @@ files:
 - devise_mailjet.gemspec
 - lib/devise_mailjet.rb
 - lib/devise_mailjet/mailjet_list_api_mapper.rb
+- lib/devise_mailjet/mailjet_worker.rb
 - lib/devise_mailjet/model.rb
 - lib/devise_mailjet/version.rb
 homepage: http://zedalaye.github.com/devise_mailjet/
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: devise_mailjet
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Easy MailJet integration for Devise