active_payment 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752928e70a64e010c888df7e33e60a8acde5bfb5
-  data.tar.gz: 9a43f17688e5da7a8d3b6eb1743afee92acf3d24
+  metadata.gz: aedbd01450926d0d0b744e1b06619e2bf2c0b4c1
+  data.tar.gz: 8abe24d2336acf58b71f2eea631d93bb8ee27c02
 SHA512:
-  metadata.gz: 65b4a9cd247f3edb1938646140741e5cf1ecec83390aad6d5aea0e166c1d8208f1b006b314ea029b8400db310cb085b5151227c05fcf6ed5969c3532e7d74bfa
-  data.tar.gz: 598ce55e9ab77b2c0553df607bd122a2f6b17b83fea2377e125983b232bbbfc8a4549d76b254635e9e0a38e6259b1b4156486013c35984ff6dd36c20c56a2096
+  metadata.gz: 4007087f5b29cc94ce7a5c248d1b3c6056b80f91aa991601139ab6baf27eb3b00b1393b3b49604496b0ff6f7f5974a80d87f94812552a848db1a483e05687875
+  data.tar.gz: 2c149d470c268420b10f6ec7c6089ae238354c5abf128e42ea77d32317117712158c647f9c969932581d5a8a850cdcbcb1df0ad0b5015eb833590562a81ac998

data/lib/active_payment/gateway.rb

@@ -80,14 +80,14 @@ module ActivePayment
 
       @gateway.sales.each do |sale|
         @transactions << ActivePayment::Transaction.create({
-          currency: 'USD',
+          currency: sale.payable.currency,
           gateway: @gateway.class.to_s,
           amount: sale.amount_in_cents,
           ip_address: ip_address,
           payee_id: sale.payee.id,
           payer_id: sale.payer.id,
-          payable_id: sale.payable.reference ? sale.payable.reference.id : nil,
-          payable_type: sale.payable.reference ? sale.payable.reference.class.to_s : nil,
+          payable_id: sale.payable.id,
+          payable_type: sale.payable.class.to_s,
           reference_number: sale.payable.reference_number,
           external_id: @purchase_token,
           metadata: { description: sale.payable.description }

data/lib/active_payment/models/concerns/paypal_payable.rb

@@ -0,0 +1,16 @@
+module ActivePayment
+  module Models
+    module PaypalPayable
+      extend ActiveSupport::Concern
+
+      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/concerns/paypal_payee.rb

@@ -0,0 +1,14 @@
+module ActivePayment
+  module Models
+    module PaypalPayee
+      extend ActiveSupport::Concern
+
+      def to_paypal_hash
+        {
+          email: @paypal_identifier,
+          primary: @primary
+        }
+      end
+    end
+  end
+end

data/lib/active_payment/models/payable.rb

@@ -1,27 +1,22 @@
 module ActivePayment
   module Models
     class Payable
-      attr_accessor :description, :amount, :reference,
-                    :reference_number, :external_id, :shipping, :tax,
-                    :number, :quantity
+      include ActivePayment::Models::PaypalPayable
+
+      attr_accessor :id, :class, :description, :amount,
+                    :reference_number, :external_id,
+                    :shipping, :tax, :number, :quantity,
+                    :currency
 
       def initialize(params = {})
         @tax = 0
         @shipping = 0
         @number = 1
         @quantity = 1
+        @currency = 'USD'
 
         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

@@ -1,18 +1,14 @@
 module ActivePayment
   module Models
     class Payee
-      attr_accessor :identifier, :primary
+      include ActivePayment::Models::PaypalPayee
 
-      def initialize(identifier:, primary: false)
-        @identifier = identifier
-        @primary = primary
-      end
+      attr_accessor :id, :paypal_identifier, :primary
 
-      def to_paypal_hash
-        {
-          email: @identifier,
-          primary: @primary
-        }
+      def initialize(id:, paypal_identifier:, primary: false)
+        @id = id
+        @paypal_identifier = paypal_identifier
+        @primary = primary
       end
     end
   end

data/lib/active_payment/models/sale.rb

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

data/lib/active_payment/version.rb

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

data/lib/active_payment.rb

@@ -8,6 +8,8 @@ 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/paypal_payable'
+require 'active_payment/models/concerns/paypal_payee'
 require 'active_payment/models/payee'
 require 'active_payment/models/sale'
 require 'active_payment/models/sales'

data/spec/active_payment/models/payable_spec.rb

@@ -8,9 +8,10 @@ describe ActivePayment::Models::Payable do
 
     it 'should set attributes when passing a hash' do
       service = ActivePayment::Models::Payable.new({
+        id: 1,
+        class: 'PayableObj',
         description: 'desc',
         amount: 1000,
-        reference: 200,
         reference_number: 'ABC123',
         number: 999,
         quantity: 300,
@@ -19,9 +20,10 @@ describe ActivePayment::Models::Payable do
         shipping: 456
       })
 
+      expect(service.id).to eq(1)
+      expect(service.class).to eq('PayableObj')
       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)
@@ -30,11 +32,25 @@ describe ActivePayment::Models::Payable do
       expect(service.quantity).to eq(300)
     end
 
+    it 'should set default currency value to USD if not set' do
+      service = ActivePayment::Models::Payable.new({
+        id: 1,
+        class: 'PayableObj',
+        description: 'desc',
+        amount: 1000,
+        reference_number: 'ABC123',
+        external_id: '100',
+        shipping: 456
+      })
+      expect(service.currency).to eq('USD')
+    end
+
     it 'should set default tax value to 0 if not set' do
       service = ActivePayment::Models::Payable.new({
+        id: 1,
+        class: 'PayableObj',
         description: 'desc',
         amount: 1000,
-        reference: 200,
         reference_number: 'ABC123',
         external_id: '100',
         shipping: 456
@@ -44,9 +60,10 @@ describe ActivePayment::Models::Payable do
 
     it 'should set default shipping value to 0 if not set' do
       service = ActivePayment::Models::Payable.new({
+        id: 1,
+        class: 'PayableObj',
         description: 'desc',
         amount: 1000,
-        reference: 200,
         reference_number: 'ABC123',
         external_id: '100',
         tax: 123
@@ -57,9 +74,10 @@ describe ActivePayment::Models::Payable do
 
   it 'should set default number value to 1 if not set' do
     service = ActivePayment::Models::Payable.new({
+      id: 1,
+      class: 'PayableObj',
       description: 'desc',
       amount: 1000,
-      reference: 200,
       reference_number: 'ABC123',
       external_id: '100',
       shipping: 456
@@ -69,9 +87,10 @@ describe ActivePayment::Models::Payable do
 
   it 'should set default quantity value to 1 if not set' do
     service = ActivePayment::Models::Payable.new({
+      id: 1,
+      class: 'PayableObj',
       description: 'desc',
       amount: 1000,
-      reference: 200,
       reference_number: 'ABC123',
       external_id: '100',
       shipping: 456
@@ -82,9 +101,10 @@ describe ActivePayment::Models::Payable do
   describe 'to_paypal_hash' do
     it 'should returns expect value' do
       service = ActivePayment::Models::Payable.new({
+        id: 1,
+        class: 'PayableObj',
         description: 'desc',
         amount: 1000,
-        reference: 200,
         reference_number: 'ABC123',
         external_id: '100',
         tax: 123,

data/spec/active_payment/models/payee_spec.rb

@@ -6,24 +6,32 @@ describe ActivePayment::Models::Payee 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
+    it 'should raise error if trying to initialize without id' do
+      expect { ActivePayment::Models::Payee.new(paypal_identifier: 'test@test.com') }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise error if trying to initialize without identifier' do
+      expect { ActivePayment::Models::Payee.new(id: 1) }.to raise_error(ArgumentError)
+    end
+
+    it 'should not raise error when using id/identifier parameters' do
+      expect { ActivePayment::Models::Payee.new(id: 1, paypal_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')
+      service = ActivePayment::Models::Payee.new(id: 1, paypal_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)
+      service = ActivePayment::Models::Payee.new(id: 1, paypal_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')
+      service = ActivePayment::Models::Payee.new(id: 1, paypal_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)

data/spec/active_payment/models/sale_spec.rb

@@ -52,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: @sale.payee.identifier,
+        email: @sale.payee.paypal_identifier,
         amount: 1,
         primary: false
       })
@@ -74,7 +74,7 @@ describe ActivePayment::Models::Sale do
           total_tax: @sale.payable.tax
         },
         receiver: {
-          email: @sale.payee.identifier
+          email: @sale.payee.paypal_identifier
         }
       })
     end