paypal-sdk-rest 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2490e56be1c78da53b019c1702f3d547df672024
-  data.tar.gz: bceeb80ea46eb51676489edcde9a6c419c9066f0
+  metadata.gz: 3b3439f7dc0c9f865a7cc7815422c6b9bc81d050
+  data.tar.gz: bf6283b0d9c0f1fdc37093839b44dba33801324e
 SHA512:
-  metadata.gz: ace6f59d27a3d96761684d8c89bb75f88e6d24e5a0542b1c60d827a4e409539a890762e151d5517c7147575b780062e906a4092fc32e6db4d04dc7faaebd3669
-  data.tar.gz: 48ed978938587c4b73b864ec6bb8c2153c8d17e532b7129c1147807c9e5d3aa6339377809ed5d386d7182cb9b8b046768711c22eb7cf0f5b9a72905d84ecb8bf
+  metadata.gz: 77823b3d706673505b29aae207be9faf1d2c8a25525a3e2177cd5c6e18eb710bd7c250c39373f2af43e975b9d4b61fd7a9a83ad394ec1edfa5602fff2575bbd9
+  data.tar.gz: 5f2710b9aa5e78c3785e36ba496b139484cc0367ab83887ed6815fcab67c2cb3877165719ac5467f0e3efdc58fd7ebcb80824841065c90bd62b565a464df0409

data/Gemfile

@@ -9,6 +9,7 @@ gem 'rake', :require => false
 group :test do
   gem 'simplecov', :require => false
   gem 'rspec'
+  gem 'webmock'
 end
 
 gem 'releasinator', '~> 0.6'

data/lib/paypal-sdk/core/api/rest.rb

@@ -143,7 +143,7 @@ module PayPal::SDK::Core
           if response.code >= "200" and response.code <= "299"
             response.body && response.content_type == "application/json" ? MultiJson.load(response.body) : {}
           elsif response.content_type == "application/json"
-            { "error" => MultiJson.load(response.body) }
+            { "error" => flat_hash(MultiJson.load(response.body)) }
           else
             { "error" => { "name" => response.code, "message" => response.message,
               "developer_msg" => response } }
@@ -151,6 +151,18 @@ module PayPal::SDK::Core
         payload
       end
 
+      def flat_hash(h)
+        new_hash = {}
+        h.each_pair do |key, val|
+          if val.is_a?(Hash)
+            new_hash.merge!(flat_hash(val))
+          else
+            new_hash[key] = val
+          end
+        end
+        new_hash
+      end
+
       # Log PayPal-Request-Id header
       def log_http_call(payload)
         if payload[:header] and payload[:header]["PayPal-Request-Id"]

data/lib/paypal-sdk/core/openid_connect.rb

@@ -20,7 +20,7 @@ module PayPal::SDK
         end
         alias_method :config=, :set_config
 
-        AUTHORIZATION_URL  = "paypal.com/webapps/auth/protocol/openidconnect/v1/authorize"
+        AUTHORIZATION_URL  = "paypal.com/signin/authorize"
         ENDSESSION_URL     = "paypal.com/webapps/auth/protocol/openidconnect/v1/endsession"
         DEFAULT_SCOPE      = "openid"
 

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

@@ -1,5 +1,5 @@
 require 'paypal-sdk-core'
-require 'uuidtools'
+require 'securerandom'
 require 'multi_json'
 require 'open-uri'
 require 'zlib'
@@ -17,7 +17,7 @@ module PayPal::SDK
         end
 
         def request_id
-          @request_id ||= UUIDTools::UUID.random_create.to_s
+          @request_id ||= SecureRandom.uuid
         end
 
         def http_header
@@ -1122,30 +1122,39 @@ module PayPal::SDK
       class Invoice < Base
         def self.load_members
           object_of :id, String
-          object_of :number, String
-          object_of :uri, String
-          object_of :status, String
-          object_of :merchant_info, MerchantInfo
-          array_of  :billing_info, BillingInfo
-          object_of :shipping_info, ShippingInfo
-          array_of  :items, InvoiceItem
-          object_of :invoice_date, String
-          object_of :payment_term, PaymentTerm
-          object_of :reference, String
-          object_of :discount, Cost
-          object_of :shipping_cost, ShippingCost
-          object_of :custom, CustomAmount
-          object_of :tax_calculated_after_discount, Boolean
-          object_of :tax_inclusive, Boolean
-          object_of :terms, String
-          object_of :note, String
-          object_of :refunded_amount, InvoiceAmountWrapper
-          object_of :merchant_memo, String
-          object_of :logo_url, String
-          object_of :total_amount, Currency
+	      object_of :number, String
+	      object_of :template_id, String
+	      object_of :uri, String
+	      object_of :status, String
+	      object_of :merchant_info, MerchantInfo
+	      array_of  :billing_info, BillingInfo
+	      array_of  :cc_info, Participant
+	      object_of :shipping_info, ShippingInfo
+	      array_of  :items, InvoiceItem
+	      object_of :invoice_date, String
+	      object_of :payment_term, PaymentTerm
+	      object_of :reference, String
+	      object_of :discount, Cost
+	      object_of :shipping_cost, ShippingCost
+	      object_of :custom, CustomAmount
+	      object_of :allow_partial_payment, Boolean
+	      object_of :minimum_amount_due, Currency
+	      object_of :tax_calculated_after_discount, Boolean
+	      object_of :tax_inclusive, Boolean
+	      object_of :terms, String
+	      object_of :note, String
+	      object_of :merchant_memo, String
+	      object_of :logo_url, String
+	      object_of :total_amount, Currency
           array_of  :payments, PaymentDetail
-          array_of  :refund_details, RefundDetail
-          object_of :metadata, Metadata
+          array_of  :refunds, RefundDetail
+	      object_of :metadata, Metadata
+	      object_of :additional_data, String
+	      object_of :gratuity, Currency
+	      object_of :paid_amount, PaymentSummary
+	      object_of :refunded_amount, PaymentSummary
+          array_of  :attachments, FileAttachment
+          array_of  :links, Links
         end
 
         include RequestDataType
@@ -1213,7 +1222,6 @@ module PayPal::SDK
         raise_on_api_error :create, :send_invoice, :remind, :cancel,
                            :record_payment, :record_refund, :update, :delete
 
-
         #
         class << self
           def search(options, access_token = nil)
@@ -1235,11 +1243,157 @@ module PayPal::SDK
             api.token = access_token unless access_token.nil?
             Invoices.new(api.get(path, options))
           end
+
+          def qr_code(options = {})
+            path = "v1/invoicing/invoices/{invoice_id}/qr-code"
+            object.new(api.get(path, options))
+          end
+
+          def self.generate_number(options)
+            path = "v1/invoicing/invoices/next-invoice-number"
+            response = api.post(path, options)
+            object.new(response)
+          end
         end
       end
 
-      class WebhooksEventType < Base
+      class Participant < Base
+        def self.load_members
+	            object_of :email, String
+	            object_of :first_name, String
+	            object_of :last_name, String
+	            object_of :business_name, String
+	            object_of :phone, Phone
+	            object_of :fax, Phone
+	            object_of :website, String
+	            object_of :additional_info, String
+	            object_of :address, Address
+        end
+      end
+
+      class Template < Base
+
+        def self.load_members
+	            object_of :template_id, String
+	            object_of :name, String
+	            object_of :default, Boolean
+	            object_of :template_data, TemplateData
+	            array_of  :settings, TemplateSettings
+	            object_of :unit_of_measure, String
+	            object_of :custom, Boolean
+	            array_of  :links, Links
+        end
+
+        include RequestDataType
+
+        def delete()
+          path = "v1/invoicing/templates/#{self.template_id}"
+          response = api.delete(path, {})
+          self.merge!(response)
+          success?
+        end
+
+        def update()
+          path = "v1/invoicing/templates/#{self.template_id}"
+          response = api.put(path, self.to_hash, http_header)
+          self.merge!(response)
+          Template.new(response)
+        end
+
+        def create()
+            path = "v1/invoicing/templates"
+            response = api.post(path, self.to_hash, http_header)
+            self.merge!(response)
+            Template.new(response)
+        end
+
+        class << self
+          def get(template_id, options = {})
+            raise ArgumentError.new("template_id required") if template_id.to_s.strip.empty?
+            path = "v1/invoicing/templates/#{template_id}"
+            self.new(api.get(path, options))
+          end
+        end
+      end
+
+      class TemplateData < Base
 
