json-schema 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9686db47d231f89e17854471084e1dfe27b365df2e5be5e04a98ef27d05cbcf
-  data.tar.gz: 5f6e77d40b284308ed64d630e292d57797c0c156bdc8ebaafa12acc3ffcfba7f
+  metadata.gz: 22afd4889333e3c72db735249ce9f628ebf760c343b98bca7dcf44b5d8aedade
+  data.tar.gz: cd6abf52a3af173231e02fec990f2ec80084c8d808ca5f98ef95601fe2c87cf7
 SHA512:
-  metadata.gz: bdb9e93be56be04160b301dd200684b20495ffd3326d12dd2ca2014eb6f3bfc667f61ba1a3f61bdb5f39cab20a0edbf509a7efd84cb52ac728219b88c1ad4b61
-  data.tar.gz: b62696183483862807c53bcc9ccbf831206800dda4e26f03de0da0f12f556e36a6e01083c853100348f7f9f96c13607d1e7600af41436ceb01eb4ca4966b56a3
+  metadata.gz: 626dc61e7da4ecd5984463bc20a3eadd9551ca5a652cfdc60faf7869e09d0f89aa0676aee7e91135738d0fecef5dda298499d196011bfeb1494a2e9cabe3e946
+  data.tar.gz: e111b99ff25a98f785a967b91a3d277f5a0236b5a96bf49cd6c88709abaced71377de17d3f23f206c5d037201a85bd3a1b6d44c685c4e25353f3fc12143da541

data/README.md

@@ -478,6 +478,14 @@ Optionally, the JSON Schema library supports using the MultiJSON library for
 selecting JSON backends. If the MultiJSON library is installed, it will be
 autoloaded.
 
+**Deprecation notice:** MultiJSON support is deprecated and will be removed in a
+future version. To stop using MultiJSON, add the following to your application's
+initialization code:
+
+```ruby
+JSON::Validator.use_multi_json = false
+```
+
 Notes
 -----
 

data/lib/json-schema/attributes/formats/date.rb

@@ -3,7 +3,7 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class DateFormat < FormatAttribute
-      REGEXP = /\A\d{4}-\d{2}-\d{2}\z/
+      REGEXP = /\A\d{4}-\d{2}-\d{2}\z/.freeze
 
       def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         if data.is_a?(String)

data/lib/json-schema/attributes/formats/date_time.rb

@@ -3,7 +3,7 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class DateTimeFormat < FormatAttribute
-      REGEXP = /\A\d{4}-\d{2}-\d{2}T(\d{2}):(\d{2}):(\d{2})([.,]\d+)?(Z|[+-](\d{2})(:?\d{2})?)?\z/
+      REGEXP = /\A\d{4}-\d{2}-\d{2}T(\d{2}):(\d{2}):(\d{2})([.,]\d+)?(Z|[+-](\d{2})(:?\d{2})?)?\z/.freeze
 
       def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         # Timestamp in restricted ISO-8601 YYYY-MM-DDThh:mm:ssZ with optional decimal fraction of the second

data/lib/json-schema/attributes/formats/time.rb

@@ -3,7 +3,7 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class TimeFormat < FormatAttribute
-      REGEXP = /\A(\d{2}):(\d{2}):(\d{2})\z/
+      REGEXP = /\A(\d{2}):(\d{2}):(\d{2})\z/.freeze
 
       def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         if data.is_a?(String)

data/lib/json-schema/validator.rb

@@ -38,6 +38,8 @@ module JSON
     @@available_json_backends = []
     @@json_backend = nil
     @@serializer = nil
+    @@use_multi_json = defined?(MultiJson) ? true : false
+    @@multi_json_warned = false
     @@mutex = Mutex.new
 
     def initialize(schema_data, opts = {})
@@ -411,8 +413,20 @@ module JSON
         end
       end
 
+      def use_multi_json?
+        @@use_multi_json
+      end
+
+      def use_multi_json=(value)
+        @@use_multi_json = value ? true : false
+        if use_multi_json? == false
+          ensure_ruby_json_backends!
+        end
+      end
+
       def json_backend
-        if defined?(MultiJson)
+        if use_multi_json?
+          multi_json_deprecation_warning!
           MultiJson.respond_to?(:adapter) ? MultiJson.adapter : MultiJson.engine
         else
           @@json_backend
@@ -420,7 +434,8 @@ module JSON
       end
 
       def json_backend=(backend)
-        if defined?(MultiJson)
+        if use_multi_json?
+          multi_json_deprecation_warning!
           backend = 'json_gem' if backend == 'json'
           MultiJson.respond_to?(:use) ? MultiJson.use(backend) : MultiJson.engine = backend
         else
@@ -434,7 +449,8 @@ module JSON
       end
 
       def parse(s)
-        if defined?(MultiJson)
+        if use_multi_json?
+          multi_json_deprecation_warning!
           begin
             MultiJson.respond_to?(:adapter) ? MultiJson.load(s) : MultiJson.decode(s)
           rescue MultiJson::ParseError => e
@@ -481,7 +497,11 @@ module JSON
         end
       end
 
-      unless defined?(MultiJson)
+      def ensure_ruby_json_backends!
+        if !@@available_json_backends.empty? || !@@serializer.nil?
+          return
+        end
+
         if Gem::Specification.find_all_by_name('json').any?
           require 'json'
           @@available_json_backends << 'json'
@@ -510,6 +530,25 @@ module JSON
                          ->(o) { YAML.dump(o) }
                        end
       end
+
+      def multi_json_deprecation_warning!
+        unless @@multi_json_warned
+          @@multi_json_warned = true
+          warn '[DEPRECATION NOTICE] json-schema support for MultiJSON is deprecated and will be removed in a future version. ' \
+               'To stop using MultiJSON, add `JSON::Validator.use_multi_json = false` to your application\'s initialization code.'
+        end
+      end
+
+      private
+
+      # for test usage only
+      def reset_multi_json_deprecation_warning!
+        @@multi_json_warned = false
+      end
+    end
+
+    if use_multi_json? == false
+      ensure_ruby_json_backends!
     end
 
     private
@@ -523,7 +562,8 @@ module JSON
     end
 
     def serialize(schema)
-      if defined?(MultiJson)
+      if self.class.use_multi_json?
+        self.class.multi_json_deprecation_warning!
         MultiJson.respond_to?(:dump) ? MultiJson.dump(schema) : MultiJson.encode(schema)
       else
         @@serializer.call(schema)

data/lib/json-schema.rb

@@ -14,5 +14,5 @@ require 'json-schema/schema'
 require 'json-schema/schema/reader'
 require 'json-schema/validator'
 
-Dir[File.join(File.dirname(__FILE__), 'json-schema/attributes/**/*.rb')].each { |file| require file }
+Dir[File.join(File.dirname(__FILE__), 'json-schema/attributes/**/*.rb')].sort.each { |file| require file }
 Dir[File.join(File.dirname(__FILE__), 'json-schema/validators/*.rb')].sort!.each { |file| require file }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Kenny Hoxworth
@@ -10,68 +10,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: voxpupuli-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.1.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.23'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.23'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -211,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files: []