mrproper 0.0.2 → 0.0.3

data/README.md

@@ -77,6 +77,8 @@ In addition to plain class names, we can feed `data` with more or less complex e
                                 # or [-44, "eB"]
     data [[Float]]              # generates arrays of arrays of floats
                                 # such as [[0.12, 3.41], [-2.31]]
+    data (1..10)                # generates integers between 1 and 10
+    data (0.0..10.0)            # generates floats between 1 and 10
     data({Symbol => String})    # generates hashes whose keys are symbols
                                 # and whose values are strings such as
                                 # {:tR=>"m", :aSKnsndwWK=>"QUrGwAAh"}
@@ -85,8 +87,13 @@ In addition to plain class names, we can feed `data` with more or less complex e
                                 # parser thinks we're defining a block `;)`)
     data({String => [Integer]}) # generates hashes whose keys are strings
                                 # and whose values are arrays of integers
+    data({:first => String,
+          :second => Integer})  # generates a hash with two keys, :first and
+                                # :second, each one with an String or Integer
+                                # value (this is specially useful for testing
+                                # methods with more than one parameter)
 
-In case this is not enough, you can just use a block and do whatever you want to generate the data:
+You can combine this cases ad infinitum, but in case this is not enough, you can just use a block and do whatever you want to generate the data:
 
     data do
       rand > 0.5 ? Wadus.new(rand(9)) : FooBar.new(rand(9))

data/lib/mrproper.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'mrproper/base'
 require 'mrproper/dsl'
+require 'mrproper/data_block'
 require 'mrproper/errors'
 require 'mrproper/core_extensions/string_extensions'
 

data/lib/mrproper/base.rb

@@ -8,8 +8,7 @@ module MrProper
       dsl.properties.each do |message, test_block|
         define_method "test_property: #{message.inspect}" do
           dsl.data_blocks.each do |data_block|
-            TESTS_PER_PROPERTY.times do
-              data = data_block.call
+            data_block.data.each do |data|
               begin
                 instance_exec(data, &test_block)
               rescue Test::Unit::AssertionFailedError, MiniTest::Assertion => e

data/lib/mrproper/data_block.rb

@@ -0,0 +1,76 @@
+module MrProper
+  
+  class DataBlock
+    
+    EXAMPLES_PER_PROPERTY = 200
+    
+    def initialize(spec = nil, &block)
+      @spec = spec
+      @block = block
+    end
+    
+    def data
+      EXAMPLES_PER_PROPERTY.times.map { call }.uniq
+    end
+    
+    def call
+      to_proc.call
+    end
+    
+    def to_proc
+      return @block if @block
+      
+      case @spec
+      when Array
+        if @spec.size == 1
+          Proc.new { rand(20).times.map { DataBlock.new(@spec.first).call } }
+        else
+          Proc.new { @spec.map { |s| DataBlock.new(s).call }}
+        end
+      when Hash
+        if @spec.size == 1
+          Proc.new do
+            {}.tap do |h|
+              rand(20).times.each do
+                h[DataBlock.new(@spec.keys.first).call] = DataBlock.new(@spec.values.first).call
+              end
+            end
+          end
+        else
+          Proc.new do
+            {}.tap do |h|
+              @spec.each do |k, v|
+                h[DataBlock.new(k).call] = DataBlock.new(v).call
+              end
+            end
+          end
+        end
+      when Range
+        case @spec.begin
+        when Integer
+          Proc.new { @spec.begin + rand(@spec.end - @spec.begin) }
+        when Float
+          Proc.new { @spec.begin + rand * (@spec.end - @spec.begin) }
+        else
+          Proc.new { @spec }
+        end
+      when Class
+        if @spec == Integer
+          DataBlock.new(-500..500).to_proc
+        elsif @spec == Float
+          DataBlock.new(-5.0..5.0).to_proc
+        elsif @spec == String
+          Proc.new { String.random(rand(10)) }
+        elsif @spec == Symbol
+          Proc.new { DataBlock.new(String).call.to_sym }
+        elsif @spec == NilClass
+          Proc.new { nil }
+        end
+      else
+        Proc.new { @spec }
+      end
+    end
+    
+  end
+  
+end

data/lib/mrproper/dsl.rb

@@ -1,7 +1,5 @@
 module MrProper
   
-  TESTS_PER_PROPERTY = 100
-  
   class DSL
     
     attr_reader :properties, :data_blocks
@@ -12,50 +10,13 @@ module MrProper
     end
     
     def data(spec = nil, &block)
-      @data_blocks << data_block(spec, &block)
+      @data_blocks << DataBlock.new(spec, &block)
     end
     
     def property(message, &block)
       @properties << [message, block]
     end
     
-    private
-    
-    def data_block(spec = nil, &block)
-      return block if block_given?
-      
-      case spec
-      when Array
-        if spec.size == 1
-          Proc.new { rand(20).times.map { data_block(spec.first).call } }
-        else
-          Proc.new { spec.map { |s| data_block(s).call }}
-        end
-      when Hash
-        Proc.new do
-          {}.tap do |h|
-            rand(20).times.each do
-              h[data_block(spec.keys.first).call] = data_block(spec.values.first).call
-            end
-          end
-        end
-      when Class
-        if spec == Integer
-          Proc.new { rand(1000) - 500 }
-        elsif spec == Float
-          Proc.new { rand * 10 - 10 }
-        elsif spec == String
-          Proc.new { String.random(rand(10)) }
-        elsif spec == Symbol
-          Proc.new { data_block(String).call.to_sym }
-        elsif spec == NilClass
-          Proc.new { nil }
-        end
-      else
-        Proc.new { spec }
-      end
-    end
-    
   end
   
 end

metadata

@@ -1,54 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mrproper
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Sergio Gil
-- Mari Carmen Gutiérrez
+- "Mari Carmen Guti\xC3\xA9rrez"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000Z
+
+date: 2011-11-25 00:00:00 Z
 dependencies: []
+
 description: 
 email: sgilperez@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - README.md
 - lib/mrproper/base.rb
 - lib/mrproper/core_extensions/string_extensions.rb
+- lib/mrproper/data_block.rb
 - lib/mrproper/dsl.rb
 - lib/mrproper/errors.rb
 - lib/mrproper.rb
 homepage: http://github.com/porras/mrproper
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Property Based Testing library
 test_files: []
+
+has_rdoc: