swaggable 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950abcc534dfbb5b2539b33e20ab050c91ef91c3
-  data.tar.gz: 58864e41f69769a787de1701863dab7cc82317b9
+  metadata.gz: a0ba12b2dc9c54ce2f6920b7d6fd6c45fe056ff5
+  data.tar.gz: 27874e95a2cfcdd88f67c3ef2bbd024660c979a3
 SHA512:
-  metadata.gz: 4b87287e8876c10e78757bef380a2ff2b8d8f4d225eb2abd439f18566ed895c95bbc22958d1af84ed4ca865f993d7db86368b1b3fc6572a100baed39f481181f
-  data.tar.gz: 8bc007dce6dbc50d8e6ccc47401f672dfe57d5de8502e02a80a64bbbf60db99646e64a66eef490c36973f1ecaa6b72d0034db70f921212edbbf3b29a0a687723
+  metadata.gz: bf44a0e08c55b0f6e948f73d711d7c758b77ae00a90dad0007451c1102265f0c44a928c868827be588504f380797f6c548826af5ab68c260bfcae7e4014712e2
+  data.tar.gz: faab31754af448942d0e7f9012c233a28e004c718a750c2adbd450082ecdd5c1f3b40fa1c3921e199ed6b6a20b5f52537a6c7953b0e6c689c50d08b820088cbd

data/lib/swaggable/endpoint_definition.rb

@@ -34,11 +34,11 @@ module Swaggable
     end
 
     def consumes
-      @consumes ||= []
+      @consumes ||= Set.new
     end
 
     def produces
-      @produces ||= []
+      @produces ||= Set.new
     end
 
     def configure &block

data/lib/swaggable/grape_adapter.rb

@@ -62,9 +62,11 @@ module Swaggable
     def import_endpoint grape_endpoint, api_endpoint, grape
       api_endpoint.verb = grape_endpoint.route_method.downcase
       api_endpoint.summary = grape_endpoint.route_description
-      api_endpoint.produces << "application/#{grape.format}" if grape.format
       api_endpoint.path = extract_path(grape_endpoint, grape)
 
+      api_endpoint.produces.merge grape.content_types.values
+      api_endpoint.consumes.merge grape.content_types.values
+
       api_endpoint.tags.add_new do |t|
         t.name = grape.name
       end

data/lib/swaggable/swagger_2_serializer.rb

@@ -52,8 +52,8 @@ module Swaggable
     def serialize_endpoint endpoint
       {
         tags: endpoint.tags.map(&:name),
-        consumes: endpoint.consumes,
-        produces: endpoint.produces,
+        consumes: endpoint.consumes.to_a,
+        produces: endpoint.produces.to_a,
         parameters: endpoint.parameters.map{|p| serialize_parameter p },
         responses: serialize_responses(endpoint.responses),
       }.

data/lib/swaggable/version.rb

@@ -1,3 +1,3 @@
 module Swaggable
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/swaggable/endpoint_definition_spec.rb

@@ -34,13 +34,13 @@ RSpec.describe 'Swaggable::EndpointDefinition' do
   it 'has consumes' do
     format = double('format')
     subject.consumes << format
-    expect(subject.consumes).to eq  [format]
+    expect(subject.consumes.to_a).to eq  [format]
   end
 
   it 'has produces' do
     format = double('format')
     subject.produces << format
-    expect(subject.produces).to eq  [format]
+    expect(subject.produces.to_a).to eq  [format]
   end
 
   it 'has parameters' do

data/spec/swaggable/grape_adapter_spec.rb

@@ -51,11 +51,20 @@ RSpec.describe 'Swaggable::GrapeAdapter' do
         expect(api.endpoints.first.summary).to eq 'My endpoint'
       end
 
-      it 'sets format' do
+      it 'sets produces' do
         grape.format :json
+        grape.content_type :xml, 'application/xml'
         grape.post { }
         do_import
-        expect(api.endpoints.first.produces).to eq ['application/json']
+        expect(api.endpoints.first.produces.to_a).to eq ['application/json', 'application/xml']
+      end
+
+      it 'sets consumes' do
+        grape.format :json
+        grape.content_type :xml, 'application/xml'
+        grape.post { }
+        do_import
+        expect(api.endpoints.first.consumes.to_a).to eq ['application/json', 'application/xml']
       end
 
       describe 'path' do

data/spec/swaggable/integration_spec.rb

@@ -116,8 +116,8 @@ RSpec.describe 'Integration' do
       expect(api.endpoints.first.parameters.first.name).to eq 'include_comments_count'
       expect(api.endpoints.first.responses.first).to be api.endpoints.first.responses[200]
       expect(api.endpoints.first.responses.first.description).to eq 'Success'
-      expect(api.endpoints.first.consumes).to eq [:json]
-      expect(api.endpoints.first.produces).to eq [:json]
+      expect(api.endpoints.first.consumes.to_a).to eq [:json]
+      expect(api.endpoints.first.produces.to_a).to eq [:json]
     end
 
     it 'renders proper swagger JSON' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swaggable
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Manuel Morales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarding_dsl