pliny 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0737c4e1c61ecef9881625ff6bb0d2afeacc63977f239b7e2562d4aec3c3609a
-  data.tar.gz: f8db4293037c673ff3e33e025c75e86664f19cd207f3e36a2934e47eb981e942
+  metadata.gz: 53b08362a2511749050f3ca5ea9690d2adeefec8662f0a74cf391c896b119fd8
+  data.tar.gz: 23da2c0e15bdb3bf93f719e440bf0c2ac2a093fc1de3e500850c47ce5b8d6851
 SHA512:
-  metadata.gz: bad71b767121811048ca67857644d74d6b7e565461e96cc6f52fa3b8207a41cb6f5fa8b4d32d14fc49894709a7959c55ddd7a6c8972f1555f6d5b6108c160978
-  data.tar.gz: d0e2adac5319670b3c12344f6b4d40a989e74770f4ffdbffdbf7082941ed7f2590802babf478966a63c475638f4736961855a449cf9629779baf696f98f2eb28
+  metadata.gz: fc1e1a5d4fda88d1a181e06e7aefb300d1cf6ee516ca8e6018173dfd5dcf079885ebfb8c74643db317aa889a82cd38b95ce9101a592b3126fd7039f4aa7b029c
+  data.tar.gz: 1120021ef6ade5c1470cb280504e9abad2f672610be35546d3ea2521164841e973cef2b1be2f2e1b9dd0614ac1c493e6dae818ab35cb8dff242fdd115228524c

data/lib/pliny/errors.rb

@@ -6,7 +6,7 @@ module Pliny
       def self.render(error)
         headers = { "content-type" => "application/json; charset=utf-8" }
         data = { id: error.id, message: error.message }
-        [error.status, headers, [MultiJson.encode(data)]]
+        [error.status, headers, [JSON.generate(data)]]
       end
 
       def initialize(message, id)

data/lib/pliny/helpers/encode.rb

@@ -2,7 +2,11 @@ module Pliny::Helpers
   module Encode
     def encode(object)
       content_type :json, charset: 'utf-8'
-      MultiJson.encode(object, pretty: params[:pretty] == 'true' || Config.pretty_json)
+      if params[:pretty] == 'true' || Config.pretty_json
+        JSON.pretty_generate(object)
+      else
+        JSON.generate(object)
+      end
     end
   end
 end

data/lib/pliny/helpers/params.rb

@@ -9,8 +9,8 @@ module Pliny::Helpers
     def parse_body_params
       if request.media_type == "application/json"
         begin
-          decoded = MultiJson.decode(request.body.read)
-        rescue MultiJson::ParseError => e
+          decoded = JSON.parse(request.body.read)
+        rescue JSON::ParserError => e
           raise Pliny::Errors::BadRequest, e.message
         end
         request.body.rewind

data/lib/pliny/middleware/versioning.rb

@@ -27,7 +27,7 @@ module Pliny::Middleware
 Please specify a version along with the MIME type. For example, `Accept: application/vnd.#{@app_name}+json; version=1`.
             eos
             return [400, { "content-type" => "application/json; charset=utf-8" },
-              [MultiJson.encode(error)]]
+              [JSON.generate(error)]]
           end
 
           unless version

data/lib/pliny/templates/endpoint_acceptance_test.erb

@@ -23,7 +23,7 @@ RSpec.describe Endpoints::<%= plural_class_name %> do
   describe 'POST <%= url_path %>' do
     it 'returns correct status code and conforms to schema' do
       header "Content-Type", "application/json"
-      post '<%= url_path %>', MultiJson.encode({})
+      post '<%= url_path %>', JSON.generate({})
       assert_equal 201, last_response.status
       assert_schema_conform
     end
@@ -40,7 +40,7 @@ RSpec.describe Endpoints::<%= plural_class_name %> do
   describe 'PATCH <%= url_path %>/:id' do
     it 'returns correct status code and conforms to schema' do
       header "Content-Type", "application/json"
-      patch '<%= url_path %>/123', MultiJson.encode({})
+      patch '<%= url_path %>/123', JSON.generate({})
       assert_equal 200, last_response.status
       assert_schema_conform
     end

data/lib/pliny/templates/endpoint_scaffold_acceptance_test.erb

@@ -32,7 +32,7 @@ RSpec.describe Endpoints::<%= plural_class_name %> do
   describe 'POST <%= url_path %>' do
     it 'returns correct status code and conforms to schema' do
       header "Content-Type", "application/json"
-      post '<%= url_path %>', MultiJson.encode({})
+      post '<%= url_path %>', JSON.generate({})
       assert_equal 201, last_response.status
       assert_schema_conform
     end
@@ -50,7 +50,7 @@ RSpec.describe Endpoints::<%= plural_class_name %> do
   describe 'PATCH <%= url_path %>/:id' do
     it 'returns correct status code and conforms to schema' do
       header "Content-Type", "application/json"
-      patch "<%= url_path %>/#{@<%= field_name %>.id}", MultiJson.encode({})
+      patch "<%= url_path %>/#{@<%= field_name %>.id}", JSON.generate({})
       assert_equal 200, last_response.status
       assert_schema_conform
     end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/pliny.rb

@@ -1,4 +1,4 @@
-require "multi_json"
+require "json"
 require "sinatra/base"
 
 require_relative "pliny/version"

data/lib/template/Gemfile

@@ -1,8 +1,6 @@
 source "https://rubygems.org"
 ruby "2.4.0"
 
-gem "multi_json"
-gem "oj"
 gem "pg"
 gem "pliny", "~> 0.32"
 gem "pry"

data/lib/template/spec/endpoints/health_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Endpoints::Health do
       assert_equal(200, last_response.status)
       assert_equal("application/json;charset=utf-8", last_response.headers["Content-Type"])
       assert_equal(2, last_response.headers["Content-Length"].to_i)
-      assert_equal({}, MultiJson.decode(last_response.body))
+      assert_equal({}, JSON.parse(last_response.body))
     end
   end
 
@@ -49,7 +49,7 @@ RSpec.describe Endpoints::Health do
       assert_equal(200, last_response.status)
       assert_equal("application/json;charset=utf-8", last_response.headers["Content-Type"])
       assert_equal(2, last_response.headers["Content-Length"].to_i)
-      assert_equal({}, MultiJson.decode(last_response.body))
+      assert_equal({}, JSON.parse(last_response.body))
     end
   end
 end

data/spec/commands/generator/endpoint_spec.rb

@@ -26,31 +26,31 @@ describe Pliny::Commands::Generator::Endpoint do
     it "defines a stub GET /" do
       get "/artists"
       assert_equal 200, last_response.status
-      assert_equal [], MultiJson.decode(last_response.body)
+      assert_equal [], JSON.parse(last_response.body)
     end
 
     it "defines a stub POST /" do
       post "/artists"
       assert_equal 201, last_response.status
-      assert_equal Hash.new, MultiJson.decode(last_response.body)
+      assert_equal Hash.new, JSON.parse(last_response.body)
     end
 
     it "defines a stub GET /:id" do
       get "/artists/123"
       assert_equal 200, last_response.status
-      assert_equal Hash.new, MultiJson.decode(last_response.body)
+      assert_equal Hash.new, JSON.parse(last_response.body)
     end
 
     it "defines a stub PATCH /:id" do
       patch "/artists/123"
       assert_equal 200, last_response.status
-      assert_equal Hash.new, MultiJson.decode(last_response.body)
+      assert_equal Hash.new, JSON.parse(last_response.body)
     end
 
     it "defines a stub DELETE /:id" do
       delete "/artists/123"
       assert_equal 200, last_response.status
-      assert_equal Hash.new, MultiJson.decode(last_response.body)
+      assert_equal Hash.new, JSON.parse(last_response.body)
     end
 
   end

data/spec/helpers/encode_spec.rb

@@ -23,19 +23,19 @@ describe Pliny::Helpers::Encode do
   it "encodes as json" do
     payload = { "foo" => "bar" }
     post "/", payload
-    assert_equal MultiJson.encode(payload), last_response.body
+    assert_equal JSON.generate(payload), last_response.body
   end
 
   it "encodes in pretty mode when pretty=true" do
     payload = { "foo" => "bar", "pretty" => "true" }
     post "/", payload
-    assert_equal MultiJson.encode(payload, pretty: true), last_response.body
+    assert_equal JSON.pretty_generate(payload), last_response.body
   end
 
   it "encodes in pretty mode when set by config" do
     allow(Config).to receive(:pretty_json) { true }
     payload = { "foo" => "bar" }
     post "/", payload
