newrelic-grape 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560a366131820b64816fde8d7599814a57f516f6
-  data.tar.gz: 9c31d2b9a3fdf7578f81a9bb9f113a5461f7d6d7
+  metadata.gz: 3d1c6a522ac658fdea25afcb6d90fdf1d7d9fb46
+  data.tar.gz: 31fc208d6c5433975b6c992ed14aeacefe4a6fdf
 SHA512:
-  metadata.gz: e88df3b36b2395d8ffb1c3cbbab940fe02ba2d297ee0142d26677c84b5f6e352468861e654828ee4ca7d0df8a4f92fcc8d68dffd5c3e6f04ad8f00318f1eb3dc
-  data.tar.gz: 53a411586c756abbada2ecafb03f39fd8d0f840d04d48d5f6ea510efb489865df6f3b0573fb1f7da19f9342aa7329c0d336eeedba13f3fdf6552802c239794fc
+  metadata.gz: b20c6e72cc34576c5cd6e24eb77f0e25f23ee1c53761abe11ef45f9d72f1de7268ddb172227565b7beb34881b4ea0e734717daeefdba621ebbd97aed943cea25
+  data.tar.gz: 985840a2d20dbb9250dfb191c24c367bd44151a6d3ee4b9df87050c5ad58d8bc3f9305c5ece54dc6d98b18516f89768a6ee2e9393bce877eca3230642b298ed5

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+
+rvm:
+  - 2.2
+  - 2.0
+  - rbx-2.5.8
+  - jruby-19mode
+
+env:
+  - GRAPE_VERSION=0.8.0
+  - GRAPE_VERSION=0.9.0
+  - GRAPE_VERSION=0.10.0
+  - GRAPE_VERSION=0.10.1
+  - GRAPE_VERSION=0.11.0
+  - GRAPE_VERSION=0.12.0
+  - GRAPE_VERSION=0.13.0
+  - GRAPE_VERSION=0.14.0
+  - GRAPE_VERSION=HEAD

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-# Next Release
+# 2.1.0 (12/08/2014)
+
+* Work with grape 0.14.0 [@dblock](https://github.com/dblock)
 
 ## 2.0.0 (10/20/2014)
 
@@ -6,8 +8,7 @@
 
 ## 1.4.1 (07/04/2014)
 
-* Fix "uninitialized constant NewRelic::MetricSpec (NameError)" with
-newrelic_rpm 3.8.1.221
+* Fix "uninitialized constant NewRelic::MetricSpec (NameError)" with newrelic_rpm 3.8.1.221
 * Fix "uninitialized constant Grape"
 
 ## 1.4.0 (05/09/2014)

data/Gemfile

@@ -3,9 +3,16 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in newrelic-grape.gemspec
 gemspec
 
+case version = ENV['GRAPE_VERSION'] || '~> 0.14.0'
+when 'HEAD'
+  gem 'grape', github: 'ruby-grape/grape'
+else
+  gem 'grape', version
+end
+
 group :development, :test do
-  gem "rake", "~> 10.0"
-  gem "bundler", "~> 1.0"
-  gem "rspec", "~> 2.6"
-  gem "rack-test", "~> 0.6.2"
+  gem 'rake', '~> 10.0'
+  gem 'bundler', '~> 1.0'
+  gem 'rspec', '~> 3.4.0'
+  gem 'rack-test', '~> 0.6.3'
 end

data/README.md

@@ -1,10 +1,16 @@
 # NewRelic::Grape
 
+### NewRelic has already officially support grape, see more [here](https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation)
+
+[![Build Status](https://travis-ci.org/xinminlabs/newrelic-grape.svg)](https://travis-ci.org/xinminlabs/newrelic-grape)
+
 NewRelic instrumentation for the [Grape API DSL][0], inspired by [this blog post][1].
 
 If you use newrelic_rpm < 3.9.0, please use newrelic-grape 1.4.x
 If you use newrelic_rpm >= 3.9.0, please use newrelic-grape >= 2.0.0
 
+**Please note**: newrelic_rpm 3.9.8 is [incompatible](https://discuss.newrelic.com/t/refusing-to-re-register-dependencydetection-block-with-name-grape/13734)! A fix was [included in 3.9.9](https://docs.newrelic.com/docs/release-notes/agent-release-notes/ruby-release-notes/ruby-agent-399275).
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
@@ -17,4 +17,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec

data/example_app/Gemfile

@@ -2,10 +2,10 @@ source 'http://rubygems.org'
 
 gem 'rack'
 gem 'grape'
-gem 'newrelic_rpm'
-gem 'newrelic-grape'
+gem 'newrelic_rpm', '~> 3.9.0'
+gem 'newrelic-grape', '~> 2.0.0'
 
 group :test do
-  gem "rspec"
-  gem "rack-test", require: "rack/test"
+  gem 'rspec'
+  gem 'rack-test', require: 'rack/test'
 end

data/example_app/config.ru

@@ -1,7 +1,7 @@
 require File.expand_path('../config/environment', __FILE__)
 
 if ENV['RACK_ENV'] == 'development'
-  puts "Loading NewRelic in developer mode ..."
+  puts 'Loading NewRelic in developer mode ...'
   require 'new_relic/rack/developer_mode'
   use NewRelic::Rack::DeveloperMode
 end

data/example_app_with_newrelic_3_8/Gemfile

@@ -3,9 +3,9 @@ source 'http://rubygems.org'
 gem 'rack'
 gem 'grape'
 gem 'newrelic_rpm', '~> 3.8.0'
-gem 'newrelic-grape'
+gem 'newrelic-grape', '~> 1.4.0'
 
 group :test do
-  gem "rspec"
-  gem "rack-test", require: "rack/test"
+  gem 'rspec'
+  gem 'rack-test', require: 'rack/test'
 end

data/example_app_with_newrelic_3_8/config.ru

@@ -1,7 +1,7 @@
 require File.expand_path('../config/environment', __FILE__)
 
 if ENV['RACK_ENV'] == 'development'
-  puts "Loading NewRelic in developer mode ..."
+  puts 'Loading NewRelic in developer mode ...'
   require 'new_relic/rack/developer_mode'
   use NewRelic::Rack::DeveloperMode
 end

data/lib/newrelic-grape.rb

@@ -1,2 +1,2 @@
-require "newrelic-grape/version"
-require "newrelic-grape/instrument"
+require 'newrelic-grape/version'
+require 'newrelic-grape/instrument'

data/lib/newrelic-grape/instrument.rb

@@ -1,5 +1,5 @@
 require 'new_relic/agent/instrumentation'
-require 'new_relic/agent/instrumentation/controller_instrumentation'
+require 'new_relic/agent/instrumentation/middleware_proxy'
 require 'grape'
 
 module NewRelic
@@ -12,10 +12,10 @@ module NewRelic
           @env = env
           @newrelic_request = ::Rack::Request.new(env)
           trace_options = {
-            :category => :rack,
-            :path => "#{request_method} #{request_path}",
-            :request => @newrelic_request,
-            :params => @newrelic_request.params
+            category: :rack,
+            path: "#{request_method} #{request_path}",
+            request: @newrelic_request,
+            params: @newrelic_request.params
           }
           perform_action_with_newrelic_trace(trace_options) do
             @app_response = @app.call(@env)
@@ -27,7 +27,7 @@ module NewRelic
         end
 
         def request_path
-          path = route.route_path[1..-1].gsub('/', '-')
+          path = route.route_path[1..-1].tr('/', '-')
           path.sub!(/\(\.:format\)\z/, '')
           route.route_version && path.sub!(':version', route.route_version)
 
@@ -46,32 +46,48 @@ DependencyDetection.defer do
   @name = :grape
 
   depends_on do
-    defined?(::Grape) && ! ::NewRelic::Control.instance['disable_grape'] && ! ENV['DISABLE_NEW_RELIC_GRAPE']
+    defined?(::Grape) && ! ::NewRelic::Control.instance['disable_grape'] && !ENV['DISABLE_NEW_RELIC_GRAPE']
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Grape instrumentation'
+    NewRelic::Agent.logger.info 'Installing Grape instrumentation'
   end
 
   executes do
-    NewRelic::Agent::Instrumentation::MiddlewareProxy.class_eval do
-      def self.needs_wrapping?(target)
-        (
-          !target.respond_to?(:_nr_has_middleware_tracing) &&
-          !is_sinatra_app?(target) &&
-          !target.is_a?(Proc)
-        )
+    begin
+      NewRelic::Agent::Instrumentation::MiddlewareProxy.class_eval do
+        def self.needs_wrapping?(target)
+          (
+            !target.respond_to?(:_nr_has_middleware_tracing) &&
+            !is_sinatra_app?(target) &&
+            !target.is_a?(Proc)
+          )
+        end
       end
-    end
 
-    ::Grape::Endpoint.class_eval do
-      alias_method :origin_build_middleware, :build_middleware
+      ::Grape::Endpoint.class_eval do
+        if method_defined?(:build_middleware)
+          alias_method :_build_middleware, :build_middleware
+
+          def build_middleware
+            b = _build_middleware
+            b.use ::NewRelic::Agent::Instrumentation::Grape
+            b
+          end
+        elsif private_method_defined?(:build_stack)
+          include Grape::DSL::Middleware::ClassMethods
 
-      def build_middleware
-        b = origin_build_middleware
-        b.use ::NewRelic::Agent::Instrumentation::Grape
-        b
+          alias_method :_build_stack, :build_stack
+
+          def build_stack
+            use ::NewRelic::Agent::Instrumentation::Grape
+            _build_stack
+          end
+        end
       end
+    rescue Exception => e
+      STDERR.puts e
+      raise e
     end
   end
 end

data/lib/newrelic-grape/version.rb

@@ -1,5 +1,5 @@
 module NewRelic
   module Grape
-    VERSION = "2.0.0"
+    VERSION = '2.1.0'
   end
 end

data/newrelic-grape.gemspec

@@ -4,19 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'newrelic-grape/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "newrelic-grape"
+  gem.name          = 'newrelic-grape'
   gem.version       = NewRelic::Grape::VERSION
-  gem.authors       = ["Richard Huang"]
-  gem.email         = ["flyerhzm@gmail.com"]
-  gem.description   = %q{newrelic instrument for grape}
-  gem.summary       = %q{newrelic instrument for grape}
-  gem.homepage      = "https://github.com/flyerhzm/newrelic-grape"
+  gem.authors       = ['Richard Huang']
+  gem.email         = ['flyerhzm@gmail.com']
+  gem.description   = 'newrelic instrument for grape'
+  gem.summary       = 'newrelic instrument for grape'
+  gem.homepage      = 'https://github.com/flyerhzm/newrelic-grape'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency(%q<grape>)
-  gem.add_runtime_dependency(%q<newrelic_rpm>)
+  gem.add_runtime_dependency('grape')
+  gem.add_runtime_dependency('newrelic_rpm')
 end

data/spec/newrelic-grape/instrumenter_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe NewRelic::Agent::Instrumentation::Grape do
-
   subject { Class.new(Grape::API) }
 
   def app
@@ -16,8 +15,8 @@ describe NewRelic::Agent::Instrumentation::Grape do
     end
 
     it 'perform_action_with_newrelic_trace' do
-      NewRelic::Agent::Instrumentation::Grape.any_instance
-        .should_receive(:perform_action_with_newrelic_trace)
+      expect_any_instance_of(NewRelic::Agent::Instrumentation::Grape)
+        .to receive(:perform_action_with_newrelic_trace)
         .with(hash_including(path: 'GET hello'))
         .and_yield
 
@@ -38,8 +37,8 @@ describe NewRelic::Agent::Instrumentation::Grape do
       end
 
       it 'perform_action_with_newrelic_trace' do
-        NewRelic::Agent::Instrumentation::Grape.any_instance
-          .should_receive(:perform_action_with_newrelic_trace)
+        expect_any_instance_of(NewRelic::Agent::Instrumentation::Grape)
+          .to receive(:perform_action_with_newrelic_trace)
           .with(hash_including(path: 'GET v1-hello'))
           .and_yield
 
@@ -50,5 +49,4 @@ describe NewRelic::Agent::Instrumentation::Grape do
       end
     end
   end
-
 end

data/spec/newrelic-grape/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe NewRelic::Grape do
-  it "has a version" do
-    NewRelic::Grape::VERSION.should_not be_nil
+  it 'has a version' do
+    expect(NewRelic::Grape::VERSION).not_to be_nil
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rack/test'
 
 RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
   config.include Rack::Test::Methods
   config.before do
     DependencyDetection.detect!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-grape
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: newrelic instrument for grape