brownie 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5bf4bff9ea80abaf061bd214b6647eac94c776
-  data.tar.gz: 75255b947c46c07b5bf386f7bed90b6e716a2b6b
+  metadata.gz: 5272fa1331a8f96bfbb00999011a2434a37339f7
+  data.tar.gz: 640b647d7426a7b7c4c3f918badff18029e551bd
 SHA512:
-  metadata.gz: 38f572c6733ce215f1c96d84a2c9551f76cb0b7006f8746ea70a26dfb955273ad87efcc919cd96d632b780d8ea9986556b6daf3f4fccab2b82aaaf5f7a6fe39e
-  data.tar.gz: d65858f0951cb5b565795fa366c012be421668c8ee0595ef3097e46ee73379dd898d1de90df8de69cd58efdf6b0e5314f23c4e6281442573201486de89779eda
+  metadata.gz: 30875b266eef846deb71d47104a2afbedfd38c26c6afe355e58da5403d549f183f969cad03fdbe6660e1d90c0cafcbdc95a3442feb930fd0ab9bc99c587c1403
+  data.tar.gz: 888e25e2689fec4c31f8e557459802ae3881906d5802389c66a4060fb7766f88ca0a85f2c8ca8e06972875fac1cd533593e2043c74358879a21cabb3832bf612

data/Gemfile

@@ -7,7 +7,7 @@ gem "rest_client", ">= 1.7"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.1.3)
     docile (1.1.3)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
@@ -59,12 +60,14 @@ GEM
       json (~> 1.4)
     rest_client (1.7.3)
       netrc (~> 0.7.7)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.5.0)
-      activesupport (>= 3.0.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -83,5 +86,5 @@ DEPENDENCIES
   jeweler (~> 2.0.1)
   rdoc (~> 3.12)
   rest_client (>= 1.7)
-  shoulda
+  rspec (~> 2.8.0)
   simplecov

data/README.markdown

@@ -1,11 +1,11 @@
 # brownie
 
-Brownie helps you create shipments via UPS.com's developer api.  You can create shipments, and labels.
+Brownie helps you create shipments via UPS.com's developer api.  This gem is a work in progress. You can create shipments, and labels.
 
 Future releasess will have address valdation, and tracking 
 
 ## Install
-	gem 'brownie', '~> 0.1.0'
+	gem 'brownie', '~> 0.1.1'
 
 
 ## Usage 
@@ -48,6 +48,8 @@ Future releasess will have address valdation, and tracking
 	b.package_type = Brownie::Package::BOX
 	b.declared_value = 100
 
+	b.environment = "production" # defaulted to development 
+
 	# Confirm and Validate Shipment
 	if b.confirm
 	   puts b.tracking_number
@@ -60,6 +62,13 @@ Future releasess will have address valdation, and tracking
 	b.label(b.shipment_digest,"/path/to/save/label.gif")
 
 
+## TODO
+
+* Spruce up Shipping class so population of xml fields is cleaner
+* Add addresss validation
+* Run rspec tests on shipping confirmation and shipping acceptance.
+* Add more local validations and error checking
+
 
 
 ## Contributing to brownie

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/brownie.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: brownie 0.1.1 ruby lib
+# stub: brownie 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "brownie"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Jaffe"]
-  s.date = "2014-03-29"
+  s.date = "2014-04-18"
   s.description = "Creates UPS shipments and labels via UPS.com's developer api."
   s.email = "mike@mikewritescode.com"
   s.extra_rdoc_files = [
@@ -27,9 +27,12 @@ Gem::Specification.new do |s|
     "VERSION",
     "brownie.gemspec",
     "lib/brownie.rb",
+    "lib/brownie/common.rb",
     "lib/brownie/credentials.rb",
+    "lib/brownie/package.rb",
     "lib/brownie/ship_from.rb",
     "lib/brownie/ship_to.rb",
+    "lib/brownie/shipment.rb",
     "lib/brownie/shipper.rb",
     "test/helper.rb",
     "test/test_brownie.rb",
@@ -47,7 +50,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.2.2"])
       s.add_runtime_dependency(%q<rest_client>, [">= 1.7"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
@@ -55,7 +58,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>, [">= 3.2.2"])
       s.add_dependency(%q<rest_client>, [">= 1.7"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
@@ -64,7 +67,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 3.2.2"])
     s.add_dependency(%q<rest_client>, [">= 1.7"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])

data/lib/brownie/common.rb

@@ -0,0 +1,25 @@
+module Brownie
+	class Common
+         def self.domain
+            staging = "wwwcie.ups.com"
+            production = "onlinetools.ups.com"
+            return staging if ENV["RAILS_ENV"]
+
+            if self.environment.nil?
+               staging
+            elsif self.environment == "production"
+                  production
+               else
+                staging
+            end
+         end
+
+         def self.template_to_hash(template,root="ShipmentConfirmRequest")
+            xml_path = File.join(File.dirname(File.expand_path(__FILE__)), "../../xml/#{template}.xml")
+            digest_xml_file = File.open(xml_path, "rb")
+            xml = digest_xml_file.read
+            hash = Hash.from_xml(xml)
+            hash[root]
+         end
+	end
+end

data/lib/brownie/package.rb

@@ -0,0 +1,64 @@
+module Brownie
+	class Package
+	
+  	  LETTER = "01"
+      CUSTOMER_SUPPLIED_PACKAGE = "02"
+      TUBE = "03"
+      PAK = "04"
+      UPS_EXPRESS_BOX = "21"
+      UPS_25KG_BOX = "24"
+      UPS_10KG_BOX = "25"
+      PALLET = "30"
+      SMALL_EXPRESS_BOX = "2a"
+      MEDIUM_EXPRESS_BOX = "2b"
+      LARGE_EXPRESS_BOX = "2c"
+      FLATS = "56"
+      PARCELS = "57"
+      BPM = "58"
+      FIRST_CLASS = "59"
+      PRIORITY = "60"
+      MACHINABLES = "61"
+      IRREGULARS = "62"
+      PARCEL_POST = "63"
+      BPM_PARCEL = "64"
+      MEDIA_MAIL = "65"
+      BPM_FLAT = "66"
+      STANDARD_FLAT = "67"
+
+      
+		attr_accessor :package_type,:unit_of_measurement,:length,:width,:height,:weight,:declared_value
+	
+
+		def create
+			data = Hash.from_xml(template)["Package"]	
+	       	data["PackagingType"]["Code"] = self.package_type
+	       	data["PackageServiceOptions"]["InsuredValue"]["MonetaryValue"] = self.declared_value.to_s
+	       	data["PackageWeight"]["Weight"] = self.weight.nil? ? 1.0.to_s : self.weight.to_s
+	       	data["Dimensions"]["UnitOfMeasurement"]["Code"] = self.unit_of_measurement
+	       	data["Dimensions"]["Length"] = self.length
+	       	data["Dimensions"]["Width"] = self.width
+	       	data["Dimensions"]["Height"] = self.height
+	   		return data
+		end
+
+		private
+		def template
+			'<Package>
+      <PackagingType>
+         <Code></Code>
+      </PackagingType> 
+      <Dimensions>
+         <UnitOfMeasurement> <Code></Code> </UnitOfMeasurement>
+         <Length></Length> <Width></Width> <Height></Height>
+      </Dimensions> 
+<PackageWeight>
+      <Weight></Weight> 
+</PackageWeight>
+<PackageServiceOptions>
+      <InsuredValue> <MonetaryValue></MonetaryValue>
+      </InsuredValue> 
+   </PackageServiceOptions>
+      </Package>'
+		end
+	end
+end

data/lib/brownie/ship_from.rb

@@ -1,8 +1,39 @@
 module Brownie
-	class ShipFrom < ShipTo
+	class ShipFrom
 		attr_accessor :company_name,:attention_name,:phone_number,:attention_name,:address_line1,:address_line2,:city,:state_province_code,:postal_code,:country_code
  
 
+		def create
+			data = Hash.from_xml(template)["ShipFrom"]	
+            data["CompanyName"] = self.company_name
+            data["AttentionName"] = self.attention_name
+            data["PhoneNumber"] = self.phone_number
+            data["AttentionName"] = self.attention_name
+            data["Address"]["AddressLine1"] = self.address_line1
+            data["Address"]["AddressLine2"] = self.address_line2 if !self.address_line2.nil?
+            data["Address"]["City"] = self.city
+            data["Address"]["StateProvinceCode"] = self.state_province_code
+            data["Address"]["PostalCode"] = self.postal_code
+            data["Address"]["CountryCode"] = self.country_code
+	   		return data
+		end
 
+		private
+		def template
+			'<ShipFrom>
+	         <CompanyName></CompanyName>
+	         <AttentionName></AttentionName>
+	         <PhoneNumber></PhoneNumber>
+	         <TaxIdentificationNumber></TaxIdentificationNumber>
+	         <Address>
+	            <AddressLine1></AddressLine1>
+	            <City></City>
+	            <StateProvinceCode></StateProvinceCode>
+	            <PostalCode></PostalCode>
+	            <CountryCode></CountryCode>
+	         </Address>
+	      </ShipFrom>'
+		end
 	end
+	 
 end

data/lib/brownie/ship_to.rb

@@ -2,6 +2,35 @@ module Brownie
 	class ShipTo
 		attr_accessor :company_name,:attention_name,:phone_number,:attention_name,:address_line1,:address_line2,:city,:state_province_code,:postal_code,:country_code
 
+		def create
+			data = Hash.from_xml(template)["ShipTo"]	
+	   		data["CompanyName"] = self.company_name
+	   		data["AttentionName"] = self.attention_name
+	   		data["PhoneNumber"] = self.phone_number
+	   		data["AttentionName"] = self.attention_name
+	   		data["Address"]["AddressLine1"] = self.address_line1
+            data["Address"]["AddressLine2"] = self.address_line2 if !self.address_line2.nil?
+   			data["Address"]["City"] = self.city
+   			data["Address"]["StateProvinceCode"] = self.state_province_code
+   			data["Address"]["PostalCode"] = self.postal_code
+   			data["Address"]["CountryCode"] = self.country_code
+	   		return data
+		end
 
+		private
+		def template
+			'<ShipTo>
+	         <CompanyName></CompanyName>
+	         <AttentionName></AttentionName>
+	         <PhoneNumber></PhoneNumber>
+	         <Address>
+	            <AddressLine1></AddressLine1>
+	            <City></City>
+	            <StateProvinceCode></StateProvinceCode>
+	            <PostalCode></PostalCode>
+	            <CountryCode></CountryCode>
+	         </Address>
+	      </ShipTo>'
+		end
 	end
 end

data/lib/brownie/shipment.rb

@@ -0,0 +1,98 @@
+require 'active_support/all'
+require 'rest_client'
+module Brownie
+  
+
+
+   class Shipment
+   		attr_accessor :request,:errors,:account_number,:tracking_number,:shipment_digest,:credentials,:shipper,:ship_to,
+         :ship_from,:response,:service_code,:label_binary,:api_domain,
+         :environment,:data,:shipment_xml,:template,:package
+
+ 
+   		def initialize(shipment=nil)
+   			    self.shipment_data = shipment if !shipment.nil?
+            self.credentials = Credentials.new
+            self.shipper = Shipper.new
+            self.ship_to = ShipTo.new
+            self.ship_from = ShipFrom.new
+            self.package = Package.new
+            self.template = Common::template_to_hash(:ship_confirm)
+            
+   		end
+
+
+
+   		def confirm
+        
+        data = self.template["Shipment"]
+        data["PaymentInformation"]["Prepaid"]["BillShipper"]["AccountNumber"] = self.account_number
+        data["Service"]["Code"] = self.service_code 
+        data["Package"] = self.package.create 
+        data["Shipper"] = self.shipper.create
+        data["ShipTo"] = self.ship_to.create
+        data["ShipFrom"] = self.ship_from.create
+       
+        self.template["Shipment"] = data
+        request_template = {"ShipmentConfirmRequest" => self.template}
+			  shipment_xml_str = request_template["ShipmentConfirmRequest"].to_xml(:root => "ShipmentConfirmRequest")
+ 
+   			self.response = RestClient.post("https://#{Common::domain}/ups.app/xml/ShipConfirm","#{access_request_header}#{shipment_xml_str}")
+   			if self.response.code.eql?(200)
+   				response_hash = Hash.from_xml(response)
+               if response_hash["ShipmentConfirmResponse"]["Response"]["ResponseStatusCode"].eql?("0")
+                  self.errors = response_hash["ShipmentConfirmResponse"]["Response"]["Error"]
+                  return false
+               end
+
+   				self.tracking_number = response_hash["ShipmentConfirmResponse"]["ShipmentIdentificationNumber"]
+   				self.shipment_digest = response_hash["ShipmentConfirmResponse"]["ShipmentDigest"]
+   				return true
+
+   			else 
+   				raise "In-valid request #{response}"
+   			end
+   		end
+
+     def label(_shipment_digest,path)
+        shipment_digest = _shipment_digest.nil? ? @shipment_digest : _shipment_digest
+         label_xml = '<?xml version="1.0" encoding="ISO-8859-1"?>
+            <ShipmentAcceptRequest>
+            <Request>
+            <TransactionReference>
+            <CustomerContext></CustomerContext>
+            </TransactionReference>
+            <RequestAction>ShipAccept</RequestAction>
+            <RequestOption>1</RequestOption>
+            </Request>
+            <ShipmentDigest>' + shipment_digest +  '</ShipmentDigest>
+            </ShipmentAcceptRequest>'
+
+
+        
+
+        label_response = RestClient.post("https://#{Common::domain}/ups.app/xml/ShipAccept","#{access_request_header}#{label_xml}")
+        label_hash = Hash.from_xml(label_response)
+        self.label_binary = label_hash["ShipmentAcceptResponse"]["ShipmentResults"]["PackageResults"]["LabelImage"]["GraphicImage"]
+        File.open(path, 'wb') do|f|
+          f.write(Base64.decode64(self.label_binary))
+        end
+
+     end
+          
+
+   		private
+         def access_request_header
+            '<?xml version="1.0"?>
+                  <AccessRequest xml:lang="en-US">
+                  <AccessLicenseNumber>' + self.credentials.license_number + '</AccessLicenseNumber>
+                  <UserId>' + self.credentials.user_id + '</UserId>
+                  <Password>' + self.credentials.password + '</Password>
+                  </AccessRequest>'
+         end
+
+   end
+ 
+
+
+end

data/lib/brownie/shipper.rb

@@ -5,5 +5,38 @@ module Brownie
 		:address_line1,:address_line2,:city,:state_province_code,:postal_code,:country_code
 
 
+
+		def create
+			data = Hash.from_xml(template)["Shipper"]
+   			data["Name"] = self.name
+   			data["PhoneNumber"] = self.phone_number
+   			data["ShipperNumber"] = self.account_number
+   			data["TaxIdentificationNumber"] = self.tax_identification_number
+	   		data["Address"]["AddressLine1"] = self.address_line1
+            data["Address"]["AddressLine2"] = self.address_line2 if !self.address_line2.nil?
+	   		data["Address"]["City"] = self.city
+	   		data["Address"]["StateProvinceCode"] = self.state_province_code
+	   		data["Address"]["PostalCode"] = self.postal_code
+	   		data["Address"]["CountryCode"] = self.country_code
+	   		return data
+		end
+
+		private
+		def template
+			' <Shipper>
+				   <Name></Name>
+				   <PhoneNumber></PhoneNumber>
+				   <ShipperNumber></ShipperNumber>
+				   <TaxIdentificationNumber></TaxIdentificationNumber>
+				   <Address>
+				      <AddressLine1></AddressLine1>
+				      <City></City>
+				      <StateProvinceCode></StateProvinceCode>
+				      <PostalCode></PostalCode>
+				      <PostcodeExtendedLow />
+				      <CountryCode></CountryCode>
+				   </Address>
+				</Shipper>'
+		end
 	end
 end

data/lib/brownie.rb

@@ -1,180 +1,40 @@
 require 'active_support/all'
 require 'rest_client'
+require 'brownie/common'
 require 'brownie/credentials'
 require 'brownie/shipper'
 require 'brownie/ship_to'
 require 'brownie/ship_from' 
+require 'brownie/package'
+require 'brownie/shipment'
 module Brownie
-  
-
-
-   class Shipment
-   		attr_accessor :request,:errors,:account_number,:tracking_number,:shipment_digest,:credentials,:shipper,:ship_to,
-         :ship_from,:response,:service_code,:package_type,:declared_value,:package_weight,:label_binary,:api_domain,:environment
-
-   		attr_writer :shipment_data,:shipment_xml
-
  
-   		def initialize(shipment=nil)
-   			self.shipment_data = shipment if !shipment.nil?
-            self.credentials = Credentials.new
-            self.shipper = Shipper.new
-            self.ship_to = ShipTo.new
-            self.ship_from = ShipFrom.new
-
-   		end
-
-
-
-   		def confirm
-   			test = template_hash
-   			shipment = test["ShipmentConfirmRequest"]["Shipment"]
-
-            shipment["PaymentInformation"]["Prepaid"]["BillShipper"]["AccountNumber"] = self.account_number
-            shipment["Service"]["Code"] = self.service_code 
-            shipment["Package"]["PackagingType"]["Code"] = self.package_type
-            shipment["Package"]["PackageServiceOptions"]["InsuredValue"]["MonetaryValue"] = self.declared_value.to_s
-            shipment["Package"]["PackageWeight"]["Weight"] = self.package_weight.nil? ? 1.0.to_s : self.package_weight.to_s
-
-   			shipment["Shipper"]["Name"] = self.shipper.name
-   			shipment["Shipper"]["PhoneNumber"] = self.shipper.phone_number
-   			shipment["Shipper"]["ShipperNumber"] = self.account_number
-   			shipment["Shipper"]["TaxIdentificationNumber"] = self.shipper.tax_identification_number
-	   		shipment["Shipper"]["Address"]["AddressLine1"] = self.shipper.address_line1
-            shipment["Shipper"]["Address"]["AddressLine2"] = self.shipper.address_line2 if !self.shipper.address_line2.nil?
-	   		shipment["Shipper"]["Address"]["City"] = self.shipper.city
-	   		shipment["Shipper"]["Address"]["StateProvinceCode"] = self.shipper.state_province_code
-	   		shipment["Shipper"]["Address"]["PostalCode"] = self.shipper.postal_code
-	   		shipment["Shipper"]["Address"]["CountryCode"] = self.shipper.country_code
-
-
-	   		shipto = shipment["ShipTo"]
-	   		shipto["CompanyName"] = self.ship_to.company_name
-	   		shipto["AttentionName"] = self.ship_to.attention_name
-	   		shipto["PhoneNumber"] = self.ship_to.phone_number
-	   		shipto["AttentionName"] = self.ship_to.attention_name
-	   		shipto["Address"]["AddressLine1"] = self.ship_to.address_line1
-            shipto["Address"]["AddressLine2"] = self.ship_to.address_line2 if !self.ship_to.address_line2.nil?
-   			shipto["Address"]["City"] = self.ship_to.city
-   			shipto["Address"]["StateProvinceCode"] = self.ship_to.state_province_code
-   			shipto["Address"]["PostalCode"] = self.ship_to.postal_code
-   			shipto["Address"]["CountryCode"] = self.ship_to.country_code
-	   		
-
-            shipfrom = shipment["ShipFrom"]
-            shipfrom["CompanyName"] = self.ship_from.company_name
-            shipfrom["AttentionName"] = self.ship_from.attention_name
-            shipfrom["PhoneNumber"] = self.ship_from.phone_number
-            shipfrom["AttentionName"] = self.ship_from.attention_name
-            shipfrom["Address"]["AddressLine1"] = self.ship_from.address_line1
-            shipfrom["Address"]["AddressLine2"] = self.ship_from.address_line2 if !self.ship_from.address_line2.nil?
-            shipfrom["Address"]["City"] = self.ship_from.city
-            shipfrom["Address"]["StateProvinceCode"] = self.ship_from.state_province_code
-            shipfrom["Address"]["PostalCode"] = self.ship_from.postal_code
-            shipfrom["Address"]["CountryCode"] = self.ship_from.country_code
-
-
-				shipment_xml_str = test["ShipmentConfirmRequest"].to_xml(:root => "ShipmentConfirmRequest")
-	 
-   			self.response = RestClient.post("https://#{domain}/ups.app/xml/ShipConfirm","#{access_request_header}#{shipment_xml_str}")
-   			if self.response.code.eql?(200)
-   				response_hash = Hash.from_xml(response)
-               if response_hash["ShipmentConfirmResponse"]["Response"]["ResponseStatusCode"].eql?("0")
-                  self.errors = response_hash["ShipmentConfirmResponse"]["Response"]["Error"]
-                  return false
-               end
-
-   				self.tracking_number = response_hash["ShipmentConfirmResponse"]["ShipmentIdentificationNumber"]
-   				self.shipment_digest = response_hash["ShipmentConfirmResponse"]["ShipmentDigest"]
-   				return true
-
-   			else 
-   				raise "In-valid request #{response}"
-   			end
-   		end
-
-         def label(_shipment_digest,path)
-            shipment_digest = _shipment_digest.nil? ? @shipment_digest : _shipment_digest
-             label_xml = '<?xml version="1.0" encoding="ISO-8859-1"?>
-                <ShipmentAcceptRequest>
-                <Request>
-                <TransactionReference>
-                <CustomerContext></CustomerContext>
-                </TransactionReference>
-                <RequestAction>ShipAccept</RequestAction>
-                <RequestOption>1</RequestOption>
-                </Request>
-                <ShipmentDigest>' + shipment_digest +  '</ShipmentDigest>
-                </ShipmentAcceptRequest>'
-
-
-            
-
-            label_response = RestClient.post("https://#{domain}/ups.app/xml/ShipAccept","#{access_request_header}#{label_xml}")
-            label_hash = Hash.from_xml(label_response)
-            self.label_binary = label_hash["ShipmentAcceptResponse"]["ShipmentResults"]["PackageResults"]["LabelImage"]["GraphicImage"]
-            File.open(path, 'wb') do|f|
-              f.write(Base64.decode64(self.label_binary))
-            end
-
-         end
-          
-
-   		private
-         def domain
-            if self.environment.nil?
-               "wwwcie.ups.com"
-            elsif self.environment == "production"
-                  "onlinetools.ups.com"
-               else
-                 "wwwcie.ups.com" 
-            end
-         end
-
-         def template_hash
-            xml_path = File.join(File.dirname(File.expand_path(__FILE__)), "../xml/ship_confirm.xml")
-            digest_xml_file = File.open(xml_path, "rb")
-            @shipment_xml = digest_xml_file.read
-            Hash.from_xml(@shipment_xml)
-         end
-
-         def access_request_header
-            '<?xml version="1.0"?>
-                  <AccessRequest xml:lang="en-US">
-                  <AccessLicenseNumber>' + self.credentials.license_number + '</AccessLicenseNumber>
-                  <UserId>' + self.credentials.user_id + '</UserId>
-                  <Password>' + self.credentials.password + '</Password>
-                  </AccessRequest>'
-         end
 
+   class Dimensions
+      INCHES = "IN"
+      CENTIMETERS = "CM"
+      METRIC_UNITS_OF_MEASUREMENT = "00"
+      ENGLISH_UNITS_OF_MEASUREMENT = "01"
    end
 
-
-   class Package
-      BAG = "01"
-      BOX = "02"
-      CARTON = "03"
-      CRATE = "04"
-      DRUM = "05"
-      PALLET = "06"
-      ROLL = "07"
-      TUBE = "08"
+   class Weight
+      POUNDS = "LBS"
+      KILOGRAMS = "KGS"
+       METRIC_UNITS_OF_MEASUREMENT = "00"
+      ENGLISH_UNITS_OF_MEASUREMENT = "01"
    end
 
    class ServiceCodes
-      STANDARD = "11"
+      NEXT_DAY_AIR = "01"
+      SECOND_DAY_AIR = "02"
       GROUND = "03"
-      E3DAYSELECT = "12"
-      E2NDDAYAIR = "02"
-      E2NDDAYAIRAM = "59"
-      NEXTDAYAIRSAVER = "13"
-      NEXTDAYAIR = "01"
-      NEXTDAYAIREARLYAM = "14"
-      UPSWORLDWIDEEXPRESS = "07"
-      WORLDWIDEEXPRESSPLUS = "54"
-      UPSWORDWIDESAVER = "65"
-      UPSWORLDWIDEEXPEDITED = "08"
- 
+      EXPRESS = "07"
+      Expedited = "08"
+      Ups_Standard = "11"
+      THREE_DAY_SELECT = "12"
+      NEXT_DAY_AIR_SAVER = "13"
+      NEXT_DAY_AIR_EARLY_AM = "14"
+      EXPRESS_PLUS = "54"
    end
 
 

data/xml/ship_confirm.xml

@@ -77,10 +77,13 @@
       <PackagingType>
          <Code></Code>
       </PackagingType> 
+      <Dimensions>
+         <UnitOfMeasurement> <Code></Code> </UnitOfMeasurement>
+         <Length></Length> <Width></Width> <Height></Height>
+      </Dimensions> 
       <PackageWeight>
-         <Weight></Weight>
-      </PackageWeight> 
-
+      <Weight></Weight> 
+      </PackageWeight>
       <PackageServiceOptions>
       <InsuredValue> <MonetaryValue></MonetaryValue>
       </InsuredValue> 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brownie
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Jaffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -125,9 +125,12 @@ files:
 - VERSION
 - brownie.gemspec
 - lib/brownie.rb
+- lib/brownie/common.rb
 - lib/brownie/credentials.rb
+- lib/brownie/package.rb
 - lib/brownie/ship_from.rb
 - lib/brownie/ship_to.rb
+- lib/brownie/shipment.rb
 - lib/brownie/shipper.rb
 - test/helper.rb
 - test/test_brownie.rb