prop_check 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f707bae1dadf800e667376a749c7d5de3f3d741d13e63118de79dfb7233fb5
-  data.tar.gz: e86ac3b096bff66cfa88c0a66b1fc8ea91dc8452ded41c417fb1452c33c2b1d7
+  metadata.gz: 6938e33edff09860d467d560675d04173ac8f44c487f65f22a4253bcad01a465
+  data.tar.gz: 1ed4f6b097d008461e251f285ad52fcd32dfce27cc306862b250cea45e0b954a
 SHA512:
-  metadata.gz: e0985469e34e0b353aab0fac657a073fadfe135c03029187d3f7824ebded0bfd244122aa2ae4361b5ccad3fb05ca52162e3967e9f46a6e43674e7d7626a700f7
-  data.tar.gz: 0b0505768ea68855beaf9c8954cb973215dd392c40975e7f581e7faa9d7570c9e4fb76402227c5b0f223f96e87f72d58decfb7dffd2744897c22db3ba0959ac6
+  metadata.gz: e8d7498c00b09f17ec90fced0b130158e1919270837bad1af82ca7f4140f8904816c377cdd3489aea38d6ef36b911a128a92ca956c598daf9f0f88654ca4ac64
+  data.tar.gz: b05e4c9364808468af3c5b9807cc8cc8e036a780e449efd0468f7b577853bd3a286371a3312073c0cf5952c5debb12dd6b13ad2d3e8d0fed0952839db680757c

data/lib/prop_check/generator.rb

@@ -100,17 +100,15 @@ module PropCheck
     def map(&proc)
       Generator.new do |size, rng|
         result = self.generate(size, rng)
-        result.map do |*val|
-          proc.call(*val)
-        end
+        result.map(&proc)
       end
     end
 
     ##
     # Creates a new Generator that only produces a value when the block `condition` returns a truthy value.
     def where(&condition)
-      self.map do |*result|
-        if condition.call(*result)
+      self.map do |result|
+        if condition.call(result)
           result
         else
           :"_PropCheck.filter_me"

data/lib/prop_check/generators.rb

@@ -227,19 +227,45 @@ module PropCheck
     # is generated by `element_generator`.
     #
     # Shrinks to shorter arrays (with shrunken elements).
+    # Accepted keyword arguments:
     #
+    # `empty:` When false, behaves the same as `min: 1`
+    # `min:` Ensures at least this many elements are generated. (default: 0)
+    # `max:` Ensures at most this many elements are generated. When nil, an arbitrary count is used instead. (default: nil)
+    #
+    #
+    #    >> Generators.array(Generators.positive_integer).sample(5, size: 1, rng: Random.new(42))
+    #    =>  [[2], [2], [2], [1], [2]]
     #    >> Generators.array(Generators.positive_integer).sample(5, size: 10, rng: Random.new(42))
     #    => [[10, 5, 1, 4], [5, 9, 1, 1, 11, 8, 4, 9, 11, 10], [6], [11, 11, 2, 2, 7, 2, 6, 5, 5], [2, 10, 9, 7, 9, 5, 11, 3]]
-    def array(element_generator)
-      nonnegative_integer.bind do |generator|
-        generators = (0...generator).map do
+    #
+    #    >> Generators.array(Generators.positive_integer, empty: true).sample(5, size: 1, rng: Random.new(1))
+    #    =>  [[], [2], [], [], [2]]
+    #    >> Generators.array(Generators.positive_integer, empty: false).sample(5, size: 1, rng: Random.new(1))
+    #    =>  [[2], [1], [2], [1], [1]]
+
+
+    def array(element_generator, min: 0, max: nil, empty: true)
+      min = 1 if min.zero? && !empty
+
+      res = proc do |count|
+        count = min + 1 if count < min
+        count += 1 if count == min && min != 0
+        generators = (min...count).map do
           element_generator.clone
         end
 
         tuple(*generators)
       end
+
+      if max.nil?
+        nonnegative_integer.bind(&res)
+      else
+        proc.call(max)
+      end
     end
 
+
     ##
     # Generates a hash of key->values,
     # where each of the keys is made using the `key_generator`
@@ -249,8 +275,8 @@ module PropCheck
     #
     #    >> Generators.hash(Generators.printable_ascii_string, Generators.positive_integer).sample(5, size: 3, rng: Random.new(42))
     #    => [{""=>2, "g\\4"=>4, "rv"=>2}, {"7"=>2}, {"!"=>1, "E!"=>1}, {"kY5"=>2}, {}]
-    def hash(key_generator, value_generator)
-      array(tuple(key_generator, value_generator))
+    def hash(key_generator, value_generator, **kwargs)
+      array(tuple(key_generator, value_generator), **kwargs)
         .map(&:to_h)
     end
 
@@ -276,8 +302,8 @@ module PropCheck
     #
     #    >> Generators.alphanumeric_string.sample(5, size: 10, rng: Random.new(42))
     #    => ["ZCoQ", "8uM", "wkkx0JNx", "v0bxRDLb", "Gl5v8RyWA6"]
-    def alphanumeric_string
-      array(alphanumeric_char).map(&:join)
+    def alphanumeric_string(**kwargs)
+      array(alphanumeric_char, **kwargs).map(&:join)
     end
 
     @printable_ascii_chars = (' '..'~').to_a.freeze
@@ -302,8 +328,8 @@ module PropCheck
     #
     #    >> Generators.printable_ascii_string.sample(5, size: 10, rng: Random.new(42))
     #    => ["S|.g", "rvjjw7\"5T!", "=", "!_[4@", "Y"]
-    def printable_ascii_string
-      array(printable_ascii_char).map(&:join)
+    def printable_ascii_string(**kwargs)
+      array(printable_ascii_char, **kwargs).map(&:join)
     end
 
     @ascii_chars = [
@@ -341,8 +367,8 @@ module PropCheck
     #
     #    >> Generators.ascii_string.sample(5, size: 10, rng: Random.new(42))
     #    => ["S|.g", "drvjjw\b\a7\"", "!w=E!_[4@k", "x", "zZI{[o"]
-    def ascii_string
-      array(ascii_char).map(&:join)
+    def ascii_string(**kwargs)
+      array(ascii_char, **kwargs).map(&:join)
     end
 
     @printable_chars = [
@@ -372,8 +398,8 @@ module PropCheck
     #
     #    >> Generators.printable_string.sample(5, size: 10, rng: Random.new(42))
     #    => ["", "Ȍ", "𐁂", "Ȕ", ""]
-    def printable_string
-      array(printable_char).map(&:join)
+    def printable_string(**kwargs)
+      array(printable_char, **kwargs).map(&:join)
     end
 
     ##
@@ -398,8 +424,8 @@ module PropCheck
     #
     #    >> Generators.string.sample(5, size: 10, rng: Random.new(42))
     #    => ["\u{A3DB3}𠍜\u{3F46A}\u{1AEBC}", "􍙦𡡹󴇒\u{DED74}𪱣\u{43E97}ꂂ\u{50695}􏴴\u{C0301}", "\u{4FD9D}", "\u{C14BF}\u{193BB}𭇋󱣼\u{76B58}", "𦐺\u{9FDDB}\u{80ABB}\u{9E3CF}𐂽\u{14AAE}"]
-    def string
-      array(char).map(&:join)
+    def string(**kwargs)
+      array(char, **kwargs).map(&:join)
     end
 
     ##

data/lib/prop_check/version.rb

@@ -1,3 +1,3 @@
 module PropCheck
-  VERSION = '0.10.4'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prop_check
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Qqwy/Wiebe-Marten Wijnja