support ruby 2.4

.travis.yml

@@ -6,32 +6,23 @@ before_install:
 
 matrix:
   include:
-    - rvm: 2.3.3
-      script:
-        - bundle exec danger
-    - rvm: 2.3.3
+    - rvm: 2.4.0-preview3
       env: MODEL_PARSER=grape-swagger-entity
-    - rvm: 2.3.3
+    - rvm: 2.4.0-preview3
       env: MODEL_PARSER=grape-swagger-representable
-    - rvm: 2.3.3
-      env: GRAPE_VERSION=0.14.0
-    - rvm: 2.3.3
-      env: GRAPE_VERSION=0.15.0
-    - rvm: 2.3.3
       env: GRAPE_VERSION=0.16.2
-    - rvm: 2.3.3
+    - rvm: 2.4.0-preview3
       env: GRAPE_VERSION=0.17.0
-    - rvm: 2.3.3
+    - rvm: 2.4.0-preview3
       env: GRAPE_VERSION=0.18.0
-    - rvm: 2.3.3
+    - rvm: 2.4.0-preview3
       env: GRAPE_VERSION=HEAD
+    - rvm: 2.3.3
     - rvm: 2.2
     - rvm: ruby-head
     - rvm: jruby-9.1.6.0
     - rvm: jruby-head
-    - rvm: rbx-2
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-9.1.6.0
     - rvm: jruby-head
-    - rvm: rbx-2

Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'http://rubygems.org'
 
 ruby RUBY_VERSION

README.md

@@ -54,6 +54,7 @@ grape-swagger | swagger spec | grape                   | grape-entity | represen
 0.23.0        |     2.0      | >= 0.12.0 ... <= 0.17.0 | <= 0.5.1     | >= 2.4.1      |
 0.24.0        |     2.0      | >= 0.12.0 ... <= 0.18.0 | <= 0.5.1     | >= 2.4.1      |
 0.25.0        |     2.0      | >= 0.14.0 ... <= 0.18.0 | <= 0.5.2     | >= 2.4.1      |
+0.xx.0        |     2.0      | >= 0.16.0 ...           | >= 0.5.2     | >= 2.4.1      |
 
 <a name="swagger-spec" />
 ## Swagger-Spec

Rakefile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'bundler'
@@ -14,6 +15,7 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+# task default: [:spec]
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 

grape-swagger.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'grape-swagger/version'
 
@@ -11,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Add auto generated documentation to your Grape API that can be displayed with Swagger.'
   s.license     = 'MIT'
 
-  s.add_runtime_dependency 'grape', '>= 0.12.0'
+  s.add_runtime_dependency 'grape', '~> 0.16'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec}/*`.split("\n")

lib/grape-swagger.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'grape'
 
 require 'grape-swagger/grape/route'

lib/grape-swagger/doc_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'grape-swagger/doc_methods/status_codes'
 
 require 'grape-swagger/doc_methods/produces_consumes'

lib/grape-swagger/doc_methods/build_model_definition.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class BuildModelDefinition

lib/grape-swagger/doc_methods/data_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class DataType

lib/grape-swagger/doc_methods/extensions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class Extensions

lib/grape-swagger/doc_methods/headers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class Headers

lib/grape-swagger/doc_methods/move_params.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class MoveParams

lib/grape-swagger/doc_methods/operation_id.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class OperationId

lib/grape-swagger/doc_methods/optional_object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class OptionalObject

lib/grape-swagger/doc_methods/parse_params.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class ParseParams

lib/grape-swagger/doc_methods/path_string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class PathString

lib/grape-swagger/doc_methods/produces_consumes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class ProducesConsumes

lib/grape-swagger/doc_methods/status_codes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class StatusCodes

lib/grape-swagger/doc_methods/tag_name_description.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module DocMethods
     class TagNameDescription

lib/grape-swagger/endpoint.rb

@@ -240,7 +240,7 @@ def partition_params(route)
                          parse_request_params(required)
                        end || {}
 
-      request_params = route.params.merge(request_params) if route.params.present? && !route.settings[:declared_params].present?
+      return route.params.merge(request_params) if route.params.present? && !route.settings[:declared_params].present?
 
       request_params
     end

lib/grape-swagger/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   module Errors
     class MarkdownDependencyMissingError < StandardError

lib/grape-swagger/grape/route.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # backwards compatibility for Grape < 0.16.0
 module Grape
   class Route

lib/grape-swagger/markdown/kramdown_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   class Markdown
     class KramdownAdapter

lib/grape-swagger/markdown/redcarpet_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   class Markdown
     class RedcarpetAdapter

lib/grape-swagger/model_parsers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   class ModelParsers
     include Enumerable

lib/grape-swagger/rake/oapi_tasks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rake'
 require 'rake/tasklib'
 require 'rack/test'

spec/issues/403_versions_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'describing versions' do

spec/issues/430_entity_definitions_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'definition names' do

spec/lib/data_type_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::DataType do

spec/lib/endpoint_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Grape::Endpoint do

spec/lib/extensions_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::Extensions do

spec/lib/model_parsers_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::ModelParsers do

spec/lib/move_params_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::MoveParams do

spec/lib/oapi_tasks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe GrapeSwagger::Rake::OapiTasks do

spec/lib/operation_id_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::OperationId do

spec/lib/optional_object_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::OptionalObject do

spec/lib/path_string_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::PathString do

spec/lib/produces_consumes_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::DocMethods::ProducesConsumes do

spec/markdown/kramdown_adapter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::Markdown::KramdownAdapter do

spec/markdown/redcarpet_adapter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GrapeSwagger::Markdown::RedcarpetAdapter, unless: RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx') do

spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 MODEL_PARSER = ENV.key?('MODEL_PARSER') ? ENV['MODEL_PARSER'].to_s.downcase.sub('grape-swagger-', '') : 'mock'

spec/support/empty_model_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class EmptyClass
 end
 

spec/support/grape_version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class GrapeVersion
   class << self
     def current_version

spec/support/mock_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GrapeSwagger
   class MockParser
     attr_reader :model

spec/support/model_parsers/entity_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context 'entity swagger example' do
   before :all do
     module Entities

spec/support/model_parsers/mock_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context 'mock swagger example' do
   before :all do
     module Entities

spec/support/model_parsers/representable_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'representable/json'
 
 RSpec.shared_context 'representable swagger example' do

spec/support/namespace_tags.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context 'namespace example' do
   before :all do
     module TheApi

spec/support/the_paths_definitions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context 'the api paths/defs' do
   let(:paths) do
     {

spec/swagger_v2/api_swagger_v2_body_definitions_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'body parameter definitions' do

spec/swagger_v2/api_swagger_v2_definitions-models_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'definitions/models' do

spec/swagger_v2/api_swagger_v2_detail_spec.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 def details

spec/swagger_v2/api_swagger_v2_extensions_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'extensions' do

spec/swagger_v2/api_swagger_v2_format-content_type_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'format, content_type' do

spec/swagger_v2/api_swagger_v2_global_configuration_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'global configuration stuff' do

spec/swagger_v2/api_swagger_v2_hash_and_array_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'document hash and array' do

spec/swagger_v2/api_swagger_v2_headers_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'headers' do

spec/swagger_v2/api_swagger_v2_hide_documentation_path_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'hide documentation path' do

spec/swagger_v2/api_swagger_v2_hide_param_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'hidden flag enables a single endpoint parameter to be excluded from the documentation' do

spec/swagger_v2/api_swagger_v2_ignore_defaults_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'swagger spec v2.0' do

spec/swagger_v2/api_swagger_v2_mounted_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'swagger spec v2.0' do

spec/swagger_v2/api_swagger_v2_param_type_body_nested_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'moving body/formData Params to definitions' do

spec/swagger_v2/api_swagger_v2_param_type_body_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'setting of param type, such as `query`, `path`, `formData`, `body`, `header`' do

spec/swagger_v2/api_swagger_v2_param_type_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'setting of param type, such as `query`, `path`, `formData`, `body`, `header`' do

spec/swagger_v2/api_swagger_v2_request_params_fix_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'additional parameter settings' do

spec/swagger_v2/api_swagger_v2_response_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'response' do

spec/swagger_v2/api_swagger_v2_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'swagger spec v2.0' do