active-profiling 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5f519cf88d1010c707548ab98932d88d81f2c837
+  data.tar.gz: f192a78d710d21019043f58dbe0fe5ba653b616d
+SHA512:
+  metadata.gz: f978d65cb2a40cfd1bd50202bb9e1b90ac5d7d16d1aca8e82a4e8d991c6b1dca0784203d93ae79bb2ebbfbc49d21afdbcfa6bea1af000e58b4aa34d579b2d750
+  data.tar.gz: c2eb4490ad875b06886b81f4185f7851212243b3977029f8ee6c5fa331fe6049f76d7e83b7526625b15ae441cf5576952d048be289652d55d9d8641d3a6efc59

data/MIT-LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 J Smith <dark.panda@gmail.com>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2012-2017 J Smith <dark.panda@gmail.com>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/active-profiling.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.description = "A Rails profiling suite."
   s.summary = s.description
   s.email = "dark.panda@gmail.com"
+  s.license = "MIT"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]

data/lib/active-profiling/action_controller/action_profiling.rb

@@ -1,6 +1,4 @@
 
-require 'digest/md5'
-
 module ActionController
   module ActionProfiling
     extend ActiveSupport::Concern
@@ -9,17 +7,23 @@ module ActionController
       include ActiveProfiling::RubyProfiler
       include ActiveProfiling::GCStatistics
 
-      around_filter :action_profiler, :if => proc {
+      around_filter_method = if ActionController::Base.respond_to?(:around_action)
+        :around_action
+      else
+        :around_filter
+      end
+
+      send around_filter_method, :action_profiler, :if => proc {
         Rails.application.config.active_profiling.profiler.enabled && ActiveProfiling.ruby_prof?
       }
 
-      around_filter :action_gc_statistics, :if => proc {
+      send around_filter_method, :action_gc_statistics, :if => proc {
         Rails.application.config.active_profiling.gc_statistics.enabled && ActiveProfiling.gc_statistics?
       }
     end
 
     def action_profiler(*args)
-      ruby_profiler do
+      ruby_profiler(:name => "#{controller_name}.#{action_name}") do
         yield
       end
     end

data/lib/active-profiling/ruby_profiler.rb

@@ -1,4 +1,6 @@
 
+require 'active-profiling/ruby_profiler/output'
+
 module ActiveProfiling
   module RubyProfiler
     extend ActiveSupport::Concern
@@ -9,103 +11,8 @@ module ActiveProfiling
     #
     # For details on the various options, see the default options located in
     # ActiveProfiling::Railtie::DEFAULT_PROFILER_OPTIONS.
-    def ruby_profiler(*args)
-      options = Rails.application.config.active_profiling.profiler.merge(args.extract_options!)
-
-      printer_class = case options[:printer]
-        when :flat_with_line_numbers
-          RubyProf::FlatPrinterWithLineNumbers
-        else
-          RubyProf.const_get("#{options[:printer].to_s.camelize}Printer")
-      end
-
-      output = if options[:output]
-        options[:output]
-      else
-        case options[:printer]
-          when :call_tree, :call_stack, :graph_html, :dot
-            :file
-          else
-            :log
-        end
-      end
-
-      return yield if output == :log && !ActiveProfiling::LogSubscriber.logger
-
-      RubyProf.measure_mode = RubyProf.const_get(options[:measure_mode].to_s.upcase)
-      GC.disable if options[:disable_gc]
-
-      result = nil
-      exception = nil
-      profiler_result = RubyProf.profile do
-        begin
-          result = yield
-        rescue
-          exception = $!
-        end
-      end
-
-      case output
-        when :stdout
-          printer_class.new(profiler_result).print($stdout, options.printer_options)
-        when :log
-          str = StringIO.new
-          printer_class.new(profiler_result).print(str, options.printer_options)
-          str.rewind
-
-          ActiveSupport::Notifications.instrument('profiler_output.active_profiling', {
-            :profiler_output => str.read,
-            :title => options[:title] || args.first
-          })
-        when :file
-          path, file_name = if args.first
-            [ File.dirname(args.first), args.first ]
-          elsif options[:file_name]
-            [ File.dirname(options[:file_name]), options[:file_name] ]
-          else
-            time = Time.now.strftime('%Y-%m-%d-%H:%M:%S')
-            hash = Digest::MD5.hexdigest(rand.to_s)[0..6]
-            path = Rails.root.join('log/profiling', self.class.name.underscore)
-            ext = case options[:printer]
-              when :graph_html, :call_stack
-                'html'
-              when :dot
-                'dot'
-              else
-                'log'
-            end
-
-            file_name = [
-              self.action_name,
-              options[:measure_mode],
-              options[:printer],
-              time,
-              hash,
-              ext
-            ].join('.')
-
-            if options[:printer] == :call_tree && !options[:call_tree_prefix].blank?
-              file_name = "#{options[:call_tree_prefix]}#{file_name}"
-            end
-
-            [ path.to_s, path.join(file_name) ]
-          end
-
-          ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
-            :file_name => file_name
-          })
-
-          FileUtils.mkdir_p(path)
-          printer_class.new(profiler_result).print(File.open(file_name, 'w'), options[:printer_options])
-      end
-
-      if exception
-        raise exception
-      else
-        result
-      end
-    ensure
-      GC.enable if options[:disable_gc]
+    def ruby_profiler(*args, &block)
+      Output.new(*args).run(&block)
     end
   end
 

data/lib/active-profiling/ruby_profiler/output.rb

@@ -0,0 +1,171 @@
+
+module ActiveProfiling
+  module RubyProfiler
+    class Output
+      def initialize(*args)
+        @options = Rails.application.config.active_profiling.profiler.merge(args.extract_options!)
+        @path = args.first
+
+        @output = if @options[:output]
+          @options[:output]
+        else
+          case @options[:printer]
+            when :call_tree, :call_stack, :graph_html, :dot
+              :file
+            else
+              :log
+          end
+        end
+      end
+
+      def run
+        return yield if @output == :log && !ActiveProfiling::ActionController::LogSubscriber.logger
+
+        RubyProf.measure_mode = RubyProf.const_get(@options[:measure_mode].to_s.upcase)
+        GC.disable if @options[:disable_gc]
+
+        result = nil
+        exception = nil
+        @profiler_result = RubyProf.profile do
+          begin
+            result = yield
+          rescue
+            exception = $!
+          end
+        end
+
+        case @output
+          when :stdout
+            write_to_stdout
+          when :log
+            write_to_log
+          when :file
+            write_to_file_or_path
+        end
+
+        if exception
+          raise exception
+        else
+          result
+        end
+      ensure
+        GC.enable if @options[:disable_gc]
+      end
+
+      private
+
+      def printer_class
+        @printer_class ||= case @options[:printer]
+          when :flat_with_line_numbers
+            RubyProf::FlatPrinterWithLineNumbers
+          else
+            RubyProf.const_get("#{@options[:printer].to_s.camelize}Printer")
+        end
+      end
+
+      def path_and_file_name
+        return @path_and_file_name if defined?(@path_and_file_name)
+
+        if @path.present?
+          { path: File.dirname(@path), file_name: @path }
+        elsif @options[:file_name]
+          { path: File.dirname(options[:file_name]), file_name: @options[:file_name] }
+        else
+          time = Time.now.strftime('%Y-%m-%d-%H:%M:%S')
+          hash = Digest::MD5.hexdigest(rand.to_s)[0..6]
+          path = Rails.root.join('log/profiling')
+          ext = case @options[:printer]
+            when :graph_html, :call_stack
+              'html'
+            when :dot
+              'dot'
+            else
+              'log'
+          end
+
+          file_name = [
+            @options[:name],
+            @options[:measure_mode],
+            @options[:printer],
+            time,
+            hash,
+            ext
+          ].join('.')
+
+          @path_and_file_name = {
+            path: path.to_s,
+            file_name: path.join(file_name)
+          }
+        end
+      end
+
+      def write_to_stdout
+        printer_class.new(@profiler_result).print($stdout, @options)
+      end
+
+      def write_to_log
+        str = StringIO.new
+        printer_class.new(@profiler_result).print(str, @options[:printer_options])
+        str.rewind
+
+        ActiveSupport::Notifications.instrument('profiler_output.active_profiling', {
+          :profiler_output => str.read,
+          :title => @options[:title] || @path
+        })
+      end
+
+      def write_to_file_or_path
+        if call_tree_printer_file_output?
+          write_to_path
+        else
+          write_to_file
+        end
+      end
+
+      def write_to_file
+        ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
+          :file_name => path_and_file_name[:file_name]
+        })
+
+        FileUtils.mkdir_p(path_and_file_name[:path])
+        printer_class.new(@profiler_result).print(File.open(path_and_file_name[:file_name], 'w'), @options[:printer_options])
+      end
+
+      def write_to_path
+        ActiveSupport::Notifications.instrument('profiler_output_to_file.active_profiling', {
+          :file_name => path_and_file_name[:path]
+        })
+
+        FileUtils.mkdir_p(path_and_file_name[:path])
+        printer_class.new(@profiler_result).print(merged_printer_options(path_and_file_name))
+      end
+
+      def call_tree_prefix_option
+        # XXX - Bit of a hack here -- newer versions of RubyProf have changed
+        # the method signature of CallTreePrinter#print and changed how the
+        # generated files are prefixed. To accomodate call tree viewers like
+        # [KQ]CacheGrind, we need to hack in an appropriate file prefix.
+        if call_tree_printer_file_output?
+          @options[:call_tree_prefix].try(:gsub, /\.$/, '')
+        else
+          @options[:call_tree_prefix]
+        end
+      end
+
+      def merged_printer_options(path_and_file_name)
+        if @options[:printer] == :call_tree && @output == :file
+          @options[:printer_options].merge(
+            profile: call_tree_prefix_option,
+            path: path_and_file_name[:path]
+          )
+        else
+          @options[:printer_options]
+        end
+      end
+
+      def call_tree_printer_file_output?
+        printer_class.instance_method(:print).arity == -1 && printer_class == RubyProf::CallTreePrinter
+      end
+    end
+  end
+end

data/lib/active-profiling/version.rb

@@ -1,4 +1,4 @@
 
 module ActiveProfiling
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active-profiling
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
-  prerelease: false
 description: A Rails profiling suite.
 email: dark.panda@gmail.com
 executables: []
@@ -34,7 +31,7 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -49,32 +46,30 @@ files:
 - lib/active-profiling/gc_statistics.rb
 - lib/active-profiling/railtie.rb
 - lib/active-profiling/ruby_profiler.rb
+- lib/active-profiling/ruby_profiler/output.rb
 - lib/active-profiling/version.rb
 homepage: http://github.com/dark-panda/active-profiling
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 1112450418277949513
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Rails profiling suite.
 test_files: []