diff --git a/lib/generators/jsonapi/swagger/templates/swagger.rb.erb b/lib/generators/jsonapi/swagger/templates/swagger.rb.erb index 106fa48..717a6a4 100644 --- a/lib/generators/jsonapi/swagger/templates/swagger.rb.erb +++ b/lib/generators/jsonapi/swagger/templates/swagger.rb.erb @@ -11,7 +11,9 @@ RSpec.describe '<%= resouces_name %>', type: :request do tags '<%= route_resouces %>' produces 'application/vnd.api+json' parameter name: :'page[number]', in: :query, type: :string, description: '<%= t(:page_num) %>', required: false +<% if relationships.present? -%> parameter name: :include, in: :query, type: :string, description: '<%= t(:include_related_data) %>', required: false +<% end -%> <% filters.each do |filter_attr, filter_config| -%> parameter name: :'filter[<%= filter_attr %>]', in: :query, type: :string, description: '<%= t(:filter_field) %>', <% if filter_config[:default] -%>default: '<%= safe_encode(filter_config[:default]) %>',<% end %>required: false <% end -%> @@ -99,7 +101,9 @@ RSpec.describe '<%= resouces_name %>', type: :request do tags '<%= route_resouces %>' produces 'application/vnd.api+json' parameter name: :id, in: :path, type: :integer, description: 'ID', required: true +<% if relationships.present? -%> parameter name: :include, in: :query, type: :string, description: '<%= t(:include_related_data) %>', required: false +<% end -%> parameter name: :'fields[<%= route_resouces %>]', in: :query, type: :string, description: '<%= t(:display_field) %>', required: false <% relationships.each_value do |relation| -%> parameter name: :'fields[<%= relation.class_name.tableize %>]', in: :query, type: :string, description: '<%= t(:display_field) %>', required: false diff --git a/lib/jsonapi/swagger/railtie.rb b/lib/jsonapi/swagger/railtie.rb index 70ee731..918a246 100644 --- a/lib/jsonapi/swagger/railtie.rb +++ b/lib/jsonapi/swagger/railtie.rb @@ -6,7 +6,7 @@ module Jsonapi initializer 'jsonapi-swagger-i18n' do |app| locates = app.config.i18n.available_locales locates_dir = File.expand_path('../../i18n', __dir__) - locates.each do |loc| + Array(locates).each do |loc| locate_file = File.join(locates_dir, "#{loc}.yml") I18n.load_path.push(locate_file) if File.exist?(locate_file) && !I18n.load_path.include?(locate_file) end