rantly 0.2.0 → 0.3.0

data/README.textile

@@ -194,7 +194,7 @@ Rant#sized(n,&block)
 Rant provides two methods that depends on the size
 
 <pre><code>
-Rant#array(*branches)
+Rant#array(size=default_size)
   returns a sized array consisted of elements by Rant#calling random branches.
 Rant#string(char_class=:print)
   returns a sized random string, consisted of only chars from a char_class.
@@ -220,13 +220,8 @@ The avaiable char classes for strings are:
 
 <pre><code>
 # sized 10 array of integer or float
-> gen.value { sized(10) { array(:integer,:float)}}
+> gen.value { array(10) { branch(:integer,:float)}}
 => [417733046, -375385433, 0.967812380000118, 26478621, 0.888588160450082, 250944144, 305584916, -151858342, 0.308123867823313, 0.316824642414253]
-
-# fails if you forget to set the size.
-> gen.value { array(:integer,:float)}
-RuntimeError: size not set
-
 </code></pre>
 
 If you set the size once, it applies to all subsequent recursive structures. Here's a sized 10 array of sized 10 strings,
@@ -239,7 +234,7 @@ If you set the size once, it applies to all subsequent recursive structures. Her
 Or a sized 10 array of sized 5 strings,
 
 <pre><code>
-> gen.value { sized(10) { array Proc.new {sized(5) {string}}}}
+> gen.value { array(10) { array(5) { string}}}
 => ["S\"jf ", "d\\F-$", "-_8pa", "IN0iF", "SxRV$", ".{kQ7", "6>;fo", "}.D8)", "P(tS'", "y0v/v"]
 </code></pre>
 
@@ -281,7 +276,7 @@ The check block takes the generated data as its argument. One idiom I find usefu
 should "generate right sized array" do
   property_of {
     len = integer
-    [len,sized(len) { array :integer }]
+    [len,array(len){integer}]
   }.check { |(len,arr)|
     assert_equal len, arr.length
   }

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :major: 0
-:minor: 2
+:minor: 3
 :patch: 0

data/lib/rantly.rb

@@ -5,3 +5,11 @@ class Rantly
 end
 
 require 'rantly/generator'
+
+def Rantly(n=1,&block)
+  if n > 1
+    Rantly.map(n,&block)
+  else
+    Rantly.value(&block)
+  end
+end

data/lib/rantly/generator.rb

@@ -204,9 +204,9 @@ class Rantly
     end
   end
 
-  def array(*freq_pairs)
+  def array(n=self.size,&block)
     acc = []
-    self.size.times { acc << freq(*freq_pairs) }
+    n.times { acc << self.instance_eval(&block) }
     acc
   end
 

data/lib/rantly/silly.rb

@@ -10,7 +10,7 @@ end
 module Rantly::Silly::Love
 
   def letter(n=3)
-    body = sized(n) { array(:paragraph) }.join "\n\n"
+    body = array(n){paragraph}.join "\n\n"
     <<-EOS
 #{address}:
 
@@ -43,7 +43,7 @@ EOS
   end
 
   def paragraph
-    sized(range(2,4)) { array(:sentence)}.join " "
+    array(range(2,4)){ sentence}.join " "
   end
 
   def sentence

data/rantly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rantly}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Howard Yeh"]
-  s.date = %q{2010-01-04}
+  s.date = %q{2010-01-12}
   s.email = %q{hayeah@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/test/rantly_test.rb

@@ -189,14 +189,14 @@ class RantlyTest::Generator < Test::Unit::TestCase
       assert o == 1 || o == 2
     }
     property_of {
-      arr = sized(10) { array(:integer) }
+      arr = sized(10) { array { integer } }
       choose(*arr) 
     }.check { |o|
       assert o.is_a?(Fixnum)
     }
     property_of {
       # array of array of ints
-      arr = sized(10) { array(Proc.new { array(:integer)})}
+      arr = sized(10) { array { array { integer }}}
       # choose an array from an array of arrays of ints
       choose(*arr)
     }.check { |arr|
@@ -210,7 +210,7 @@ class RantlyTest::Generator < Test::Unit::TestCase
   should "not pick an element with 0 frequency" do
     property_of {
       sized(10) {
-        array Proc.new { freq([0,:string],[1,:integer]) }
+        array { freq([0,:string],[1,:integer]) }
       }
     }.check { |arr|
       assert arr.all? { |o| o.is_a?(Integer)}
@@ -235,7 +235,7 @@ class RantlyTest::Generator < Test::Unit::TestCase
 
   should "generate empty array" do
     property_of {
-      sized(0) { array(:integer)}
+      sized(0) { array { integer }}
     }.check { |o|
       assert o.empty?
     }
@@ -245,7 +245,7 @@ class RantlyTest::Generator < Test::Unit::TestCase
     property_of {
       size1 = range(5,10)
       size2 = range(0,size1-1)
-      array = sized(size1) { array(Proc.new { sized(size2) { array(:integer)}})}
+      array = sized(size1) { array { array(size2) { integer }}}
       [size1,array]
     }.check { |(size1,outter_array)|
       assert_equal size1, outter_array.size
@@ -255,7 +255,7 @@ class RantlyTest::Generator < Test::Unit::TestCase
   
   should "generate array with right types" do
     property_of {
-      sized(10) { array :integer,:string,:float }
+      sized(10) { array { freq(:integer,:string,:float)}  }
     }.check { |arr|
       assert arr.all? { |o|
         case o

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rantly
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Howard Yeh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: []