paypal-sdk-rest 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07eb29c0bcc2e64cb6021ee41b2a8044c9ea614e
-  data.tar.gz: 34af36098b7335cf1f2f7eb5d733bc8e38a5a024
+  metadata.gz: 96c5110387c529214199709d42f2583c1c9ec8bf
+  data.tar.gz: 8c258a28b2716cba02248cc8f9a822a207c35b6c
 SHA512:
-  metadata.gz: acbaec588e900bcc9efd6d19dfa455e1402b5cb83c64e6358afb254d452ae472fb2cf1ceb4f42032699d789c41d6c85f8a0137dc31a72f649ea5c28fc0dfd95f
-  data.tar.gz: c868cc58f3610e68cf142536500f18736752e598124a7b237307773799a6e280d3a22e8bda0d484d6ea7ee39b04b0abf9168d8ce324495ac4c7440ce2f6e0cd4
+  metadata.gz: c4da04b7606a4ce1fe30a0600aa2ef8521f696d7411c1158d0e0fc23553017d0325aa86a26e95a61fabe6692bca0fa303c3185be4a5c6486e0326fd0ffffecaa
+  data.tar.gz: d420deb8a02247e67d3648f502c246abb81fcde5eb5a7d7d3776c1e862b8b48cfeb336297870135c322d57714ae62dab044b9038f0d0e5a9b8e0172c4b0eb81d

data/README.md

@@ -134,38 +134,25 @@ PayPal::SDK::REST.set_config(
 
 # Build Payment object
 @payment = Payment.new({
-  :intent => "sale",
-  :payer => {
-    :payment_method => "credit_card",
-    :funding_instruments => [{
-      :credit_card => {
-        :type => "visa",
-        :number => "4567516310777851",
-        :expire_month => "11",
-        :expire_year => "2018",
-        :cvv2 => "874",
-        :first_name => "Joe",
-        :last_name => "Shopper",
-        :billing_address => {
-          :line1 => "52 N Main ST",
-          :city => "Johnstown",
-          :state => "OH",
-          :postal_code => "43210",
-          :country_code => "US" }}}]},
-  :transactions => [{
+  :intent =>  "sale",
+  :payer =>  {
+    :payment_method =>  "paypal" },
+  :redirect_urls => {
+    :return_url => "http://localhost:3000/payment/execute",
+    :cancel_url => "http://localhost:3000/" },
+  :transactions =>  [{
     :item_list => {
       :items => [{
         :name => "item",
         :sku => "item",
-        :price => "1",
+        :price => "5",
         :currency => "USD",
         :quantity => 1 }]},
-    :amount => {
-      :total => "1.00",
-      :currency => "USD" },
-    :description => "This is the payment transaction description." }]})
+    :amount =>  {
+      :total =>  "5",
+      :currency =>  "USD" },
+    :description =>  "This is the payment transaction description." }]})
 
-# Create Payment and return the status(true or false)
 if @payment.create
   @payment.id     # Payment Id
 else
@@ -186,8 +173,6 @@ payment_history.payments
 
 ## Execute Payment
 
-Only for [Payment](https://github.com/paypal/rest-api-sdk-ruby/blob/master/samples/payment/create_with_paypal.rb) with `payment_method` as `"paypal"`
-
 ```ruby
 payment = Payment.find("PAY-57363176S1057143SKE2HO3A")
 
@@ -273,6 +258,10 @@ rescue ResourceNotFound => err
   logger.error @payout.error.inspect
 end
 ```
+
+## Direct Credit Card Support
+[Braintree Direct](https://www.braintreepayments.com/products/braintree-direct) is PayPal's preferred integration solution for accepting direct credit card payments in your mobile app or website. Braintree, a PayPal service, is the easiest way to accept credit cards, PayPal, and many other payment methods.
+
 ## License
 Code released under [SDK LICENSE](LICENSE)  
 

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

@@ -14,7 +14,6 @@ module PayPal::SDK::Core
       DEFAULT_REST_END_POINTS = {
         :sandbox => "https://api.sandbox.paypal.com",
         :live    => "https://api.paypal.com",
-        :security_test_sandbox   => "https://test-api.sandbox.paypal.com"
       }
       TOKEN_REQUEST_PARAMS = "grant_type=client_credentials"
 
@@ -140,7 +139,9 @@ module PayPal::SDK::Core
       def format_response(payload)
         response = payload[:response]
         payload[:data] =
-          if response.code >= "200" and response.code <= "299"
+          if response.body && response.body.strip == ""
+            {}
+          elsif 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" => flat_hash(MultiJson.load(response.body)) }

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

@@ -84,6 +84,10 @@ module PayPal::SDK::Core
     class ResourceGone < ClientError # :nodoc:
     end
 
+    # 422 Unprocessable Entity
+    class ResourceInvalid < ClientError # :nodoc:
+    end
+
     # 5xx Server Error
     class ServerError < ConnectionError # :nodoc:
     end

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

@@ -1594,17 +1594,15 @@ module PayPal::SDK
             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 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
+          def all(options = {})
+            path = "v1/notifications/webhooks-events"
+            WebhookEventList.new(api.get(path, options))
           end
         end
       end

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

@@ -13,7 +13,7 @@ module PayPal
         def []=(key, value)
           value =
             if value.is_a? Hash
-              ErrorHash.convert(hash)
+              ErrorHash.convert(value)
             elsif value.is_a? Array and value[0].is_a? Hash
               value.map{|array_value| ErrorHash.convert(array_value) }
             else

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

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

data/spec/core/api/rest_spec.rb

@@ -144,4 +144,67 @@ describe PayPal::SDK::Core::API::REST do
       expect(response["error"]["name"]).to eql "VALIDATION_ERROR"
     end
   end
+
+  describe "format response" do
+    before :each do
+      @response = instance_double(Net::HTTPResponse)
+      allow(@response).to receive(:code) { "200" }
+      allow(@response).to receive(:content_type) { "application/json" }
+    end
+
+    it "parses empty object JSON correctly" do
+      allow(@response).to receive(:body) { "{}" }
+      payload = {
+        :response => @response
+      }
+
+      formatted_response = @api.format_response(payload)
+      expect(formatted_response).to_not be_nil
+      expect(formatted_response[:data]).to eq({})
+    end
+
+    it "parses empty string JSON correctly" do
+      allow(@response).to receive(:body) { '""' }
+      payload = {
+        :response => @response
+      }
+
+      formatted_response = @api.format_response(payload)
+      expect(formatted_response).to_not be_nil
+      expect(formatted_response[:data]).to eq("")
+    end
+
+    it "parses whitespace body correctly" do
+      allow(@response).to receive(:body) { ' 	 ' }
+      payload = {
+        :response => @response
+      }
+
+      formatted_response = @api.format_response(payload)
+      expect(formatted_response).to_not be_nil
+      expect(formatted_response[:data]).to eq({})
+    end
+
+    it "parses nil body correctly" do
+      allow(@response).to receive(:body) { nil }
+      payload = {
+        :response => @response
+      }
+
+      formatted_response = @api.format_response(payload)
+      expect(formatted_response).to_not be_nil
+      expect(formatted_response[:data]).to eq({})
+    end
+
+    it "parses with whitespace around JSON correctly" do
+      allow(@response).to receive(:body) { '    { "test": "value"  } ' }
+      payload = {
+        :response => @response
+      }
+
+      formatted_response = @api.format_response(payload)
+      expect(formatted_response).to_not be_nil
+      expect(formatted_response[:data]).to eq({ "test" => "value" })
+    end
+  end
 end

data/spec/rest/error_hash_spec.rb

@@ -0,0 +1,83 @@
+module PayPal::SDK::REST
+  describe ErrorHash do
+    it 'converts Hashes to ErrorHashes' do
+      hash = ErrorHash.convert({
+        nested_hash: { bing: 'bong' },
+        empty_array: [],
+        array_with_hashes: [
+          { foo: 'boo' },
+          { biz: 'boz' }
+        ],
+        array_without_hashes: [1, 2, 3],
+        nilly: nil,
+        stringy: 'cheese'
+      })
+
+      expect(hash).to be_a(ErrorHash)
+      expect(hash.nested_hash).to be_a(ErrorHash)
+      expect(hash.empty_array).to eq([])
+      expect(hash.array_with_hashes[0]).to be_a(ErrorHash)
+      expect(hash.array_with_hashes[1]).to be_a(ErrorHash)
+      expect(hash.array_without_hashes).to eq([1, 2, 3])
+      expect(hash.nilly).to be_nil
+      expect(hash.stringy).to eq('cheese')
+    end
+
+    it 'can access string keys as properties, strings, or symbols' do
+      hash = ErrorHash.convert({ 'foo' => 5 })
+      hash['boo'] = 'grue'
+
+      expect(hash.foo).to eq(5)
+      expect(hash['foo']).to eq(5)
+      expect(hash[:foo]).to eq(5)
+      expect(hash.boo).to eq('grue')
+      expect(hash['boo']).to eq('grue')
+      expect(hash[:boo]).to eq('grue')
+    end
+
+    it 'can access symbol keys as properties, strings, or symbols' do
+      hash = ErrorHash.convert({ :foo => 5 })
+      hash[:boo] = 'grue'
+
+      expect(hash.foo).to eq(5)
+      expect(hash['foo']).to eq(5)
+      expect(hash[:foo]).to eq(5)
+      expect(hash.boo).to eq('grue')
+      expect(hash['boo']).to eq('grue')
+      expect(hash[:boo]).to eq('grue')
+    end
+
+    it 'converts Hashes to ErrorHashes on assignment' do
+      hash = ErrorHash.new
+      hash['foo'] = { bing: 'bong' }
+
+      expect(hash['foo']).to be_a(ErrorHash)
+      expect(hash['foo'].bing).to eq('bong')
+    end
+
+    it 'converts Hashes inside of Arrays to ErrorHashes on assignment' do
+      hash = ErrorHash.new
+      hash['foo'] = [{ bing: 'bong' }]
+
+      expect(hash['foo'][0]).to be_a(ErrorHash)
+      expect(hash['foo'][0].bing).to eq('bong')
+    end
+
+    it "doesn't convert Hashes inside of Arrays if the first element of the array isn't a Hash" do
+      hash = ErrorHash.new
+      hash['foo'] = [100, { bing: 'bong' }]
+
+      expect(hash['foo'][1]).to be_a(Hash)
+      expect(hash['foo'][1]).not_to be_a(ErrorHash)
+    end
+
+    it 'gets and sets numbers and strings' do
+      hash = ErrorHash.new
+      hash['foo'] = 123
+      hash['boo'] = 'baa'
+
+      expect(hash['foo']).to eq(123)
+      expect(hash['boo']).to eq('baa')
+    end
+  end
+end

data/spec/webhooks_examples_spec.rb

@@ -15,6 +15,14 @@ describe "Webhooks" do
     ]
   }
 
+  describe "PayPal::SDK::Core::API::DataTypes::WebhookEvent" do
+    describe "get event by id via .find" do
+      it "exists" do
+        expect(WebhookEvent).to respond_to(:find)
+      end
+    end
+  end
+
   describe "Notifications", :integration => true do
     it "create webhook" do
       $webhook = PayPal::SDK::REST::Webhook.new(webhookAttributes)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paypal-sdk-rest
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - PayPal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -124,6 +124,7 @@ files:
 - spec/payments_examples_spec.rb
 - spec/payouts_examples_spec.rb
 - spec/rest/data_types_spec.rb
+- spec/rest/error_hash_spec.rb
 - spec/spec_helper.rb
 - spec/subscription_examples_spec.rb
 - spec/support/sample_data.rb
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The PayPal REST SDK provides Ruby APIs to create, process and manage payment.
@@ -170,6 +171,7 @@ test_files:
 - spec/payments_examples_spec.rb
 - spec/payouts_examples_spec.rb
 - spec/rest/data_types_spec.rb
+- spec/rest/error_hash_spec.rb
 - spec/spec_helper.rb
 - spec/subscription_examples_spec.rb
 - spec/support/sample_data.rb