referer_tracking 4.4.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04a42b5c9dbe463190c10e2489d318b42022e13f
-  data.tar.gz: a2aed6b1aca898703c472add2e59104fbfcf54e5
+SHA256:
+  metadata.gz: f4a943652b97e3ec7de397bb63b9790b3d0a891a5681a419912622930f663cd7
+  data.tar.gz: dcb1f135ffe680a0eadbda0b9f8c8190c545671afd3faff670d7699433f41f9b
 SHA512:
-  metadata.gz: 8ed5657b8e2e4ffff119d8fcff8cd0ddcf78e4f6f523d366fdd97ded9b0badaf5dec467279c8fc1c98253e576f38b9491aab3418e69c97e2fb4e0fef8a6a3850
-  data.tar.gz: 01dca5b8f50084b5c6dcacadb4ce28e61b8cdb4e1f0aaead356bf703941f20c038248f65e79b0f0846622330f7d5fd8692a04e6bbb754800868eaacde26bba4a
+  metadata.gz: caa1aedca0dd0bc04c2ea890d2761f69b77f0b84f522e88ebd65737e034ff8cfa4367253aa0008e877413173ea71415ac4541e6c20d7fb30eaf8e8e0d9fe39b4
+  data.tar.gz: e706b830603bc58520a4a8e60301ff5419ad970485adecbeee51496372c39dcdb5020b2de19b0dbd940c3b2770a098e96f195548bbfd727122b794744603711a

data/README.md

@@ -162,9 +162,7 @@ is not recommended but possible with session[:referer_tracking]. Information is
 
 ## Requirements
 
-Gem has been tested with latest Ruby and Rails combinations, see https://github.com/holli/referer_tracking/blob/master/.travis.yml for more info.
-
-[<img src="https://secure.travis-ci.org/holli/referer_tracking.png" />](http://travis-ci.org/holli/referer_tracking)
+Gem has been tested with latest Ruby and Rails combinations. See github actions for more info.
 
 ## Other possible gems
 

data/app/models/referer_tracking/tracking.rb

@@ -1,9 +1,12 @@
 module RefererTracking
   class Tracking < ActiveRecord::Base
     self.table_name = "referer_trackings"
-    belongs_to :trackable, :polymorphic => true
-    serialize :infos_session, Hash
-    serialize :infos_request, Hash
+    belongs_to :trackable, polymorphic: true, optional: true
+    # coder is explicit because Rails 7.1 defaults set active_record.default_column_serializer
+    # to nil; without it `serialize` raises ArgumentError in any app on load_defaults 7.1+.
+    # YAML keeps the on-disk format of existing rows unchanged.
+    serialize :infos_session, type: Hash, coder: YAML
+    serialize :infos_request, type: Hash, coder: YAML
 
     def first_url_combined
       cookie_first_url || session_first_url
@@ -31,10 +34,10 @@ module RefererTracking
       Rails.logger.info("RefererTracking add_log_line to #{trackable_type}.#{trackable_id}: #{log_line}")
 
       log_line = log_line.to_s.gsub("\n", ' ')
-      str = "#{Time.now.utc.to_s(:db)}: #{log_line}\n"
+      str = "#{Time.now.utc.to_fs(:db)}: #{log_line}\n"
       self.log = log.to_s + str
 
-      save if save_model
+      save if save_model && !self.new_record?
     end
 
     def get_log_lines(regexp)

data/lib/referer_tracking/controller_addons.rb

@@ -14,22 +14,25 @@ module RefererTracking::ControllerAddons
         request_ref = request_ref.to_s.gsub(/pass(word)?=[^&]+/, 'pass=xxxx')
         first_url = request.url.to_s.gsub(/pass(word)?=[^&]+/, 'pass=xxxx')
 
-        hash[:session_referer_url] = request_ref
-        hash[:session_first_url] = first_url
+        # String keys throughout the session hash. Rails 7.0 made :json the default
+        # cookies_serializer, and JSON has no symbols — a symbol key written here comes
+        # back as a string on the next request, so any symbol lookup silently returns nil.
+        hash["session_referer_url"] = request_ref
+        hash["session_first_url"] = first_url
 
         if RefererTracking.set_referer_cookies && cookies[RefererTracking.set_referer_cookies_name].nil?
           cookie_info = "v01|||#{Time.now.utc.to_i}|||#{first_url.first(RefererTracking.set_referer_cookies_first_url_max_length)}|||#{request_ref.first(RefererTracking.set_referer_cookies_ref_url_max_length)}"
           cookies[RefererTracking.set_referer_cookies_name] = { :value => cookie_info, :expires => 5.years.from_now, :domain => :all }
         end
 
-        logger.info( "REFERER_TRACKING_FIRST: ver04 (ref|first) ||| #{hash[:session_referer_url]} ||| #{hash[:session_first_url]}" )
+        logger.info( "REFERER_TRACKING_FIRST: ver04 (ref|first) ||| #{hash["session_referer_url"]} ||| #{hash["session_first_url"]}" )
       end
 
     end
   end
 
   def referer_tracking_after_create(record)
-    @referer_tracking_saved_records = [] if @referer_tracking_saved_records.nil?
+    @referer_tracking_saved_records ||= []
     if session && session["referer_tracking"]
       ses = session["referer_tracking"]
 
@@ -42,14 +45,15 @@ module RefererTracking::ControllerAddons
 
       ses.each_pair do |key, value|
         ref_mod[key] = value if ref_mod.has_attribute?(key)
-        ref_mod.infos_session[key] = value unless [:session_referer_url, :session_first_url].include?(key)
+        ref_mod.infos_session[key] = value unless ["session_referer_url", "session_first_url"].include?(key.to_s)
       end
 
-      req = @referer_tracking_request_add_infos
-      if req && req.is_a?(Hash)
-        req.each_pair do |key, value|
-          ref_mod[key] = value if ref_mod.has_attribute?(key)
-          ref_mod.infos_request[key] = value
+      if defined?(@referer_tracking_request_add_infos)
+        if (req = @referer_tracking_request_add_infos) && req.is_a?(Hash)
+          req.each_pair do |key, value|
+            ref_mod[key] = value if ref_mod.has_attribute?(key)
+            ref_mod.infos_request[key] = value
+          end
         end
       end
 
@@ -60,7 +64,7 @@ module RefererTracking::ControllerAddons
       ref_mod[:session_id] = request.session["session_id"]
 
       unless cookies[RefererTracking.set_referer_cookies_name].blank?
-        cookie_ver, cookie_time_org, cookie_first_url, cookie_referer_url = cookies[RefererTracking.set_referer_cookies_name].to_s.split("|||")
+        _cookie_ver, cookie_time_org, cookie_first_url, cookie_referer_url = cookies[RefererTracking.set_referer_cookies_name].to_s.split("|||")
         ref_mod[:cookie_first_url] = cookie_first_url
         ref_mod[:cookie_referer_url] = cookie_referer_url
         ref_mod[:cookie_time] = Time.at(cookie_time_org.to_i)
@@ -89,19 +93,19 @@ module RefererTracking::ControllerAddons
   # Add only if referer_tracking already in session and key has not been added/changed before
   # So this is only performed on the first time of the session
   def referer_tracking_add_info(key, value)
-    if !session[:referer_tracking].nil? && session[:referer_tracking][key.to_sym].nil?
+    if !session[:referer_tracking].nil? && session[:referer_tracking][key.to_s].nil?
       referer_tracking_set_info(key, value)
     end
   end
 
   def referer_tracking_set_info(key, value)
     if !session[:referer_tracking].nil?
-      session[:referer_tracking][key.to_sym] = value
+      session[:referer_tracking][key.to_s] = value
     end
   end
 
   def referer_tracking_get_info(key)
-    session[:referer_tracking].nil? ? nil : session[:referer_tracking][key.to_sym]
+    session[:referer_tracking].nil? ? nil : session[:referer_tracking][key.to_s]
   end
 
   ###############################################

data/lib/referer_tracking/version.rb

@@ -1,3 +1,3 @@
 module RefererTracking
-  VERSION = "4.4.1"
+  VERSION = "5.0.0"
 end