rails_surrogate_key_logging 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ffb01158739d8e9483393f18c917c77a17ef7632153c831f15856ec737faf2f
-  data.tar.gz: 54c085f0021eadfa90cb57c86c72327aa2dece0ff5b21a6b1abbf2dfdcbf6bf2
+  metadata.gz: 0c90ffc261a0cc4de8d88266fd00e0ce40c4c5a1802cf60b2fdaa72c6d345d61
+  data.tar.gz: 13dfb52ddf21fd49d28930043a4c8a3160c466fb2a03dfc8e9e369ad9b0007ab
 SHA512:
-  metadata.gz: 332f4dbc5a940d9f761236ca335acf8314ed297e32be30146ef2f8b1d12e6c4ae2f3b29ec3c06ec21a16f5d9586134a756c17655446dd79b2d23be5aba464c9c
-  data.tar.gz: d59829e5426f10e971d32d3390017b6c370f4d0552cd84ff5eab16d5224959e75c1769e976f265c03150f86d2ac46913ac86474cf73f1e499813597976325b7d
+  metadata.gz: cc2df820cec2c3c042552fd8e9e7f16c87b5c8592228a9f8c03e9c91e40417d5c0b7cf8cb2e15d729e56837e7ec6cccbb63a75e10c8cfd633ff55c6e029a7668
+  data.tar.gz: 80ce2c893ef9394acec270591f2c63d4f5603d701fd12eb8562a9b23a9d07555f8af0481a0e1df92692900e080bf826025cd20f77295514e8ac5fe0186a659cd

data/lib/surrogate_key_logging/engine.rb

@@ -17,11 +17,6 @@ module SurrogateKeyLogging
       g.templates.unshift File.expand_path('lib/templates', root)
     end
 
-    rake_tasks do
-      # load 'tasks/surrogate_key_logging.rake'
-      # load 'tasks/key_store/active_record.rake'
-    end
-
     initializer 'surrogate_key_logging.config' do |app|
       SurrogateKeyLogging.configure do |config|
         config.enabled = Rails.env.production? unless config.key?(:enabled)
@@ -35,7 +30,9 @@ module SurrogateKeyLogging
     end
 
     initializer 'surrogate_key_logging.middleware' do |app|
-      app.middleware.insert_before(0, Middleware)
+      if SurrogateKeyLogging.config.enabled
+        app.middleware.insert_before(0, Middleware)
+      end
     end
 
     initializer 'surrogate_key_logging.filter_parameters' do
@@ -53,5 +50,15 @@ module SurrogateKeyLogging
       end
     end
 
+    initializer 'surrogate_key_logging.sidekiq' do
+      if SurrogateKeyLogging.config.enabled && defined?(::Sidekiq)
+        Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.prepend SurrogateKeyLogging::SidekiqMiddleware
+          end
+        end
+      end
+    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
@@ -38,3 +39,14 @@ if defined?(::Sidekiq)
 
   end
 end
+
+module SurrogateKeyLogging
+  class SidekiqMiddleware
+
+    def call(env)
+      yield
+      SurrogateKeyLogging.reset
+    end
+
+  end
+end

data/lib/surrogate_key_logging/version.rb

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

data/lib/surrogate_key_logging.rb

@@ -41,7 +41,7 @@ module SurrogateKeyLogging
     def reset
       reset! if config.cache
     end
-    
+
     def reset!
       @key_manager = @parameter_filter = nil
     end
@@ -55,7 +55,7 @@ module SurrogateKeyLogging
     end
 
     def filter_for_attributes(attrs)
-      ::ActiveSupport::ParameterFilter.new(attrs, mask: key_manager)
+      config.enabled ? ::ActiveSupport::ParameterFilter.new(attrs, mask: key_manager) : attrs
     end
 
     def key_store
@@ -63,11 +63,11 @@ module SurrogateKeyLogging
     end
 
     def filter_parameters(params)
-      parameter_filter.filter params
+      config.enabled ? parameter_filter.filter(params) : params
     end
 
     def surrogate_for(value)
-      key_manager.get(value)
+      config.enabled ? key_manager.get(value) : value
     end
 
     def add_param_to_filter(attr, *parents)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_surrogate_key_logging
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Taylor Yelverton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack