scorerb 0.0.1 → 0.0.2

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 tmp/
+tmp/*

data/lib/scorerb.rb

@@ -1,62 +1,68 @@
 module Scorerb
-  class ::String
-	def score(abrv, fuzzines = 0)
+    
+    def index_anycase(match)
+      self.index(match.upcase) || self.index(match.downcase)  
+    end    
 
-		# If strings are equal return exact one
-		return 1.0 if self == abrv
+
+	  def score(abrv, fuzzines = 0)
+
+		  # If strings are equal return exact one
+		  return 1.0 if self == abrv
 		
-		total_char_score = 0
-		fuzzies = 1
-		bonus_starting_string = false
-		abrv_size = abrv.size
-		word_size = self.size
-		word = self
-		final_score = 0
-
-		(0..abrv_size-1).each do |i|
-			char = abrv[i]
-			index_char_upper = word.index(char.upcase) || -1
-			index_char_lower = word.index(char.downcase) || -1
-			min_index = [index_char_upper, index_char_lower].min
+		  total_char_score = 0
+		  fuzzies = 1
+		  bonus_starting_string = false
+		  abrv_size = abrv.size
+		  word_size = self.size
+		  word = self
+		  final_score = 0
+
+		  (0..abrv_size-1).each do |i|
+			  char = abrv[i]
 			
-			index_in_string = min_index > -1 ? min_index : [index_char_upper, index_char_lower].max
+			  index_in_string = word.index_anycase(char)
 
-			if index_in_string == -1
-				if fuzzines > 0
-					fuzzies += 1 - fuzzines
-					next
-				else
-					return 0
-				end
-			else
-				char_score = 0.1
-			end
+			  if index_in_string.nil?
+				  if fuzzines > 0
+					  fuzzies += 1 - fuzzines
+					  next
+				  else
+					  return 0
+				  end
+			  else
+				  char_score = 0.1
+			  end
 
 
-			char_score += 0.1 if word[index_in_string] == char
+			  char_score += 0.1 if word[index_in_string] == char
 
-			if index_in_string == 0
-				char_score += 0.6
-				bonus_starting_string = i == 0
-			else
-				char_score += 0.8 if word[index_in_string - 1] == " "			
-			end
+			  if index_in_string == 0
+				  char_score += 0.6
+				  bonus_starting_string = i == 0
+			  else
+				  char_score += 0.8 if word[index_in_string - 1] == " "			
+			  end
 
-			word = word.slice index_in_string + 1, word.size
+			  word = word.slice index_in_string + 1, word.size
 
-			total_char_score += char_score
-		end
+			  total_char_score += char_score
+		  end
 
-		abrv_score = total_char_score / abrv_size
+		  abrv_score = total_char_score / abrv_size
 		
-		#Reduce penalty for longer words
-        final_score = ((abrv_score * (abrv_size/word_size)) + abrv_score) / 2
+		  #Reduce penalty for longer words
+          final_score = ((abrv_score * (abrv_size/word_size)) + abrv_score) / 2
 
-		#Reduce using fuzzies
-        final_score = final_score / fuzzies
+		  #Reduce using fuzzies
+          final_score = final_score / fuzzies
+
+		  final_score += 0.15 if bonus_starting_string && final_score <= 0.85
+		  final_score
+	  end
+
+end
 
-		final_score += 0.15 if bonus_starting_string && final_score <= 0.85
-		final_score
-	end
-  end
+class String
+  include Scorerb
 end

data/lib/scorerb/version.rb

@@ -1,3 +1,3 @@
 module Scorerb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/scorerb/scorerb_spec.rb

@@ -32,4 +32,18 @@ describe Scorerb do
 	it "should drop score with lower fuzzines" do
 		"Hi there".score("Hi thi", 0.1).should be < "Hi there".score("Hi thi", 0.8)
 	end
+
+  describe "finding first match unconsidering letters case" do
+    it "should find the first match given a lowercase" do
+      "Abc".index_anycase("a").should be == 0
+    end
+    it "should find the first match given a uppercase" do
+      "Abc".index_anycase("A").should be == 0
+    end
+
+    it "should return nothing if no matches" do
+      "Abc".index_anycase("Z").should be == nil
+    end
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: scorerb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bruno Tavares
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -03:00
+date: 2011-04-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency