json_schemer 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a183671565c8bc3443ea0cb0b729858c4c34208c45da986bc2994504d1dfa3
-  data.tar.gz: dc7005acad88d864d4c7a5781fb0fd9d3e5ec7f78cd152db0cad9591ce650eb5
+  metadata.gz: dd79033e749c1e3077636935feed34452d51b528b89acef5e35d07871f6ab9c0
+  data.tar.gz: 355a3bb6aae3ea6c29047c69d0f64d3481bfa265453b6a495788d4a963715abd
 SHA512:
-  metadata.gz: b5c165cb49f7fb1e0d2253542a0b5d14bf6c624d474fea09ec3e1727ae0f443f74242b423c4f4478b61cb648654e87e7e52dca458792ae4bc771705a2efb999b
-  data.tar.gz: 6e507392188f78799924393b992eb646933fa9ce046b527d89bd368d7e24691d98e2fb4c6286e57e66ff25f6cfc775c5f09a76184433cdfe479ae1681f522ee3
+  metadata.gz: fce9c0f1ceb00466f7da2a1692fb1fb78382c5d82f8bc6995bb81af0c6a1f362e5602b2574fbe4429e661b29c89f6af16cf8871cba8893f5439c1a5079126887
+  data.tar.gz: fdc5f5968f05fa551939c22c0dfe66226e2cec18bcdc53aa567287b89b1fc00f8599d8cb5a3e8a19c2822ebe6601aea47a0a9b97a82529f3a1fb3e0c601c9673

data/.travis.yml

@@ -4,10 +4,6 @@ rvm:
   - 2.6
   - 2.5
   - 2.4
-  - 2.3
-  - 2.2
-  - 2.1
-  - 2.0
 before_install: gem install bundler -v 1.16.1
 before_script:
   - pip install --user Flask

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.4)
+    json_schemer (0.2.5)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -22,10 +22,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   json_schemer!
   minitest (~> 5.0)
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

data/json_schemer.gemspec

@@ -20,9 +20,9 @@ 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.0'
+  spec.required_ruby_version = '~> 2.4'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 

data/lib/json_schemer/format.rb

@@ -108,18 +108,18 @@ module JSONSchemer
 
     def valid_date_time?(data)
       DateTime.rfc3339(data)
-      !!(DATE_TIME_OFFSET_REGEX =~ data)
+      DATE_TIME_OFFSET_REGEX.match?(data)
     rescue ArgumentError => e
       raise e unless e.message == 'invalid date'
       false
     end
 
     def valid_email?(data)
-      !!(EMAIL_REGEX =~ data)
+      EMAIL_REGEX.match?(data)
     end
 
     def valid_hostname?(data)
-      !!(HOSTNAME_REGEX =~ data && data.split('.').all? { |label| label.size <= 63 })
+      HOSTNAME_REGEX.match?(data) && data.split('.').all? { |label| label.size <= 63 }
     end
 
     def valid_ip?(data, type)
@@ -130,11 +130,11 @@ module JSONSchemer
     end
 
     def valid_iri?(data)
-      !!(IRI =~ data)
+      IRI.match?(data)
     end
 
     def valid_iri_reference?(data)
-      !!(IRELATIVE_REF =~ data)
+      IRELATIVE_REF.match?(data)
     end
 
     def valid_uri_template?(data)
@@ -145,11 +145,11 @@ module JSONSchemer
     end
 
     def valid_json_pointer?(data)
-      !!(JSON_POINTER_REGEX =~ data)
+      JSON_POINTER_REGEX.match?(data)
     end
 
     def valid_relative_json_pointer?(data)
-      !!(RELATIVE_JSON_POINTER_REGEX =~ data)
+      RELATIVE_JSON_POINTER_REGEX.match?(data)
     end
   end
 end

data/lib/json_schemer/schema/base.rb

@@ -470,13 +470,7 @@ module JSONSchemer
         if insert_property_defaults?
           properties.each do |property, property_schema|
             if !data.key?(property) && property_schema.key?('default')
-              default = property_schema.fetch('default')
-              data[property] = case default
-              when Numeric, Symbol, true, false, nil
-                default
-              else
-                default.clone
-              end
+              data[property] = property_schema.fetch('default').clone
             end
           end
         end
@@ -526,7 +520,7 @@ module JSONSchemer
               [pattern, ecma_262_regex(pattern), property_schema]
             end
             regex_pattern_properties.each do |pattern, regex, property_schema|
-              if regex =~ key
+              if regex.match?(key)
                 subinstance = instance.merge(
                   data: value,
                   data_pointer: "#{instance.data_pointer}/#{key}",

data/lib/json_schemer/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JSONSchemer
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - David Harsha
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="