scorerb 0.0.3a → 0.1.0

data/README.md

@@ -26,8 +26,18 @@ It's simple:
 >	"Abc".score "A" # without fuzzines
 >       
 >       "Abc".score "azb" 0.2 # with fuzzines (0..1)
+>       
+>       ["abc","AB","a"].score "A"
 > 
 
+## Options
+
+### String
+        "Hello".score "He", fuzzines = 0 
+
+### Array
+        [1,2,3].score "1", :fuzz => 0, :to_s => false 
+
 ## Credits
 
 It's based on the [string_score](https://github.com/joshaven/string_score) from [Joshaven Potter](https://github.com/joshaven/).

data/lib/scorerb.rb

@@ -1,68 +1,10 @@
-module Scorerb
-    
-    def index_anycase(match)
-      self.index(match.upcase) || self.index(match.downcase)  
-    end    
-
-
-	  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_in_string = word.index_anycase(char)
-
-			  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
-
-			  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
-
-			  total_char_score += char_score
-		  end
-
-		  abrv_score = total_char_score / abrv_size
-		
-		  #Reduce penalty for longer words
-          final_score = ((abrv_score * (abrv_size/word_size)) + abrv_score) / 2
-
-		  #Reduce using fuzzies
-          final_score = final_score / fuzzies
-
-		  final_score += 0.15 if bonus_starting_string && final_score <= 0.85
-		  final_score
-	  end
+require "scorerb/string"
+require "scorerb/array"
 
+class String
+  include Scorerb::String
 end
 
-class String
-  include Scorerb
+class Array
+  include Scorerb::Array
 end

data/lib/scorerb/array.rb

@@ -0,0 +1,18 @@
+module Scorerb
+  module Array
+    OPTIONS = {:fuzz => 0, :to_S => false}
+    
+    def score(string, options = {})
+      return nil if empty?
+      optional = OPTIONS.merge(options)
+      matches = {}
+      each do |against|
+        against = against.to_s if optional[:to_s]
+        current_score = { against => string.score(against, optional[:fuzz]) } 
+        matches.update(current_score)
+      end
+      matches
+    end
+
+  end
+end

data/lib/scorerb/string.rb

@@ -0,0 +1,65 @@
+module Scorerb
+    module String
+      def index_anycase(match)
+        self.index(match.upcase) || self.index(match.downcase)  
+      end    
+
+
+	    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_in_string = word.index_anycase(char)
+
+			    if index_in_string.nil?
+				    if fuzzines > 0
+					    fuzzies += 1 - fuzzines
+					    next
+				    else
+					    return 0
+				    end
+			    else
+				    char_score = 0.1
+			    end
+
+          #The current char is in the same position?
+			    char_score += 0.1 if word[index_in_string] == char
+
+          #If starting the word
+			    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
+
+			    total_char_score += char_score
+		    end
+
+		    abrv_score = total_char_score / abrv_size
+		
+		    #Reduce penalty for longer words
+            final_score = ((abrv_score * (abrv_size/word_size)) + abrv_score) / 2
+
+		    #Reduce using fuzzies
+            final_score = final_score / fuzzies
+
+		    final_score += 0.15 if bonus_starting_string && final_score <= 0.85
+		    final_score
+	    end
+  end
+end

data/lib/scorerb/version.rb

@@ -1,3 +1,3 @@
 module Scorerb
-  VERSION = "0.0.3a"
+  VERSION = "0.1.0"
 end

data/scorerb.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Bruno Tavares"]
   s.email       = ["bruno.exz@gmail.com"]
   s.homepage    = ""
-  s.summary     = %q{Simple fuzzy search for your strings}
-  s.description = %q{With that gem you have the ability to check one string against other and get the score}
+  s.summary     = %q{Simple fuzzy search for your strings and arrays}
+  s.description = %q{With that gem you have the ability to check one string against other, string against an array and get the score for the matches}
 
 
   s.files         = `git ls-files`.split("\n")

data/spec/scorerb/scorerb_array_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Scorerb::Array do 
+
+	it "should add score method to arrays" do
+		[].should respond_to :score
+	end
+	
+	it "should return an hash for score arrays" do
+	  result = { "Hello" => 1, "Hel" => 0.4000000000000001, "Hi" => 0 }
+		["Hello", "Hel", "Hi"].score("Hello").should be == result
+	end
+
+  it "should accept fuzzines" do
+    result = { "Hello" => 1, "Hel" => 0.4000000000000001, "Hi" => 0.2833333333333333 }
+		["Hello", "Hel", "Hi"].score("Hello", :fuzz => 0.5 ).should be == result
+  end
+
+  it "should return nil for empty arrays" do
+    [].score("Hello").should be == nil    
+  end
+
+  it "should accept option to convert everything to string" do
+    result = {"1" => 1 , "2" => 0, "3" => 0}
+    [1,2,3].score("1", :to_s => true).should be == result
+  end
+
+  it "should accept all the options together" do
+    result = {"1" => 1 , "12" => 0.55, "113" => 0.41666666666666663 }
+    [1,12,113].score("1", :to_s => true, :fuzz => 0.5 ).should be == result
+  end
+end

data/spec/scorerb/{scorerb_spec.rb → scorerb_string_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Scorerb do
+describe Scorerb::String do
 	it "should add score method to strings" do
 		"".should respond_to :score
 	end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: scorerb
 version: !ruby/object:Gem::Version 
-  prerelease: 5
-  version: 0.0.3a
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Bruno Tavares
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 -03:00
-default_executable: 
+date: 2011-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -24,7 +23,7 @@ dependencies:
         version: 2.5.0
   type: :development
   version_requirements: *id001
-description: With that gem you have the ability to check one string against other and get the score
+description: With that gem you have the ability to check one string against other, string against an array and get the score for the matches
 email: 
 - bruno.exz@gmail.com
 executables: []
@@ -40,11 +39,13 @@ files:
 - README.md
 - Rakefile
 - lib/scorerb.rb
+- lib/scorerb/array.rb
+- lib/scorerb/string.rb
 - lib/scorerb/version.rb
 - scorerb.gemspec
-- spec/scorerb/scorerb_spec.rb
+- spec/scorerb/scorerb_array_spec.rb
+- spec/scorerb/scorerb_string_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -62,16 +63,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Simple fuzzy search for your strings
+summary: Simple fuzzy search for your strings and arrays
 test_files: 
-- spec/scorerb/scorerb_spec.rb
+- spec/scorerb/scorerb_array_spec.rb
+- spec/scorerb/scorerb_string_spec.rb
 - spec/spec_helper.rb
+has_rdoc: