Bump version to 1.7.0: Ruby & Rails version requirement declared

Author: hikari-desu

.gitignore

@@ -12,3 +12,4 @@
 coverage
 
 .idea/*
+Gemfile.lock

CHANGELOG.md

@@ -2,9 +2,19 @@
 
 ## [Unreleased]
 
+## [1.7.0] - 2018/12/17 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v1.6.1...v1.7.0)
+
+### Added
+
+1. Declare Ruby & Rails version requirement in Gemspec
+
+### Fixed
+
+1. `match?` => `'string'[matcher].present?`, for compatibility with ruby < 2.4
+
 ### Changed
 
-1. `base_doc_class: ApiDoc` => `base_doc_classes: [ApiDoc]`
+1. Config option `base_doc_class: ApiDoc` changed to `base_doc_classes: [ApiDoc]`
 
 ## [1.6.1] - 2018/8/21 - [view diff](https://github.com/zhandao/zero-rails_openapi/compare/v1.6.0...v1.6.1)
 

Gemfile.lock

@@ -805,13 +805,7 @@
 
 - **You wrote document of the current API, but not find in the generated json file?**  
   Check your routing settings.
-- **Undefine method `match?`**  
-  Monkey patches for `String` and `Symbol`:
-  ```ruby
-  class String # Symbol
-    def match?(pattern); !match(pattern).nil? end
-  end
-  ```
+
 - **Report error when require `routes.rb`?***
   1. Run `rails routes`.
   2. Copy the output to a file, for example `config/routes.txt`.

README.md

@@ -745,13 +745,7 @@
 
 - **You wrote document of the current API, but not find in the generated json file?**  
   Check your routing settings.
-- **Undefine method `match?`**  
-  Monkey patches for `String` and `Symbol`:
-  ```ruby
-  class String # Symbol
-    def match?(pattern); !match(pattern).nil? end
-  end
-  ```
+
 - **Report error when require `routes.rb`?***
   1. Run `rails routes`.
   2. Copy the output to a file, for example `config/routes.txt`.

README_zh.md

@@ -10,8 +10,8 @@ module ClassMethods
     def inherited(subclass)
       super
       subclass.class_eval do
-        break unless self.name.match?(/sController|sDoc/)
-        route_base self.name.sub('Doc', '').downcase.gsub('::', '/') if self.name.match?(/sDoc/)
+        break unless self.name[/sController|sDoc/]
+        route_base self.name.sub('Doc', '').downcase.gsub('::', '/') if self.name[/sDoc/]
         open_api_dry
       end
     end

documentation/examples/auto_gen_doc.rb

@@ -12,7 +12,7 @@ def initialize(name, param_type, type, required, schema)
         self.processed = {
             name: name,
             in: param_type,
-            required: required.to_s.match?(/req/)
+            required: required.to_s[/req/].present?
         }
         self.schema = schema.is_a?(CombinedSchema) ? schema : SchemaObj.new(type, schema)
         merge! schema

lib/oas_objs/param_obj.rb

@@ -11,7 +11,7 @@ class RequestBodyObj < Hash
       attr_accessor :processed, :media_types
       def initialize(required, desc)
         self.media_types = [ ]
-        self.processed   = { required: required.match?('req'), description: desc }
+        self.processed   = { required: required['req'].present?, description: desc }
       end
 
       def add_or_fusion(media_type, hash)

lib/oas_objs/request_body_obj.rb

@@ -40,14 +40,14 @@ def processed_type(type = self.type)
         elsif t.is_a? Symbol
           RefObj.new(:schema, t).process
         elsif t.in? %w[ float double int32 int64 ]
-          { type: t.match?('int') ? 'integer' : 'number', format: t }
+          { type: t['int'] ? 'integer' : 'number', format: t }
         elsif t.in? %w[ binary base64 uri ]
           { type: 'string', format: t }
         elsif t == 'file' # TODO
           { type: 'string', format: Config.file_format }
         elsif t == 'datetime'
           { type: 'string', format: 'date-time' }
-        elsif t.match?(/\{=>.*\}/)
+        elsif t[/\{=>.*\}/]
           self[:values_type] = t[3..-2]
           { type: 'object' }
         else # other string

lib/oas_objs/schema_obj.rb

@@ -38,7 +38,7 @@ def api action, summary = '', id: nil, tag: nil, http: http_method = nil, skip:
         doc_tag if @doc_info.nil?
         # select the routing info (corresponding to the current method) from routing list.
         action_path = "#{@route_base ||= controller_path}##{action}"
-        routes = ctrl_routes_list&.select { |api| api[:action_path].match?(/^#{action_path}$/) }
+        routes = ctrl_routes_list&.select { |api| api[:action_path][/^#{action_path}$/].present? }
         return puts '    ZRO'.red + " Route mapping failed: #{action_path}" if routes.blank?
 
         api = Api.new(action_path, skip: Array(skip), use: Array(use))

lib/open_api/dsl.rb

@@ -31,7 +31,7 @@ def _load_schema_based_on_show_attr(model)
           if columns.include?(attr)
             index = columns.index(attr)
             _type_mapping(model.columns[index])
-          elsif attr.match?(/_info/)
+          elsif attr[/_info/]
             # TODO: 如何获知关系是 many？因为不能只判断结尾是否 ‘s’
             assoc_model = Object.const_get(attr.to_s.split('_').first.singularize.camelize)
             { attr => load_schema(assoc_model) }

lib/open_api/dsl/helpers.rb

@@ -85,7 +85,7 @@ def routes
 
     def routes_list
       @routes_list ||= routes.split("\n").drop(1).map do |line|
-        next unless line.match?('#')
+        next unless line['#']
         infos = line.match(/[A-Z|].*/).to_s.split(' ') # => [GET, /api/v1/examples/:id, api/v1/examples#index]
 
         {

lib/open_api/generator.rb

@@ -1,3 +1,3 @@
 module OpenApi
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

lib/open_api/version.rb

@@ -9,8 +9,8 @@ def undo_dry
     def inherited(subclass)
       super
       subclass.class_eval do
-        break unless self.name.match?(/sController|sDoc/)
-        route_base self.name.sub('Doc', '').downcase.gsub('::', '/') if self.name.match?(/sDoc/)
+        break unless self.name[/sController|sDoc/]
+        route_base self.name.sub('Doc', '').downcase.gsub('::', '/') if self.name[/sDoc/]
       end
     end
   end

spec/support/api_doc.rb

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # spec.required_ruby_version     = ">= 2.2.2"
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16.a'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'colorize'
-  spec.add_runtime_dependency 'activesupport', '>= 3'
-  spec.add_runtime_dependency 'rails', '>= 3'
+  spec.add_runtime_dependency 'activesupport', '>= 4.1'
+  spec.add_runtime_dependency 'rails', '>= 4.1'
 
   # spec.post_install_message = ""
 end