vero 0.7.0 → 0.10.0

data/lib/vero/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   class Context
     include Vero::APIContext
@@ -6,27 +8,23 @@ module Vero
     def initialize(object = {})
       case object
       when Hash
-        #stub
+        # stub
       when Vero::Context
         @config = object.config
         @subject = object.subject
       else
-        object = Vero::Config.available_attributes.inject({}) do |hash, symbol|
+        object = Vero::Config.available_attributes.each_with_object({}) do |symbol, hash|
           hash[symbol] = object.respond_to?(symbol) ? object.send(symbol) : nil
-          hash
         end
       end
+      return unless object.is_a?(Hash)
 
-      if object.is_a?(Hash)
-        @config = Vero::Config.new
-        self.configure(object)
-      end
+      @config = Vero::Config.new
+      configure(object)
     end
 
     def configure(hash = {}, &block)
-      if hash.is_a?(Hash) && hash.any?
-        @config.update_attributes(hash)
-      end
+      @config.update_attributes(hash) if hash.is_a?(Hash) && hash.any?
 
       block.call(@config) if block_given?
     end
@@ -43,4 +41,4 @@ module Vero
       @config.configured?
     end
   end
-end
+end

data/lib/vero/context/api.rb

@@ -1,38 +1,40 @@
+# frozen_string_literal: true
+
 module Vero
   module APIContext
     def track!(event_name, event_data, extras = {})
-      options = {:data => event_data, :event_name => event_name, :identity => subject.to_vero, :extras => extras}
+      options = { data: event_data, event_name: event_name, identity: subject.to_vero, extras: extras }
       Vero::Api::Events.track!(options, self)
     end
 
     def identify!
       identity = subject.to_vero
-      options = {:id => identity[:id], :email => identity[:email], :data => identity}
+      options = { id: identity[:id], email: identity[:email], data: identity }
       Vero::Api::Users.track!(options, self)
     end
 
     def update_user!
       identity = subject.to_vero
-      options = {:id => identity[:id], :email => identity[:email], :changes => identity}
+      options = { id: identity[:id], email: identity[:email], changes: identity }
       Vero::Api::Users.edit_user!(options, self)
     end
 
     def update_user_tags!(add = [], remove = [])
       identity = subject.to_vero
-      options = {:id => identity[:id], :email => identity[:email], :add => Array(add), :remove => Array(remove)}
+      options = { id: identity[:id], email: identity[:email], add: Array(add), remove: Array(remove) }
       Vero::Api::Users.edit_user_tags!(options, self)
     end
 
     def unsubscribe!
       identity = subject.to_vero
-      options = {:id => identity[:id], :email => identity[:email]}
+      options = { id: identity[:id], email: identity[:email] }
       Vero::Api::Users.unsubscribe!(options, self)
     end
 
     def reidentify!(previous_id)
       identity = subject.to_vero
-      options = {:id => previous_id, :new_id => identity[:id]}
+      options = { id: previous_id, new_id: identity[:id] }
       Vero::Api::Users.reidentify!(options, self)
     end
   end
-end
+end

data/lib/vero/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   ##
   # A lightweight DSL for using the Vero API. You may find this desirable in
@@ -15,7 +17,7 @@ module Vero
   #   end
   module DSL
     def vero
-      @_vero_proxy ||= Proxy.new
+      @vero ||= Proxy.new
     end
 
     # :nodoc:

data/lib/vero/railtie.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'vero/view_helpers/javascript'
 
 module Vero
   class Railtie < Rails::Railtie
-    initializer "vero.view_helpers" do
-      ActionView::Base.send :include, ViewHelpers::Javascript
+    initializer 'vero.view_helpers' do
+      ActionView::Base.include ViewHelpers::Javascript
     end
   end
-end
+end

data/lib/vero/sender.rb

@@ -1,48 +1,30 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Vero
-  class SenderHash < ::Hash
+  class SenderLookup
     def [](key)
-      if self.has_key?(key)
-        super
-      else
-        klass_name = key.to_s.split("_").map(&:capitalize).join
+      klass_name = key.to_s.split('_').map(&:capitalize).join
+
+      if Vero::Senders.const_defined?(klass_name)
         Vero::Senders.const_get(klass_name)
+      else
+        Vero::Senders::Base
       end
     end
   end
 
   class Sender
     def self.senders
-      t = Vero::SenderHash.new
-
-      t.merge!({
-        true          => Vero::Senders::Invalid,
-        false         => Vero::Senders::Base,
-        :none         => Vero::Senders::Base,
-        :thread       => Vero::Senders::Invalid
-      })
-
-      if RUBY_VERSION !~ /1\.8\./
-        t.merge!(
-          true        => Vero::Senders::Thread,
-          :thread     => Vero::Senders::Thread
-        )
-      end
-
-      t
+      @senders ||= Vero::SenderLookup.new
     end
 
     def self.send(api_class, sender_strategy, domain, options)
-      sender_class = if self.senders[sender_strategy]
-        self.senders[sender_strategy]
-      else
-        self.senders[false]
-      end
-      (sender_class.new).call(api_class, domain, options)
-    rescue => e
+      senders[sender_strategy].new.call(api_class, domain, options)
+    rescue StandardError => e
       options_s = JSON.dump(options)
-      Vero::App.log(self.new, "method: #{api_class.name}, options: #{options_s}, error: #{e.message}")
+      Vero::App.log(new, "method: #{api_class.name}, options: #{options_s}, error: #{e.message}")
       raise e
     end
   end

data/lib/vero/senders/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Vero
@@ -11,4 +13,4 @@ module Vero
       end
     end
   end
-end
+end

data/lib/vero/senders/delayed_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'delayed_job'
 
@@ -9,13 +11,11 @@ module Vero
         options_s = JSON.dump(options)
         Vero::App.log(self, "method: #{api_class.name}, options: #{options_s}, response: delayed job queued")
         response
-      rescue => e
-        if e.message == "Could not find table 'delayed_jobs'"
-          raise "To send ratings asynchronously, you must configure delayed_job. Run `rails generate delayed_job:active_record` then `rake db:migrate`."
-        else
-          raise e
-        end
+      rescue StandardError => e
+        raise 'To send ratings asynchronously, you must configure delayed_job. Run `rails generate delayed_job:active_record` then `rake db:migrate`.' if e.message == "Could not find table 'delayed_jobs'"
+
+        raise e
       end
     end
   end
-end
+end

data/lib/vero/senders/invalid.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Vero
   module Senders
     class Invalid
-      def call(api_class, domain, options)
-        raise "Vero sender not supported by your version of Ruby. Please change `config.async` to a valid sender. See https://github.com/getvero/vero for more information."
+      def call(_api_class, _domain, _options)
+        raise 'Vero sender not supported by your version of Ruby. Please change `config.async` to a valid sender. See https://github.com/getvero/vero for more information.'
       end
     end
   end
-end
+end

data/lib/vero/senders/resque.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'resque'
 
@@ -5,15 +7,13 @@ module Vero
   class ResqueWorker
     @queue = :vero
 
-    def self.perform(api_class_name, domain, options)
-      api_class = eval(api_class_name)
-      new_options = {}
-      options.each do |k,v|
-        new_options[k.to_sym] = v
+    def self.perform(api_class, domain, options)
+      new_options = options.each_with_object({}) do |(k, v), o|
+        o[k.to_sym] = v
       end
 
-      api_class.new(domain, new_options).perform
-      Vero::App.log(self, "method: #{api_class.name}, options: #{options.to_json}, response: resque job queued")
+      api_class.constantize.new(domain, new_options).perform
+      Vero::App.log(self, "method: #{api_class}, options: #{options.to_json}, response: resque job queued")
     end
   end
 
@@ -24,4 +24,4 @@ module Vero
       end
     end
   end
-end
+end

data/lib/vero/senders/sidekiq.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'sidekiq'
+
+module Vero
+  class SidekiqWorker
+    include ::Sidekiq::Worker
+
+    def perform(api_class, domain, options)
+      api_class.constantize.new(domain, options).perform
+      Vero::App.log(self, "method: #{api_class}, options: #{options.to_json}, response: sidekiq job queued")
+    end
+  end
+
+  module Senders
+    class Sidekiq
+      def call(api_class, domain, options)
+        response = ::Vero::SidekiqWorker.perform_async(api_class.to_s, domain, options)
+        Vero::App.log(self, "method: #{api_class.name}, options: #{options.to_json}, response: sidekiq job queued")
+        response
+      end
+    end
+  end
+end

data/lib/vero/senders/{thread.rb → sucker_punch.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'sucker_punch'
 
@@ -7,19 +9,19 @@ module Vero
 
     def perform(api_class, domain, options)
       new_options = {}
-      options.each { |k,v| new_options[k.to_sym] = v }
+      options.each { |k, v| new_options[k.to_sym] = v }
 
       begin
         api_class.new(domain, new_options).perform
         Vero::App.log(self, "method: #{api_class.name}, options: #{options.to_json}, response: job performed")
-      rescue => e
+      rescue StandardError => e
         Vero::App.log(self, "method: #{api_class.name}, options: #{options.to_json}, response: #{e.message}")
       end
     end
   end
 
   module Senders
-    class Thread
+    class SuckerPunch
       def call(api_class, domain, options)
         Vero::SuckerPunchWorker.new.async.perform(api_class, domain, options)
       end

data/lib/vero/trackable.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'vero/trackable/base'
 require 'vero/trackable/interface'
 
 module Vero
-  module Trackable    
+  module Trackable
     include Base
     include Interface
 
@@ -11,4 +13,4 @@ module Vero
       base.extend(Base::ClassMethods)
     end
   end
-end
+end

data/lib/vero/trackable/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Trackable
     module Base
@@ -9,10 +11,10 @@ module Vero
       module ClassMethods
         def trackable(*args)
           @vero_trackable_map = case @vero_trackable_map
-          when Array then (@vero_trackable_map << args).flatten
-          else
-            args
-          end
+                                when Array then (@vero_trackable_map << args).flatten
+                                else
+                                  args
+                                end
         end
 
         def trackable_map
@@ -27,15 +29,14 @@ module Vero
       def to_vero
         klass = self.class
         symbols, other = klass.trackable_map.partition { |i| i.is_a?(Symbol) }
-        
-        result = symbols.inject({}) do |hash, symbol|
+
+        result = symbols.each_with_object({}) do |symbol, hash|
           t = respond_to?(symbol) ? send(symbol) : nil
           hash[symbol] = t unless t.nil?
-          hash
         end
 
         if other.is_a?(Array) && !other.empty?
-          other.reject! { |i| !(i.is_a?(Hash) && i.has_key?(:extras)) }
+          other.select! { |i| (i.is_a?(Hash) && i.key?(:extras)) }
           other.each do |h|
             symbol = h[:extras]
             t = respond_to?(symbol, true) ? send(symbol) : nil
@@ -43,7 +44,7 @@ module Vero
           end
         end
 
-        result[:email] = result.delete(:email_address) if result.has_key?(:email_address)
+        result[:email] = result.delete(:email_address) if result.key?(:email_address)
         result[:_user_type] = self.class.name
         result
       end

data/lib/vero/trackable/interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Trackable
     module Interface
@@ -14,4 +16,4 @@ module Vero
       end
     end
   end
-end
+end

data/lib/vero/utility/ext.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Object
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
-end
+end

data/lib/vero/utility/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
   module Utility
     module Logger
@@ -19,13 +21,9 @@ module Vero
         end
 
         def logger
-          if defined?(Rails)
-            Rails.logger
-          else
-            nil
-          end
+          Rails.logger if defined?(Rails)
         end
       end
     end
   end
-end
+end

data/lib/vero/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vero
-  VERSION = '0.7.0'
+  VERSION = '0.10.0'
 end

data/lib/vero/view_helpers/javascript.rb

@@ -1,43 +1,43 @@
+# frozen_string_literal: true
+
 module Vero
   module ViewHelpers
     module Javascript
       def vero_javascript_tag(method = :default, context = Vero::App.default_context)
-        return "" unless context.configured?
+        return '' unless context.configured?
+
         config = context.config
 
-        unless [:default, :mixpanel, :kissmetrics].include?(method)
-          method = :default
-        end
+        method = :default unless %i[default mixpanel kissmetrics].include?(method)
 
-        method_name = method.to_s + "_vero_javascript_tag"
-        self.send(method_name.to_sym, config.config_params)
+        method_name = "#{method}_vero_javascript_tag"
+        send(method_name.to_sym, config.config_params)
       end
 
       private
+
       def default_vero_javascript_tag(options = {})
-        content_tag :script, {:type => "text/javascript"} do
-          result = "var _veroq = _veroq || [];" +
-          "setTimeout(function(){if(typeof window.Semblance==\"undefined\"){console.log(\"Vero did not load in time.\");for(var i=0;i<_veroq.length;i++){a=_veroq[i];if(a.length==3&&typeof a[2]==\"function\")a[2](null,false);}}},3000);" +
-          "_veroq.push(['init', {" +
-          options_to_string(options) +
-          "}]);" + 
-          "(function() {var ve = document.createElement('script'); ve.type = 'text/javascript'; ve.async = true; ve.src = '//getvero.com/assets/m.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ve, s);})();"
+        content_tag :script, { type: 'text/javascript' } do
+          result = 'var _veroq = _veroq || [];' \
+                   'setTimeout(function(){if(typeof window.Semblance=="undefined"){console.log("Vero did not load in time.");for(var i=0;i<_veroq.length;i++){a=_veroq[i];if(a.length==3&&typeof a[2]=="function")a[2](null,false);}}},3000);' \
+                   "_veroq.push(['init', {" +
+                   options_to_string(options) +
+                   '}]);' \
+                   "(function() {var ve = document.createElement('script'); ve.type = 'text/javascript'; ve.async = true; ve.src = '//getvero.com/assets/m.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ve, s);})();"
           result.html_safe
         end.html_safe
       end
 
-      def mixpanel_vero_javascript_tag(options = {})
-      end
+      def mixpanel_vero_javascript_tag(options = {}); end
 
-      def kissmetrics_vero_javascript_tag(options = {})
-      end
+      def kissmetrics_vero_javascript_tag(options = {}); end
 
       def options_to_string(options)
-        options = {} unless options.kind_of?(Hash)
+        options = {} unless options.is_a?(Hash)
 
         keys = options.keys.map(&:to_s)
-        keys.sort.map { |k| "\"#{k}\": \"#{options[k.to_sym]}\"" }.join(", ")
+        keys.sort.map { |k| "\"#{k}\": \"#{options[k.to_sym]}\"" }.join(', ')
       end
     end
   end
-end
+end