rails_surrogate_key_logging 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d8e483ef4291595ab8400d078f6b05d806b3f6ff2615742d1b581a339a471b
-  data.tar.gz: 45e9c0742590d9b511b9d0895d66243c89271c7b76e583c53886e6ff8c968f9e
+  metadata.gz: ea7560b27adda872ef0742f8d5be560541849824d8cf3ec5ceaba42b50e2a4f7
+  data.tar.gz: a5ed6d8ced6c1fca2067dea1c4c975df569534542e2c0f8caf53ddac9298bb7b
 SHA512:
-  metadata.gz: abdb1c362e0f5dc3834cbcdf3e72053ff938dc300625ec573d0d2162c3a4039fe0f6ce9ef72b2107a1ad8dba7874189d617893f754e0d07e292b36399b1998d1
-  data.tar.gz: 21bada8eb48e7bb83bea8ed5fd982cf41c32ec97f22dfee44330d219a9db61921d89186c59fc0277b85bb29309930e5fa68e4fc0cb003f5a4981a5d3e28527bb
+  metadata.gz: 5ea28f7ec2eae90380bf4d786fa640bcf3d6489ca594ee7b76fe8f36b87d284fb3e6d8b1d3c7349f32fb947ee123c3614e98be1859f9e77313b7f3acf6e3a20c
+  data.tar.gz: 2d23b23e491b82ee53daa5987666797622912c9d915d8f63213668811fcfc7bf2b7ce248b316b1c5ede1d2702f4e637f9bbb3fb19e548340476a8d3c4cd240f9

data/app/models/surrogate_key_logging/surrogate.rb

@@ -15,14 +15,16 @@ module SurrogateKeyLogging
         where(hashed_value: hash_value(value)).select(:key).first&.key
       end
 
-      def add(surrogate, value)
-        s = new(key: surrogate, value: value, hashed_value: hash_value(value))
-        s.save
-      end
-
       def use(surrogate)
         where(key: surrogate).touch_all
       end
+
+      def find_or_create_surrogate_for_value(value, key_for)
+        hashed_value = hash_value(value)
+        upsert_all([{key: key_for.call(value), value: value, hashed_value: hashed_value}], update_only: 'updated_at')
+        where(hashed_value: hashed_value).select(:key).first.key
+      end
+
     end
   end
 end

data/lib/surrogate_key_logging/engine.rb

@@ -34,6 +34,10 @@ module SurrogateKeyLogging
       end
     end
 
+    initializer 'surrogate_key_logging.middleware' do |app|
+      app.middleware.insert_before(0, Middleware)
+    end
+
     initializer 'surrogate_key_logging.filter_parameters' do
       if SurrogateKeyLogging.config.enabled
       end

data/lib/surrogate_key_logging/key_manager.rb

@@ -28,13 +28,9 @@ module SurrogateKeyLogging
     end
 
     def get_non_cached(value)
-      stored = key_store.surrogate_for_value(value)
-      return stored if stored.present?
-      surrogate = key_for.call(value)
-      key_store.save(surrogate, value)
-      surrogate
+      key_store.get(value)
     end
-    
+
     def call(_key, value, _parents = [], _original_params = nil)
       return "" if value.blank?
       surrogate = get(value)

data/lib/surrogate_key_logging/key_store/active_record.rb

@@ -5,7 +5,7 @@ module SurrogateKeyLogging
 
     class ActiveRecord < Base
 
-      attr_reader :model
+      attr_reader :model, :key_for
 
       def initialize
         if SurrogateKeyLogging.config.key?(:model) && SurrogateKeyLogging.config.model.present?
@@ -14,24 +14,16 @@ module SurrogateKeyLogging
         else
           @model = SurrogateKeyLogging::Surrogate
         end
+        @key_for = SurrogateKeyLogging.config.key_for
       end
 
-      def surrogate_for_value(value)
-        key = model.surrogate_for_value(value)
-        use(key)
-        key
-      end
-
-      def value_for_surrogate(surrogate)
-        model.value_for_surrogate(surrogate)
-      end
-
-      def save(surrogate, value)
-        model.add(surrogate, value)
-      end
-
-      def use(surrogate)
-        model.use(surrogate)
+      def get(value)
+        _get = -> { model.find_or_create_surrogate_for_value(value, key_for) }
+        if SurrogateKeyLogging.config.debug
+          _get.call
+        else
+          ::ActiveRecord::Base.logger.silence { _get.call }
+        end
       end
 
     end

data/lib/surrogate_key_logging/key_store/base.rb

@@ -4,19 +4,7 @@ module SurrogateKeyLogging
   module KeyStore
     class Base
 
-      def surrogate_for_value(value)
-        raise NotImplementedError
-      end
-
-      def value_for_surrogate(surrogate)
-        raise NotImplementedError
-      end
-
-      def save(surrogate, value)
-        raise NotImplementedError
-      end
-      
-      def use(surrogate)
+      def get(value, generator)
         raise NotImplementedError
       end
       

data/lib/surrogate_key_logging/middleware.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SurrogateKeyLogging
+  class Middleware
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      SurrogateKeyLogging.reset
+      @app.call(env)
+    end
+
+  end
+end

data/lib/surrogate_key_logging/sidekiq.rb

@@ -29,6 +29,7 @@ if defined?(::Sidekiq)
                 hash['args'][param.last] = job_hash['args'][i]
               end
               hash['args'] = SurrogateKeyLogging.filter_for_attributes(klass.surrogate_params).filter(hash['args'])
+            rescue NameError # TODO: Add support for Sidekiq::Extensions::DelayedMailer (ApplicationMailer.delay.some_mail) and Sidekiq::Extensions::Delayed (SomeClass.delay.some_method)
             end
           end
           hash

data/lib/surrogate_key_logging/version.rb

@@ -4,7 +4,7 @@ module SurrogateKeyLogging
 
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 3
     PATCH = 0
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_surrogate_key_logging
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Taylor Yelverton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -120,6 +120,7 @@ files:
 - lib/surrogate_key_logging/key_store.rb
 - lib/surrogate_key_logging/key_store/active_record.rb
 - lib/surrogate_key_logging/key_store/base.rb
+- lib/surrogate_key_logging/middleware.rb
 - lib/surrogate_key_logging/sidekiq.rb
 - lib/surrogate_key_logging/version.rb
 - lib/tasks/key_store/active_record.rake