fedex 2.2.0 → 2.2.1

data/Readme.md

@@ -147,24 +147,30 @@ label = fedex.label(:filename => "my_dir/example_epl2.pcx",
                     :shipping_details => shipping_details,
                     :label_specification => example_spec)
 ```
+### ** Storing a label on Amazon S3 with Paperclip **
 
-### ** Tracking a shipment **
-
-To track a shipment:
+This is useful when you need to store the labels for later use, and are hosting your application on [Heroku](http://www.heroku.com/) as they do not allow writing to the filesystem, save the `tmp` directory. With [Paperclip](https://github.com/thoughtbot/paperclip/) setup up on a shipment model:
 
 ```ruby
-tracking_info = fedex.track(:tracking_number => "1234567890123")
-
-tracking_info.tracking_number
-# => "1234567890123"
+label = fedex.label(:filename => "tmp/example_label.pdf",
+                    :shipper=>shipper,
+                    :recipient => recipient,
+                    :packages => packages,
+                    :service_type => "FEDEX_GROUND",
+                    :shipping_details => shipping_details,
+                    :label_specification => example_spec)
+```
 
-tracking_info.status
-# => "Delivered"
+Then attach the label to your Paperclip model:
 
-tracking_info.events.first.description
-# => "On FedEx vehicle for delivery"
+```ruby
+shipment.fedex_label = label.file_name
+shipment.save!
 ```
 
+Documentation for setting up Paperclip with Amazon S3 can be found in the Paperclip [README](https://github.com/thoughtbot/paperclip/#storage).
+
+
 ### ** Tracking a shipment **
 
 To track a shipment:
@@ -221,6 +227,9 @@ Fedex::Shipment::DROP_OFF_TYPES
 - [parndt](https://github.com/parndt) (Philip Arndt)
 - [mmell](https://github.com/mmell) (Michael Mell)
 - [jordanbyron](https://github.com/jordanbyron) (Jordan Byron)
+- [GermanC4](https://github.com/GermanC4) (German Garcia)
+- [janders223] (https://github.com/janders223) (Jim Anders)
+- [jlambert121] (https://github.com/jlambert121) (Justin Lambert)
 
 # Copyright/License:
 Copyright 2011 [Jazmin Schroeder](http://jazminschroeder.com)

data/lib/fedex/label.rb

@@ -14,7 +14,7 @@ module Fedex
       @options[:format] = label_details[:format]
       @options[:tracking_number] = package_details[:tracking_ids][:tracking_number]
       @options[:file_name] = label_details[:file_name]
-      
+
       @image = Base64.decode64(options[:parts][:image]) if has_image?
 
       if file_name = @options[:file_name]
@@ -30,6 +30,10 @@ module Fedex
       options[:format]
     end
 
+    def file_name
+      options[:file_name]
+    end
+
     def tracking_number
       options[:tracking_number]
     end

data/lib/fedex/request/base.rb

@@ -182,6 +182,51 @@ module Fedex
               end
               }
             end
+            if package[:special_services_requested] && package[:special_services_requested][:special_service_types]
+              xml.SpecialServicesRequested{
+                if package[:special_services_requested][:special_service_types].is_a? Array
+                  package[:special_services_requested][:special_service_types].each do |type|
+                    xml.SpecialServiceTypes type
+                  end
+                else
+                  xml.SpecialServiceTypes package[:special_services_requested][:special_service_types]
+                end
+                # Handle COD Options
+                if package[:special_services_requested][:cod_detail]
+                  xml.CodDetail{
+                    xml.CodCollectionAmount{
+                      xml.Currency package[:special_services_requested][:cod_detail][:cod_collection_amount][:currency]
+                      xml.Amount package[:special_services_requested][:cod_detail][:cod_collection_amount][:amount]
+                    }
+                    if package[:special_services_requested][:cod_detail][:add_transportation_charges]
+                      xml.AddTransportationCharges package[:special_services_requested][:cod_detail][:add_transportation_charges]
+                    end
+                    xml.CollectionType package[:special_services_requested][:cod_detail][:collection_type]
+                    xml.CodRecipient {
+                      add_shipper(xml)
+                    }
+                    if package[:special_services_requested][:cod_detail][:reference_indicator]
+                      xml.ReferenceIndicator package[:special_services_requested][:cod_detail][:reference_indicator]
+                    end
+                  }
+                end
+                # DangerousGoodsDetail goes here
+                if package[:special_services_requested][:dry_ice_weight]
+                  xml.DryIceWeight{
+                    xml.Units package[:special_services_requested][:dry_ice_weight][:units]
+                    xml.Value package[:special_services_requested][:dry_ice_weight][:value]
+                  }
+                end
+                if package[:special_services_requested][:signature_option_detail]
+                  xml.SignatureOptionDetail{
+                    xml.OptionType package[:special_services_requested][:signature_option_detail][:signature_option_type]
+                  }
+                end
+                if package[:special_services_requested][:priority_alert_detail]
+                  xml.PriorityAlertDetail package[:special_services_requested][:priority_alert_detail]
+                end
+              }
+            end
           }
         end
       end

data/lib/fedex/request/shipment.rb

@@ -59,7 +59,9 @@ module Fedex
       # Add the label specification
       def add_label_specification(xml)
         xml.LabelSpecification {
-          hash_to_xml(xml, @label_specification)
+          xml.LabelFormatType @label_specification[:label_format_type]
+          xml.ImageType @label_specification[:image_type]
+          xml.LabelStockType @label_specification[:label_stock_type]
         }
       end
 

data/lib/fedex/version.rb

@@ -1,3 +1,3 @@
 module Fedex
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/lib/fedex/label_spec.rb

@@ -21,48 +21,52 @@ module Fedex
       let(:shipping_options) do
         { :packaging_type => "YOUR_PACKAGING", :drop_off_type => "REGULAR_PICKUP" }
       end
-      
+
       let(:label_specification) do
         { :label_format_type => 'COMMON2D',
           :image_type => 'PNG',
         }
-      end  
-      
+      end
+
       let(:filename) {
         require 'tmpdir'
         File.join(Dir.tmpdir, "label#{rand(15000)}.pdf")
       }
-      
+
       let(:options) do
-        { :shipper => shipper, 
+        { :shipper => shipper,
           :recipient => recipient,
-          :packages => packages, 
+          :packages => packages,
           :service_type => "FEDEX_GROUND",
           :label_specification => label_specification,
           :filename =>  filename
         }
       end
-      
+
       describe "label", :vcr do
         before do
           @label = fedex.label(options)
         end
-        
+
         it "should create a label" do
           File.should exist(filename)
         end
-      
+
         it "should return tracking number" do
-          @label.should respond_to('tracking_number') 
+          @label.should respond_to('tracking_number')
         end
-          
+
         it "should expose complete response" do
           @label.should respond_to('response_details')
-        end  
+        end
         after do
           require 'fileutils'
           FileUtils.rm_r(filename) if File.exist?(filename)
         end
+
+        it "should expose the file_name" do
+          @label.should respond_to('file_name')
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedex
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70172992598000 !ruby/object:Gem::Requirement
+  requirement: &70200674635740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70172992598000
+  version_requirements: *70200674635740
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70172992597500 !ruby/object:Gem::Requirement
+  requirement: &70200674635240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70172992597500
+  version_requirements: *70200674635240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172992597040 !ruby/object:Gem::Requirement
+  requirement: &70200674634760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70172992597040
+  version_requirements: *70200674634760
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70172992596580 !ruby/object:Gem::Requirement
+  requirement: &70200674634280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70172992596580
+  version_requirements: *70200674634280
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70172992596200 !ruby/object:Gem::Requirement
+  requirement: &70200674633880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172992596200
+  version_requirements: *70200674633880
 description: Provides an interface to Fedex Web Services(version 10) - shipping rates,
   generate labels and address validation
 email: