oas_contrib 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f74cdce165853e7f21d8a71c42d3c07665166c383eb14ae920f9f13b9179647
-  data.tar.gz: 7a9676bc8f852f38175716222ba5dcc2cffbd89a4753621e1ee8b8c1d14cd6db
+  metadata.gz: 2b2dd9f63fca90af7dfadb2acb5bbcf3298bcbe8124f058228ef2e039702e519
+  data.tar.gz: 4077394dfc935cf038f283147840a9bb95600774bec1f0ccb2c21254edc1500a
 SHA512:
-  metadata.gz: f1cbb48a8848b56dc402f86329c673883ec8e1a8eb86a9363edea17903041d03f7c0a9e0a11586ccacfd330093d2754fcb7bfd46f24e0cf671acf792c6be4a4c
-  data.tar.gz: 18a35b2c39802c1e7e5902203b5f40ce6f891a149d8527637da0e12a54dc850798333c4b80151ef867613dd577439df91ef4df59ce50e477344bcf6879537c87
+  metadata.gz: 63164dd1c20142588d8453c87c4a9043107ae3ba7f9a6d9072dd4639b5d6886a4333d7de0acc9a39b85cc20870c27db9df623aebf318aee8d95464afd7c04b67
+  data.tar.gz: 396ae10edea63c1a1198ae20054d631e2c4ade37d2e073965f6d6714014755a6bfb3e6c6ee57114b214aa1782cbdc83ca6a91a26382dee9751d7bcbb804d7823

data/.rspec_status

@@ -0,0 +1,12 @@
+example_id                           | status | run_time        |
+------------------------------------ | ------ | --------------- |
+./spec/divide_command_spec.rb[1:1:1] | passed | 0.31599 seconds |
+./spec/divide_command_spec.rb[1:2:1] | passed | 0.31835 seconds |
+./spec/divide_command_spec.rb[1:3:1] | passed | 0.32395 seconds |
+./spec/divide_command_spec.rb[1:4:1] | passed | 0.33436 seconds |
+./spec/divide_command_spec.rb[1:5:1] | passed | 0.30711 seconds |
+./spec/merge_command_spec.rb[1:1:1]  | passed | 0.32602 seconds |
+./spec/merge_command_spec.rb[1:2:1]  | passed | 0.31555 seconds |
+./spec/merge_command_spec.rb[1:3:1]  | passed | 0.30952 seconds |
+./spec/merge_command_spec.rb[1:4:1]  | passed | 0.31631 seconds |
+./spec/merge_command_spec.rb[1:5:1]  | passed | 0.31812 seconds |

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 Open API (2.0, 3.0) Specification.
 
 ## Installation
 
@@ -27,10 +27,10 @@ Or install it yourself as:
 Divide the OAS file into path units and schema units.
 
 ```bash
-$ oas_contrib divide <input_file> <output_dir> (<options>...)
+$ oas_contrib divide <OAS file> <output_dir> (<options>...)
 ```
 
-`<input_file>` must be `.json` or `.yml`
+`<OAS file>` must be `.json` or `.yml`
 
 #### Options
 
@@ -42,24 +42,24 @@ $ oas_contrib divide <input_file> <output_dir> (<options>...)
 
 ##### 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)
+[BEFORE](https://github.com/MichinaoShimizu/oas_contrib/blob/master/example/v3.yml) -> [AFTER](https://github.com/MichinaoShimizu/oas_contrib/tree/master/example/dist/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/
+$ oas_contrib divide example/v3.yml example/dist/v3
+Load: example/v3.yml
+Dist: example/dist/v3/meta
+Dist: example/dist/v3/meta/001_openapi.yml
+Dist: example/dist/v3/meta/002_info.yml
+Dist: example/dist/v3/meta/003_servers.yml
+Dist: example/dist/v3/path
+Dist: example/dist/v3/path/001_pets.yml
+Dist: example/dist/v3/path/002_pets_{petId}.yml
+Dist: example/dist/v3/model
+Dist: example/dist/v3/model/001_Pet.yml
+Dist: example/dist/v3/model/002_Error.yml
+
+$ tree example/dist/v3/
+example/dist/v3/
 ├── meta
 │   ├── 001_openapi.yml
 │   ├── 002_info.yml
@@ -73,33 +73,33 @@ example/dist/openapi_v3/
     └── 002_pets_{petId}.yml
 ```
 
-##### Swagger v2
+##### Open API 2.0
 
-[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)
+[BEFORE](https://github.com/MichinaoShimizu/oas_contrib/blob/master/example/v2.yml) -> [AFTER](https://github.com/MichinaoShimizu/oas_contrib/tree/master/example/dist/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
+$ oas_contrib divide example/v2.yml example/dist/v2
+Load: example/v2.yml
+Dist: example/dist/v2/meta
+Dist: example/dist/v2/meta/001_swagger.yml
+Dist: example/dist/v2/meta/002_info.yml
+Dist: example/dist/v2/meta/003_host.yml
+Dist: example/dist/v2/meta/004_basePath.yml
+Dist: example/dist/v2/meta/005_schemes.yml
+Dist: example/dist/v2/meta/006_consumes.yml
+Dist: example/dist/v2/meta/007_produces.yml
+Dist: example/dist/v2/meta/008_components.yml
+Dist: example/dist/v2/path
+Dist: example/dist/v2/path/001_pets.yml
+Dist: example/dist/v2/path/002_pets_{petId}.yml
+Dist: example/dist/v2/model
+Dist: example/dist/v2/model/001_Pet.yml
+Dist: example/dist/v2/model/002_Error.yml
+Dist: example/dist/v2/model/003_Pets.yml
 
 $ tree example/dist/
 example/dist/
-└── swagger_v2
+└── v2
     ├── meta
     │   ├── 001_swagger.yml
     │   ├── 002_info.yml
@@ -123,10 +123,10 @@ example/dist/
 Merge multiple divided files into an OAS file.
 
 ```bash
-$ oas_contrib merge <input_dir> <output_file> (<options>...)
+$ oas_contrib merge <input_dir> <OAS file> (<options>...)
 ```
 
-`<output_file>` must be `.json` or `.yml`
+`<OAS file>` must be `.json` or `.yml`
 
 #### Options
 

data/lib/oas_contrib/command.rb

@@ -1,55 +1,38 @@
 require 'thor'
-require 'oas_contrib/command_resolvers/divide_command_resolver'
-require 'oas_contrib/command_resolvers/merge_command_resolver'
+require 'oas_contrib/resolver/divide'
+require 'oas_contrib/resolver/merge'
+require 'oas_contrib/resolver/preview'
 
 module OasContrib
   # Commands
   class Command < Thor
     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.'
-
     # 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 [Integer]
     def divide(in_file, out_dir)
-      resolver = CommandResolvers::DivideCommandResolver.new(in_file, out_dir, options['out_type'])
-      resolver.load
-      resolver.resolve
-      resolver.dist
-      exit(0)
+      Resolver::Divide.new(in_file, out_dir, options['out_type']).run
     end
 
     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.'
-
     # Command (Merge multiple divided files into an OAS file)
     # @param [String] in_dir input directory path
     # @param [String] out_file output file path
     # @return [Integer]
     def merge(in_dir, out_file)
-      resolver = CommandResolvers::MergeCommandResolver.new(in_dir, out_file, options['in_type'])
-      resolver.load
-      resolver.resolve
-      resolver.dist
-      exit(0)
+      Resolver::Merge.new(in_dir, out_file, options['in_type']).run
     end
 
     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 [Integer]
     def preview(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"
-      exit(0)
+      Resolver::Preview.new(in_file, options['port']).run
     end
   end
 end

data/lib/oas_contrib/{swagger → openapi}/v2/spec.rb

@@ -1,6 +1,6 @@
 module OasContrib
-  # Swagger module
-  module Swagger
+  # OpenAPI module
+  module OpenAPI
     # Version 2 module
     module V2
       # Spec

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

@@ -1,5 +1,5 @@
 module OasContrib
-  # Open API definition module
+  # OpenAPI
   module OpenAPI
     # Version 3 module
     module V3

data/lib/oas_contrib/resolver/base.rb

@@ -0,0 +1,161 @@
+require 'oas_contrib/openapi/v2/spec'
+require 'oas_contrib/openapi/v3/spec'
+require 'yaml'
+require 'json'
+
+module OasContrib
+  module Resolver
+    # CommandResolver Base
+    class Base
+      # 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
+
+      # Run
+      # @raise [NotImplementedError]
+      # @return [nil]
+      def run
+        raise NotImplementedError, 'This class must be implemented "run" method.'
+      end
+
+      # Load
+      # @raise [NotImplementedError]
+      # @return [nil]
+      def load
+        raise NotImplementedError, 'This class must be implemented "load" method.'
+      end
+
+      # Distribute
+      # @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::OpenAPI::V2::Spec.new(@load_data) if has_v2_meta?
+        return @spec = OasContrib::OpenAPI::V3::Spec.new(@load_data) if has_v3_meta?
+        raise 'Undefined OAS file.'
+      end
+
+      # <Description>
+      # @return [<Type>] <description>
+      def has_v3_meta?
+        @load_data['openapi'] =~ /^3/
+      end
+
+      # <Description>
+      # @return [<Type>] <description>
+      def has_v2_meta?
+        @load_data['swagger'] =~ /^2/
+      end
+
+      # Check the type of OpenAPI v3 definition or not
+      # @return [Boolean]
+      def v3_spec?
+        @spec.is_a?(OasContrib::OpenAPI::V3::Spec)
+      end
+
+      # Check the type of OpenAPI v2 definition or not
+      # @return [Boolean]
+      def v2_spec?
+        @spec.is_a?(OasContrib::OpenAPI::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
+end

data/lib/oas_contrib/{command_resolvers/divide_command_resolver.rb → resolver/divide.rb}

@@ -1,10 +1,10 @@
-require 'oas_contrib/command_resolver_base'
+require 'oas_contrib/resolver/base'
 
 module OasContrib
   # Command Resolvers
-  module CommandResolvers
+  module Resolver
     # Divide command resolver
-    class DivideCommandResolver < CommandResolverBase
+    class Divide < Resolver::Base
       # Initialize
       # @param [String] input_file_path input file path
       # @param [String] output_dir_path output directory path
@@ -16,6 +16,14 @@ module OasContrib
         super(output_dir_path)
       end
 
+      # Run
+      # @return [nil]
+      def run
+        load
+        resolve
+        dist
+      end
+
       # Load the OAS file
       # @return [Hash] loaded data
       def load

data/lib/oas_contrib/{command_resolvers/merge_command_resolver.rb → resolver/merge.rb}

@@ -1,10 +1,10 @@
-require 'oas_contrib/command_resolver_base'
+require 'oas_contrib/resolver/base'
 
 module OasContrib
   # Command Resolvers
-  module CommandResolvers
+  module Resolver
     # Merge command resolver
-    class MergeCommandResolver < CommandResolverBase
+    class Merge < Resolver::Base
       # Initialize
       # @param [String] input_dir_path input directory path
       # @param [String] output_file_path output file path
@@ -16,6 +16,14 @@ module OasContrib
         super(input_dir_path)
       end
 
+      # Run
+      # @return [nil]
+      def run
+        load
+        resolve
+        dist
+      end
+
       # Load divided files
       # @return [Hash] load and merged data
       def load
@@ -49,10 +57,11 @@ module OasContrib
       # @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?
+        if v3_spec?
           @load_data['components'] = {}
           @load_data['components']['schemas'] = input_dir(path)
+        elsif v2_spec?
+          @load_data['definitions'] = input_dir(path)
         end
       end
     end

data/lib/oas_contrib/resolver/preview.rb

@@ -0,0 +1,42 @@
+require 'oas_contrib/resolver/base'
+
+module OasContrib
+  # Command Resolvers
+  module Resolver
+    # Preview command resolver
+    class Preview < Resolver::Base
+      # Initialize
+      # @param [String] input_file_path input file path
+      # @param [String] input_file_type input file type (json or yaml)
+      def initialize(input_file_path, port)
+        @input_file_path = input_file_path
+        @port = port
+      end
+
+      # Run
+      # @return [nil]
+      def run
+        load
+        dist
+      end
+
+      # Load
+      # @return [nil]
+      def load
+        @expand_path = File.expand_path(@input_file_path)
+        @basename = File.basename(@expand_path)
+        nil
+      end
+
+      # Distribute
+      # @return [nil]
+      def dist
+        puts "SwaggerUI listen: http://localhost:#{@port} with: #{@expand_path}"
+        `docker run --rm --name oas_contrib_preview_swagger_ui \
+        -p #{@port}:8080 -e API_URL=#{@basename} \
+        -v #{@expand_path}:/usr/share/nginx/html/#{@basename} swaggerapi/swagger-ui`
+        raise 'Preview command needs docker.' unless $?.exitstatus.zero?
+      end
+    end
+  end
+end

data/lib/oas_contrib/version.rb

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

data/oas_contrib.gemspec

@@ -7,19 +7,16 @@ Gem::Specification.new do |spec|
   spec.version       = OasContrib::VERSION
   spec.authors       = ['Michinao Shimizu']
   spec.email         = ['shimizu.michinao@gmail.com']
-
-  spec.summary       = 'Open API Specification related commands and libraries.'
-  spec.description   = 'Open API Specification related commands and libraries.'
+  spec.summary       = 'Libraries and Commands for Open API (2.0, 3.0) Specification.'
+  spec.description   = 'Libraries and Commands for Open API (2.0, 3.0) Specification.'
   spec.homepage      = 'https://github.com/MichinaoShimizu/oas_contrib'
   spec.license       = 'MIT'
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
   spec.add_dependency 'thor', '~> 0.20'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_contrib
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michinao Shimizu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Open API Specification related commands and libraries.
+description: Libraries and Commands for Open API (2.0, 3.0) Specification.
 email:
 - shimizu.michinao@gmail.com
 executables:
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec_status"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -82,37 +83,38 @@ 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
+- example/dist/v2/meta/001_swagger.yml
+- example/dist/v2/meta/002_info.yml
+- example/dist/v2/meta/003_host.yml
+- example/dist/v2/meta/004_basePath.yml
+- example/dist/v2/meta/005_schemes.yml
+- example/dist/v2/meta/006_consumes.yml
+- example/dist/v2/meta/007_produces.yml
+- example/dist/v2/meta/008_components.yml
+- example/dist/v2/model/001_Pet.yml
+- example/dist/v2/model/002_Error.yml
+- example/dist/v2/model/003_Pets.yml
+- example/dist/v2/path/001_pets.yml
+- example/dist/v2/path/002_pets_{petId}.yml
+- example/dist/v3/meta/001_openapi.yml
+- example/dist/v3/meta/002_info.yml
+- example/dist/v3/meta/003_servers.yml
+- example/dist/v3/model/001_Pet.yml
+- example/dist/v3/model/002_Error.yml
+- example/dist/v3/model/003_Pets.yml
+- example/dist/v3/path/001_pets.yml
+- example/dist/v3/path/002_pets_{petId}.yml
+- example/v2.yml
+- example/v3.yml
 - exe/oas_contrib
 - lib/oas_contrib.rb
 - lib/oas_contrib/command.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/v2/spec.rb
 - lib/oas_contrib/openapi/v3/spec.rb
-- lib/oas_contrib/swagger/v2/spec.rb
+- lib/oas_contrib/resolver/base.rb
+- lib/oas_contrib/resolver/divide.rb
+- lib/oas_contrib/resolver/merge.rb
+- lib/oas_contrib/resolver/preview.rb
 - lib/oas_contrib/version.rb
 - oas_contrib.gemspec
 homepage: https://github.com/MichinaoShimizu/oas_contrib
@@ -138,5 +140,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Open API Specification related commands and libraries.
+summary: Libraries and Commands for Open API (2.0, 3.0) Specification.
 test_files: []

data/lib/oas_contrib/command_resolver_base.rb

@@ -1,140 +0,0 @@
-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