json_check 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a9cd8a03afe74cb317287ab967e3feb577cd08d
-  data.tar.gz: 8535309d9735b490ddcfd905f528dafd49f36914
+  metadata.gz: 32c38a04db2895fbfb2982e8dfaad61220f14adb
+  data.tar.gz: bca09c6b39dcbc5ad182e9ad9e2d03980a5b9d33
 SHA512:
-  metadata.gz: 5df8394af51451ffe78e0aa82e43c9ec1dff076ee7cf1b1a6cb83bb7ca90aa065ce5f5ec38c8d53d0ecd5d68b4f551ac7ae18604d642f6a5f6db31e8ee73c161
-  data.tar.gz: ed221ba70b1d8e4c39c8058b0c8ea0db3cd8265da697d59f466adfdfcc46b7073b06da3eb52bbe4962f90ac52bb8e7b2c90ed7d05f7d764b4a084de9fdfddcab
+  metadata.gz: 4ae324b7bf3f035986590d8313f9493aa3749fbd303e0c12099343d4d00dde022487c0f3294b6307f22f4421e7e70e62aa5cd18a9b8b1bc5f4e522b8e2aca7b2
+  data.tar.gz: 294af175dea635249ab4b1a4ba34e6958413547381e614950f7ee35b8666c619967e78a88a93fe3fc11c0fdc148c958d96101fd008dff950af11f948e4d02b73

data/lib/json_check.rb

@@ -19,7 +19,7 @@ module JSON_check
   
   @@permissible_params = {
           'Integer' => ['null', 'required', 'enum', 'compare'],
-          'Float' => ['null', 'required', 'enum', 'compare'],
+          'Float' => ['null', 'required', 'enum', 'compare', 'integer'],
           'String' => ['null', 'required', 'enum', 'mask'],
           'Boolean' => ['null', 'required', 'enum'],
           'URL'  => ['null', 'required', 'mask'],
@@ -177,7 +177,7 @@ module JSON_check
               change_status
             end
           when 'Float'
-            unless check_float value, c_p["null"]
+            unless check_float value, c_p['null'], c_p['integer']
               add({key=>value}, num != last, "It must be Float")
               failure = true
               change_status
@@ -212,7 +212,7 @@ module JSON_check
             unless failure or value.nil?
 	      status = 0
               attempt = 0
-              while status != 200 and attempt < 4
+              while status != 200 and attempt < 8
                 status = url_status(value)
                 attempt += 1
               end
@@ -343,31 +343,31 @@ module JSON_check
       end
       case ptn['type']
       when 'Integer'
-        unless check_int value, false
+        unless check_int value, ptn['null']
           add([value], num != last, "It must be Integer")
           failure = true
           change_status
         end
       when 'Float'
-        unless check_float value,false 
+        unless check_float value, ptn['null'], ptn['integer']
           add([value], num != last, "It must be Float")
           failure = true
           change_status
         end
       when 'String'
-        unless check_str value, false
+        unless check_str value, ptn['null']
           add([value], num != last, "It must be String")
           failure = true
           change_status
         end
       when 'Boolean'
-        unless check_bool value, false
+        unless check_bool value, ptn['null']
           add([value], num != last, "It must be Boolean")
           failure = true
           change_status
         end
       when 'URL'
-        unless check_url value, false
+        unless check_url value, ptn['null']
           add([value], num != last, "It must be URL")
           failure = true
           change_status
@@ -375,7 +375,7 @@ module JSON_check
         unless failure
           status = 0
           attempt = 0
-          while status != 200 and attempt < 4
+          while status != 200 and attempt < 8
             status = url_status(value)
             attempt += 1
           end
@@ -392,7 +392,7 @@ module JSON_check
           end
         end 
       when 'Array'
-        unless check_array value, false
+        unless check_array value, ptn['null']
           add([value], num != last, "It must be Array")
           failure = true
           change_status
@@ -410,7 +410,7 @@ module JSON_check
         num += 1
         next
       when 'Hash'
-        unless check_hash value, false
+        unless check_hash value, ptn['null']
           add([value], num != last, "It must be Hash")
           failure = true
           change_status
@@ -521,9 +521,10 @@ module JSON_check
     return arg.class == Fixnum 
   end
   
-  def self.check_float arg, null
+  def self.check_float arg, null, integer
     return true if null && arg.class == NilClass
-    return (arg.class == Float or arg.class == Fixnum)
+    return true if integer && arg.class == Fixnum
+    return arg.class == Float
   end
   
   def self.check_null arg
@@ -611,7 +612,7 @@ module JSON_check
     begin
       link = URI.parse(url)
       resp = Net::HTTP.start(link.host){|http| 
-                                         http.read_timeout = 10
+                                         http.read_timeout = 30
                                          http.head(link)
                                        }
       http_status = resp.code.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_check
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Motin Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json