heuristics 1.0.1 → 1.0.2

data/README.md

@@ -41,6 +41,9 @@ Or install it yourself as:
 
 ## Usage
 
+**NOTE**: Order matters. First assumption to return true for all conditions will be used.
+This means you should write your assumptions in the order from most specific to least specfic.
+
     # Creates a new heuristic named :field_tester
     Heuristics.define(:field_tester) do
     
@@ -67,10 +70,19 @@ Or install it yourself as:
     # Returns :hash_with_values in this case
     Heuristics.test(:field_tester, {a: 1})
     
+**Test an array of value** (Also shows of using heuristic without a name):
+  Heuristics.define do
+    
+    # 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 } }} 
+  end
     
-    NOTE:
-    Order matters. First assumption to return true for all conditions will be used.
-    This means you should write your assumptions in the order from most specific to least specfic.
+  Heuristics.test([1,2,3,'23.09.85','1','2','3','4']) # returns :string
+
     
 ## Contributing
 

data/lib/heuristics.rb

@@ -8,12 +8,12 @@ module Heuristics
 	class << self
 		@@testers = {}
 		
-		def define(name, &block)
+		def define(name = :default, &block)
 			raise "A heuristic with the name '#{name}' already exists" unless @@testers[name].nil?
 			@@testers[name] = Tester.new(Docile.dsl_eval(Builder.new, &block))
 		end
 		
-		def test(name, value)
+		def test(value, name = :default)
 			unless @@testers.key? name
 				raise "Heuristic named #{name} hasn't been defined."
 			else

data/lib/heuristics/tester.rb

@@ -5,7 +5,28 @@ module Heuristics
 		end
 		
 		def test(value)
-			@builder.tests.map{|k, e| e.check(value) ? k : nil }.reject(&:nil?).first || @builder.default
+			freq = Frequency.new
+			[*value].map do |v|
+				freq.add(@builder.tests.map{|k, e| e.check(v) ? k : nil }.reject(&:nil?).first || @builder.default)
+			end
+			
+			freq.list.keys.first
+		end
+		
+		private
+		class Frequency
+			def initialize()
+				@storage = {}
+			end
+			
+			def add(name)
+				@storage[name] ||= 0
+				@storage[name] += 1
+			end
+			
+			def list
+				Hash[@storage.sort_by{|key, value| value }.reverse]
+			end
 		end
 	end
 end

data/lib/heuristics/version.rb

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

data/test/lib/heuristics/functional_test.rb

@@ -1,36 +1,15 @@
 require_relative '../../test_helper'
 
 describe Heuristics do
-	before do
-		# @default = Heuristics.define do
-		# 	
-		# 	assume_default :string
-		# 	
-		# 	assume :integer do
-		# 		condition { value =~ /\A\d+\Z/ }
-		# 	end
-		# 	
-		# 	assume :email do
-		# 		condition { value =~ /\A.*@.*\Z/}
-		# 	end
-		# 	
-		# 	assume :date_of_birth do
-		# 		require 'chronic'
-		# 		
-		# 		condition { Chronic.parse(value) }
-		# 	end
-		# 	
-		# 	assume :phone_number do
-		# 		condition { value.starts_with? '+353' } and
-		# 		condition { value.scan(/\d/).length > 5 }
-		# 	end
-		# end
+	it 'should allow skipping the heuristics name' do
+		Heuristics.define { assume_default :string; assume(:email) { condition { 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.test(:external_lib_test, '23.09.85').must_equal :date
+		Heuristics.test('23.09.85', :external_lib_test).must_equal :date
 	end
 	
 	it 'should return the assumption that first matched all conditions' do
@@ -43,19 +22,19 @@ describe Heuristics do
 			assume(:string) { condition { value.instance_of? String } } 
 		end
 
-		Heuristics.test(:first_come_first_serve, '23.09.85').must_equal :date
-		Heuristics.test(:first_come_first_serve, '27').must_equal :integer_string
-		Heuristics.test(:first_come_first_serve, 'This is string').must_equal :string
+		Heuristics.test('23.09.85', :first_come_first_serve).must_equal :date
+		Heuristics.test('27', :first_come_first_serve).must_equal :integer_string
+		Heuristics.test('This is string', :first_come_first_serve).must_equal :string
 	end
 	
 	it 'should return default if no assumptions are true' do
 		Heuristics.define(:default_test) { assume_default :string; assume(:email) { condition { false } } }
-		Heuristics.test(:default_test, 1).must_equal :string
+		Heuristics.test(1, :default_test).must_equal :string
 	end
 	
 	it 'should return nil if no default is set' do
 		Heuristics.define(:default_test2) { assume(:nothing) { condition { false } } }
-		Heuristics.test(:default_test2, 1).must_be :nil?
+		Heuristics.test(1, :default_test2).must_be :nil?
 	end
 	
 	it 'should return the first true assumption' do
@@ -64,12 +43,25 @@ describe Heuristics do
 			assume(:string)	{ condition { value.instance_of? String } }
 			assume(:hash)		{ condition { value.instance_of? String } }
 		end
-		Heuristics.test(:assumption_test, 'abc').must_equal :string
+		Heuristics.test('abc', :assumption_test).must_equal :string
 	end
 	
 	it 'should support complex types' do
 		Heuristics.define(:complex_test) { assume_default :integer; assume(:test) { condition { value[:hepp] } } }
-		Heuristics.test(:complex_test, []).must_equal :integer
+		Heuristics.test(Object.new, :complex_test).must_equal :integer
+	end
+	
+	it 'should determine the most frequent type of an array' 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 } }
+		end
+		
+		Heuristics.test([1,2,3,'a','b','c','d'], :array_test).must_equal :string
+		Heuristics.test([1,2,'a','b','c','23.09.85','23.09.85','23.09.85','23.09.85'], :array_test).must_equal :date
 	end
 	
 	it 'should raise an exception if trying to create a heuristic with a name that already exists ' do

metadata

@@ -2,14 +2,14 @@
 name: heuristics
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Peter Haza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement