fax_finder 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/fax_finder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fax_finder}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erich L. Timkar"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-07-12}
   s.email = %q{erich@hordesoftware.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,11 +25,14 @@ Gem::Specification.new do |s|
     "fax_finder.gemspec",
     "fax_finder.tmproj",
     "lib/fax_finder.rb",
+    "lib/fax_finder/abort.rb",
     "lib/fax_finder/query.rb",
     "lib/fax_finder/request.rb",
     "lib/fax_finder/response.rb",
     "lib/fax_finder/send.rb",
-    "pkg/fax_finder-0.2.0.gem",
+    "pkg/fax_finder-0.2.1.gem",
+    "pkg/fax_finder-0.2.2.gem",
+    "test/abort_test.rb",
     "test/fixtures/send_request_external.xml",
     "test/fixtures/send_request_inline.xml",
     "test/fixtures/send_response_success.xml",

data/lib/fax_finder/abort.rb

@@ -0,0 +1,28 @@
+require 'nokogiri'
+require 'builder'
+
+module FaxFinder
+
+  class Abort < Request
+    def self.delete(fax_key, entry_key)
+      self.post(){
+        construct_http_request(fax_key, entry_key)
+      }
+    end
+
+    def self.construct_http_request(fax_key, entry_key)
+      request = Net::HTTP::Delete.new(self.path(fax_key, entry_key))
+      request.basic_auth self.user, self.password
+      request.set_content_type(Request::CONTENT_TYPE)
+      request
+    end
+
+    def self.path(fax_key, entry_key)
+      params=[BASE_PATH, fax_key, entry_key].reject{ |p| p.nil? }
+      File.join(*params)
+    end
+
+  end
+  
+end
+

data/lib/fax_finder/request.rb

@@ -24,8 +24,12 @@ module FaxFinder
       response_body=nil
 
       begin
-        Net::HTTP.start(Request.host, Request.port) { |http|  
-          http.use_ssl=Request.ssl
+        
+        _http=Net::HTTP.new(Request.host, Request.port) 
+        _http.use_ssl=Request.ssl
+        _http.verify_mode = OpenSSL::SSL::VERIFY_NONE if _http.use_ssl?
+        
+        _http.start {|http|
           http_request = yield
           http_request.basic_auth Request.user, Request.password
           http_request.set_content_type(Request::CONTENT_TYPE)
@@ -34,6 +38,8 @@ module FaxFinder
         }
       rescue Errno::ECONNREFUSED => e
         response_body=Responses::NO_CONNECTION
+      rescue OpenSSL::SSL::SSLError => e
+        response_body=Responses::BAD_SSL_CONFIG
       rescue RuntimeError => e
         response_body=Responses::APPLICATION_ERROR.gsub(Responses::ERROR_GSUB, e.message)
       end

data/lib/fax_finder/response.rb

@@ -14,6 +14,8 @@ module FaxFinder
     NO_CONNECTION = APPLICATION_ERROR.gsub('####MESSAGE#####', 'No connection to fax server')
 
     UNAUTHORIZED = APPLICATION_ERROR.gsub('####MESSAGE#####', 'Unauthorized to communicate with fax server.')
+
+    BAD_SSL_CONFIG = APPLICATION_ERROR.gsub('####MESSAGE#####', 'Your connection is not configured correctly.  If you are using SSL, make sure the port is is set to 443.')
     
   end
 

data/lib/fax_finder.rb

@@ -29,3 +29,4 @@ require 'fax_finder/response.rb'
 require 'fax_finder/request.rb'
 require 'fax_finder/send.rb'
 require 'fax_finder/query.rb'
+require 'fax_finder/abort.rb'

data/test/abort_test.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+module FaxFinder
+  class AbortDeleteTest<Test::Unit::TestCase
+    def setup
+      Request.configure('example.com', 'user', 'password')
+    end
+    
+    def test_get
+      Abort.delete('user', 'password')
+    end
+    
+    def test_gets_returns_response
+      assert_instance_of(FaxFinder::Response, Abort.delete(nil, nil))
+    end
+  end
+
+  class AbortConstructHttpRequestTest<Test::Unit::TestCase
+    def setup
+      Request.configure('example.com', 'user', 'password')
+      @http_request=Abort.construct_http_request('fax_key', 'entry_key')
+    end
+
+    def test_returns_a_get
+      assert_instance_of(Net::HTTP::Delete, @http_request)
+    end
+    
+    def test_sets_path
+      assert_equal(Abort.path('fax_key', 'entry_key'), @http_request.path)
+    end
+    
+    def test_sets_basic_auth
+      assert_not_nil(@http_request['authorization'])
+    end
+
+    def test_sets_content_type
+      assert_equal('text/xml', @http_request['Content-Type'])
+    end
+  end
+
+  class AbortPathTest<Test::Unit::TestCase
+    def setup
+    end
+    
+    def test_constructs_using_base_path
+      assert_equal(Request::BASE_PATH+'/'+'fax_key' +'/'+'entry_key', Abort.path('fax_key', 'entry_key'))
+    end
+    
+  end
+  
+end

data/test/send_test.rb

@@ -32,6 +32,8 @@ module FaxFinder
   class SendConstructXMLTest<Test::Unit::TestCase
     def setup
       @doc=Nokogiri::XML(Send.construct_xml('1234567890', OPTIONS.merge(:external_url=>'https://localhost/something')))
+      now=Time.now.utc
+      @now_utc=DateTime.civil(Date.today.year, Date.today.month, Date.today.day, now.hour, now.min, now.sec)
     end
     
     def test_returns_string_and_doesnt_blow_up
@@ -96,12 +98,14 @@ module FaxFinder
     end
 
     def test_includes_schedule_all_at
-      assert_equal(Time.now.utc.strftime(Request::TIME_FORMAT), @doc.xpath('//schedule_fax/schedule_all_at').text)
+      actual=DateTime.parse(@doc.xpath('//schedule_fax/schedule_all_at').text)
+      (@now_utc.ajd-actual.ajd).abs < 5
     end
 
     def test_converts_to_utc
       @doc=Nokogiri::XML(Send.construct_xml('1234567890', OPTIONS.merge(:schedule_all_at=>Time.now, :external_url=>'https://localhost/something')))
-      assert_equal(Time.now.utc.strftime(Request::TIME_FORMAT), @doc.xpath('//schedule_fax/schedule_all_at').text)
+      actual=DateTime.now(@doc.xpath('//schedule_fax/schedule_all_at').text)
+      (@now_utc.ajd-actual.ajd).abs < 5
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fax_finder
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Erich L. Timkar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2011-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -97,11 +97,14 @@ files:
 - fax_finder.gemspec
 - fax_finder.tmproj
 - lib/fax_finder.rb
+- lib/fax_finder/abort.rb
 - lib/fax_finder/query.rb
 - lib/fax_finder/request.rb
 - lib/fax_finder/response.rb
 - lib/fax_finder/send.rb
-- pkg/fax_finder-0.2.0.gem
+- pkg/fax_finder-0.2.1.gem
+- pkg/fax_finder-0.2.2.gem
+- test/abort_test.rb
 - test/fixtures/send_request_external.xml
 - test/fixtures/send_request_inline.xml
 - test/fixtures/send_response_success.xml