kevintyll-ofac 1.1.9 → 1.1.10

data/History.txt

@@ -56,4 +56,11 @@
 * 1 minor enhancement:
   * Added a method, db_hit? for when your more concerned with speed than accuracy.  db_hit? will retun true if there is an exact name match
     in the ofac_sdn database.  This method ignores address and city and does not produce a score.
-    Usage: Ofac.new({:name => 'Oscar Hernandez', :city => 'Clearwater', :address => '123 somewhere ln'}).db_hit?
+    Usage: Ofac.new({:name => 'Oscar Hernandez', :city => 'Clearwater', :address => '123 somewhere ln'}).db_hit?
+
+
+== 1.1.10 2009-07-28
+
+* 1 minor enhancement:
+  * Modified the select in OfacSdn to use the city to pull records from the database.  This is another compromise to improve performance,
+    but still get a score.  The db_hit? method is still faster, but this will still calculate a score for accuracy.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 9
+:patch: 10
 :major: 1

data/lib/ofac/models/ofac.rb

@@ -147,9 +147,17 @@ class Ofac
         sql_alt_name_partial = name_array.collect {|partial_name| ["alternate_identity_name like ?", "%#{partial_name}%"]}
         conditions = sql_name_partial + sql_alt_name_partial
         conditions = conditions.transpose
-        conditions = [conditions.first.join(' or ')] + conditions.second
-
-        possible_sdns = OfacSdn.find_all_by_sdn_type('individual',:select => 'name, alternate_identity_name, address, city', :conditions => conditions)
+        unless @identity[:city].blank?
+          city_condition = ' and (city like ? or city is null)'
+        end
+        name_values = conditions.second
+        conditions = conditions.first.join(' or ')
+        conditions = "(#{conditions})"
+        conditions += city_condition if city_condition
+        condition_array = [conditions] + name_values
+        condition_array += ["%#{@identity[:city]}%"] if city_condition
+        
+        possible_sdns = OfacSdn.find_all_by_sdn_type('individual',:select => 'name, alternate_identity_name, address, city', :conditions => condition_array)
         possible_sdns = possible_sdns.collect {|sdn|{:name => "#{sdn['name']}|#{sdn['alternate_identity_name']}", :city => sdn['city'], :address => sdn['address']}}
      
         match = OfacMatch.new({:name => {:weight => 60, :token => "#{name_array.join(' ')}"},

data/test/files/test_address_data_load.pip

@@ -5,6 +5,6 @@
 39|29|"Bal Harbour Shopping Center, Via Italia"|"Panama City"|"Panama"|-0-
 41|41|"Avenida de Concha, Espina 8, E-28036"|"Madrid"|"Spain"|-0-
 41|102|-0- |-0- |-0- |-0-
-66|111|-0- |"Milan"|"Italy"|-0-
+66|111|-0- |-0- |"Italy"|-0-
 66|117|-0- |-0- |"Panama"|-0-
-66|125|"1840 West 49th Street"|"Hialeah, FL"|"United States"|-0-
+66|125|"1840 West 49th Street"|-0- |"United States"|-0-

data/test/files/valid_flattened_file.csv

@@ -11,9 +11,9 @@
 ``|`AEROTAXI EJECUTIVO, S.A.`|``|`CUBA`|``|``|``|``|``|``|``|``|`Bal Harbour Shopping Center, Via Italia`|`Panama City`|`Panama`|``|``|``|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
 ``|`AGENCIA DE VIAJES GUAMA`|``|`CUBA`|``|``|``|``|``|``|``|``|`Avenida de Concha, Espina 8, E-28036`|`Madrid`|`Spain`|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
 ``|`AGENCIA DE VIAJES GUAMA`|``|`CUBA`|``|``|``|``|``|``|``|``|``|``|``|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
-``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|``|`Milan`|`Italy`|``|`aka`|`BNC`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
-``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|``|`Milan`|`Italy`|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
+``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|``|``|`Italy`|``|`aka`|`BNC`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
+``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|``|``|`Italy`|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
 ``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|``|``|`Panama`|``|`aka`|`BNC`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
 ``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|``|``|`Panama`|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
-``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|`1840 West 49th Street`|`Hialeah, FL`|`United States`|``|`aka`|`BNC`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
-``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|`1840 West 49th Street`|`Hialeah, FL`|`United States`|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
+``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|`1840 West 49th Street`|``|`United States`|``|`aka`|`BNC`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`
+``|`AGUIAR, Raul`|`individual`|`CUBA`|`Director, Banco Nacional de Cuba`|``|``|``|``|``|``|`; Director, Banco Nacional de Cuba.`|`1840 West 49th Street`|``|`United States`|``|`aka`|`NATIONAL BANK OF CUBA`|``|`2009-05-06 15:55:24`|`2009-05-06 15:55:24`

data/test/ofac_test.rb

@@ -22,9 +22,6 @@ class OfacTest < Test::Unit::TestCase
       assert_equal 0, Ofac.new({:name => 'Kevin T P'}).score
       assert_equal 0, Ofac.new({:name => "O'Brian"}).score
       assert_equal 0, Ofac.new({:name => {:first_name => 'Matthew',:last_name => "O'Brian"}}).score
-    end
-
-    should "give a score of 0 if there is no name match but there is an address and city match" do
       assert_equal 0, Ofac.new({:name => 'Kevin', :address => '123 somewhere ln', :city => 'Clearwater'}).score
     end
 
@@ -47,19 +44,15 @@ class OfacTest < Test::Unit::TestCase
       assert_equal 60, Ofac.new({:name => {:last_name => 'Oscar'}}).score
     end
 
-    should "deduct scores for non matches on address and city if data is in the database" do
+    should "deduct scores for non matches on address if data is in the database" do
       #if there is data for address or city in the database, and that info is passed in, then 10%
-      #of the weight will be deducted if there is not match or sounds like match
+      #of the weight will be deducted if there is no match or sounds like match
 
-      #only name matches
-      assert_equal 56, Ofac.new({:name => 'Oscar Hernandez', :city => 'no match', :address => 'no match'}).score
-      #only name matches
-      assert_equal 56, Ofac.new({:name => 'Oscar Hernandez', :city => 'Las Vegas', :address => 'no match'}).score
       #name and city match
       assert_equal 89, Ofac.new({:name => 'Oscar Hernandez', :city => 'Clearwater', :address => 'no match'}).score
-      #city is a partial match - Clearwater matches, but not Bay
-      #score = 60 for name + 15 for Clearwater - (15 * .1) for Bay = 73.5
-      assert_equal 74, Ofac.new({:name => 'Oscar Hernandez', :city => 'Clearwater Bay'}).score
+      #the record is pulled because clear is like clearwater, but it's not a match
+      #score = 60 for name  - (30 * .1) for Clear = 57
+      assert_equal 57, Ofac.new({:name => 'Oscar Hernandez', :city => 'Clear'}).score
     end
 
     should "not deduct from score if no data for city or address is in the database" do
@@ -80,6 +73,20 @@ class OfacTest < Test::Unit::TestCase
       assert_equal 90, Ofac.new({:name => 'Oscar Hernandez', :city => 'Clearwater'}).score
     end
 
+    should "not find a match if the city does not match" do
+      assert_equal 0, Ofac.new({:name => 'Oscar Hernandez', :city => 'Tampa'}).score
+      #only name matches
+      assert_equal 0, Ofac.new({:name => 'Oscar Hernandez', :city => 'no match', :address => 'no match'}).score
+    end
+
+    should "find a match if the city is not passed in" do
+      assert_equal 60, Ofac.new({:name => 'Oscar Hernandez'}).score
+    end
+
+    should "find a match if the city is not in the database" do
+      assert_equal 60, Ofac.new({:name => 'Raul AGUIAR'}).score
+    end
+
     should "give a score of 100 if there is a name and city and address match" do
       assert_equal 100, Ofac.new({:name => 'Oscar Hernandez', :city => 'Clearwater', :address => '123 somewhere ln'}).score
     end
@@ -141,5 +148,6 @@ class OfacTest < Test::Unit::TestCase
       sdn = Ofac.new({:name => 'Oscar de la Hernandez', :city => 'bad city', :address => 'bad address'})
       assert !sdn.db_hit?
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kevintyll-ofac
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors: 
 - Kevin Tyll
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -07:00
+date: 2009-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +48,7 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/kevintyll/ofac
+licenses: 
 post_install_message: |-
   For more information on ofac, see http://kevintyll.github.com/ofac/
   
@@ -79,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Attempts to find a hit on the Office of Foreign Assets Control's Specially Designated Nationals list.