shipping 1.2.0 → 1.2.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "1.2.0"
+PKG_VERSION = "1.2.1"
 
 PKG_FILES = FileList[
     "lib/**/*", "bin/*", "test/**/*", "[A-Z]*", "Rakefile", "doc/**/*"
@@ -32,7 +32,7 @@ end
 desc "Create documentation"
 Rake::RDocTask.new("doc") { |rdoc|
   rdoc.title = "Ruby Shipping - UPS, FedEx, USPS"
-  rdoc.rdoc_dir = 'doc'
+  rdoc.rdoc_dir = 'html'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 }

data/lib/extensions.rb

@@ -0,0 +1,11 @@
+class Object
+ def blank?
+   if respond_to? :empty?
+     empty?
+   elsif respond_to? :zero?
+     zero?
+   else
+     !self
+   end
+ end
+end

data/lib/shipping.rb

@@ -26,15 +26,17 @@
 
 begin
    require 'rubygems'
-   require_gem 'builder', '~> 1.2'
 rescue LoadError
-   require 'builder'
+   nil
 end
 
+require 'builder'
 require 'yaml'
 require 'rexml/document'
 require 'net/http'
 require 'net/https'
+
+require 'extensions'
 require 'shipping/base'
 require 'shipping/fedex'
 require 'shipping/ups'

data/lib/shipping/fedex.rb

@@ -10,17 +10,17 @@ module Shipping
       # Gets the total price of the shipping
       def price
          get_price
-         p = REXML::XPath.first(@response, "//FDXRateReply/EstimatedCharges/DiscountedCharges/NetCharge").text.to_f rescue nil
-         raise ShippingError, get_error if p.nil?
-         return p
+         return REXML::XPath.first(@response, "//FDXRateReply/EstimatedCharges/DiscountedCharges/NetCharge").text.to_f
+      rescue
+        raise ShippingError, get_error
       end
       
       # Gets the base price of the shipping (with discounts taken into consideration)
       def base_price
          get_price
-         p = REXML::XPath.first(@response, "//FDXRateReply/EstimatedCharges/DiscountedCharges/BaseCharge").text.to_f rescue nil
-         raise ShippingError, get_error if p.nil?
-         return p
+         return REXML::XPath.first(@response, "//FDXRateReply/EstimatedCharges/DiscountedCharges/BaseCharge").text.to_f
+      rescue
+         raise ShippingError, get_error
       end
       
 		# still not sure what the best way to handle this transaction's return data would be. Possibly a hash of the form {service => delivery_estimate}?
@@ -42,7 +42,7 @@ module Shipping
 					b.PostalCode @zip
 					b.CountryCode @country || "US"
 				}
-				b.ShipDate @ship_date unless @ship_date.nil?
+				b.ShipDate @ship_date unless @ship_date.blank?
 				b.PackageCount @package_total || '1'
 			}
 			
@@ -53,7 +53,7 @@ module Shipping
 		   @required = [:name, :company, :phone, :email, :address, :city, :state, :zip]
 		   @required += [:fedex_account, :fedex_url]
 		   
-		   state = STATES.has_value?(@state.downcase) ? STATES.index(@state.downcase).upcase : @state.upcase
+		   state = STATES.has_value?(@state.downcase) ? STATES.index(@state.downcase).upcase : @state.upcase rescue nil
 
 		   @data = String.new
 		   b = Builder::XmlMarkup.new :target => @data
@@ -98,13 +98,14 @@ module Shipping
 		def label
 		   @required =  [:phone,        :email,        :address,        :city,        :state,        :zip        ]
 		   @required += [:sender_phone, :sender_email, :sender_address, :sender_city, :sender_state, :sender_zip ]
-		   @required += [:fedex_account, :fedex_url]
+		   @required += [:fedex_account, :fedex_url, :weight                                                     ]
          
 		   @transaction_type ||= 'rate_ground'
 		   @weight = (@weight.to_f*10).round/10.0
-		   @declared_value = (@declared_value.to_f*100).round/100.0 unless @declared_value.nil?
-		   state = STATES.has_value?(@state.downcase) ? STATES.index(@state.downcase).upcase : @state.upcase
-		   sender_state = STATES.has_value?(@sender_state.downcase) ? STATES.index(@sender_state.downcase).upcase : @sender_state.upcase
+		   @declared_value = (@declared_value.to_f*100).round/100.0 unless @declared_value.blank?
+		   
+		   state = STATES.has_value?(@state.downcase) ? STATES.index(@state.downcase).upcase : @state.upcase rescue nil
+		   sender_state = STATES.has_value?(@sender_state.downcase) ? STATES.index(@sender_state.downcase).upcase : @sender_state.upcase rescue nil
 
 		   @data = String.new
 		   
@@ -127,14 +128,14 @@ module Shipping
    			   b.Contact { |b|
    			      if @sender_name.to_s.size > 2
       			      b.PersonName @sender_name
-      			      b.CompanyName @sender_company unless @sender_company.nil?
+      			      b.CompanyName @sender_company unless @sender_company.blank?
       			   elsif @sender_company.to_s.size > 2
-      			      b.PersonName @sender_name unless @sender_name.nil?
+      			      b.PersonName @sender_name unless @sender_name.blank?
       			      b.CompanyName @sender_company
       			   else
       			      raise ShippingError, "Either the sender_name or the sender_company value must be bigger than 2 characters."
       			   end
-      			   b.Department @sender_department unless @sender_department.nil?
+      			   b.Department @sender_department unless @sender_department.blank?
       			   b.PhoneNumber @sender_phone.gsub(/[^\d]/,"")
       			   b.PagerNumber @sender_pager.gsub(/[^\d]/,"") if @sender_pager.class == String
       			   b.FaxNumber @sender_fax.gsub(/[^\d]/,"") if @sender_fax.class == String
@@ -142,7 +143,7 @@ module Shipping
    			   }
    			   b.Address { |b|
    			      b.Line1 @sender_address
-   			      b.Line2 @sender_address2 unless @sender_address2.nil?
+   			      b.Line2 @sender_address2 unless @sender_address2.blank?
    			      b.City @sender_city
    			      b.StateOrProvinceCode sender_state
    			      b.PostalCode @sender_zip
@@ -153,14 +154,14 @@ module Shipping
       			b.Contact { |b|
          			if @name.to_s.size > 2
          			   b.PersonName @name
-         			   b.CompanyName @company unless @company.nil?
+         			   b.CompanyName @company unless @company.blank?
          			elsif @company.to_s.size > 2
-         			   b.PersonName @name unless @name.nil?
+         			   b.PersonName @name unless @name.blank?
          			   b.CompanyName @company
          			else
          			   raise ShippingError, "Either the name or the company value must be bigger than 2 characters."
          			end
-         			b.Department @department unless @department.nil?
+         			b.Department @department unless @department.blank?
       			   b.PhoneNumber @phone.gsub(/[^\d]/,"")
       			   b.PagerNumber @pager.gsub(/[^\d]/,"") if @pager.class == String
       			   b.FaxNumber @fax.gsub(/[^\d]/,"") if @fax.class == String
@@ -168,7 +169,7 @@ module Shipping
       			}
       			b.Address { |b|
       			   b.Line1 @address
-      			   b.Line2 @address2 unless @address2.nil?
+      			   b.Line2 @address2 unless @address2.blank?
       			   b.City @city
       			   b.StateOrProvinceCode state
       			   b.PostalCode @zip
@@ -179,18 +180,18 @@ module Shipping
       		   b.PayorType PaymentTypes[@pay_type] || 'SENDER'
       		   b.Payor { |b|
       		      b.AccountNumber @payor_account_number
-      		      b.CountryCode @payor_country_code unless @payor_country_code.nil?
-      		   } unless @payor_account_number.nil?
+      		      b.CountryCode @payor_country_code unless @payor_country_code.blank?
+      		   } unless @payor_account_number.blank?
       		}
       		b.RMA { |b|
       		   b.Number @rma_number
-      		} unless @rma_number.nil?
+      		} unless @rma_number.blank?
       		b.Package { |b|
       		   b.Weight @weight
       		   b.DeclaredValue @declared_value || '99.00'
       		   b.ReferenceInfo { |b|
       		      b.CustomerReference @customer_reference
-      		   } unless @customer_reference.nil?
+      		   } unless @customer_reference.blank?
       		   b.ItemDescription @description || "Shipment"
       		}
       		b.SpecialServices { |b|
@@ -208,9 +209,9 @@ module Shipping
       		         b.tag! :"E-MailAddress", @other_email
       		         b.ShipAlert @other_ship_alert ? 'true' : 'false'
       		         b.LanguageCode @other_language || 'EN' # FR also available
-      		      } unless @other_email.nil?
+      		      } unless @other_email.blank?
       		   }
-      		} unless @message.nil?
+      		} unless @message.blank?
          }
 		   
 		   get_response @fedex_url
@@ -250,7 +251,7 @@ module Shipping
 =end
 
 		   # don't allow people to edit the response
-		   response.freeze
+		   return response.freeze
 		end
 
       private
@@ -271,7 +272,7 @@ module Shipping
          		b.MeterNumber @fedex_meter
          		b.CarrierCode TransactionTypes[@transaction_type][1]
          	}
-         	b.ShipDate @ship_date unless @ship_date.nil?
+         	b.ShipDate @ship_date unless @ship_date.blank?
          	b.DropoffType @dropoff_type || 'REGULARPICKUP'
          	b.Service ServiceTypes[@service_type] || ServiceTypes['ground_service'] # default to ground service
          	b.Packaging PackageTypes[@packaging_type] || 'YOURPACKAGING'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: shipping
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2005-08-02
+  version: 1.2.1
+date: 2005-09-15
 summary: A general shipping module to find out the shipping prices via UPS or FedEx.
 require_paths: 
   - lib
@@ -27,6 +27,7 @@ platform: ruby
 authors: 
   - Lucas Carlson
 files: 
+  - lib/extensions.rb
   - lib/shipping
   - lib/shipping.rb
   - lib/shipping/base.rb