ofac 1.2.4 → 1.2.5

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.5 2012-02-15
+
+*  1 enhancements:
+   * didn't add the proxy everywhere
+
 == 1.2.4 2012-02-14
 
 *  1 enhancements:

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 4
+:patch: 5
 :build: 

data/lib/ofac/models/ofac_sdn_loader.rb

@@ -15,9 +15,8 @@ class OfacSdnLoader
     uri = URI.parse('http://www.treasury.gov/ofac/downloads/sdn.pip')
 
     proxy_addr, proxy_port = ENV['http_proxy'].gsub("http://", "").split(/:/) if ENV['http_proxy']
-    proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
 
-    bytes = sdn.write(Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user, proxy_pass).get(uri))
+    bytes = sdn.write(Net::HTTP::Proxy(proxy_addr, proxy_port).get(uri))
     sdn.rewind
     if bytes == 0 || convert_line_to_array(sdn.readline).size != 12
       puts "Trouble downloading file.  The url may have changed."
@@ -27,10 +26,10 @@ class OfacSdnLoader
       sdn.rewind
     end
     address = Tempfile.new('sdn')
-    address.write(Net::HTTP.get(URI.parse('http://www.treasury.gov/ofac/downloads/add.pip')))
+    address.write(Net::HTTP::Proxy(proxy_addr, proxy_port).get(URI.parse('http://www.treasury.gov/ofac/downloads/add.pip')))
     address.rewind
     alt = Tempfile.new('sdn')
-    alt.write(Net::HTTP.get(URI.parse('http://www.treasury.gov/ofac/downloads/alt.pip')))
+    alt.write(Net::HTTP::Proxy(proxy_addr, proxy_port).get(URI.parse('http://www.treasury.gov/ofac/downloads/alt.pip')))
     alt.rewind
 
     if OfacSdn.connection.kind_of?(ActiveRecord::ConnectionAdapters::MysqlAdapter)

data/ofac.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ofac}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kevin Tyll}]
-  s.date = %q{2012-02-14}
+  s.date = %q{2012-02-15}
   s.description = %q{Attempts to find a hit on the Office of Foreign Assets Control's Specially Designated Nationals list.}
   s.email = %q{kevintyll@gmail.com}
   s.extra_rdoc_files = [

data/rdoc/OfacSdnLoader.html

@@ -161,9 +161,8 @@ href="http://www.treas.gov/offices/enforcement/ofac/sdn/delimit/index.shtml">www
   <span class="ruby-identifier">uri</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-string">'http://www.treasury.gov/ofac/downloads/sdn.pip'</span>)
 
   <span class="ruby-identifier">proxy_addr</span>, <span class="ruby-identifier">proxy_port</span> = <span class="ruby-constant">ENV</span>[<span class="ruby-string">'http_proxy'</span>].<span class="ruby-identifier">gsub</span>(<span class="ruby-string">&quot;http://&quot;</span>, <span class="ruby-string">&quot;&quot;</span>).<span class="ruby-identifier">split</span>(<span class="ruby-regexp">/:/</span>) <span class="ruby-keyword">if</span> <span class="ruby-constant">ENV</span>[<span class="ruby-string">'http_proxy'</span>]
-  <span class="ruby-identifier">proxy_user</span>, <span class="ruby-identifier">proxy_pass</span> = <span class="ruby-identifier">uri</span>.<span class="ruby-identifier">userinfo</span>.<span class="ruby-identifier">split</span>(<span class="ruby-regexp">/:/</span>) <span class="ruby-keyword">if</span> <span class="ruby-identifier">uri</span>.<span class="ruby-identifier">userinfo</span>
 
-  <span class="ruby-identifier">bytes</span> = <span class="ruby-identifier">sdn</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span><span class="ruby-operator">::</span><span class="ruby-constant">Proxy</span>(<span class="ruby-identifier">proxy_addr</span>, <span class="ruby-identifier">proxy_port</span>, <span class="ruby-identifier">proxy_user</span>, <span class="ruby-identifier">proxy_pass</span>).<span class="ruby-identifier">get</span>(<span class="ruby-identifier">uri</span>))
+  <span class="ruby-identifier">bytes</span> = <span class="ruby-identifier">sdn</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span><span class="ruby-operator">::</span><span class="ruby-constant">Proxy</span>(<span class="ruby-identifier">proxy_addr</span>, <span class="ruby-identifier">proxy_port</span>).<span class="ruby-identifier">get</span>(<span class="ruby-identifier">uri</span>))
   <span class="ruby-identifier">sdn</span>.<span class="ruby-identifier">rewind</span>
   <span class="ruby-keyword">if</span> <span class="ruby-identifier">bytes</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">convert_line_to_array</span>(<span class="ruby-identifier">sdn</span>.<span class="ruby-identifier">readline</span>).<span class="ruby-identifier">size</span> <span class="ruby-operator">!=</span> <span class="ruby-value">12</span>
     <span class="ruby-identifier">puts</span> <span class="ruby-string">&quot;Trouble downloading file.  The url may have changed.&quot;</span>
@@ -173,10 +172,10 @@ href="http://www.treas.gov/offices/enforcement/ofac/sdn/delimit/index.shtml">www
     <span class="ruby-identifier">sdn</span>.<span class="ruby-identifier">rewind</span>
   <span class="ruby-keyword">end</span>
   <span class="ruby-identifier">address</span> = <span class="ruby-constant">Tempfile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-string">'sdn'</span>)
-  <span class="ruby-identifier">address</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">get</span>(<span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-string">'http://www.treasury.gov/ofac/downloads/add.pip'</span>)))
+  <span class="ruby-identifier">address</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span><span class="ruby-operator">::</span><span class="ruby-constant">Proxy</span>(<span class="ruby-identifier">proxy_addr</span>, <span class="ruby-identifier">proxy_port</span>).<span class="ruby-identifier">get</span>(<span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-string">'http://www.treasury.gov/ofac/downloads/add.pip'</span>)))
   <span class="ruby-identifier">address</span>.<span class="ruby-identifier">rewind</span>
   <span class="ruby-identifier">alt</span> = <span class="ruby-constant">Tempfile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-string">'sdn'</span>)
-  <span class="ruby-identifier">alt</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">get</span>(<span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-string">'http://www.treasury.gov/ofac/downloads/alt.pip'</span>)))
+  <span class="ruby-identifier">alt</span>.<span class="ruby-identifier">write</span>(<span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span><span class="ruby-operator">::</span><span class="ruby-constant">Proxy</span>(<span class="ruby-identifier">proxy_addr</span>, <span class="ruby-identifier">proxy_port</span>).<span class="ruby-identifier">get</span>(<span class="ruby-constant">URI</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-string">'http://www.treasury.gov/ofac/downloads/alt.pip'</span>)))
   <span class="ruby-identifier">alt</span>.<span class="ruby-identifier">rewind</span>
 
   <span class="ruby-keyword">if</span> <span class="ruby-constant">OfacSdn</span>.<span class="ruby-identifier">connection</span>.<span class="ruby-identifier">kind_of?</span>(<span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">ConnectionAdapters</span><span class="ruby-operator">::</span><span class="ruby-constant">MysqlAdapter</span>)

data/rdoc/created.rid

@@ -1,8 +1,8 @@
-Tue, 14 Feb 2012 14:07:43 -0500
+Wed, 15 Feb 2012 13:37:59 -0500
 README.rdoc	Tue, 12 May 2009 11:20:38 -0400
 lib/ofac.rb	Thu, 02 Sep 2010 14:42:06 -0400
 lib/ofac/ofac_match.rb	Wed, 29 Jul 2009 13:27:13 -0400
 lib/ofac/ruby_string_extensions.rb	Mon, 11 May 2009 12:39:33 -0400
 lib/ofac/models/ofac.rb	Mon, 17 Aug 2009 10:17:51 -0400
 lib/ofac/models/ofac_sdn.rb	Tue, 21 Dec 2010 12:34:18 -0500
-lib/ofac/models/ofac_sdn_loader.rb	Tue, 14 Feb 2012 14:04:58 -0500
+lib/ofac/models/ofac_sdn_loader.rb	Wed, 15 Feb 2012 13:35:31 -0500

data/rdoc/index.html

@@ -4,7 +4,7 @@
 <head>
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 
-<title>ofac 1.2.4</title>
+<title>ofac 1.2.5</title>
 
 <link type="text/css" media="screen" href="./rdoc.css" rel="stylesheet">
 
@@ -75,7 +75,7 @@
   </div>
 </nav>
 
-<p>This is the API documentation for ofac 1.2.4.
+<p>This is the API documentation for ofac 1.2.5.
 
 
 <footer id="validator-badges">

metadata

@@ -2,7 +2,7 @@
 name: ofac
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
   - Kevin Tyll
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-14 00:00:00 Z
+date: 2012-02-15 00:00:00 Z
 dependencies: []
 
 description: Attempts to find a hit on the Office of Foreign Assets Control's Specially Designated Nationals list.