postalmethods 1.0.0 → 1.0.1

data/README.txt

@@ -16,7 +16,7 @@ API wrapper library for the postal methods api.
 
 require 'postalmethods'
 
-@doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+@doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
 @client = PostalMethods::Client.new(:user => "user", :password => "password")
 rv = @client.send_letter(@doc, "description of doc")
 puts rv

data/lib/postalmethods.rb

@@ -31,7 +31,7 @@ module PostalMethods
         end
         
         ## declare here so we can override in tests, etc.
-        self.api_uri = "http://api.postalmethods.com/PostalWS.asmx?WSDL"
+        self.api_uri = "https://api.postalmethods.com/PostalWS.asmx?WSDL"
                 
         self.username = opts[:username]
         self.password = opts[:password]

data/lib/postalmethods/send_letter.rb

@@ -12,13 +12,13 @@ module PostalMethods
       status_code = rv.sendLetterResult.to_i
       
       if status_code > 0
-        return rv
+        return status_code
       elsif API_STATUS_CODES.has_key?(status_code)
         instance_eval("raise APIStatusCode#{status_code.to_s.gsub(/( |\-)/,'')}Exception")
       end
     end
     
-    def send_letter_and_address(doc, description, address)
+    def send_letter_with_address(doc, description, address)
       raise PostalMethods::NoPreparationException unless self.prepared 
       raise PostalMethods::AddressNotHashException unless (address.class == Hash)
       
@@ -35,7 +35,7 @@ module PostalMethods
       status_code = rv.sendLetterAndAddressResult.to_i
       
       if status_code > 0
-        return rv
+        return status_code
       elsif API_STATUS_CODES.has_key?(status_code)
         instance_eval("raise APIStatusCode#{status_code.to_s.gsub(/( |\-)/,'')}Exception")
       end

data/lib/postalmethods/version.rb

@@ -2,7 +2,7 @@ module Postalmethods
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/document_processor_spec.rb

@@ -7,17 +7,17 @@ describe "Document Processing" do
   end
   
   it "should open a valid pre-opened document" do
-    @client.document = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+    @client.document = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
     @client.document.class.should == Hash
   end
   
   it "should open a valid document path" do
-    @client.document = File.dirname(__FILE__) + '/../doc/sample.pdf'
+    @client.document = File.dirname(__FILE__) + '/../spec/doc/sample.pdf'
     @client.document.class.should == Hash
   end
   
   it "should create a hash with the right elements" do
-    @client.document = File.dirname(__FILE__) + '/../doc/sample.pdf'
+    @client.document = File.dirname(__FILE__) + '/../spec/doc/sample.pdf'
     @client.document[:extension].should == "pdf"
     @client.document[:bytes].length.should == 213312
     @client.document[:name].should == "sample.pdf"
@@ -25,12 +25,12 @@ describe "Document Processing" do
   end
   
   it "should return true on a valid document path" do
-    @client.document = File.dirname(__FILE__) + '/../doc/sample.pdf'
+    @client.document = File.dirname(__FILE__) + '/../spec/doc/sample.pdf'
     @client.document?.should == true
   end
   
   it "should throw an exception on a false path" do
-    @doc = File.dirname(__FILE__) + '/../doc/does_not_exist.pdf'
+    @doc = File.dirname(__FILE__) + '/../spec/doc/does_not_exist.pdf'
     lambda {@client.document = @doc}.should raise_error(Errno::ENOENT)
   end
   

data/spec/get_letter_status_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "Get Letter Status" do
   
   before :each do
-    @doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+    @doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
     @client = PostalMethods::Client.new(PM_OPTS)
     @client.prepare!
     sleep(10)
@@ -24,11 +24,11 @@ describe "Get Letter Status" do
   it "should send multiple letters and get their status" do
     letters = []
     1.upto(3) do
-      @doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+      @doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
       @client = PostalMethods::Client.new(PM_OPTS)
       @client.prepare!      
-      rv = @client.send_letter(@doc, "the long goodbye").sendLetterResult
-      rv.to_i.should > 0
+      rv = @client.send_letter(@doc, "the long goodbye")
+      rv.should > 0
       letters << rv
       #sleep(10) # api needs some time
     end
@@ -37,7 +37,7 @@ describe "Get Letter Status" do
     ret.should be_an_instance_of(Array)
     
     # the return is an array [results, status]
-    recv_letters = ret.collect { |r| r.iD }
+    recv_letters = ret.collect { |r| r.iD.to_i }
   
     recv_letters.should == letters
   end
@@ -49,11 +49,11 @@ describe "Get Letter Status" do
   it "should request a range of letters and get their status" do
     letters = []
     1.upto(3) do
-      @doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+      @doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
       @client = PostalMethods::Client.new(PM_OPTS)
       @client.prepare!      
-      rv = @client.send_letter(@doc, "the long goodbye").sendLetterResult
-      rv.to_i.should > 0
+      rv = @client.send_letter(@doc, "the long goodbye")
+      rv.should > 0
       letters << rv
       #sleep(10) # api needs some time
     end
@@ -62,7 +62,7 @@ describe "Get Letter Status" do
     ret.should be_an_instance_of(Array)
     
     # the return is an array [results, status]
-    recv_letters = ret.collect { |r| r.iD }
+    recv_letters = ret.collect { |r| r.iD.to_i }
 
     recv_letters.should == letters
   end

data/spec/send_letter_spec.rb

@@ -3,14 +3,13 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "Send Letter" do
   
   before :each do
-    @doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+    @doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
     @client = PostalMethods::Client.new(PM_OPTS)
   end
   
   it "should instantiate and send a letter" do
     @client.prepare!
-    rv = @client.send_letter(@doc, "the long goodbye")
-    rv.sendLetterResult.to_i.should > 0    
+    rv = @client.send_letter(@doc, "the long goodbye").should > 0
   end
   
   it "should refuse to send letter before prepare" do
@@ -38,7 +37,7 @@ end
 describe "Send Letter With Address" do
   
   before :each do
-    @doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+    @doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
     @addr = {:AttentionLine1 => "The Fonz", :Address1 => "Happy Days", :City => "Baja", :State => "CA", 
              :PostalCode => "90210", :Country => "USA"}
     @client = PostalMethods::Client.new(PM_OPTS)
@@ -46,29 +45,28 @@ describe "Send Letter With Address" do
   
   it "should instantiate and send a letter with address" do
     @client.prepare!
-    rv = @client.send_letter_and_address(@doc, "Shark Jumping Notes", @addr)
-    rv.sendLetterAndAddressResult.to_i.should > 0
+    rv = @client.send_letter_with_address(@doc, "Shark Jumping Notes", @addr).should > 0
   end
   
   it "should raise the proper exception when trying to send letter without valid attention line" do
     @client.prepare!
     addr = @addr.except(:AttentionLine1)
-    lambda {@client.send_letter_and_address(@doc, "the long goodbye", addr)}.should raise_error(PostalMethods::APIStatusCode4008Exception)
+    lambda {@client.send_letter_with_address(@doc, "the long goodbye", addr)}.should raise_error(PostalMethods::APIStatusCode4008Exception)
   end
   
   it "should refuse to send letter before prepare" do
-    lambda {@client.send_letter_and_address(@doc, "the long goodbye", @addr)}.should raise_error(PostalMethods::NoPreparationException)
+    lambda {@client.send_letter_with_address(@doc, "the long goodbye", @addr)}.should raise_error(PostalMethods::NoPreparationException)
   end  
   
   it "should raise the proper exception when trying to send textfile" do
     @doc = open(File.dirname(__FILE__) + '/../README.txt')
     @client.prepare!
-    lambda {@client.send_letter_and_address(@doc, "the long goodbye", @addr)}.should raise_error(PostalMethods::APIStatusCode3004Exception)
+    lambda {@client.send_letter_with_address(@doc, "the long goodbye", @addr)}.should raise_error(PostalMethods::APIStatusCode3004Exception)
   end
   
   it "should raise the proper exception when trying to send an empty string" do
     @client.prepare!
-    lambda {@client.send_letter_and_address("", "the long goodbye", @addr)}.should raise_error(Errno::ENOENT)
+    lambda {@client.send_letter_with_address("", "the long goodbye", @addr)}.should raise_error(Errno::ENOENT)
   end
   
   

data/spec/utility_spec.rb

@@ -4,7 +4,7 @@ require 'base64'
 describe "Utility Methods" do
   
   before :each do
-    @doc = open(File.dirname(__FILE__) + '/../doc/sample.pdf')
+    @doc = open(File.dirname(__FILE__) + '/../spec/doc/sample.pdf')
     @client = PostalMethods::Client.new(PM_OPTS)
     @client.prepare!
   end
@@ -20,16 +20,13 @@ describe "Utility Methods" do
   end
   
   it "should check for error for when there is no file yet" do
-    res = @client.send_letter(@doc, "the long goodbye")
-    id = res.sendLetterResult.to_i
-    
+    id = @client.send_letter(@doc, "the long goodbye")
     id.should > 0
-     #    
     lambda {@client.get_pdf(id)}.should raise_error(PostalMethods::APIStatusCode3020Exception)
   end
   
   it "should get the details of a letter" do
-    id = @client.send_letter(@doc, "the long goodbye").sendLetterResult.to_i
+    id = @client.send_letter(@doc, "the long goodbye").to_i
     sleep(10) # because it's a tired little clients
     details = @client.get_letter_details(id)
     
@@ -49,7 +46,7 @@ describe "Utility Methods" do
   end
   
   it "should cancel delivery of a letter" do
-    id = @client.send_letter(@doc, "the long goodbye").sendLetterResult.to_i
+    id = @client.send_letter(@doc, "the long goodbye")
     rv = @client.cancel_delivery(id)
     rv.should be_true  
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postalmethods
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - James Cox
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-22 00:00:00 +01:00
+date: 2008-10-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency