universal-track-manager 0.7.0.alpha → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d480176796bb905c66f3e4eb2904402232548966be5183768033636b9e50d7b
-  data.tar.gz: 0a7762ea705d448444a4113e254c49ba9e77588a4880197c5244e46388266637
+  metadata.gz: 8712d19c21825899298ab6fb39d7d1d97299261003898e730db82e6b72fe44bf
+  data.tar.gz: c215ac7ba9ef0ce32bc9abf0c9d3742ed68e108103725b3b1ef74b71635336d1
 SHA512:
-  metadata.gz: 99679f236136ab3eed671f2a0319cd01e53ca833589b97fab3e289eaa1fb5647bce188e0d4fbce05c9b5ef9ed0e09f65669e84ac2920c5430fbb1b89f03e0083
-  data.tar.gz: 6997c26bf61ecbcb8e4867a3dfac99158d4b885209248746c364178acd3405698a8e210204d0a619f34c6a0c8fb8ef4badd4f24bb105292a9d5c9dbef47e1bc0
+  metadata.gz: 513b88940fbd32c3e535c4b8e4eb4e43ffc797bbb5df8f8dd90b4b2faa94075557d44975c1a44714eaca871476095ff02ee73bc9f4790e937c4cb93d336e258a
+  data.tar.gz: 42a4c1af1fb267ca4280b3e25028d7a130ca76c0fbd79f4f0ad947eb1d167e5ce6c3f78211763ec7e652fecc09d9b5be6d645a0719606ec0f735aa1b179f5814

data/lib/generators/templates/create_universal_track_manager_tables.rb

@@ -4,7 +4,8 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
 
       create_table :browsers do |t|
         # this table gets automatically populated by inbound traffic
-        t.string :name, size: 255
+        t.string :name, limit: 255
+        t.timestamps
       end
 
       add_index :browsers, :name
@@ -12,10 +13,11 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
       create_table :campaigns do |t|
         # this table gets automatically populated by inbound traffic
 #GENERATOR INSERTS CAMPAIGN COLUMNS HERE
+        t.string :sha1, limit: 40
         t.timestamps
       end
 
-      #GENERATOR INSERTS CAMPAIGN INDEX HERE
+      add_index :campaigns, :sha1
 
       create_table :visits do |t|
         t.datetime :first_pageload
@@ -23,10 +25,11 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
         t.integer :original_visit_id
         t.integer :campaign_id
         t.integer :browser_id
-        t.string :ip_v4_address, length: 15
+        t.string :ip_v4_address, limit: 15
 
         t.integer :viewport_width
         t.integer :viewport_height
+        t.timestamps
       end
     end
   end

data/lib/generators/universal_track_manager/install_generator.rb

@@ -26,13 +26,8 @@ module UniversalTrackManager
       @params.split(',').each  do |p|
         column_defs += "          t.string :#{p}, limit:256\n"
       end
-
-      index_def = "add_index :campaigns, #{@params.split(',').map{|c| c.to_sym}.to_s}, name: 'utm_all_combined'"
       copy_file "create_universal_track_manager_tables.rb", "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged"
-      byebug
       gsub_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged", "#GENERATOR INSERTS CAMPAIGN COLUMNS HERE", column_defs
-      byebug
-      gsub_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged", "#GENERATOR INSERTS CAMPAIGN INDEX HERE", index_def
       migration_template "create_universal_track_manager_tables.rb-staged",  "db/migrate/create_universal_track_manager_tables.rb"
     end
 

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

@@ -83,9 +83,16 @@ module UniversalTrackManagerConcern
 
   def find_or_create_campaign_by_current
     return nil if ! UniversalTrackManager.track_utms?
-    campaign = UniversalTrackManager::Campaign.find_or_create_by(
-      *permitted_utm_params
-    )
+    gen_sha1 = gen_campaign_key(permitted_utm_params)
+
+    # find_or_create_by finding only by sha1 would be nice here, but how to do so with a dynamic set of columns?
+    # we've got a small chance of dups here due to the non-atomic find/create and sha1, but that's ok for this application.
+    c = UniversalTrackManager::Campaign.find_by(sha1: gen_sha1)
+    c ||= UniversalTrackManager::Campaign.create(*(permitted_utm_params.merge({"sha1": gen_sha1})))
+  end
+
+  def gen_campaign_key(params)
+    Digest::SHA1.hexdigest(params.keys.map{|k| k.downcase()}.sort.map{|k| {"#{k}":  params[k]}}.to_s)
   end
 
   def evict_visit!(old_visit)

data/lib/universal_track_manager/models/visit.rb

@@ -16,7 +16,7 @@ class UniversalTrackManager::Visit < ActiveRecord::Base
 
     # note params are allowed to be missing
     UniversalTrackManager.campaign_column_symbols.each do |c|
-      if campaign[c] != params[c]
+      if (campaign[c] && (campaign[c] != params[c])) || (!campaign[c] && params[c])
         return false
       end
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module UniversalTrackManager
-  VERSION = "0.7.0.alpha"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: universal-track-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha
+  version: 0.7.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
@@ -108,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.7
 signing_key: