grape-swagger 0.10.2 → 0.10.4

data/spec/mutually_exclusive_spec.rb

@@ -30,7 +30,7 @@ describe 'Mutually exclusive group params' do
     body = JSON.parse last_response.body
     parameters = body['apis'].first['operations'].first['parameters']
     expect(parameters).to eq [
-      { 'paramType' => 'form', 'name' => 'required_group[param_group_1][param_1]', 'description' => nil, 'type' => 'string', 'required' => false, 'allowMultiple' => false },
-      { 'paramType' => 'form', 'name' => 'required_group[param_group_2][][param_2]', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false }]
+      { 'paramType' => 'form', 'name' => 'required_group[param_group_1][param_1]', 'description' => '', 'type' => 'string', 'required' => false, 'allowMultiple' => false },
+      { 'paramType' => 'form', 'name' => 'required_group[param_group_2][][param_2]', 'description' => '', 'type' => 'string', 'required' => true, 'allowMultiple' => false }]
   end
 end

data/spec/non_default_api_spec.rb

@@ -551,7 +551,6 @@ describe 'options: ' do
         end
       end
     end
-
   end
 
   context 'multiple documentations' do

data/spec/param_type_spec.rb

@@ -5,8 +5,9 @@ describe 'Params Types' do
     Class.new(Grape::API) do
       format :json
 
+      desc 'description', nickname: 'desc', params: { input1: { type: Integer, param_type: 'query' } }
       params do
-        requires :input, type: String, documentation: { param_type: 'query' }
+        requires :input2, type: String, documentation: { param_type: 'query' }
       end
       post :action do
       end
@@ -19,12 +20,13 @@ describe 'Params Types' do
     get '/swagger_doc/action'
     expect(last_response.status).to eq 200
     body = JSON.parse last_response.body
-    body['apis'].first['operations'].first['parameters']
+    body['apis'].first['operations'].flat_map { |o| o['parameters'] }
   end
 
   it 'reads param type correctly' do
-    expect(subject).to eq [
-      { 'paramType' => 'query', 'name' => 'input', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false }
+    expect(subject).to match_array [
+      { 'paramType' => 'query', 'name' => 'input1', 'description' => '', 'type' => 'integer', 'required' => false, 'allowMultiple' => false, 'format' => 'int32' },
+      { 'paramType' => 'query', 'name' => 'input2', 'description' => '', 'type' => 'string', 'required' => true, 'allowMultiple' => false }
     ]
   end
 

data/spec/param_values_spec.rb

@@ -46,7 +46,7 @@ describe 'Convert values to enum or Range' do
 
     it 'has values as array in enum' do
       expect(plain_array).to eq [
-        { 'paramType' => 'form', 'name' => 'letter', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false, 'enum' => %w(a b c) }
+        { 'paramType' => 'form', 'name' => 'letter', 'description' => '', 'type' => 'string', 'required' => true, 'allowMultiple' => false, 'enum' => %w(a b c) }
       ]
     end
   end
@@ -56,7 +56,7 @@ describe 'Convert values to enum or Range' do
 
     it 'has proc returned values as array in enum' do
       expect(array_in_proc).to eq [
-        { 'paramType' => 'form', 'name' => 'letter', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false, 'enum' => %w(d e f) }
+        { 'paramType' => 'form', 'name' => 'letter', 'description' => '', 'type' => 'string', 'required' => true, 'allowMultiple' => false, 'enum' => %w(d e f) }
       ]
     end
   end
@@ -66,7 +66,7 @@ describe 'Convert values to enum or Range' do
 
     it 'has letter range values' do
       expect(range_letter).to eq [
-        { 'paramType' => 'form', 'name' => 'letter', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false }
+        { 'paramType' => 'form', 'name' => 'letter', 'description' => '', 'type' => 'string', 'required' => true, 'allowMultiple' => false }
       ]
     end
 
@@ -74,7 +74,7 @@ describe 'Convert values to enum or Range' do
 
     it 'has integer range values' do
       expect(range_integer).to eq [
-        { 'paramType' => 'form', 'name' => 'integer', 'description' => nil, 'type' => 'integer', 'required' => true, 'allowMultiple' => false, 'format' => 'int32', 'minimum' => -5, 'maximum' => 5 }
+        { 'paramType' => 'form', 'name' => 'integer', 'description' => '', 'type' => 'integer', 'required' => true, 'allowMultiple' => false, 'format' => 'int32', 'minimum' => -5, 'maximum' => 5 }
       ]
     end
   end
@@ -113,7 +113,7 @@ describe 'Convert values to enum for float range and not arrays inside a proc',
 
     it 'has proc returned value as string in enum' do
       expect(non_array_in_proc).to eq [
-        { 'paramType' => 'form', 'name' => 'letter', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false, 'enum' => 'string' }
+        { 'paramType' => 'form', 'name' => 'letter', 'description' => '', 'type' => 'string', 'required' => true, 'allowMultiple' => false, 'enum' => 'string' }
       ]
     end
   end
@@ -123,7 +123,7 @@ describe 'Convert values to enum for float range and not arrays inside a proc',
 
     it 'has float range values as string' do
       expect(range_float).to eq [
-        { 'paramType' => 'form', 'name' => 'float', 'description' => nil, 'type' => 'number', 'format' => 'float', 'required' => true, 'allowMultiple' => false }
+        { 'paramType' => 'form', 'name' => 'float', 'description' => '', 'type' => 'number', 'format' => 'float', 'required' => true, 'allowMultiple' => false }
       ]
     end
   end

data/spec/spec_helper.rb

@@ -15,10 +15,13 @@ Bundler.setup :default, :test
 
 require 'rack/test'
 
+require 'i18n_helper'
+
 RSpec.configure do |config|
   require 'rspec/expectations'
   config.include RSpec::Matchers
   config.mock_with :rspec
   config.include Rack::Test::Methods
   config.raise_errors_for_deprecations!
+  config.include I18nHelper
 end

data/spec/support/i18n_helper.rb

@@ -0,0 +1,8 @@
+module I18nHelper
+  def with_translations(locale, translations)
+    I18n.backend.store_translations locale, translations
+    yield
+  ensure
+    I18n.reload!
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.4
 platform: ruby
 authors:
 - Tim Vandecasteele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -28,16 +28,16 @@ dependencies:
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ files:
 - spec/group_params_spec.rb
 - spec/hash_params_spec.rb
 - spec/hide_api_spec.rb
+- spec/i18n_spec.rb
 - spec/markdown/kramdown_adapter_spec.rb
 - spec/markdown/markdown_spec.rb
 - spec/markdown/redcarpet_adapter_spec.rb
@@ -259,6 +260,7 @@ files:
 - spec/simple_mounted_api_spec.rb
 - spec/spec_helper.rb
 - spec/support/grape_version.rb
+- spec/support/i18n_helper.rb
 - spec/version_spec.rb
 homepage: https://github.com/ruby-grape/grape-swagger
 licenses:
@@ -306,6 +308,7 @@ test_files:
 - spec/group_params_spec.rb
 - spec/hash_params_spec.rb
 - spec/hide_api_spec.rb
+- spec/i18n_spec.rb
 - spec/markdown/kramdown_adapter_spec.rb
 - spec/markdown/markdown_spec.rb
 - spec/markdown/redcarpet_adapter_spec.rb
@@ -320,4 +323,5 @@ test_files:
 - spec/simple_mounted_api_spec.rb
 - spec/spec_helper.rb
 - spec/support/grape_version.rb
+- spec/support/i18n_helper.rb
 - spec/version_spec.rb