rails-footnotes 7.0.0 → 7.1.0

data/lib/rails-footnotes/notes/assigns_note.rb

@@ -1,24 +1,24 @@
+require "active_record"
+
 module Footnotes
   module Notes
     class AssignsNote < AbstractNote
-      @@ignored_assigns = [
-                            :@real_format,
-                            :@before_filter_chain_aborted,
-                            :@performed_redirect,
-                            :@performed_render,
-                            :@_params,
-                            :@_response,
-                            :@url,
-                            :@template,
-                            :@_request,
-                            :@db_rt_before_render,
-                            :@db_rt_after_render,
-                            :@view_runtime,
-                            :@marked_for_same_origin_verification
-                          ]
-      cattr_accessor :ignored_assigns, :instance_writer => false
-      @@ignored_assigns_pattern = /^@_/
-      cattr_accessor :ignored_assigns_pattern, :instance_writer => false
+      thread_cattr_accessor :ignored_assigns, instance_writer: false, default: [
+        :@real_format,
+        :@before_filter_chain_aborted,
+        :@performed_redirect,
+        :@performed_render,
+        :@_params,
+        :@_response,
+        :@url,
+        :@template,
+        :@_request,
+        :@db_rt_before_render,
+        :@db_rt_after_render,
+        :@view_runtime,
+        :@marked_for_same_origin_verification
+      ]
+      thread_cattr_accessor :ignored_assigns_pattern, instance_writer: false, default: /^@_/
 
       def initialize(controller)
         @controller = controller
@@ -40,8 +40,11 @@ module Footnotes
         def to_table
           table = assigns.inject([]) do |rr, var|
             class_name = assigned_value(var).class.name
-            var_name = var.to_s
-            rr << ["<strong>#{var.to_s}</strong>" + "<br /><em>#{class_name}</em>", escape(assigned_value(var).inspect)]
+            var_value = assigned_value(var)
+            if var_value.is_a?(ActiveRecord::Relation) && var_value.limit_value.nil?
+              var_value = var_value.limit(Footnotes::Filter.default_limit)
+            end
+            rr << ["<strong>#{var.to_s}</strong>" + "<br /><em>#{class_name}</em>", escape(var_value.inspect)]
           end
 
           table.unshift(['Name', 'Value'])

data/lib/rails-footnotes/notes/controller_note.rb

@@ -23,7 +23,7 @@ module Footnotes
         end
 
         def controller_filename
-          @controller_filename ||= Gem.find_files(controller_path).first # tnx https://github.com/MasterLambaster
+          @controller_filename ||= Gem.find_files(controller_path).first
         end
 
         def controller_text

data/lib/rails-footnotes/notes/log_note/note_logger.rb

@@ -15,44 +15,6 @@ module Footnotes
           formatter = @formatter || Logger::Formatter.new
           @logs << formatter.call(format_severity(severity), Time.now, message, progname)
         end
-
-        ## Backport from rails 4 for handling logging broadcast, should be removed when rails 3 is deprecated :
-
-        # Broadcasts logs to multiple loggers.
-        def self.broadcast(logger) # :nodoc:
-          Module.new do
-            define_method(:add) do |*args, &block|
-              logger.add(*args, &block)
-              super(*args, &block)
-            end
-
-            define_method(:<<) do |x|
-              logger << x
-              super(x)
-            end
-
-            define_method(:close) do
-              logger.close
-              super()
-            end
-
-            define_method(:progname=) do |name|
-              logger.progname = name
-              super(name)
-            end
-
-            define_method(:formatter=) do |formatter|
-              logger.formatter = formatter
-              super(formatter)
-            end
-
-            define_method(:level=) do |level|
-              logger.level = level
-              super(level)
-            end
-          end
-        end
-
       end
     end
   end

data/lib/rails-footnotes/notes/log_note.rb

@@ -4,8 +4,8 @@ module Footnotes
 
       autoload :NoteLogger, 'rails-footnotes/notes/log_note/note_logger'
 
-      cattr_accessor :logs
-      cattr_accessor :original_logger
+      thread_cattr_accessor :logs
+      thread_cattr_accessor :original_logger
 
       def self.start!(controller)
         self.logs = []
@@ -18,9 +18,12 @@ module Footnotes
           else
             defined?(ActiveSupport::Logger) ? ActiveSupport::Logger::SimpleFormatter.new : Logger::SimpleFormatter.new
           end
-        # Rails 3 don't have ActiveSupport::Logger#broadcast so we backported it
-        extend_module = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger.broadcast(note_logger) : NoteLogger.broadcast(note_logger)
-        Rails.logger = self.original_logger.clone.extend(extend_module)
+
+        if ::Rails::VERSION::STRING < "7.1"
+          ::Rails.logger.extend(::ActiveSupport::Logger.broadcast(note_logger))
+        else
+          ::Rails.logger = ::ActiveSupport::BroadcastLogger.new(::Rails.logger, note_logger)
+        end
       end
 
       def title

data/lib/rails-footnotes/notes/partials_note.rb

@@ -2,12 +2,12 @@ module Footnotes
   module Notes
     class PartialsNote < AbstractNote
 
-      cattr_accessor :partials
+      thread_cattr_accessor :partials
 
       def self.start!(controller)
         self.partials = []
         @subscriber ||= ActiveSupport::Notifications.subscribe('render_partial.action_view') do |*args|
-          event = ActiveSupport::Notifications::Event.new *args
+          event = ActiveSupport::Notifications::Event.new(*args)
           self.partials << {:file => event.payload[:identifier], :duration => event.duration}
         end
       end

data/lib/rails-footnotes/notes/queries_note.rb

@@ -1,12 +1,10 @@
 module Footnotes
   module Notes
     class QueriesNote < AbstractNote
-      cattr_accessor :alert_db_time, :alert_sql_number, :orm, :ignored_regexps, :instance_writer => false
-      @@alert_db_time    = 16.0
-      @@alert_sql_number = 8
-      @@query_subscriber = nil
-      @@orm              = [:active_record, :data_mapper]
-      @@ignored_regexps  = [%r{(pg_table|pg_attribute|pg_namespace|show\stables|pragma|sqlite_master)}i]
+      thread_cattr_accessor :alert_db_time, default: 16.0, instance_writer: false
+      thread_cattr_accessor :alert_sql_number, default: 8, instance_writer: false
+      thread_cattr_accessor :orm, default: [:active_record, :data_mapper], instance_writer: false
+      thread_cattr_accessor :ignored_regexps, default: [%r{(pg_table|pg_attribute|pg_namespace|show\stables|pragma|sqlite_master)}i], instance_writer: false
 
       def self.start!(controller)
         self.query_subscriber.reset!

data/lib/rails-footnotes/notes/view_note.rb

@@ -1,11 +1,11 @@
 module Footnotes
   module Notes
     class ViewNote < AbstractNote
-      cattr_accessor :template
+      thread_cattr_accessor :template
 
       def self.start!(controller)
         @subscriber ||= ActiveSupport::Notifications.subscribe('render_template.action_view') do |*args|
-          event = ActiveSupport::Notifications::Event.new *args
+          event = ActiveSupport::Notifications::Event.new(*args)
           self.template = {:file => event.payload[:identifier], :duration => event.duration}
         end
       end
@@ -19,7 +19,7 @@ module Footnotes
       end
 
       def title
-        "View (#{"%.3f" % self.template[:duration]}ms)"
+        "View (#{"%.3f" % template[:duration]}ms)"
       end
 
       def link
@@ -34,7 +34,7 @@ module Footnotes
 
         def filename
           return @filename if defined?(@filename)
-          @filename = self.class.template.try(:[], :file)
+          @filename = template.try(:[], :file)
         end
 
     end

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "7.0.0"
+  VERSION = "7.1.0"
 end

data/lib/rails-footnotes.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require 'action_controller'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 require 'rails-footnotes/abstract_note'
 require 'rails-footnotes/each_with_rescue'
 require 'rails-footnotes/filter'
@@ -7,14 +8,9 @@ require 'rails-footnotes/notes/all'
 require 'rails-footnotes/extension'
 
 module Footnotes
-  mattr_accessor :before_hooks
-  @@before_hooks = []
-
-  mattr_accessor :after_hooks
-  @@after_hooks = []
-
-  mattr_accessor :enabled
-  @@enabled = false
+  thread_mattr_accessor :before_hooks
+  thread_mattr_accessor :after_hooks
+  thread_mattr_accessor :enabled, default: false
 
   class << self
     delegate :notes, :to => Filter
@@ -34,25 +30,28 @@ module Footnotes
 
     delegate :font_size, :to => Filter
     delegate :font_size=, :to => Filter
+
+    delegate :default_limit, :to => Filter
+    delegate :default_limit=, :to => Filter
   end
 
   def self.before(&block)
-    @@before_hooks << block
+    before_hooks << block
   end
 
   def self.after(&block)
-    @@after_hooks << block
+    after_hooks << block
   end
 
   def self.enabled?(controller)
-    if @@enabled.is_a? Proc
-      if @@enabled.arity == 1
-        @@enabled.call(controller)
+    if enabled.is_a? Proc
+      if enabled.arity == 1
+        enabled.call(controller)
       else
-        @@enabled.call
+        enabled.call
       end
     else
-      !!@@enabled
+      !!enabled
     end
   end
 
@@ -61,8 +60,11 @@ module Footnotes
   end
 end
 
+Footnotes.before_hooks = []
+Footnotes.after_hooks = []
+
 ActiveSupport.on_load(:action_controller) do
   ActionController::Base.send(:include, Footnotes::RailsFootnotesExtension)
 end
 
-load Rails.root.join('.rails_footnotes') if Rails.root && Rails.root.join('.rails_footnotes').exist?
+load Rails.root.join('.rails_footnotes') if Rails.root&.join('.rails_footnotes')&.exist?

data/rails-footnotes.gemspec

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rails-footnotes/version"
+require_relative "./lib/rails-footnotes/version"
 
 Gem::Specification.new do |s|
   s.name        = "rails-footnotes"