active_shipping 0.9.15 → 0.10.0

data/lib/active_shipping/shipping/package.rb

@@ -1,5 +1,80 @@
 module ActiveMerchant #:nodoc:
   module Shipping #:nodoc:
+    # A package item is a unique item(s) that is physically in a package. 
+    # A single package can have many items. This is only required 
+    # for shipping methods (label creation) right now.
+    class PackageItem
+      include Quantified
+
+      attr_reader :sku, :hs_code, :value, :name, :weight, :quantity, :options
+
+      def initialize(name, grams_or_ounces, value, quantity, options = {})
+        @name = name
+
+        imperial = (options[:units] == :imperial) ||
+          (grams_or_ounces.respond_to?(:unit) && m.unit.to_sym == :imperial)
+        
+        @unit_system = imperial ? :imperial : :metric
+
+        @weight = attribute_from_metric_or_imperial(grams_or_ounces, Mass, :grams, :ounces)
+
+        @value = Package.cents_from(value)
+        @quantity = quantity > 0 ? quantity : 1
+
+        @sku = options[:sku]
+        @hs_code = options[:hs_code]
+        @options = options
+      end
+
+      def weight(options = {})
+        case options[:type]
+        when nil, :actual
+          @weight
+        when :volumetric, :dimensional
+          @volumetric_weight ||= begin
+            m = Mass.new((centimetres(:box_volume) / 6.0), :grams)
+            @unit_system == :imperial ? m.in_ounces : m
+          end
+        when :billable
+          [ weight, weight(:type => :volumetric) ].max
+        end
+      end
+      alias_method :mass, :weight
+
+      def ounces(options={})
+        weight(options).in_ounces.amount
+      end
+      alias_method :oz, :ounces
+  
+      def grams(options={})
+        weight(options).in_grams.amount
+      end
+      alias_method :g, :grams
+  
+      def pounds(options={})
+        weight(options).in_pounds.amount
+      end
+      alias_method :lb, :pounds
+      alias_method :lbs, :pounds
+  
+      def kilograms(options={})
+        weight(options).in_kilograms.amount
+      end
+      alias_method :kg, :kilograms
+      alias_method :kgs, :kilograms
+
+      private
+
+      def attribute_from_metric_or_imperial(obj, klass, metric_unit, imperial_unit)
+        if obj.is_a?(klass)
+          return value
+        else
+          return klass.new(obj, (@unit_system == :imperial ? imperial_unit : metric_unit))
+        end
+      end
+
+    end
+
     class Package
       include Quantified
       
@@ -15,16 +90,30 @@ module ActiveMerchant #:nodoc:
         @options = options
         
         @dimensions = [dimensions].flatten.reject {|d| d.nil?}
+
         
         imperial = (options[:units] == :imperial) ||
-          ([grams_or_ounces, *dimensions].all? {|m| m.respond_to?(:unit) && m.unit.to_sym == :imperial})
+            ([grams_or_ounces, *dimensions].all? {|m| m.respond_to?(:unit) && m.unit.to_sym == :imperial})
         
-        @unit_system = imperial ? :imperial : :metric
+        weight_imperial = dimensions_imperial = imperial if options.include?(:units)
+
+        if options.include?(:weight_units)
+          weight_imperial = (options[:weight_units] == :imperial) ||
+              (grams_or_ounces.respond_to?(:unit) && m.unit.to_sym == :imperial)
+        end
+
+        if options.include?(:dim_units)
+          dimensions_imperial = (options[:dim_units] == :imperial) ||
+              (dimensions && dimensions.all? {|m| m.respond_to?(:unit) && m.unit.to_sym == :imperial})
+        end
         
-        @weight = attribute_from_metric_or_imperial(grams_or_ounces, Mass, :grams, :ounces)
+        @weight_unit_system = weight_imperial ? :imperial : :metric
+        @dimensions_unit_system = dimensions_imperial ? :imperial : :metric
+        
+        @weight = attribute_from_metric_or_imperial(grams_or_ounces, Mass, @weight_unit_system, :grams, :ounces)
         
         if @dimensions.blank?
-          @dimensions = [Length.new(0, (imperial ? :inches : :centimetres))] * 3
+          @dimensions = [Length.new(0, (dimensions_imperial ? :inches : :centimetres))] * 3
         else
           process_dimensions
         end
@@ -33,8 +122,18 @@ module ActiveMerchant #:nodoc:
         @currency = options[:currency] || (options[:value].currency if options[:value].respond_to?(:currency))
         @cylinder = (options[:cylinder] || options[:tube]) ? true : false
         @gift = options[:gift] ? true : false
+        @oversized = options[:oversized] ? true : false
+        @unpackaged = options[:unpackaged] ? true : false
       end
   
+      def unpackaged?
+        @unpackaged
+      end
+
+      def oversized?
+        @oversized
+      end
+    
       def cylinder?
         @cylinder
       end
@@ -83,7 +182,7 @@ module ActiveMerchant #:nodoc:
         when :volumetric, :dimensional
           @volumetric_weight ||= begin
             m = Mass.new((centimetres(:box_volume) / 6.0), :grams)
-            @unit_system == :imperial ? m.in_ounces : m
+            @weight_unit_system == :imperial ? m.in_ounces : m
           end
         when :billable
           [ weight, weight(:type => :volumetric) ].max
@@ -108,12 +207,12 @@ module ActiveMerchant #:nodoc:
       end
   
       private
-      
-      def attribute_from_metric_or_imperial(obj, klass, metric_unit, imperial_unit)
+
+      def attribute_from_metric_or_imperial(obj, klass, unit_system, metric_unit, imperial_unit)
         if obj.is_a?(klass)
-          return value
+          return obj
         else
-          return klass.new(obj, (@unit_system == :imperial ? imperial_unit : metric_unit))
+          return klass.new(obj, (unit_system == :imperial ? imperial_unit : metric_unit))
         end
       end
       
@@ -132,7 +231,7 @@ module ActiveMerchant #:nodoc:
       
       def process_dimensions
         @dimensions = @dimensions.map do |l|
-          attribute_from_metric_or_imperial(l, Length, :centimetres, :inches)
+          attribute_from_metric_or_imperial(l, Length, @dimensions_unit_system, :centimetres, :inches)
         end.sort
         # [1,2] => [1,1,2]
         # [5] => [5,5,5]

data/lib/active_shipping/shipping/rate_estimate.rb

@@ -1,18 +1,20 @@
 module ActiveMerchant #:nodoc:
   module Shipping #:nodoc:
-  
+
     class RateEstimate
       attr_reader :origin         # Location objects
-      attr_reader :destination  
+      attr_reader :destination
       attr_reader :package_rates  # array of hashes in the form of {:package => <Package>, :rate => 500}
       attr_reader :carrier        # Carrier.name ('USPS', 'FedEx', etc.)
       attr_reader :service_name   # name of service ("First Class Ground", etc.)
       attr_reader :service_code
       attr_reader :currency       # 'USD', 'CAD', etc.
                                   # http://en.wikipedia.org/wiki/ISO_4217
+      attr_reader :shipping_date
       attr_reader :delivery_date  # Usually only available for express shipments
       attr_reader :delivery_range # Min and max delivery estimate in days
-        
+      attr_reader :negotiated_rate
+
       def initialize(origin, destination, carrier, service_name, options={})
         @origin, @destination, @carrier, @service_name = origin, destination, carrier, service_name
         @service_code = options[:service_code]
@@ -22,8 +24,10 @@ module ActiveMerchant #:nodoc:
           @package_rates = Array(options[:packages]).map {|p| {:package => p}}
         end
         @total_price = Package.cents_from(options[:total_price])
+        @negotiated_rate = options[:negotiated_rate] ? Package.cents_from(options[:negotiated_rate]) : nil
         @currency = options[:currency]
         @delivery_range = options[:delivery_range] ? options[:delivery_range].map { |date| date_for(date) }.compact : []
+        @shipping_date = date_for(options[:shipping_date])
         @delivery_date = @delivery_range.last
       end
 
@@ -35,18 +39,18 @@ module ActiveMerchant #:nodoc:
         end
       end
       alias_method :price, :total_price
-      
+
       def add(package,rate=nil)
         cents = Package.cents_from(rate)
         raise ArgumentError.new("New packages must have valid rate information since this RateEstimate has no total_price set.") if cents.nil? and total_price.nil?
         @package_rates << {:package => package, :rate => cents}
         self
       end
-      
+
       def packages
         package_rates.map {|p| p[:package]}
       end
-      
+
       def package_count
         package_rates.length
       end

data/lib/active_shipping/shipping/shipping_response.rb

@@ -0,0 +1,16 @@
+module ActiveMerchant #:nodoc:
+  module Shipping
+    
+    class ShippingResponse < Response
+      attr_reader :shipping_id # string
+      attr_reader :tracking_number # string
+      
+      def initialize(success, message, params = {}, options = {})
+        @shipping_id = options[:shipping_id]
+        @tracking_number = options[:tracking_number]
+        super
+      end
+    end
+    
+  end
+end

data/lib/active_shipping/shipping/tracking_response.rb

@@ -8,6 +8,7 @@ module ActiveMerchant #:nodoc:
       attr_reader :status_code # string
       attr_reader :status_description #string
       attr_reader :scheduled_delivery_date # time
+      attr_reader :delivery_signature #string
       attr_reader :tracking_number # string
       attr_reader :shipment_events # array of ShipmentEvents in chronological order
       attr_reader :origin, :destination
@@ -19,6 +20,7 @@ module ActiveMerchant #:nodoc:
         @status_code = options[:status_code]
         @status_description = options[:status_description]
         @scheduled_delivery_date = options[:scheduled_delivery_date]
+        @delivery_signature = options[:delivery_signature]
         @tracking_number = options[:tracking_number]
         @shipment_events = Array(options[:shipment_events])
         @origin, @destination = options[:origin], options[:destination]
@@ -44,4 +46,4 @@ module ActiveMerchant #:nodoc:
     end
     
   end
-end
+end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.9.15"
+  VERSION = "0.10.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: active_shipping
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.9.15
+  version: 0.10.0
 platform: ruby
 authors:
 - James MacAulay
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -142,6 +142,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: nokogiri
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Get rates and tracking info from various shipping carriers.
 email:
 - james@shopify.com
@@ -153,12 +169,15 @@ files:
 - lib/active_shipping/shipping/carrier.rb
 - lib/active_shipping/shipping/carriers/bogus_carrier.rb
 - lib/active_shipping/shipping/carriers/canada_post.rb
+- lib/active_shipping/shipping/carriers/canada_post_pws.rb
 - lib/active_shipping/shipping/carriers/fedex.rb
 - lib/active_shipping/shipping/carriers/kunaki.rb
 - lib/active_shipping/shipping/carriers/new_zealand_post.rb
 - lib/active_shipping/shipping/carriers/shipwire.rb
 - lib/active_shipping/shipping/carriers/ups.rb
+- lib/active_shipping/shipping/carriers/ups.rb.orig
 - lib/active_shipping/shipping/carriers/usps.rb
+- lib/active_shipping/shipping/carriers/usps.rb.orig
 - lib/active_shipping/shipping/carriers.rb
 - lib/active_shipping/shipping/location.rb
 - lib/active_shipping/shipping/package.rb
@@ -167,6 +186,7 @@ files:
 - lib/active_shipping/shipping/response.rb
 - lib/active_shipping/shipping/shipment_event.rb
 - lib/active_shipping/shipping/shipment_packer.rb
+- lib/active_shipping/shipping/shipping_response.rb
 - lib/active_shipping/shipping/tracking_response.rb
 - lib/active_shipping/version.rb
 - lib/active_shipping.rb
@@ -205,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3014508717412085176
+      hash: -3915278247980377542
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement