creative-paypal-express 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b6637908ce92f01757f3561a0835d86e667ce2
-  data.tar.gz: c3c7ca0dde27ed7f3e43bc18f7e6328fdf75c99a
+  metadata.gz: 5dd169c91e9532a067b8d075e4b2024b5780026c
+  data.tar.gz: 61519d004da8d2b51dc79cd5f832dec82fd711e1
 SHA512:
-  metadata.gz: 320892ab92f76b77fef75b53044c77f10c1fa3a153ad41ea0cfaf137d6e794f33827adf5f47603c451fae7e98df2f038516a1f10b4f422fb3ecdd1245e97947d
-  data.tar.gz: 06323e9c79aea9270dc3665c054ebd56854ec62dee1dc012804a98cc75f1de0691c8cb6bf2d325a7de2be8b4f61297cfaeadd201c5a620b370ad5f829f6e4b8e
+  metadata.gz: b9b3991b6e6fd62441d38beac1d41324be5716a18ce3199beb11e37d5dee2f375cc4db841c1e477c540b6fcd25b3a4e96f3629875334117093156d8ea9948f0b
+  data.tar.gz: fd01eee4f2c878d650543b690f910a07eb43adfb14819e9191e2a9f824ffedfbe3d27774ed157d722a25113495726b3b63c356d384d45dea79e8e81f5e7c4948

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/circle.yml

@@ -0,0 +1,6 @@
+machine:
+  ruby:
+    version: 2.3.5
+  timezone: "Europe/Riga"
+  environment:
+    COV: 'false'

data/creative-paypal-express.gemspec

@@ -16,13 +16,14 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.add_dependency "activesupport", ">= 4"
-  s.add_dependency "rest-client"
+  s.add_dependency "rest-client", "~> 2.0.0"
   s.add_dependency "attr_required", ">= 0.0.5"
 
   # s.add_development_dependency "activesupport", "4.1" # uses this for development, but will probably work with higher versions
-  s.add_development_dependency "rake", ">= 0.8"
+  s.add_development_dependency "rake", "~> 10.5.0"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rspec", "< 2.99"
   s.add_development_dependency "fakeweb", ">= 1.3.0"
+  # s.add_development_dependency "webmock", "~> 2.3.1"
   s.add_development_dependency "pry"
 end

data/lib/paypal/express/request.rb

@@ -31,12 +31,12 @@ module Paypal
         end
 
         Array(payment_requests).each_with_index do |payment_request, index|
-          params.merge! payment_request.to_params(index)
+          params.merge!(payment_request.to_params(index))
         end
 
         response = request(:SetExpressCheckout, params)
 
-        Response.new response, options
+        Response.new(response, options)
       end
 
       def details(token)
@@ -98,8 +98,8 @@ module Paypal
         params = {
           :PROFILEID => profile_id
         }
-        response = self.request :GetRecurringPaymentsProfileDetails, params
-        Response.new response
+        response = self.request(:GetRecurringPaymentsProfileDetails, params)
+        Response.new(response)
       end
 
       def renew!(profile_id, action, options = {})
@@ -185,7 +185,6 @@ module Paypal
         Response.new response
       end
 
-
       #== Refund Specific
       def refund!(transaction_id, options = {})
         params = {

data/lib/paypal/express/response.rb

@@ -19,7 +19,7 @@ module Paypal
       end
 
       def redirect_uri
-        endpoint = URI.parse Paypal.endpoint
+        endpoint = URI.parse(Paypal.endpoint)
         endpoint.query = query(:with_cmd).to_query
         endpoint.to_s
       end

data/lib/paypal/nvp/request.rb

@@ -44,20 +44,20 @@ module Paypal
         def post(method, params)
           rest_params = common_params.merge(params).merge(METHOD: method)
 
-          response = RestClient.post(self.class.endpoint, rest_params)
+          response = RestClient.post(send(:class).endpoint, rest_params)
 
           puts ">> Paypal::NVP Got response to POST request <<"
           puts "Request arguments:\nendpoint: #{self.class.endpoint}\nparams: #{rest_params})\n"
           puts "Response string:\n#{response}"
           puts "=============================================="
 
-          return response
+          response
         end
 
         def handle_response
           response = yield
           response = CGI.parse(response).inject({}) do |res, (k, v)|
-            res.merge!(k.to_sym => v.first)
+            res.merge!(k.to_sym => v.first.to_s)
           end
 
           case response[:ACK]

data/lib/paypal/nvp/response.rb

@@ -193,8 +193,9 @@ module Paypal
             payment_responses[index.to_i][key.to_sym] = attrs.delete(_attr_)
           end
         end
+
         @payment_responses = payment_responses.collect do |_attrs_|
-          Payment::Response.new _attrs_
+          Payment::Response.new(_attrs_)
         end
 
         # payment_info
@@ -234,7 +235,11 @@ module Paypal
       end
 
       def to_s
-        return @raw_response.to_s
+        @raw_response.to_s
+      end
+
+      def to_json
+        @raw_response.to_json
       end
     end
   end

data/lib/paypal/payment/response.rb

@@ -1,7 +1,10 @@
 module Paypal
   module Payment
     class Response < Base
-      attr_accessor :amount, :ship_to, :bill_to, :description, :note, :items, :notify_url, :insurance_option_offered, :currency_code, :short_message, :long_message, :error_code, :severity_code, :ack, :transaction_id, :billing_agreement_id, :request_id, :seller_id
+      attr_accessor :amount, :ship_to, :bill_to, :description, :note, :items,
+        :notify_url, :insurance_option_offered, :currency_code, :short_message,
+        :long_message, :error_code, :severity_code, :ack, :transaction_id,
+        :billing_agreement_id, :request_id, :seller_id
 
       def initialize(attributes = {})
         attrs = attributes.dup

data/lib/paypal/util.rb

@@ -3,7 +3,7 @@ module Paypal
 
     def self.formatted_amount(x)
       # Thanks @nahi ;)
-      sprintf "%0.2f", BigDecimal.new(x.to_s).truncate(2)
+      sprintf "%0.2f", BigDecimal.new(x.to_f.to_s).truncate(2)
     end
 
     def self.to_numeric(x)
@@ -25,4 +25,4 @@ module Paypal
     end
 
   end
-end
+end

data/spec/helpers/fake_response_helper.rb

@@ -30,4 +30,35 @@ module FakeResponseHelper
 end
 
 FakeWeb.allow_net_connect = false
-include FakeResponseHelper
+include FakeResponseHelper
+
+# require 'webmock'
+# WebMock.enable!
+# WebMock.disable_net_connect!(allow_localhost: true)
+
+# module FakeResponseHelper
+#   def fake_response(file_path, api = :NVP, options = {})
+#     endpoint = case api
+#     when :NVP
+#       Paypal::NVP::Request.endpoint
+#     when :IPN
+#       Paypal::IPN.endpoint
+#     else
+#       raise "Non-supported API: #{api}"
+#     end
+
+#     body = File.read(File.join(File.dirname(__FILE__), '../fake_response', "#{file_path}.txt"))
+
+#     WebMock.stub_request(:post, %r'#{endpoint}').
+#     to_return(body: body, status: 200, headers: {})
+#   end
+
+#   def request_to(endpoint, method = :get)
+#     raise_error(
+#       RuntimeError,
+#       "Real HTTP connections are disabled. Unregistered request: #{method.to_s.upcase} #{endpoint}"
+#     )
+#   end
+# end
+
+# include FakeResponseHelper

data/spec/paypal/exception/api_error_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper.rb'
-
 describe Paypal::Exception::APIError do
   let(:error) { Paypal::Exception::APIError.new(params) }
 
@@ -75,4 +73,4 @@ describe Paypal::Exception::APIError do
     its(:response) { should == params }
     its(:message) { should == "PayPal API Error" }
   end
-end
+end

data/spec/paypal/exception/http_error_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper.rb'
-
 describe Paypal::Exception::HttpError do
   subject { Paypal::Exception::HttpError.new(400, 'BadRequest', 'You are bad man!') }
   its(:code)    { should == 400 }
   its(:message) { should == 'BadRequest' }
   its(:body)    { should == 'You are bad man!' }
-end
+end

data/spec/paypal/express/request_spec.rb

@@ -2,14 +2,21 @@
 describe Paypal::Express::Request do
   class Paypal::Express::Request
     attr_accessor :_sent_params_, :_method_
-    def post_with_logging(method, params)
+  end
+
+  module Verbose
+    def request(method, params = {})
       self._method_ = method
       self._sent_params_ = params
-      post_without_logging method, params
+
+      handle_response do
+        post(method, params)
+      end
     end
-    alias_method_chain :post, :logging
   end
 
+  Paypal::Express::Request.include(Verbose)
+
   let(:return_url) { 'http://example.com/success' }
   let(:cancel_url) { 'http://example.com/cancel' }
   let(:nvp_endpoint) { Paypal::NVP::Request::ENDPOINT[:production] }
@@ -103,16 +110,17 @@ describe Paypal::Express::Request do
   end
 
   describe '#setup' do
-    it 'should return Paypal::Express::Response' do
+    it 'returns Paypal::Express::Response' do
       fake_response 'SetExpressCheckout/success'
-      response = instance.setup recurring_payment_request, return_url, cancel_url
+      response = instance.setup(recurring_payment_request, return_url, cancel_url)
       response.should be_instance_of Paypal::Express::Response
     end
 
-    it 'should support no_shipping option' do
-      expect do
-        instance.setup instant_payment_request, return_url, cancel_url, :no_shipping => true
-      end.to request_to nvp_endpoint, :post
+    it 'supports no_shipping option' do
+      expect {
+        instance.setup(instant_payment_request, return_url, cancel_url, :no_shipping => true)
+      }.to(request_to(nvp_endpoint, :post))
+
       instance._method_.should == :SetExpressCheckout
       instance._sent_params_.should == {
         :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',

data/spec/paypal/ipn_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Paypal::IPN do
   describe '.verify!' do
     context 'when valid' do
@@ -16,4 +14,4 @@ describe Paypal::IPN do
       end
     end
   end
-end
+end

data/spec/paypal/nvp/request_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper.rb'
-
 describe Paypal::NVP::Request do
   let :attributes do
     {
@@ -113,4 +111,4 @@ describe Paypal::NVP::Request do
       end
     end
   end
-end
+end

data/spec/paypal/nvp/response_spec.rb

@@ -124,7 +124,7 @@ describe Paypal::NVP::Response do
 
       it 'should handle all attributes' do
         Paypal.logger.should_not_receive(:warn)
-        response = request.subscription 'profile_id'
+        response = request.subscription('profile_id')
         response.recurring.billing.amount.total.should == 1000
         response.recurring.regular_billing.paid.should == 1000
         response.recurring.summary.next_billing_date.should == '2011-03-04T10:00:00Z'
@@ -148,11 +148,25 @@ describe Paypal::NVP::Response do
       fake_response 'SetExpressCheckout/success'
     end
 
-    it "should return a stringified hash of POST request response that instantiated the object" do
+    it "returns a stringified representation of the response->hash conversion" do
       response = request.setup(payment_request, return_url, cancel_url)
 
       expect(response.to_s).to eq("{:ACK=>\"Success\", :BUILD=>\"1721431\", :CORRELATIONID=>\"5549ea3a78af1\", :TIMESTAMP=>\"2011-02-02T02:02:18Z\", :TOKEN=>\"EC-5YJ90598G69065317\", :VERSION=>\"66.0\"}")
     end
   end
 
+  describe "#to_json" do
+    before do
+      fake_response 'SetExpressCheckout/success'
+    end
+
+    it "returns a JSON representation of the response->hash conversion" do
+      response = request.setup(payment_request, return_url, cancel_url)
+
+      expect(response.to_json).to eq(
+        "{\"ACK\":\"Success\",\"BUILD\":\"1721431\",\"CORRELATIONID\":\"5549ea3a78af1\",\"TIMESTAMP\":\"2011-02-02T02:02:18Z\",\"TOKEN\":\"EC-5YJ90598G69065317\",\"VERSION\":\"66.0\"}"
+      )
+    end
+  end
+
 end

data/spec/paypal/util_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper.rb'
-
 describe Paypal::Util do
   describe '.formatted_amount' do
     it 'should return String in "xx.yy" format' do
@@ -29,4 +27,4 @@ describe Paypal::Util do
       Paypal::Util.to_numeric('10.25').should == 10.25
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+abort(
+  "Please use Ruby 2.3.5 or less in specs, fakeweb breaks on 2.4.0"
+) if RUBY_VERSION[%r'\A2\.[4-9]']
+
 require 'simplecov'
 
 SimpleCov.start do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: creative-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - nov matake
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -29,16 +29,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: attr_required
   requirement: !ruby/object:Gem::Requirement
@@ -57,16 +57,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -135,13 +135,13 @@ files:
 - ".document"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
+- circle.yml
 - creative-paypal-express.gemspec
 - lib/paypal.rb
 - lib/paypal/base.rb
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods

data/.travis.yml

@@ -1,6 +0,0 @@
-before_install:
-  - gem install bundler
-
-rvm:
-  - 2.0.0
-  - 2.1.2