Points to grape-swagger-entity fix. (#799)

- allows grape head to fails ... for the moment

Author: LeFnord

.rubocop.yml

@@ -11,6 +11,9 @@ AllCops:
 Layout/EmptyLinesAroundArguments:
   Enabled: false
 
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
 Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
@@ -24,6 +27,12 @@ Layout/SpaceAroundMethodCallOperator:
 
 # Lint stuff
 #
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
 Lint/RaiseException:
   Enabled: true
 
@@ -39,6 +48,9 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Max: 300
 
+Metrics/CyclomaticComplexity:
+  Max: 17
+
 Metrics/MethodLength:
   Exclude:
     - spec/**/*
@@ -64,3 +76,15 @@ Style/HashTransformValues:
 
 Style/RegexpLiteral:
   Enabled: false
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: false

.travis.yml

@@ -33,3 +33,5 @@ jobs:
     - rvm: 2.4.10
     - rvm: ruby-head
     - rvm: jruby-head
+
+    - env: GRAPE_VERSION=HEAD

Gemfile

@@ -14,6 +14,7 @@ gem 'grape', case version = ENV['GRAPE_VERSION'] || '>= 1.3.0'
              end
 
 gem ENV['MODEL_PARSER'] if ENV.key?('MODEL_PARSER')
+
 group :development, :test do
   gem 'bundler'
   gem 'grape-entity'
@@ -26,12 +27,16 @@ group :development, :test do
   gem 'rake'
   gem 'rdoc'
   gem 'rspec', '~> 3.9'
-  gem 'rubocop', '~> 0.82', require: false
+  gem 'rubocop', '~> 0.85', require: false
 end
 
 group :test do
   gem 'coveralls_reborn', require: false
-  gem 'grape-swagger-entity'
+
   gem 'ruby-grape-danger', '~> 0.1.1', require: false
   gem 'simplecov', require: false
+
+  unless ENV['MODEL_PARSER'] == 'grape-swagger-entity'
+    gem 'grape-swagger-entity', git: 'https://github.com/ruby-grape/grape-swagger-entity'
+  end
 end

lib/grape-swagger.rb

@@ -109,6 +109,7 @@ def route_path_start_with?(route, name)
 module SwaggerDocumentationAdder
   attr_accessor :combined_namespaces, :combined_namespace_identifiers
   attr_accessor :combined_routes, :combined_namespace_routes
+
   include SwaggerRouting
 
   def add_swagger_documentation(options = {})

lib/grape-swagger/doc_methods/operation_id.rb

@@ -16,8 +16,8 @@ def build(route, path = nil)
 
         def manipulate(path)
           operation = path.split('/').map(&:capitalize).join
-          operation.gsub!(/\-(\w)/, &:upcase).delete!('-') if operation[/\-(\w)/]
-          operation.gsub!(/\_(\w)/, &:upcase).delete!('_') if operation.include?('_')
+          operation.gsub!(/-(\w)/, &:upcase).delete!('-') if operation[/-(\w)/]
+          operation.gsub!(/_(\w)/, &:upcase).delete!('_') if operation.include?('_')
           operation.gsub!(/\.(\w)/, &:upcase).delete!('.') if operation[/\.(\w)/]
           if path.include?('{')
             operation.gsub!(/\{(\w)/, &:upcase)