active_payment 0.0.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f56028a3c36cad165bf1c617ef183a3818d502
-  data.tar.gz: 82c5dd80c4e2a4649d783e47023d07679e83308d
+  metadata.gz: 752928e70a64e010c888df7e33e60a8acde5bfb5
+  data.tar.gz: 9a43f17688e5da7a8d3b6eb1743afee92acf3d24
 SHA512:
-  metadata.gz: 66fa5109b7a33754581e29ba9f2d1eb8e20085a4869a023d6a7299ae5e75db80bfa2309cba69dcb824f824cb14cff9d6431bf0f39b441f1bce877500f5e97790
-  data.tar.gz: 66c78b1e0ecd774065de7a8ab92f0dee0585f43e3fd1f2465cb9875d18bb5eab6fab79622035257630abb7e35eb7b66229c33ac44f5c143ae27cf3d6f062ccf4
+  metadata.gz: 65b4a9cd247f3edb1938646140741e5cf1ecec83390aad6d5aea0e166c1d8208f1b006b314ea029b8400db310cb085b5151227c05fcf6ed5969c3532e7d74bfa
+  data.tar.gz: 598ce55e9ab77b2c0553df607bd122a2f6b17b83fea2377e125983b232bbbfc8a4549d76b254635e9e0a38e6259b1b4156486013c35984ff6dd36c20c56a2096

data/lib/active_payment.rb

@@ -8,11 +8,10 @@ require 'active_payment/gateway'
 require 'active_payment/configuration'
 require 'active_payment/gateways/paypal_adaptive_payment'
 require 'active_payment/gateways/paypal_express_checkout'
-require 'active_payment/models/concerns/payable'
-require 'active_payment/models/concerns/payee'
-require 'active_payment/models/concerns/payer'
+require 'active_payment/models/payee'
 require 'active_payment/models/sale'
 require 'active_payment/models/sales'
+require 'active_payment/models/payable'
 
 module ActivePayment
   attr_accessor :configuration

data/lib/active_payment/gateway.rb

@@ -86,9 +86,9 @@ module ActivePayment
           ip_address: ip_address,
           payee_id: sale.payee.id,
           payer_id: sale.payer.id,
-          payable_id: sale.payable ? sale.payable.id : nil,
-          payable_type: sale.payable ? sale.payable.class.to_s : nil,
-          reference_number: sale.payable.reference,
+          payable_id: sale.payable.reference ? sale.payable.reference.id : nil,
+          payable_type: sale.payable.reference ? sale.payable.reference.class.to_s : nil,
+          reference_number: sale.payable.reference_number,
           external_id: @purchase_token,
           metadata: { description: sale.payable.description }
         })

data/lib/active_payment/models/payable.rb

@@ -0,0 +1,27 @@
+module ActivePayment
+  module Models
+    class Payable
+      attr_accessor :description, :amount, :reference,
+                    :reference_number, :external_id, :shipping, :tax,
+                    :number, :quantity
+
+      def initialize(params = {})
+        @tax = 0
+        @shipping = 0
+        @number = 1
+        @quantity = 1
+
+        params.each { |key, value| send "#{key}=", value }
+      end
+
+      def to_paypal_hash
+        {
+          name: @description,
+          amount: @amount.to_i,
+          number: @number.to_i,
+          quantity: @quantity.to_i
+        }
+      end
+    end
+  end
+end

data/lib/active_payment/models/payee.rb

@@ -0,0 +1,19 @@
+module ActivePayment
+  module Models
+    class Payee
+      attr_accessor :identifier, :primary
+
+      def initialize(identifier:, primary: false)
+        @identifier = identifier
+        @primary = primary
+      end
+
+      def to_paypal_hash
+        {
+          email: @identifier,
+          primary: @primary
+        }
+      end
+    end
+  end
+end

data/lib/active_payment/models/sale.rb

@@ -31,7 +31,7 @@ module ActivePayment
 
       def paypal_recipient
         {
-          email: payee.paypal_identifier,
+          email: payee.identifier,
           amount: amount,
           primary: false
         }
@@ -51,7 +51,7 @@ module ActivePayment
             total_tax: payable.tax
           },
           receiver: {
-            email: @payee.paypal_identifier
+            email: @payee.identifier
           }
         }
       end

data/lib/active_payment/version.rb

@@ -1,3 +1,3 @@
 module ActivePayment
-  VERSION = '0.0.8'
+  VERSION = '0.9.0'
 end

data/spec/active_payment/controllers/paypal_express_checkout_callback_controller_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe ActivePayment::PaypalExpressCheckoutCallbackController, type: :co
   describe 'success' do
     let!(:transaction) { create(:transaction) }
 
-    it 'should riase NoTransactionError if no token is passed' do
+    it 'should raise NoTransactionError if no token is passed' do
       expect {
         get :success
       }.to raise_error(ActivePayment::NoTransactionError)

data/spec/active_payment/gateway_spec.rb

@@ -43,9 +43,9 @@ describe ActivePayment::Gateway do
   end
 
   it 'set correct transactions' do
-    payer = Payer.new
-    payee = Payee.new
-    payable = Payable.new
+    payer = PayerObj.new
+    payee = PayeeObj.new
+    payable = PayableObj.new.to_payable
     sale = ActivePayment::Models::Sale.new(payable: payable, payer: payer, payee: payee)
     sales = ActivePayment::Models::Sales.new([sale])
     gateway = ActivePayment::Gateway.new('paypal_adaptive_payment')
@@ -63,7 +63,7 @@ describe ActivePayment::Gateway do
     expect(gateway.transactions.first.payer_id).to eq(2)
     expect(gateway.transactions.first.payable_id).to eq(3)
     expect(gateway.transactions.first.reference_number).to eq('3')
-    expect(gateway.transactions.first.payable_type).to eq('Payable')
+    expect(gateway.transactions.first.payable_type).to eq('PayableObj')
     expect(gateway.transactions.first.gateway).to eq('ActivePayment::Gateways::PaypalAdaptivePayment')
     expect(gateway.transactions.first.ip_address).to eq('127.0.0.1')
     expect(gateway.transactions.first.state).to eq('pending')

data/spec/active_payment/gateways/paypal_adaptive_payment_spec.rb

@@ -2,16 +2,16 @@ require 'helper'
 
 describe ActivePayment::Gateways::PaypalAdaptivePayment do
   before(:each) do
-    @payer = Payer.new
-    @payee = Payee.new
-    @payable = Payable.new
-    @sale = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee)
-    @payee2 = Payee.new
-    @payee2.paypal_identifier = 'test2@paypal.com'
-    @payee3 = Payee.new
-    @payee3.paypal_identifier = 'test3@paypal.com'
-    @sale2 = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee2)
-    @sale3 = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee3)
+    @payer = PayerObj.new
+    @payee = PayeeObj.new
+    @payable = PayableObj.new
+    @sale = ActivePayment::Models::Sale.new(payable: @payable.to_payable, payer: @payer, payee: @payee.to_payee)
+    @payee2 = PayeeObj.new
+    @payee2.paypal = 'test2@paypal.com'
+    @payee3 = PayeeObj.new
+    @payee3.paypal = 'test3@paypal.com'
+    @sale2 = ActivePayment::Models::Sale.new(payable: @payable.to_payable, payer: @payer, payee: @payee2.to_payee)
+    @sale3 = ActivePayment::Models::Sale.new(payable: @payable.to_payable, payer: @payer, payee: @payee3.to_payee)
 
     @sales = ActivePayment::Models::Sales.new([@sale, @sale2, @sale3])
     @gateway = ActivePayment::Gateways::PaypalAdaptivePayment.new
@@ -37,7 +37,7 @@ describe ActivePayment::Gateways::PaypalAdaptivePayment do
         true
       end
       def [](request)
-        "pay_key"
+        'pay_key'
       end
     end
     @success_gateway_response = SuccessMockResponse.new

data/spec/active_payment/gateways/paypal_express_checkout_spec.rb

@@ -2,47 +2,16 @@ require 'helper'
 
 describe ActivePayment::Gateways::PaypalExpressCheckout do
   before(:each) do
-    class Payee
-      include ActivePayment::Models::Payee
-      attr_accessor :paypal_identifier
-
-      def paypal_identifier
-        "test@paypal.com"
-      end
-    end
-    class Payer
-      include ActivePayment::Models::Payer
-    end
-    class Payable
-      include ActivePayment::Models::Payable
-
-      def amount
-        100
-      end
-
-      def description
-        "description"
-      end
-
-      def tax
-        10
-      end
-
-      def shipping
-        20
-      end
-    end
-
-    @payer = Payer.new
-    @payee = Payee.new
-    @payable = Payable.new
-    @sale = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee)
-    @payee2 = Payee.new
-    @payee2.paypal_identifier = "test2@paypal.com"
-    @payee3 = Payee.new
-    @payee3.paypal_identifier = "test3@paypal.com"
-    @sale2 = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee2)
-    @sale3 = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee3)
+    @payer = PayerObj.new
+    @payee = PayeeObj.new
+    @payable = PayableObj.new
+    @sale = ActivePayment::Models::Sale.new(payable: @payable.to_payable, payer: @payer, payee: @payee)
+    @payee2 = PayeeObj.new
+    @payee2.paypal = 'test2@paypal.com'
+    @payee3 = PayeeObj.new
+    @payee3.paypal = 'test3@paypal.com'
+    @sale2 = ActivePayment::Models::Sale.new(payable: @payable.to_payable, payer: @payer, payee: @payee2.to_payee)
+    @sale3 = ActivePayment::Models::Sale.new(payable: @payable.to_payable, payer: @payer, payee: @payee3.to_payee)
 
     @sales = ActivePayment::Models::Sales.new([@sale, @sale2, @sale3])
     @gateway = ActivePayment::Gateways::PaypalExpressCheckout.new

data/spec/active_payment/models/payable_spec.rb

@@ -0,0 +1,100 @@
+require 'helper'
+
+describe ActivePayment::Models::Payable do
+  describe 'initialize' do
+    it 'should not raise any error if calling initialize without any parameter' do
+      expect { ActivePayment::Models::Payable.new }.not_to raise_error
+    end
+
+    it 'should set attributes when passing a hash' do
+      service = ActivePayment::Models::Payable.new({
+        description: 'desc',
+        amount: 1000,
+        reference: 200,
+        reference_number: 'ABC123',
+        number: 999,
+        quantity: 300,
+        external_id: '100',
+        tax: 123,
+        shipping: 456
+      })
+
+      expect(service.description).to eq('desc')
+      expect(service.amount).to eq(1000)
+      expect(service.reference).to eq(200)
+      expect(service.reference_number).to eq('ABC123')
+      expect(service.external_id).to eq('100')
+      expect(service.tax).to eq(123)
+      expect(service.shipping).to eq(456)
+      expect(service.number).to eq(999)
+      expect(service.quantity).to eq(300)
+    end
+
+    it 'should set default tax value to 0 if not set' do
+      service = ActivePayment::Models::Payable.new({
+        description: 'desc',
+        amount: 1000,
+        reference: 200,
+        reference_number: 'ABC123',
+        external_id: '100',
+        shipping: 456
+      })
+      expect(service.tax).to eq(0)
+    end
+
+    it 'should set default shipping value to 0 if not set' do
+      service = ActivePayment::Models::Payable.new({
+        description: 'desc',
+        amount: 1000,
+        reference: 200,
+        reference_number: 'ABC123',
+        external_id: '100',
+        tax: 123
+      })
+      expect(service.shipping).to eq(0)
+    end
+  end
+
+  it 'should set default number value to 1 if not set' do
+    service = ActivePayment::Models::Payable.new({
+      description: 'desc',
+      amount: 1000,
+      reference: 200,
+      reference_number: 'ABC123',
+      external_id: '100',
+      shipping: 456
+    })
+    expect(service.number).to eq(1)
+  end
+
+  it 'should set default quantity value to 1 if not set' do
+    service = ActivePayment::Models::Payable.new({
+      description: 'desc',
+      amount: 1000,
+      reference: 200,
+      reference_number: 'ABC123',
+      external_id: '100',
+      shipping: 456
+    })
+    expect(service.quantity).to eq(1)
+  end
+
+  describe 'to_paypal_hash' do
+    it 'should returns expect value' do
+      service = ActivePayment::Models::Payable.new({
+        description: 'desc',
+        amount: 1000,
+        reference: 200,
+        reference_number: 'ABC123',
+        external_id: '100',
+        tax: 123,
+        shipping: 456
+      })
+      expect(service.to_paypal_hash.class).to eq(Hash)
+      expect(service.to_paypal_hash[:name]).to eq('desc')
+      expect(service.to_paypal_hash[:amount]).to eq(1000)
+      expect(service.to_paypal_hash[:number]).to eq(1)
+      expect(service.to_paypal_hash[:quantity]).to eq(1)
+    end
+  end
+end

data/spec/active_payment/models/payee_spec.rb

@@ -0,0 +1,32 @@
+require 'helper'
+
+describe ActivePayment::Models::Payee do
+  describe 'initialize' do
+    it 'should raise error if trying to initialize without any parameters' do
+      expect { ActivePayment::Models::Payee.new }.to raise_error(ArgumentError)
+    end
+
+    it 'should not raise error is using identifier parameter' do
+      expect { ActivePayment::Models::Payee.new(identifier: 'test@test.com') }.not_to raise_error
+    end
+
+    it 'should set primary default value to false' do
+      service = ActivePayment::Models::Payee.new(identifier: 'test@test.com')
+      expect(service.primary).to eq(false)
+    end
+
+    it 'should allow to set primary value' do
+      service = ActivePayment::Models::Payee.new(identifier: 'test@test.com', primary: true)
+      expect(service.primary).to eq(true)
+    end
+  end
+
+  describe 'to_paypal_hash' do
+    it 'should returns expect value' do
+      service = ActivePayment::Models::Payee.new(identifier: 'test@test.com')
+      expect(service.to_paypal_hash.class).to eq(Hash)
+      expect(service.to_paypal_hash[:email]).to eq('test@test.com')
+      expect(service.to_paypal_hash[:primary]).to eq(false)
+    end
+  end
+end

data/spec/active_payment/models/sale_spec.rb

@@ -2,39 +2,12 @@ require 'helper'
 
 describe ActivePayment::Models::Sale do
   before(:each) do
-    class Payee
-      include ActivePayment::Models::Payee
-
-      def paypal_identifier
-        "test@paypal.com"
-      end
-    end
-    class Payer
-      include ActivePayment::Models::Payer
-    end
-    class Payable
-      include ActivePayment::Models::Payable
-
-      def amount
-        100
-      end
-
-      def description
-        "description"
-      end
-
-      def tax
-        10
-      end
-
-      def shipping
-        20
-      end
-    end
-
-    @payer = Payer.new
-    @payee = Payee.new
-    @payable = Payable.new
+    @payer = PayerObj.new
+    # @payer = payer_obj.to_payer
+    payee_obj = PayeeObj.new
+    @payee = payee_obj.to_payee
+    payable_obj = PayableObj.new
+    @payable = payable_obj.to_payable
     @sale = ActivePayment::Models::Sale.new(payable: @payable, payer: @payer, payee: @payee)
   end
 
@@ -60,13 +33,13 @@ describe ActivePayment::Models::Sale do
 
   describe 'description' do
     it 'displays the payable description' do
-      expect(@sale.description).to eq(@payable.description)
+      expect(@sale.description).to eq(@sale.payable.description)
     end
   end
 
   describe 'shipping' do
     it 'displays the payable shipping value' do
-      expect(@sale.shipping).to eq(@payable.shipping)
+      expect(@sale.shipping).to eq(@sale.payable.shipping)
     end
   end
 
@@ -79,7 +52,7 @@ describe ActivePayment::Models::Sale do
   describe 'paypal_recipient' do
     it 'displays the paypal_recipient hash with correct values' do
       expect(@sale.paypal_recipient).to eq({
-        email: @payee.paypal_identifier,
+        email: @sale.payee.identifier,
         amount: 1,
         primary: false
       })
@@ -89,19 +62,19 @@ describe ActivePayment::Models::Sale do
   describe 'paypal_hash' do
     it 'displays the paypal_hash with correct values' do
       expect(@sale.paypal_hash).to eq({
-        description: @payable.description,
+        description: @sale.payable.description,
         invoice_data: {
           item: [{
-            name: @payable.description,
+            name: @sale.payable.description,
             item_count: 1,
             item_price: 1,
             price: 1
           }],
-          total_shipping: @payable.shipping,
-          total_tax: @payable.tax
+          total_shipping: @sale.payable.shipping,
+          total_tax: @sale.payable.tax
         },
         receiver: {
-          email: @payee.paypal_identifier
+          email: @sale.payee.identifier
         }
       })
     end