grape-appsignal 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801fa49a4ee1290f3145ce8bfd2910472016e0b4
-  data.tar.gz: 2d11531026cd6c0c50aef962514fea5a5ddadc2f
+  metadata.gz: c0a52b4dfdf6f23389a64d350b5b482596a827d3
+  data.tar.gz: 16687f8a13c5540a7baafb2b0d4b58244f7fe4c6
 SHA512:
-  metadata.gz: b14855bf668efacee9e6a1f73843fe12c4faf65b08002956316b3782cd3b0d4d0b5cf23a0864906148b4ccf0eb3f5d34e457968ed3df9aca8c53fdf63824f2fd
-  data.tar.gz: 44e97b5ab1b563e01f03741d1d06a93c46b87af7b587ab045af011fa85c9c24060d0eefb74c0180d2fe83ab9542601661485ac11f2c35cfc17e1923590d66816
+  metadata.gz: c3de557f96ebc3d97647eecaf5778765742cd03b0c935438c979d926cc7f3cbd4149b26de1601033fe317455beafda91ba3bd11120c9a5f8cd1b3ab59309b1e8
+  data.tar.gz: 59547e6f06534c8664e77aaf4abca915cf2f076191f3e94670d390f01ac78cae94f15d80ad1ec7adbaa6ca448e268b7bfa1875a7b22850adc58d5d3002bd204e

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 2.1.0
+  - 2.1.2
   - 2.0.0
   - 1.9.3
   - jruby

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Changelog
 
+### Version 0.2.0
+* Change the logging so that id's are pulled out of the URLs.
+
 ### Version 0.0.1
 * First commit. Yeah!

data/Gemfile

@@ -13,7 +13,7 @@ group :development, :test do
   gem 'rspec'
   gem 'github-markup'
   gem 'rack-test'
-  gem 'rspec-expectations', '~> 2.14.0'
-  gem 'rspec-mocks', '~> 2.14.0'
+  gem 'rspec-expectations', '~> 3.0.0'
+  gem 'rspec-mocks', '~> 3.0.0'
   gem 'listen', '~> 2.1'
 end

data/lib/grape-appsignal/middleware.rb

@@ -9,12 +9,12 @@ module Appsignal
       end
 
       def call(env)
+        req = ::Rack::Request.new(env)
         method = env['REQUEST_METHOD']
-        metric_path = env['PATH_INFO'].nil? ? ".api" : env['PATH_INFO'].gsub("/", ".")
-        request_path = env['api.endpoint'].routes.first.route_path[1..-1].gsub(/\(\.:format\)\z/, "")
 
-        metric_name  = "process_action.grape#{metric_path}"
-        action = "#{method}#{env['PATH_INFO']}"
+        request_path = env['api.endpoint'].routes.first.route_path[1..-1].sub(/\(\.:format\)\z/, "")
+        metric_name  = "grape.#{req.request_method}.#{request_path}"
+        action = "#{method} #{env['PATH_INFO']}"
 
         ActiveSupport::Notifications.instrument(metric_name, { method: method, path: request_path, action: action, class: "API" } ) do |payload|
           @app.call(env)

data/lib/grape-appsignal/version.rb

@@ -1,5 +1,5 @@
 module Appsignal
   module Grape
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/spec/grape-appsignal/middleware_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Appsignal::Grape::Middleware do
 
-  class TestAPI < Grape::API
+  class ComplexAPI < Grape::API
     prefix "api"
     version "v1"
     use Appsignal::Grape::Middleware
@@ -14,30 +14,79 @@ describe Appsignal::Grape::Middleware do
     end
   end
 
-  def app; TestAPI; end
-
-  let(:event) { @events.pop }
-  subject { event.payload }
+  class SimpleAPI < Grape::API
+    use Appsignal::Grape::Middleware
 
-  before(:all) do
-    @events     = []
-    ActiveSupport::Notifications.subscribe('process_action.grape.api.v1.hello.mark') do |*args|
-      @events << ActiveSupport::Notifications::Event.new(*args)
+    resource :hello do
+      get ':id' do
+        "hello #{params['id']}"
+      end
     end
   end
 
-  before(:each) do
-    get "api/v1/hello/mark"
-  end
+  context "with a simple API" do
+    let(:events){ [] }
+    let(:app){ SimpleAPI }
+    before do
+      ActiveSupport::Notifications.subscribe(/^[^!]/) do |*args|
+        events << ActiveSupport::Notifications::Event.new(*args)
+      end
+    end
 
-  it do
-    should == { method: "GET" , path: "api/:version/hello/:name", action: "GET/api/v1/hello/mark", class: "API"}
+    subject { get "/hello/1337"; events.last}
+
+    it "delivers a payload consistent with the API call."do
+      expect(subject.payload ).to eq(
+        { method: "GET" , path: "hello/:id", action: "GET /hello/1337", class: "API"}
+      )
+    end
+
+    it "names the payload consistent with the API call."do
+      expect(subject.name ).to eq("grape.GET.hello/:id")
+    end
+
+    context "verify the api request" do
+      subject{ get "/hello/1337"; last_response }
+
+      it "returns the correct body" do
+        expect(subject.body).to eq("hello 1337")
+      end
+      it "returns the correct status code" do
+        expect(subject.status).to eq(200)
+      end
+    end
   end
 
-  context "verify the api request" do
-    subject{ last_response }
+  context "with a complex API" do
+    let(:events){ [] }
+    let(:app){ ComplexAPI }
+    before do
+      ActiveSupport::Notifications.subscribe(/^[^!]/) do |*args|
+        events << ActiveSupport::Notifications::Event.new(*args)
+      end
+    end
+
+    subject { get "api/v1/hello/mark"; events.last}
+
+    it "delivers a payload consistent with the API call."do
+      expect(subject.payload ).to eq(
+        { method: "GET" , path: "api/:version/hello/:name", action: "GET /api/v1/hello/mark", class: "API"}
+      )
+    end
 
-    its(:body){ should == "hello mark" }
-    its(:status){ should == 200 }
+    it "names the payload consistent with the API call."do
+      expect(subject.name ).to eq("grape.GET.api/:version/hello/:name")
+    end
+
+    context "verify the api request" do
+      subject{ get "api/v1/hello/mark"; last_response }
+
+      it "returns the correct body" do
+        expect(subject.body).to eq("hello mark")
+      end
+      it "returns the correct status code" do
+        expect(subject.status).to eq(200)
+      end
+    end
   end
 end

data/spec/grape-appsignal/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Appsignal::Grape do
   it "has a version" do
-    Appsignal::Grape::VERSION.should_not be_nil
+    expect(Appsignal::Grape::VERSION).to_not be_nil
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: grape-appsignal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appsignal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 description: appsignal integration for grape
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -113,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: appsignal integration for grape