rails_surrogate_key_logging 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6c120ebe49e9724f0c2324feefd62dc61c317b87c118e438d3735364193897
-  data.tar.gz: a33a587bdc49075fcf20917797a9a631702ff4b52bd54f021e0088f383e36d3a
+  metadata.gz: 51ed41b166599e90b95c595ecbd87fb3812dbeca4087dec61f4a6d4efc03793f
+  data.tar.gz: 5389b994867bac68b6edaeaf90e2af777af74634bfea2d505378bb8f5ec55432
 SHA512:
-  metadata.gz: f5020c84352f1dc337ae18b2a8e4f6c8a576bea91ecdaf710fe9d0402fc31f82c6c865a23dee02269e45f7e3faa8e72208f8f64764357b765591a97ae8d5157f
-  data.tar.gz: e7c60aeebd180e87480c3e5857d94cd3926cb945545cc8c0a56f4bc5735dcd4c40b075aae1373e098a8186c3a641d5a3041582f88d42ae5740ebee6ed11c7abc
+  metadata.gz: 799c109ed078447639c5c06f2f6f20ba9d27d5fa1674b61cfc9f8ac96f0d033fe9c01b8472f03676e2852752ae42ca108b2b5b3f13093f22d03d5ae222b1eb4f
+  data.tar.gz: 2c06278e7a1744f49bd90e88682b82d69b40f502a5af20b69fb0bc1e264110996806a7a340cdd2ab63c5e1cbbbb9a329ff1483273ff8d46fc2c75cc1c6e4b502

data/lib/surrogate_key_logging/action_controller/params.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module SurrogateKeyLogging
+  module ActionController
+    module Params
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def surrogate_params(*params, action: '*')
+          @surrogate_params ||= ActiveSupport::HashWithIndifferentAccess.new {|h,k| h[k] = [] }
+          params.each do |param|
+            param = param.to_s
+            @surrogate_params[action] << param
+            if param.include?('.')
+              dots = param.split('.')
+              @surrogate_params[action] << [dots.first, dots[1..-1].map{|p| "[#{p}]"}].compact.join('')
+              @surrogate_params[action] << URI.encode_www_form_component(@surrogate_params[action].last)
+              @surrogate_params[action] << dots.map{|p| "[#{p}]"}.join('')
+              @surrogate_params[action] << URI.encode_www_form_component(@surrogate_params[action].last)
+            elsif param.include?('[') && param.include?(']')
+              @surrogate_params[action] << URI.encode_www_form_component(param)
+            else
+              @surrogate_params[action] << param
+            end
+          end
+          @surrogate_params
+        end
+      end
+
+    end
+  end
+end

data/lib/surrogate_key_logging/action_dispatch/params_filter.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module SurrogateKeyLogging
+  module ActionDispatch
+    class ParamsFilter
+
+      class << self
+        def call(params, req = nil)
+          new(params, req).filtered
+        end
+      end
+
+      attr_reader :params, :req
+      
+      def initialize(params, req = nil)
+        @params = params
+        @req = req
+      end
+
+      def filterable_params
+        @filterable_params ||= if req.controller_class.respond_to?(:surrogate_params)
+          surrogate_params = req.controller_class.surrogate_params
+          surrogate_params[params[:action]] + surrogate_params['*']
+        else
+          []
+        end
+      end
+
+      def params_filter
+        return @params_filter if @params_filter
+        attrs = SurrogateKeyLogging.parameter_filter.instance_variable_get(:@filters).dup
+        attrs += filterable_params
+        @params_filter = SurrogateKeyLogging.filter_for_attributes(attrs)
+      end
+
+      def filtered
+        @filtered ||= params_filter.filter params
+      end
+
+    end
+  end
+end

data/lib/surrogate_key_logging/action_dispatch/query_string_filter.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module SurrogateKeyLogging
+  module ActionDispatch
+    class QueryStringFilter
+
+      class << self
+        def call(qs, req = nil)
+          new(qs, req).filtered
+        end
+      end
+
+      attr_reader :qs, :req
+      
+      def initialize(qs, req = nil)
+        @qs = qs
+        @req = req
+      end
+
+      def path_params
+        @path_params ||= begin
+          req.routes.recognize_path_with_request(req, req.path, {})
+        rescue
+          {}
+        end
+      end
+  
+      def controller_class
+        @controller_class = req.controller_class_for(path_params[:controller])
+      end
+  
+      def filterable_params
+        @filterable_params ||= if controller_class.respond_to?(:surrogate_params)
+          surrogate_params = controller_class.surrogate_params
+          surrogate_params[path_params[:action]] + surrogate_params['*']
+        else
+          []
+        end
+      end
+
+      def params_filter
+        return @params_filter if @params_filter
+        attrs = SurrogateKeyLogging.parameter_filter.instance_variable_get(:@filters).dup
+        attrs += filterable_params
+        @params_filter = SurrogateKeyLogging.filter_for_attributes(attrs)
+      end
+
+      def filtered
+        @filtered ||= qs.gsub(::ActionDispatch::Request::PAIR_RE) do |_|
+          params_filter.filter(::Regexp.last_match(1) => ::Regexp.last_match(2)).first.join('=')
+        end
+      end
+
+    end
+  end
+end

data/lib/surrogate_key_logging/action_dispatch/request.rb

@@ -4,10 +4,12 @@ module SurrogateKeyLogging
   module ActionDispatch
     module Request
 
+      def filtered_parameters
+        @filtered_parameters ||= ParamsFilter.call(super, self)
+      end
+
       def filtered_query_string
-        super.gsub(::ActionDispatch::Request::PAIR_RE) do |_|
-          SurrogateKeyLogging.filter_parameters(::Regexp.last_match(1) => ::Regexp.last_match(2)).first.join('=')
-        end
+        QueryStringFilter.call(super, self)
       end
 
     end

data/lib/surrogate_key_logging/action_dispatch.rb

@@ -4,6 +4,8 @@ module SurrogateKeyLogging
   module ActionDispatch
     extend ActiveSupport::Autoload
 
+    autoload :ParamsFilter
+    autoload :QueryStringFilter
     autoload :Request
 
   end

data/lib/surrogate_key_logging/active_record/attributes.rb

@@ -7,13 +7,9 @@ module SurrogateKeyLogging
     module Attributes
       extend ActiveSupport::Concern
 
-      included do
-        surrogate_parent_names model_name.singular, model_name.plural
-      end
-
       class_methods do
         def surrogate_parent_names(*names)
-          @surrogate_parent_names ||= []
+          @surrogate_parent_names ||= [model_name.singular, model_name.plural]
           names.each do |name|
             @surrogate_parent_names << name.to_sym
             surrogate_attributes.each do |attr|

data/lib/surrogate_key_logging/engine.rb

@@ -49,11 +49,5 @@ module SurrogateKeyLogging
       end
     end
 
-    initializer 'surrogate_key_logging.middleware' do
-      if SurrogateKeyLogging.config.enabled
-        Rails.application.config.middleware.insert_before 0, Middleware
-      end
-    end
-
   end
 end

data/lib/surrogate_key_logging/version.rb

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

data/lib/surrogate_key_logging.rb

@@ -49,7 +49,11 @@ module SurrogateKeyLogging
     end
 
     def parameter_filter
-      @parameter_filter ||= ::ActiveSupport::ParameterFilter.new(surrogate_attributes, mask: key_manager)
+      @parameter_filter ||= filter_for_attributes(surrogate_attributes)
+    end
+
+    def filter_for_attributes(attrs)
+      ::ActiveSupport::ParameterFilter.new(attrs, mask: key_manager)
     end
 
     def key_store

data/rails_surrogate_key_logging.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_dependency('actionpack', '>= 6.0.0')
-  s.add_dependency('activerecord', '>= 6.0.0')
-  s.add_dependency('activesupport', '>= 6.0.0')
-  s.add_dependency('railties', '>= 6.0.0')
+  s.add_dependency('actionpack', '>= 6.0.0', '< 7.0.0')
+  s.add_dependency('activerecord', '>= 6.0.0', '< 7.0.0')
+  s.add_dependency('activesupport', '>= 6.0.0', '< 7.0.0')
+  s.add_dependency('railties', '>= 6.0.0', '< 7.0.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_surrogate_key_logging
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Taylor Yelverton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +77,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 description: ''
 email: rubygems@yelvert.io
 executables: []
@@ -77,7 +101,10 @@ files:
 - lib/surrogate_key_logging.rb
 - lib/surrogate_key_logging/action_controller.rb
 - lib/surrogate_key_logging/action_controller/log_subscriber.rb
+- lib/surrogate_key_logging/action_controller/params.rb
 - lib/surrogate_key_logging/action_dispatch.rb
+- lib/surrogate_key_logging/action_dispatch/params_filter.rb
+- lib/surrogate_key_logging/action_dispatch/query_string_filter.rb
 - lib/surrogate_key_logging/action_dispatch/request.rb
 - lib/surrogate_key_logging/active_record.rb
 - lib/surrogate_key_logging/active_record/attributes.rb
@@ -89,7 +116,6 @@ 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/version.rb
 - lib/tasks/key_store/active_record.rake
 - lib/tasks/surrogate_key_logging.rake

data/lib/surrogate_key_logging/middleware.rb

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