landable 1.13.1 → 1.13.2

data/lib/landable/traffic/tracker.rb

@@ -5,43 +5,43 @@ module Landable
   module Traffic
     class Tracker
       TRACKING_PARAMS = {
-        "ad_type"        => %w[ad_type adtype],
-        "ad_group"       => %w[ad_group adgroup ovadgrpid ysmadgrpid],
-        "bid_match_type" => %w[bidmatchtype bid_match_type bmt],
-        "campaign"       => %w[campaign utm_campaign ovcampgid ysmcampgid],
-        "content"        => %w[content utm_content],
-        "creative"       => %w[creative adid ovadid],
-        "device_type"    => %w[device_type devicetype device],
-        "click_id"       => %w[gclid click_id clickid],
-        "experiment"     => %w[experiment aceid],
-        "keyword"        => %w[keyword kw utm_term ovkey ysmkey],
-        "match_type"     => %w[match_type matchtype match ovmtc ysmmtc],
-        "medium"         => %w[medium utm_medium],
-        "network"        => %w[network],
-        "placement"      => %w[placement],
-        "position"       => %w[position adposition ad_position],
-        "search_term"    => %w[search_term searchterm q querystring ovraw ysmraw],
-        "source"         => %w[source utm_source],
-        "target"         => %w[target],
+        'ad_type'        => %w(ad_type adtype),
+        'ad_group'       => %w(ad_group adgroup ovadgrpid ysmadgrpid),
+        'bid_match_type' => %w(bidmatchtype bid_match_type bmt),
+        'campaign'       => %w(campaign utm_campaign ovcampgid ysmcampgid),
+        'content'        => %w(content utm_content),
+        'creative'       => %w(creative adid ovadid),
+        'device_type'    => %w(device_type devicetype device),
+        'click_id'       => %w(gclid click_id clickid),
+        'experiment'     => %w(experiment aceid),
+        'keyword'        => %w(keyword kw utm_term ovkey ysmkey),
+        'match_type'     => %w(match_type matchtype match ovmtc ysmmtc),
+        'medium'         => %w(medium utm_medium),
+        'network'        => %w(network),
+        'placement'      => %w(placement),
+        'position'       => %w(position adposition ad_position),
+        'search_term'    => %w(search_term searchterm q querystring ovraw ysmraw),
+        'source'         => %w(source utm_source),
+        'target'         => %w(target)
       }.freeze
 
       TRACKING_KEYS    = TRACKING_PARAMS.values.flatten.freeze
-      ATTRIBUTION_KEYS = TRACKING_PARAMS.except("click_id").keys
+      ATTRIBUTION_KEYS = TRACKING_PARAMS.except('click_id').keys
 
       TRACKING_PARAMS_TRANSFORM = {
-        "ad_type"        => { 'pe'  => 'product_extensions',
+        'ad_type'        => { 'pe'  => 'product_extensions',
                               'pla' => 'product_listing' },
 
-        "bid_match_type" => { 'bb'  => 'bidded broad',
+        'bid_match_type' => { 'bb'  => 'bidded broad',
                               'bc'  => 'bidded content',
                               'be'  => 'bidded exact',
                               'bp'  => 'bidded phrase' },
 
-        "device_type"    => { 'c'   => 'computer',
+        'device_type'    => { 'c'   => 'computer',
                               'm'   => 'mobile',
                               't'   => 'tablet' },
 
-        "match_type"     => { 'b'   => 'broad',
+        'match_type'     => { 'b'   => 'broad',
                               'c'   => 'content',
                               'e'   => 'exact',
                               'p'   => 'phrase',
@@ -49,9 +49,9 @@ module Landable
                               'adv' => 'advanced',
                               'cnt' => 'content' },
 
-        "network"        => { 'g'   => 'google_search',
+        'network'        => { 'g'   => 'google_search',
                               's'   => 'search_partner',
-                              'd'   => 'display_network' },
+                              'd'   => 'display_network' }
       }.freeze
 
       UUID_REGEX       = /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\Z/
@@ -75,7 +75,7 @@ module Landable
       class << self
         def for(controller)
           type = controller.request.user_agent.presence && Landable::Traffic::UserAgent[controller.request.user_agent].user_agent_type
-          type = 'noop' if Landable.configuration.traffic_enabled == :html and not controller.request.format.html?
+          type = 'noop' if Landable.configuration.traffic_enabled == :html && !controller.request.format.html?
           type = 'user' if type.nil?
           type = 'user' if controller.request.query_parameters.with_indifferent_access.slice(*TRACKING_KEYS).any?
 
@@ -85,13 +85,13 @@ module Landable
 
       def initialize(controller)
         # Allow subclasses to super from initialize
-        raise NotImplementedError, "You must subclass Tracker" if self.class == Tracker
+        fail NotImplementedError, 'You must subclass Tracker' if self.class == Tracker
         @controller = controller
         @start_time = Time.now
       end
 
       def track
-        raise NotImplementedError, "You must subclass Tracker" if self.class == Tracker
+        fail NotImplementedError, 'You must subclass Tracker' if self.class == Tracker
       end
 
       def visitor_id
@@ -101,7 +101,6 @@ module Landable
 
       def create_event(type, meta = {})
         return unless @visit_id
-
         Event.create(visit_id: @visit_id, event_type: type, meta: meta)
       end
 
@@ -118,23 +117,25 @@ module Landable
       end
 
       def landing_path
-        @visit_id and PageView.where(visit_id: @visit_id).order(:page_view_id).first.try(:path)
+        @visit_id && PageView.where(visit_id: @visit_id).order(:page_view_id).first.try(:path)
       end
 
+      # TODO: Is this used in multiple applications outside Landable. If not,
+      # then lets get rid of this method.
+      # rubocop:disable Style/AccessorMethodName
       def get_user_agent
         user_agent
       end
 
-    protected
+      protected
+
       def cookies
         request.cookie_jar
       end
 
       def cookie
         validate_cookie
-
         @cookie_id ||= Cookie.create.id
-
         set_cookie
       end
 
@@ -155,9 +156,8 @@ module Landable
       end
 
       def do_not_track
-        return unless headers["DNT"]
-
-        headers["DNT"] == "1"
+        return unless headers['DNT']
+        headers['DNT'] == '1'
       end
 
       def user_agent
@@ -172,10 +172,14 @@ module Landable
         attribution = Attribution.lookup params.slice(*ATTRIBUTION_KEYS)
         query       = params.except(*ATTRIBUTION_KEYS)
 
-        @referer = Referer.where(domain_id:       Domain[referer_uri.host],
-                                 path_id:         Path[referer_uri_path],
-                                 query_string_id: QueryString[query.to_query],
-                                 attribution_id:  attribution.id).first_or_create
+        begin
+          @referer = Referer.where(domain_id:       Domain[referer_uri.host],
+                                   path_id:         Path[referer_uri_path],
+                                   query_string_id: QueryString[query.to_query],
+                                   attribution_id:  attribution.id).first_or_create
+        rescue ActiveRecord::RecordNotUnique
+          retry
+        end
       end
 
       def ip_address
@@ -254,7 +258,6 @@ module Landable
 
       def visit_stale?
         return false unless @last_visit_time
-
         Time.current - @last_visit_time > 30.minutes
       end
 
@@ -262,13 +265,13 @@ module Landable
         hash = {}
 
         TRACKING_PARAMS.each do |key, names|
-          next unless param = names.find { |name| params.key?(name) }
+          param = names.find { |name| params.key?(name) }
+          next unless param
           hash[key] = params[param]
         end
 
         TRACKING_PARAMS_TRANSFORM.each do |key, transform|
           next unless hash.key? key
-
           hash[key] = transform[hash[key]] if transform.key? hash[key]
         end
 
@@ -297,6 +300,8 @@ module Landable
 
       def visitor
         @visitor ||= Visitor.with_ip_address(ip_address).with_user_agent(user_agent).first_or_create
+      rescue ActiveRecord::RecordNotUnique
+        retry
       end
 
       def visit

data/lib/landable/traffic/user_tracker.rb

@@ -28,23 +28,20 @@ module Landable
           p.query_string = untracked_parameters.to_query
           p.request_id   = request.uuid
 
-          p.click_id     = tracking_parameters["click_id"]
+          p.click_id     = tracking_parameters['click_id']
 
           p.http_status  = response.status
 
           p.visit_id     = @visit_id
-          # this is strange, yes, but is it better than a db call?
-          p.created_at   = Time.current
-
-          p.response_time = ( Time.now - @start_time ) * 1000
+          current_time = Time.now
+          p.created_at   = current_time
+          p.response_time = (current_time - @start_time) * 1000
         end
       end
 
       def save
         p = record_page_view
-        if Landable.configuration.amqp_service_enabled
-          EventPublisher.publish(p)
-        end
+        EventPublisher.publish(p) if Landable.configuration.amqp_service_enabled
 
         session[:landable] = {
           KEYS[:visit_id]         => @visit_id,
@@ -58,12 +55,20 @@ module Landable
 
       def identify(identifier)
         visit = Visit.find(@visit_id)
-        owner = Owner.where(owner: identifier).first_or_create
+        begin
+          owner = Owner.where(owner: identifier).first_or_create
+        rescue ActiveRecord::RecordNotUnique
+          retry
+        end
 
         visit.owner = owner
         visit.save!
 
-        Ownership.where(cookie_id: @cookie_id, owner: owner).first_or_create
+        begin
+          Ownership.where(cookie_id: @cookie_id, owner: owner).first_or_create
+        rescue ActiveRecord::RecordNotUnique
+          retry
+        end
       end
     end
   end

data/lib/landable/version.rb

@@ -2,7 +2,7 @@ module Landable
   module VERSION
     MAJOR = 1
     MINOR = 13
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/schema_moves.rb

@@ -3,9 +3,9 @@ module SchemaMoves
     def create_schema(schema)
       connection = ActiveRecord::Base.connection
 
-      sql = %{
+      sql = %(
         CREATE SCHEMA #{schema};
-      }
+            )
       puts "Creating #{schema} schema"
       connection.execute sql
     end
@@ -13,9 +13,9 @@ module SchemaMoves
     def drop_schema(schema)
       connection = ActiveRecord::Base.connection
 
-      sql = %{
+      sql = %(
         DROP SCHEMA #{schema};
-      }
+            )
       puts "Dropping #{schema} schema"
       connection.execute sql
     end
@@ -35,10 +35,10 @@ module SchemaMoves
       ")
 
       objects.each do |object|
-        sql = %{
+        sql = %(
           ALTER #{object_type} #{from_schema}.#{object['relname']}
             SET SCHEMA #{to_schema}
-        }
+                )
         puts "Moving #{from_schema}.#{object['relname']} TO #{to_schema}"
         connection.execute sql
       end
@@ -129,7 +129,7 @@ module SchemaMoves
           BEFORE UPDATE OF notes, is_minor, page_id, author_id, created_at, ordinal ON #{new_schema}.page_revisions
           FOR EACH STATEMENT EXECUTE PROCEDURE #{new_schema}.tg_disallow();
       }
-      puts "Creating new triggers..."
+      puts 'Creating new triggers...'
       connection.execute sql
     end
 
@@ -148,7 +148,7 @@ module SchemaMoves
         DROP FUNCTION IF EXISTS #{old_schema}.template_revision_ordinal();
         DROP FUNCTION IF EXISTS #{old_schema}.tg_disallow();
       }
-      puts "Dropping old triggers..."
+      puts 'Dropping old triggers...'
       connection.execute sql
     end
 
@@ -158,14 +158,13 @@ module SchemaMoves
 
     def get_schema_names(new = true)
       # Always get old schemas
-      @old_landable = ask("Enter the OLD main landable schema: ") { |q| q.default = 'landable' }
-      @old_traffic = ask("Enter the OLD traffic schema: ") { |q| q.default = 'landable_traffic' }
+      @old_landable = ask('Enter the OLD main landable schema: ') { |q| q.default = 'landable' }
+      @old_traffic = ask('Enter the OLD traffic schema: ') { |q| q.default = 'landable_traffic' }
 
       # Only ask for new names if new == true
-      if new
-        @new_landable = ask("Enter the NEW main landable schema: ") { |q| q.default = "#{appname}_landable" }
-        @new_traffic = ask("Enter the NEW traffic schema: ") { |q| q.default = "#{appname}_landable_traffic" }
-      end
+      return unless new
+      @new_landable = ask('Enter the NEW main landable schema: ') { |q| q.default = "#{appname}_landable" }
+      @new_traffic = ask('Enter the NEW traffic schema: ') { |q| q.default = "#{appname}_landable_traffic" }
     end
 
     def create_schemas
@@ -195,8 +194,8 @@ module SchemaMoves
 
     def want_to_drop_old_schemas?
       drop = nil
-      until ['yes', 'no'].include?(drop.to_s.downcase)
-        drop = ask("Would you like to drop the old schemas? (Yes or No)") { |q| q.default = 'no' }
+      until %w(yes no).include?(drop.to_s.downcase)
+        drop = ask('Would you like to drop the old schemas? (Yes or No)') { |q| q.default = 'no' }
       end
       drop.to_s.downcase == 'yes'
     end

data/lib/tasks/landable/cucumber.rake

@@ -1,67 +1,66 @@
 namespace :landable do
   # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-  # It is recommended to regenerate this file in the future when you upgrade to a 
-  # newer version of cucumber-rails. Consider adding your own code to a new file 
+  # It is recommended to regenerate this file in the future when you upgrade to a
+  # newer version of cucumber-rails. Consider adding your own code to a new file
   # instead of editing this one. Cucumber will automatically load all features/**/*.rb
   # files.
 
+  unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gems:* tasks
 
-  unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+    vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+    $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
-  vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-  $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+    begin
+      require 'cucumber/rake/task'
 
-  begin
-    require 'cucumber/rake/task'
+      namespace :cucumber do
+        Cucumber::Rake::Task.new({ ok: 'db:test:prepare' }, 'Run features that should pass') do |t|
+          t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+          t.fork = true # You may get faster startup if you set this to false
+          t.profile = 'default'
+        end
 
-    namespace :cucumber do
-      Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
-        t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'default'
-      end
-
-      Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
-        t.binary = vendored_cucumber_bin
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'wip'
-      end
+        Cucumber::Rake::Task.new({ wip: 'db:test:prepare' }, 'Run features that are being worked on') do |t|
+          t.binary = vendored_cucumber_bin
+          t.fork = true # You may get faster startup if you set this to false
+          t.profile = 'wip'
+        end
 
-      Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
-        t.binary = vendored_cucumber_bin
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'rerun'
-      end
+        Cucumber::Rake::Task.new({ rerun: 'db:test:prepare' }, 'Record failing features and run only them if any exist') do |t|
+          t.binary = vendored_cucumber_bin
+          t.fork = true # You may get faster startup if you set this to false
+          t.profile = 'rerun'
+        end
 
-      desc 'Run all features'
-      task :all => [:ok, :wip]
+        desc 'Run all features'
+        task all: [:ok, :wip]
 
-      task :statsetup do
-        require 'rails/code_statistics'
-        ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
-        ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+        task :statsetup do
+          require 'rails/code_statistics'
+          ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+          ::CodeStatistics::TEST_TYPES << 'Cucumber features' if File.exist?('features')
+        end
       end
-    end
-    desc 'Alias for cucumber:ok'
-    task :cucumber => 'cucumber:ok'
+      desc 'Alias for cucumber:ok'
+      task cucumber: 'cucumber:ok'
 
-    task :default => :cucumber
+      task default: :cucumber
 
-    task :features => :cucumber do
-      STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
-    end
+      task features: :cucumber do
+        STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+      end
 
-    # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
-    task 'db:test:prepare' do
-    end
+      # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+      task 'db:test:prepare' do
+      end
 
-    task :stats => 'cucumber:statsetup'
-  rescue LoadError
-    desc 'cucumber rake task not available (cucumber not installed)'
-    task :cucumber do
-      abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+      task stats: 'cucumber:statsetup'
+    rescue LoadError
+      desc 'cucumber rake task not available (cucumber not installed)'
+      task :cucumber do
+        abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+      end
     end
-  end
 
   end
-end
+end