json_schemer 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad4883bcdfb3cac627d3b20c3ab74c0ebf4a3b3ce9f95b59cc653b60f2771580
-  data.tar.gz: bbb0a784d78974b3a812becdb354222e145a642ef9162c6e8bd6d74578994024
+  metadata.gz: a8a183671565c8bc3443ea0cb0b729858c4c34208c45da986bc2994504d1dfa3
+  data.tar.gz: dc7005acad88d864d4c7a5781fb0fd9d3e5ec7f78cd152db0cad9591ce650eb5
 SHA512:
-  metadata.gz: cf54450f55764c1c50751173db9008babda7befde4012b1e434ed7087134e2e5f053cbc35977cf58b96a8a4b7176302ed03731bddeb192e8aca3f29e79622eff
-  data.tar.gz: 464a4611a5261cba8e5a4c1acac299eb51342b1c06da90950e9f6aa826dabf4256feed1959247262310b66c061776a4f1f262bdc0028e29205097efec328b3c9
+  metadata.gz: b5c165cb49f7fb1e0d2253542a0b5d14bf6c624d474fea09ec3e1727ae0f443f74242b423c4f4478b61cb648654e87e7e52dca458792ae4bc771705a2efb999b
+  data.tar.gz: 6e507392188f78799924393b992eb646933fa9ce046b527d89bd368d7e24691d98e2fb4c6286e57e66ff25f6cfc775c5f09a76184433cdfe479ae1681f522ee3

data/.travis.yml

@@ -4,6 +4,10 @@ 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.3)
+    json_schemer (0.2.4)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -22,10 +22,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (~> 1.16)
   json_schemer!
   minitest (~> 5.0)
   rake (~> 10.0)
 
 BUNDLED WITH
-   2.0.2
+   1.17.3

data/json_schemer.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.required_ruby_version = '~> 2.0'
+
+  spec.add_development_dependency "bundler", "~> 1.16"
   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.match?(data)
+      !!(DATE_TIME_OFFSET_REGEX =~ data)
     rescue ArgumentError => e
       raise e unless e.message == 'invalid date'
       false
     end
 
     def valid_email?(data)
-      EMAIL_REGEX.match?(data)
+      !!(EMAIL_REGEX =~ data)
     end
 
     def valid_hostname?(data)
-      HOSTNAME_REGEX.match?(data) && data.split('.').all? { |label| label.size <= 63 }
+      !!(HOSTNAME_REGEX =~ 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.match?(data)
+      !!(IRI =~ data)
     end
 
     def valid_iri_reference?(data)
-      IRELATIVE_REF.match?(data)
+      !!(IRELATIVE_REF =~ data)
     end
 
     def valid_uri_template?(data)
@@ -145,11 +145,11 @@ module JSONSchemer
     end
 
     def valid_json_pointer?(data)
-      JSON_POINTER_REGEX.match?(data)
+      !!(JSON_POINTER_REGEX =~ data)
     end
 
     def valid_relative_json_pointer?(data)
-      RELATIVE_JSON_POINTER_REGEX.match?(data)
+      !!(RELATIVE_JSON_POINTER_REGEX =~ data)
     end
   end
 end

data/lib/json_schemer/schema/base.rb

@@ -470,7 +470,13 @@ module JSONSchemer
         if insert_property_defaults?
           properties.each do |property, property_schema|
             if !data.key?(property) && property_schema.key?('default')
-              data[property] = property_schema.fetch('default').clone
+              default = property_schema.fetch('default')
+              data[property] = case default
+              when Numeric, Symbol, true, false, nil
+                default
+              else
+                default.clone
+              end
             end
           end
         end
@@ -520,7 +526,7 @@ module JSONSchemer
               [pattern, ecma_262_regex(pattern), property_schema]
             end
             regex_pattern_properties.each do |pattern, regex, property_schema|
-              if regex.match?(key)
+              if regex =~ 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.3'
+  VERSION = '0.2.4'
 end

metadata

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