kevintyll-ofac 1.1.7 → 1.1.8

data/History.txt

@@ -43,4 +43,10 @@
 == 1.1.7 2009-06-30
 
 * 1 bug fix:
-  * fixed error when passing a nil value into the new :first_name or :last_name hash values when initializing the Ofac object.
+  * fixed error when passing a nil value into the new :first_name or :last_name hash values when initializing the Ofac object.
+
+== 1.1.8 2009-06-30
+
+* 1 bug fix:
+  * Refactored the select on OfacSdn to use the AR connection instead of building sql and using the raw connection.  Fixes a bug
+    introducted in 1.1.6 where quotes in the name raised an error.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 7
+:patch: 8
 :major: 1

data/lib/ofac/models/ofac.rb

@@ -120,14 +120,13 @@ class Ofac
 
       name_array.delete_if{|n| n.strip.size < 2}
       unless name_array.empty?
-        sql_name_partial = name_array.collect {|partial_name| "name like '%#{partial_name}%'"}.join(' or ')
-        sql_alt_name_partial = name_array.collect {|partial_name| "alternate_identity_name like '%#{partial_name}%'"}.join(' or ')
-        possible_sdns = OfacSdn.connection.select_all("select name, alternate_identity_name, address, city
-                                from ofac_sdns
-                                where name is not null
-                                and sdn_type = 'individual'
-                                and (#{sql_name_partial}
-                                or #{sql_alt_name_partial})")
+        sql_name_partial = name_array.collect {|partial_name| ["name like ?", "%#{partial_name}%"]}
+        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)
         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/ofac_test.rb

@@ -20,6 +20,8 @@ class OfacTest < Test::Unit::TestCase
 
     should "give a score of 0 if there is no name match" do
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kevintyll-ofac
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors: 
 - Kevin Tyll