+        def self.load_members
+	            object_of :merchant_info, MerchantInfo
+	            array_of  :billing_info, BillingInfo
+	            array_of  :cc_info, String
+	            object_of :shipping_info, ShippingInfo
+	            array_of  :items, InvoiceItem
+	            object_of :payment_term, PaymentTerm
+	            object_of :reference, String
+	            object_of :discount, Cost
+	            object_of :shipping_cost, ShippingCost
+	            object_of :custom, CustomAmount
+	            object_of :allow_partial_payment, Boolean
+	            object_of :minimum_amount_due, Currency
+	            object_of :tax_calculated_after_discount, Boolean
+	            object_of :tax_inclusive, Boolean
+	            object_of :terms, String
+	            object_of :note, String
+	            object_of :merchant_memo, String
+	            object_of :logo_url, String
+	            object_of :total_amount, Currency
+	            array_of  :attachments, FileAttachment
+        end
+
+      end
+
+      class TemplateSettings < Base
+
+        def self.load_members
+	            object_of :field_name, String
+	            object_of :display_preference, TemplateSettingsMetadata
+        end
+      end
+
+      class TemplateSettingsMetadata < Base
+
+        def self.load_members
+	            object_of :hidden, Boolean
+        end
+
+      end
+
+      class PaymentSummary < Base
+        def self.load_members
+	            object_of :paypal, Currency
+	            object_of :other, Currency
+        end
+      end
+      class FileAttachment < Base
+
+        def self.load_members
+	            object_of :name, String
+	            object_of :url, String
+        end
+
+      end
+      class Templates < Base
+
+        def self.load_members
+	          array_of  :addresses, Address
+	          array_of  :emails, String
+	          array_of  :phones, Phone
+	          array_of  :templates, Template
+	          array_of  :links, Links
+        end
+
+        include RequestDataType
+
+        class << self
+          def get_all(options = {})
+            path = "v1/invoicing/templates/"
+            Templates.new(api.get(path, options))
+          end
+        end
+      end
+
+      class WebhooksEventType < Base
         def self.load_members
           array_of :event_types, EventType
         end
@@ -1270,6 +1424,7 @@ module PayPal::SDK
         def self.load_members
           object_of :name, String
           object_of :description, String
+          object_of :status, String
         end
       end
 
@@ -1286,10 +1441,12 @@ module PayPal::SDK
           object_of :id, String
           object_of :create_time, String
           object_of :resource_type, String
+          object_of :event_version, String
           object_of :event_type, String
           object_of :summary, String
+          object_of :status, String
           object_of :resource, Hash
-          array_of :links, Links
+          array_of  :links, Links
         end
 
         def resend()
@@ -1384,9 +1541,20 @@ module PayPal::SDK
           end
 
           def get(webhook_event_id)
-            raise ArgumentError.new("webhook_event_id required") if webhook_event_id.to_s.strip.empty?
-            path = "v1/notifications/webhooks-events/#{webhook_event_id}"
-            WebhookEvent.new(api.get(path))
+            WebhookEvent.find(webhook_event_id)
+          end
+
+          class << self
+            def find(resource_id)
+              raise ArgumentError.new("webhook_event_id required") if resource_id.to_s.strip.empty?
+              path = "v1/notifications/webhooks-events/#{resource_id}"
+              self.new(api.get(path))
+            end
+
+            def all(options = {})
+              path = "v1/notifications/webhooks-events"
+              WebhookEventList.new(api.get(path, options))
+            end
           end
         end
       end
@@ -1396,8 +1564,8 @@ module PayPal::SDK
         def self.load_members
           object_of :id, String
           object_of :url, String
-          array_of :event_types, EventType
-          array_of :links, Links
+          array_of  :event_types, EventType
+          array_of  :links, Links
         end
 
         include RequestDataType
@@ -1433,11 +1601,13 @@ module PayPal::SDK
             path = "v1/notifications/webhooks/#{webhook_id}"
             Webhook.new(api.get(path))
           end
+
           def get_event_types(webhook_id)
             raise ArgumentError.new("webhook_id required") if webhook_id.to_s.strip.empty?
             path = "v1/notifications/webhooks/#{webhook_id}/event-types"
             EventTypeList.new(api.get(path))
           end
+
           def all(options={})
             path = "v1/notifications/webhooks"
             WebhookList.new(api.get(path))
@@ -1559,28 +1729,31 @@ module PayPal::SDK
 
       class InvoiceItem < Base
         def self.load_members
-          object_of :name, String
-          object_of :description, String
-          object_of :quantity, Number
-          object_of :unit_price, Currency
-          object_of :tax, Tax
-          object_of :date, String
-          object_of :discount, Cost
+	        object_of :name, String
+	        object_of :description, String
+	        object_of :quantity, Number
+	        object_of :unit_price, Currency
+	        object_of :tax, Tax
+	        object_of :date, String
+	        object_of :discount, Cost
+	        object_of :image_url, String
+	        object_of :unit_of_measure, String
         end
       end
 
       class MerchantInfo < Base
         def self.load_members
-          object_of :email, String
-          object_of :first_name, String
-          object_of :last_name, String
-          object_of :address, Address
-          object_of :business_name, String
-          object_of :phone, Phone
-          object_of :fax, Phone
-          object_of :website, String
-          object_of :tax_id, String
-          object_of :additional_info, String
+	        object_of :email, String
+	        object_of :first_name, String
+	        object_of :last_name, String
+	        object_of :address, Address
+	        object_of :business_name, String
+	        object_of :phone, Phone
+	        object_of :fax, Phone
+	        object_of :website, String
+	        object_of :tax_id, String
+	        object_of :additional_info_label, String
+	        object_of :additional_info, String
         end
       end
 
@@ -1593,6 +1766,8 @@ module PayPal::SDK
           object_of :address, Address
           object_of :language, String
           object_of :additional_info, String
+          object_of :notification_channel, String
+          object_of :phone, Phone
         end
       end
 
@@ -1611,6 +1786,7 @@ module PayPal::SDK
           object_of :subject, String
           object_of :note, String
           object_of :send_to_merchant, Boolean
+          array_of  :cc_emails, String
         end
       end
 
@@ -1668,6 +1844,7 @@ module PayPal::SDK
           object_of :page, Number
           object_of :page_size, Number
           object_of :total_count_required, Boolean
+          object_of :archived, Boolean
         end
       end
 
@@ -2109,10 +2286,10 @@ module PayPal::SDK
         def self.load_members
           object_of :id, String
           object_of :name, String
+          object_of :temporary, Boolean
           object_of :flow_config, FlowConfig
           object_of :input_fields, InputFields
           object_of :presentation, Presentation
-          object_of :temporary, Boolean
         end
 
         include RequestDataType
@@ -2132,8 +2309,9 @@ module PayPal::SDK
         end
 
         def partial_update(patch_request)
+          patch_request = PatchRequest.new(patch_request) unless patch_request.is_a? PatchRequest
           path = "v1/payment-experience/web-profiles/#{self.id}"
-          response = api.patch(path, patch_request, http_header)
+          response = api.patch(path, patch_request.to_hash, http_header)
           self.merge!(response)
           success?
         end
@@ -2173,6 +2351,8 @@ module PayPal::SDK
         def self.load_members
           object_of :landing_page_type, String
           object_of :bank_txn_pending_url, String
+          object_of :user_action, String
+          object_of :return_uri_http_method, String
         end
       end
 
@@ -2189,12 +2369,8 @@ module PayPal::SDK
           object_of :brand_name, String
           object_of :logo_image, String
           object_of :locale_code, String
-        end
-      end
-
-      class CreateProfileResponse < Base
-        def self.load_members
-          object_of :id, String
+          object_of :return_url_label, String
+          object_of :note_to_seller_label, String
         end
       end
 

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

@@ -1,7 +1,7 @@
 module PayPal
   module SDK
     module REST
-      VERSION = "1.4.9"
+      VERSION = "1.5.0"
     end
   end
 end

data/spec/payments_examples_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'json'
+require 'webmock/rspec'
 
 describe "Payments" do
 
@@ -49,6 +51,18 @@ describe "Payments" do
             "currency" =>  "USD" },
           "description" =>  "This is the payment transaction description." } ] }
 
+  ProcessorErrorResponse = {
+    "name" => "INSTRUMENT_DECLINED",
+    "message" => "The instrument presented was either declined by the processor or bank, or it can't be used for this payment.",
+    "information_link" => "https://developer.paypal.com/docs/api/#INSTRUMENT_DECLINED",
+    "debug_id" => "20dcd4f71107c",
+    "another_thing" => {
+      "avs_code" => "Y",
+      "cvv_code" => "N",
+      "response_code" => "0051"
+    }
+  }
+
   it "Validate user-agent", :unit => true do
     expect(PayPal::SDK::REST::API.user_agent).to match "PayPalSDK/PayPal-Ruby-SDK"
   end
@@ -62,6 +76,40 @@ describe "Payments" do
         PayPal::SDK::REST.set_config(backup_config)
         expect(PayPal::SDK::REST.api.config.client_id).not_to eql "XYZ"
       end
+
+      it "Create - does not return true when error not provided in response" do
+        oauth_response = {
+            :scope => "https://uri.paypal.com/services/subscriptions https://api.paypal.com/v1/payments/.* https://api.paypal.com/v1/vault/credit-card https://uri.paypal.com/services/applications/webhooks openid https://uri.paypal.com/payments/payouts https://api.paypal.com/v1/vault/credit-card/.*",
+            :nonce => "2016-10-04T18:00:00ZP3PcGAv5XAncoc8Zt4MF5cRLlaEBW3OAoLEhMIFk--g",
+            :access_token => "A101.tp_sF5GHqWnnqEQA13Ua5ABnIhRWgd-G9LhRnJdgOvJHc_L08zlfD9WgPF4I3kre.mShauuOGxWyw8ikViItmxkWmX78",
+            :token_type => "Bearer",
+            :app_id => "APP-80W284485P519543T",
+            :expires_in => 30695
+        }
+
+        response_headers = {
+            "date" => ["Fri, 09 Sep 2016 17:44:23 GMT"],
+            "server" => ["Apache"],
+            "proxy_server_info" => ["host=dcg12javapapi8768.dcg12.slc.paypalinc.com;threadId=1177"],
+            "paypal-debug-id" => ["20dcd4f71107c", "20dcd4f71107c"],
+            "correlation-id" => ["20dcd4f71107c"],
+            "content-language" => ["*"],
+            "connection" => ["close", "close"],
+            "set-cookie" => ["X-PP-SILOVER=name%3DLIVE3.API.1%26silo_version%3D880%26app%3Dplatformapiserv%26TIME%3D4160016983%26HTTP_X_PP_AZ_LOCATOR%3Ddcg12.slc; Expires=Fri, 09 Sep 2016 18:14:25 GMT; domain=.paypal.com; path=/; Secure; HttpOnly", "X-PP-SILOVER=; Expires=Thu, 01 Jan 1970 00:00:01 GMT"],
+            "vary" => ["Authorization"],
+            "content-length" => ["335"],
+            "content-type"=>["application/json"]
+        }
+
+        stub_request(:post, "https://api.sandbox.paypal.com/v1/oauth2/token")
+            .to_return(:body => oauth_response.to_json)
+
+        stub_request(:post, "https://api.sandbox.paypal.com/v1/payments/payment")
+            .to_return(:body => ProcessorErrorResponse.to_json, :status => 400, :headers => response_headers)
+
+        payment = Payment.new(PaymentAttributes)
+        expect(payment.create).to be_falsey
+      end
     end
 
     describe "Payment", :integration => true do
@@ -87,7 +135,6 @@ describe "Payments" do
         expect(new_payment.error).to be_nil
 
         expect(payment.id).to eql new_payment.id
-
       end
 
       it "Create with token" do

data/spec/spec_helper.rb

@@ -33,3 +33,5 @@ RSpec.configure do |config|
   config.include SampleData
   # config.include PayPal::SDK::REST::DataTypes
 end
+
+WebMock.allow_net_connect!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paypal-sdk-rest
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - PayPal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 description: The PayPal REST SDK provides Ruby APIs to create, process and manage
   payment.
 email: