sapience 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3000f95011dbbb20f73e3cb9ba95f7df3270b84a
-  data.tar.gz: c079d45e7bd0aecb28c38e98fc656b8a38167ebe
+  metadata.gz: ae04b1f22f074540165f61ec01984bc3c4deae70
+  data.tar.gz: c9690199caa95c88d73f204eec77ef251e3b70d4
 SHA512:
-  metadata.gz: 1cb03d2e5cdfecbb017f61d9e93557dd5d53fbe1c7687a60758da8b0cbc14dc149ed3daa3ebd38040747316840f1622b1e8432eced86196bccf6e081b129276b
-  data.tar.gz: f5156e824985e613c78deb80b9f32ce14c83c4907cd81294cf86fbc428f19f7473b3d46b80fac296f9d7032727ad7da8ef3b30e8ad32882470b48a9c687a1eb8
+  metadata.gz: 05c062963ae6bcbb52518431c7b92e5af8360cc51f155efe332f5d8a066168e3f3b85f572469d5ef5dd4b342d3b70b4bd4d07f0367826c73546de04f9a0c3eef
+  data.tar.gz: c5f46eb79fba5d3efb89c34962967fa046e51e1128e2626e70dd18b8cca7d7bbbc95456a3bf6f8d7068250138962721af7c7b286e1109a0b9f82b5dbd57163ef

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.12
+
+- Fix NoMethodError in Grape::Notification
+- Exclude test apps from Gem
+
 ## v1.0.11
 
 - Fix a NoMethodError with logging the response format in grape

data/lib/sapience/extensions/grape/middleware/logging.rb

@@ -1,10 +1,13 @@
 require "grape/middleware/base"
+require_relative "../request_format_helper"
 
 module Sapience
   module Extensions
     module Grape
       module Middleware
         class Logging < ::Grape::Middleware::Base
+          include RequestFormatHelper
+
           ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
             event = ActiveSupport::Notifications::Event.new(*args)
             Grape::Timings.append_db_runtime(event)
@@ -39,7 +42,7 @@ module Sapience
             {
               method: request.request_method,
               request_path: request.path,
-              format: response_format,
+              format: request_format(request.env),
               status: response.try(:status) || 404,
               class_name: env["api.endpoint"].options[:for].to_s,
               action: "index",
@@ -60,16 +63,6 @@ module Sapience
 
           private
 
-          def content_type
-            request.env.fetch("CONTENT_TYPE") do
-              request.env["CONTENT-TYPE"]
-            end
-          end
-
-          def response_format
-            content_type.to_s.split("/").last
-          end
-
           def request
             @request ||= ::Rack::Request.new(env)
           end

data/lib/sapience/extensions/grape/notifications.rb

@@ -1,7 +1,10 @@
+require_relative "request_format_helper"
+
 module Sapience
   module Extensions
     module Grape
       class Notifications < ::Sapience::Extensions::Notifications
+        include RequestFormatHelper
         # Options:
         #
         # *<tt>:metric_name</tt> - the metric name, defaults to "grape.request"
@@ -25,7 +28,7 @@ module Sapience
           route    = endpoint.route
           version  = route.version
           method   = route.request_method.downcase
-          format   = payload[:endpoint].instance_variable_get(:@app).instance_variable_get(:@app).options[:format]
+          format   = request_format(endpoint.env)
           path = route.pattern.path.dup
 
           path.sub!(/\(\.#{format}\)$/, "")

data/lib/sapience/extensions/grape/request_format_helper.rb

@@ -0,0 +1,12 @@
+module Sapience
+  module Extensions
+    module Grape
+      module RequestFormatHelper
+        def request_format(env)
+          content_type = env["CONTENT_TYPE"] || env["CONTENT-TYPE"]
+          content_type.to_s.split("/").last
+        end
+      end
+    end
+  end
+end

data/lib/sapience/version.rb

@@ -1,3 +1,3 @@
 module Sapience
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

data/sapience.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
     fail "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(/^(test|spec|features|bin)\//) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(/^(test|test_apps|spec|features|bin)\//) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "concurrent-ruby", "~> 1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapience
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -300,6 +300,7 @@ files:
 - lib/sapience/extensions/active_record/notifications.rb
 - lib/sapience/extensions/grape/middleware/logging.rb
 - lib/sapience/extensions/grape/notifications.rb
+- lib/sapience/extensions/grape/request_format_helper.rb
 - lib/sapience/extensions/grape/timings.rb
 - lib/sapience/extensions/notifications.rb
 - lib/sapience/extensions/rails/rack/logger.rb
@@ -322,119 +323,6 @@ files:
 - lib/sapience/version.rb
 - lib/tasks/coverage.rake
 - sapience.gemspec
-- test_apps/grape/.gitignore
-- test_apps/grape/.rspec
-- test_apps/grape/.simplecov
-- test_apps/grape/Appraisals
-- test_apps/grape/Gemfile
-- test_apps/grape/Rakefile
-- test_apps/grape/config.ru
-- test_apps/grape/gemfiles/grape_0.16.2.gemfile
-- test_apps/grape/gemfiles/grape_0.16.2.gemfile.lock
-- test_apps/grape/gemfiles/grape_0.17.0.gemfile
-- test_apps/grape/gemfiles/grape_0.17.0.gemfile.lock
-- test_apps/grape/lib/ping.rb
-- test_apps/grape/lib/ping/api.rb
-- test_apps/grape/spec/lib/ping/api_spec.rb
-- test_apps/grape/spec/spec_helper.rb
-- test_apps/rails/.gitignore
-- test_apps/rails/.rspec
-- test_apps/rails/.ruby-version
-- test_apps/rails/.simplecov
-- test_apps/rails/Gemfile
-- test_apps/rails/README.md
-- test_apps/rails/Rakefile
-- test_apps/rails/app/assets/config/manifest.js
-- test_apps/rails/app/assets/images/.keep
-- test_apps/rails/app/assets/javascripts/posts.js
-- test_apps/rails/app/assets/stylesheets/application.css
-- test_apps/rails/app/assets/stylesheets/posts.css
-- test_apps/rails/app/assets/stylesheets/scaffold.css
-- test_apps/rails/app/channels/application_cable/channel.rb
-- test_apps/rails/app/channels/application_cable/connection.rb
-- test_apps/rails/app/controllers/application_controller.rb
-- test_apps/rails/app/controllers/concerns/.keep
-- test_apps/rails/app/controllers/posts_controller.rb
-- test_apps/rails/app/helpers/application_helper.rb
-- test_apps/rails/app/helpers/posts_helper.rb
-- test_apps/rails/app/jobs/application_job.rb
-- test_apps/rails/app/jobs/test_job.rb
-- test_apps/rails/app/mailers/application_mailer.rb
-- test_apps/rails/app/models/application_record.rb
-- test_apps/rails/app/models/concerns/.keep
-- test_apps/rails/app/models/post.rb
-- test_apps/rails/app/models/user.rb
-- test_apps/rails/app/views/layouts/application.html.erb
-- test_apps/rails/app/views/layouts/mailer.html.erb
-- test_apps/rails/app/views/layouts/mailer.text.erb
-- test_apps/rails/app/views/posts/_form.html.slim
-- test_apps/rails/app/views/posts/edit.html.slim
-- test_apps/rails/app/views/posts/index.html.slim
-- test_apps/rails/app/views/posts/new.html.slim
-- test_apps/rails/app/views/posts/show.html.slim
-- test_apps/rails/app/workers/test_worker.rb
-- test_apps/rails/bin/bundle
-- test_apps/rails/bin/rails
-- test_apps/rails/bin/rake
-- test_apps/rails/bin/setup
-- test_apps/rails/bin/sneakers
-- test_apps/rails/bin/update
-- test_apps/rails/config.ru
-- test_apps/rails/config/application.rb
-- test_apps/rails/config/boot.rb
-- test_apps/rails/config/cable.yml
-- test_apps/rails/config/database.yml
-- test_apps/rails/config/environment.rb
-- test_apps/rails/config/environments/development.rb
-- test_apps/rails/config/environments/production.rb
-- test_apps/rails/config/environments/test.rb
-- test_apps/rails/config/initializers/application_controller_renderer.rb
-- test_apps/rails/config/initializers/backtrace_silencers.rb
-- test_apps/rails/config/initializers/cookies_serializer.rb
-- test_apps/rails/config/initializers/filter_parameter_logging.rb
-- test_apps/rails/config/initializers/inflections.rb
-- test_apps/rails/config/initializers/mime_types.rb
-- test_apps/rails/config/initializers/new_framework_defaults.rb
-- test_apps/rails/config/initializers/session_store.rb
-- test_apps/rails/config/initializers/sneakers.rb
-- test_apps/rails/config/initializers/wrap_parameters.rb
-- test_apps/rails/config/locales/en.yml
-- test_apps/rails/config/puma.rb
-- test_apps/rails/config/routes.rb
-- test_apps/rails/config/sapience_example.yml
-- test_apps/rails/config/secrets.yml
-- test_apps/rails/db/migrate/20160812092236_create_users.rb
-- test_apps/rails/db/migrate/20160902141445_create_posts.rb
-- test_apps/rails/db/schema.rb
-- test_apps/rails/db/seeds.rb
-- test_apps/rails/lib/assets/.keep
-- test_apps/rails/lib/external_sneaker.rb
-- test_apps/rails/lib/tasks/.keep
-- test_apps/rails/lib/tasks/sneakers.rake
-- test_apps/rails/public/404.html
-- test_apps/rails/public/422.html
-- test_apps/rails/public/500.html
-- test_apps/rails/public/apple-touch-icon-precomposed.png
-- test_apps/rails/public/apple-touch-icon.png
-- test_apps/rails/public/favicon.ico
-- test_apps/rails/public/robots.txt
-- test_apps/rails/spec/controllers/posts_controller_spec.rb
-- test_apps/rails/spec/factories/posts.rb
-- test_apps/rails/spec/factories/users.rb
-- test_apps/rails/spec/fixtures/sapience.yml
-- test_apps/rails/spec/integration/sapience_spec.rb
-- test_apps/rails/spec/jobs/test_job_spec.rb
-- test_apps/rails/spec/models/post_spec.rb
-- test_apps/rails/spec/rails_helper.rb
-- test_apps/rails/spec/requests/posts_spec.rb
-- test_apps/rails/spec/routing/posts_routing_spec.rb
-- test_apps/rails/spec/spec_helper.rb
-- test_apps/rails/spec/views/posts/edit.html.slim_spec.rb
-- test_apps/rails/spec/views/posts/index.html.slim_spec.rb
-- test_apps/rails/spec/views/posts/new.html.slim_spec.rb
-- test_apps/rails/spec/views/posts/show.html.slim_spec.rb
-- test_apps/rails/spec/workers/test_worker_spec.rb
-- test_apps/rails/vendor/assets/stylesheets/.keep
 homepage: https://github.com/reevoo/sapience
 licenses:
 - MIT
@@ -456,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hasslefree autoconfiguration for logging, metrics and exception collection.

data/test_apps/grape/.gitignore

@@ -1,41 +0,0 @@
-*.rbc
-capybara-*.html
-/log
-/tmp
-/db/*.sqlite3
-/db/*.sqlite3-journal
-/public/system
-/coverage/
-/spec/tmp
-**.orig
-rerun.txt
-pickle-email-*.html
-
-# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
-config/initializers/secret_token.rb
-config/secrets.yml
-
-# dotenv
-# TODO Comment out this rule if environment variables can be committed
-.env
-
-## Environment normalization:
-/.bundle
-/vendor/bundle
-
-# these should all be checked in to normalize the environment:
-# Gemfile.lock, .ruby-version, .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# if using bower-rails ignore default bower_components path bower.json files
-/vendor/assets/bower_components
-*.bowerrc
-bower.json
-
-# Ignore pow environment settings
-.powenv
-
-# Ignore Byebug command history file.
-.byebug_history

data/test_apps/grape/.rspec

@@ -1 +0,0 @@
-test_apps/grape/../../.rspec

data/test_apps/grape/.simplecov

@@ -1,25 +0,0 @@
-require "simplecov-json"
-
-coverage_dir = '../../coverage/grape'
-FileUtils.rm_rf coverage_dir
-
-SimpleCov.coverage_dir coverage_dir
-SimpleCov.command_name "grape"
-SimpleCov.maximum_coverage_drop 1
-SimpleCov.formatters = [
-  SimpleCov::Formatter::HTMLFormatter,
-  SimpleCov::Formatter::JSONFormatter,
-]
-SimpleCov.start do
-  profiles.delete(:root_filter)
-  filters.clear
-  add_filter do |src|
-    if src.filename =~ %r{sapience\-rb|\/usr\/src\/app/}
-      src.filename.include?("test_apps/grape")
-    else
-      true
-    end
-  end
-
-  add_group "Sapience", "../"
-end

data/test_apps/grape/Appraisals

@@ -1,9 +0,0 @@
-appraise "grape-0.17.0" do
-  gem "grape", "0.17.0"
-end
-
-appraise "grape-0.16.2" do
-  gem "grape", "0.16.2"
-  gem "activesupport", "4.2.6"
-  gem "rack", "1.6.4"
-end

data/test_apps/grape/Gemfile

@@ -1,31 +0,0 @@
-source "https://rubygems.org"
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem "grape"
-# Use Puma as the app server
-gem "puma", "~> 3.0"
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-gem "sapience", path: "../.."
-gem "sentry-raven"
-gem "dogstatsd-ruby"
-gem "activesupport"
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem "byebug", platform: :mri
-  # gem "pry-nav", platform: :mri
-  gem "pry-byebug", platform: :mri
-  gem "rspec"
-  gem "racksh"
-  gem "appraisal"
-end
-
-group :test do
-  gem "rspec-its"
-  gem "simplecov"
-  gem "simplecov-json"
-  gem "fuubar"
-end

data/test_apps/grape/Rakefile

@@ -1,8 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require_relative "lib/ping"
-
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
-
-task default: [:spec]

data/test_apps/grape/config.ru

@@ -1,5 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require_relative 'lib/ping/api'
-
-run Ping::API

data/test_apps/grape/gemfiles/grape_0.16.2.gemfile

@@ -1,26 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "grape", "0.16.2"
-gem "puma", "~> 3.0"
-gem "sapience", :path => "../../.."
-gem "sentry-raven"
-gem "dogstatsd-ruby"
-gem "activesupport", "4.2.6"
-gem "rack", "1.6.4"
-
-group :development, :test do
-  gem "byebug", :platform => :mri
-  gem "pry-byebug", :platform => :mri
-  gem "rspec"
-  gem "racksh"
-  gem "appraisal"
-end
-
-group :test do
-  gem "rspec-its"
-  gem "simplecov"
-  gem "simplecov-json"
-  gem "fuubar"
-end

data/test_apps/grape/gemfiles/grape_0.16.2.gemfile.lock

@@ -1,140 +0,0 @@
-PATH
-  remote: ../../..
-  specs:
-    sapience (1.0.10)
-      concurrent-ruby (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    dogstatsd-ruby (2.0.0)
-    enumerable-lazy (0.0.2)
-    equalizer (0.0.11)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    fuubar (2.2.0)
-      rspec-core (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    grape (0.16.2)
-      activesupport
-      builder
-      hashie (>= 2.1.0)
-      multi_json (>= 1.3.2)
-      multi_xml (>= 0.5.2)
-      mustermann19 (~> 0.4.3)
-      rack (>= 1.3.0)
-      rack-accept
-      virtus (>= 1.0.0)
-    hashie (3.4.6)
-    i18n (0.7.0)
-    ice_nine (0.11.2)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.9.1)
-    multi_json (1.12.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    mustermann19 (0.4.4)
-      enumerable-lazy
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    puma (3.6.0)
-    rack (1.6.4)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    racksh (1.0.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby-progressbar (1.8.1)
-    sentry-raven (2.0.2)
-      faraday (>= 0.7.6, < 0.10.x)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    simplecov-json (0.2)
-      json
-      simplecov
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (= 4.2.6)
-  appraisal
-  byebug
-  dogstatsd-ruby
-  fuubar
-  grape (= 0.16.2)
-  pry-byebug
-  puma (~> 3.0)
-  rack (= 1.6.4)
-  racksh
-  rspec
-  rspec-its
-  sapience!
-  sentry-raven
-  simplecov
-  simplecov-json
-
-BUNDLED WITH
-   1.13.2

data/test_apps/grape/gemfiles/grape_0.17.0.gemfile

@@ -1,25 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "grape", "0.17.0"
-gem "puma", "~> 3.0"
-gem "sapience", :path => "../../.."
-gem "sentry-raven"
-gem "dogstatsd-ruby"
-gem "activesupport"
-
-group :development, :test do
-  gem "byebug", :platform => :mri
-  gem "pry-byebug", :platform => :mri
-  gem "rspec"
-  gem "racksh"
-  gem "appraisal"
-end
-
-group :test do
-  gem "rspec-its"
-  gem "simplecov"
-  gem "simplecov-json"
-  gem "fuubar"
-end