active_fulfillment 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,5 +1,11 @@
 = ActiveFulfillment CHANGELOG
 
+== Version 1.0.1 (Dec 13, 2010)
+
+* Updated common files with changes from activemerchant [Dennis Theisen]
+* Updated Webgistix USPS shipping methods (4 added, 1 removed) [Dennis Theisen]
+* Changed Webgistix to treat a duplicate response as success instead of failure and to retry failed connection errors. [Dennis Theisen]
+
 == Version 1.0.0 (July 12, 2010)
 
 * Add inventory support to Amazon and Webgistix [Adrian Irving-Beer]

data/Rakefile

@@ -47,13 +47,14 @@ begin
     gemspec.email = "cody@shopify.com"
     gemspec.homepage = "http://github.com/shopify/active_fulfillment"
     gemspec.authors = ["Cody Fauser", "James MacAulay"]
-    gemspec.add_dependency('activesupport', '~> 2.3.2')
+    gemspec.add_dependency('activesupport', '>= 2.3.2')
     gemspec.add_dependency('builder', '>= 2.0.0')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
+desc "Update common files from active_merchant directory"
 task :update_common do 
   STDERR.puts "Updating common include from ../active_merchant. Please make sure this is up-to-date"
   system("diff -u lib/active_merchant/common.rb ../active_merchant/lib/active_merchant/common.rb | patch -p0")

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/active_fulfillment.gemspec

@@ -1,68 +1,72 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{active_fulfillment}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cody Fauser", "James MacAulay"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-12-13}
   s.email = %q{cody@shopify.com}
   s.files = [
     "CHANGELOG",
-     "Rakefile",
-     "VERSION",
-     "active_fulfillment.gemspec",
-     "init.rb",
-     "lib/active_fulfillment.rb",
-     "lib/active_fulfillment/fulfillment/base.rb",
-     "lib/active_fulfillment/fulfillment/response.rb",
-     "lib/active_fulfillment/fulfillment/service.rb",
-     "lib/active_fulfillment/fulfillment/services.rb",
-     "lib/active_fulfillment/fulfillment/services/amazon.rb",
-     "lib/active_fulfillment/fulfillment/services/shipwire.rb",
-     "lib/active_fulfillment/fulfillment/services/webgistix.rb",
-     "lib/active_merchant/common.rb",
-     "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/certs/cacert.pem",
-     "test/fixtures.yml",
-     "test/fixtures/xml/amazon/inventory_get_response.xml",
-     "test/fixtures/xml/amazon/inventory_list_response.xml",
-     "test/fixtures/xml/amazon/inventory_list_response_with_next_1.xml",
-     "test/fixtures/xml/amazon/inventory_list_response_with_next_2.xml",
-     "test/remote/amazon_test.rb",
-     "test/remote/shipwire_test.rb",
-     "test/remote/webgistix_test.rb",
-     "test/test_helper.rb",
-     "test/unit/base_test.rb",
-     "test/unit/services/amazon_test.rb",
-     "test/unit/services/shipwire_test.rb",
-     "test/unit/services/webgistix_test.rb"
+    "Rakefile",
+    "VERSION",
+    "active_fulfillment.gemspec",
+    "init.rb",
+    "lib/active_fulfillment.rb",
+    "lib/active_fulfillment/fulfillment/base.rb",
+    "lib/active_fulfillment/fulfillment/response.rb",
+    "lib/active_fulfillment/fulfillment/service.rb",
+    "lib/active_fulfillment/fulfillment/services.rb",
+    "lib/active_fulfillment/fulfillment/services/amazon.rb",
+    "lib/active_fulfillment/fulfillment/services/shipwire.rb",
+    "lib/active_fulfillment/fulfillment/services/webgistix.rb",
+    "lib/active_merchant/common.rb",
+    "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/certs/cacert.pem",
+    "test/fixtures.yml",
+    "test/fixtures/xml/amazon/inventory_get_response.xml",
+    "test/fixtures/xml/amazon/inventory_list_response.xml",
+    "test/fixtures/xml/amazon/inventory_list_response_with_next_1.xml",
+    "test/fixtures/xml/amazon/inventory_list_response_with_next_2.xml",
+    "test/fixtures/xml/amazon/tracking_response_1.xml",
+    "test/fixtures/xml/amazon/tracking_response_2.xml",
+    "test/fixtures/xml/amazon/tracking_response_error.xml",
+    "test/fixtures/xml/amazon/tracking_response_not_found.xml",
+    "test/fixtures/xml/webgistix/tracking_response.xml",
+    "test/remote/amazon_test.rb",
+    "test/remote/shipwire_test.rb",
+    "test/remote/webgistix_test.rb",
+    "test/test_helper.rb",
+    "test/unit/base_test.rb",
+    "test/unit/services/amazon_test.rb",
+    "test/unit/services/shipwire_test.rb",
+    "test/unit/services/webgistix_test.rb"
   ]
   s.homepage = %q{http://github.com/shopify/active_fulfillment}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Framework and tools for dealing with shipping, tracking and order fulfillment services.}
   s.test_files = [
     "test/remote/amazon_test.rb",
-     "test/remote/shipwire_test.rb",
-     "test/remote/webgistix_test.rb",
-     "test/test_helper.rb",
-     "test/unit/base_test.rb",
-     "test/unit/services/amazon_test.rb",
-     "test/unit/services/shipwire_test.rb",
-     "test/unit/services/webgistix_test.rb"
+    "test/remote/shipwire_test.rb",
+    "test/remote/webgistix_test.rb",
+    "test/test_helper.rb",
+    "test/unit/base_test.rb",
+    "test/unit/services/amazon_test.rb",
+    "test/unit/services/shipwire_test.rb",
+    "test/unit/services/webgistix_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -70,14 +74,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
       s.add_runtime_dependency(%q<builder>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 2.3.2"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.2"])
       s.add_dependency(%q<builder>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 2.3.2"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.2"])
     s.add_dependency(%q<builder>, [">= 2.0.0"])
   end
 end

data/lib/active_fulfillment.rb

@@ -30,6 +30,16 @@ rescue LoadError
   require 'active_support'
 end
 
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/delegating_attributes'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/enumerable'
+begin
+  require 'active_support/core_ext/time/acts_like'
+rescue LoadError
+end
+
 begin
   require 'builder'
 rescue LoadError

data/lib/active_fulfillment/fulfillment/services/amazon.rb

@@ -54,7 +54,8 @@ module ActiveMerchant
         :outbound => {
           :status => 'GetServiceStatus',
           :create => 'CreateFulfillmentOrder',
-          :list   => 'ListAllFulfillmentOrders'
+          :list   => 'ListAllFulfillmentOrders',
+          :tracking => 'GetFulfillmentOrder'
         },
         :inventory => {
           :get  => 'GetInventorySupply',
@@ -113,6 +114,26 @@ module ActiveMerchant
           response
         end
       end
+
+      def fetch_tracking_numbers(order_ids, options = {})
+        order_ids.inject(nil) do |previous, o_id|
+          response = commit :outbound, :tracking, build_tracking_request(o_id, options)
+
+          if !response.success?
+            if response.faultstring =~ /Reason: requested order not found./
+              response = Response.new(true, nil, {
+                :status           => SUCCESS,
+                :tracking_numbers => {}
+              })
+            else
+              return response
+            end
+          end
+
+          response.tracking_numbers.merge!(previous.tracking_numbers) if previous
+          response
+        end
+      end
       
       def valid_credentials?
         status.success?
@@ -202,6 +223,15 @@ module ActiveMerchant
         end
       end
 
+      def build_tracking_request(order_id, options)
+        request = OPERATIONS[:outbound][:tracking]
+        soap_request(request) do |xml|
+          xml.tag! request, { 'xmlns' => SERVICES[:outbound][:xmlns] } do
+            xml.tag! "MerchantFulfillmentOrderId", order_id
+          end
+        end
+      end
+
       def add_credentials(xml, request)
         login     = @options[:login]
         timestamp = "#{Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S")}Z"
@@ -264,7 +294,12 @@ module ActiveMerchant
 
         case service
         when :outbound
-          parse_fulfillment_response(op, document)
+          case op
+          when :tracking
+            parse_tracking_response(document)
+          else
+            parse_fulfillment_response(op, document)
+          end
         when :inventory
           parse_inventory_response(document)
         else
@@ -288,7 +323,7 @@ module ActiveMerchant
 
         document.each_element('//ns1:MerchantSKUSupply') do |node|
           # {MerchantSKU => 'SOME-ID', InStockSupplyQuantity => '101', ...}
-          params = node.elements.to_a.inject(Hash.new) {|h, k| h[k.name] = k.text; h}
+          params = node.elements.to_a.each_with_object({}) {|elem, hash| hash[elem.name] = elem.text}
 
           response[:stock_levels][params['MerchantSKU']] = params['InStockSupplyQuantity'].to_i
         end
@@ -300,6 +335,20 @@ module ActiveMerchant
         response
       end
       
+      def parse_tracking_response(document)
+        response = {}
+        response[:tracking_numbers] = {}
+
+        track_node = REXML::XPath.first(document, '//ns1:FulfillmentShipmentPackage/ns1:TrackingNumber')
+        if track_node
+          id_node = REXML::XPath.first(document, '//ns1:MerchantFulfillmentOrderId')
+          response[:tracking_numbers][id_node.text] = track_node.text
+        end
+
+        response[:response_status] = SUCCESS
+        response
+      end
+      
       def parse_error(http_response)
         response = {}
         response[:http_code] = http_response.code

data/lib/active_fulfillment/fulfillment/services/shipwire.rb

@@ -54,12 +54,12 @@ module ActiveMerchant
         commit :inventory, build_inventory_request(options)
       end
       
-      def fetch_tracking_numbers(options = {})
-        commit :tracking, build_tracking_request(options)
+      def fetch_tracking_numbers(order_ids)
+        commit :tracking, build_tracking_request(order_ids)
       end
       
       def valid_credentials?
-        response = fetch_tracking_numbers
+        response = fetch_tracking_numbers([])
         response.message !~ INVALID_LOGIN
       end
       
@@ -91,14 +91,16 @@ module ActiveMerchant
         end
       end
       
-      def build_tracking_request(options)
+      def build_tracking_request(order_ids)
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.declare! :DOCTYPE, :InventoryStatus, :SYSTEM, SCHEMA_URLS[:inventory]
         xml.tag! 'TrackingUpdate' do
           add_credentials(xml)
           xml.tag! 'Server', test? ? 'Test' : 'Production'
-          xml.tag! 'Bookmark', '3'
+          order_ids.each do |o_id|
+            xml.tag! 'OrderNo', o_id
+          end
         end
       end
 

data/lib/active_fulfillment/fulfillment/services/webgistix.rb

@@ -3,16 +3,26 @@ module ActiveMerchant
     class WebgistixService < Service
       SERVICE_URLS = {
         :fulfillment => 'https://www.webgistix.com/XML/CreateOrder.asp',
-        :inventory => 'https://www.webgistix.com/XML/GetInventory.asp'
+        :inventory => 'https://www.webgistix.com/XML/GetInventory.asp',
+        :tracking  => 'https://www.webgistix.com/XML/GetTracking.asp'
       } 
       TEST_URLS = SERVICE_URLS.merge({
         :fulfillment => 'https://www.webgistix.com/XML/CreateOrderTest.asp'
       })
+      
+      SUCCESS, DUPLICATE, FAILURE = 'True', 'Duplicate', 'False'
 
-      SUCCESS, FAILURE = 'True', 'False'
       SUCCESS_MESSAGE = 'Successfully submitted the order'
       FAILURE_MESSAGE = 'Failed to submit the order'
-      INVALID_LOGIN = 'Access Denied'
+      DUPLICATE_MESSAGE = 'This order has already been successfully submitted'
+      
+      INVALID_LOGIN = 'Invalid Credentials'
+      NOT_SHIPPED = 'Not Shipped'
+
+      # If a request is detected as a duplicate only the original data will be 
+      # used by Webgistix, and the subsequent responses will have a
+      # :duplicate parameter set in the params hash.
+      self.retry_safe = true
       
       # The first is the label, and the last is the code
       def self.shipping_methods
@@ -37,16 +47,18 @@ module ActiveMerchant
           ["FedEx International Economy", "FedEx International Economy"],
           ["FedEx International First", "FedEx International First"],
           ["FedEx Ground", "FedEx Ground"],
-          ["USPS Priority Mail & Global Priority Mail", "Priority"],
-          ["USPS Priority Mail & Global Priority Mail (flat rate)", "Flat Rate Priority"],
+          ["USPS Priority Mail", "Priority Mail"],
+          ["USPS Priority Mail International", "Priority Mail International"],
+          ["USPS Priority Mail Small Flat Rate Box", "Priority Mail Small Flat Rate Box"],
+          ["USPS Priority Mail Medium Flat Rate Box", "Priority Mail Medium Flat Rate Box"],
+          ["USPS Priority Mail Large Flat Rate Box", "Priority Mail Large Flat Rate Box"],
+          ["USPS Priority Mail Flat Rate Envelope", "Priority Mail Flat Rate Envelope"],
           ["USPS First Class Mail", "First Class"],
-          ["USPS Express Mail & Global Express Mail", "Express"],
-          ["USPS Flat Rate Global Express Mail", "Global Express Mail Flat Rate"],
-          ["USPS Parcel Post", "Parcel"],
           ["USPS First Class International", "First Class International"],
-          ["USPS Media Mail", "Media Mail"],
-          ["USPS Economy Parcel Post", "Economy Parcel"],
-          ["USPS Economy Air Letter Post", "Economy Letter"],
+          ["USPS Express Mail", "Express"],
+          ["USPS Express Mail International", "Express Mail International"],
+          ["USPS Parcel Post", "Parcel"],
+          ["USPS Media Mail", "Media Mail"]
         ].inject(ActiveSupport::OrderedHash.new){|h, (k,v)| h[k] = v; h}
       end
       
@@ -65,6 +77,10 @@ module ActiveMerchant
       def fetch_stock_levels(options = {})
         commit :inventory, build_inventory_request(options)
       end
+
+      def fetch_tracking_numbers(order_ids, options = {})
+        commit :tracking, build_tracking_request(order_ids, options)
+      end
       
       def valid_credentials?
         response = fulfill('', {}, [], :shipping_method => '')
@@ -124,7 +140,32 @@ module ActiveMerchant
           add_credentials(xml)
         end
       end
-            
+
+      #<?xml version="1.0"?>
+      # <TrackingXML>
+      #   <Password>Webgistix</Password> 
+      #   <CustomerID>3</CustomerID> 
+      #   <Tracking>
+      #     <Order>AB12345</Order>
+      #   </Tracking>
+      #   <Tracking>
+      #     <Order>XY4567</Order>
+      #   </Tracking>
+      # </TrackingXML>
+      def build_tracking_request(order_ids, options)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.instruct!
+        xml.tag! 'TrackingXML' do
+          add_credentials(xml)
+          
+          order_ids.each do |o_id|
+            xml.tag! 'Tracking' do
+              xml.tag! 'Order', o_id
+            end
+          end
+        end
+      end
+
       def add_credentials(xml)
         xml.tag! 'CustomerID', @options[:login]
         xml.tag! 'Password', @options[:password]
@@ -184,13 +225,15 @@ module ActiveMerchant
       end
       
       def success?(response)
-        response[:success] == SUCCESS
+        response[:success] == SUCCESS || response[:success] == DUPLICATE
       end
       
       def message_from(response)
-        return SUCCESS_MESSAGE if success?(response)
-
-        if response[:error_0] == INVALID_LOGIN
+        if response[:duplicate]
+          DUPLICATE_MESSAGE
+        elsif success?(response)
+          SUCCESS_MESSAGE
+        elsif response[:error_0] == INVALID_LOGIN
           INVALID_LOGIN
         else
           FAILURE_MESSAGE
@@ -209,18 +252,15 @@ module ActiveMerchant
           parse_fulfillment_response(document)
         when :inventory
           parse_inventory_response(document)
+        when :tracking
+          parse_tracking_response(document)
         else
           raise ArgumentError, "Unknown action #{action}"
         end
       end
       
       def parse_fulfillment_response(document)
-        response = {}
-        
-        # Fetch the errors
-        document.root.elements.to_a("Error").each_with_index do |e, i|
-          response["error_#{i}".to_sym] = e.text
-        end
+        response = parse_errors(document)
         
         # Check if completed
         if completed = REXML::XPath.first(document, '//Completed')
@@ -231,23 +271,50 @@ module ActiveMerchant
           response[:success] = FAILURE
         end
         
+        response[:duplicate] = response[:success] == DUPLICATE
+        
         response
       end
 
       def parse_inventory_response(document)
-        response = {}
+        response = parse_errors(document)
         response[:stock_levels] = {}
 
         document.root.each_element('//Item') do |node|
           # {ItemID => 'SOME-ID', ItemQty => '101'}
-          params = node.elements.to_a.inject(Hash.new) {|h, k| h[k.name] = k.text; h}
+          params = node.elements.to_a.each_with_object({}) {|elem, hash| hash[elem.name] = elem.text}
 
           response[:stock_levels][params['ItemID']] = params['ItemQty'].to_i
         end
 
-        response[:success] = SUCCESS
         response
       end
+
+      def parse_tracking_response(document)
+        response = parse_errors(document)
+        response[:tracking_numbers] = {}
+
+        document.root.each_element('//Shipment') do |node|
+          # {InvoiceNumber => 'SOME-ID', ShipmentTrackingNumber => 'SOME-TRACKING-NUMBER'}
+          params = node.elements.to_a.each_with_object({}) {|elem, hash| hash[elem.name] = elem.text}
+
+          tracking = params['ShipmentTrackingNumber']
+          response[:tracking_numbers][params['InvoiceNumber']] = tracking unless tracking == NOT_SHIPPED
+        end
+
+        response
+      end
+      
+      def parse_errors(document)
+        response = {}
+        
+        REXML::XPath.match(document, "//Errors/Error").to_a.each_with_index do |e, i|
+          response["error_#{i}".to_sym] = e.text
+        end
+        
+        response[:success] = response.empty? ? SUCCESS : FAILURE
+        response
+      end        
     end
   end
 end

data/lib/active_merchant/common/connection.rb

@@ -71,9 +71,8 @@ module ActiveMerchant
           end
           
           info "--> %d %s (%d %.4fs)" % [result.code, result.message, result.body ? result.body.length : 0, realtime], tag
-          response = handle_response(result)
-          debug response
-          response
+          debug result.body
+          result
         rescue EOFError => e
           raise ConnectionError, "The remote server dropped the connection"
         rescue Errno::ECONNRESET => e
@@ -147,15 +146,6 @@ module ActiveMerchant
       end
     end
     
-    def handle_response(response)
-      case response.code.to_i
-      when 200...300
-        response.body
-      else
-        raise ResponseError.new(response)
-      end
-    end
-    
     def debug(message, tag = nil)
       log(:debug, message, tag)
     end
@@ -169,4 +159,4 @@ module ActiveMerchant
       logger.send(level, message) if logger
     end
   end
-end
+end

data/lib/active_merchant/common/country.rb

@@ -46,7 +46,16 @@ module ActiveMerchant #:nodoc:
     end
 
     def code(format)
-      @codes.select{|c| c.format == format}
+      @codes.detect{|c| c.format == format}
+    end
+    
+    def ==(other)
+      (@name == other.name)
+    end
+    alias eql? ==
+    
+    def hash
+      @name.hash
     end
 
     def to_s
@@ -67,7 +76,6 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'AW', :name => 'Aruba', :alpha3 => 'ABW', :numeric => '533' }, 
       { :alpha2 => 'AU', :name => 'Australia', :alpha3 => 'AUS', :numeric => '036' }, 
       { :alpha2 => 'AT', :name => 'Austria', :alpha3 => 'AUT', :numeric => '040' },
-      { :alpha2 => 'AX', :name => 'Åland Islands', :alpha3 => 'ALA', :numeric => '248' },
       { :alpha2 => 'AZ', :name => 'Azerbaijan', :alpha3 => 'AZE', :numeric => '031' }, 
       { :alpha2 => 'BS', :name => 'Bahamas', :alpha3 => 'BHS', :numeric => '044' }, 
       { :alpha2 => 'BH', :name => 'Bahrain', :alpha3 => 'BHR', :numeric => '048' }, 
@@ -84,8 +92,8 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'BW', :name => 'Botswana', :alpha3 => 'BWA', :numeric => '072' }, 
       { :alpha2 => 'BV', :name => 'Bouvet Island', :alpha3 => 'BVD', :numeric => '074' }, 
       { :alpha2 => 'BR', :name => 'Brazil', :alpha3 => 'BRA', :numeric => '076' }, 
-      { :alpha2 => 'BN', :name => 'Brunei Darussalam', :alpha3 => 'BRN', :numeric => '096' },
       { :alpha2 => 'IO', :name => 'British Indian Ocean Territory', :alpha3 => 'IOT', :numeric => '086' }, 
+      { :alpha2 => 'BN', :name => 'Brunei Darussalam', :alpha3 => 'BRN', :numeric => '096' },
       { :alpha2 => 'BG', :name => 'Bulgaria', :alpha3 => 'BGR', :numeric => '100' }, 
       { :alpha2 => 'BF', :name => 'Burkina Faso', :alpha3 => 'BFA', :numeric => '854' }, 
       { :alpha2 => 'BI', :name => 'Burundi', :alpha3 => 'BDI', :numeric => '108' }, 
@@ -142,15 +150,15 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'GP', :name => 'Guadeloupe', :alpha3 => 'GLP', :numeric => '312' }, 
       { :alpha2 => 'GU', :name => 'Guam', :alpha3 => 'GUM', :numeric => '316' }, 
       { :alpha2 => 'GT', :name => 'Guatemala', :alpha3 => 'GTM', :numeric => '320' }, 
+      { :alpha2 => 'GG', :name => 'Guernsey', :alpha3 => 'GGY', :numeric => '831' },
       { :alpha2 => 'GN', :name => 'Guinea', :alpha3 => 'GIN', :numeric => '324' }, 
       { :alpha2 => 'GW', :name => 'Guinea-Bissau', :alpha3 => 'GNB', :numeric => '624' }, 
       { :alpha2 => 'GY', :name => 'Guyana', :alpha3 => 'GUY', :numeric => '328' },
-      { :alpha2 => 'GG', :name => 'Guernsey', :alpha3 => 'GGY', :numeric => '831' },
       { :alpha2 => 'HT', :name => 'Haiti', :alpha3 => 'HTI', :numeric => '332' }, 
+      { :alpha2 => 'HM', :name => 'Heard Island And Mcdonald Islands', :alpha3 => 'HMD', :numeric => '334' }, 
       { :alpha2 => 'VA', :name => 'Holy See (Vatican City State)', :alpha3 => 'VAT', :numeric => '336' }, 
       { :alpha2 => 'HN', :name => 'Honduras', :alpha3 => 'HND', :numeric => '340' }, 
       { :alpha2 => 'HK', :name => 'Hong Kong', :alpha3 => 'HKG', :numeric => '344' }, 
-      { :alpha2 => 'HM', :name => 'Heard Island And Mcdonald Islands', :alpha3 => 'HMD', :numeric => '334' }, 
       { :alpha2 => 'HU', :name => 'Hungary', :alpha3 => 'HUN', :numeric => '348' }, 
       { :alpha2 => 'IS', :name => 'Iceland', :alpha3 => 'ISL', :numeric => '352' }, 
       { :alpha2 => 'IN', :name => 'India', :alpha3 => 'IND', :numeric => '356' }, 
@@ -298,7 +306,8 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'EH', :name => 'Western Sahara', :alpha3 => 'ESH', :numeric => '732' }, 
       { :alpha2 => 'YE', :name => 'Yemen', :alpha3 => 'YEM', :numeric => '887' }, 
       { :alpha2 => 'ZM', :name => 'Zambia', :alpha3 => 'ZMB', :numeric => '894' }, 
-      { :alpha2 => 'ZW', :name => 'Zimbabwe', :alpha3 => 'ZWE', :numeric => '716' }
+      { :alpha2 => 'ZW', :name => 'Zimbabwe', :alpha3 => 'ZWE', :numeric => '716' },
+      { :alpha2 => 'AX', :name => 'Åland Islands', :alpha3 => 'ALA', :numeric => '248' }
     ]
 
     def self.find(name)

data/lib/active_merchant/common/posts_data.rb

@@ -25,9 +25,12 @@ module ActiveMerchant #:nodoc:
     def ssl_post(endpoint, data, headers = {})
       ssl_request(:post, endpoint, data, headers)
     end
-    
-    private
-    def ssl_request(method, endpoint, data, headers = {})
+
+    def ssl_request(method, endpoint, data, headers)
+      handle_response(raw_ssl_request(method, endpoint, data, headers))
+    end
+
+    def raw_ssl_request(method, endpoint, data, headers = {})
       connection = Connection.new(endpoint)
       connection.open_timeout = open_timeout
       connection.read_timeout = read_timeout
@@ -42,6 +45,17 @@ module ActiveMerchant #:nodoc:
       
       connection.request(method, data, headers)
     end
+
+    private
+
+    def handle_response(response)
+      case response.code.to_i
+      when 200...300
+        response.body
+      else
+        raise ResponseError.new(response)
+      end
+    end
     
   end
-end
+end

data/test/fixtures/xml/amazon/tracking_response_1.xml

@@ -0,0 +1,56 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+  <soapenv:Body>
+    <ns1:GetFulfillmentOrderResponse
+      xmlns:ns1="http://fba-outbound.amazonaws.com/doc/2007-08-02/">
+      <ns1:GetFulfillmentOrderResult>
+        <ns1:FulfillmentOrder>
+          <ns1:MerchantFulfillmentOrderId>TEST-00000001</ns1:MerchantFulfillmentOrderId>
+          <ns1:ReceivedDateTime>2007-08-02T08:00:00Z</ns1:ReceivedDateTime>
+          <ns1:ShippingSpeedCategory>Standard</ns1:ShippingSpeedCategory>
+          <ns1:DisplayableOrderDateTime>2007-08-02T00:00:00Z</ns1:DisplayableOrderDateTime>
+          <ns1:DisplayableOrderComment>Thank you for your order!</ns1:DisplayableOrderComment>
+          <ns1:DisplayableOrderId>TEST-00000001</ns1:DisplayableOrderId>
+          <ns1:DestinationAddress>
+            <ns1:Name>John Smith</ns1:Name>
+            <ns1:Line1>2412 25th Ave NW.</ns1:Line1>
+            <ns1:City>Seattle</ns1:City>
+            <ns1:StateOrProvinceCode>WA</ns1:StateOrProvinceCode>
+            <ns1:CountryCode>US</ns1:CountryCode>
+            <ns1:PostalCode>98104</ns1:PostalCode>
+            <ns1:PhoneNumber>206-266-1000</ns1:PhoneNumber>
+          </ns1:DestinationAddress>
+          <ns1:FulfillmentOrderStatus>Complete</ns1:FulfillmentOrderStatus>
+          <ns1:StatusUpdatedDateTime>2007-08-03T16:00:00Z</ns1:StatusUpdatedDateTime>
+        </ns1:FulfillmentOrder>
+        <ns1:FulfillmentOrderItem>
+          <ns1:MerchantSKU>MSKU-00000001</ns1:MerchantSKU>
+          <ns1:MerchantFulfillmentOrderItemId>TEST-00000001-1</ns1:MerchantFulfillmentOrderItemId>
+          <ns1:Quantity>2</ns1:Quantity>
+          <ns1:CancelledQuantity>0</ns1:CancelledQuantity>
+          <ns1:UnfulfillableQuantity>0</ns1:UnfulfillableQuantity>
+        </ns1:FulfillmentOrderItem>
+        <ns1:FulfillmentShipment>
+          <ns1:AmazonShipmentId>TEST00000001</ns1:AmazonShipmentId>
+          <ns1:FulfillmentCenterId>TST1</ns1:FulfillmentCenterId>
+          <ns1:FulfillmentShipmentStatus>Shipped</ns1:FulfillmentShipmentStatus>
+          <ns1:ShippingDateTime>2007-08-03T16:00:00Z</ns1:ShippingDateTime>
+          <ns1:EstimatedArrivalDateTime>2007-08-10T16:00:00Z</ns1:EstimatedArrivalDateTime>
+          <ns1:FulfillmentShipmentItem>
+            <ns1:MerchantSKU>MSKU-00000001</ns1:MerchantSKU>
+            <ns1:MerchantFulfillmentOrderItemId>TEST-00000001-1</ns1:MerchantFulfillmentOrderItemId>
+            <ns1:Quantity>2</ns1:Quantity>
+            <ns1:PackageNumber>1</ns1:PackageNumber>
+          </ns1:FulfillmentShipmentItem>
+          <ns1:FulfillmentShipmentPackage>
+            <ns1:PackageNumber>1</ns1:PackageNumber>
+            <ns1:CarrierCode>UPS</ns1:CarrierCode>
+            <ns1:TrackingNumber>UPS00000001</ns1:TrackingNumber>
+          </ns1:FulfillmentShipmentPackage>
+        </ns1:FulfillmentShipment>
+      </ns1:GetFulfillmentOrderResult>
+      <ns1:ResponseMetadata>
+        <ns1:RequestId>963215ec-bec6-4ae0-84e0-19f5823ee33a</ns1:RequestId>
+      </ns1:ResponseMetadata>
+    </ns1:GetFulfillmentOrderResponse>
+  </soapenv:Body>
+</soapenv:Envelope>

data/test/fixtures/xml/amazon/tracking_response_2.xml

@@ -0,0 +1,38 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+  <soapenv:Body>
+    <ns1:GetFulfillmentOrderResponse
+      xmlns:ns1="http://fba-outbound.amazonaws.com/doc/2007-08-02/">
+      <ns1:GetFulfillmentOrderResult>
+        <ns1:FulfillmentOrder>
+          <ns1:MerchantFulfillmentOrderId>TEST-00000002</ns1:MerchantFulfillmentOrderId>
+          <ns1:ReceivedDateTime>2007-08-02T08:00:00Z</ns1:ReceivedDateTime>
+          <ns1:ShippingSpeedCategory>Standard</ns1:ShippingSpeedCategory>
+          <ns1:DisplayableOrderDateTime>2007-08-02T00:00:00Z</ns1:DisplayableOrderDateTime>
+          <ns1:DisplayableOrderComment>Thank you for your order!</ns1:DisplayableOrderComment>
+          <ns1:DisplayableOrderId>TEST-00000001</ns1:DisplayableOrderId>
+          <ns1:DestinationAddress>
+            <ns1:Name>John Smith</ns1:Name>
+            <ns1:Line1>2412 25th Ave NW.</ns1:Line1>
+            <ns1:City>Seattle</ns1:City>
+            <ns1:StateOrProvinceCode>WA</ns1:StateOrProvinceCode>
+            <ns1:CountryCode>US</ns1:CountryCode>
+            <ns1:PostalCode>98104</ns1:PostalCode>
+            <ns1:PhoneNumber>206-266-1000</ns1:PhoneNumber>
+          </ns1:DestinationAddress>
+          <ns1:FulfillmentOrderStatus>Complete</ns1:FulfillmentOrderStatus>
+          <ns1:StatusUpdatedDateTime>2007-08-03T16:00:00Z</ns1:StatusUpdatedDateTime>
+        </ns1:FulfillmentOrder>
+        <ns1:FulfillmentOrderItem>
+          <ns1:MerchantSKU>MSKU-00000001</ns1:MerchantSKU>
+          <ns1:MerchantFulfillmentOrderItemId>TEST-00000001-1</ns1:MerchantFulfillmentOrderItemId>
+          <ns1:Quantity>2</ns1:Quantity>
+          <ns1:CancelledQuantity>0</ns1:CancelledQuantity>
+          <ns1:UnfulfillableQuantity>0</ns1:UnfulfillableQuantity>
+        </ns1:FulfillmentOrderItem>
+      </ns1:GetFulfillmentOrderResult>
+      <ns1:ResponseMetadata>
+        <ns1:RequestId>963215ec-bec6-4ae0-84e0-19f5823ee33a</ns1:RequestId>
+      </ns1:ResponseMetadata>
+    </ns1:GetFulfillmentOrderResponse>
+  </soapenv:Body>
+</soapenv:Envelope>

data/test/fixtures/xml/amazon/tracking_response_error.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+xmlns:aws="http://webservices.amazon.com/AWSFault/2005-15-09">
+  <env:Body>
+    <env:Fault>
+      <faultcode>aws:Client.UnknownError</faultcode>
+      <faultstring>Something bad happened!</faultstring>
+      <detail>
+        <aws:RequestId xmlns:aws="http://webservices.amazon.com/AWSFault/2005-15-09">145b969c-23ec-41e4-a552-30e57fc2684f</aws:RequestId>
+      </detail>
+    </env:Fault>
+  </env:Body>
+</env:Envelope>

data/test/fixtures/xml/amazon/tracking_response_not_found.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+xmlns:aws="http://webservices.amazon.com/AWSFault/2005-15-09">
+  <env:Body>
+    <env:Fault>
+      <faultcode>aws:Client.InvalidParameterValue</faultcode>
+      <faultstring>Value #1337-1 for parameter MerchantFulfillmentOrderId is invalid. Reason: requested order not found.</faultstring>
+      <detail>
+        <aws:RequestId xmlns:aws="http://webservices.amazon.com/AWSFault/2005-15-09">145b969c-23ec-41e4-a552-30e57fc2684f</aws:RequestId>
+      </detail>
+    </env:Fault>
+  </env:Body>
+</env:Envelope>

data/test/fixtures/xml/webgistix/tracking_response.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Orders>
+  <Shipment>
+    <InvoiceNumber>AB12345</InvoiceNumber>
+    <WebgistixOrderNumber>67891</WebgistixOrderNumber>
+    <Method>UPS Ground</Method>
+    <DateShipped>10/25/2009</DateShipped>
+    <ShipmentTrackingNumber>1Z8E5A380396682872</ShipmentTrackingNumber>
+  </Shipment>
+  <Shipment>
+    <InvoiceNumber>XY4567</InvoiceNumber>
+    <ShipmentTrackingNumber>Not Shipped</ShipmentTrackingNumber>
+  </Shipment>
+</Orders>

data/test/remote/amazon_test.rb

@@ -76,6 +76,18 @@ class RemoteAmazonTest < Test::Unit::TestCase
     assert_equal 0, response.stock_levels['SETTLERS']
   end
   
+  def test_fetch_tracking_numbers
+    response = @service.fetch_tracking_numbers(['123456']) # an actual order
+    assert response.success?
+    assert_equal Hash.new, response.tracking_numbers # no tracking numbers in testing
+  end
+  
+  def test_fetch_tracking_numbers_ignores_not_found
+    response = @service.fetch_tracking_numbers(['#1337-1'])
+    assert response.success?
+    assert_equal Hash.new, response.tracking_numbers
+  end
+  
   def test_valid_credentials
     assert @service.valid_credentials?
   end

data/test/remote/shipwire_test.rb

@@ -125,10 +125,10 @@ class RemoteShipwireTest < Test::Unit::TestCase
   end
   
   def test_fetch_tracking_numbers
-    response = @shipwire.fetch_tracking_numbers
+    response = @shipwire.fetch_tracking_numbers(['123456'])
     assert response.success?    
     assert response.test?
-    assert_equal Hash.new, response.tracking_numbers
+    assert_equal Hash.new, response.tracking_numbers # no tracking numbers in testing
   end
   
   def test_valid_credentials

data/test/remote/webgistix_test.rb

@@ -63,15 +63,25 @@ class RemoteWebgistixTest < Test::Unit::TestCase
     response = service.fulfill('123456', @address, @line_items, @options)
     assert !response.success?
     assert response.test?
-    assert_equal "Access Denied", response.message
+    assert_equal "Invalid Credentials", response.message
   end
   
   def test_get_inventory
     response = @service.fetch_stock_levels
     assert response.success?
     assert response.test?
-    assert_equal 95, response.stock_levels['GN-600-46']
-    assert_equal 97, response.stock_levels['GN-800-09']
+    assert_equal 90,  response.stock_levels['WX-01-3022']
+    assert_equal 140, response.stock_levels['WX-04-1080']
+  end
+  
+  def test_fetch_tracking_numbers
+    response = @service.fetch_tracking_numbers([
+      '1254658', 'FAItest123', 'Flat Rate Test Order 4'
+    ])
+    assert response.success?
+    assert_equal '4209073191018052136352154', response.tracking_numbers['1254658']
+    assert_equal '9101805213907472080032',    response.tracking_numbers['Flat Rate Test Order 4']
+    assert_nil response.tracking_numbers['FAItest123'] # 'Not Shipped'
   end
   
   def test_valid_credentials

data/test/unit/services/amazon_test.rb

@@ -90,6 +90,49 @@ class AmazonTest < Test::Unit::TestCase
     assert_equal 555, response.stock_levels['GN-02-02A']
   end
   
+  def test_fetch_tracking_numbers
+    @service.expects(:ssl_post).twice.returns(
+      xml_fixture('amazon/tracking_response_1'),
+      xml_fixture('amazon/tracking_response_2')
+    )
+      
+    response = @service.fetch_tracking_numbers(['TEST-00000001', 'TEST-00000002'])
+    assert response.success?
+    assert_equal 'UPS00000001', response.tracking_numbers['TEST-00000001']
+    assert_nil response.tracking_numbers['TEST-00000002']
+  end
+
+  def test_fetch_tracking_numbers_ignores_not_found
+    response = mock('response')
+    response.stubs(:code).returns(500)
+    response.stubs(:message).returns('Internal Server Error')
+    response.stubs(:body).returns(xml_fixture('amazon/tracking_response_not_found'))
+    
+    @service.expects(:ssl_post).times(3).
+      returns(xml_fixture('amazon/tracking_response_1')).
+      raises(ActiveMerchant::ResponseError.new(response)).
+      returns(xml_fixture('amazon/tracking_response_2'))
+      
+    response = @service.fetch_tracking_numbers(['TEST-00000001', '#1337-1', 'TEST-00000002'])
+    assert response.success?
+    assert_equal 'UPS00000001', response.tracking_numbers['TEST-00000001']
+  end
+
+  def test_fetch_tracking_numbers_aborts_on_error
+    response = mock('response')
+    response.stubs(:code).returns(500)
+    response.stubs(:message).returns('Internal Server Error')
+    response.stubs(:body).returns(xml_fixture('amazon/tracking_response_error'))
+    
+    @service.expects(:ssl_post).twice.
+      returns(xml_fixture('amazon/tracking_response_1')).
+      raises(ActiveMerchant::ResponseError.new(response))
+      
+    response = @service.fetch_tracking_numbers(['TEST-00000001', 'ERROR', 'TEST-00000002'])
+    assert !response.success?
+    assert_equal 'Something bad happened!', response.faultstring
+  end
+
   def test_404_error
     http_response = build_mock_response(response_from_404, "Not Found", "404")
     @service.expects(:ssl_post).raises(ActiveMerchant::ResponseError.new(http_response))

data/test/unit/services/shipwire_test.rb

@@ -62,10 +62,9 @@ class ShipwireTest < Test::Unit::TestCase
     
   def test_no_tracking_numbers_available
     @shipwire.expects(:ssl_post).returns(successful_empty_tracking_response)
-    response = @shipwire.fetch_tracking_numbers
+    response = @shipwire.fetch_tracking_numbers(['1234'])
     assert response.success?
     assert_equal Hash.new, response.tracking_numbers
-    
   end
   
   def test_successful_tracking
@@ -73,7 +72,7 @@ class ShipwireTest < Test::Unit::TestCase
                  "2987" => "1ZW682E90326795080" }
     
     @shipwire.expects(:ssl_post).returns(successful_tracking_response)
-    response = @shipwire.fetch_tracking_numbers
+    response = @shipwire.fetch_tracking_numbers(["2986", "2987"])
     assert response.success?
     assert_equal "3", response.params["total_orders"]
     assert_equal "Test", response.params["status"]
@@ -84,7 +83,11 @@ class ShipwireTest < Test::Unit::TestCase
   
   def test_successful_tracking_with_live_data
     @shipwire.expects(:ssl_post).returns(successful_live_tracking_response)
-    response = @shipwire.fetch_tracking_numbers
+    response = @shipwire.fetch_tracking_numbers([
+        '21',   '22',   '23',   '24',   '25',
+        '26', '2581', '2576', '2593', '2598',
+      '2610', '2611', '2613', '2616', '2631'
+    ])
     assert response.success?
     assert_equal "15", response.params["total_orders"]
     assert_equal "0", response.params["status"]

data/test/unit/services/webgistix_test.rb

@@ -99,6 +99,16 @@ class WebgistixTest < Test::Unit::TestCase
     assert_equal 202, response.stock_levels['GN-00-01A']
     assert_equal 199, response.stock_levels['GN-00-02A']
   end
+
+  def test_tracking_numbers
+    @service.expects(:ssl_post).returns(xml_fixture('webgistix/tracking_response'))
+    
+    response = @service.fetch_tracking_numbers(['AB12345', 'XY4567'])
+    assert response.success?
+    assert_equal WebgistixService::SUCCESS_MESSAGE, response.message
+    assert_equal '1Z8E5A380396682872', response.tracking_numbers['AB12345']
+    assert_nil response.tracking_numbers['XY4567']
+  end
   
   def test_failed_login
     @service.expects(:ssl_post).returns(invalid_login_response)
@@ -106,10 +116,10 @@ class WebgistixTest < Test::Unit::TestCase
     response = @service.fulfill('123456', @address, @line_items, @options)
     assert !response.success?
     assert response.test?
-    assert_equal 'Access Denied', response.message
+    assert_equal 'Invalid Credentials', response.message
     assert_nil response.params['order_id']
     
-    assert_equal 'Access Denied', response.params['error_0']
+    assert_equal 'Invalid Credentials', response.params['error_0']
   end
   
   def test_garbage_response
@@ -132,6 +142,22 @@ class WebgistixTest < Test::Unit::TestCase
     assert !@service.valid_credentials?
   end
     
+  def test_duplicate_response_is_treated_as_success
+    response = stub(:code => 200, :body => duplicate_response, :message => '')
+    Net::HTTP.any_instance.stubs(:post).raises(ActiveMerchant::ConnectionError).returns(response)
+
+    response = @service.fulfill('123456', @address, @line_items, @options)
+    assert response.success?
+    assert response.test?
+    assert_equal WebgistixService::DUPLICATE_MESSAGE, response.message
+    assert response.params['duplicate']
+    assert_nil response.params['order_id']
+  end
+
+  def test_ensure_gateway_uses_safe_retry
+    assert @service.retry_safe
+  end
+    
   private
   def minimal_successful_response
     '<Completed><Success>True</Success></Completed>'
@@ -142,11 +168,11 @@ class WebgistixTest < Test::Unit::TestCase
   end
   
   def invalid_login_response
-    '<Error>Access Denied</Error>'
+    '<Errors><Error>Invalid Credentials</Error></Errors>'
   end
   
   def failure_response
-    '<Error>No Address Line 1</Error><Error>Unknown ItemID:  testitem</Error><Error>Unknown ItemID:  WX-01-1000</Error>'
+    '<Errors><Error>No Address Line 1</Error><Error>Unknown ItemID:  testitem</Error><Error>Unknown ItemID:  WX-01-1000</Error></Errors>'
   end
   
   def garbage_response
@@ -159,4 +185,8 @@ class WebgistixTest < Test::Unit::TestCase
       '<Item><ItemID>GN-00-02A</ItemID><ItemQty>199</ItemQty></Item>' +
       '</InventoryXML>'
   end
+  
+  def duplicate_response
+    '<Completed><Success>Duplicate</Success></Completed>'
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_fulfillment
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Cody Fauser
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -04:00
+date: 2010-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -88,6 +88,11 @@ files:
 - test/fixtures/xml/amazon/inventory_list_response.xml
 - test/fixtures/xml/amazon/inventory_list_response_with_next_1.xml
 - test/fixtures/xml/amazon/inventory_list_response_with_next_2.xml
+- test/fixtures/xml/amazon/tracking_response_1.xml
+- test/fixtures/xml/amazon/tracking_response_2.xml
+- test/fixtures/xml/amazon/tracking_response_error.xml
+- test/fixtures/xml/amazon/tracking_response_not_found.xml
+- test/fixtures/xml/webgistix/tracking_response.xml
 - test/remote/amazon_test.rb
 - test/remote/shipwire_test.rb
 - test/remote/webgistix_test.rb
@@ -101,8 +106,8 @@ homepage: http://github.com/shopify/active_fulfillment
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement