r2-oas 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ff37fb9f530ea30d7a06154dd6036ae63fdbd1358cab2d38bad3b2fd6334fc
-  data.tar.gz: 99f6574107d260c8961d645c1dfbc29b19143b19d5a903554e4576be39280f9f
+  metadata.gz: 7a8548f2c821fe7b76548b748dbe733ce0f11386d76ae046cc047b0fe0eb017b
+  data.tar.gz: ee6ebb9740a854142b929195a57206cf8cedfeb1f965e4217e048152effc03a0
 SHA512:
-  metadata.gz: 964aefff2e439e5d0eab907fc0c1301826dd81bdefa23f07d8ec822b054a4eb31c689b8e927e0ed28b4c790a26013c8d14d65d5706205fec5a02207fee661ec3
-  data.tar.gz: 484e127af388c3b633a5a7683f8493fa95fa2d1a6ef4981d227e37ce2676d7022170c18d708eb6ecb23eacfa9c48ac39865fe9e746e7d6fd94073e224c673047
+  metadata.gz: fcdf6903f652e7109c137b05123d6d244aaec02e9bb2a1fd657bc710ae549c6d84bd887c281a2f881e070d757299f17334200273bb2b3f9e6b988d16578a246b
+  data.tar.gz: 129cfd622a8bd4c5b55bd5415cb24f24d0b918ea7cd9781aec7127b41640c3fe116b5f7e4dfe20add9ec68993d075471d172bd4919fda957893dc8b747c48ce2

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-# Change Log
+# CHANGELOG
+
+## v0.5.0
+
+2020-01-29
+
+- [`Breaking`] Remove `use_object_classes` option ([#171](https://github.com/yukihirop/r2-oas/pull/171))
+- [`Feature`] Upgrade init command ([#176](https://github.com/yukihirop/r2-oas/pull/176))
+- [`EOL`] EOL Ruby `2.3` and Support over Ruby `2.5.0` ([#170](https://github.com/yukihirop/r2-oas/pull/170))
+
+Please see mileston [v0.5.0](https://github.com/yukihirop/r2-oas/milestone/5?closed=1)
 
 ## v0.4.1
 

data/README.ja.md

@@ -50,8 +50,17 @@ $ brew cask install chromedriver
 gemをrequire後、以下のrakeタスクを実行するだけです。
 
 ```bash
-bundle exec routes:oas:docs
-bundle exec routes:oas:editor
+$ bundle exec rake routes:oas:init
+      create	oas_docs
+      create	oas_docs/.paths
+      create	oas_docs/plugins/helpers
+      create	oas_docs/tasks/helpers
+      create	oas_docs/plugins/.gitkeep
+      create	oas_docs/plugins/helpers/.gitkeep
+      create	oas_docs/tasks/.gitkeep
+      create	oas_docs/tasks/helpers/.gitkeep
+$ bundle exec rake routes:oas:docs
+$ bundle exec rake routes:oas:editor
 ```
 
 #### Generate docs
@@ -79,6 +88,14 @@ railsプロジェクトのルートディレクトリで以下のコマンドが
 
 ```bash
 $ bundle exec rake routes:oas:init
+      create	oas_docs
+      create	oas_docs/.paths
+      create	oas_docs/plugins/helpers
+      create	oas_docs/tasks/helpers
+      create	oas_docs/plugins/.gitkeep
+      create	oas_docs/plugins/helpers/.gitkeep
+      create	oas_docs/tasks/.gitkeep
+      create	oas_docs/tasks/helpers/.gitkeep
 ```
 
 ### Generate
@@ -141,7 +158,7 @@ $ OAS_FILE="~/Desktop/swagger.yml" bundle exec rake routes:oas:analyze
 
 ## ❤️ Support Ruby Version
 
-- Ruby (>= 2.3.3p222 (2016-11-21 revision 56859) [x86_64-darwin18])
+- Ruby (>= 2.5.0)
 
 ## ❤️ Support Rouging
 
@@ -185,8 +202,6 @@ OpenAPIの3.0.0をサポートしてます。
 .
 .
 ===== Bundle install for All Support Ruby Result =====
-ruby-2.3.3: 0
-ruby-2.4.2: 0
 ruby-2.5.8: 0
 ruby-2.6.6: 0
 ruby-2.7.1: 0
@@ -214,8 +229,6 @@ ruby-2.7.1: 0
 .
 .
 ===== Rspec for All Support Ruby Result =====
-ruby-2.3.3: 0
-ruby-2.4.2: 0
 ruby-2.5.8: 0
 ruby-2.6.6: 0
 ruby-2.7.1: 0

data/README.md

@@ -64,8 +64,17 @@ R2OAS.load_tasks
 ```
 
 ```bash
-bundle exec routes:oas:docs
-bundle exec routes:oas:editor
+$ bundle exec rake routes:oas:init
+      create	oas_docs
+      create	oas_docs/.paths
+      create	oas_docs/plugins/helpers
+      create	oas_docs/tasks/helpers
+      create	oas_docs/plugins/.gitkeep
+      create	oas_docs/plugins/helpers/.gitkeep
+      create	oas_docs/tasks/.gitkeep
+      create	oas_docs/tasks/helpers/.gitkeep
+$ bundle exec rake routes:oas:docs
+$ bundle exec rake routes:oas:editor
 ```
 
 #### Generate docs
@@ -90,6 +99,14 @@ Initialize r2-oas.
 
 ```bash
 $ bundle exec rake routes:oas:init
+      create	oas_docs
+      create	oas_docs/.paths
+      create	oas_docs/plugins/helpers
+      create	oas_docs/tasks/helpers
+      create	oas_docs/plugins/.gitkeep
+      create	oas_docs/plugins/helpers/.gitkeep
+      create	oas_docs/tasks/.gitkeep
+      create	oas_docs/tasks/helpers/.gitkeep
 ```
 
 ### Generate
@@ -147,7 +164,7 @@ Full docs are available at https://yukihirop.github.io/r2-oas
 
 ## ❤️ Support Ruby Version
 
-- Ruby (>= 2.3.3p222 (2016-11-21 revision 56859) [x86_64-darwin18])
+- Ruby (>= 2.5.0)
 
 ## ❤️ Support Rouging
 
@@ -189,8 +206,6 @@ Full docs are available at https://yukihirop.github.io/r2-oas/#/setting/configur
 .
 .
 ===== Bundle install for All Support Ruby Result =====
-ruby-2.3.3: 0
-ruby-2.4.2: 0
 ruby-2.5.8: 0
 ruby-2.6.6: 0
 ruby-2.7.1: 0
@@ -218,8 +233,6 @@ ruby-2.7.1: 0
 .
 .
 ===== Rspec for All Support Ruby Result =====
-ruby-2.3.3: 0
-ruby-2.4.2: 0
 ruby-2.5.8: 0
 ruby-2.6.6: 0
 ruby-2.7.1: 0

data/lib/r2-oas/configuration.rb

@@ -3,17 +3,17 @@
 require 'fileutils'
 
 require_relative 'app_configuration'
-require_relative 'pluggable_configuration'
 require_relative 'configuration/paths_config'
 require_relative 'logger/stdout_logger'
 require_relative 'support/deprecation'
+require_relative 'helpers/file_helper'
 
 module R2OAS
   module Configuration
     extend AppConfiguration
-    extend PluggableConfiguration
+    include Helpers::FileHelper
 
-    PUBLIC_VALID_OPTIONS_KEYS = AppConfiguration::VALID_OPTIONS_KEYS + PluggableConfiguration::VALID_OPTIONS_KEYS
+    PUBLIC_VALID_OPTIONS_KEYS = AppConfiguration::VALID_OPTIONS_KEYS
 
     UNPUBLIC_VALID_OPTIONS_KEYS = %i[
       paths_config
@@ -24,18 +24,8 @@ module R2OAS
 
     attr_accessor *PUBLIC_VALID_OPTIONS_KEYS
 
-    # MEMO: override because deprecated
-    def use_object_classes=(data)
-      ::R2OAS::Deprecation.will_remove(<<-MSG.squish)
-        Using a R2OAS.use_object_classes= in configuration is deprecated and
-        will be removed in r2-oas (v0.4.2).
-      MSG
-      @use_object_classes = data
-    end
-
     def self.extended(base)
       base.send :set_default_for_configuration, base
-      base.send :set_default_for_pluggable, base
     end
 
     def configure
@@ -63,17 +53,14 @@ module R2OAS
       end
     end
 
-    def pluggable_configuration_options
-      PluggableConfiguration::VALID_OPTIONS_KEYS.inject({}) do |option, key|
-        option.merge!(key => send(key))
-      end
-    end
-
     def load_tasks
       load_local_tasks
     end
 
     def init
+      old_stdout = $stdout
+      $stdout = StringIO.new
+
       plugins_path = File.expand_path("#{root_dir_path}/#{local_plugins_dir_name}")
       plugins_helpers_path = "#{plugins_path}/helpers"
       tasks_path = File.expand_path("#{root_dir_path}/#{local_tasks_dir_name}")
@@ -84,14 +71,21 @@ module R2OAS
       gitkeep_tasks_path = "#{tasks_path}/.gitkeep"
       gitkeep_tasks_helpers_path = "#{tasks_helpers_path}/.gitkeep"
 
-      FileUtils.mkdir_p(plugins_helpers_path) unless FileTest.exists?(plugins_helpers_path)
-      FileUtils.mkdir_p(tasks_helpers_path) unless FileTest.exists?(tasks_helpers_path)
+      paths_config.create_dot_paths(false)
+      mkdir_p_dir_or_skip(plugins_helpers_path)
+      mkdir_p_dir_or_skip(tasks_helpers_path)
+      write_file_or_skip(gitkeep_plugins_path, '')
+      write_file_or_skip(gitkeep_plugins_helpers_path, '')
+      write_file_or_skip(gitkeep_tasks_path, '')
+      write_file_or_skip(gitkeep_tasks_helpers_path, '')
+
+      if $stdout.string.present?
+        STDOUT.puts $stdout.string
+      else
+        STDOUT.puts "Already Initialized existing oas_docs in #{root_dir_path}"
+      end
 
-      File.write(gitkeep_plugins_path, '') unless FileTest.exists?(gitkeep_plugins_path)
-      File.write(gitkeep_plugins_helpers_path, '') unless FileTest.exists?(gitkeep_plugins_helpers_path)
-      File.write(gitkeep_tasks_path, '') unless FileTest.exists?(gitkeep_tasks_path)
-      File.write(gitkeep_tasks_helpers_path, '') unless FileTest.exists?(gitkeep_tasks_helpers_path)
-      paths_config.create_dot_paths
+      $stdout = old_stdout
     end
 
     def output_dir_path
@@ -117,9 +111,5 @@ module R2OAS
     def set_default_for_configuration(target)
       AppConfiguration.set_default(target)
     end
-
-    def set_default_for_pluggable(target)
-      PluggableConfiguration.set_default(target)
-    end
   end
 end

data/lib/r2-oas/configuration/paths_config.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require 'r2-oas/schema/manager/file/path_item_file_manager'
+require 'r2-oas/helpers/file_helper'
 
 module R2OAS
   module Configuration
     class PathsConfig
+      include Helpers::FileHelper
+
       def initialize(root_dir_path, schema_save_dir_name)
         @root_dir_path = root_dir_path
         @schema_save_dir_path = "#{root_dir_path}/#{schema_save_dir_name}"
@@ -25,11 +28,11 @@ module R2OAS
         end.uniq.compact.reject(&:empty?)
       end
 
-      def create_dot_paths
+      def create_dot_paths(silent = true)
         abs_root_path = File.expand_path(@root_dir_path)
 
-        FileUtils.mkdir_p(abs_root_path) unless FileTest.exists?(abs_root_path)
-        File.write(abs_paths_path, '') unless FileTest.exists?(abs_paths_path)
+        mkdir_p_dir_or_skip(abs_root_path, silent)
+        write_file_or_skip(abs_paths_path, '', silent)
       end
 
       def many_components_file_paths

data/lib/r2-oas/helpers/file_helper.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+# https :/ / keyesberry.hatenadiary.org / entry / 20101107 / p1
+#
+# Text attributes
+# 0	All attributes off
+# 1	Bold on
+# 4	Underscore (on monochrome display adapter only)
+# 5	Blink on
+# 7	Reverse video on
+# 8	Concealed on
+
+# Foreground colors
+# 30	Black
+# 31	Red
+# 32	Green
+# 33	Yellow
+# 34	Blue
+# 35	Magenta
+# 36	Cyan
+# 37	White
+
+# Background colors
+# 40	Black
+# 41	Red
+# 42	Green
+# 43	Yellow
+# 44	Blue
+# 45	Magenta
+# 46	Cyan
+# 47	White
+module R2OAS
+  module Helpers
+    module FileHelper
+      def write_file_or_skip(file_path, data, silent = false)
+        unless FileTest.exists?(file_path)
+          File.write(file_path, data)
+          puts "#{space}#{bold('create')}\t#{relative(file_path)}" unless silent
+        end
+      end
+
+      def mkdir_p_dir_or_skip(dir_path, silent = false)
+        unless FileTest.exists?(dir_path)
+          FileUtils.mkdir_p(dir_path)
+          puts "#{space}#{bold('create')}\t#{relative(dir_path)}" unless silent
+        end
+      end
+
+      private
+
+      def relative(path)
+        current_dir_pathname = Pathname.new(Dir.pwd)
+        target_path = Pathname.new(path)
+        target_path.relative_path_from(current_dir_pathname)
+      end
+
+      def bold(str)
+        "\e[1m#{str}\e[0m"
+      end
+
+      def space
+        '      '
+      end
+    end
+  end
+end

data/lib/r2-oas/plugin/hookable.rb

@@ -5,6 +5,11 @@ require 'r2-oas/hooks/hook'
 module R2OAS
   module Plugin
     module Hookable
+      def self.extended(base)
+        super
+        base.class_variable_set(:@@hook_klass, ::R2OAS::Hooks::Hook.register(:plugin, base))
+      end
+
       def hooks_map
         hook_klass.repository[:plugin]
       end
@@ -14,11 +19,11 @@ module R2OAS
       end
 
       def hook_klass=(klass)
-        @@hook_klass = klass
+        class_variable_set(:@@hook_klass, klass)
       end
 
       def hook_klass
-        @@hook_klass
+        class_variable_get(:@@hook_klass)
       end
 
       def on(on, callback, once = false)

data/lib/r2-oas/public.rb

@@ -1,5 +1,3 @@
 # frozen_string_literal: true
 
 require 'r2-oas/configuration'
-require 'r2-oas/errors'
-require 'r2-oas/schema/v3/object/from_routes/public'

data/lib/r2-oas/schema/editor.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal:true
 
 require 'docker'
-require 'eventmachine'
+require 'em/pure_ruby'
 require 'watir'
 require 'tempfile'
 require 'fileutils'

data/lib/r2-oas/schema/monitor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal:true
 
-require 'eventmachine'
+require 'em/pure_ruby'
 
 # Scope Rails
 module R2OAS

data/lib/r2-oas/schema/ui.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal:true
 
 require 'docker'
-require 'eventmachine'
+require 'em/pure_ruby'
 require 'watir'
 require 'forwardable'
 

data/lib/r2-oas/schema/v3/object/from_routes/base_object.rb

@@ -16,40 +16,16 @@ module R2OAS
             send("#{key}=", app_configuration_options[key])
           end
 
-          PluggableConfiguration::VALID_OPTIONS_KEYS.each do |key|
-            instance_variable_set(:"@#{key}", pluggable_configuration_options[key])
-          end
-
           @opts = opts
           @plugin_executor = ::R2OAS::Plugin::Executor.new(@plugins, opts)
         end
 
-        def info_object_class
-          @use_object_classes[:info_object]
-        end
-
-        def paths_object_class
-          @use_object_classes[:paths_object]
-        end
-
-        def path_item_object_class
-          @use_object_classes[:path_item_object]
-        end
-
-        def external_document_object_class
-          @use_object_classes[:external_document_object]
-        end
-
-        def components_object_class
-          @use_object_classes[:components_object]
+        def doc
+          @doc ||= {}
         end
 
-        def components_schema_object_class
-          @use_object_classes[:components_schema_object]
-        end
-
-        def components_request_body_object_class
-          @use_object_classes[:components_request_body_object]
+        def to_doc
+          raise 'Implement Inherit Class'
         end
 
         private
@@ -58,17 +34,7 @@ module R2OAS
           R2OAS.app_configuration_options
         end
 
-        def pluggable_configuration_options
-          R2OAS.pluggable_configuration_options
-        end
-
-        # Can not define attr_accessor for PluggableConfiguration::VALID_OPTIONS_KEYS.
-        # Because, PuggableConfiguration module is not loaded when this class is loaded.
         attr_accessor *AppConfiguration::VALID_OPTIONS_KEYS
-
-        def to_doc
-          raise 'Implement Inherit Class'
-        end
       end
     end
   end

data/lib/r2-oas/schema/v3/object/from_routes/components/request_body_object.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
+require 'r2-oas/schema/v3/object/from_routes/base_object'
 require 'r2-oas/schema/v3/manager/file/components_file_manager'
+require_relative 'schema_object'
 
 module R2OAS
   module Schema
     module V3
       module Components
-        class RequestBodyObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+        class RequestBodyObject < R2OAS::Schema::V3::BaseObject
           def initialize(route_data, path, opts = {})
             super(opts)
             @path_comp   = Routing::PathComponent.new(path)
@@ -23,10 +24,9 @@ module R2OAS
           end
 
           def to_doc
-            execute_before_create(@schema_name)
             create_doc do
               child_file_manager = ComponentsFileManager.new("#/components/schemas/#{_components_schema_name}", :ref)
-              schema_object = components_schema_object_class.new(@route_data, @path, @opts)
+              schema_object = Components::SchemaObject.new(@route_data, @path, @opts)
 
               unless child_file_manager.skip_save?
                 result = {
@@ -45,22 +45,9 @@ module R2OAS
                 )
               end
             end
-            execute_after_create(@schema_name)
             doc
           end
 
-          # MEMO:
-          # please override in inherited class.
-          def components_schema_name(_doc, _path_component, _tag_name, _verb, schema_name)
-            schema_name
-          end
-
-          # MEMO:
-          # please override in inherited class.
-          def components_request_body_name(_doc, _path_component, _tag_name, _verb, schema_name)
-            schema_name
-          end
-
           def generate?
             file_manager = ComponentsFileManager.new("#/components/schemas/#{_components_schema_name}", :ref)
             (@verb.in? http_methods_when_generate_request_body) && !file_manager.skip_save?
@@ -83,11 +70,11 @@ module R2OAS
           end
 
           def _components_schema_name
-            components_schema_name(doc, @path_comp, @tag_name, @verb, @schema_name)
+            @schema_name
           end
 
           def _components_request_body_name
-            components_request_body_name(doc, @path_comp, @tag_name, @verb, @schema_name)
+            @schema_name
           end
         end
       end

data/lib/r2-oas/schema/v3/object/from_routes/components/schema_object.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
+require 'r2-oas/schema/v3/object/from_routes/base_object'
 
 module R2OAS
   module Schema
     module V3
       module Components
-        class SchemaObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+        class SchemaObject < R2OAS::Schema::V3::BaseObject
           def initialize(route_data, path, opts = {})
             super(opts)
             @path_comp    = Routing::PathComponent.new(path)
@@ -22,18 +22,10 @@ module R2OAS
           end
 
           def to_doc
-            execute_before_create(@schema_name)
             create_doc
-            execute_after_create(@schema_name)
             doc
           end
 
-          # MEMO:
-          # please override in inherited class.
-          def components_schema_name(_doc, _path_component, _tag_name, _verb, _http_status, schema_name)
-            schema_name
-          end
-
           private
 
           def create_doc
@@ -49,8 +41,8 @@ module R2OAS
             doc.merge!(result)
           end
 
-          def _components_schema_name(http_status)
-            components_schema_name(doc, @path_comp, @tag_name, @verb, http_status, @schema_name)
+          def _components_schema_name(_http_status)
+            @schema_name
           end
         end
       end

data/lib/r2-oas/schema/v3/object/from_routes/components_object.rb

@@ -1,18 +1,24 @@
 # frozen_string_literal: true
 
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
+require_relative 'base_object'
 require_relative 'components/schema_object'
 require_relative 'components/request_body_object'
+require_relative 'path_item_object'
 
 module R2OAS
   module Schema
     module V3
-      class ComponentsObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+      class ComponentsObject < BaseObject
         def initialize(routes_data, opts = {})
           super(opts)
           @routes_data = routes_data
         end
 
+        def to_doc
+          create_doc
+          doc
+        end
+
         def create_doc
           create_doc_for_components_schemas!
           create_doc_for_components_request_bodies!
@@ -24,14 +30,14 @@ module R2OAS
           result = components_schema_docs.each_with_object({}) do |(schema_name, components_schema_doc), docs|
             docs[schema_name] = components_schema_doc
           end
-          doc.merge!('schemas' => result)
+          doc.merge!({ 'schemas' => result })
         end
 
         def create_doc_for_components_request_bodies!
           result = components_request_body_docs.each_with_object({}) do |(schema_name, components_request_body_doc), docs|
             docs[schema_name] = components_request_body_doc
           end
-          doc.merge!('requestBodies' => result)
+          doc.merge!({ 'requestBodies' => result })
         end
 
         # e.x.)
@@ -43,9 +49,9 @@ module R2OAS
             path = route_el[:path]
             route_data = route_el[:data]
 
-            path_item_object = path_item_object_class.new(route_data, path, @opts)
+            path_item_object = PathItemObject.new(route_data, path, @opts)
             path_item_object.http_statuses.each do |http_status|
-              components_schema_object = components_schema_object_class.new(route_data, path, @opts)
+              components_schema_object = Components::SchemaObject.new(route_data, path, @opts)
               components_schema_doc = components_schema_object.to_doc
               schema_name = components_schema_object.send(:_components_schema_name, http_status)
 
@@ -63,7 +69,7 @@ module R2OAS
             path = route_el[:path]
             route_data = route_el[:data]
 
-            components_request_body_object = components_request_body_object_class.new(route_data, path, @opts)
+            components_request_body_object = Components::RequestBodyObject.new(route_data, path, @opts)
             next unless components_request_body_object.generate?
 
             components_request_body_doc = components_request_body_object.to_doc

data/lib/r2-oas/schema/v3/object/from_routes/external_document_object.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
+require_relative 'base_object'
 
 module R2OAS
   module Schema
     module V3
-      class ExternalDocumentObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+      class ExternalDocumentObject < BaseObject
         def to_doc
-          execute_before_create
           create_doc
-          execute_after_create
           doc
         end
 

data/lib/r2-oas/schema/v3/object/from_routes/info_object.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
+require_relative 'base_object'
 
 module R2OAS
   module Schema
     module V3
-      class InfoObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+      class InfoObject < BaseObject
         def to_doc
-          execute_before_create
           create_doc
-          execute_after_create
           doc
         end
 

data/lib/r2-oas/schema/v3/object/from_routes/openapi_object.rb

@@ -3,6 +3,10 @@
 require_relative 'base_object'
 require_relative 'tag_object'
 require_relative 'server_object'
+require_relative 'info_object'
+require_relative 'external_document_object'
+require_relative 'components_object'
+require_relative 'paths_object'
 
 module R2OAS
   module Schema
@@ -25,13 +29,13 @@ module R2OAS
             'servers' => servers_doc,
             'components' => components_doc
           }
-          result
+          doc.merge!(result)
         end
 
         private
 
         def info_doc
-          info_object_class.new(@opts).to_doc
+          InfoObject.new(@opts).to_doc
         end
 
         def tags_doc
@@ -39,11 +43,11 @@ module R2OAS
         end
 
         def paths_doc
-          paths_object_class.new(@routes_data, @opts).to_doc
+          PathsObject.new(@routes_data, @opts).to_doc
         end
 
         def external_docs_doc
-          external_document_object_class.new(@opts).to_doc
+          ExternalDocumentObject.new(@opts).to_doc
         end
 
         def servers_doc
@@ -51,7 +55,7 @@ module R2OAS
         end
 
         def components_doc
-          components_object_class.new(@routes_data, @opts).to_doc
+          ComponentsObject.new(@routes_data, @opts).to_doc
         end
       end
     end

data/lib/r2-oas/schema/v3/object/from_routes/path_item_object.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require 'forwardable'
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
 require 'r2-oas/routing/components/path_component'
+require_relative 'base_object'
+require_relative 'components/schema_object'
+require_relative 'components/request_body_object'
 
 module R2OAS
   module Schema
     module V3
-      class PathItemObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+      class PathItemObject < BaseObject
         extend Forwardable
         # reference
         # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#path-item-object
@@ -27,15 +29,13 @@ module R2OAS
           @required_parameters            = route_data[:required_parameters]
           @format_name                    = create_format_name
           @http_status_manager            = HttpStatusManager.new(@path, @verb, http_statuses_when_http_method)
-          @components_schema_object       = components_schema_object_class.new(route_data, path, opts)
-          @components_request_body_object = components_request_body_object_class.new(route_data, path, opts)
+          @components_schema_object       = Components::SchemaObject.new(route_data, path, opts)
+          @components_request_body_object = Components::RequestBodyObject.new(route_data, path, opts)
           support_field_name? if route_data.key?(:verb)
         end
 
         def to_doc
-          execute_before_create(@path)
           create_doc
-          execute_after_create(@path)
           doc
         end
 

data/lib/r2-oas/schema/v3/object/from_routes/paths_object.rb

@@ -1,23 +1,28 @@
 # frozen_string_literal: true
 
-require 'r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object'
 require 'r2-oas/routing/components/path_component'
+require_relative 'base_object'
+require_relative 'path_item_object'
 
 module R2OAS
   module Schema
     module V3
-      class PathsObject < R2OAS::Dynamic::Schema::V3::HookableBaseObject
+      class PathsObject < BaseObject
         def initialize(routes_data, opts = {})
           super(opts)
           @routes_data = routes_data
-          define_hookable_tmp_object_class
+        end
+
+        def to_doc
+          create_doc
+          doc
         end
 
         def create_doc
           if unit_paths_file_path.present?
             unit_paths_data = YAML.load_file(unit_paths_file_path)['paths']
             result = unit_paths_data.each_with_object({}) do |(path, path_item_doc), docs|
-              docs[path] = HookableTmpObjectClass.new(path_item_doc, path, @opts).to_doc
+              docs[path] = PathItemObject.new(path_item_doc, path, @opts).to_doc
             end
           else
             result = path_item_docs.each_with_object({}) do |(path, path_item_doc), docs|
@@ -29,31 +34,6 @@ module R2OAS
 
         private
 
-        def define_hookable_tmp_object_class
-          klass = Class.new(path_item_object_class) do |_c|
-            def initialize(data, path, opts = {})
-              super(opts)
-              @data = data
-              @path = path
-              @path_comp = Routing::PathComponent.new(path)
-              use_superclass_hook
-            end
-
-            def create_doc
-              doc.merge!(@data)
-            end
-
-            def to_doc
-              execute_before_create(@path)
-              create_doc
-              execute_after_create(@path)
-              execute_transform_plugins(:path_item, doc, @path_comp)
-              doc
-            end
-          end
-          Object.const_set(:HookableTmpObjectClass, klass) unless defined?(HookableTmpObjectClass)
-        end
-
         def path_item_docs
           # e.x.)
           # [
@@ -63,7 +43,7 @@ module R2OAS
             path = route_el[:path]
             route_data = route_el[:data]
 
-            path_item_doc = path_item_object_class.new(route_data, path, @opts).to_doc
+            path_item_doc = PathItemObject.new(route_data, path, @opts).to_doc
             if data[path].present?
               data[path].merge!(path_item_doc)
             else

data/lib/r2-oas/tasks/main.rake

@@ -10,9 +10,8 @@ load File.expand_path('common.rake', __dir__)
 namespace :routes do
   namespace :oas do
     desc '[R2-OAS] Initialize'
-    task init: [:common] do
+    task :init do
       R2OAS.init
-      puts '[R2-OAS] Initialized!'
     end
 
     desc '[R2-OAS] Generate OAS documentation files'

data/lib/r2-oas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module R2OAS
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/r2-oas.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.3p222')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.add_runtime_dependency 'docker-api', '>= 1.34.2'
   spec.add_runtime_dependency 'easy_diff', '>= 1.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2-oas
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - yukihirop
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -240,8 +240,8 @@ files:
 - lib/r2-oas/configuration/paths_config.rb
 - lib/r2-oas/deploy/client.rb
 - lib/r2-oas/deploy/swagger-ui/index.html.erb
-- lib/r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object.rb
 - lib/r2-oas/errors.rb
+- lib/r2-oas/helpers/file_helper.rb
 - lib/r2-oas/hooks/global_hook.rb
 - lib/r2-oas/hooks/hook.rb
 - lib/r2-oas/hooks/repository.rb
@@ -251,7 +251,6 @@ files:
 - lib/r2-oas/lib/core_ext/string/filters.rb
 - lib/r2-oas/lib/three-way-merge/twm.rb
 - lib/r2-oas/logger/stdout_logger.rb
-- lib/r2-oas/pluggable_configuration.rb
 - lib/r2-oas/plugin/base.rb
 - lib/r2-oas/plugin/executor.rb
 - lib/r2-oas/plugin/hookable.rb
@@ -323,6 +322,7 @@ files:
 - lib/r2-oas/schema/v3/object/from_files/utils/all.rb
 - lib/r2-oas/schema/v3/object/from_files/utils/deep_methods.rb
 - lib/r2-oas/schema/v3/object/from_files/utils/refs.rb
+- lib/r2-oas/schema/v3/object/from_routes/all.rb
 - lib/r2-oas/schema/v3/object/from_routes/base_object.rb
 - lib/r2-oas/schema/v3/object/from_routes/components/request_body_object.rb
 - lib/r2-oas/schema/v3/object/from_routes/components/schema_object.rb
@@ -332,7 +332,6 @@ files:
 - lib/r2-oas/schema/v3/object/from_routes/openapi_object.rb
 - lib/r2-oas/schema/v3/object/from_routes/path_item_object.rb
 - lib/r2-oas/schema/v3/object/from_routes/paths_object.rb
-- lib/r2-oas/schema/v3/object/from_routes/public.rb
 - lib/r2-oas/schema/v3/object/from_routes/server_object.rb
 - lib/r2-oas/schema/v3/object/from_routes/tag_object.rb
 - lib/r2-oas/schema/v3/object/store.rb
@@ -359,10 +358,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/yukihirop/r2-oas/issues
-  changelog_uri: https://github.com/yukihirop/r2-oas/blob/v0.4.1/CHANGELOG.md
+  changelog_uri: https://github.com/yukihirop/r2-oas/blob/v0.5.0/CHANGELOG.md
   documentation_uri: https://yukihirop.github.io/r2-oas
-  source_code_uri: https://github.com/yukihirop/r2-oas/tree/v0.4.1
-post_install_message: 
+  source_code_uri: https://github.com/yukihirop/r2-oas/tree/v0.5.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -370,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3p222
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -378,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Provide rake tasks to management API Docment (OpenAPI)
 test_files: []

data/lib/r2-oas/dynamic/schema/v3/object/from_routes/hookable_base_object.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require 'r2-oas/schema/v3/object/from_routes/base_object'
-require 'r2-oas/hooks/hook'
-
-module R2OAS
-  module Dynamic
-    module Schema
-      module V3
-        class HookableBaseObject < R2OAS::Schema::V3::BaseObject
-          module ClassMethods
-            def before_create(&block)
-              proc = (block_given? ? block : proc {})
-              on(:before_create, proc)
-            end
-
-            def after_create(&block)
-              proc = (block_given? ? block : proc {})
-              on(:after_create, proc)
-            end
-          end
-
-          def self.inherited(base)
-            base.extend ClassMethods
-            self.hook = Hooks::Hook.register(:dynamic, base)
-          end
-
-          def self.hooks
-            superclass.hook.repository[:dynamic][self].global_hooks_data
-          end
-
-          def self.hook=(value)
-            @@hook = value
-          end
-
-          def self.hook
-            @@hook
-          end
-
-          class << self
-            def on(on, callback, once = false)
-              hook.on(on, callback, self, once)
-            end
-
-            # MEMO: Do not Use
-            def off(on, callback, once = false)
-              hook.off(on, callback, self, once)
-            end
-
-            def execute_hook(on, *data)
-              hook.execute_hook(on, *data, self)
-            end
-
-            def has_hook?(name)
-              hook.has_hook?(name, self)
-            end
-          end
-
-          attr_accessor :doc
-
-          def initialize(opts = {})
-            super(opts)
-            self.doc = {}
-          end
-
-          # MEMO: Please overwrite when passing arguments other than `doc`
-          def to_doc
-            execute_before_create
-            create_doc
-            execute_after_create
-            doc
-          end
-
-          def use_superclass_hook
-            self.class.hook.repository[:dynamic][self.class] = self.class.hook.repository[:dynamic][self.class.superclass]
-          end
-
-          private
-
-          def create_doc
-            raise NoImplementError
-          end
-
-          def execute_before_create(*data)
-            execute_hook_method(:before_create, *data)
-          end
-
-          def execute_after_create(*data)
-            execute_hook_method(:after_create, *data)
-          end
-
-          def execute_hook_method(method_name, *data)
-            args = [doc].push(*data)
-            self.class.execute_hook(method_name.to_sym, *args) if self.class.has_hook?(method_name.to_sym)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/r2-oas/pluggable_configuration.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'r2-oas/schema/v3/object/from_routes/public'
-require_relative 'support/deprecation'
-
-module R2OAS
-  module PluggableConfiguration
-    # rubocop:disable Style/MutableConstant
-    DEFAULT_USE_OBJECT_CLASSES = {
-      info_object: R2OAS::Schema::V3::InfoObject,
-      paths_object: R2OAS::Schema::V3::PathsObject,
-      path_item_object: R2OAS::Schema::V3::PathItemObject,
-      external_document_object: R2OAS::Schema::V3::ExternalDocumentObject,
-      components_object: R2OAS::Schema::V3::ComponentsObject,
-      components_schema_object: R2OAS::Schema::V3::Components::SchemaObject,
-      components_request_body_object: R2OAS::Schema::V3::Components::RequestBodyObject
-    }
-    # rubocop:enable Style/MutableConstant
-
-    VALID_OPTIONS_KEYS = %i[
-      use_object_classes
-    ].freeze
-
-    attr_reader *VALID_OPTIONS_KEYS
-
-    private
-
-    module_function
-
-    def set_default(target)
-      Deprecation.silence do
-        target.use_object_classes = DEFAULT_USE_OBJECT_CLASSES
-      end
-    end
-  end
-end