rack-metrics 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 113653220e7d38b040f004a28bb1337740bdb5f3
-  data.tar.gz: fb8853ef69139a0d7df2bdbafc51219d297b24e8
+  metadata.gz: fef07a7c21b2fc9e7eae4003d64f75e5ee0972de
+  data.tar.gz: 4fe8867da81f4f9510813699dab1ee80af64f121
 SHA512:
-  metadata.gz: 978dbc38d40e7ab1958ea5846d36099972246baff7d73fad7ffca7adeb0b1c1a7a974044d2b3aac62f84017addbc6c0989c439d1f39b753909e13eba02d3368b
-  data.tar.gz: c973893fdcec38adbe4c5efc1ca94dc4f97442d53259750f19edcbae3ed6debd8f920b9136135a807ea4fb357fa46817773ceef3e96cf4ae8ea635d351253e32
+  metadata.gz: 5b6a8e2ee0a2b0601edb901bfbf956cc8f024d223e0db289b06c99459a41d390116dee03f1266ab9161c3cebd0c0229516873415a7835bb7d0aabdbbee1e9b4f
+  data.tar.gz: 27bafde80fafbcb5de8d40b0129210b39ecbdd152d6adb6ffdde77d387ef610530596089f8ef86fde206b508f27da779d98f74e9254ffb27017333ed7b9fe59a

data/Appraisals

@@ -1,3 +1,27 @@
-appraise "rails 4" do
-  gem "rails", "~> 4.0.0"
+appraise "rails_4_0" do
+  gem "rails", "~> 4.0"
+  gem "sqlite3"
 end
+
+appraise "rails_4_1" do
+  gem "rails", "~> 4.1.x"
+  gem "sqlite3"
+end
+
+appraise "rails_3_0" do
+  gem "rails", "~> 3.0"
+  gem "sqlite3"
+  gem "test-unit"
+end
+
+appraise "rails_3_1" do
+  gem "rails", "~> 3.1"
+  gem "sqlite3"
+  gem "test-unit"
+end
+
+appraise "rails_3_2" do
+  gem "rails", "~> 3.2"
+  gem "sqlite3"
+  gem "test-unit"
+end

data/gemfiles/rails_3_0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.0"
+gem "sqlite3"
+gem "test-unit"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1"
+gem "sqlite3"
+gem "test-unit"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2"
+gem "sqlite3"
+gem "test-unit"
+
+gemspec :path=>"../"

data/gemfiles/{rails_4.gemfile → rails_4_0.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 4.0"
+gem "sqlite3"
 
 gemspec :path=>"../"

data/gemfiles/rails_4_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.x"
+gem "sqlite3"
+
+gemspec :path=>"../"

data/lib/rack/metrics.rb

@@ -96,8 +96,9 @@ module Rack
     end
   end
 end
-
-Rack::Metrics::Instrumenter.instrument_method(ActionView::PartialRenderer, :render, "start_render_partial.action_view")
+if defined?(ActionView)
+  Rack::Metrics::Instrumenter.instrument_method(ActionView::PartialRenderer, :render, "start_render_partial.action_view")
+end
 
 module Rack
   module Metrics

data/lib/rack/metrics/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Metrics
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/rack-metrics.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency 'minitest', '>= 3'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency "rake"

data/test/apps/rails3/my_app.rb

@@ -0,0 +1,67 @@
+require 'rails/all'
+require 'action_view/testing/resolvers'
+require 'rack/metrics'
+
+class MyApp < Rails::Application
+  config.root = File.expand_path("../../..", __FILE__)
+  config.cache_classes = true
+
+  config.eager_load = false
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
+
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  config.action_dispatch.show_exceptions = false
+
+  config.action_controller.allow_forgery_protection = false
+
+  config.active_support.deprecation = :stderr
+
+  config.middleware.delete "Rack::Lock"
+  config.middleware.delete "ActionDispatch::Flash"
+  config.middleware.delete "ActionDispatch::BestStandardsSupport"
+  config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+  routes.append do
+    get "/:action" => "site#:action"
+  end
+end
+
+Rack::Metrics.config.environments = [:internal_test]
+class SiteController < ActionController::Base
+  include Rails.application.routes.url_helpers
+  layout 'application'
+  self.view_paths = [ActionView::FixtureResolver.new(
+      "site/simple.html.erb"=> 'Hello from simple.html.erb',
+      "site/with_query.html.erb"=> 'Hello from with_query.html.erb',
+      "site/with_partial_render.html.erb"=> 'Hello from with_partial_render.html.erb <%= render "comment" %>',
+      "site/with_partial_render_with_query.html.erb"=> 'Hello from with_partial_render.html.erb <%= render @comments %>',
+      "site/_comment.html.erb"        => "Partial",
+      "site/_comment_with_query.html.erb"        => "Partial <%= Comment.count %>",
+      "comments/_comment.html.erb"        => "Comment partial",
+      "layouts/application.html.erb" => '<%= yield %>',
+    )]
+
+  def simple
+  end
+
+  def with_query
+    post = Post.all.count
+  end
+
+  def with_partial_render
+    post = Post.all.count
+  end
+
+  def with_partial_render_with_query
+    post = Post.all.count
+    @comments = Comment.all
+  end
+
+  def with_template_query
+    post = Post.all.count
+  end
+end
+
+MyApp.initialize!

data/test/{dummy → apps/rails4}/my_app.rb

@@ -1,7 +1,7 @@
-require "rails"
 require 'rails/all'
-require 'rack/metrics'
 require 'action_view/testing/resolvers'
+require 'rack/metrics'
+
 module MyApp
   class Application < Rails::Application
     config.root = File.expand_path("../../..", __FILE__)

data/test/test_helper.rb

@@ -2,8 +2,16 @@ ENV["RAILS_ENV"] = "internal_test"
 ENV['DATABASE_URL'] = 'sqlite3://localhost/:memory:'
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'minitest/spec'
-require "dummy/my_app"
+
+require "rails"
+case Rails.version
+when /3\../
+  require 'test/unit'
+  require "apps/rails3/my_app"
+when /4\../
+  require "apps/rails4/my_app"
+end
+
 require 'rails/test_help'
 require 'rack/metrics'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Greg Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +82,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4.gemfile
+- gemfiles/rails_3_0.gemfile
+- gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
 - lib/generators/rack/metrics/install/install_generator.rb
 - lib/rack/metrics.rb
 - lib/rack/metrics/config.rb
@@ -107,7 +97,8 @@ files:
 - lib/rack/metrics/railtie.rb
 - lib/rack/metrics/version.rb
 - rack-metrics.gemspec
-- test/dummy/my_app.rb
+- test/apps/rails3/my_app.rb
+- test/apps/rails4/my_app.rb
 - test/support/classes/foo.rb
 - test/test_helper.rb
 - test/unit/metrics_test.rb
@@ -136,7 +127,8 @@ signing_key:
 specification_version: 4
 summary: A performance monitoring tool.
 test_files:
-- test/dummy/my_app.rb
+- test/apps/rails3/my_app.rb
+- test/apps/rails4/my_app.rb
 - test/support/classes/foo.rb
 - test/test_helper.rb
 - test/unit/metrics_test.rb