json_check 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d7bd0145608705dc69dd3e11534d08667b50b8
-  data.tar.gz: 0bbf80443b2dbab4cd3229791216702fe9a1e2a6
+  metadata.gz: f4b90d3ec5b077f172e589238e26d45a3c05696f
+  data.tar.gz: 17dbcabb3f6242976386226441e9e2b88a3d008e
 SHA512:
-  metadata.gz: d87e9be5548d4793b92a2ba2d9da7f22cd6c2723faeacdb5e0bd016f2979f93315a7a87bda0d2f495652eddcb564c8bb1554d0aac0dd389f7f2a1890aac8504f
-  data.tar.gz: b812b9cb4123a0731354fd9b7ff66dd11affb0e8cac78890d5902828f17c112967b96178ea6bebfaeebf1df917e4f4f2f65880232265ed8756bcd97e603a3443
+  metadata.gz: 04f689f557a364da8fc169d4ef7136d688a2bfa09a4d257afbdc36e5c9f84841f82d13977dee043783ac3cfd2523546f6edbd5c93cffcc85c65dddb6072cbc5f
+  data.tar.gz: 96ec1692cd3f6f3479b1791f283b76fca003c125583129837c357c1179574a8746d04a558976b791ab7ddd300d180ad1017c6abbd57af57298a4a3ac1c4d758e

data/lib/json_check.rb

@@ -22,7 +22,7 @@ module JSON_check
           'Float' => ['null', 'required', 'enum', 'compare', 'integer'],
           'String' => ['null', 'required', 'enum', 'mask'],
           'Boolean' => ['null', 'required', 'enum'],
-          'URL'  => ['null', 'required', 'mask'],
+          'URL'  => ['null', 'required', 'mask', 'empty'],
           'Array' => ['null', 'required', 'empty', 'pattern', 'patterns'],
           'Hash' => ['null', 'required', 'pattern', 'patterns', 'dynamic_key'],
           'NULL' => ['required']
@@ -204,12 +204,12 @@ module JSON_check
               change_status
             end
           when 'URL'
-            unless check_url value, c_p["null"]
+            unless check_url value, c_p["null"], c_p["empty"]
               add({key=>value}, num != last, "It must be URL")
               failure = true
               change_status
             end
-            unless failure or value.nil?
+            unless failure or value.nil? or value == ''
 	      status = 0
               attempt = 0
               while status != 200 and attempt < 8
@@ -367,12 +367,12 @@ module JSON_check
           change_status
         end
       when 'URL'
-        unless check_url value, ptn['null']
+        unless check_url value, ptn['null'], ptn['empty']
           add([value], num != last, "It must be URL")
           failure = true
           change_status
         end
-        unless failure
+        unless failure or value == ''
           status = 0
           attempt = 0
           while status != 200 and attempt < 8
@@ -541,7 +541,8 @@ module JSON_check
     return (arg.class == TrueClass or arg.class == FalseClass)
   end
   
-  def self.check_url arg, null
+  def self.check_url arg, null, empty
+    return true if empty && arg.class == String && arg == ''
     return true if null && arg.class == NilClass
     return false unless arg.class == String
     attempt = 0
@@ -717,4 +718,4 @@ module JSON_check
     return true
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_check
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Motin Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json