bullet_train-api 1.0.12 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27ca15eddb9b29b85afaba362068e42a8c7d844226d1aa5b37c37b11ba3f356f
-  data.tar.gz: 6e5ae250fddaa6b461e867e006abf9d30fe9fcde8f846eaf120a12130396edcf
+  metadata.gz: e93441de2a659f5a8f2bbac21638ff1ee591e508bf95aa89e356cbd9146cfa14
+  data.tar.gz: e1a0120f64880dac83f704c1f161076c6ac6343b2e42535f24d60e76dbb210f1
 SHA512:
-  metadata.gz: 1326b4449fb8f96c87377cd5cc5cd35921234e9b7ed28926bd7dd49ca4ea73db401d59fd95c2e847f1c709bbfb606a1a0a01e3f46fd8bb6d983e51d3c6b03237
-  data.tar.gz: 530412b77a184ca0c271e50b2678f4427513f53d3dc2ab45457661586fa7f55846ac1cf0db62391a321aadeef1c393d1b4e48eead90b7aff5211398f29597f7f
+  metadata.gz: 17b8ee23d486ec26488bb40b0ef3b80a4b2b5c1f900d4016e0af457b593f5caecf5daf45dc529cc86a0240b292f5c469552ea6a0398417c5e83d6c946de190ef
+  data.tar.gz: ed4a3e521703d43e2c13e5015cfe116fa669edaa7fc45ceec08b6ae4171ef0eb9c79cf833a6c000234c5df8b418373a63066534f868beded9a878d52c43516be

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2022 Andrew Culver
+Copyright 2022 Bullet Train, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/api/base.rb

@@ -8,19 +8,24 @@ class Api::Base < Grape::API
   format :jsonapi
   default_error_formatter :json
 
-  # TODO Shouldn't this be in V1 or not versioned?
-  include Api::V1::ExceptionsHandler
-
   mount Api::V1::Root
 
-  # Swagger docs are available at `/api/swagger_doc.json`.
+  # Swagger docs are available at `/api/docs/swagger.json`.
   add_swagger_documentation \
-    hide_documentation_path: true,
-    array_use_braces: true,
     api_version: "v1",
+    array_use_braces: true,
+    base_path: "/api",
+    doc_version: "1.0",
+    endpoint_auth_wrapper: ::WineBouncer::OAuth2,
+    hide_documentation_path: true,
     info: {
       title: I18n.t("application.name"),
       description: I18n.t("application.description")
     },
-    endpoint_auth_wrapper: WineBouncer::OAuth2
+    mount_path: "/docs/swagger"
+
+  # TODO Reintroduce this once we've got `context` in current attributes.
+  # before do
+  #   Current.context = :api
+  # end
 end

data/app/controllers/api/model_parser.rb

@@ -0,0 +1,42 @@
+class Api::ModelParser < GrapeSwagger::Jsonapi::Parser
+  attr_reader :model, :endpoint
+
+  alias_method :schema, :call
+
+  def initialize(model, endpoint)
+    @model = model
+    @endpoint = endpoint
+  end
+
+  def call
+    # first let's grab the schema generated by the JSON:API parser
+    schema_json = schema.to_json
+
+    # From Nick Schneble:
+
+    # we can easily override these types for our API endpoints in the documentation
+    # but we can't do the same thing for the relationship objects that are auto-generated
+    # thus the fancy affair below
+
+    # if you want to learn more about what's happening here, read these:
+    # https://stackoverflow.com/a/17918118/1322386
+    # https://swagger.io/docs/specification/data-models/data-types/
+
+    # Swagger 3.0 only supports a subset of Ruby data types
+    schema_json.gsub!("\"type\":\"binary\"", "\"type\":\"string\", \"format\":\"binary\"")
+    schema_json.gsub!("\"type\":\"date\"", "\"type\":\"string\", \"format\":\"date\"")
+    schema_json.gsub!("\"type\":\"datetime\"", "\"type\":\"string\", \"format\":\"date-time\"")
+    schema_json.gsub!("\"type\":\"decimal\"", "\"type\":\"number\", \"format\":\"double\"")
+    schema_json.gsub!("\"type\":\"float\"", "\"type\":\"number\", \"format\":\"float\"")
+    schema_json.gsub!("\"type\":\"bigint\"", "\"type\":\"integer\", \"format\":\"int64\"")
+    schema_json.gsub!("\"type\":\"primary_key\"", "\"type\":\"integer\", \"format\":\"int64\"")
+    schema_json.gsub!("\"type\":\"references\"", "\"type\":\"object\"")
+    schema_json.gsub!("\"type\":\"text\"", "\"type\":\"string\"")
+    schema_json.gsub!("\"type\":\"time\"", "\"type\":\"string\", \"format\":\"time\"")
+    schema_json.gsub!("\"type\":\"timestamp\"", "\"type\":\"string\", \"format\":\"timestamp\"")
+    schema_json.gsub!("\"type\":\"json\"", "\"type\":\"array\", \"items\":{\"type\":\"string\"}")
+
+    # returns a Hash as if nothing fancy happened
+    JSON.parse(schema_json)
+  end
+end

data/app/controllers/api/v1/me_endpoint.rb

@@ -1,8 +1,9 @@
 class Api::V1::MeEndpoint < Api::V1::Root
-  resource :me do
+  resource :me, desc: Api.title(:actions) do
+    desc Api.title(:show), &Api.show_desc
     oauth2
-    get "/" do
-      render Api::V1::UserSerializer.new(current_user, include: [:teams, :memberships]).to_json
+    get do
+      render current_user, include: [:teams, :memberships], serializer: "Api::V1::UserSerializer", adapter: :attributes
     end
   end
 end

data/app/controllers/concerns/api/v1/base.rb

@@ -4,9 +4,11 @@ module Api::V1::Base
   included do
     include Api::V1::Defaults
     include Api::V1::LoadsAndAuthorizesApiResource
+    include Api::V1::ExceptionsHandler
 
     version "v1"
-    use ::WineBouncer::OAuth2
+
+    use ::WineBouncer::OAuth2, message: "Doorkeeper OAuth2 Authentication"
 
     rescue_from :all do |error|
       handle_api_error(error)
@@ -15,6 +17,11 @@ module Api::V1::Base
     BulletTrain::Api.endpoints.each do |endpoint_class|
       mount endpoint_class.constantize
     end
+
+    after_validation do
+      # Ensure responses never get cached.
+      header "Cache-Control", "no-store"
+    end
   end
 
   class_methods do

data/app/controllers/concerns/api/v1/teams/endpoint_base.rb

@@ -16,7 +16,7 @@ module Api::V1::Teams::EndpointBase
         # `Api::V1::TeamsEndpoint`, but since we can get the latter, we'll use that to fetch whatever proc is defined
         # in ADDITIONAL_PARAMS.
         if defined?(@api.to_s.constantize::PARAMS)
-          instance_eval &@api.to_s.constantize::PARAMS
+          instance_eval(&@api.to_s.constantize::PARAMS)
         end
       end
     end

data/config/locales/en/me.en.yml

@@ -0,0 +1,5 @@
+en:
+  me: &me
+  	api:
+			actions: "Actions for the current user"
+			show: "Retrieve info about the current user"

data/lib/bullet_train/api/engine.rb

@@ -4,7 +4,7 @@ require "grape_jsonapi"
 require "grape-swagger"
 require "grape_on_rails_routes"
 # require "wine_bouncer"
-require "kaminari"
+require "pagy"
 require "api-pagination"
 require "rack/cors"
 

data/lib/bullet_train/api/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Api
-    VERSION = "1.0.12"
+    VERSION = "1.0.15"
   end
 end

data/lib/bullet_train/api.rb

@@ -7,7 +7,7 @@ require "grape_jsonapi"
 require "grape-swagger"
 require "grape_on_rails_routes"
 # require "wine_bouncer"
-require "kaminari"
+require "pagy"
 require "api-pagination"
 require "rack/cors"
 require "jsonapi/serializer"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-api
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.15
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: standard
+  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: grape-jsonapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: grape-swagger
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bullet_train
+  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: '0'
 description: Bullet Train API
 email:
 - andrew.culver@gmail.com
@@ -178,6 +206,7 @@ files:
 - app/controllers/account/platform/applications_controller.rb
 - app/controllers/api.rb
 - app/controllers/api/base.rb
+- app/controllers/api/model_parser.rb
 - app/controllers/api/v1.rb
 - app/controllers/api/v1/defaults.rb
 - app/controllers/api/v1/exceptions_handler.rb
@@ -207,6 +236,7 @@ files:
 - app/views/account/platform/applications/show.html.erb
 - app/views/account/platform/applications/show.json.jbuilder
 - config/locales/en/api.en.yml
+- config/locales/en/me.en.yml
 - config/locales/en/platform/applications.en.yml
 - config/routes.rb
 - lib/bullet_train/api.rb
@@ -234,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bullet Train API