universal-track-manager 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8712d19c21825899298ab6fb39d7d1d97299261003898e730db82e6b72fe44bf
-  data.tar.gz: c215ac7ba9ef0ce32bc9abf0c9d3742ed68e108103725b3b1ef74b71635336d1
+  metadata.gz: 42bec7b0ea6f8012f06c632b17da95e5a0b065ef3cfb445988a7c8305f8d1dff
+  data.tar.gz: 0bfbb9d1a6e43d8704c845784649d3b7dbd84c691d897d56b433237d3fb3317c
 SHA512:
-  metadata.gz: 513b88940fbd32c3e535c4b8e4eb4e43ffc797bbb5df8f8dd90b4b2faa94075557d44975c1a44714eaca871476095ff02ee73bc9f4790e937c4cb93d336e258a
-  data.tar.gz: 42a4c1af1fb267ca4280b3e25028d7a130ca76c0fbd79f4f0ad947eb1d167e5ce6c3f78211763ec7e652fecc09d9b5be6d645a0719606ec0f735aa1b179f5814
+  metadata.gz: a435166404567f0986456d80460753dadd340ba26598d2ecbc46bd15e4668824c82b522a5ea00b883b15c228d8394704b74273e6680b010308d08d5b0798caea
+  data.tar.gz: 1c17f30402ab644ef841e90dfca4b6f38bea5420b22093e3cd907c59da27c08f4e59491d24606cfcfe38efd5bc3b278189791ceb0c8384372d59a06132f1146a

data/lib/generators/templates/create_universal_track_manager_tables.rb

@@ -29,6 +29,7 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
 
         t.integer :viewport_width
         t.integer :viewport_height
+        t.integer :count, default: 1
         t.timestamps
       end
     end

data/lib/generators/universal_track_manager/install_generator.rb

@@ -1,8 +1,6 @@
 
 require 'rails/generators'
 
-require 'byebug'
-
 module UniversalTrackManager
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
@@ -12,7 +10,13 @@ module UniversalTrackManager
     source_root File.expand_path('../templates', __dir__)
 
     class_option :orm, type: 'boolean'
-    class_option :param_list, type: :string, default: 'utm_source,utm_medium,utm_campaign,utm_content,utm_term'
+
+    class_option :param_list, type: :string, default: nil # DEPRECATED --- DO NOT USE
+
+
+
+    class_option :add, type: :string, default: nil
+    class_option :only, type: :string, default: nil
 
 
     def self.next_migration_number(path)
@@ -21,14 +25,45 @@ module UniversalTrackManager
 
     desc "Creates an initializer for Universal Track Manager and copy files to your application."
     def create_universal_track_manager_migration
-      @params = options['param_list']
+      # guard against pre-0.7.3 sytnax
+      if options['param_list']
+        puts "Oops (FATAL): param_list is removed; use 'add' to augment the default list of fields or use 'only' to replace it"
+        exit
+      end
+
+      # guard against using both 'add' and 'only'
+      if options['add'] && options['only']
+        puts "Oops (FATAL): You specified both 'add' and 'only'; use 'add' to augment the default list of fields OR use 'only' to replace it"
+        exit
+      end
+
+      @default_params = %w{utm_source utm_medium utm_campaign utm_content utm_term}
+
+      if options['add']
+        options['add'].split(",").each  do |p|
+          if !@default_params.include?(p)
+            @default_params << p
+          end
+        end
+      end
+
+
+      if options['only']
+        @default_params = []
+        options['only'].split(",").each  do |p|
+          @default_params << p
+        end
+      end
+
       column_defs = ""
-      @params.split(',').each  do |p|
+      @default_params.each  do |p|
         column_defs += "          t.string :#{p}, limit:256\n"
       end
       copy_file "create_universal_track_manager_tables.rb", "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged"
       gsub_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged", "#GENERATOR INSERTS CAMPAIGN COLUMNS HERE", column_defs
       migration_template "create_universal_track_manager_tables.rb-staged",  "db/migrate/create_universal_track_manager_tables.rb"
+
+      remove_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged"
     end
 
     def create_universal_track_manager_initializer
@@ -36,6 +71,7 @@ module UniversalTrackManager
       copy_file "universal_track_manager.rb", "#{self.class.source_root}/universal_track_manager.rb-staged"
       gsub_file "#{self.class.source_root}/universal_track_manager.rb-staged", "#GENERATOR INSERTS CAMPAIGN COLUMN CONFIG HERE", column_config
       copy_file 'universal_track_manager.rb-staged', 'config/initializers/universal_track_manager.rb'
+      remove_file "#{self.class.source_root}/universal_track_manager.rb-staged"
     end
 
     def migration_version

data/lib/universal_track_manager/controllers/concerns/universal_track_manager_concern.rb

@@ -27,7 +27,7 @@ module UniversalTrackManagerConcern
 
   def user_agent
     return nil if ! UniversalTrackManager.track_user_agent?
-    request.user_agent[0..255]
+    request.user_agent && request.user_agent[0..254]
   end
 
   def now
@@ -101,12 +101,16 @@ module UniversalTrackManagerConcern
       first_pageload: now,
       last_pageload: now,
       original_visit_id: old_visit.original_visit_id.nil? ?  old_visit.id : old_visit.original_visit_id,
+      count: old_visit.original_visit_id.nil? ?  old_visit.count + 1 : 1,
       ip_v4_address: ip_address,
       campaign: find_or_create_campaign_by_current
     }
 
     # fail silently if there is no user agent
-    params[:browser] =  find_or_create_browser_by_current if request.user_agent
+    if request.user_agent
+      params[:browser] =  find_or_create_browser_by_current
+    end
+
     visit = UniversalTrackManager::Visit.create!(params)
 
     session[:visit_id] = visit.id

data/lib/universal_track_manager/models/visit.rb

@@ -3,8 +3,9 @@ class UniversalTrackManager::Visit < ActiveRecord::Base
 
   belongs_to :campaign, class_name: "UniversalTrackManager::Campaign"
   belongs_to :browser, class_name: "UniversalTrackManager::Browser"
+  belongs_to :original_visit,  optional: true, class_name: "UniversalTrackManager::Visit"
 
-
+  # class_name: "UniveralTrackManager::Visit",
   def matches_all_utms?(params)
     if !campaign
       # this visit has no campaign, which means all UTMs = null
@@ -22,4 +23,8 @@ class UniversalTrackManager::Visit < ActiveRecord::Base
     end
     return true
   end
+
+  def name
+    "#{ip_v4_address} #{browser.name}"
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module UniversalTrackManager
-  VERSION = "0.7.1"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universal-track-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.6
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '2.2'
 description: Simple, plug & play visitor tracking by user agent (browser), IP address,
   referrer, and UTM parameters.
-email: jason.fb@datatravels.com
+email: support@heliosdev.shop
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -84,19 +84,19 @@ files:
 - lib/universal_track_manager/models/campaign.rb
 - lib/universal_track_manager/models/visit.rb
 - lib/version.rb
-homepage: https://blog.jasonfleetwoodboldt.com/my-open-source-projects/universal-track-manager/
+homepage: https://heliosdev.shop/p/universal-track-manager
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/jasonfb/universal_track_manager
-  documentation_uri: https://jfb.teachable.com/p/gems-by-jason
-  homepage_uri: https://blog.jasonfleetwoodboldt.com/my-open-source-projects/universal-track-manager/
+  homepage_uri: https://heliosdev.shop/p/universal-track-manager
 post_install_message: |
   ---------------------------------------------
   Welcome to Universal Track Manager
   to set up, please run
 
   rails generate universal_track_manager:install
+  For support see https://heliosdev.shop/p/universal-track-manager
   ---------------------------------------------
 rdoc_options: []
 require_paths:
@@ -112,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: A gem to track visitors to your website.
+summary: A gem to track visitors and their UTMs to your website.
 test_files: []