nice_hash 1.12.8 → 1.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b8f9fc57bbbfad89f5c5545609e05486240881cbad12f64226cd2e1cc1f5ea
-  data.tar.gz: 1942366e5103e57ad221c08b0766cfdf135a70422574fe89ee64c6992c5b650e
+  metadata.gz: 3bff78c12a5f0b46e46eb9f2af18c66d570dfa51b9c45ac2a6600939c8387f28
+  data.tar.gz: d92ba9acd53a8f288a1be13a9d50c6f0924ae72168bdafb32dcf4e097e12e269
 SHA512:
-  metadata.gz: a56520db1ad240c8eddf0a0f6dda03f47736b94792b442d1cb8e26457da36277a0244640b82dc7729e7cb6ef536feec2db2b2bc2eabf11e389de39af8d7c972f
-  data.tar.gz: 173cd64e2ca12b2040ea9f9d124b041601ae60052c44614073b08e34657975a3403133c6b0042a380b17e84c7c6284a19199d8bef576a023559940107708ab1b
+  metadata.gz: e89e0412ce972946f6b2ec5e2df538849d492d45c716cf23ee538ddb44082004db33f9b23ea778ce249fcc44140d896e1ec82f972fcf80e71bcffe7926385e39
+  data.tar.gz: 77a9745af901aafc25463b3569d7870fa4621307a107870c3a71bc40086a060840587f1096ecc66ae0eb0205db8255c8a901f0c6ffa8f2b3fc2ee411d83f21cc

data/README.md

@@ -53,6 +53,8 @@ my_hash={
     loginame: :"5-10:/xn/", 
     [:pwd1, :pwd2, :pwd3] => :"5-10:L/n/",
     name: :"10-20:T_/x/",
+    age: 18..120,
+    euros: 0.0..3000.0,
     draws: [
         {
             drawId: :"5:N",
@@ -92,6 +94,8 @@ Explanations of the different fields:
     loginname: from 5 to 10 characters, mandatory to have lower letters and numbers
     pwd, pwd2, pwd3: will have the same value. The value from 5 to 10 chars, optional capital and lower letters, necessary to contain numbers
     name: from 10 to 20 chars. Optional national characters and space, necessary lower letters.
+    age: number from 18 to 120
+    euros: float number from 0.0 to 3000.0
     drawId: 5 numbers
     drawName: 10 letters and/or numbers
     type: 'Weekely' or 'Daily'
@@ -236,6 +240,8 @@ On this example new_hash will contain:
     loginame: :"5-10:/xn/", 
     [:pwd1, :pwd2, :pwd3] => :"5-10:L/n/",
     name: :"10-20:T_/x/",
+    age: 18..120,
+    euros: 0.0..3000.0,
     draws: [
         {
             drawId: :"5:N",
@@ -294,6 +300,8 @@ In case of filtering by :correct new_hash would have a value like this for examp
  :pwd2=>"E6hz9YS7",
  :pwd3=>"E6hz9YS7",
  :name=>"OyTQNfEyPOzVYMxPym",
+ :age=> 19,
+ :euros=> 2133.34,
  :draws=>
   [{:drawId=>"54591",
     :drawName=>"cr5Q7pq4G8",
@@ -351,6 +359,8 @@ On this example wrong_min_length will contain something like:
  :pwd2=>"4XDx",
  :pwd3=>"4XDx",
  :name=>"bU",
+ :age=> 5,
+ :euros=> -452.311,
  :draws=>
   [{:drawId=>"", :drawName=>"P03AgdMqV", :type=>"Dail", :owner=>"dYzLRMCnVc"},
    {:drawId=>"", :drawName=>"qw", :type=>"Dail", :owner=>"zkHhTEzM"}],
@@ -485,6 +495,8 @@ After using the bury method default_values will contain:
  :pwd2=>"x33exx",
  :pwd3=>"x33exx",
  :name=>"HdmsjLxlEgYIFY",
+ :age=> 20,
+ :euros=> 155.11,
  :draws=>
   [{:drawId=>"12318",
     :drawName=>"FirstDraw",
@@ -508,16 +520,19 @@ After using the bury method default_values will contain:
 
 If you have a Hash that should follow the patterns you specified (in this example declared on my_hash) and you want to validate, then use the 'validate' method.
 
-This is particulary useful to test REST APIs responses in JSON
+This is specially useful to test REST APIs responses in JSON
 
 If we have a hash with these values:
 
 ```ruby
-{:loginame=>"rdewvqur",
+values = { 
+ :loginame=>"rdewvqur",
  :pwd1=>"d3ulo",
  :pwd2=>"d3ulo",
  :pwd3=>"d3ulo",
  :name=>"LTqVKxxFCTqpkdjFkxU",
+ :age=> 20,
+ :euros=> 155.11,
  :draws=>
   [{:drawId=>"54a43",
     :drawName=>"h3F24yjMWp",
@@ -537,7 +552,7 @@ If we have a hash with these values:
  :display=>true}
 ```
 
-To validate those values taking in consideration was is stated on my_hash:
+To validate those values against the patterns defined on my_hash:
 
 ```ruby
 results_all_fields = my_hash.validate :correct, values

data/lib/nice_hash.rb

@@ -359,9 +359,7 @@ class NiceHash
           else
             value = NiceHash.generate(value, select_hash_key, expected_errors: expected_errors)
           end
-        end
-
-        if value.kind_of?(String) or value.kind_of?(Symbol)
+        elsif value.kind_of?(String) or value.kind_of?(Symbol)
           if ((StringPattern.optimistic and value.kind_of?(String)) or value.kind_of?(Symbol)) and value.to_s.scan(/^!?\d+-?\d*:.+/).size > 0
             hashv[key] = StringPattern.generate(value, expected_errors: expected_errors)
           elsif ((StringPattern.optimistic and value.kind_of?(String)) or value.kind_of?(Symbol)) and value.to_s.scan(/^([\w\s\-]+\|)+[\w\s\-]+$/).size > 0
@@ -415,10 +413,31 @@ class NiceHash
             }
             hashv[key] = value_ret
           end
+        elsif value.kind_of?(Range)
+          if expected_errors.empty?
+            hashv[key] = rand(value)  
+          else
+            hashv[key] = rand(value)
+            expected_errors.each do |er|
+              if er == :min_length
+                hashv[key] = rand((value.first-value.last)..value.first-1)
+              elsif er == :max_length
+                hashv[key] = rand((value.last+1)..(value.last*2))
+              elsif er == :length
+                if rand.round==1
+                  hashv[key] = rand((value.first-value.last)..value.first-1)
+                else
+                  hashv[key] = rand((value.last+1)..(value.last*2))
+                end
+              elsif er == :value
+                hashv[key] = :"1-10:N/L/".gen
+              end
+            end
+          end
         elsif value.kind_of?(Proc)
           hashv[key] = value.call
         elsif value.kind_of?(Regexp)
-          hashv[key] = value.generate
+          hashv[key] = value.generate(expected_errors: expected_errors)
         else
           hashv[key] = value
         end
@@ -523,6 +542,17 @@ class NiceHash
             elsif !only_patterns
               results[key] = false unless value.to_s == values[key].to_s
             end
+          elsif value.kind_of?(Range)
+            if values[key].class != value.first.class or values[key].class != value.last.class
+              results[key] = false
+            elsif values[key] < value.first or values[key] > value.last
+              results[key] = false
+            end
+          elsif value.kind_of?(Regexp)
+            rex = Regexp.new("^#{value}$")
+            unless values[key].match?(rex)
+              results[key] = false
+            end
           elsif value.kind_of?(Array)
             array_pattern = false
             complex_data = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_hash
 version: !ruby/object:Gem::Version
-  version: 1.12.8
+  version: 1.12.9
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string_pattern