open_api_import 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8f63ba6acbf1d3734f2e0e3b6df8edec9030a5ede1e14414dad974a1c3fab3
-  data.tar.gz: e4ef52b2d0f5cd2830951b8b1ffdf9843b2140c8b8da518bfbcdb5f345f7bb62
+  metadata.gz: 1785c2aeaa1f0211104cf19f3a827f95f001787ec6d96133ad74fec3651b617d
+  data.tar.gz: c28a8aa99ec9b3f98c0aebe9335ca4366418ec80f25bdedd4563cfb4d0be31dd
 SHA512:
-  metadata.gz: 5a35275273edc44be3dad32e73b90e0cf09d37612b91ac81a05e1c5be99f2d62ee1ff94f14861c9ab095ed44a2b6af48bf687a48f0ef126cf583bed17aab22d6
-  data.tar.gz: 9546b16e8f880e8b2678e591b917b593e2c69f2281dc540621e64c9b7222ec22b61a5d9345338390b7f1f39056d5263e181c4c8d62c6a9ee9d0ba5d70052ff24
+  metadata.gz: 86bc8c53a3932521a9245b386baafdf384171ac546a6306ac3b745014a6b633de8eb485f2498c88748edb7280316771fa42f853443406fac90adfe82bee5208c
+  data.tar.gz: 0bb4013a8dc30bbec7132dcbda4dbb64a33c218573caa29090d0107bbe26f0000f3aa0171a4bbfb27e56eb596cccf17f0746f69dddb5337af62a7b2466730b0e

data/lib/open_api_import.rb

@@ -113,6 +113,7 @@ class OpenApiImport
             params = []
             params_path = []
             params_query = []
+            params_required = []
             description_parameters = []
             data_required = []
             data_read_only = []
@@ -211,19 +212,23 @@ class OpenApiImport
               cont[:parameters].each do |p|
                 if p[:in] == "path"
                   if create_method_name == :operationId
-                    params_path << p[:name]
-                    path_txt.gsub!("{#{p[:name]}}", "\#{#{p[:name]}}")
+                    param_name = p[:name]
+                    path_txt.gsub!("{#{param_name}}", "\#{#{param_name}}")
                   else
-                    params_path << p[:name].to_s.snake_case
-                    path_txt.gsub!("{#{p[:name]}}", "\#{#{p[:name].to_s.snake_case}}")
+                    param_name = p[:name].to_s.snake_case
+                    path_txt.gsub!("{#{p[:name]}}", "\#{#{param_name}}")
                   end
+                  params_path << param_name
+                  #params_required << param_name if p[:required].to_s=="true"
+
                   if p.keys.include?(:description)
-                    description_parameters << "#    #{p[:name]}: (#{p[:type]}) #{p[:description]}"
+                    description_parameters << "#    #{p[:name]}: (#{p[:type]}) #{"(required)" if p[:required].to_s=="true"} #{p[:description]}"
                   end
                 elsif p[:in] == "query"
                   params_query << p[:name]
+                  params_required << p[:name] if p[:required].to_s=="true"
                   if p.keys.include?(:description)
-                    description_parameters << "#    #{p[:name]}: (#{p[:type]}) #{p[:description]}"
+                    description_parameters << "#    #{p[:name]}: (#{p[:type]}) #{"(required)" if p[:required].to_s=="true"} #{p[:description]}"
                   end
                 elsif p[:in] == "body"
                   if p.keys.include?(:schema)
@@ -294,13 +299,27 @@ class OpenApiImport
 
               unless params_query.empty?
                 path_txt += "?"
+                params_required.each do |pr|
+                  if params_query.include?(pr)
+                    if create_method_name == :operationId
+                      path_txt += "#{pr}=\#{#{pr}}&"
+                      params << "#{pr}"
+                    else
+                      path_txt += "#{pr}=\#{#{pr.to_s.snake_case}}&"
+                      params << "#{pr.to_s.snake_case}"
+                    end
+                      
+                  end
+                end
                 params_query.each do |pq|
-                  if create_method_name == :operationId
-                    path_txt += "#{pq}=\#{#{pq}}&"
-                    params << "#{pq}: ''"
-                  else
-                    path_txt += "#{pq}=\#{#{pq.to_s.snake_case}}&"
-                    params << "#{pq.to_s.snake_case}: ''"
+                  unless params_required.include?(pq)
+                    if create_method_name == :operationId
+                      path_txt += "#{pq}=\#{#{pq}}&"
+                      params << "#{pq}: ''"
+                    else
+                      path_txt += "#{pq}=\#{#{pq.to_s.snake_case}}&"
+                      params << "#{pq.to_s.snake_case}: ''"
+                    end
                   end
                 end
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser