bullet_train-api 1.0.8 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68d08813f7429b8be31aa20cf1eaaaa1294ed3f66fd04e54165d0426bb7df43
-  data.tar.gz: d849b06fd396ad5e466b80493195b337992dd32f649de6e24779c8d142042758
+  metadata.gz: 2f8599c5782cc6d6bbc75ac56c21630781a78a74f7ea2eed9ea52a1b02075d1b
+  data.tar.gz: f21ff5faab0e451c593519671f5ead35063a7ced971e95ab7d741f35fd654265
 SHA512:
-  metadata.gz: 8a556c8c605e9c2fc8935aeb682d206c6e34908e27a5b140060cf4ddeedd82a8f029c19418b92844c7490af9ee4db878139d196e42361f99ee14ddf5ef65e96a
-  data.tar.gz: 0e101b006c7831c8bb47edc562536e4fab741ac5f656ddef27a1a3c5d9452e6180db96b78e268d6c7677f67dd7466dc7c32de2743e07dc7a1e03d12f37500d96
+  metadata.gz: 8ce2e86ed0de69b74859f69be71f516317c0b2ca46986e9faa1d11a39f375101fbcf351521f40da25241b88088ed242b9d01e699a35aa786040d3dd9a5a16aec
+  data.tar.gz: 1ee449d6858dd7e7d5ba5a72f1c28ba1cbbb45063ad444390a8bca73c01e8a441564162169aab9b63b69eb85dde242e21a9c88f205480848c64ad6de48547237

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

@@ -3,8 +3,8 @@ require "grape-cancan"
 require "grape_jsonapi"
 require "grape-swagger"
 require "grape_on_rails_routes"
-require "wine_bouncer"
-require "kaminari"
+# require "wine_bouncer"
+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.8"
+    VERSION = "1.0.14"
   end
 end

data/lib/bullet_train/api.rb

@@ -1,6 +1,18 @@
 require "bullet_train/api/version"
 require "bullet_train/api/engine"
 
+require "grape"
+require "grape-cancan"
+require "grape_jsonapi"
+require "grape-swagger"
+require "grape_on_rails_routes"
+# require "wine_bouncer"
+require "pagy"
+require "api-pagination"
+require "rack/cors"
+require "jsonapi/serializer"
+require "doorkeeper"
+
 module BulletTrain
   module Api
     mattr_accessor :endpoints, default: []

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-api
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.14
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 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
@@ -54,6 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-jsonapi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: grape-swagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grape-swagger
+  name: grape_on_rails_routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grape_on_rails_routes
+  name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wine_bouncer
+  name: api-pagination
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: api-pagination
+  name: jsonapi-serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-cors
+  name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jsonapi-serializer
+  name: bullet_train
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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