oas_contrib 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c8a1b78e6c65c71f5d0053bd8b1a268213a8cb0e1eecfe423f2321c27aea23e
-  data.tar.gz: 8d705ccbd6fbabb6e11e418c08423707cbd14ae47f67bf3eaa8b689d52484f21
+  metadata.gz: 7f74cdce165853e7f21d8a71c42d3c07665166c383eb14ae920f9f13b9179647
+  data.tar.gz: 7a9676bc8f852f38175716222ba5dcc2cffbd89a4753621e1ee8b8c1d14cd6db
 SHA512:
-  metadata.gz: 587adc04a079ca0030fd341df911947edbb4722ee583df1bd6487e78a8d7be29221833855d0665fa17424b729516422aa13630da48776a89a342f1844a278d1b
-  data.tar.gz: 4b6876e829bd6f7a1e1bebd662c7533a01b1b6e6796d6467f5a9eb8ccd8d9b4b9a6ba9fcaaf1f3c82f036cf9e1f02f86bae850da8aa89eae19de2359be20e626
+  metadata.gz: f1cbb48a8848b56dc402f86329c673883ec8e1a8eb86a9363edea17903041d03f7c0a9e0a11586ccacfd330093d2754fcb7bfd46f24e0cf671acf792c6be4a4c
+  data.tar.gz: 18a35b2c39802c1e7e5902203b5f40ce6f891a149d8527637da0e12a54dc850798333c4b80151ef867613dd577439df91ef4df59ce50e477344bcf6879537c87

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/oas_contrib.svg)](https://badge.fury.io/rb/oas_contrib)
 
-Libraries and commands for OpenAPI Specification.
+Libraries and Commands for OpenAPI Specification.
 
 ## Installation
 
@@ -26,37 +26,113 @@ Or install it yourself as:
 
 Divide the OAS file into path units and schema units.
 
-`$ oas_contrib divide <input_file_path> <output_directory_path> (OPTIONS)`
+```bash
+$ oas_contrib divide <input_file> <output_dir> (<options>...)
+```
+
+`<input_file>` must be `.json` or `.yml`
+
+#### Options
+
+| option     | description      | value type                | default  |
+|------------|------------------|---------------------------|----------|
+|`--out_type`| output file type | String (`yaml` or `json`) | `yaml`   |
 
-__Options__
+#### Example
 
-* `--in_type`  input file type (`yaml` or `json`, default `yaml`)
-* `--out_type` output file type (`yaml` or `json`, default `yaml`)
+##### Open API 3.0
+
+[BEFORE](https://github.com/MichinaoShimizu/oas_contrib/blob/master/example/sample_petstore_openapi_v3.yml) -> [AFTER](https://github.com/MichinaoShimizu/oas_contrib/tree/master/example/dist/openapi_v3)
+
+```
+$ oas_contrib divide example/sample_petstore_openapi_v3.yml example/dist/openapi_v3
+Load: example/sample_petstore_openapi_v3.yml
+Dist: example/dist/openapi_v3/meta
+Dist: example/dist/openapi_v3/meta/001_openapi.yml
+Dist: example/dist/openapi_v3/meta/002_info.yml
+Dist: example/dist/openapi_v3/meta/003_servers.yml
+Dist: example/dist/openapi_v3/path
+Dist: example/dist/openapi_v3/path/001_pets.yml
+Dist: example/dist/openapi_v3/path/002_pets_{petId}.yml
+Dist: example/dist/openapi_v3/model
+Dist: example/dist/openapi_v3/model/001_Pet.yml
+Dist: example/dist/openapi_v3/model/002_Error.yml
+
+$ tree example/dist/openapi_v3/
+example/dist/openapi_v3/
+├── meta
+│   ├── 001_openapi.yml
+│   ├── 002_info.yml
+│   └── 003_servers.yml
+├── model
+│   ├── 001_Pet.yml
+│   ├── 002_Error.yml
+│   └── 003_Pets.yml
+└── path
+    ├── 001_pets.yml
+    └── 002_pets_{petId}.yml
+```
 
-You can below 4 case:
+##### Swagger v2
 
-* JSON OAS file -> JSON files
-* YAML OAS file -> YAML files
-* JSON OAS file -> YAML files
-* YAML OAS file -> JSON files
+[BEFORE](https://github.com/MichinaoShimizu/oas_contrib/blob/master/example/sample_petstore_swagger_v2.yml) -> [AFTER](https://github.com/MichinaoShimizu/oas_contrib/tree/master/example/dist/swagger_v2)
+
+```
+$ oas_contrib divide example/sample_petstore_swagger_v2.yml example/dist/swagger_v2
+Load: example/sample_petstore_swagger_v2.yml
+Dist: example/dist/swagger_v2/meta
+Dist: example/dist/swagger_v2/meta/001_swagger.yml
+Dist: example/dist/swagger_v2/meta/002_info.yml
+Dist: example/dist/swagger_v2/meta/003_host.yml
+Dist: example/dist/swagger_v2/meta/004_basePath.yml
+Dist: example/dist/swagger_v2/meta/005_schemes.yml
+Dist: example/dist/swagger_v2/meta/006_consumes.yml
+Dist: example/dist/swagger_v2/meta/007_produces.yml
+Dist: example/dist/swagger_v2/meta/008_components.yml
+Dist: example/dist/swagger_v2/path
+Dist: example/dist/swagger_v2/path/001_pets.yml
+Dist: example/dist/swagger_v2/path/002_pets_{petId}.yml
+Dist: example/dist/swagger_v2/model
+Dist: example/dist/swagger_v2/model/001_Pet.yml
+Dist: example/dist/swagger_v2/model/002_Error.yml
+Dist: example/dist/swagger_v2/model/003_Pets.yml
+
+$ tree example/dist/
+example/dist/
+└── swagger_v2
+    ├── meta
+    │   ├── 001_swagger.yml
+    │   ├── 002_info.yml
+    │   ├── 003_host.yml
+    │   ├── 004_basePath.yml
+    │   ├── 005_schemes.yml
+    │   ├── 006_consumes.yml
+    │   ├── 007_produces.yml
+    │   └── 008_components.yml
+    ├── model
+    │   ├── 001_Pet.yml
+    │   ├── 002_Error.yml
+    │   └── 003_Pets.yml
+    └── path
+        ├── 001_pets.yml
+        └── 002_pets_{petId}.yml
+```
 
 ### Merge command
 
 Merge multiple divided files into an OAS file.
 
-`$ oas_contrib merge <input_directory_path> <output_file_path> (OPTIONS)`
-
-__Options__
+```bash
+$ oas_contrib merge <input_dir> <output_file> (<options>...)
+```
 
-* `--in_type`  input file type (`yaml` or `json`, default `yaml`)
-* `--out_type` output file type (`yaml` or `json`, default `yaml`)
+`<output_file>` must be `.json` or `.yml`
 
-You can below 4 case:
+#### Options
 
-* JSON files -> JSON OAS file
-* YAML files -> YAML OAS file
-* JSON files -> YAML OAS file
-* YAML files -> JSON OAS file
+| option     | description      | value type               | default  |
+|------------|------------------|------------------------- |----------|
+|`--in_type` | input file type  | String (`yaml` or `json`)| `yaml`   |
 
 ### Preview command
 
@@ -64,11 +140,17 @@ Preview OAS file using Swagger-UI official Docker image.
 
 The preview command needs docker.
 
-`$ oas_contrib preview <input_file> (OPTIONS)`
+```bash
+$ oas_contrib preview <input_file> (<options>...)
+```
+
+`<input_file>` must be `.json` or `.yml`
 
-__Options__
+#### Options
 
-* `--port` Swagger UI listen port (default `50010`)
+| option     | description             | value type      | default  |
+|------------|-------------------------|-----------------|----------|
+|`--port`    | Swagger UI listen port  | Integer         | `50010`  |
 
 ## Contributing
 

data/example/dist/openapi_v3/meta/001_openapi.yml

@@ -0,0 +1,2 @@
+---
+openapi: 3.0.0

data/example/dist/openapi_v3/meta/002_info.yml

@@ -0,0 +1,6 @@
+---
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT

data/example/dist/openapi_v3/meta/003_servers.yml

@@ -0,0 +1,3 @@
+---
+servers:
+- url: http://petstore.swagger.io/v1

data/example/dist/openapi_v3/model/001_Pet.yml

@@ -0,0 +1,13 @@
+---
+Pet:
+  required:
+  - id
+  - name
+  properties:
+    id:
+      type: integer
+      format: int64
+    name:
+      type: string
+    tag:
+      type: string

data/example/dist/openapi_v3/model/002_Error.yml

@@ -0,0 +1,11 @@
+---
+Error:
+  required:
+  - code
+  - message
+  properties:
+    code:
+      type: integer
+      format: int32
+    message:
+      type: string

data/example/dist/openapi_v3/model/003_Pets.yml

@@ -0,0 +1,5 @@
+---
+Pets:
+  type: array
+  items:
+    "$ref": "#/components/schemas/Pet"

data/example/dist/openapi_v3/path/001_pets.yml

@@ -0,0 +1,47 @@
+---
+"/pets":
+  get:
+    summary: List all pets
+    operationId: listPets
+    tags:
+    - pets
+    parameters:
+    - name: limit
+      in: query
+      description: How many items to return at one time (max 100)
+      required: false
+      schema:
+        type: integer
+        format: int32
+    responses:
+      '200':
+        description: A paged array of pets
+        headers:
+          x-next:
+            description: A link to the next page of responses
+            schema:
+              type: string
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/Pets"
+      default:
+        description: unexpected error
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/Error"
+  post:
+    summary: Create a pet
+    operationId: createPets
+    tags:
+    - pets
+    responses:
+      '201':
+        description: Null response
+      default:
+        description: unexpected error
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/Error"

data/example/dist/openapi_v3/path/002_pets_{petId}.yml

@@ -0,0 +1,27 @@
+---
+"/pets/{petId}":
+  get:
+    summary: Info for a specific pet
+    operationId: showPetById
+    tags:
+    - pets
+    parameters:
+    - name: petId
+      in: path
+      required: true
+      description: The id of the pet to retrieve
+      schema:
+        type: string
+    responses:
+      '200':
+        description: Expected response to a valid request
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/Pets"
+      default:
+        description: unexpected error
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/Error"

data/example/dist/swagger_v2/meta/001_swagger.yml

@@ -0,0 +1,2 @@
+---
+swagger: '2.0'

data/example/dist/swagger_v2/meta/002_info.yml

@@ -0,0 +1,6 @@
+---
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT

data/example/dist/swagger_v2/meta/003_host.yml

@@ -0,0 +1,2 @@
+---
+host: petstore.swagger.io

data/example/dist/swagger_v2/meta/004_basePath.yml

@@ -0,0 +1,2 @@
+---
+basePath: "/v1"

data/example/dist/swagger_v2/meta/005_schemes.yml

@@ -0,0 +1,3 @@
+---
+schemes:
+- http

data/example/dist/swagger_v2/meta/006_consumes.yml

@@ -0,0 +1,3 @@
+---
+consumes:
+- application/json

data/example/dist/swagger_v2/meta/007_produces.yml

@@ -0,0 +1,3 @@
+---
+produces:
+- application/json

data/example/dist/swagger_v2/meta/008_components.yml

@@ -0,0 +1,2 @@
+---
+components: {}

data/example/dist/swagger_v2/model/001_Pet.yml

@@ -0,0 +1,13 @@
+---
+Pet:
+  required:
+  - id
+  - name
+  properties:
+    id:
+      type: integer
+      format: int64
+    name:
+      type: string
+    tag:
+      type: string

data/example/dist/swagger_v2/model/002_Error.yml

@@ -0,0 +1,11 @@
+---
+Error:
+  required:
+  - code
+  - message
+  properties:
+    code:
+      type: integer
+      format: int32
+    message:
+      type: string

data/example/dist/swagger_v2/model/003_Pets.yml

@@ -0,0 +1,5 @@
+---
+Pets:
+  type: array
+  items:
+    "$ref": "#/definitions/Pet"

data/example/dist/swagger_v2/path/001_pets.yml

@@ -0,0 +1,39 @@
+---
+"/pets":
+  get:
+    summary: List all pets
+    operationId: listPets
+    tags:
+    - pets
+    parameters:
+    - name: limit
+      in: query
+      description: How many items to return at one time (max 100)
+      required: false
+      type: integer
+      format: int32
+    responses:
+      '200':
+        description: A paged array of pets
+        headers:
+          x-next:
+            type: string
+            description: A link to the next page of responses
+        schema:
+          "$ref": "#/definitions/Pets"
+      default:
+        description: unexpected error
+        schema:
+          "$ref": "#/definitions/Error"
+  post:
+    summary: Create a pet
+    operationId: createPets
+    tags:
+    - pets
+    responses:
+      '201':
+        description: Null response
+      default:
+        description: unexpected error
+        schema:
+          "$ref": "#/definitions/Error"

data/example/dist/swagger_v2/path/002_pets_{petId}.yml

@@ -0,0 +1,22 @@
+---
+"/pets/{petId}":
+  get:
+    summary: Info for a specific pet
+    operationId: showPetById
+    tags:
+    - pets
+    parameters:
+    - name: petId
+      in: path
+      required: true
+      description: The id of the pet to retrieve
+      type: string
+    responses:
+      '200':
+        description: Expected response to a valid request
+        schema:
+          "$ref": "#/definitions/Pets"
+      default:
+        description: unexpected error
+        schema:
+          "$ref": "#/definitions/Error"

data/lib/oas_contrib.rb

@@ -1,8 +1,6 @@
 require 'oas_contrib/version'
 
-#
-# <Description>
-#
+# OAS Contribute module
+# @author Michinao Shimizu
 module OasContrib
-  # Your code goes here...
 end

data/lib/oas_contrib/command.rb

@@ -1,83 +1,55 @@
 require 'thor'
-require 'oas_contrib/command_util'
+require 'oas_contrib/command_resolvers/divide_command_resolver'
+require 'oas_contrib/command_resolvers/merge_command_resolver'
 
 module OasContrib
-  # OAS contrib commands
-  # @author Michinao Shimizu
+  # Commands
   class Command < Thor
-    include CommandUtil
+    option :out_type, type: :string, aliases: '-ot', default: 'yaml', desc: 'output file type (yaml or json)'
+    desc 'divide <input_file> <output_dir>', 'Divide the OAS file into path units and schema units.'
 
-    option :in_type,  :type => :string, :aliases => '-it', :default => 'yaml', :desc => 'input file type (yaml or json)'
-    option :out_type, :type => :string, :aliases => '-ot', :default => 'yaml', :desc => 'output file type (yaml or json)'
-    desc 'divide <input_file_path> <output_directory_path>', 'Divide the OAS file into path units and schema units.'
-
-    # Divide the OAS file into path units and schema units
+    # Command (Divide the OAS file into path units and schema units)
     # @param [String] in_file input file path
     # @param [String] out_dir output directory path
-    # @return [Boolean]
+    # @return [Integer]
     def divide(in_file, out_dir)
-      raise ArgumentError, "in_file:[#{in_file}] is not exists." unless File.exist?(in_file)
-      in_type  = options['in_type']
-      out_type = options['out_type']
-      hash = input_solo(in_file, in_type)
-      version = definition_version(hash)
-
-      meta_file = get_meta_file_path(out_dir, out_type)
-      path_dir = get_path_dir_path(out_dir)
-      schema_dir = get_schema_dir_path(out_dir, version)
-
-      FileUtils.mkdir_p(path_dir)
-      FileUtils.mkdir_p(schema_dir)
-
-      output_solo(meta_filter(hash), meta_file, out_type)
-      output_multi(hash['paths'], path_dir, out_type)
-      output_multi(schema_filter(hash, version), schema_dir, out_type)
+      resolver = CommandResolvers::DivideCommandResolver.new(in_file, out_dir, options['out_type'])
+      resolver.load
+      resolver.resolve
+      resolver.dist
+      exit(0)
     end
 
-    option :in_type,  :type => :string, :aliases => '-it', :default => 'yaml', :desc => 'input file type (yaml or json)'
-    option :out_type, :type => :string, :aliases => '-ot', :default => 'yaml', :desc => 'output file type (yaml or json)'
-    desc 'merge <input_directory_path> <output_file_path>', 'Merge multiple divided files into an OAS file.'
+    option :in_type, type: :string, aliases: '-it', default: 'yaml', desc: 'input file type (yaml or json)'
+    desc 'merge <input_dir> <output_file>', 'Merge multiple divided files into an OAS file.'
 
-    # Merge multiple divided files into an OAS file.
+    # Command (Merge multiple divided files into an OAS file)
     # @param [String] in_dir input directory path
     # @param [String] out_file output file path
-    # @return [Boolean]
+    # @return [Integer]
     def merge(in_dir, out_file)
-      raise ArgumentError, "in_dir:[#{in_dir}] is not exists." unless File.exist?(in_dir)
-      in_type  = options['in_type']
-      out_type = options['out_type']
-
-      meta_file = get_meta_file_path(in_dir, in_type)
-      hash = input_solo(meta_file, in_type)
-      version = definition_version(hash)
-
-      path_dir = get_path_dir_path(in_dir)
-      schema_dir = get_schema_dir_path(in_dir, version)
-
-      hash['components'] = {}
-      hash['paths'] = input_multi(path_dir, in_type)
-      case version
-      when 'v2' then hash['definitions'] = input_multi(schema_dir, in_type)
-      when 'v3' then hash['components']['schemas'] = input_multi(schema_dir, in_type)
-      end
-      output_solo(hash, out_file, out_type)
+      resolver = CommandResolvers::MergeCommandResolver.new(in_dir, out_file, options['in_type'])
+      resolver.load
+      resolver.resolve
+      resolver.dist
+      exit(0)
     end
 
-    option :port,  :type => :string, :aliases => '-p', :default => '50010', :desc => 'Swagger UI listen port'
+    option :port, type: :string, aliases: '-p', default: '50010', desc: 'Swagger UI listen port'
     desc 'preview <input_file>', 'Preview OAS file using Swagger-UI official Docker image.'
 
     # Preview OAS file using Swagger-UI official Docker image.
     # @param [String] in_file input file path
-    # @return [Boolean] return code
+    # @return [Integer]
     def preview(in_file)
-      raise ArgumentError, "in_file:[#{in_file}] is not exists." unless File.exist?(in_file)
       port = options['port']
       path = File.expand_path(in_file)
       basename = File.basename(path)
       puts "SwaggerUI listen: http://localhost:#{port} with: #{in_file}"
       Kernel.exec "docker run --rm --name oas_contrib_preview_swagger_ui \
-      -p #{port}:8080 -e API_URL=#{basename} \
-      -v #{path}:/usr/share/nginx/html/#{basename} swaggerapi/swagger-ui"
+                   -p #{port}:8080 -e API_URL=#{basename} \
+                   -v #{path}:/usr/share/nginx/html/#{basename} swaggerapi/swagger-ui"
+      exit(0)
     end
   end
 end

data/lib/oas_contrib/command_resolver_base.rb

@@ -0,0 +1,140 @@
+require 'oas_contrib/swagger/v2/spec'
+require 'oas_contrib/openapi/v3/spec'
+require 'yaml'
+require 'json'
+
+module OasContrib
+  # CommandResolver Basic
+  class CommandResolverBase
+    # Initialze
+    # @param [String] path input or output directory path
+    def initialize(path)
+      @meta_dir  = path + '/meta'
+      @path_dir  = path + '/path'
+      @model_dir = path + '/model'
+    end
+
+    # Load input files or directories
+    # @raise [NotImplementedError]
+    # @return [nil]
+    def load
+      raise NotImplementedError, 'This class must be implemented "load" method.'
+    end
+
+    # Distribute output file
+    # @raise [NotImplementedError]
+    # @return [nil]
+    def dist
+      raise NotImplementedError, 'This class must be implemented "dist" method.'
+    end
+
+    # Determine which type of definition data.
+    # @raise [StandardError]
+    # @return [OasContrib::Swagger::V2::Spec|OasContrib::OpenAPI::V3::Spec] spec
+    def resolve
+      return @spec = OasContrib::Swagger::V2::Spec.new(@load_data) if @load_data['swagger'] =~ /^2/
+      return @spec = OasContrib::OpenAPI::V3::Spec.new(@load_data) if @load_data['openapi'] =~ /^3/
+      raise 'Undefined OAS file.'
+    end
+
+    # Check the type of OpenAPI v3 definition or not
+    # @return [Boolean]
+    def openapi_v3?
+      @spec.is_a?(OasContrib::OpenAPI::V3::Spec)
+    end
+
+    # Check the type of Swagger v2 definition or not
+    # @return [Boolean]
+    def swagger_v2?
+      @spec.is_a?(OasContrib::Swagger::V2::Spec)
+    end
+
+    # Convert file type string to file extention string.
+    # @param [String] type file type string (yaml or json)
+    # @raise [ArgumentError] invalid file type string
+    # @return [String] file extension string (.yml or .json)
+    def file_type_to_ext(type)
+      case type
+      when 'yaml' then '.yml'
+      when 'json' then '.json'
+      else raise ArgumentError, 'Undefined file type'
+      end
+    end
+
+    # Load a file
+    # @param [String] path input file path
+    # @return [Hash]
+    def input(path)
+      @load_data = input_call(path)
+    end
+
+    # Output a file
+    # @param [Hash] hash data
+    # @param [String] path output file path
+    # @return [File]
+    def output(hash, path)
+      File.open(path, 'w') { |f| output_call(hash, f) }
+    end
+
+    # Load directory files
+    # @param [String] path input directory
+    # @return [Hash] merged input files data
+    def input_dir(path)
+      Dir.glob(path).sort.each_with_object({}, &input_call_lambda)
+    end
+
+    # Proc of input a yaml or json file
+    # @return [Proc]
+    def input_call_lambda
+      lambda do |file, result|
+        hash = input_call(file)
+        key = hash.keys[0]
+        result[key] = hash[key]
+      end
+    end
+
+    # Load a file depending on file extension
+    # @param [String] path file path
+    # @raise [ArgumentError] invalid file type string
+    # @return [Hash]
+    def input_call(path)
+      puts "Load: #{path}"
+      case @input_file_ext
+      when '.yml'  then YAML.load_file(path)
+      when '.json' then JSON.parse(File.read(path))
+      else raise ArgumentError, 'Undefined file type'
+      end
+    end
+
+    # Output a file depending on file extension
+    # @param [String] path file path
+    # @raise [ArgumentError] invalid file type string
+    # @return [IO]
+    def output_call(hash, file)
+      puts "Dist: #{file.path}"
+      case @output_file_ext
+      when '.yml'  then YAML.dump(hash, file)
+      when '.json' then JSON.dump(hash, file)
+      else raise ArgumentError, 'Undefined file type'
+      end
+    end
+
+    # Output directory and files
+    # @param [Hash] hash data
+    # @param [String] path directory path
+    # @return [nil]
+    def output_dir(hash, path)
+      puts "Dist: #{path}"
+      FileUtils.mkdir_p(path)
+
+      i = 1
+      hash.each do |k, _v|
+        key = k.tr('/', '_').gsub(/^_/, '')
+        val = hash.select { |hash_key, _| hash_key == k }
+        output(val, "#{path}/#{i.to_s.rjust(3, '0')}_#{key}#{@output_file_ext}")
+        i += 1
+      end
+      nil
+    end
+  end
+end

data/lib/oas_contrib/command_resolvers/divide_command_resolver.rb

@@ -0,0 +1,34 @@
+require 'oas_contrib/command_resolver_base'
+
+module OasContrib
+  # Command Resolvers
+  module CommandResolvers
+    # Divide command resolver
+    class DivideCommandResolver < CommandResolverBase
+      # Initialize
+      # @param [String] input_file_path input file path
+      # @param [String] output_dir_path output directory path
+      # @param [String] output_file_type output file type (json or yaml)
+      def initialize(input_file_path, output_dir_path, output_file_type)
+        @input_file_path = input_file_path
+        @input_file_ext  = File.extname(input_file_path)
+        @output_file_ext = file_type_to_ext(output_file_type)
+        super(output_dir_path)
+      end
+
+      # Load the OAS file
+      # @return [Hash] loaded data
+      def load
+        input(@input_file_path)
+      end
+
+      # Output divided files
+      # @return [nil]
+      def dist
+        output_dir(@spec.meta,  @meta_dir)
+        output_dir(@spec.path,  @path_dir)
+        output_dir(@spec.model, @model_dir)
+      end
+    end
+  end
+end

data/lib/oas_contrib/command_resolvers/merge_command_resolver.rb

@@ -0,0 +1,60 @@
+require 'oas_contrib/command_resolver_base'
+
+module OasContrib
+  # Command Resolvers
+  module CommandResolvers
+    # Merge command resolver
+    class MergeCommandResolver < CommandResolverBase
+      # Initialize
+      # @param [String] input_dir_path input directory path
+      # @param [String] output_file_path output file path
+      # @param [String] input_file_type input file type (json or yaml)
+      def initialize(input_dir_path, output_file_path, input_file_type)
+        @input_file_ext = file_type_to_ext(input_file_type)
+        @output_file_path = output_file_path
+        @output_file_ext = File.extname(output_file_path)
+        super(input_dir_path)
+      end
+
+      # Load divided files
+      # @return [Hash] load and merged data
+      def load
+        load_meta
+        resolve
+        load_path
+        load_model
+      end
+
+      # Output the OAS file
+      # @return [nil]
+      def dist
+        output(@load_data, @output_file_path)
+      end
+
+      private
+
+      # Load meta part files
+      # @return [Hash] loaded data
+      def load_meta
+        @load_data = input_dir(@meta_dir + '/**/*' + @input_file_ext)
+      end
+
+      # Load path part files
+      # @return [Hash] load and merged data
+      def load_path
+        @load_data['paths'] = input_dir(@path_dir + '/**/*' + @input_file_ext)
+      end
+
+      # Load model part files
+      # @return [Hash] load and merged data
+      def load_model
+        path = @model_dir + '/**/*' + @input_file_ext
+        @load_data['definitions'] = input_dir(path) if swagger_v2?
+        if openapi_v3?
+          @load_data['components'] = {}
+          @load_data['components']['schemas'] = input_dir(path)
+        end
+      end
+    end
+  end
+end

data/lib/oas_contrib/openapi/v3/spec.rb

@@ -0,0 +1,21 @@
+module OasContrib
+  # Open API definition module
+  module OpenAPI
+    # Version 3 module
+    module V3
+      # Spec class
+      class Spec
+        attr_accessor :data, :meta, :path, :model
+
+        # Initialize
+        # @param [Hash] data mapping data
+        def initialize(data)
+          @data  = data
+          @meta  = data.select { |v| v != 'paths' && v != 'components' } || nil
+          @path  = data['paths'] || nil
+          @model = data.dig('components', 'schemas') || nil
+        end
+      end
+    end
+  end
+end

data/lib/oas_contrib/swagger/v2/spec.rb

@@ -0,0 +1,20 @@
+module OasContrib
+  # Swagger module
+  module Swagger
+    # Version 2 module
+    module V2
+      # Spec
+      class Spec
+        attr_accessor :data, :meta, :path, :model
+        # Initialize
+        # @param [Hash] data mapping data
+        def initialize(data)
+          @data  = data
+          @meta  = data.select { |v| v != 'paths' && v != 'definitions' } || nil
+          @path  = data['paths'] || nil
+          @model = data['definitions'] || nil
+        end
+      end
+    end
+  end
+end

data/lib/oas_contrib/version.rb

@@ -1,4 +1,4 @@
 module OasContrib
-  # @return [String] semantic version
-  VERSION = '0.1.1'.freeze
+  # @return [String] version
+  VERSION = '0.2.0'.freeze
 end

data/oas_contrib.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Open API Specification related commands and libraries.'
   spec.description   = 'Open API Specification related commands and libraries.'
-  spec.homepage      = "https://github.com/MichinaoShimizu/oas_contrib"
+  spec.homepage      = 'https://github.com/MichinaoShimizu/oas_contrib'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_contrib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michinao Shimizu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -82,14 +82,39 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/dist/openapi_v3/meta/001_openapi.yml
+- example/dist/openapi_v3/meta/002_info.yml
+- example/dist/openapi_v3/meta/003_servers.yml
+- example/dist/openapi_v3/model/001_Pet.yml
+- example/dist/openapi_v3/model/002_Error.yml
+- example/dist/openapi_v3/model/003_Pets.yml
+- example/dist/openapi_v3/path/001_pets.yml
+- example/dist/openapi_v3/path/002_pets_{petId}.yml
+- example/dist/swagger_v2/meta/001_swagger.yml
+- example/dist/swagger_v2/meta/002_info.yml
+- example/dist/swagger_v2/meta/003_host.yml
+- example/dist/swagger_v2/meta/004_basePath.yml
+- example/dist/swagger_v2/meta/005_schemes.yml
+- example/dist/swagger_v2/meta/006_consumes.yml
+- example/dist/swagger_v2/meta/007_produces.yml
+- example/dist/swagger_v2/meta/008_components.yml
+- example/dist/swagger_v2/model/001_Pet.yml
+- example/dist/swagger_v2/model/002_Error.yml
+- example/dist/swagger_v2/model/003_Pets.yml
+- example/dist/swagger_v2/path/001_pets.yml
+- example/dist/swagger_v2/path/002_pets_{petId}.yml
+- example/sample_petstore_openapi_v3.yml
+- example/sample_petstore_swagger_v2.yml
 - exe/oas_contrib
 - lib/oas_contrib.rb
 - lib/oas_contrib/command.rb
-- lib/oas_contrib/command_util.rb
+- lib/oas_contrib/command_resolver_base.rb
+- lib/oas_contrib/command_resolvers/divide_command_resolver.rb
+- lib/oas_contrib/command_resolvers/merge_command_resolver.rb
+- lib/oas_contrib/openapi/v3/spec.rb
+- lib/oas_contrib/swagger/v2/spec.rb
 - lib/oas_contrib/version.rb
 - oas_contrib.gemspec
-- sample_petstore_2.yml
-- sample_petstore_3.yml
 homepage: https://github.com/MichinaoShimizu/oas_contrib
 licenses:
 - MIT

data/lib/oas_contrib/command_util.rb

@@ -1,125 +0,0 @@
-require 'yaml'
-require 'json'
-
-module OasContrib
-  # Command class utility
-  module CommandUtil
-    # @return [String]
-    FILE_TYPE_YAML = 'yaml'.freeze
-    # @return [String]
-    FILE_TYPE_JSON = 'json'.freeze
-
-    def definition_version(hash)
-      if hash['swagger']
-        puts 'OK. input file is swagger 2.0 format.'
-        return 'v2'
-      end
-
-      if hash['openapi']
-        puts 'OK. input file is openapi 3.0 format.'
-        return 'v3'
-      end
-
-      raise 'input file must be swagger 2.0, or openapi 3.0 format.'
-    end
-
-    def schema_filter(hash, version)
-      case version
-      when 'v2' then hash['definitions']
-      when 'v3' then hash['components']['schemas']
-      end
-    end
-
-    def get_meta_file_path(root, file_type)
-      "#{root}/meta#{file_type_ext(file_type)}"
-    end
-
-    def get_path_dir_path(root)
-      "#{root}/paths"
-    end
-
-    def get_schema_dir_path(root, version)
-      schema_path = case version
-                    when 'v2' then '/definitions'
-                    when 'v3' then '/components/schemas'
-                    end
-
-      "#{root}#{schema_path}"
-    end
-
-    # Get file extension
-    # @param [String] file_type yaml or json
-    # @return [String] .yml or .json
-    def file_type_ext(file_type)
-      case file_type
-      when FILE_TYPE_YAML then '.yml'
-      when FILE_TYPE_JSON then '.json'
-      end
-    end
-
-    # Get hash from yaml or json file
-    # @param [String] path <description>
-    # @param [String] file_type <description>
-    # @return [Hash]
-    def input_solo(path, file_type)
-      hash = case file_type
-             when FILE_TYPE_YAML then YAML.load_file(path)
-             when FILE_TYPE_JSON then JSON.parse(File.read(path))
-             end
-
-      puts "Load #{file_type} complete: #{path}"
-      hash
-    end
-
-    # Load path files and get hash
-    # @param [String] dir_path target directory path
-    # @param [String] file_type yaml or json
-    # @return [Hash] parsed hash
-    def input_multi(dir_path, file_type)
-      path = "#{dir_path}/*#{file_type_ext(file_type)}"
-      Dir.glob(path).each_with_object({}) do |input_file_path, result|
-        hash = input_solo(input_file_path, file_type)
-        key = hash.keys[0]
-        result[key] = hash[key]
-      end
-    end
-
-    # <Description>
-    # @param [<Type>] hash <description>
-    # @param [<Type>] path <description>
-    # @param [<Type>] file_type <description>
-    # @return [<Type>] <description>
-    def output_solo(hash, path, file_type)
-      output_lambda = case file_type
-                      when FILE_TYPE_YAML then ->(file) { YAML.dump(hash, file) }
-                      when FILE_TYPE_JSON then ->(file) { JSON.dump(hash, file) }
-                      end
-
-      File.open(path, 'w') do |f|
-        output_lambda.call(f)
-        puts "Generate #{file_type} complete: #{path}"
-      end
-    end
-
-    # Output path definition files
-    # @param [Hash] hash data source hash
-    # @param [String] dir_path output directory path
-    # @param [String] file_type output file type (yaml, json)
-    # @return [Boolean]
-    def output_multi(hash, dir_path, file_type)
-      hash.each do |k, _|
-        key = k.tr('/', '_').gsub(/^\_/, '')
-        path = "#{dir_path}/#{key}#{file_type_ext(file_type)}"
-        val = hash.select { |hash_key, _| hash_key == k }
-        output_solo(val, path, file_type)
-      end
-    end
-
-    # Return meta section hash
-    # @param [Hash] hash data source hash
-    # @return [Hash] filtered hash
-    def meta_filter(hash)
-      hash.select { |k, _| k != 'paths' && k != 'components' && k != 'definitions' }
-    end
-  end
-end