heuristics 1.0.2 → 2.0.0

data/README.md

@@ -7,9 +7,9 @@ A typical simple example can look like this:
     Heuristics.define(:field_tester) do
     	assume_default :integer
 	
-    	assume(:date) { condition { Chronic.parse(value) } }
-    	assume(:string) { condition { value.instance_of? String } }
-    	assume(:hash) { condition { value.instance_of? Hash } } 
+    	assume(:date) { Chronic.parse(value) }
+    	assume(:string) { value.instance_of? String }
+    	assume(:hash) { value.instance_of? Hash } 
     end
 
 Then you can use it like this
@@ -20,10 +20,6 @@ Then you can use it like this
     # Returns :date
     Heuristics.test(:field_tester, '23.09.1985')
 
-    # Falls back to :integer per assume_default. None of the other assumptions returned trus
-    Heuristics.test(:field_tester, [])
-
-
 
 ## Installation
 
@@ -52,16 +48,16 @@ This means you should write your assumptions in the order from most specific to
 
       # Assummption with multiple conditions. Returns :hash_with_values
       # if all conditions return true
-      assume(:hash_with_values)		do
-        condition { value.instance_of? Hash }
-        condition { value.keys.size > 0 }
+      assume(:hash_with_values) do
+        value.instance_of? Hash
+        value.keys.size > 0
       }
 
       # An assumption that will return :date if all conditions return true
-      assume(:date) { condition { Chronic.parse(value) != nil } }
+      assume(:date) { Chronic.parse(value) != nil }
       
       # An assumption that will return :string if all conditions return true
-      assume(:string)	{ condition { value.instance_of? String } }
+      assume(:string) { value.instance_of? String }
     end
     
     
@@ -76,9 +72,9 @@ This means you should write your assumptions in the order from most specific to
     # Default value to return if no assumptions match
     assume_default :set
 
-    assume(:date) { condition { Chronic.parse(value) != nil } }
-    assume(:string)	{ condition { value.instance_of? String } } }
-    assume(:integer)	{ condition { value.instance_of? Fixnum } }} 
+    assume(:date) { Chronic.parse(value) != nil }
+    assume(:string) { value.instance_of? String }
+    assume(:integer) { value.instance_of? Fixnum }
   end
     
   Heuristics.test([1,2,3,'23.09.85','1','2','3','4']) # returns :string

data/lib/heuristics.rb

@@ -1,6 +1,5 @@
 require 'docile'
 require 'heuristics/builder'
-require 'heuristics/condition_evaluator'
 require 'heuristics/tester'
 require 'heuristics/version'
 

data/lib/heuristics/builder.rb

@@ -1,14 +1,24 @@
+require 'ostruct'
+
 module Heuristics
 	class Builder
-		attr_reader :tests, :default
+		attr_reader :assumptions, :default
 		
 		def initialize
-			@tests = {}
+			@assumptions = {}
 		end
 		
 		def assume(type, &block)
-			raise "An assumption with the name '#{type}' already exists" unless @tests[type].nil?
-			@tests[type] = Docile.dsl_eval(ConditionEvaluator.new, &block)
+			raise "An assumption with the name '#{type}' already exists" unless @assumptions[type].nil?
+			@assumptions[type] = Proc.new(&block)
+		end
+		
+		def check(value)
+			context = OpenStruct.new(value: value)
+			
+			@assumptions.map do |type, prok|
+				(context.instance_eval(&prok) ? type : default) rescue default
+			end.reject(&:nil?).first
 		end
 		
 		def assume_default(type)

data/lib/heuristics/tester.rb

@@ -7,7 +7,7 @@ module Heuristics
 		def test(value)
 			freq = Frequency.new
 			[*value].map do |v|
-				freq.add(@builder.tests.map{|k, e| e.check(v) ? k : nil }.reject(&:nil?).first || @builder.default)
+				freq.add(@builder.check(v) || @builder.default)
 			end
 			
 			freq.list.keys.first

data/lib/heuristics/version.rb

@@ -1,3 +1,3 @@
 module Heuristics
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/test/lib/heuristics/builder_test.rb

@@ -2,7 +2,7 @@ require_relative '../../test_helper'
 
 describe Heuristics::Builder do
   it 'should respond to #tests' do
-		Heuristics::Builder.new.must_respond_to :tests
+		Heuristics::Builder.new.must_respond_to :assumptions
   end
 	
 	it 'must allow setting a default assumption' do

data/test/lib/heuristics/functional_test.rb

@@ -2,13 +2,13 @@ require_relative '../../test_helper'
 
 describe Heuristics do
 	it 'should allow skipping the heuristics name' do
-		Heuristics.define { assume_default :string; assume(:email) { condition { false } } }
+		Heuristics.define { assume_default :string; assume(:email) { false } }
 		Heuristics.test(1).must_equal :string
 	end
 	
 	it 'should allow to use external libs for testing' do
 		require 'chronic'
-		Heuristics.define(:external_lib_test) { assume(:date) { condition { Chronic.parse(value) != nil } } }
+		Heuristics.define(:external_lib_test) { assume(:date) { Chronic.parse(value) != nil } }
 		Heuristics.test('23.09.85', :external_lib_test).must_equal :date
 	end
 	
@@ -17,9 +17,9 @@ describe Heuristics do
 		Heuristics.define(:first_come_first_serve) do
 			assume_default nil # This is implicit anyway
 			
-			assume(:date) { condition { Chronic.parse(value) != nil } } 
-			assume(:integer_string) { condition { value =~ /\A\d+\Z/ } }
-			assume(:string) { condition { value.instance_of? String } } 
+			assume(:date) { Chronic.parse(value) != nil }
+			assume(:integer_string) { value =~ /\A\d+\Z/ }
+			assume(:string) { value.instance_of? String }
 		end
 
 		Heuristics.test('23.09.85', :first_come_first_serve).must_equal :date
@@ -40,8 +40,8 @@ describe Heuristics do
 	it 'should return the first true assumption' do
 		Heuristics.define(:assumption_test) do 
 			assume_default :integer
-			assume(:string)	{ condition { value.instance_of? String } }
-			assume(:hash)		{ condition { value.instance_of? String } }
+			assume(:string)	{ value.instance_of? String }
+			assume(:hash)		{ value.instance_of? Hash }
 		end
 		Heuristics.test('abc', :assumption_test).must_equal :string
 	end
@@ -55,9 +55,9 @@ describe Heuristics do
 		require 'chronic'
 		
 		Heuristics.define(:array_test) do 
-			assume(:date) { condition { Chronic.parse(value) } }
-			assume(:string) { condition { value.instance_of? String } } 
-			assume(:integer) { condition { value.instance_of? Fixnum } }
+			assume(:date) { Chronic.parse(value) }
+			assume(:string) { value.instance_of? String } 
+			assume(:integer) {  value.instance_of? Fixnum }
 		end
 		
 		Heuristics.test([1,2,3,'a','b','c','d'], :array_test).must_equal :string

metadata

@@ -2,14 +2,14 @@
 name: heuristics
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Haza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,6 @@ files:
 - heuristics.gemspec
 - lib/heuristics.rb
 - lib/heuristics/builder.rb
-- lib/heuristics/condition_evaluator.rb
 - lib/heuristics/tester.rb
 - lib/heuristics/version.rb
 - test/lib/heuristics/builder_test.rb

data/lib/heuristics/condition_evaluator.rb

@@ -1,20 +0,0 @@
-require 'ostruct'
-
-module Heuristics
-	class ConditionEvaluator		
-		
-		def initialize
-			@conditions = []
-		end
-		
-		def condition(&block)
-			@conditions << Proc.new(&block)
-		end
-		
-		def check(value)
-			context = OpenStruct.new(value: value)
-			
-			@conditions.map{|cond| context.instance_eval(&cond) rescue false}.reject{|v| v}.length == 0
-		end
-	end
-end