r2-oas 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba83d46ef3c82522c969cdde703651d661245da9df0d232b5a1be7b709ac5a7c
-  data.tar.gz: f93c520a94b994941cdcf8ad958482bfd69657f7f39dd1af2da5f3f03f0d89af
+  metadata.gz: 202a93f6e116bb378c723a0810746749dea8059e91d2c199727739850ca528e7
+  data.tar.gz: 8061d7a71e56c7656065b20ac85f39755df665dd0d22031e01374e82a773114c
 SHA512:
-  metadata.gz: c0f096c893cfab491f15ef307bf731437f0790a3dc9d4ebb7c3f06ae4a77f6cfee4bc56914eb145a0c997ccd11b7d6ddc2bce707fbe8ffd0e3cca32f8c0f927c
-  data.tar.gz: 163f8f551d87826b60a712fd9c0d6ff8011a6cf553d9e279e9bc224a431a8527ab3b27ac9534bc7ac83075bcc9eb756785b560e49db80df99d61a1a31ecb5056
+  metadata.gz: 0700ad89a7147febd6b7fabb6c2343403a0f0fc4fa2e244996e3a2fa24a9e951e6e5899335f4fb4e26858796c87b04e4af4984992ce06d3a0d6864fdd6f2659f
+  data.tar.gz: 2bab390d140d5eeef3b12b7563ffe20e3b2179e129f38bf4c3c4483777d80f4b91e5f73f8d74ad7a8f7c9db81ff258915a6a57cda90b4b2edcf199eb26b2ec49

data/.rubocop_todo.yml

@@ -10,7 +10,7 @@
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 2088
 
 Metrics/AbcSize:
@@ -280,3 +280,12 @@ Style/SlicingWithRange:
 Lint/NonDeterministicRequireOrder:
   Exclude:
     - "spec/spec_helper.rb"
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+
+Style/RedundantRegexpEscape:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.3.1
+
+2020-06-07
+
+- [`Breaking`] Remove unnecessary runtime dependencies ([384ea1a](https://github.com/yukihirop/r2-oas/pull/132))
+
 ## v0.3.0
 
 2020-05-30

data/GEMSPEC.md

@@ -1,6 +1,7 @@
 Configureless and no DSL. 👍 But you can also configure.  
+Manage with yaml file instead of Ruby code.  
 Loosely coupled to your Rails project. 👍  
-So If it doesn't, you can always stop easily. 😢  
+So if you want to use another tool, you can port it right away. 😢  
 Generate api docment(OpenAPI) side only from `Rails` routing.  
   
 Provide rake tasks to management API Docment (OpenAPI) 🎉  

data/lib/r2-oas.rb

@@ -6,14 +6,14 @@ require 'r2-oas/errors'
 require 'r2-oas/schema/v3/object/public'
 
 module R2OAS
-  extend ActiveSupport::Autoload
-
   if !defined?(::Rails)
     raise NoImplementError, 'Can not load Rails'
   # support Rails version
   elsif ::Rails::VERSION::STRING >= '4.2.5.1'
     extend Configuration
     require 'r2-oas/task'
+    require 'r2-oas/lib/core_ext/hash/deep_merge'
+    require 'r2-oas/lib/core_ext/object/blank'
 
     autoload :Base, 'r2-oas/base'
     autoload :NoImplementError, 'r2-oas/errors'
@@ -22,8 +22,6 @@ module R2OAS
     autoload :Sortable, 'r2-oas/shared/all'
 
     module Schema
-      extend ActiveSupport::Autoload
-
       autoload :Base, 'r2-oas/schema/base'
       autoload :Generator, 'r2-oas/schema/generator'
       autoload :Builder, 'r2-oas/schema/builder'

data/lib/r2-oas/lib/core_ext/hash/deep_merge.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Copy From https://github.com/rails/rails/blob/v4.2.5/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+
+# rubocop:disable all
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { a: true, b: { c: [1, 2, 3] } }
+  #   h2 = { a: false, b: { x: [3, 4, 5] } }
+  #
+  #   h1.deep_merge(h2) #=> { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #
+  # Like with Hash#merge in the standard library, a block can be provided
+  # to merge values:
+  #
+  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+  #   h2 = { b: 250, c: { c1: 200 } }
+  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+  #   # => { a: 100, b: 450, c: { c1: 300 } }
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    other_hash.each_pair do |current_key, other_value|
+      this_value = self[current_key]
+
+      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+        this_value.deep_merge(other_value, &block)
+      else
+        if block_given? && key?(current_key)
+          block.call(current_key, this_value, other_value)
+        else
+          other_value
+        end
+      end
+    end
+
+    self
+  end
+end
+# rubocop:enable all

data/lib/r2-oas/lib/core_ext/object/blank.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+# Copy From https://github.com/rails/rails/blob/v4.2.5/activesupport/lib/active_support/core_ext/object/blank.rb
+
+# rubocop:disable all
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, +false+, '', '   ', +nil+, [], and {} are all blank.
+  #
+  # This simplifies
+  #
+  #   !address || address.empty?
+  #
+  # to
+  #
+  #   address.blank?
+  #
+  # @return [true, false]
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  #
+  # @return [true, false]
+  def present?
+    !blank?
+  end
+
+  # Returns the receiver if it's present otherwise returns +nil+.
+  # <tt>object.presence</tt> is equivalent to
+  #
+  #    object.present? ? object : nil
+  #
+  # For example, something like
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # becomes
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  #
+  # @return [Object]
+  def presence
+    self if present?
+  end
+end
+
+class NilClass
+  # +nil+ is blank:
+  #
+  #   nil.blank? # => true
+  #
+  # @return [true]
+  def blank?
+    true
+  end
+end
+
+class FalseClass
+  # +false+ is blank:
+  #
+  #   false.blank? # => true
+  #
+  # @return [true]
+  def blank?
+    true
+  end
+end
+
+class TrueClass
+  # +true+ is not blank:
+  #
+  #   true.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end
+
+class Array
+  # An array is blank if it's empty:
+  #
+  #   [].blank?      # => true
+  #   [1,2,3].blank? # => false
+  #
+  # @return [true, false]
+  alias_method :blank?, :empty?
+end
+
+class Hash
+  # A hash is blank if it's empty:
+  #
+  #   {}.blank?                # => true
+  #   { key: 'value' }.blank?  # => false
+  #
+  # @return [true, false]
+  alias_method :blank?, :empty?
+end
+
+class String
+  BLANK_REGEXP = /\A[[:space:]]*\z/
+
+  # A string is blank if it's empty or contains whitespaces only:
+  #
+  #   ''.blank?       # => true
+  #   '   '.blank?    # => true
+  #   "\t\n\r".blank? # => true
+  #   ' blah '.blank? # => false
+  #
+  # Unicode whitespace is supported:
+  #
+  #   "\u00a0".blank? # => true
+  #
+  # @return [true, false]
+  def blank?
+    BLANK_REGEXP === self
+  end
+end
+
+class Numeric #:nodoc:
+  # No number is blank:
+  #
+  #   1.blank? # => false
+  #   0.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end
+# rubocop:enable all

data/lib/r2-oas/version.rb

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

data/r2-oas.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'eventmachine', '>= 1.2.0'
   spec.add_runtime_dependency 'key_flatten', '>= 1.0.0'
   spec.add_runtime_dependency 'paint'
-  spec.add_runtime_dependency 'rails', '>= 4.2.5'
+  spec.add_runtime_dependency 'railties', '>= 4.2.5'
   spec.add_runtime_dependency 'terminal-table', '>= 1.6.0'
   spec.add_runtime_dependency 'watir', '>= 6.16.5'
   spec.add_development_dependency 'bundler', '>= 1.17'
@@ -47,4 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'activerecord', '>= 4.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2-oas
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - yukihirop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,16 +220,31 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
 description: "== Let's intuitively write API documentation with Swagger Editor in
   your Rails Project! \U0001F60A\nConfigureless and no DSL. \U0001F44D But you can
-  also configure.  \nLoosely coupled to your Rails project. \U0001F44D  \nSo If it
-  doesn't, you can always stop easily. \U0001F622  \nGenerate api docment(OpenAPI)
-  side only from `Rails` routing.  \n  \nProvide rake tasks to management API Docment
-  (OpenAPI) \U0001F389  \n  \n\n    $ bundle exec rake routes:oas:docs\n    $ bundle
-  exec rake routes:oas:ui\n    $ bundle exec rake routes:oas:editor\n    $ bundle
-  exec rake routes:oas:monitor\n    $ bundle exec rake routes:oas:dist\n    $ bundle
-  exec rake routes:oas:clean\n    $ bundle exec rake routes:oas:analyze\n    $ bundle
-  exec rake routes:oas:deploy\n\n  \nHappy Coding ❗️\n"
+  also configure.  \nManage with yaml file instead of Ruby code.  \nLoosely coupled
+  to your Rails project. \U0001F44D  \nSo if you want to use another tool, you can
+  port it right away. \U0001F622  \nGenerate api docment(OpenAPI) side only from `Rails`
+  routing.  \n  \nProvide rake tasks to management API Docment (OpenAPI) \U0001F389
+  \ \n  \n\n    $ bundle exec rake routes:oas:docs\n    $ bundle exec rake routes:oas:ui\n
+  \   $ bundle exec rake routes:oas:editor\n    $ bundle exec rake routes:oas:monitor\n
+  \   $ bundle exec rake routes:oas:dist\n    $ bundle exec rake routes:oas:clean\n
+  \   $ bundle exec rake routes:oas:analyze\n    $ bundle exec rake routes:oas:deploy\n\n
+  \ \nHappy Coding ❗️\n"
 email:
 - te108186@gmail.com
 executables: []
@@ -313,6 +328,8 @@ files:
 - lib/r2-oas/hooks/global_hook.rb
 - lib/r2-oas/hooks/hook.rb
 - lib/r2-oas/hooks/repository.rb
+- lib/r2-oas/lib/core_ext/hash/deep_merge.rb
+- lib/r2-oas/lib/core_ext/object/blank.rb
 - lib/r2-oas/lib/three-way-merge/twm.rb
 - lib/r2-oas/logger/stdout_logger.rb
 - lib/r2-oas/pluggable_configuration.rb
@@ -401,9 +418,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/yukihirop/r2-oas/issues
-  changelog_uri: https://github.com/yukihirop/r2-oas/blob/v0.3.0/CHANGELOG.md
+  changelog_uri: https://github.com/yukihirop/r2-oas/blob/v0.3.1/CHANGELOG.md
   documentation_uri: https://yukihirop.github.io/r2-oas
-  source_code_uri: https://github.com/yukihirop/r2-oas/tree/v0.3.0
+  source_code_uri: https://github.com/yukihirop/r2-oas/tree/v0.3.1
 post_install_message: 
 rdoc_options: []
 require_paths: