cruft_tracker 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a8291697321237133216a66cb9d58b1e526fe537dddd05644c1fafeaaafb36
-  data.tar.gz: 4ff9fe36c9efd852b03dfc45b7511a74f08f6d92687582ca1316dd8a992031e2
+  metadata.gz: a82b0ad009d2cde41d3b6ed06e4e7446fdbdf4a6859320c31e3088e6ef407f86
+  data.tar.gz: 73bac370ea7ba50131e1229dbe08dcec1ad3bbce250eaeb3cf0aeb143157f4ab
 SHA512:
-  metadata.gz: 7151e6f098431af83070f860877bf3a7e7446b3b13ba0116c56cf5b6b77bf023282c602bf78e1cca181e5cef25ac3e27fac6b2a95ca45d9c1e69b01652efea5b
-  data.tar.gz: bebf3b0e9acbaaf3f4b60753903f48cd548b9e935061c6a28333e8b53eaff8f2099e0d5ff34234864c257c7110b8ce6a7ad75d3e0cae84bd23e264118ee652d8
+  metadata.gz: 03fb7812e4214f3a99b722236e1709af842a9633e33497366dc47f106e63b1c7c577614fc105b180ecd172b26e1f74cd5109cf9185338cd4c14d9be8b7754af2
+  data.tar.gz: 4b7f5bd324d2e5b51a03ac50f2c046f9c3480b8f2edcbd4be8b02c551c51086f58d05c36abc35cd0cda93a78b17f6c4a63b4b891ec690054740b0876500b3732

data/README.md

@@ -47,6 +47,16 @@ CruftTracker.init do
 end
 ```
 
+Note: you may need to wrap the `CruftTracker.init` call in `Rails.application.reloader.to_prepare` to prevent deprecation warnings related to autoloading constants during initialization. For example:
+
+```ruby
+Rails.application.reloader.to_prepare do
+  CruftTracker.init do
+    # your configuration.... (more on this below)
+  end
+end
+```
+
 ### Tracking method invocations
 
 CruftTracker is pretty simple. Let's say you have a class (or module) like this...
@@ -355,7 +365,7 @@ Let's say you have this view and you're just not sure it's being used anymore:
 <!-- app/views/something/some_view.html.erb -->
   
 <div>
-	<%- if @data.present? %>
+  <%- if @data.present? %>
   	<strong>Woo hoo!</strong>
   <% end %>
 </div>

data/app/services/cruft_tracker/record_arguments.rb

@@ -9,9 +9,9 @@ module CruftTracker
     private
 
     def execute
-      return unless arguments_record.present?
-
       CruftTracker::LogSuppressor.suppress_logging do
+        return unless arguments_record.present?
+
         arguments_record.with_lock do
           arguments_record.reload
           arguments_record.update(occurrences: arguments_record.occurrences + 1)
@@ -24,22 +24,23 @@ module CruftTracker
     def arguments_record
       @arguments_record ||=
         begin
-          return find_existing_arguments_record if max_records_reached?
+          arguments_record = CruftTracker::Argument.find_by(
+            method: method,
+            arguments_hash: arguments_hash
+          )
+
+          if arguments_record.present? || max_records_reached?
+            return arguments_record
+          end
 
           CruftTracker::Argument.create(
             method: method,
             arguments_hash: arguments_hash,
             arguments: transformed_arguments
           )
-        rescue ActiveRecord::RecordNotUnique
-          find_existing_arguments_record
         end
     end
 
-    def find_existing_arguments_record
-      CruftTracker::Argument.find_by(arguments_hash: arguments_hash)
-    end
-
     def arguments_hash
       Digest::MD5.hexdigest(transformed_arguments.to_json)
     end

data/app/services/cruft_tracker/record_backtrace.rb

@@ -7,9 +7,9 @@ module CruftTracker
     private
 
     def execute
-      return unless backtrace_record.present?
-
       CruftTracker::LogSuppressor.suppress_logging do
+        return unless backtrace_record.present?
+        
         backtrace_record.with_lock do
           backtrace_record.reload
           backtrace_record.update(occurrences: backtrace_record.occurrences + 1)
@@ -22,22 +22,23 @@ module CruftTracker
     def backtrace_record
       @backtrace_record ||=
         begin
-          return find_existing_backtrace_record if max_records_reached?
+          backtrace_record = CruftTracker::Backtrace.find_by(
+            traceable: method,
+            trace_hash: backtrace_hash
+          )
+
+          if backtrace_record.present? || max_records_reached?
+            return backtrace_record
+          end
 
           CruftTracker::Backtrace.create(
             traceable: method,
             trace_hash: backtrace_hash,
             trace: filtered_backtrace
           )
-        rescue ActiveRecord::RecordNotUnique
-          find_existing_backtrace_record
         end
     end
 
-    def find_existing_backtrace_record
-      CruftTracker::Backtrace.find_by(trace_hash: backtrace_hash)
-    end
-
     def backtrace_hash
       Digest::MD5.hexdigest(filtered_backtrace.to_json)
     end

data/app/services/cruft_tracker/record_render_metadata.rb

@@ -10,9 +10,10 @@ module CruftTracker
 
     def execute
       return unless metadata.present?
-      return unless render_metadata_record.present?
 
       CruftTracker::LogSuppressor.suppress_logging do
+        return unless render_metadata_record.present?
+        
         render_metadata_record.with_lock do
           render_metadata_record.reload
           render_metadata_record.update(
@@ -25,22 +26,23 @@ module CruftTracker
     def render_metadata_record
       @render_metadata_record ||=
         begin
-          return find_existing_render_metadata_record if max_records_reached?
+          render_metadata_record = CruftTracker::RenderMetadata.find_by(
+            view_render: view_render,
+            metadata_hash: metadata_hash
+          )
+
+          if render_metadata_record.present? || max_records_reached?
+            return render_metadata_record
+          end
 
           CruftTracker::RenderMetadata.create(
             view_render: view_render,
             metadata_hash: metadata_hash,
             metadata: metadata
           )
-        rescue ActiveRecord::RecordNotUnique
-          find_existing_render_metadata_record
         end
     end
 
-    def find_existing_render_metadata_record
-      CruftTracker::RenderMetadata.find_by(metadata_hash: metadata_hash)
-    end
-
     def metadata_hash
       Digest::MD5.hexdigest([view_render.render_hash, metadata].to_json)
     end

data/app/services/cruft_tracker/record_view_render.rb

@@ -20,9 +20,9 @@ module CruftTracker
     private
 
     def execute
-      return unless view_render_record.present?
-
       CruftTracker::LogSuppressor.suppress_logging do
+        return unless view_render_record.present?
+
         view.with_lock do
           view.reload
           view.update(renders: view.renders + 1)
@@ -52,7 +52,14 @@ module CruftTracker
     def view_render_record
       @view_render_record ||=
         begin
-          return find_existing_view_render_record if max_records_reached?
+          view_render_record = CruftTracker::ViewRender.find_by(
+            view: view,
+            render_hash: render_hash
+          )
+
+          if view_render_record.present? || max_records_reached?
+            return view_render_record
+          end
 
           CruftTracker::ViewRender.create(
             view: view,
@@ -63,15 +70,9 @@ module CruftTracker
             http_method: http_method,
             render_stack: render_stack
           )
-        rescue ActiveRecord::RecordNotUnique
-          find_existing_view_render_record
         end
     end
 
-    def find_existing_view_render_record
-      CruftTracker::ViewRender.find_by(render_hash: render_hash)
-    end
-
     def render_hash
       Digest::MD5.hexdigest(
         {

data/app/services/cruft_tracker/track_method.rb

@@ -77,17 +77,19 @@ module CruftTracker
     end
 
     def create_or_find_method_record
-      CruftTracker::Method.create(
+      method_record = CruftTracker::Method.find_by(
         owner: owner.name,
         name: name,
-        method_type: method_type,
-        comment: comment
+        method_type: method_type
       )
-    rescue ActiveRecord::RecordNotUnique
-      CruftTracker::Method.find_by(
+
+      return method_record if method_record.present?
+
+      CruftTracker::Method.create(
         owner: owner.name,
         name: name,
-        method_type: method_type
+        method_type: method_type,
+        comment: comment
       )
     end
 

data/app/services/cruft_tracker/track_view.rb

@@ -52,9 +52,11 @@ module CruftTracker
     end
 
     def create_or_find_view_record
+      view_record = CruftTracker::View.find_by(view: view)
+
+      return view_record if view_record.present?
+
       CruftTracker::View.create(view: view, comment: comment)
-    rescue ActiveRecord::RecordNotUnique
-      CruftTracker::View.find_by(view: view)
     end
   end
 end

data/lib/cruft_tracker/engine.rb

@@ -3,16 +3,13 @@ module CruftTracker
     isolate_namespace CruftTracker
 
     config.after_initialize do
+      ActionController::Base.helper CruftTracker::ApplicationHelper
       CruftTracker::CleanupUntrackedMethods.run!
       CruftTracker::CleanupUntrackedViews.run!
     rescue StandardError
       # Swallow all errors to prevent initialization failures.
     end
 
-    initializer 'local_helper.action_controller' do
-      ActiveSupport.on_load :action_controller do
-        helper CruftTracker::ApplicationHelper
-      end
-    end
+
   end
 end

data/lib/cruft_tracker/version.rb

@@ -1,3 +1,3 @@
 module CruftTracker
-  VERSION = '0.2.1'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cruft_tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Adwerx Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction