pliny 1.1.0 → 2.0.0

data/spec/middleware/versioning_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Pliny::Middleware::Versioning do
@@ -10,58 +12,58 @@ describe Pliny::Middleware::Versioning do
   def app
     Rack::Builder.new do
       use Rack::Lint
-      use Pliny::Middleware::Versioning, default: '2', app_name: 'pliny'
+      use Pliny::Middleware::Versioning, default: "2", app_name: "pliny"
       run Sinatra.new {
         get "/" do
-          MultiJson.encode env
+          JSON.generate env
         end
       }
     end
   end
 
   it "produces default version on application/json" do
-    get '/', {}, {'HTTP_ACCEPT' => 'application/json'}
-    json = MultiJson.decode(last_response.body)
-    assert_equal 'application/json', json['HTTP_ACCEPT']
-    assert_equal '2', json['HTTP_X_API_VERSION']
+    get "/", {}, { "HTTP_ACCEPT" => "application/json" }
+    json = JSON.parse(last_response.body)
+    assert_equal "application/json", json["HTTP_ACCEPT"]
+    assert_equal "2", json["HTTP_X_API_VERSION"]
   end
 
   it "errors without a version specified on application/vnd.pliny+json" do
-    get '/', {}, {'HTTP_ACCEPT' => 'application/vnd.pliny+json'}
-    error = { id: :bad_version, message: <<-eos }
-Please specify a version along with the MIME type. For example, `Accept: application/vnd.pliny+json; version=1`.
-    eos
+    get "/", {}, { "HTTP_ACCEPT" => "application/vnd.pliny+json" }
+    error = { id: :bad_version, message: <<~EOS }
+      Please specify a version along with the MIME type. For example, `Accept: application/vnd.pliny+json; version=1`.
+    EOS
 
     assert_equal 400, last_response.status
-    assert_equal MultiJson.encode(error), last_response.body
+    assert_equal JSON.generate(error), last_response.body
   end
 
   it "ignores a wrong app name" do
-    get '/', {}, {'HTTP_ACCEPT' => 'application/vnd.chuck_norris+json'}
-    json = MultiJson.decode(last_response.body)
-    assert_equal 'application/vnd.chuck_norris+json', json['HTTP_ACCEPT']
-    assert_equal '2', json['HTTP_X_API_VERSION']
+    get "/", {}, { "HTTP_ACCEPT" => "application/vnd.chuck_norris+json" }
+    json = JSON.parse(last_response.body)
+    assert_equal "application/vnd.chuck_norris+json", json["HTTP_ACCEPT"]
+    assert_equal "2", json["HTTP_X_API_VERSION"]
   end
 
   it "produces a version on application/vnd.pliny+json; version=3" do
-    get '/', {}, {'HTTP_ACCEPT' => 'application/vnd.pliny+json; version=3'}
-    json = MultiJson.decode(last_response.body)
-    assert_equal 'application/json', json['HTTP_ACCEPT']
-    assert_equal '3', json['HTTP_X_API_VERSION']
+    get "/", {}, { "HTTP_ACCEPT" => "application/vnd.pliny+json; version=3" }
+    json = JSON.parse(last_response.body)
+    assert_equal "application/json", json["HTTP_ACCEPT"]
+    assert_equal "3", json["HTTP_X_API_VERSION"]
   end
 
   # this behavior is pretty sketchy, but a pretty extreme edge case
   it "handles multiple MIME types" do
-    get '/', {}, {'HTTP_ACCEPT' => 'application/vnd.pliny+json; version=3; q=0.5, text/xml'}
-    json = MultiJson.decode(last_response.body)
-    assert_equal 'text/xml, application/json; q=0.5', json['HTTP_ACCEPT']
-    assert_equal '3', json['HTTP_X_API_VERSION']
+    get "/", {}, { "HTTP_ACCEPT" => "application/vnd.pliny+json; version=3; q=0.5, text/xml" }
+    json = JSON.parse(last_response.body)
+    assert_equal "text/xml, application/json; q=0.5", json["HTTP_ACCEPT"]
+    assert_equal "3", json["HTTP_X_API_VERSION"]
   end
 
   it "produces the priority version on multiple types" do
-    get '/', {}, {'HTTP_ACCEPT' => 'application/vnd.pliny+json; version=4; q=0.5, application/vnd.pliny+json; version=3'}
-    json = MultiJson.decode(last_response.body)
-    assert_equal 'application/json, application/json; q=0.5', json['HTTP_ACCEPT']
-    assert_equal '3', json['HTTP_X_API_VERSION']
+    get "/", {}, { "HTTP_ACCEPT" => "application/vnd.pliny+json; version=4; q=0.5, application/vnd.pliny+json; version=3" }
+    json = JSON.parse(last_response.body)
+    assert_equal "application/json, application/json; q=0.5", json["HTTP_ACCEPT"]
+    assert_equal "3", json["HTTP_X_API_VERSION"]
   end
 end

data/spec/request_store_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Pliny::RequestStore do
   before do
     @env = {
-      "REQUEST_IDS" => ["abc", "def"]
+      "REQUEST_IDS" => ["abc", "def"],
     }
   end
 

data/spec/rollbar_logger_spec.rb

@@ -1,41 +1,43 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Pliny::RollbarLogger do
   subject(:logger) { Pliny::RollbarLogger.new }
 
-  let(:message) { 'hello world' }
+  let(:message) { "hello world" }
   let(:log_context) { { rollbar: true, level: level, message: message } }
 
   before do
     expect(Pliny).to receive(:log).with(log_context)
   end
 
-  context '#debug' do
-    let(:level) { 'debug' }
+  context "#debug" do
+    let(:level) { "debug" }
 
     it "proxies the debug log level" do
       logger.debug(message)
     end
   end
 
-  context '#info' do
-    let(:level) { 'info' }
+  context "#info" do
+    let(:level) { "info" }
 
     it "proxies the info log level" do
       logger.info(message)
     end
   end
 
-  context '#warn' do
-    let(:level) { 'warn' }
+  context "#warn" do
+    let(:level) { "warn" }
 
     it "proxies the warn log level" do
       logger.warn(message)
     end
   end
 
-  context '#error' do
-    let(:level) { 'error' }
+  context "#error" do
+    let(:level) { "error" }
 
     it "proxies the error log level" do
       logger.error(message)

data/spec/router_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Pliny::Router do
@@ -5,12 +7,12 @@ describe Pliny::Router do
     def app
       Rack::Builder.new do
         use Rack::Lint
-        use Pliny::Middleware::Versioning, default: '2', app_name: 'pliny'
+        use Pliny::Middleware::Versioning, default: "2", app_name: "pliny"
 
         use Pliny::Router do
-          version '3' do
+          version "3" do
             mount Sinatra.new {
-              get '/' do
+              get "/" do
                 "API V3"
               end
             }
@@ -26,13 +28,13 @@ describe Pliny::Router do
     end
 
     it "should not run on any api" do
-      get '/'
-      assert_equal 'No API', last_response.body
+      get "/"
+      assert_equal "No API", last_response.body
     end
 
     it "should run on API V3" do
-      get '/', {}, {'HTTP_ACCEPT' => 'application/vnd.pliny+json; version=3'}
-      assert_equal 'API V3', last_response.body
+      get "/", {}, { "HTTP_ACCEPT" => "application/vnd.pliny+json; version=3" }
+      assert_equal "API V3", last_response.body
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # make sure this is set before Sinatra is required
 ENV["RACK_ENV"] = "test"
 
@@ -35,7 +37,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 
   # the rack app to be tested with rack-test:
   def app

data/spec/support/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pliny/config_helpers"
 
 # Supress the "use RbConfig instead" warning.

data/spec/support/endpoints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # create Endpoints::Base so we can test subclasses generated by Pliny:
 module Endpoints
   class Base < Sinatra::Base

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brandur Leach
 - Pedro Belo
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,40 +16,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: http_accept
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: prmd
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +90,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -87,30 +100,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: http_accept
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: sinatra-router
   requirement: !ruby/object:Gem::Requirement
@@ -152,95 +145,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rollbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -254,7 +229,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -268,79 +243,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: sentry-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rollbar
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pliny is a set of base classes and helpers to help developers write excellent
   APIs in Sinatra
 email:
@@ -373,6 +344,7 @@ files:
 - lib/pliny/db_support.rb
 - lib/pliny/error_reporters.rb
 - lib/pliny/error_reporters/rollbar.rb
+- lib/pliny/error_reporters/sentry.rb
 - lib/pliny/errors.rb
 - lib/pliny/helpers/encode.rb
 - lib/pliny/helpers/params.rb
@@ -415,7 +387,7 @@ files:
 - lib/template/.env.test.erb
 - lib/template/.gitignore
 - lib/template/.rspec
-- lib/template/.rubocop.yml
+- lib/template/.rubocop_template.yml
 - lib/template/.ruby-version
 - lib/template/Gemfile
 - lib/template/LICENSE
@@ -431,7 +403,7 @@ files:
 - lib/template/config/initializers/database.rb
 - lib/template/config/initializers/log.rb
 - lib/template/config/initializers/metrics.rb
-- lib/template/config/initializers/rollbar.rb
+- lib/template/config/initializers/sentry.rb
 - lib/template/config/puma.rb
 - lib/template/db/schema.sql
 - lib/template/db/seeds.rb
@@ -468,6 +440,7 @@ files:
 - spec/config_helpers_spec.rb
 - spec/db_support_spec.rb
 - spec/error_reporters/rollbar_spec.rb
+- spec/error_reporters/sentry_spec.rb
 - spec/error_reporters_spec.rb
 - spec/errors_spec.rb
 - spec/helpers/encode_spec.rb
@@ -497,7 +470,6 @@ homepage: https://github.com/interagent/pliny
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -505,15 +477,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra
 test_files: []

data/lib/template/config/initializers/rollbar.rb

@@ -1,12 +0,0 @@
-require "pliny/error_reporters/rollbar"
-
-Pliny::ErrorReporters.error_reporters << Pliny::ErrorReporters::Rollbar
-
-Rollbar.configure do |config|
-  config.enabled = ENV.key?("ROLLBAR_ACCESS_TOKEN")
-  config.disable_rack_monkey_patch = true
-  config.access_token = ENV["ROLLBAR_ACCESS_TOKEN"]
-  config.environment = ENV["ROLLBAR_ENV"]
-  config.logger = Pliny::RollbarLogger.new
-  config.use_sucker_punch
-end