copperegg-apm 1.0.0.pre14 → 1.0.0.pre15

data/README.md

@@ -215,14 +215,14 @@ If you prefer to add RUM to your HTML pages manually, you can call the helper me
 <%= ce_rum_javascript_tag %>
 ```
 
-For versions prior to 3.2, you will need to include the `CopperEgg::APM::RUM` module into your helper modules:
+For versions prior to 3.0, you may need to include the `CopperEgg::APM::RUM` module into your helper modules:
 
 ```ruby
 module ApplicationHelper
    include CopperEgg::APM::RUM
 ```
 
-Alternatively, you can include the module in your controllers:
+or include the module in your controllers:
 
 ```ruby
 class UsersController < ActionController::Base

data/lib/copperegg/apm/benchmark_methods_table.rb

@@ -55,6 +55,7 @@ module CopperEgg
         else
           puts
           puts "#{separator}\n#{header_columns}\n#{separator}\n#{benchmarkable_methods.map {|method| method_columns(method)}.join("\n")}\n#{separator}"
+          puts "Benchmark level: #{Configuration.benchmark_methods_level}"
           puts "#{benchmarkable_methods.size} methods defined in #{classes_count} classes across #{file_count} files. #{benchmarkable_methods.size - excluded_methods.size == 1 ? "1 method" : "#{benchmarkable_methods.size - excluded_methods.size} methods"} benchmarked."
           puts
         end

data/lib/copperegg/apm/configuration.rb

@@ -170,13 +170,7 @@ module CopperEgg
 
       def self.configure(&block)
         yield(self)
-        if defined?(::Rails) && ::Rails.respond_to?(:configuration)
-          Rails.configuration.after_initialize do
-            self.init
-          end
-        else
-          self.init
-        end
+        self.init
       end
 
       def self.init
@@ -198,7 +192,13 @@ module CopperEgg
           @@include_methods           = []
         else
           if @@benchmark_methods_level != :disabled
-            CopperEgg::APM.add_method_benchmarking
+            if defined?(::Rails) && ::Rails.respond_to?(:configuration)
+              ::Rails.configuration.after_initialize do
+                CopperEgg::APM.add_method_benchmarking
+              end
+            else
+              CopperEgg::APM.add_method_benchmarking
+            end
           end
 
           if @@benchmark_browser && defined?(::Rails) && ::Rails.respond_to?(:configuration) && ::Rails.configuration.respond_to?(:middleware) && ::Rails.configuration.middleware.respond_to?(:use)

data/lib/copperegg/apm/railtie.rb

@@ -5,7 +5,7 @@ module CopperEgg
   module APM
     class Railtie < ::Rails::Railtie
       initializer "copperegg_apm.helpers" do
-        ActiveSupport.on_load_all do
+        ActiveSupport.on_load(:action_controller) do
           helper CopperEgg::APM::RUM
         end
       end

data/lib/copperegg/apm/version.rb

@@ -1,5 +1,5 @@
 module CopperEgg
   module APM
-    GEM_VERSION = '1.0.0.pre14' unless defined? GEM_VERSION
+    GEM_VERSION = '1.0.0.pre15' unless defined? GEM_VERSION
   end
 end

data/lib/generators/copperegg/apm/templates/config.rb

@@ -3,7 +3,8 @@ CopperEgg::APM.configure do |config|
   config.benchmark_sql        = true
   config.benchmark_exceptions = true
   config.benchmark_http       = true
-  config.benchmark_methods :disabled # To enable, set to :basic, :moderate, or :full
+  config.benchmark_browser    = false
+  config.benchmark_methods :disabled # To enable, set to :basic, :moderate, :full, or :custom
   # Below are examples of customizing method benchmarking
   # config.benchmark_methods :basic, :exclude => %w(UsersController#new UsersController#edit), :include => %w(User UserRole perform)
   # config.benchmark_methods :custom, %w(User Client index ClientsController#create)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: copperegg-apm
 version: !ruby/object:Gem::Version 
-  hash: -3216946352
+  hash: -778372730
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - pre
-  - 14
-  version: 1.0.0.pre14
+  - 15
+  version: 1.0.0.pre15
 platform: ruby
 authors: 
 - Mike Bradford
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-27 00:00:00 Z
+date: 2013-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -345,7 +345,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: copperegg-apm-1.0.0.pre14
+summary: copperegg-apm-1.0.0.pre15
 test_files: 
 - spec/action_controller_spec.rb
 - spec/apm_spec.rb