grape-swagger-entity 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e7aa5ac754173602ac184f45b9bdf26f75c0af9
-  data.tar.gz: fbda957670775299a43bd8a99f582c909780ec05
+  metadata.gz: 09004935e0da7b2d424d04a85feb7d0b7e4f5665
+  data.tar.gz: 13531135fa1fd80e04a9f0677bbf95cd9034e4aa
 SHA512:
-  metadata.gz: 9da5ddc8dec9962670fa707c7a19ef50e603ba3b71a941143df4db24274625e3245b8afeaea587125cdb7c1e386262f3e4454d9359fd16f5a70f5ffe1040b2f6
-  data.tar.gz: 4fe7e4ddfed0651b2d6eff80734adfd1f6dfaa722b2d86fd00d5eeb0673f274eccbae5b059df76fd5252b6baea8f65fb85295af9010caac34ac042523a9aff4b
+  metadata.gz: e605ba8293b54f14ca786afe7c2c5f5e478042889c37aee3e2dd98e61f8149e4e5f3b1545a6d7d373542f679f4e8fbdbae48511de6b1a8465508b9c1c9ecfbec
+  data.tar.gz: 49da1141e3a3b413b893db0c0f4d1755e3a6dd516d05ffea0f367388f5cfba7130d103c8cfe349273c98f577a6302ef80e9b46b56cd76486c471184374a5ec94

data/.rubocop_todo.yml

@@ -1,33 +1,33 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-05-11 07:39:21 +0300 using RuboCop version 0.39.0.
+# on 2016-06-08 01:18:12 +0300 using RuboCop version 0.40.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 1
 Metrics/AbcSize:
-  Max: 69
+  Max: 48
 
 # Offense count: 1
 Metrics/CyclomaticComplexity:
   Max: 16
 
-# Offense count: 51
+# Offense count: 50
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 136
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 27
+  Max: 42
 
 # Offense count: 1
 Metrics/PerceivedComplexity:
-  Max: 19
+  Max: 18
 
 # Offense count: 2
 Style/Documentation:

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### Next
+
+#### Features
+
+* Your contribution here.
+
+#### Fixes
+
+* Your contribution here.
+
+### 0.1.4 (June 7, 2016)
+
+#### Fixes
+
+* [#7](https://github.com/ruby-grape/grape-swagger-entity/pull/7) Fixed array support for primitive types - [@Bugagazavr](https://github.com/Bugagazavr).

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

@@ -25,49 +25,89 @@ module GrapeSwagger
       private
 
       def parse_grape_entity_params(params)
-        return if params.nil?
+        return unless params
 
-        params.each_with_object({}) do |x, memo|
-          next if x[1].fetch(:documentation, {}).fetch(:in, nil).to_s == 'header'
-          x[0] = x.last[:as] if x.last[:as]
+        params.each_with_object({}) do |(entity_name, entity_options), memo|
+          next if entity_options.fetch(:documentation, {}).fetch(:in, nil).to_s == 'header'
 
-          model = x.last[:using] if x.last[:using].present?
-          model ||= x.last[:documentation][:type] if x.last[:documentation] && could_it_be_a_model?(x.last[:documentation])
+          entity_name = entity_options[:as] if entity_options[:as]
+          model = entity_options[:using] if entity_options[:using].present?
+
+          if entity_options[:documentation] && could_it_be_a_model?(entity_options[:documentation])
+            model ||= entity_options[:documentation][:type]
+          end
 
           if model
             name = endpoint.send(:expose_params_from_model, model)
-            memo[x.first] = if x.last[:documentation] && x.last[:documentation][:is_array]
-                              { 'type' => 'array', 'items' => { '$ref' => "#/definitions/#{name}" } }
-                            else
-                              { '$ref' => "#/definitions/#{name}" }
-                            end
+            memo[entity_name] = entity_model_type(name, entity_options)
           else
-            documented_type = x.last[:type]
-            documented_type ||= x.last[:documentation][:type] if x.last[:documentation]
+            documented_type = entity_options[:type]
+
+            if entity_options[:documentation]
+              documented_type ||= entity_options[:documentation][:type]
+            end
+
             data_type = GrapeSwagger::DocMethods::DataType.call(documented_type)
 
             if GrapeSwagger::DocMethods::DataType.primitive?(data_type)
               data = GrapeSwagger::DocMethods::DataType.mapping(data_type)
-              memo[x.first] = { type: data.first, format: data.last }
+
+              memo[entity_name] = {
+                type: data.first,
+                format: data.last
+              }
             else
-              memo[x.first] = { type: data_type }
+              memo[entity_name] = {
+                type: data_type
+              }
+            end
+
+            if entity_options[:values] && entity_options[:values].is_a?(Array)
+              memo[entity_name][:enum] = entity_options[:values]
+            end
+
+            if entity_options[:documentation] && entity_options[:documentation][:is_array]
+              memo[entity_name] = {
+                type: :array,
+                items: memo.delete(entity_name)
+              }
             end
+          end
 
-            memo[x.first][:enum] = x.last[:values] if x.last[:values] && x.last[:values].is_a?(Array)
+          if entity_options[:documentation] && entity_options[:documentation][:desc]
+            memo[entity_name][:description] = entity_options[:documentation][:desc]
           end
-          memo[x.first][:description] = x.last[:documentation][:desc] if x.last[:documentation] && x.last[:documentation][:desc]
         end
       end
 
       def could_it_be_a_model?(value)
-        (
-          value[:type].to_s.include?('Entity') || value[:type].to_s.include?('Entities')
-        ) || (
-          value[:type] &&
-          value[:type].is_a?(Class) &&
-          !GrapeSwagger::DocMethods::DataType.primitive?(value[:type].name.downcase) &&
-          !value[:type] == Array
-        )
+        direct_model_type?(value[:type]) || ambiguous_model_type?(value[:type])
+      end
+
+      def direct_model_type?(type)
+        type.to_s.include?('Entity') || type.to_s.include?('Entities')
+      end
+
+      def ambiguous_model_type?(type)
+        type &&
+          type.is_a?(Class) &&
+          !GrapeSwagger::DocMethods::DataType.primitive?(type.name.downcase) &&
+          !type == Array
+      end
+
+      def entity_model_type(name, entity_options)
+        if entity_options[:documentation] && entity_options[:documentation][:is_array]
+          {
+            'type' => 'array',
+            'items' => {
+              '$ref' => "#/definitions/#{name}"
+            }
+          }
+        else
+          {
+            '$ref' => "#/definitions/#{name}"
+          }
+        end
       end
     end
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-entity
 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: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-swagger
@@ -190,6 +190,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md