paypal-sdk-rest 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96c5110387c529214199709d42f2583c1c9ec8bf
-  data.tar.gz: 8c258a28b2716cba02248cc8f9a822a207c35b6c
+  metadata.gz: d165dec1b67f8e996a1d4fe9a406bc3b388428c4
+  data.tar.gz: bfab6906d27219ecb60cb74af6afacec35e316e9
 SHA512:
-  metadata.gz: c4da04b7606a4ce1fe30a0600aa2ef8521f696d7411c1158d0e0fc23553017d0325aa86a26e95a61fabe6692bca0fa303c3185be4a5c6486e0326fd0ffffecaa
-  data.tar.gz: d420deb8a02247e67d3648f502c246abb81fcde5eb5a7d7d3776c1e862b8b48cfeb336297870135c322d57714ae62dab044b9038f0d0e5a9b8e0172c4b0eb81d
+  metadata.gz: 6678cc8c36716ab8a898612c97ed8aa214f3349cbe2c23e154c4012657d17e10c053c468d835ef2ecd30a4902a01850bf8346d8bf6eec550b8c5248e93002603
+  data.tar.gz: 584469eaffaae16b69cce489b15635644c03970b02471e1cea4a0671612521f5d7c1a39faea627e947dbdfef770724aee13e9f4db03c9b546992f797c18fd147

data/lib/paypal-sdk/rest/data_types.rb

@@ -365,7 +365,7 @@ module PayPal::SDK
         raise_on_api_error :create, :update, :delete
       end
 
-      class Address < Base
+      class BaseAddress < Base
         def self.load_members
           object_of :line1, String
           object_of :line2, String
@@ -373,13 +373,24 @@ module PayPal::SDK
           object_of :country_code, String
           object_of :postal_code, String
           object_of :state, String
-          object_of :phone, String
           object_of :normalization_status, String
           object_of :status, String
           object_of :type, String
         end
       end
 
+      class Address < BaseAddress
+        def self.load_members
+          object_of :phone, String
+        end
+      end
+
+      class InvoiceAddress < BaseAddress
+        def self.load_members
+          object_of :phone, Phone
+        end
+      end
+
       class OneOf < Base
         def self.load_members
           object_of :phone, Phone
@@ -1811,11 +1822,37 @@ module PayPal::SDK
           object_of :first_name, String
           object_of :last_name, String
           object_of :business_name, String
-          object_of :address, Address
+          object_of :address, InvoiceAddress
           object_of :language, String
           object_of :additional_info, String
           object_of :notification_channel, String
           object_of :phone, Phone
+
+          define_method "address=" do |value|
+            if value.is_a?(Address)
+              value = value.to_hash
+            end
+            object = convert_object(value, InvoiceAddress)
+            instance_variable_set("@address", object)
+          end
+
+          define_method "address" do |&block|
+            default_value = PayPal::SDK::Core::Util::OrderedHash.new
+            value = instance_variable_get("@address") || ( default_value && (send("address=", default_value)))
+            value = convert_object(value.to_hash, Address)
+            value
+          end
+
+          define_method "invoice_address=" do |value|
+            object = convert_object(value, InvoiceAddress)
+            instance_variable_set("@address", object)
+          end
+
+          define_method "invoice_address" do |&block|
+            default_value = PayPal::SDK::Core::Util::OrderedHash.new
+            value = instance_variable_get("@address") || ( default_value && (send("address=", default_value)))
+            value
+          end
         end
       end
 
@@ -1824,8 +1861,34 @@ module PayPal::SDK
           object_of :first_name, String
           object_of :last_name, String
           object_of :business_name, String
-          object_of :address, Address
+          object_of :address, InvoiceAddress
           object_of :email, String
+
+          define_method "address=" do |value|
+            if value.is_a?(Address)
+              value = value.to_hash
+            end
+            object = convert_object(value, InvoiceAddress)
+            instance_variable_set("@address", object)
+          end
+
+          define_method "address" do |&block|
+            default_value = PayPal::SDK::Core::Util::OrderedHash.new
+            value = instance_variable_get("@address") || ( default_value && (send("address=", default_value)))
+            value = convert_object(value.to_hash, Address)
+            value
+          end
+
+          define_method "invoice_address=" do |value|
+            object = convert_object(value, InvoiceAddress)
+            instance_variable_set("@address", object)
+          end
+
+          define_method "invoice_address" do |&block|
+            default_value = PayPal::SDK::Core::Util::OrderedHash.new
+            value = instance_variable_get("@address") || ( default_value && (send("address=", default_value)))
+            value
+          end
         end
       end
 
@@ -2110,7 +2173,7 @@ module PayPal::SDK
           object_of :rel, String
           object_of :targetSchema, HyperSchema
           object_of :method, String
-          object_of :enctype, String
+          object_of :encType, String
           object_of :schema, HyperSchema
         end
       end

data/lib/paypal-sdk/rest/version.rb

@@ -1,7 +1,7 @@
 module PayPal
   module SDK
     module REST
-      VERSION = "1.6.1"
+      VERSION = "1.7.0"
     end
   end
 end

data/spec/core/api/data_type_spec.rb

@@ -56,6 +56,106 @@ describe PayPal::SDK::Core::API::DataTypes::Base do
     expect(test_type.fromCurrency.amount).to  eql "50.0"
   end
 
+  it "invoice address loads all members of default address object" do
+    invoice_address = InvoiceAddress.new(:line1 => "line1", :line2 => "line2", :phone => { :country_code => "123", :national_number => "1231231234", :extension => "123" }, :status => "status" )
+    expect(invoice_address).to be_a InvoiceAddress
+    expect(invoice_address.phone).to be_a Phone
+    expect(invoice_address.line1).to eql "line1"
+    expect(invoice_address.line2).to eql "line2"
+    expect(invoice_address.status).to eql "status"
+    expect(invoice_address.phone.country_code).to eql "123"
+    expect(invoice_address.phone.national_number).to eql "1231231234"
+    expect(invoice_address.phone.extension).to eql "123"
+  end
+
+  it "billing info converts an address to invoiceaddress automatically" do
+    address = Address.new(:line1 => "line1", :line2 => "line2", :status => "status" )
+    billing_info = BillingInfo.new({
+      :first_name => "Sally",
+      :last_name => "Patient",
+      :business_name => "Not applicable",
+    })
+    billing_info.address = address
+    expect(billing_info.address).to be_a Address
+    expect(billing_info.invoice_address).to be_a InvoiceAddress
+  end
+
+  it "shipping info returns an Address even if set to InvoiceAddress for backwards compatibility" do
+    address = InvoiceAddress.new(:line1 => "line1", :line2 => "line2", :status => "status", :phone => { :national_number => "1234567890" } )
+    billing_info = BillingInfo.new({
+      :first_name => "Sally",
+      :last_name => "Patient",
+      :business_name => "Not applicable",
+    })
+    billing_info.address = address
+    expect(billing_info.address).to be_a Address
+    expect(billing_info.invoice_address).to be_a InvoiceAddress
+    expect(billing_info.invoice_address.phone.national_number).to eql "1234567890"
+  end
+
+  it "returns the address and invoice address types in the billing info" do
+    billing_info = BillingInfo.new({
+      "first_name" => "Sally",
+      "last_name" => "Patient",
+      "business_name" => "Not applicable",
+      "address" => {
+        "line1" => "line1Value",
+        "phone" => { "country_code" => "123", "national_number" => "1234567890", "extension" => "456" },
+      },
+    })
+    expect(billing_info.address).to be_a Address
+    expect(billing_info.address.line1).to eql "line1Value"
+    expect(billing_info.invoice_address).to be_a InvoiceAddress
+    expect(billing_info.invoice_address.line1).to eql "line1Value"
+    expect(billing_info.invoice_address.phone.country_code).to eql "123"
+    expect(billing_info.invoice_address.phone.national_number).to eql "1234567890"
+    expect(billing_info.invoice_address.phone.extension).to eql "456"
+  end
+
+  it "shipping info converts an address to invoiceaddress automatically" do
+    address = Address.new(:line1 => "line1", :line2 => "line2", :status => "status" )
+    shipping_info = ShippingInfo.new({
+      "first_name" => "Sally",
+      "last_name" => "Patient",
+      "business_name" => "Not applicable",
+    })
+    shipping_info.address = address
+    expect(shipping_info.address).to be_a Address
+    expect(shipping_info.invoice_address).to be_a InvoiceAddress
+  end
+
+  it "shipping info returns an Address even if set to InvoiceAddress for backwards compatibility" do
+    address = InvoiceAddress.new(:line1 => "line1", :line2 => "line2", :status => "status", :phone => { :national_number => "1234567890" } )
+    shipping_info = ShippingInfo.new({
+      "first_name" => "Sally",
+      "last_name" => "Patient",
+      "business_name" => "Not applicable",
+    })
+    shipping_info.address = address
+    expect(shipping_info.address).to be_a Address
+    expect(shipping_info.invoice_address).to be_a InvoiceAddress
+    expect(shipping_info.invoice_address.phone.national_number).to eql "1234567890"
+  end
+
+  it "returns the address and invoice address types in the shipping info" do
+    shipping_info = ShippingInfo.new({
+      "first_name" => "Sally",
+      "last_name" => "Patient",
+      "business_name" => "Not applicable",
+      "address" => {
+        "line1" => "line1Value",
+        "phone" => { "country_code" => "123", "national_number" => "1234567890", "extension" => "456" },
+      },
+    })
+    expect(shipping_info.address).to be_a Address
+    expect(shipping_info.address.line1).to eql "line1Value"
+    expect(shipping_info.invoice_address).to be_a InvoiceAddress
+    expect(shipping_info.invoice_address.line1).to eql "line1Value"
+    expect(shipping_info.invoice_address.phone.country_code).to eql "123"
+    expect(shipping_info.invoice_address.phone.national_number).to eql "1234567890"
+    expect(shipping_info.invoice_address.phone.extension).to eql "456"
+  end
+
   it "should allow block with initializer" do
     test_type = TestType.new do
       fromCurrency do

data/spec/core/api/rest_spec.rb

@@ -76,10 +76,11 @@ describe PayPal::SDK::Core::API::REST do
       }.to raise_error PayPal::SDK::Core::Exceptions::UnauthorizedAccess
     end
 
-    xit "Should handle expired token" do
+    it "Should handle expired token" do
       old_token = @api.token
       @api.token_hash[:expires_in] = 0
-      expect(@api.token).not_to eql old_token
+      new_token = @api.token
+      expect(@api.token_hash[:expires_in]).not_to eql 0
     end
 
     it "Get token" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paypal-sdk-rest
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - PayPal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls