vero 0.7.0 → 0.10.0

data/lib/generators/vero_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class VeroGenerator < Rails::Generators::Base
   class_option :heroku
   class_option :api_key
@@ -6,30 +8,27 @@ class VeroGenerator < Rails::Generators::Base
   def create_initializer_file
     type = options[:heroku] || 'standard'
 
-    if options[:heroku].blank? && (options[:api_key].blank? || options[:api_secret].blank?)
-      abort("You must provide an API KEY and API SECRET to proceed.")
-    end
-    create_file "config/initializers/vero.rb", self.send("#{type}_initializer_content".to_sym)
+    abort('You must provide an API KEY and API SECRET to proceed.') if options[:heroku].blank? && (options[:api_key].blank? || options[:api_secret].blank?)
+    create_file 'config/initializers/vero.rb', send("#{type}_initializer_content".to_sym)
   end
 
   private
+
   def standard_initializer_content
-    text = <<-END_TEXT
-Vero::App.init do |config|
-  config.api_key  = '#{options[:api_key]}'
-  config.secret   = '#{options[:api_secret]}'
-end
-END_TEXT
-    text
+    <<~END_TEXT
+      Vero::App.init do |config|
+        config.api_key  = '#{options[:api_key]}'
+        config.secret   = '#{options[:api_secret]}'
+      end
+    END_TEXT
   end
 
   def heroku_initializer_content
-    text = <<-END_TEXT
-Vero::App.init do |config|
-  config.api_key  = ENV['VERO_API_KEY']
-  config.secret   = ENV['VERO_API_SECRET']
-end
-END_TEXT
-    text
+    <<~END_TEXT
+      Vero::App.init do |config|
+        config.api_key  = ENV['VERO_API_KEY']
+        config.secret   = ENV['VERO_API_SECRET']
+      end
+    END_TEXT
   end
-end
+end

data/lib/vero.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rest-client'
 require 'vero/utility/ext'
 
@@ -9,11 +11,13 @@ module Vero
   autoload :Trackable,            'vero/trackable'
   autoload :DSL,                  'vero/dsl'
   autoload :Sender,               'vero/sender'
+  autoload :SuckerPunchWorker,    'vero/senders/sucker_punch'
   autoload :ResqueWorker,         'vero/senders/resque'
+  autoload :SidekiqWorker,        'vero/senders/sidekiq'
 
   module Api
     module Workers
-      autoload :BaseAPI,          'vero/api/base_api'
+      autoload :BaseAPI, 'vero/api/base_api'
 
       module Events
         autoload :TrackAPI,       'vero/api/events/track_api'
@@ -24,7 +28,9 @@ module Vero
         autoload :EditAPI,        'vero/api/users/edit_api'
         autoload :EditTagsAPI,    'vero/api/users/edit_tags_api'
         autoload :UnsubscribeAPI, 'vero/api/users/unsubscribe_api'
+        autoload :ResubscribeAPI, 'vero/api/users/resubscribe_api'
         autoload :ReidentifyAPI,  'vero/api/users/reidentify_api'
+        autoload :DeleteAPI,      'vero/api/users/delete_api'
       end
     end
 
@@ -36,12 +42,13 @@ module Vero
     autoload :Base,               'vero/senders/base'
     autoload :DelayedJob,         'vero/senders/delayed_job'
     autoload :Resque,             'vero/senders/resque'
+    autoload :Sidekiq,            'vero/senders/sidekiq'
     autoload :Invalid,            'vero/senders/invalid'
-    autoload :Thread,             'vero/senders/thread'
+    autoload :SuckerPunch, 'vero/senders/sucker_punch'
   end
 
   module Utility
-    autoload :Logger,             'vero/utility/logger'
+    autoload :Logger, 'vero/utility/logger'
   end
 end
 

data/lib/vero/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     class Base
@@ -8,23 +10,21 @@ module Vero
       end
 
       def config
-        self.context.config
+        context.config
       end
 
       def run_api(api_klass, options)
+        return if config.disabled
+
         validate_configured!
         options.merge!(config.request_params)
-
-        unless config.disabled
-          Vero::Sender.send(api_klass, config.async, config.domain, options)
-        end
+        Vero::Sender.send(api_klass, config.async, config.domain, options)
       end
 
       protected
+
       def validate_configured!
-        unless config.configured?
-          raise "You must configure the 'vero' gem. Visit https://github.com/semblancesystems/vero for more details."
-        end
+        raise "You must configure the 'vero' gem. Visit https://github.com/getvero/vero for more details." unless config.configured?
       end
     end
 
@@ -59,6 +59,14 @@ module Vero
         new(context).unsubscribe!(options)
       end
 
+      def self.resubscribe!(options, context = Vero::App.default_context)
+        new(context).resubscribe!(options)
+      end
+
+      def self.delete!(options, context = Vero::App.default_context)
+        new(context).delete!(options)
+      end
+
       def track!(options)
         run_api(Vero::Api::Workers::Users::TrackAPI, options)
       end
@@ -75,9 +83,17 @@ module Vero
         run_api(Vero::Api::Workers::Users::UnsubscribeAPI, options)
       end
 
+      def resubscribe!(options)
+        run_api(Vero::Api::Workers::Users::ResubscribeAPI, options)
+      end
+
       def reidentify!(options)
         run_api(Vero::Api::Workers::Users::ReidentifyAPI, options)
       end
+
+      def delete!(options)
+        run_api(Vero::Api::Workers::Users::DeleteAPI, options)
+      end
     end
   end
 end

data/lib/vero/api/base_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'rest-client'
 
@@ -5,16 +7,17 @@ module Vero
   module Api
     module Workers
       class BaseAPI
-        attr_accessor :domain, :options
+        attr_accessor :domain
+        attr_reader :options
 
         def self.perform(domain, options)
-          caller = self.new(domain, options)
+          caller = new(domain, options)
           caller.perform
         end
 
         def initialize(domain, options)
           @domain = domain
-          @options = options
+          self.options = options
           setup_logging
         end
 
@@ -28,6 +31,7 @@ module Vero
         end
 
         protected
+
         def setup_logging
           return unless Vero::App.logger
 
@@ -38,18 +42,16 @@ module Vero
           end
         end
 
-        def url
-        end
+        def url; end
 
         def validate!
           raise "#{self.class.name}#validate! should be overridden"
         end
 
-        def request
-        end
+        def request; end
 
         def request_content_type
-          {:content_type => :json, :accept => :json}
+          { content_type: :json, accept: :json }
         end
 
         def request_params_as_json
@@ -57,12 +59,11 @@ module Vero
         end
 
         def options_with_symbolized_keys(val)
-          val.inject({}) do |h,(k,v)|
+          val.each_with_object({}) do |(k, v), h|
             h[k.to_sym] = v
-            h
           end
         end
       end
     end
   end
-end
+end

data/lib/vero/api/events/track_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     module Workers
@@ -8,12 +10,12 @@ module Vero
           end
 
           def request
-            RestClient.post(self.url, self.request_params_as_json, self.request_content_type)
+            RestClient.post(url, request_params_as_json, request_content_type)
           end
 
           def validate!
-            raise ArgumentError.new("Missing :event_name") if options[:event_name].to_s.blank?
-            raise ArgumentError.new(":data must be either nil or a Hash") unless (options[:data].nil? || options[:data].is_a?(Hash))
+            raise ArgumentError, 'Missing :event_name' if options[:event_name].to_s.blank?
+            raise ArgumentError, ':data must be either nil or a Hash' unless options[:data].nil? || options[:data].is_a?(Hash)
           end
         end
       end

data/lib/vero/api/users/delete_api.rb

@@ -0,0 +1,21 @@
+module Vero
+  module Api
+    module Workers
+      module Users
+        class DeleteAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/users/delete.json"
+          end
+
+          def request
+            RestClient.post(url, @options)
+          end
+
+          def validate!
+            raise ArgumentError.new("Missing :id") if options[:id].to_s.blank?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vero/api/users/edit_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     module Workers
@@ -8,12 +10,12 @@ module Vero
           end
 
           def request
-            RestClient.put(url, self.request_params_as_json, self.request_content_type)
+            RestClient.put(url, request_params_as_json, request_content_type)
           end
 
           def validate!
-            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
-            raise ArgumentError.new(":changes must be a Hash") unless options[:changes].is_a?(Hash)
+            raise ArgumentError, 'Missing :id or :email' if options[:id].to_s.blank? && options[:email].to_s.blank?
+            raise ArgumentError, ':changes must be a Hash' unless options[:changes].is_a?(Hash)
           end
         end
       end

data/lib/vero/api/users/edit_tags_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     module Workers
@@ -8,14 +10,14 @@ module Vero
           end
 
           def request
-            RestClient.put(url, self.request_params_as_json, self.request_content_type)
+            RestClient.put(url, request_params_as_json, request_content_type)
           end
 
           def validate!
-            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
-            raise ArgumentError.new(":add must an Array if present") unless options[:add].nil? || options[:add].is_a?(Array)
-            raise ArgumentError.new(":remove must an Array if present") unless options[:remove].nil? || options[:remove].is_a?(Array)
-            raise ArgumentError.new("Either :add or :remove must be present") if (options[:remove].nil? && options[:add].nil?)
+            raise ArgumentError, 'Missing :id or :email' if options[:id].to_s.blank? && options[:email].to_s.blank?
+            raise ArgumentError, ':add must an Array if present' unless options[:add].nil? || options[:add].is_a?(Array)
+            raise ArgumentError, ':remove must an Array if present' unless options[:remove].nil? || options[:remove].is_a?(Array)
+            raise ArgumentError, 'Either :add or :remove must be present' if options[:remove].nil? && options[:add].nil?
           end
         end
       end

data/lib/vero/api/users/reidentify_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     module Workers
@@ -8,12 +10,12 @@ module Vero
           end
 
           def request
-            RestClient.put(url, self.request_params_as_json, self.request_content_type)
+            RestClient.put(url, request_params_as_json, request_content_type)
           end
 
           def validate!
-            raise ArgumentError.new("Missing :id") if options[:id].to_s.blank?
-            raise ArgumentError.new("Missing :new_id") if options[:new_id].to_s.blank?
+            raise ArgumentError, 'Missing :id' if options[:id].to_s.blank?
+            raise ArgumentError, 'Missing :new_id' if options[:new_id].to_s.blank?
           end
         end
       end

data/lib/vero/api/users/resubscribe_api.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Vero
+  module Api
+    module Workers
+      module Users
+        class ResubscribeAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/users/resubscribe.json"
+          end
+
+          def request
+            RestClient.post(url, @options)
+          end
+
+          def validate!
+            raise ArgumentError, 'Missing :id or :email' if options[:id].to_s.blank? && options[:email].to_s.blank?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vero/api/users/track_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     module Workers
@@ -8,12 +10,12 @@ module Vero
           end
 
           def request
-            RestClient.post(url, self.request_params_as_json, self.request_content_type)
+            RestClient.post(url, request_params_as_json, request_content_type)
           end
 
           def validate!
-            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
-            raise ArgumentError.new(":data must be either nil or a Hash") unless (options[:data].nil? || options[:data].is_a?(Hash))
+            raise ArgumentError, 'Missing :id or :email' if options[:id].to_s.blank? && options[:email].to_s.blank?
+            raise ArgumentError, ':data must be either nil or a Hash' unless options[:data].nil? || options[:data].is_a?(Hash)
           end
         end
       end

data/lib/vero/api/users/unsubscribe_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Api
     module Workers
@@ -12,7 +14,7 @@ module Vero
           end
 
           def validate!
-            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
+            raise ArgumentError, 'Missing :id or :email' if options[:id].to_s.blank? && options[:email].to_s.blank?
           end
         end
       end

data/lib/vero/app.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Vero
   class App
     include Vero::Utility::Logger
 
     def self.default_context
-      @@default_context ||= Context.new
+      @@default_context ||= Context.new # rubocop:disable Style/ClassVars
     end
 
     def self.init(&block)
@@ -22,4 +24,4 @@ module Vero
       default_context.configured?
     end
   end
-end
+end

data/lib/vero/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Vero
@@ -6,39 +8,36 @@ module Vero
     attr_accessor :api_key, :secret, :development_mode, :async, :disabled, :logging
 
     def self.available_attributes
-      [:api_key, :secret, :development_mode, :async, :disabled, :logging, :domain]
+      %i[api_key secret development_mode async disabled logging domain]
     end
 
     def initialize
-      self.reset!
+      reset!
     end
 
     def config_params
-      options = {:api_key => self.api_key, :secret => self.secret}
+      { api_key: api_key, secret: secret }
     end
 
     def request_params
-      [:auth_token, :development_mode].inject({}) do |h, symbol|
-        method_name = "from_#{symbol}".to_sym
-        if respond_to?(symbol)
-          temp = send(symbol)
-          h[symbol] = temp unless temp.blank?
-        end
-        h
-      end
+      {
+        auth_token: auth_token,
+        development_mode: development_mode
+      }.reject { |_, v| v.nil? }
     end
 
     def domain
       if @domain.blank?
         'https://api.getvero.com'
       else
-        @domain =~ /http[s]?\:\/\/.+/ ? @domain : "http://#{@domain}"
+        @domain =~ %r{https?://.+} ? @domain : "http://#{@domain}"
       end
     end
 
     def auth_token
       return unless auth_token?
-      ::Base64::encode64("#{api_key}:#{secret}").gsub(/[\n ]/, '')
+
+      ::Base64.encode64("#{api_key}:#{secret}").gsub(/[\n ]/, '')
     end
 
     def auth_token?
@@ -60,10 +59,6 @@ module Vero
       self.logging          = false
       self.api_key          = nil
       self.secret           = nil
-
-      if defined?(Rails)
-        self.development_mode = !Rails.env.production?
-      end
     end
 
     def update_attributes(attributes = {})
@@ -71,8 +66,8 @@ module Vero
 
       Vero::Config.available_attributes.each do |symbol|
         method_name = "#{symbol}=".to_sym
-        self.send(method_name, attributes[symbol]) if self.respond_to?(method_name) && attributes.has_key?(symbol)
+        send(method_name, attributes[symbol]) if respond_to?(method_name) && attributes.key?(symbol)
       end
     end
   end
-end
+end