grape-swagger-entity 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 719e50145ee34ef39de1daf50a3d495ff0221d07ee7688fea3df86c503e5de16
-  data.tar.gz: 3c470cba6e089f1e7ffa1b5139de981ee84f5d7d3e005a464d57c8b7f54a0e02
+SHA1:
+  metadata.gz: 05c52de504600d57fb8bb41dff26265beb90d32e
+  data.tar.gz: 6b829aae12775c2f27521cf08be88f56298158d5
 SHA512:
-  metadata.gz: fc20da740449366c3df92f5850ac36865cb4d0f0404a6cb2069e82cc94ceb71f2d32b5c3ba12d4a440676e8d053402a8e60de2ac8a62504e624c574ef126dac2
-  data.tar.gz: 7b281a8feeadbed1ff4651c92168783eaa6e7d3c5ae3e56970696c0096b7011f8a2e79d67b0cead55bab677f89788afde7ae1320ec5d5cc8ab5086416fefdd07
+  metadata.gz: 9dc4d2973ef5f678eddce41c1c5a393f26267cf177b6f2973fd804d278adaa0c5c065cd4ac7b5a8006d561a896350064f96f10043f144071d51e1b402279dcc9
+  data.tar.gz: a5b0c18af91a1c16c6f8c2d834950dcc82885e375c29b3b6c3547d7481718c31b59fb157aa233e0a49ad6eb9e292001c6a241e2a1e933e092ea872120dd1f16d

data/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 * Your contribution here.
 
+### 0.3.0 (August 22, 2018)
+
+#### Features
+
+* [#35](https://github.com/ruby-grape/grape-swagger-entity/pull/35): Support for required attributes - [@Bugagazavr](https://github.com/Bugagazavr).
+
 ### 0.2.5 (April 26, 2018)
 
 #### Features

data/Gemfile

@@ -16,6 +16,8 @@ group :development, :test do
   gem 'rubocop', '~> 0.48'
 end
 
+gem 'grape-swagger', git: 'https://github.com/ruby-grape/grape-swagger.git'
+
 group :test do
   gem 'grape-entity', ENV.fetch('GRAPE_ENTITY', '0.6.1')
   gem 'ruby-grape-danger', '~> 0.1.1', require: false

data/grape-swagger-entity.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.2.6'
   s.add_runtime_dependency 'grape-entity', '>= 0.5.0'
-  s.add_runtime_dependency 'grape-swagger', '>= 0.20.4'
+  s.add_runtime_dependency 'grape-swagger', '>= 0.31.0'
 end

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

@@ -22,7 +22,8 @@ module GrapeSwagger
           if value.for_merge && (value.respond_to?(:entity_class) || value.respond_to?(:using_class_name))
             entity_class = value.respond_to?(:entity_class) ? value.entity_class : value.using_class_name
 
-            memo.merge!(extract_params(entity_class))
+            extracted_params = extract_params(entity_class)
+            memo.merge!(extracted_params)
           else
             memo[value.attribute] = value.send(:options)
           end
@@ -32,7 +33,7 @@ module GrapeSwagger
       def parse_grape_entity_params(params, parent_model = nil)
         return unless params
 
-        params.each_with_object({}) do |(entity_name, entity_options), memo|
+        parsed = params.each_with_object({}) do |(entity_name, entity_options), memo|
           next if entity_options.fetch(:documentation, {}).fetch(:in, nil).to_s == 'header'
 
           final_entity_name = entity_options.fetch(:as, entity_name)
@@ -48,6 +49,8 @@ module GrapeSwagger
           memo[final_entity_name][:readOnly] = documentation[:read_only].to_s == 'true' if documentation[:read_only]
           memo[final_entity_name][:description] = documentation[:desc] if documentation[:desc]
         end
+
+        [parsed, required_params(params)]
       end
 
       def parse_nested(entity_name, entity_options, parent_model = nil)
@@ -61,9 +64,7 @@ module GrapeSwagger
           memo[value.attribute] = value.send(:options)
         end
 
-        required = required_params(params)
-
-        properties = parse_grape_entity_params(params, nested_entity)
+        properties, required = parse_grape_entity_params(params, nested_entity)
         is_a_collection = entity_options[:documentation].is_a?(Hash) &&
                           entity_options[:documentation][:type].to_s.casecmp('array').zero?
 

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

@@ -1,5 +1,5 @@
 module GrapeSwagger
   module Entity
-    VERSION = '0.2.5'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-entity
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Kirill Zaitsev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-entity
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.4
+        version: 0.31.0
 description: 
 email:
 - kirik910@gmail.com
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Grape swagger adapter to support grape-entity object parsing