pupa 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3539ca0b77fc4b2174c42857990638713dac180
-  data.tar.gz: c5a18a0390ac9a3a48e0ba868ac1dd627af0db08
+  metadata.gz: 5c9f14316f20d5b37194d8e61ead60c90eaf1e41
+  data.tar.gz: 50b4de7a5b95f287f46760356e22c5fe45cbc03a
 SHA512:
-  metadata.gz: c93da2b8ff26107c28e02e51b8ea2ec999b5e086cc8564e0af6062a58af7fe3b71429e20d26eefc57471313da578699218a4098cd35ca94eed831340f63beef1
-  data.tar.gz: 2444a4491a3c0b499f4dd40c4b188a72644fc4fddec941471816747bb2e694bd5b96c7d550fe4dd98ed6c477b358ade25b25cf17c3a329ca8733929f6041252c
+  metadata.gz: 1abbc8fa6cd13e2a53ee675e8c57d040668dd9606ec62ef800a8143c35b50b5403d1085bb12a83d3e4239fac178b0f0e50d6c5c0df3d76f541df5bfd0538b909
+  data.tar.gz: b307d48deb6b948b53d42c8d76481f6c011d84665543315ca3cdaa1e1b7d329dd8696f735a2956d9fda2875f607b23f638494de063d8e99a39f723d5643b0d50

data/lib/pupa/refinements/json-schema.rb

@@ -11,7 +11,7 @@ module Pupa
         when 'email'
           if String === data
             address = Mail::Address.new(data)
-            unless (address.address == data && address.domain && address.__send__(:tree).domain.dot_atom_text.elements.size > 1 rescue false)
+            unless address.address == data && address.domain && address.domain.split('.').size > 1
               error_message = "The property '#{build_fragment(fragments)}' must be a valid email address (#{data})"
               validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
             end

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/refinements/json-schema_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Pupa::Refinements do
+  let(:schema) do
+    {
+      'properties' => {
+        'email' => {
+          'type' => ['string', 'null'],
+          'format' => 'email',
+        },
+        'uri' => {
+          'type' => ['string', 'null'],
+          'format' => 'uri',
+        },
+      }
+    }
+  end
+
+  context 'email validation' do
+    it 'should not raise an error if valid' do
+      expect{JSON::Validator.validate!(schema, 'email' => 'ceo@example.com')}.to_not raise_error
+    end
+
+    it 'should raise an error if invalid' do
+      expect{JSON::Validator.validate!(schema, 'email' => 'example.com')}.to raise_error(JSON::Schema::ValidationError)
+    end
+  end
+
+  context 'uri validation' do
+    it 'should not raise an error if valid' do
+      expect{JSON::Validator.validate!(schema, 'uri' => 'scheme://user:pass@host/path?query#fragment')}.to_not raise_error
+    end
+
+    it 'should raise an error if invalid' do
+      expect{JSON::Validator.validate!(schema, 'uri' => 'example.com')}.to raise_error(JSON::Schema::ValidationError)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupa
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Open North
@@ -384,6 +384,7 @@ files:
 - spec/processor/middleware/parse_json_spec.rb
 - spec/processor/yielder_spec.rb
 - spec/processor_spec.rb
+- spec/refinements/json-schema_spec.rb
 - spec/refinements/opencivicdata_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
@@ -447,6 +448,7 @@ test_files:
 - spec/processor/middleware/parse_json_spec.rb
 - spec/processor/yielder_spec.rb
 - spec/processor_spec.rb
+- spec/refinements/json-schema_spec.rb
 - spec/refinements/opencivicdata_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb