openapi_parser 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e383e6ff9f0d2a6ac67fda1ac8663b82c249449a7c1cff616a72fb608344a816
-  data.tar.gz: 53c6a442a5f170f5190197aa17a805a707fd586d7b4d0fc4c259ed8af46dc2bd
+  metadata.gz: 3019c8458c35d159f7c8eccc8f8203d39826438804460cccd1383f9e29b95299
+  data.tar.gz: 3471fed71a9d1f81688d87a0c907a0ab4c0529ca3e4a9d40159403b88238d1a6
 SHA512:
-  metadata.gz: 3cd78f54ac0bb0bca68e9538f3f33968b7815b76d88c39908735da2f18936118ecc66ec57a97ac491f2b0fdc7fd4985e312b8b32a4051d22a2242ed8ea55608f
-  data.tar.gz: 22fcb549a4c134350274be73bc59114309d612f096b70dfd5633fe049b9b2111c176809575b2ce89fc30a2db3a8cda633c5ce18b82a58a418cd95d76ce23791a
+  metadata.gz: d9f7ba65682079456e26ff03d4be816ad6f61b9bb9224c4cf37157a0bb4d4455d17c3e36fbadd0f557700d9926f69a50ae8ebdc9041412304b12b05feb91df4e
+  data.tar.gz: fd611630b787af1e69a003de92c01f8c83d9e9d6e8be68fe66fdba6a93ce2a8ca412c89a00fa35bcf4d7441fe10c309ec9eb9f3e91659957429b0375629a3671

data/.github/workflows/ci.yaml

@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.6, 2.7, '3.0', head]
+        ruby: [2.6, 2.7, '3.0', '3.1']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 1.0.0 (2021-02-03)
+### Added
+* Add date-time format validation #126
+
 ## 1.0.0.beta1 (2021-12-15)
 ### Added
 * Add strict_reference_validation config and implementation to address/implement #29 #123

data/lib/openapi_parser/errors.rb

@@ -206,6 +206,17 @@ module OpenAPIParser
     end
   end
 
+  class InvalidDateTimeFormat < OpenAPIError
+    def initialize(value, reference)
+      super(reference)
+      @value = value
+    end
+
+    def message
+      "#{@reference} Value: #{@value.inspect} is not conformant with date-time format"
+    end
+  end
+
   class NotExistStatusCodeDefinition < OpenAPIError
     def message
       "#{@reference} status code definition does not exist"

data/lib/openapi_parser/schema_validators/string_validator.rb

@@ -16,11 +16,6 @@ class OpenAPIParser::SchemaValidator
       value, err = pattern_validate(value, schema)
       return [nil, err] if err
 
-      unless @datetime_coerce_class.nil?
-        value, err = coerce_date_time(value, schema)
-        return [nil, err] if err
-      end
-
       value, err = validate_max_min_length(value, schema)
       return [nil, err] if err
 
@@ -33,28 +28,14 @@ class OpenAPIParser::SchemaValidator
       value, err = validate_date_format(value, schema)
       return [nil, err] if err
 
+      value, err = validate_datetime_format(value, schema)
+      return [nil, err] if err
+
       [value, nil]
     end
 
     private
 
-      # @param [OpenAPIParser::Schemas::Schema] schema
-      def coerce_date_time(value, schema)
-        return parse_date_time(value, schema) if schema.format == 'date-time'
-
-        [value, nil]
-      end
-
-      def parse_date_time(value, schema)
-        begin
-          return @datetime_coerce_class.parse(value), nil
-        rescue ArgumentError => e
-          raise e unless e.message =~ /invalid date/
-        end
-
-        OpenAPIParser::ValidateError.build_error_result(value, schema)
-      end
-
       # @param [OpenAPIParser::Schemas::Schema] schema
       def pattern_validate(value, schema)
         # pattern support string only so put this
@@ -101,5 +82,27 @@ class OpenAPIParser::SchemaValidator
 
         return [value, nil]
       end
+
+      def validate_datetime_format(value, schema)
+        return [value, nil] unless schema.format == 'date-time'
+
+        begin
+          if @datetime_coerce_class.nil?
+            # validate only
+            DateTime.rfc3339(value)
+            [value, nil]
+          else
+            # validate and coerce
+            if @datetime_coerce_class == Time
+              [DateTime.rfc3339(value).to_time, nil]
+            else
+              [@datetime_coerce_class.rfc3339(value), nil]
+            end
+          end
+        rescue ArgumentError
+          # when rfc3339(value) failed
+          [nil, OpenAPIParser::InvalidDateTimeFormat.new(value, schema.object_reference)]
+        end
+      end
   end
 end

data/lib/openapi_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenAPIParser
-  VERSION = '1.0.0.beta1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/openapi_parser.gemspec

@@ -25,11 +25,17 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 1.16'
   spec.add_development_dependency 'fincop'
-  spec.add_development_dependency 'pry', '~> 0.12.0'
-  spec.add_development_dependency 'pry-byebug'
+
+  if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("3.2.0")
+    spec.add_development_dependency 'pry', '~> 0.12.0'
+    spec.add_development_dependency 'pry-byebug'
+  end
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-parameterized'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency "steep"
+  # for steep 
+  # https://github.com/soutaro/steep/issues/466
+  spec.add_development_dependency "activesupport", '~> 6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - ota42y
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: parser for OpenAPI 3.0 or later
 email:
 - ota42y@gmail.com
@@ -244,11 +258,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: OpenAPI3 parser