active_shipping 0.9.13 → 0.9.14

data/lib/active_shipping/shipping/carriers/shipwire.rb

@@ -37,7 +37,7 @@ module ActiveMerchant
           :items => [ { :sku => '', :quantity => 1 } ]
         )
       rescue ActiveMerchant::Shipping::ResponseError => e
-        e.message != "Could not verify e-mail/password combination"
+        e.message != "Could not verify Username/EmailAddress and Password combination"
       end
       
       private
@@ -113,9 +113,11 @@ module ActiveMerchant
       def build_rate_estimates(response, origin, destination)
         response["rates"].collect do |quote|
           RateEstimate.new(origin, destination, carrier_for(quote["service"]), quote["service"],
-            :service_code  => quote["method"],
-            :total_price   => quote["cost"],
-            :currency      => quote["currency"]
+            :service_code    => quote["method"],
+            :total_price     => quote["cost"],
+            :currency        => quote["currency"],
+            :delivery_range  => [ timestamp_from_business_day(quote["delivery_min"]),
+                                  timestamp_from_business_day(quote["delivery_max"]) ]
           )
         end
       end
@@ -139,6 +141,10 @@ module ActiveMerchant
           rate["service"]   = parse_child_text(e, "Service")
           rate["cost"]      = parse_child_text(e, "Cost")
           rate["currency"]  = parse_child_attribute(e, "Cost", "currency")
+          if delivery_estimate = e.elements["DeliveryEstimate"]
+            rate["delivery_min"]  = parse_child_text(delivery_estimate, "Minimum").to_i
+            rate["delivery_max"]  = parse_child_text(delivery_estimate, "Maximum").to_i
+          end
           response["rates"] << rate
         end
 
@@ -166,7 +172,18 @@ module ActiveMerchant
         if element = parent.elements[name]
           element.attributes[attribute]
         end
-      end      
+      end
+
+      def timestamp_from_business_day(days)
+        return unless days
+        date = DateTime.now
+        days.times do
+          begin
+            date = date + 1
+          end until ![0,6].include?(date.wday)
+        end
+        date
+      end
     end
   end
-end
+end

data/lib/active_shipping/shipping/carriers/ups.rb

@@ -10,7 +10,7 @@ module ActiveMerchant
       @@name = "UPS"
       
       TEST_URL = 'https://wwwcie.ups.com'
-      LIVE_URL = 'https://www.ups.com'
+      LIVE_URL = 'https://onlinetools.ups.com'
       
       RESOURCES = {
         :rates => 'ups.app/xml/Rate',
@@ -275,12 +275,16 @@ module ActiveMerchant
           
           xml.elements.each('/*/RatedShipment') do |rated_shipment|
             service_code = rated_shipment.get_text('Service/Code').to_s
+            days_to_delivery = rated_shipment.get_text('GuaranteedDaysToDelivery').to_s.to_i
+            delivery_date  = days_to_delivery >= 1 ? days_to_delivery.days.from_now.strftime("%Y-%m-%d") : nil
+
             rate_estimates << RateEstimate.new(origin, destination, @@name,
                                 service_name_for(origin, service_code),
                                 :total_price => rated_shipment.get_text('TotalCharges/MonetaryValue').to_s.to_f,
                                 :currency => rated_shipment.get_text('TotalCharges/CurrencyCode').to_s,
                                 :service_code => service_code,
-                                :packages => packages)
+                                :packages => packages,
+                                :delivery_range => [delivery_date])
           end
         end
         RateResponse.new(success, message, Hash.from_xml(response).values.first, :rates => rate_estimates, :xml => response, :request => last_request)
@@ -387,4 +391,4 @@ module ActiveMerchant
       
     end
   end
-end
+end

data/lib/active_shipping/shipping/location.rb

@@ -14,13 +14,15 @@ module ActiveMerchant #:nodoc:
                   :address3,
                   :phone,
                   :fax,
-                  :address_type
+                  :address_type,
+                  :company_name
       
       alias_method :zip, :postal_code
       alias_method :postal, :postal_code
       alias_method :state, :province
       alias_method :territory, :province
       alias_method :region, :province
+      alias_method :company, :company_name
       
       def initialize(options = {})
         @country = (options[:country].nil? or options[:country].is_a?(ActiveMerchant::Country)) ?
@@ -35,12 +37,9 @@ module ActiveMerchant #:nodoc:
         @address3 = options[:address3]
         @phone = options[:phone]
         @fax = options[:fax]
-        if options[:address_type].present?
-          @address_type = options[:address_type].to_s
-          unless ADDRESS_TYPES.include?(@address_type)
-            raise ArgumentError.new("address_type must be one of #{ADDRESS_TYPES.map(&:inspect).join(', ')}")
-          end
-        end
+        @company_name = options[:company_name] || options[:company]
+
+        self.address_type = options[:address_type]
       end
       
       def self.from(object, options={})
@@ -56,7 +55,8 @@ module ActiveMerchant #:nodoc:
           :address3 => [:address3],
           :phone => [:phone, :phone_number],
           :fax => [:fax, :fax_number],
-          :address_type => [:address_type]
+          :address_type => [:address_type],
+          :company_name => [:company, :company_name]
         }
         attributes = {}
         hash_access = begin
@@ -84,7 +84,35 @@ module ActiveMerchant #:nodoc:
       def residential?; @address_type == 'residential' end
       def commercial?; @address_type == 'commercial' end
       def po_box?; @address_type == 'po_box' end
-      
+
+      def address_type=(value)
+        return unless value.present?
+        raise ArgumentError.new("address_type must be one of #{ADDRESS_TYPES.join(', ')}") unless ADDRESS_TYPES.include?(value.to_s)
+        @address_type = value.to_s
+      end
+
+      def to_hash
+        {
+          :country => country_code,
+          :postal_code => postal_code,
+          :province => province,
+          :city => city,
+          :name => name,
+          :address1 => address1,
+          :address2 => address2,
+          :address3 => address3,
+          :phone => phone,
+          :fax => fax,
+          :address_type => address_type,
+          :company_name => company_name
+        }
+      end
+
+      def to_xml(options={})
+        options[:root] ||= "location"
+        to_hash.to_xml(options)
+      end
+
       def to_s
         prettyprint.gsub(/\n/, ' ')
       end
@@ -106,4 +134,4 @@ module ActiveMerchant #:nodoc:
     end
       
   end
-end
+end

data/lib/active_shipping/shipping/package.rb

@@ -98,9 +98,9 @@ module ActiveMerchant #:nodoc:
         else
           case money
           when Float
-            (money * 100).to_i
+            (money * 100).round
           when String
-            money =~ /\./ ? (money.to_f * 100).to_i : money.to_i
+            money =~ /\./ ? (money.to_f * 100).round : money.to_i
           else
             money.to_i
           end
@@ -144,4 +144,4 @@ module ActiveMerchant #:nodoc:
   
     end
   end
-end
+end

data/lib/active_shipping/shipping/rate_estimate.rb

@@ -11,6 +11,7 @@ module ActiveMerchant #:nodoc:
       attr_reader :currency       # 'USD', 'CAD', etc.
                                   # http://en.wikipedia.org/wiki/ISO_4217
       attr_reader :delivery_date  # Usually only available for express shipments
+      attr_reader :delivery_range # Min and max delivery estimate in days
         
       def initialize(origin, destination, carrier, service_name, options={})
         @origin, @destination, @carrier, @service_name = origin, destination, carrier, service_name
@@ -22,9 +23,10 @@ module ActiveMerchant #:nodoc:
         end
         @total_price = Package.cents_from(options[:total_price])
         @currency = options[:currency]
-        @delivery_date = options[:delivery_date]
+        @delivery_range = options[:delivery_range] ? options[:delivery_range].map { |date| date_for(date) }.compact : []
+        @delivery_date = @delivery_range.last
       end
-      
+
       def total_price
         begin
           @total_price || @package_rates.sum {|p| p[:rate]}
@@ -48,7 +50,13 @@ module ActiveMerchant #:nodoc:
       def package_count
         package_rates.length
       end
-      
+
+      private
+      def date_for(date)
+        date && DateTime.strptime(date.to_s, "%Y-%m-%d")
+      rescue ArgumentError
+        nil
+      end
     end
   end
 end

data/lib/active_shipping/shipping/shipment_packer.rb

@@ -0,0 +1,48 @@
+module ActiveMerchant
+  module Shipping
+    class ShipmentPacker
+      class OverweightItem < StandardError
+      end
+
+      # items           - array of hashes containing quantity, grams and price.
+      #                   ex. [{:quantity => 2, :price => 1.0, :grams => 50}]
+      # dimensions      - [5.0, 15.0, 30.0]
+      # maximum_weight  - maximum weight in grams
+      # currency        - ISO currency code
+      def self.pack(items, dimensions, maximum_weight, currency)
+        items = items.map(&:symbolize_keys).map { |item| [item] * item[:quantity].to_i }.flatten
+        packages = []
+        state = :package_empty
+
+        while state != :packing_finished
+          case state
+          when :package_empty
+            package_weight, package_value = 0, 0
+            state = :filling_package
+          when :filling_package
+            item = items.shift
+            item_weight, item_price = item[:grams].to_i, Package.cents_from(item[:price])
+
+            if item_weight > maximum_weight
+              raise OverweightItem, "The item with weight of #{item_weight}g is heavier than the allowable package weight of #{maximum_weight}g"
+            end
+
+            if (package_weight + item_weight) <= maximum_weight
+              package_weight += item_weight
+              package_value  += item_price
+              state = :package_full if items.empty?
+            else
+              items.unshift(item)
+              state = :package_full
+            end
+          when :package_full
+            packages << ActiveMerchant::Shipping::Package.new(package_weight, dimensions, :value => package_value, :currency => currency)
+            state = items.any? ? :package_empty : :packing_finished
+          end
+        end
+
+        packages
+      end
+    end
+  end
+end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.9.13"
-end
+  VERSION = "0.9.14"
+end

data/lib/vendor/quantified/lib/quantified.rb

@@ -1,8 +1,6 @@
 $: << File.dirname(__FILE__)
-
-require 'active_support/all'
 require 'bigdecimal'
 
 require 'quantified/attribute'
 require 'quantified/mass'
-require 'quantified/length'
+require 'quantified/length'

data/lib/vendor/quantified/lib/quantified/attribute.rb

@@ -76,14 +76,10 @@ module Quantified
       if system
         self.systems_to_units[system.to_sym].dup
       else
-        read_inheritable_attribute(:primitives) | self.conversions.keys
+        self.primitives | self.conversions.keys
       end
     end
     
-    def self.primitives
-      read_inheritable_attribute(:primitives).dup
-    end
-    
     def self.non_primitives
       self.conversions.keys
     end
@@ -103,14 +99,18 @@ module Quantified
     end
     
     protected
-    
-    class_inheritable_accessor :add_numeric_methods, :primitives, :conversions, :current_system, :systems_to_units, :units_to_systems
-    self.add_numeric_methods = false
-    self.primitives = []
-    self.conversions = {}
-    self.current_system = nil
-    self.systems_to_units = {}
-    self.units_to_systems = {}
+
+    class << self
+      def primitives;              @primitives ||= [];             end
+      def add_numeric_methods;     @add_numeric_methods ||= false; end
+      def add_numeric_methods=(v); @add_numeric_methods = v;       end
+      def conversions;             @conversions ||= {};            end
+      def current_system;          @current_system;                end
+      def current_system=(v);      @current_system = v;            end
+      def systems_to_units;        @systems_to_units ||= {};       end
+      def units_to_systems;        @units_to_systems ||= {};       end
+    end
+
     
     def self.system(system_name, &block)
       old_system = self.current_system
@@ -205,4 +205,4 @@ module Quantified
       end
     end
   end
-end
+end

data/lib/vendor/quantified/test/test_helper.rb

@@ -1,2 +1,10 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/quantified'
+begin
+  require 'active_support/inflector'
+rescue LoadError => e
+  require 'rubygems'
+  gem "activesupport", ">= 2.3.5"
+  require 'active_support/inflector'
+end
+
+require File.dirname(__FILE__) + '/../lib/quantified'

data/lib/vendor/test_helper.rb

@@ -4,10 +4,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'test/unit'
 require 'active_shipping'
-
-begin
-  require 'mocha'
-rescue LoadError
-  require 'rubygems'
-  require 'mocha'
-end
+require 'mocha'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 9
-  - 13
-  version: 0.9.13
+  - 14
+  version: 0.9.14
 platform: ruby
 authors: 
 - James MacAulay
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -04:00
+date: 2012-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,8 +49,82 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: active_utils
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Get rates and tracking info from various shipping carriers.
 email: 
 - james@shopify.com
@@ -61,15 +135,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/active_merchant/common/connection.rb
-- lib/active_merchant/common/country.rb
-- lib/active_merchant/common/error.rb
-- lib/active_merchant/common/post_data.rb
-- lib/active_merchant/common/posts_data.rb
-- lib/active_merchant/common/requires_parameters.rb
-- lib/active_merchant/common/utils.rb
-- lib/active_merchant/common/validateable.rb
-- lib/active_merchant/common.rb
 - lib/active_shipping/shipping/base.rb
 - lib/active_shipping/shipping/carrier.rb
 - lib/active_shipping/shipping/carriers/bogus_carrier.rb
@@ -87,10 +152,10 @@ files:
 - lib/active_shipping/shipping/rate_response.rb
 - lib/active_shipping/shipping/response.rb
 - lib/active_shipping/shipping/shipment_event.rb
+- lib/active_shipping/shipping/shipment_packer.rb
 - lib/active_shipping/shipping/tracking_response.rb
 - lib/active_shipping/version.rb
 - lib/active_shipping.rb
-- lib/certs/cacert.pem
 - lib/certs/eParcel.dtd
 - lib/vendor/quantified/init.rb
 - lib/vendor/quantified/lib/quantified/attribute.rb