paypal-sdk-rest 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72dddceb399000bdb12b4360983c861cc927e92a
-  data.tar.gz: 6b60b36e2164f07b96951a51cb8dbfa423f8937e
+  metadata.gz: a50371cdb348785506ff61ef88aba02f119e99aa
+  data.tar.gz: d84d2eb117fca72ff6f50ac299cadaa1f8585331
 SHA512:
-  metadata.gz: 39d75f76da80b4f822ccf0046172efe935a833374223ce51ce0c00b68997258034150171d4db79f3c385a6d31fab82e0687e750388bf61f862176194c7617576
-  data.tar.gz: eb7c14092c622d5dd96428612f745e34f6b50673f84c1ef54757341df32e95cb7e5aa41038f8a773f98fa3d827736505da9827c26a7501605cf6b95b41008a71
+  metadata.gz: dfd06b69e27819ab06fc612695e0ac1967cf50566866a759f64eab4cb046c35776b5d37eb383ca06c00c7deccbc82a155cf57b5a4fd5a42a834d700e77b47b4b
+  data.tar.gz: c34219a3a6436564f26910c22399807e45d4a7b3bba0babe851a2c6f9c4b8ab562b62c750794ebb762eca1ab074c6f27188498f7b640a7eb96e8f45196f37edf

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

@@ -3,10 +3,7 @@ module PayPal
     module Core
       module API
         autoload :Base,     "paypal-sdk/core/api/base"
-        autoload :Merchant, "paypal-sdk/core/api/merchant"
-        autoload :Platform, "paypal-sdk/core/api/platform"
         autoload :REST,     "paypal-sdk/core/api/rest"
-        autoload :IPN,      "paypal-sdk/core/api/ipn"
 
         module DataTypes
           autoload :Base, "paypal-sdk/core/api/data_types/base"

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

@@ -72,19 +72,13 @@ module PayPal::SDK::Core
         :token, :token_secret, :subject,
         :http_timeout, :http_proxy,
         :device_ipaddress, :sandbox_email_address,
-        :mode, :endpoint, :merchant_endpoint, :platform_endpoint, :ipn_endpoint,
+        :mode, :endpoint,
         :rest_endpoint, :rest_token_endpoint, :client_id, :client_secret,
         :openid_endpoint, :openid_redirect_uri, :openid_client_id, :openid_client_secret,
         :verbose_logging
 
     alias_method :end_point=, :endpoint=
     alias_method :end_point, :endpoint
-    alias_method :platform_end_point=, :platform_endpoint=
-    alias_method :platform_end_point, :platform_endpoint
-    alias_method :merchant_end_point=, :merchant_endpoint=
-    alias_method :merchant_end_point, :merchant_endpoint
-    alias_method :ipn_end_point=, :ipn_endpoint=
-    alias_method :ipn_end_point, :ipn_endpoint
     alias_method :rest_end_point, :rest_endpoint
     alias_method :rest_end_point=, :rest_endpoint=
     alias_method :rest_token_end_point, :rest_token_endpoint
@@ -221,7 +215,7 @@ module PayPal::SDK::Core
       # Get logger
       def logger
         if @@configurations[:mode] == 'live' and Logging.logger.level == Logger::DEBUG
-          Logging.logger.warn "DEBUG log level not allowed in sandbox mode for security of confidential information. Changing log level to INFO..."
+          Logging.logger.warn "DEBUG log level not allowed in live mode for security of confidential information. Changing log level to INFO..."
           Logging.logger.level = Logger::INFO
         end
         Logging.logger

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

@@ -1262,8 +1262,8 @@ module PayPal::SDK
           end
 
           def get_cert_chain()
-            root_cert = "data/DigiCertHighAssuranceEVRootCA.pem"
-            intermediate_cert = "data/DigiCertSHA2ExtendedValidationServerCA.pem"
+            root_cert = File.expand_path(File.join(File.dirname(__FILE__), '../../../data/DigiCertHighAssuranceEVRootCA.pem'))
+            intermediate_cert = File.expand_path(File.join(File.dirname(__FILE__), '../../../data/DigiCertSHA2ExtendedValidationServerCA.pem'))
 
             cert_store = OpenSSL::X509::Store.new
             cert_store.add_file(root_cert)

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

@@ -1,7 +1,7 @@
 module PayPal
   module SDK
     module REST
-      VERSION = "1.4.1"
+      VERSION = "1.4.2"
     end
   end
 end

data/spec/README.md

@@ -4,31 +4,19 @@ How to run tests
 The SDK tests are composed of two groups: unit test group and integration (functional) test group. Integration test group is by default set not to run.
 
 - run a single test
-  - ```
-  $ bundle exec rspec <test-file>:<line-number>
-  ```
+  - `$ bundle exec rspec <test-file>:<line-number>`
   - e.g., to run payment create test,
-  - ```
-  $ bundle exec rspec spec/payments_examples_spec.rb:53
-  ```
+  - `$ bundle exec rspec spec/payments_examples_spec.rb:53`
 
 - run multiple tests in the same file
-  - Add ```:<line-number>``` to the above command. For example, in order to execute payment create and payment list tests,
-  - ```
-  $ bundle exec rspec spec/payments_examples_spec.rb:53:95
-  ```
+  - Add `:<line-number>` to the above command. For example, in order to execute payment create and payment list tests,
+  - `$ bundle exec rspec spec/payments_examples_spec.rb:53:95`
 
 - run integration tests
   - This will set the 'integration' flag and will execute functional tests against sandbox.
-  - ```
-  $ bundle exec rspec --tag integration
-  ```
+  - `$ bundle exec rspec --tag integration`
   
 - run tests with a specific String
-  - ```
-  $ bundle exec rspec -e "<string>"
-  ```
+  - `$ bundle exec rspec -e "<string>"`
   - e.g., to run any tests with "Sa" in test description (for the time being, it will be "Sale" tests)
-  - ```
-  $ bundle exec rspec -e "Sa"
-  ```
+  - `$ bundle exec rspec -e "Sa"`

data/spec/core/api/data_type_spec.rb

@@ -31,29 +31,29 @@ describe PayPal::SDK::Core::API::DataTypes::Base do
 
   it "should allow content key" do
     message = Message.new("Testing message")
-    message.value.should eql "Testing message"
+    expect(message.value).to eql "Testing message"
 
     message = Message.new(:value => "Testing message")
-    message.value.should eql "Testing message"
+    expect(message.value).to eql "Testing message"
   end
 
   it "should create member object automatically" do
     test_type = TestType.new
-    test_type.fromCurrency.should   be_a TestCurrency
-    test_type.toCurrency.should     be_a Array
-    test_type.toCurrency[0].should  be_a TestCurrency
-    test_type.toCurrency[1].should  be_a TestCurrency
-    test_type.toCurrency[0].amount.should eql nil
-    test_type.fromCurrency.amount.should  eql nil
-    test_type.fromCurrency.desciption.should    eql nil
-    test_type.fromCurrency.currencyID.should    eql nil
+    expect(test_type.fromCurrency).to   be_a TestCurrency
+    expect(test_type.toCurrency).to     be_a Array
+    expect(test_type.toCurrency[0]).to  be_a TestCurrency
+    expect(test_type.toCurrency[1]).to  be_a TestCurrency
+    expect(test_type.toCurrency[0].amount).to eql nil
+    expect(test_type.fromCurrency.amount).to  eql nil
+    expect(test_type.fromCurrency.desciption).to    eql nil
+    expect(test_type.fromCurrency.currencyID).to    eql nil
   end
 
   it "should convert the given data to configured type" do
     test_type = TestType.new( :fromCurrency => { :currencyID => "USD", :amount => "50.0"})
-    test_type.fromCurrency.should be_a TestCurrency
-    test_type.fromCurrency.currencyID.should    eql "USD"
-    test_type.fromCurrency.amount.should  eql "50.0"
+    expect(test_type.fromCurrency).to be_a TestCurrency
+    expect(test_type.fromCurrency.currencyID).to    eql "USD"
+    expect(test_type.fromCurrency.amount).to  eql "50.0"
   end
 
   it "should allow block with initializer" do
@@ -63,8 +63,8 @@ describe PayPal::SDK::Core::API::DataTypes::Base do
         self.amount = "50.0"
       end
     end
-    test_type.fromCurrency.currencyID.should    eql "USD"
-    test_type.fromCurrency.amount.should  eql "50.0"
+    expect(test_type.fromCurrency.currencyID).to    eql "USD"
+    expect(test_type.fromCurrency.amount).to  eql "50.0"
   end
 
   it "should allow block with member" do
@@ -73,116 +73,116 @@ describe PayPal::SDK::Core::API::DataTypes::Base do
       self.currencyID = "USD"
       self.amount = "50.0"
     end
-    test_type.fromCurrency.currencyID.should    eql "USD"
-    test_type.fromCurrency.amount.should  eql "50.0"
+    expect(test_type.fromCurrency.currencyID).to    eql "USD"
+    expect(test_type.fromCurrency.amount).to  eql "50.0"
   end
 
   it "should assign value to attribute" do
     test_currency = TestCurrency.new( :@currencyID => "USD", :amount => "50" )
-    test_currency.currencyID.should eql "USD"
+    expect(test_currency.currencyID).to eql "USD"
   end
 
   it "should allow configured Class object" do
     test_currency = TestCurrency.new( :currencyID => "USD", :amount => "50" )
     test_type = TestType.new( :fromCurrency => test_currency )
-    test_type.fromCurrency.should eql test_currency
+    expect(test_type.fromCurrency).to eql test_currency
   end
 
   it "should allow snakecase" do
     test_type = TestType.new( :from_currency => {} )
-    test_type.from_currency.should be_a TestCurrency
-    test_type.from_currency.should eql test_type.fromCurrency
+    expect(test_type.from_currency).to be_a TestCurrency
+    expect(test_type.from_currency).to eql test_type.fromCurrency
   end
 
   it "should allow array" do
     test_type = TestType.new( :toCurrency => [{ :currencyID => "USD", :amount => "50.0" }] )
-    test_type.toCurrency.should be_a Array
-    test_type.toCurrency.first.should be_a TestCurrency
-    test_type.toCurrency.first.currencyID.should eql "USD"
+    expect(test_type.toCurrency).to be_a Array
+    expect(test_type.toCurrency.first).to be_a TestCurrency
+    expect(test_type.toCurrency.first.currencyID).to eql "USD"
   end
 
   it "should skip undefind members on initializer" do
     test_type = TestType.new( :notExist => "testing")
-    lambda do
+    expect do
       test_type.notExist
-    end.should raise_error NoMethodError
-    lambda do
+    end.to raise_error NoMethodError
+    expect do
       test_type.notExist = "Value"
-    end.should raise_error NoMethodError
+    end.to raise_error NoMethodError
   end
 
   it "should not convert empty hash" do
     test_type = TestType.new( :fromCurrency => {} )
-    test_type.to_hash.should eql({})
+    expect(test_type.to_hash).to eql({})
   end
 
   it "should not convert empty array" do
     test_type = TestType.new( :toCurrency => [] )
-    test_type.to_hash.should eql({})
+    expect(test_type.to_hash).to eql({})
   end
 
   it "should not convert array of empty hash" do
     test_type = TestType.new( :toCurrency => [ {} ] )
-    test_type.to_hash.should eql({})
+    expect(test_type.to_hash).to eql({})
   end
 
   it "should return empty hash" do
     test_type = TestType.new
-    test_type.to_hash.should eql({})
+    expect(test_type.to_hash).to eql({})
   end
 
   it "should convert to hash" do
     test_currency = TestCurrency.new(:amount => "500")
-    test_currency.to_hash.should eql("amount" => "500")
+    expect(test_currency.to_hash).to eql("amount" => "500")
   end
 
   it "should convert to hash with key as symbol" do
     test_currency = TestCurrency.new(:amount => "500")
-    test_currency.to_hash(:symbol => true).should eql(:amount => "500")
+    expect(test_currency.to_hash(:symbol => true)).to eql(:amount => "500")
   end
 
   it "should convert attribute key with @" do
     test_currency = TestCurrency.new( :currencyID => "USD", :amount => "50" )
-    test_currency.to_hash["@currencyID"].should eql "USD"
+    expect(test_currency.to_hash["@currencyID"]).to eql "USD"
   end
 
   it "should convert attribute key without @" do
     test_currency = TestCurrency.new( :currencyID => "USD", :amount => "50" )
-    test_currency.to_hash(:attribute => false)["currencyID"].should eql "USD"
+    expect(test_currency.to_hash(:attribute => false)["currencyID"]).to eql "USD"
   end
 
   it "should convert to hash with namespace" do
     test_currency = TestCurrency.new(:currencyID => "USD", :amount => "500", :desciption => "Testing" )
     hash = test_currency.to_hash
-    hash["amount"].should eql "500"
-    hash["ns:desciption"].should eql "Testing"
-    hash["@currencyID"].should eql "USD"
+    expect(hash["amount"]).to eql "500"
+    expect(hash["ns:desciption"]).to eql "Testing"
+    expect(hash["@currencyID"]).to eql "USD"
     hash = test_currency.to_hash(:namespace => false)
-    hash["amount"].should eql "500"
-    hash["desciption"].should eql "Testing"
-    hash["@currencyID"].should eql "USD"
+    expect(hash["amount"]).to eql "500"
+    expect(hash["desciption"]).to eql "Testing"
+    expect(hash["@currencyID"]).to eql "USD"
   end
 
   it "should allow namespace" do
     test_currency = TestCurrency.new(:amount => "500", :"ns:desciption" => "Testing" )
-    test_currency.desciption.should eql "Testing"
+    expect(test_currency.desciption).to eql "Testing"
   end
 
   it "should use name option in members" do
     test_type = TestType.new( :firstname => "FirstName")
-    test_type.to_hash.should eql({"first-name" => "FirstName" })
+    expect(test_type.to_hash).to eql({"first-name" => "FirstName" })
   end
 
   it "should allow date" do
     date_time = "2010-10-10T10:10:10"
     test_simple_type = TestSimpleType.new( :created_on => date_time, :created_at => date_time )
-    test_simple_type.created_on.should be_a Date
-    test_simple_type.created_at.should be_a DateTime
+    expect(test_simple_type.created_on).to be_a Date
+    expect(test_simple_type.created_at).to be_a DateTime
   end
 
   it "should allow date with value 0" do
     test_simple_type = TestSimpleType.new( :created_at => "0" )
-    test_simple_type.created_at.should be_a DateTime
+    expect(test_simple_type.created_at).to be_a DateTime
   end
 
 end

data/spec/core/api/rest_spec.rb

@@ -22,68 +22,68 @@ describe PayPal::SDK::Core::API::REST do
   describe "Configuration" do
     it "create api with prefix" do
       api = create_api("v1/payments")
-      api.uri.path.should eql "/v1/payments"
+      expect(api.uri.path).to eql "/v1/payments"
     end
 
     it "service endpoint for sandbox" do
       api = create_api
-      api.service_endpoint.should eql "https://api.sandbox.paypal.com"
-      api.token_endpoint.should   eql "https://api.sandbox.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.sandbox.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.sandbox.paypal.com"
       api = create_api( :mode => "sandbox" )
-      api.service_endpoint.should eql "https://api.sandbox.paypal.com"
-      api.token_endpoint.should   eql "https://api.sandbox.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.sandbox.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.sandbox.paypal.com"
       api = create_api( :mode => :sandbox )
-      api.service_endpoint.should eql "https://api.sandbox.paypal.com"
-      api.token_endpoint.should   eql "https://api.sandbox.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.sandbox.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.sandbox.paypal.com"
       api = create_api( :mode => "invalid" )
-      api.service_endpoint.should eql "https://api.sandbox.paypal.com"
-      api.token_endpoint.should   eql "https://api.sandbox.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.sandbox.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.sandbox.paypal.com"
       api = create_api( :mode => nil )
-      api.service_endpoint.should eql "https://api.sandbox.paypal.com"
-      api.token_endpoint.should   eql "https://api.sandbox.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.sandbox.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.sandbox.paypal.com"
     end
 
     it "service endpoint for live" do
       api = create_api( :mode => "live" )
-      api.service_endpoint.should eql "https://api.paypal.com"
-      api.token_endpoint.should   eql "https://api.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.paypal.com"
       api = create_api( :mode => :live )
-      api.service_endpoint.should eql "https://api.paypal.com"
-      api.token_endpoint.should   eql "https://api.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.paypal.com"
+      expect(api.token_endpoint).to   eql "https://api.paypal.com"
     end
 
     it "override service endpoint" do
       api = create_api( :rest_endpoint => "https://testing.api.paypal.com" )
-      api.service_endpoint.should eql "https://testing.api.paypal.com"
-      api.token_endpoint.should   eql "https://testing.api.paypal.com"
+      expect(api.service_endpoint).to eql "https://testing.api.paypal.com"
+      expect(api.token_endpoint).to   eql "https://testing.api.paypal.com"
       api = create_api( :endpoint => "https://testing.api.paypal.com" )
-      api.service_endpoint.should eql "https://testing.api.paypal.com"
-      api.token_endpoint.should   eql "https://testing.api.paypal.com"
+      expect(api.service_endpoint).to eql "https://testing.api.paypal.com"
+      expect(api.token_endpoint).to   eql "https://testing.api.paypal.com"
     end
 
     it "override token endpoint" do
       api = create_api( :rest_token_endpoint => "https://testing.api.paypal.com" )
-      api.service_endpoint.should eql "https://api.sandbox.paypal.com"
-      api.token_endpoint.should   eql "https://testing.api.paypal.com"
+      expect(api.service_endpoint).to eql "https://api.sandbox.paypal.com"
+      expect(api.token_endpoint).to   eql "https://testing.api.paypal.com"
     end
   end
 
   describe "Validation" do
     it "Invalid client_id and client_secret" do
       api = create_api(:with_authentication, :client_id => "XYZ", :client_secret => "ABC")
-      lambda {
+      expect {
         api.token
-      }.should raise_error PayPal::SDK::Core::Exceptions::UnauthorizedAccess
+      }.to raise_error PayPal::SDK::Core::Exceptions::UnauthorizedAccess
     end
 
     xit "Should handle expired token" do
       old_token = @api.token
       @api.token_hash[:expires_in] = 0
-      @api.token.should_not eql old_token
+      expect(@api.token).not_to eql old_token
     end
 
     it "Get token" do
-      @api.token.should_not be_nil
+      expect(@api.token).not_to be_nil
     end
   end
 
@@ -104,13 +104,13 @@ describe PayPal::SDK::Core::API::REST do
           "amount" => {
             "total" => "7.47",
             "currency" => "USD" }}]})
-      response["error"].should be_nil
+      expect(response["error"]).to be_nil
     end
 
     it "List Payments" do
       response = @api.get("payment", { "count" => 10 })
-      response["error"].should be_nil
-      response["count"].should_not be_nil
+      expect(response["error"]).to be_nil
+      expect(response["count"]).not_to be_nil
     end
 
     it "Execute Payment"
@@ -122,26 +122,26 @@ describe PayPal::SDK::Core::API::REST do
         "expire_month" =>  "11", "expire_year" =>  "2018",
         "cvv2" =>  "874",
         "first_name" =>  "Joe", "last_name" =>  "Shopper" })
-      new_funding_instrument["error"].should  be_nil
-      new_funding_instrument["id"].should_not be_nil
+      expect(new_funding_instrument["error"]).to  be_nil
+      expect(new_funding_instrument["id"]).not_to be_nil
 
       funding_instrument = @vault_api.get("credit-card/#{new_funding_instrument["id"]}")
-      funding_instrument["error"].should be_nil
-      funding_instrument["id"].should eql new_funding_instrument["id"]
+      expect(funding_instrument["error"]).to be_nil
+      expect(funding_instrument["id"]).to eql new_funding_instrument["id"]
     end
 
   end
 
   describe "Failure request", :integration => true do
     it "Invalid Resource ID" do
-      lambda {
+      expect {
         response = @api.get("payment/PAY-1234")
-      }.should raise_error PayPal::SDK::Core::Exceptions::ResourceNotFound
+      }.to raise_error PayPal::SDK::Core::Exceptions::ResourceNotFound
     end
 
     it "Invalid parameters" do
       response = @api.post("payment")
-      response["error"]["name"].should eql "VALIDATION_ERROR"
+      expect(response["error"]["name"]).to eql "VALIDATION_ERROR"
     end
   end
 end