swagger_model 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db8605584c6f6c42787bf6629316212236ac785
-  data.tar.gz: b19bce8c3a190a2058f40723e0a228bf92ee7bad
+  metadata.gz: 70a7b07c81b02668f2669f4330cfcfd3df16351d
+  data.tar.gz: 3f942dcf8fac1e9ee8b4dbb2bea7bb1ffa2aabaa
 SHA512:
-  metadata.gz: cbbd902d7f22ed04c1aa5b6d42e7d5c8ac522994d6bc20e711202fbc9e4ac5e135a235dbea08350d6400b75d7bbb876a667711aa05180062c46dd6bbeca101a8
-  data.tar.gz: d8989fcf66046ec6f0d07bce910eb2a34eee6119702833f980ad89e37a4a55b57a362f2eb206e11ec950f2556ca71dfff7f526f1d2f5638eb980a14854888c72
+  metadata.gz: 88e47d4ef78d6d1d4cdeb755cfcd85365829538eddc72a01b5c3c576edec15141cbad9c51f2f82b3c39caf9de76c95dbf994880fab2fbb0517392dc95329edfe
+  data.tar.gz: 80aa617ffee27a101f488bd6f4da8db7efdf644c2c3870fdb7c78b4e980a2aa9169eadbe75eecb6e7af2a20b43fe8150321b2c0864074a45949ab676c7a6df9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger_model (0.2.0)
+    swagger_model (0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -12,10 +12,24 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -27,6 +41,7 @@ DEPENDENCIES
   activesupport (~> 5.2.0)
   bundler (~> 1.16)
   rake (~> 10.0)
+  rspec
   swagger_model!
 
 BUNDLED WITH

data/README.md

@@ -71,7 +71,19 @@ Or install it yourself as:
 ```ruby
 require 'swagger_model'
 
-SwaggerModel.create_from_json(json_file_path: 'example/Example.json', output_path: './example/output/')
+json = <<-EOS
+{
+  "user": {
+    "name": "marumemomo",
+    "age": 24
+  },
+  "message": "hello",
+  "created_at": "2018-05-05T20:02:24.000+09:00",
+  "updated_at": null
+}
+EOS
+
+SwaggerModel.create_from_json(json_string: json, output_path: './example/output/', response_name: "ExampleResponse")
 ```
 
 ## Development

data/example/output/{Example_model.yaml → ExampleResponse_model.yaml}

@@ -1,5 +1,5 @@
 ---
-Example:
+ExampleResponse:
   type: object
   properties:
     user:

data/lib/swagger_model/version.rb

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

data/lib/swagger_model.rb

@@ -120,16 +120,22 @@ module SwaggerModel
     obj
   end
   def self.create_from_json(params)
-    json_file_path = params[:json_file_path] || gets
-    json = open(json_file_path) do |io|
-      JSON.load(io)
+    response = {}.to_json
+    json_string = params[:json_string]
+    if !json_string.nil?
+      response = JSON.load(json_string)
+    else
+      json_file_path = params[:json_file_path] || gets
+      json = open(json_file_path) do |io|
+        JSON.load(io)
+      end
+      response = json
     end
-    model_name = params[:model_name] || File.basename(json_file_path, '.json')
-    response = json
-    model = {}
-    model[model_name] = {}
-    model[model_name]['type'] = "object"
-    object = parse_object(response, model, model_name)
+    response_name = params[:response_name] || gets
+    response_model = {}
+    response_model[response_name] = {}
+    response_model[response_name]['type'] = "object"
+    object = parse_object(response, response_model, response_name)
     properties = object['properties']
     if properties.has_key?('links')
       links = {}
@@ -137,21 +143,21 @@ module SwaggerModel
       properties['links'] = links
     end
     if properties.has_key?('meta')
-      meta_name = model_name + 'Meta'
-      model[meta_name] = properties['meta']
+      meta_name = response_name + 'Meta'
+      response_model[meta_name] = properties['meta']
       meta = {}
       meta['$ref'] = '#/components/schemas/' + meta_name
       properties['meta'] = meta
     end
-    model[model_name]['properties'] = properties
+    response_model[response_name]['properties'] = properties
     if object['required'].size > 0
-      model[model_name]['required'] = object['required']
+      response_model[response_name]['required'] = object['required']
     end
     output_path = params[:output_path] || './'
     if params[:output_type] == 'json'
-      File.write(File.join(output_path, "#{model_name}_model.json"), model.to_json)
+      File.write(File.join(output_path, "#{response_name}_model.json"), response_model.to_json)
     else
-      File.write(File.join(output_path, "#{model_name}_model.yaml"), model.to_yaml)
+      File.write(File.join(output_path, "#{response_name}_model.yaml"), response_model.to_yaml)
     end
   end
 end

data/swagger_model.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "activesupport", "~> 5.2.0"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger_model
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - marumemomo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: swagger_model
 email:
 - marumemomo@gmail.com
@@ -68,7 +82,7 @@ files:
 - bin/console
 - bin/setup
 - example/Example.json
-- example/output/Example_model.yaml
+- example/output/ExampleResponse_model.yaml
 - lib/swagger_model.rb
 - lib/swagger_model/version.rb
 - swagger_model.gemspec