deprecation_collector 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f62a11c42b2d8d6ee4236c98960b452d5aa2c0ec76d83d6215101de55edf6a8
-  data.tar.gz: aff231737c13f8e47c63e60706cbee894d50da276caff00ec4898c766da9ee19
+  metadata.gz: 60dd6c4c552576ae19c4cb2a84232c5f7e6b83b0d8fb8e11b3a98bc5abf69bdf
+  data.tar.gz: f9f638c079489229bed7e525caaed0fb995b19ceff250146644d405462739e39
 SHA512:
-  metadata.gz: d053f33b41ca1dd5b20b81069bef9cf178f4f10fe7a00f193d8a5bdb4e1aa30267223df74bfe3abd234dd08ba2ccfaef757b5febbe8546393c808c1b7b68ecc7
-  data.tar.gz: b4c259673e8b2d4b19de8e3f259563ad19e34381c43b1dfb141e9193bc1f57606eb2b48c81dfb88b699440bbf4f5922a2af92c4ead1c066a90e468bb82a973c0
+  metadata.gz: b80b9bcfdbbccaf112b447f3ab04960f042ce98c74b53b35b76e9c4f3740a37fa1cc894ce632e7206c76bcb7eaaf8e13f596bcaa53398eb611fcd245a8b77214
+  data.tar.gz: 35992cd452d01b83a5884299873bd2d80c2e5d42f8977d77b72e0635f24d5bda475200eed936e74102181205575d62e511085606af3868b059377780e9efc8e1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deprecation_collector (0.5.0)
+    deprecation_collector (0.5.1)
       redis (>= 3.0)
 
 GEM

data/gemfiles/rails_6.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    deprecation_collector (0.5.0)
+    deprecation_collector (0.5.1)
       redis (>= 3.0)
 
 GEM

data/gemfiles/rails_7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    deprecation_collector (0.5.0)
+    deprecation_collector (0.5.1)
       redis (>= 3.0)
 
 GEM

data/gemfiles/rails_none.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    deprecation_collector (0.5.0)
+    deprecation_collector (0.5.1)
       redis (>= 3.0)
 
 GEM

data/lib/deprecation_collector/storage.rb

@@ -7,6 +7,8 @@ class DeprecationCollector
     # :nodoc:
     class Base
       # rubocop:disable Style/SingleLineMethods
+      def initialize(**); end
+      def support_disabling?; false; end
       def enabled?; true; end
       def enable; end
       def disable; end
@@ -16,6 +18,7 @@ class DeprecationCollector
 
       def delete(digests); end
       def clear(enable: false); end
+      def flush(**); end
 
       def store(_deprecation); raise("Not implemented"); end
       # rubocop:enable Style/SingleLineMethods
@@ -32,9 +35,9 @@ class DeprecationCollector
     class Redis < Base
       attr_accessor :write_interval, :write_interval_jitter, :redis, :count
 
-      def initialize(redis, mutex: nil, count: false, write_interval: 900, write_interval_jitter: 60,
+      def initialize(redis: nil, mutex: nil, count: false, write_interval: 900, write_interval_jitter: 60,
                             key_prefix: nil)
-        super()
+        super
         @key_prefix = key_prefix || "deprecations"
         @redis = redis
         @last_write_time = current_time
@@ -47,6 +50,10 @@ class DeprecationCollector
         @known_digests = Set.new
       end
 
+      def support_disabling?
+        true
+      end
+
       def unsent_deprecations
         @deprecations
       end

data/lib/deprecation_collector/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class DeprecationCollector
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/deprecation_collector/web/helpers.rb

@@ -65,7 +65,10 @@ class DeprecationCollector
         msg = deprecation[:message]
         return :kwargs if msg.include?("Using the last argument as keyword parameters is deprecated") ||
                           msg.include?("Passing the keyword argument as the last hash parameter is deprecated")
-        return :test if msg.include?("trigger_kwargs_error_warning") || msg.include?("trigger_rails_deprecation")
+      end
+
+      def test_deprecation?(deprecation)
+        %w[trigger_kwargs_error_warning trigger_rails_deprecation].any? { |method| deprecation[:message]}
       end
 
       def deprecation_tags(deprecation)
@@ -73,6 +76,7 @@ class DeprecationCollector
         if (detected_tag = detect_tag(deprecation))
           tags << detected_tag
         end
+        tags << :test if test_deprecation?(deprecation)
         tags << deprecation[:realm] if deprecation[:realm] && deprecation[:realm] != "rails"
         tags.merge(deprecation.dig(:notes, :tags) || [])
 

data/lib/deprecation_collector/web/views/index.html.template.rb

@@ -6,7 +6,8 @@ _buf = ''; _buf << ("<header class=\"mb-3\"><h1>Deprecations</h1><a class=\"btn
 ; 
 ; 
 ; 
-; if DeprecationCollector.instance.enabled_in_redis?; 
+; if DeprecationCollector.instance.storage.support_disabling?; 
+; if DeprecationCollector.instance.storage.enabled?; 
 ; 
 ; 
 ; 
@@ -16,7 +17,7 @@ _buf = ''; _buf << ("<header class=\"mb-3\"><h1>Deprecations</h1><a class=\"btn
 ; 
 ; _buf << ("<a class=\"btn btn-secondary\" data-method=\"post\"".freeze); _slim_codeattributes4 = enable_deprecations_path; if _slim_codeattributes4; if _slim_codeattributes4 == true; _buf << (" href=\"\"".freeze); else; _buf << (" href=\"".freeze); _buf << ((::Temple::Utils.escape_html((_slim_codeattributes4))).to_s); _buf << ("\"".freeze); end; end; _buf << (" rel=\"nofollow\">Turn on (after workers restart)</a> ".freeze); 
 ; 
-; end; _buf << ("</header><main><table class=\"table table-striped\"><tr><th>Count</th><th>Message</th><th>Location</th><th>Ruby/Rails</th></tr>".freeze); 
+; end; end; _buf << ("</header><main><table class=\"table table-striped\"><tr><th>Count</th><th>Message</th><th>Location</th><th>Ruby/Rails</th></tr>".freeze); 
 ; 
 ; 
 ; 

data/lib/deprecation_collector.rb

@@ -78,35 +78,33 @@ class DeprecationCollector
     self.count = false
     self.write_interval = 900 # 15.minutes
     self.write_interval_jitter = 60
+    self.key_prefix = "deprecations"
     @context_saver = nil
   end
 
   def redis=(val)
     raise ArgumentError, "redis should not be nil" unless val
-
-    @storage ||= DeprecationCollector::Storage::Redis.new(val, mutex: @instance_mutex, count: count, # rubocop:disable Naming/MemoizedInstanceVariableName
-                                                               write_interval: write_interval,
-                                                               write_interval_jitter: write_interval_jitter,
-                                                               key_prefix: key_prefix)
+    self.storage = DeprecationCollector::Storage::Redis unless storage.respond_to?(:redis=)
+    storage.redis = val
   end
 
   def count=(val)
-    storage.count = val if storage.respond_to?(:count)
+    storage.count = val if storage.respond_to?(:count=)
     @count = val
   end
 
   def write_interval=(val)
-    storage.write_interval = val if storage.respond_to?(:write_interval)
+    storage.write_interval = val if storage.respond_to?(:write_interval=)
     @write_interval = val
   end
 
   def write_interval_jitter=(val)
-    storage.write_interval_jitter = val if storage.respond_to?(:write_interval_jitter)
+    storage.write_interval_jitter = val if storage.respond_to?(:write_interval_jitter=)
     @write_interval_jitter = val
   end
 
   def key_prefix=(val)
-    storage.key_prefix = val
+    storage.key_prefix = val if storage.respond_to?(:key_prefix=)
     @key_prefix = val
   end
 
@@ -114,6 +112,14 @@ class DeprecationCollector
     @storage ||= DeprecationCollector::Storage::StdErr.new
   end
 
+  def storage=(val)
+    return @storage = val unless val.is_a?(Class)
+
+    @storage = val.new(mutex: @instance_mutex, count: count,
+                       write_interval: write_interval, write_interval_jitter: write_interval_jitter,
+                       key_prefix: key_prefix)
+  end
+
   def ignored_messages=(val)
     @ignore_message_regexp = (val && Regexp.union(val)) || nil
   end
@@ -173,6 +179,7 @@ class DeprecationCollector
     storage.clear(enable: enable)
   end
 
+  # deprecated, use storage.enabled?
   def enabled_in_redis?
     storage.enabled?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deprecation_collector
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis