Skip to content

Commit d5c5772

Browse files
committed
Fixes
1 parent c16b647 commit d5c5772

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

.travis.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
sudo: false
21
language: ruby
3-
rvm:
4-
- 2.3.0
2+
3+
cache: bundler
4+
5+
matrix:
6+
include:
7+
- rvm: 2.3.0
8+
- rvm: 2.2
9+
- rvm: 2.1
10+
- rvm: ruby-head
11+
- rvm: jruby-head
12+
- rvm: jruby-20mode
13+
- rvm: rbx-2
14+
allow_failures:
15+
- rvm: ruby-head
16+
- rvm: jruby-head
517
before_install: gem install bundler -v 1.12.1

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ source 'https://rubygems.org'
22

33
# Specify your gem's dependencies in grape-swagger-representable.gemspec
44
gemspec
5+
6+
gem 'grape-swagger', github: 'Bugagazavr/grape-swagger', branch: 'representers'

grape-swagger-representable.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
1818
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
1919
s.require_paths = ['lib']
2020

21-
s.add_runtime_dependency 'grape-swagger', '>= 0.20.3'
21+
s.add_runtime_dependency 'grape-swagger', '>= 0.20.2'
2222
s.add_runtime_dependency 'representable'
2323

2424
s.add_development_dependency 'bundler', '~> 1.12'

lib/grape-swagger/representable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ module Representable
1111
end
1212
end
1313

14-
GrapeSwagger.register_model_parser(::GrapeSwagger::Representable::Parser, ::Representable::Decorator)
14+
GrapeSwagger.model_parsers.register(::GrapeSwagger::Representable::Parser, ::Representable::Decorator)

spec/grape-swagger/representable_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
end
77

88
it 'parser should be registred' do
9-
expect(GrapeSwagger.model_parsers[GrapeSwagger::Representable::Parser]).to eq('Representable::Decorator')
9+
expect(GrapeSwagger.model_parsers.to_a).to include([GrapeSwagger::Representable::Parser, 'Representable::Decorator'])
1010
end
1111
end

spec/grape-swagger/representers/response_representer_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ def app
206206
end
207207

208208
it 'it prefer entity over others' do
209-
require 'pry'
210209
expect(subject['definitions']).to eql(
211210
'Kind' => { 'type' => 'object', 'properties' => { 'id' => { 'description' => 'Title of the kind.', 'type' => 'integer', 'format' => 'int32' } } },
212211
'Tag' => { 'type' => 'object', 'properties' => { 'name' => { 'description' => 'Name', 'type' => 'string' } } },

0 commit comments

Comments
 (0)