-    assert_equal MultiJson.encode(payload, pretty: true), last_response.body
+    assert_equal JSON.pretty_generate(payload), last_response.body
   end
 end

data/spec/helpers/serialize_spec.rb

@@ -7,7 +7,7 @@ describe Pliny::Helpers::Serialize do
         register Pliny::Helpers::Serialize
 
         get "/" do
-          MultiJson.encode(serialize([]))
+          JSON.generate(serialize([]))
         end
       end
     end
@@ -34,11 +34,11 @@ describe Pliny::Helpers::Serialize do
         serializer Serializer
 
         get "/" do
-          MultiJson.encode(serialize([]))
+          JSON.generate(serialize([]))
         end
 
         get "/env" do
-          MultiJson.encode(serialize(env))
+          JSON.generate(serialize(env))
         end
       end
     end
@@ -46,13 +46,13 @@ describe Pliny::Helpers::Serialize do
     it "encodes as json" do
       get "/"
       assert_equal 200, last_response.status
-      assert_equal MultiJson.encode([]), last_response.body
+      assert_equal JSON.generate([]), last_response.body
     end
 
     it "emits information for canonical log lines" do
       get "/env"
       assert_equal 200, last_response.status
-      body = MultiJson.decode(last_response.body)
+      body = JSON.parse(last_response.body)
       assert body["pliny.serializer_arity"] > 1
       assert body["pliny.serializer_timing"] > 0
     end

data/spec/middleware/rescue_errors_spec.rb

@@ -21,7 +21,7 @@ describe Pliny::Middleware::RescueErrors do
     @app = new_rack_app
     get "/api-error"
     assert_equal 503, last_response.status
-    error_json = MultiJson.decode(last_response.body)
+    error_json = JSON.parse(last_response.body)
     assert_equal "service_unavailable", error_json["id"]
     assert_equal "Service unavailable.", error_json["message"]
   end
@@ -31,7 +31,7 @@ describe Pliny::Middleware::RescueErrors do
     expect(Pliny::ErrorReporters).to receive(:notify)
     get "/"
     assert_equal 500, last_response.status
-    error_json = MultiJson.decode(last_response.body)
+    error_json = JSON.parse(last_response.body)
     assert_equal "internal_server_error", error_json["id"]
     assert_equal "Internal server error.", error_json["message"]
   end
@@ -48,7 +48,7 @@ describe Pliny::Middleware::RescueErrors do
     allow(Pliny::ErrorReporters).to receive(:notify)
     get "/"
     assert_equal 500, last_response.status
-    error_json = MultiJson.decode(last_response.body)
+    error_json = JSON.parse(last_response.body)
     assert_equal "internal_server_error", error_json["id"]
     assert_equal "Please stand by", error_json["message"]
   end

data/spec/middleware/versioning_spec.rb

@@ -13,7 +13,7 @@ describe Pliny::Middleware::Versioning do
       use Pliny::Middleware::Versioning, default: '2', app_name: 'pliny'
       run Sinatra.new {
         get "/" do
-          MultiJson.encode env
+          JSON.generate env
         end
       }
     end
@@ -21,7 +21,7 @@ describe Pliny::Middleware::Versioning do
 
   it "produces default version on application/json" do
     get '/', {}, {'HTTP_ACCEPT' => 'application/json'}
-    json = MultiJson.decode(last_response.body)
+    json = JSON.parse(last_response.body)
     assert_equal 'application/json', json['HTTP_ACCEPT']
     assert_equal '2', json['HTTP_X_API_VERSION']
   end
@@ -33,19 +33,19 @@ Please specify a version along with the MIME type. For example, `Accept: applica
     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)
+    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)
+    json = JSON.parse(last_response.body)
     assert_equal 'application/json', json['HTTP_ACCEPT']
     assert_equal '3', json['HTTP_X_API_VERSION']
   end
@@ -53,14 +53,14 @@ Please specify a version along with the MIME type. For example, `Accept: applica
   # 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)
+    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)
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,40 +17,20 @@ 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'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: prmd
   requirement: !ruby/object:Gem::Requirement
@@ -505,14 +485,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
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra