bullet_train-api 1.1.11 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 807f6397b8ca4d3ed29c7181d9aa72456630ad6262baeab928637f11858d83f1
-  data.tar.gz: d3db30ae44aa54f4504554a10eadd3570c061a558068b9dba844580bb8fb1b7d
+  metadata.gz: a26bfba5a9e08beab9b2e9ef020751627ba9f5e622708f74bf44798ea903434b
+  data.tar.gz: b40893d54092bb315a343891b69a0cc84a651c30775bd8840f0a3b917b791136
 SHA512:
-  metadata.gz: e748b8c2207bc0a43e8cbacfb69e48108fff664298404194299fafa5271d5b330222830bedce8351916096430ef42d83ea9b4af96c647abc9f4996e9e73194f8
-  data.tar.gz: 702abad5b373fe2600f460c26c363a2063082e9cd9fb832b9991d7bf079ba40175e0eba8ef25f2f4a3bf0f9e4b46026e83b1383144cafb0c20789a8c0c7574e2
+  metadata.gz: 2794b6b2cb7574361e60c9ef1e26b9cf1cf142c557f6bbebb60fe724b2c7c7ea0857b036ad432c0cfee1d9e286508db49ea63822d06ea71a0566407f60cbd082
+  data.tar.gz: 2b4f042745a52886ba79973b159fe3a70b216f55591d537746d1a0a62365454ad6be01f132ed198665b03ed24f85022eeecd7fa5788555ce2dccdd52c5f1ae03

data/app/controllers/api/open_api_controller.rb

@@ -25,31 +25,29 @@ module OpenApiHelper
   end
 
   def automatic_paths_for(model, parent, except: [])
-    output = render("api/v1/open_api/shared/paths", except: except)
+    output = render("api/#{@version}/open_api/shared/paths", except: except)
     output = Scaffolding::Transformer.new(model.name, [parent&.name]).transform_string(output).html_safe
     indent(output, 1)
   end
 
   def automatic_components_for(model, locals: {})
-    extend JbuilderSchema
-
-    schema_json = jbuilder_schema("api/v1/#{model.name.underscore.pluralize}/_#{model.name.underscore.split("/").last}",
+    jbuilder = Jbuilder::Schema.renderer("app/views/api/#{@version}", locals: {
+      # If we ever get to the point where we need a real model here, we should implement an example team in seeds that we can source it from.
+      model.name.underscore.split("/").last.to_sym => model.new,
+      # Same here, if we ever need this to be a real object, this should be `test@example.com` with an `SecureRandom.hex` password.
+      :current_user => User.new
+    }.merge(locals))
+
+    schema_json = jbuilder.json(
+      model.new,
       title: I18n.t("#{model.name.underscore.pluralize}.label"),
       # TODO Improve this. We don't have a generic description for models we can use here.
       description: I18n.t("#{model.name.underscore.pluralize}.label"),
-      format: :json,
-      paths: view_paths.map(&:path),
-      model: model,
-      locals: {
-        # If we ever get to the point where we need a real model here, we should implement an example team in seeds that we can source it from.
-        model.name.underscore.split("/").last.to_sym => model.new,
-        # Same here, if we ever need this to be a real object, this should be `test@example.com` with an `SecureRandom.hex` password.
-        :current_user => User.new
-      }.merge(locals))
+    )
 
     attributes_output = JSON.parse(schema_json)
 
-    strong_params_module = "Api::V1::#{model.name.pluralize}Controller::StrongParameters".constantize
+    strong_params_module = "Api::#{@version.upcase}::#{model.name.pluralize}Controller::StrongParameters".constantize
     strong_parameter_keys = BulletTrain::Api::StrongParametersReporter.new(model, strong_params_module).report
     if strong_parameter_keys.last.is_a?(Hash)
       strong_parameter_keys += strong_parameter_keys.pop.keys

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

@@ -70,8 +70,7 @@ module Api::Controllers::Base
     # TODO Make this logic configurable so that downstream developers can write different methods for this column getting updated.
     begin
       doorkeeper_token.update(last_used_at: Time.zone.now)
-    rescue
-      ActiveRecord::StatementInvalid
+    rescue ActiveRecord::StatementInvalid => _
     end
     @current_user ||= User.find_by(id: doorkeeper_token[:resource_owner_id])
   end

data/lib/bullet_train/api/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Api
-    VERSION = "1.1.11"
+    VERSION = "1.1.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-api
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.13
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bullet_train
   requirement: !ruby/object:Gem::Requirement