swagger_model 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70a7b07c81b02668f2669f4330cfcfd3df16351d
-  data.tar.gz: 3f942dcf8fac1e9ee8b4dbb2bea7bb1ffa2aabaa
+  metadata.gz: cf57cf03d80813be9a9cae114628a6e95952bcec
+  data.tar.gz: 6e63d664c107c4b00f0ae4e089d1e1a497e11dc5
 SHA512:
-  metadata.gz: 88e47d4ef78d6d1d4cdeb755cfcd85365829538eddc72a01b5c3c576edec15141cbad9c51f2f82b3c39caf9de76c95dbf994880fab2fbb0517392dc95329edfe
-  data.tar.gz: 80aa617ffee27a101f488bd6f4da8db7efdf644c2c3870fdb7c78b4e980a2aa9169eadbe75eecb6e7af2a20b43fe8150321b2c0864074a45949ab676c7a6df9e
+  metadata.gz: c3dca478b40875ba2b859f8d34208895b3c07a347d261be7378c33c8e2cf0354f41f98f24a5ca1fef90eb97942763c54ce8ddcc3f47d70e7770dcece897f1181
+  data.tar.gz: 4249ff16b6ecb9793ae363ac39e9b2667bff5ed8f9345bb70e4623afa996ed9b3384fa36b09636efd62edb343de014999acd2252873e8025973cf126818310e7

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+example/output/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger_model (0.2.1)
+    swagger_model (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/swagger_model/version.rb

@@ -1,3 +1,3 @@
 module SwaggerModel
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/swagger_model.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'date'
 require 'active_support'
 require 'active_support/core_ext'
+require 'fileutils'
 
 module SwaggerModel
   def self.date_time_valid?(str)
@@ -22,6 +23,7 @@ module SwaggerModel
     when 'Hash'
       if value.has_key?('id') && value.has_key?('type')
         model_name = ActiveSupport::Inflector.classify(value['type'])
+        model[model_name] = {}
         object = parse_object(value, model, model_name)
         properties = object['properties']
         newProperties = {}
@@ -36,28 +38,28 @@ module SwaggerModel
         properties.delete('id')
         properties.delete('type')
         newProperties['allOf'][1]['properties'] = properties
-        model[model_name] = newProperties
+        model[model_name][model_name] = newProperties
         obj['$ref'] = '#/components/schemas/' + model_name
       elsif key == 'attributes'
         object = parse_object(value, model, root_key)
         properties = object['properties']
         model_name = root_key + 'Attributes'
-        model[model_name] = {}
-        model[model_name]['type'] = 'object'
-        model[model_name]['properties'] = properties
+        model[root_key][model_name] = {}
+        model[root_key][model_name]['type'] = 'object'
+        model[root_key][model_name]['properties'] = properties
         if object['required'].size > 0
-          model[model_name]['required'] = object['required']
+          model[root_key][model_name]['required'] = object['required']
         end
         obj['$ref'] = '#/components/schemas/' + model_name
       elsif key == 'relationships'
         object = parse_object(value, model, root_key)
         properties = object['properties']
         model_name = root_key + 'Relationships'
-        model[model_name] = {}
-        model[model_name]['type'] = 'object'
-        model[model_name]['properties'] = properties
+        model[root_key][model_name] = {}
+        model[root_key][model_name]['type'] = 'object'
+        model[root_key][model_name]['properties'] = properties
         if object['required'].size > 0
-          model[model_name]['required'] = object['required']
+          model[root_key][model_name]['required'] = object['required']
         end
         obj['$ref'] = '#/components/schemas/' + model_name
       else
@@ -135,7 +137,8 @@ module SwaggerModel
     response_model = {}
     response_model[response_name] = {}
     response_model[response_name]['type'] = "object"
-    object = parse_object(response, response_model, response_name)
+    model = {}
+    object = parse_object(response, model, response_name)
     properties = object['properties']
     if properties.has_key?('links')
       links = {}
@@ -154,10 +157,17 @@ module SwaggerModel
       response_model[response_name]['required'] = object['required']
     end
     output_path = params[:output_path] || './'
-    if params[:output_type] == 'json'
-      File.write(File.join(output_path, "#{response_name}_model.json"), response_model.to_json)
-    else
-      File.write(File.join(output_path, "#{response_name}_model.yaml"), response_model.to_yaml)
+    output_path_responses = File.join(output_path, 'Responses/')
+    output_path_models = File.join(output_path, 'Models/')
+
+    FileUtils::mkdir_p output_path_responses
+    FileUtils::mkdir_p output_path_models
+
+    File.write(File.join(output_path_responses, "#{response_name}.yaml"), response_model.to_yaml)
+
+    keys = model.keys
+    for key in keys do
+      File.write(File.join(output_path_models, "#{key}.yaml"), model[key].to_yaml)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swagger_model
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - marumemomo
@@ -82,7 +82,6 @@ files:
 - bin/console
 - bin/setup
 - example/Example.json
-- example/output/ExampleResponse_model.yaml
 - lib/swagger_model.rb
 - lib/swagger_model/version.rb
 - swagger_model.gemspec

data/example/output/ExampleResponse_model.yaml

@@ -1,30 +0,0 @@
----
-ExampleResponse:
-  type: object
-  properties:
-    user:
-      type: object
-      properties:
-        name:
-          type: string
-          example: marumemomo
-        age:
-          type: integer
-          example: 24
-      required:
-      - name
-      - age
-    message:
-      type: string
-      example: hello
-    created_at:
-      type: string
-      example: '2018-05-05T20:02:24.000+09:00'
-      format: date-time
-    updated_at:
-      type: ''
-      example: ''
-  required:
-  - user
-  - message
-  - created_at