open_api_import 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8d4b1c2a378d443f3f313c29b44dbedcae5bfcf199849f28919a6905fbff5f
-  data.tar.gz: b1ceb93d102bd424b914b85c95cdfdfa59013b2648bf41d6bd747563269002cf
+  metadata.gz: f90808a3947a8a9a3959f0db36d9880f1754fcc02c4a2da84a3102f07311ae60
+  data.tar.gz: d58962782d54e780988c02ef5df6d8777c16f55b8545d432266f7a689ba1de01
 SHA512:
-  metadata.gz: a3d262b0a3908a2a925e62dd72c309e494de9e8c4b0d1b7e42167e99a176d2ca5b69a9723df79080548b4c424ede7b1071ace391de563f66388f953ed22c229c
-  data.tar.gz: 96810873bc0c93c64569b100f3e73328ea34e88a3330aba7ce51692ec358b98e7e623dec18399e1f8be445421da67337cd8d13509ccae8e03dce5652d0f120fe
+  metadata.gz: a4058dbc2bc5d3c0515c9a986e1827730768bf8f300c85204332b9763593aa35b008c4ac1db1f1fb239bb0e22db61e94430d0b697fa5a6c1307cd181a40241df
+  data.tar.gz: 89f0896c5411ef3a27b3826971e62326511963ca06d1f8a766a5af4f4090da5e1482004e4a3a70ea56949b00b6f3d47a99e24af45c16106231cef9036efa9ddc

data/lib/open_api_import.rb

@@ -307,7 +307,7 @@ class OpenApiImport
                           else
                             if dpv.type == "object"
                               if dpv.key?(:properties)
-                                valv = get_examples(dpv[:properties]).join("\n")
+                                valv = get_examples(dpv[:properties], :key_value, true).join("\n")
                               else
                                 valv = "{}"
                               end
@@ -558,68 +558,70 @@ class OpenApiImport
 
   class << self
     # Retrieve the examples from the properties hash
-    private def get_examples(properties, type=:key_value)
+    private def get_examples(properties, type=:key_value, remove_read_only=false)
       #todo: consider using this method also to get data examples
       example = []
       example << "{" unless properties.empty? or type==:only_value
       properties.each do |prop, val|
-        if val.key?(:properties) and !val.key?(:example) and !val.key?(:type)
-          val[:type]='object'
-        end
-        if val.key?(:example)
-          example << if val[:example].is_a?(String) or val[:example].is_a?(Time)
-            " #{prop.to_sym}: \"#{val[:example]}\", "
-          else
-            " #{prop.to_sym}: #{val[:example]}, "
+        unless remove_read_only and val.key?(:readOnly) and val[:readOnly]==true
+          if val.key?(:properties) and !val.key?(:example) and !val.key?(:type)
+            val[:type]='object'
           end
-        elsif val.key?(:type)
-          format = val[:format]
-          format = val[:type] if format.to_s == ""
-          case val[:type].downcase
-          when "string"
-            example << " #{prop.to_sym}: \"#{format}\", "
-          when "integer", "number"
-            example << " #{prop.to_sym}: 0, "
-          when "boolean"
-            example << " #{prop.to_sym}: true, "
-          when "array"
-            if val.key?(:items) and val[:items].size==1 and val[:items].is_a?(Hash) and val[:items].key?(:type)
-              val[:items][:enum]=[val[:items][:type]]
+          if val.key?(:example)
+            example << if val[:example].is_a?(String) or val[:example].is_a?(Time)
+              " #{prop.to_sym}: \"#{val[:example]}\", "
+            else
+              " #{prop.to_sym}: #{val[:example]}, "
             end
+          elsif val.key?(:type)
+            format = val[:format]
+            format = val[:type] if format.to_s == ""
+            case val[:type].downcase
+            when "string"
+              example << " #{prop.to_sym}: \"#{format}\", "
+            when "integer", "number"
+              example << " #{prop.to_sym}: 0, "
+            when "boolean"
+              example << " #{prop.to_sym}: true, "
+            when "array"
+              if val.key?(:items) and val[:items].size==1 and val[:items].is_a?(Hash) and val[:items].key?(:type)
+                val[:items][:enum]=[val[:items][:type]]
+              end
 
-            if val.key?(:items) and val[:items].key?(:enum)
-              if type==:only_value
-                if val[:items][:enum][0].is_a?(String)
-                  example << " [\"" + val[:items][:enum].sample + "\"] "
+              if val.key?(:items) and val[:items].key?(:enum)
+                if type==:only_value
+                  if val[:items][:enum][0].is_a?(String)
+                    example << " [\"" + val[:items][:enum].sample + "\"] "
+                  else
+                    example << " [" + val[:items][:enum].sample + "] "
+                  end
                 else
-                  example << " [" + val[:items][:enum].sample + "] "
+                  if val[:items][:enum][0].is_a?(String)
+                    example << " #{prop.to_sym}: [\"" + val[:items][:enum].sample + "\"], "
+                  else
+                    example << " #{prop.to_sym}: [" + val[:items][:enum].sample + "], "
+                  end
                 end
               else
-                if val[:items][:enum][0].is_a?(String)
-                  example << " #{prop.to_sym}: [\"" + val[:items][:enum].sample + "\"], "
+                #todo: differ between response examples and data examples
+                if type == :only_value
+                  example << get_response_examples({schema: val}).join("\n")
                 else
-                  example << " #{prop.to_sym}: [" + val[:items][:enum].sample + "], "
+                  example << " #{prop.to_sym}: " + get_response_examples({schema: val}).join("\n") + ", "
                 end
               end
-            else
+            when "object"
               #todo: differ between response examples and data examples
-              if type == :only_value
-                example << get_response_examples({schema: val}).join("\n")
+              res_ex = get_response_examples({schema: val})
+              if res_ex.size == 0
+                res_ex = "{ }"
               else
-                example << " #{prop.to_sym}: " + get_response_examples({schema: val}).join("\n") + ", "
+                res_ex = res_ex.join("\n")
               end
-            end
-          when "object"
-            #todo: differ between response examples and data examples
-            res_ex = get_response_examples({schema: val})
-            if res_ex.size == 0
-              res_ex = "{ }"
+              example << " #{prop.to_sym}: " + res_ex + ", "
             else
-              res_ex = res_ex.join("\n")
+              example << " #{prop.to_sym}: \"#{format}\", "
             end
-            example << " #{prop.to_sym}: " + res_ex + ", "
-          else
-            example << " #{prop.to_sym}: \"#{format}\", "
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_import
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oas_parser