ups-ruby 0.9.6 → 0.11.8

data/spec/ups/connection/ship_spec.rb

@@ -16,52 +16,160 @@ describe UPS::Connection do
   let(:stub_path) { File.expand_path("../../../stubs", __FILE__) }
   let(:server) { UPS::Connection.new(test_mode: true) }
 
-  describe "if requesting a shipment" do
-    before do
-      Excon.stub({:method => :post}) do |params|
-        case params[:path]
-        when UPS::Connection::SHIP_CONFIRM_PATH
-          {body: File.read("#{stub_path}/ship_confirm_success.xml"), status: 200}
-        when UPS::Connection::SHIP_ACCEPT_PATH
-          {body: File.read("#{stub_path}/ship_accept_success.xml"), status: 200}
+  describe 'if requesting a shipment' do
+    describe 'single package shipment' do
+      before do
+        Excon.stub(method: :post) do |params|
+          case params[:path]
+          when UPS::Connection::SHIP_CONFIRM_PATH
+            {
+              body: File.read("#{stub_path}/ship_confirm_success.xml"), status: 200
+            }
+          when UPS::Connection::SHIP_ACCEPT_PATH
+            {
+              body: File.read("#{stub_path}/ship_accept_success.xml"), status: 200
+            }
+          end
         end
       end
-    end
 
-    subject do
-      server.ship do |shipment_builder|
-        shipment_builder.add_access_request ENV['UPS_LICENSE_NUMBER'], ENV['UPS_USER_ID'], ENV['UPS_PASSWORD']
-        shipment_builder.add_shipper shipper
-        shipment_builder.add_ship_from shipper
-        shipment_builder.add_ship_to ship_to
-        shipment_builder.add_package package
-        shipment_builder.add_payment_information ENV['UPS_ACCOUNT_NUMBER']
-        shipment_builder.add_service '07'
+      subject do
+        server.ship do |shipment_builder|
+          shipment_builder.add_access_request ENV['UPS_LICENSE_NUMBER'], ENV['UPS_USER_ID'], ENV['UPS_PASSWORD']
+          shipment_builder.add_shipper shipper
+          shipment_builder.add_ship_from shipper
+          shipment_builder.add_ship_to ship_to
+          shipment_builder.add_package package
+          shipment_builder.add_payment_information ENV['UPS_ACCOUNT_NUMBER']
+          shipment_builder.add_service '07'
+        end
       end
-    end
 
-    it "should do what ever it takes to get that shipment shipped!" do
-      subject.wont_equal false
-      subject.success?.must_equal true
-    end
+      it 'does what ever it takes to get that shipment shipped!' do
+        subject.wont_equal false
+        subject.success?.must_equal true
+      end
+
+      it 'returns the packages data' do
+        subject.packages.must_be_kind_of Array
+        subject.packages.size.must_equal 1
+      end
 
-    it "should return the label data" do
-      subject.label_graphic_image.must_be_kind_of File
-      subject.label_html_image.must_be_kind_of File
-      subject.label_graphic_extension.must_equal '.gif'
+      it 'returns the label data' do
+        subject.label_graphic_image.must_be_kind_of File
+        subject.label_graphic_image.path.end_with?('.gif').must_equal true
+        subject.label_graphic_extension.must_equal '.gif'
 
-      subject.graphic_image.must_be_kind_of File
-      subject.html_image.must_be_kind_of File
-      subject.graphic_extension.must_equal '.gif'
-    end
+        subject.graphic_image.must_be_kind_of File
+        subject.graphic_image.path.end_with?('.gif').must_equal true
+        subject.graphic_extension.must_equal '.gif'
+
+        subject.html_image.must_be_kind_of File
+        subject.html_image.path.end_with?('.gif').must_equal true
 
-    it "should return the requested customs form data" do
-      subject.form_graphic_image.must_be_kind_of File
-      subject.form_graphic_extension.must_equal '.pdf'
+        subject.label_html_image.must_be_kind_of File
+        subject.label_html_image.path.end_with?('.gif').must_equal true
+      end
+
+      it 'should return the requested customs form data' do
+        subject.form_graphic_image.must_be_kind_of File
+        subject.form_graphic_image.path.end_with?('.pdf').must_equal true
+        subject.form_graphic_extension.must_equal '.pdf'
+      end
+
+      it 'should return the tracking number' do
+        subject.tracking_number.must_equal '1Z2220060292353829'
+      end
     end
 
-    it "should return the tracking number" do
-      subject.tracking_number.must_equal '1Z2220060292353829'
+    describe 'multi package shipment' do
+      before do
+        Excon.stub(method: :post) do |params|
+          case params[:path]
+          when UPS::Connection::SHIP_CONFIRM_PATH
+            {
+              body: File.read("#{stub_path}/multi_package/ship_confirm_success.xml"), status: 200
+            }
+          when UPS::Connection::SHIP_ACCEPT_PATH
+            {
+              body: File.read("#{stub_path}/multi_package/ship_accept_success.xml"), status: 200
+            }
+          end
+        end
+      end
+
+      let(:first_package) { subject.packages[0] }
+      let(:second_package) { subject.packages[1] }
+
+      subject do
+        server.ship do |shipment_builder|
+          shipment_builder.add_access_request ENV['UPS_LICENSE_NUMBER'], ENV['UPS_USER_ID'], ENV['UPS_PASSWORD']
+          shipment_builder.add_shipper shipper
+          shipment_builder.add_ship_from shipper
+          shipment_builder.add_ship_to ship_to
+          shipment_builder.add_package package
+          shipment_builder.add_package large_package
+          shipment_builder.add_payment_information ENV['UPS_ACCOUNT_NUMBER']
+          shipment_builder.add_service '07'
+        end
+      end
+
+      describe 'legacy methods for first package' do
+        it 'returns the label data for the first package' do
+          subject.label_graphic_image.must_be_kind_of File
+          subject.label_graphic_image.path.end_with?('.gif').must_equal true
+          subject.label_graphic_extension.must_equal '.gif'
+
+          subject.graphic_image.must_be_kind_of File
+          subject.graphic_image.path.end_with?('.gif').must_equal true
+          subject.graphic_extension.must_equal '.gif'
+
+          subject.html_image.must_be_kind_of File
+          subject.html_image.path.end_with?('.gif').must_equal true
+
+          subject.label_html_image.must_be_kind_of File
+          subject.label_html_image.path.end_with?('.gif').must_equal true
+        end
+
+        it 'returns the tracking number of the first package' do
+          subject.tracking_number.must_equal '1Z2R466A6894635437'
+        end
+      end
+
+      it 'returns the packages data' do
+        subject.packages.must_be_kind_of Array
+        subject.packages.size.must_equal 2
+      end
+
+      describe 'data per package' do
+        describe 'package #1' do
+          it 'returns the correct label data' do
+            first_package.label_graphic_image.must_be_kind_of File
+            first_package.label_graphic_image.path.end_with?('.gif').must_equal true
+            first_package.label_html_image.must_be_kind_of File
+            first_package.label_html_image.path.end_with?('.gif').must_equal true
+            first_package.label_graphic_extension.must_equal '.gif'
+          end
+
+          it 'returns the correct tracking number' do
+            first_package.tracking_number.must_equal '1Z2R466A6894635437'
+          end
+        end
+
+        describe 'package #2' do
+          it 'returns the correct label data' do
+            second_package.label_graphic_image.must_be_kind_of File
+            second_package.label_graphic_image.path.end_with?('.gif').must_equal true
+            second_package.label_html_image.must_be_kind_of File
+            second_package.label_html_image.path.end_with?('.gif').must_equal true
+            second_package.label_graphic_extension.must_equal '.gif'
+          end
+
+          it 'returns the correct tracking_number' do
+            second_package.tracking_number.must_equal '1Z2R466A6893005048'
+          end
+        end
+      end
     end
   end
 

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ups-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.11.8
 platform: ruby
 authors:
 - Veeqo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,24 @@ files:
 - lib/ups/data/ie_county_prefixes.rb
 - lib/ups/data/us_states.rb
 - lib/ups/exceptions.rb
+- lib/ups/models/package_result.rb
 - lib/ups/packaging.rb
-- lib/ups/parsers/parser_base.rb
+- lib/ups/parsers/base_parser.rb
+- lib/ups/parsers/rate_parser.rb
 - lib/ups/parsers/rates_parser.rb
 - lib/ups/parsers/ship_accept_parser.rb
 - lib/ups/parsers/ship_confirm_parser.rb
 - lib/ups/services.rb
+- lib/ups/utils.rb
 - lib/ups/version.rb
 - spec/spec_helper.rb
+- spec/stubs/multi_package/ship_accept_success.xml
+- spec/stubs/multi_package/ship_confirm_success.xml
+- spec/stubs/rates_error_multi_error.xml
+- spec/stubs/rates_error_single_error.xml
 - spec/stubs/rates_negotiated_success.xml
 - spec/stubs/rates_success.xml
+- spec/stubs/rates_success_single_rate.xml
 - spec/stubs/ship_accept_failure.xml
 - spec/stubs/ship_accept_success.xml
 - spec/stubs/ship_confirm_failure.xml
@@ -133,6 +141,7 @@ files:
 - spec/support/shipping_options.rb
 - spec/support/xsd_validator.rb
 - spec/ups/builders/address_builder_spec.rb
+- spec/ups/builders/organisation_builder_spec.rb
 - spec/ups/builders/rate_builder_spec.rb
 - spec/ups/builders/ship_accept_builder_spec.rb
 - spec/ups/builders/ship_confirm_builder_spec.rb
@@ -160,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: UPS

data/lib/ups/parsers/parser_base.rb

@@ -1,52 +0,0 @@
-require 'uri'
-require 'ox'
-
-module UPS
-  module Parsers
-    class ParserBase < ::Ox::Sax
-      attr_accessor :switches,
-                    :status_code,
-                    :status_description,
-                    :error_description
-
-      def initialize
-        self.switches = {}
-      end
-
-      def start_element(name)
-        element_tracker_switch name, true
-      end
-
-      def end_element(name)
-        element_tracker_switch name, false
-      end
-
-      def value(value)
-        data = value.as_s
-        self.status_code = data if switch_active? :ResponseStatusCode
-
-        if switch_active?(:ResponseStatusDescription)
-          self.status_description = data
-        end
-
-        self.error_description = data if switch_active? :ErrorDescription
-      end
-
-      def element_tracker_switch(element, currently_in)
-        switches[element] = currently_in
-      end
-
-      def switch_active?(*elements)
-        elements.flatten.all? { |element| switches[element] == true }
-      end
-
-      def build_switch_path(*paths)
-        paths.flatten
-      end
-
-      def success?
-        ['1', 1].include? status_code
-      end
-    end
-  end
-end