grape-swagger-representable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab7b354592c96fe931677e1449e6002bf5ac146
-  data.tar.gz: 2333f1e79b6d50e27f919f92e7f4eded97f67b54
+  metadata.gz: d7283878859bdf4efc4eaf2a05f148a00d96359f
+  data.tar.gz: ce3cc382572534160da8b25c31576f2a71ed25e9
 SHA512:
-  metadata.gz: a02cd96aed6e8a4e5e51e5a76c1453e6286bf49a112d758c4e4bc5f0088a788875db5093f14bc18c12536622b05911c4903d8b7215ff3ef24eedbfcf9239e547
-  data.tar.gz: 399e267e2b45384577476cdc10fdc2ba9d18a06dc34fd173502776f486d56e1951649e9cdaf1a45a6eb0b59a182934b98a06cb3fe1712961aab46750d11d05ed
+  metadata.gz: a2c0676215a1460294fd72349fc0f169c37723b402998a44f61c7cc7fe1312fe2ff850e0138cd5547627ecccd0b342d2ee15455ad057b6f17cf23bb41df9d7b1
+  data.tar.gz: c07328b18c497f3ecef7d4aeef82e08444cb4568d63c99e31453f395f303560a69bd640424889a29899890c48662af0abbb2e9c7cc3fc46108ca73d3b9cfac02

data/.travis.yml

@@ -1,17 +1,21 @@
-language: ruby
+before_install:
+  - gem update --system
+  - gem install bundler
 
-cache: bundler
+rvm:
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
 
 matrix:
+  fast_finish: true
+
   include:
-    - rvm: 2.3.0
-    - rvm: 2.2
-    - rvm: 2.1
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-19mode
     - rvm: rbx-2
+
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-before_install: gem install bundler -v 1.12.1
+    - rvm: rbx-2

data/README.md

@@ -1,4 +1,4 @@
-# GrapeSwagger::Representable [![Build Status](https://travis-ci.org/Bugagazavr/grape-swagger-representable.svg)](https://travis-ci.org/Bugagazavr/grape-swagger-representable)
+# GrapeSwagger::Representable [![Build Status](https://travis-ci.org/ruby-grape/grape-swagger-representable.svg)](https://travis-ci.org/ruby-grape/grape-swagger-representable)
 
 A simple grape-swagger adapter to allow parse representers as response model
 

data/grape-swagger-representable.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'grape-swagger', '>= 0.20.2'
+  s.add_runtime_dependency 'grape-swagger', '>= 0.20.4'
   s.add_runtime_dependency 'representable'
 
   s.add_development_dependency 'bundler', '~> 1.12'

data/lib/grape-swagger/representable/parser.rb

@@ -20,17 +20,17 @@ module GrapeSwagger
         documentation = property[:documentation] ? property[:documentation].dup : {}
 
         if property[:decorator] && property[:nested]
-          representer_mapping(property[:decorator], documentation, is_a_collection, false, property[:nested])
+          representer_mapping(property[:decorator], documentation, property, is_a_collection, false, property[:nested])
         elsif property[:decorator]
-          representer_mapping(property[:decorator], documentation, is_a_collection, true)
+          representer_mapping(property[:decorator], documentation, property, is_a_collection, true)
         elsif property[:nested]
-          representer_mapping(property[:nested], documentation, is_a_collection)
+          representer_mapping(property[:nested], documentation, property, is_a_collection)
         else
           memo = {
-            description: documentation[:desc] || ''
+            description: documentation[:desc] || property[:desc] || ''
           }
 
-          data_type = GrapeSwagger::DocMethods::DataType.call(documentation[:type])
+          data_type = GrapeSwagger::DocMethods::DataType.call(documentation[:type] || property[:type])
           if GrapeSwagger::DocMethods::DataType.primitive?(data_type)
             data = GrapeSwagger::DocMethods::DataType.mapping(data_type)
             memo[:type] = data.first
@@ -39,7 +39,8 @@ module GrapeSwagger
             memo[:type] = data_type
           end
 
-          memo[:enum] = documentation[:values] if documentation[:values].is_a?(Array)
+          values = documentation[:values] || property[:values] || nil
+          memo[:enum] = values if values.is_a?(Array)
 
           if is_a_collection || documentation[:is_array]
             memo = {
@@ -52,7 +53,7 @@ module GrapeSwagger
         end
       end
 
-      def representer_mapping(representer, documentation, is_a_collection = false, is_a_decorator = false, nested = nil)
+      def representer_mapping(representer, documentation, property, is_a_collection = false, is_a_decorator = false, nested = nil)
         if nested.nil? && is_a_decorator
           name = endpoint.send(:expose_params_from_model, representer)
 
@@ -62,12 +63,12 @@ module GrapeSwagger
               items: {
                 '$ref' => "#/definitions/#{name}"
               },
-              description: documentation[:desc] || ''
+              description: documentation[:desc] || property[:desc] || ''
             }
           else
             {
               '$ref' => "#/definitions/#{name}",
-              description: documentation[:desc] || ''
+              description: documentation[:desc] || property[:desc] || ''
             }
           end
         else
@@ -81,13 +82,13 @@ module GrapeSwagger
                 type: :object,
                 properties: attributes
               },
-              description: documentation[:desc] || ''
+              description: documentation[:desc] || property[:desc] || ''
             }
           else
             {
               type: :object,
               properties: attributes,
-              description: documentation[:desc] || ''
+              description: documentation[:desc] || property[:desc] || ''
             }
           end
         end

data/lib/grape-swagger/representable/version.rb

@@ -1,5 +1,5 @@
 module GrapeSwagger
   module Representable
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.1.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-representable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kirill Zaitsev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-swagger
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.20.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.20.4
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement