active_payment 0.0.8 → 0.9.0

data/spec/factories/transaction.rb

@@ -7,6 +7,7 @@ FactoryGirl.define do
     payee_id 1
     payer_id 1
     payable_id 1
+    payable_type 'PayableObj'
     gateway "paypal_express_checkout"
     state "pending"
     ip_address "127.0.0.1"

data/spec/helper.rb

@@ -18,28 +18,28 @@ class ActionDispatch::Routing::RouteSet
   end
 end
 
-class Payee
-  include ActivePayment::Models::Payee
-  attr_accessor :paypal_identifier
+class PayeeObj
+  attr_accessor :paypal
 
   def id
     1
   end
 
-  def paypal_identifier
-    'test@paypal.com'
+  def paypal
+    'activepayment@paypal.com'
   end
-end
-class Payer
-  include ActivePayment::Models::Payer
 
+  def to_payee
+    ActivePayment::Models::Payee.new(identifier: paypal)
+  end
+end
+class PayerObj
   def id
     2
   end
 end
-class Payable
-  include ActivePayment::Models::Payable
 
+class PayableObj
   def id
     3
   end
@@ -59,6 +59,13 @@ class Payable
   def shipping
     20
   end
+
+  def to_payable
+    ActivePayment::Models::Payable.new(
+      amount: amount, reference: self,
+      description: description, reference_number: id,
+      tax: tax, shipping: shipping)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_payment
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Jeremy Marc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -167,9 +167,8 @@ files:
 - lib/active_payment/gateway.rb
 - lib/active_payment/gateways/paypal_adaptive_payment.rb
 - lib/active_payment/gateways/paypal_express_checkout.rb
-- lib/active_payment/models/concerns/payable.rb
-- lib/active_payment/models/concerns/payee.rb
-- lib/active_payment/models/concerns/payer.rb
+- lib/active_payment/models/payable.rb
+- lib/active_payment/models/payee.rb
 - lib/active_payment/models/sale.rb
 - lib/active_payment/models/sales.rb
 - lib/active_payment/version.rb
@@ -179,6 +178,8 @@ files:
 - spec/active_payment/gateway_spec.rb
 - spec/active_payment/gateways/paypal_adaptive_payment_spec.rb
 - spec/active_payment/gateways/paypal_express_checkout_spec.rb
+- spec/active_payment/models/payable_spec.rb
+- spec/active_payment/models/payee_spec.rb
 - spec/active_payment/models/sale_spec.rb
 - spec/active_payment/models/sales_spec.rb
 - spec/active_payment/models/transaction_spec.rb
@@ -253,6 +254,8 @@ test_files:
 - spec/active_payment/gateway_spec.rb
 - spec/active_payment/gateways/paypal_adaptive_payment_spec.rb
 - spec/active_payment/gateways/paypal_express_checkout_spec.rb
+- spec/active_payment/models/payable_spec.rb
+- spec/active_payment/models/payee_spec.rb
 - spec/active_payment/models/sale_spec.rb
 - spec/active_payment/models/sales_spec.rb
 - spec/active_payment/models/transaction_spec.rb

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

@@ -1,32 +0,0 @@
-module ActivePayment
-  module Models
-    module Payable
-      extend ActiveSupport::Concern
-
-      def to_paypal_hash
-        {
-          name: description,
-          amount: amount.to_i,
-          number: 1,
-          quantity: 1,
-        }
-      end
-
-      def shipping
-        shipping
-      end
-
-      def tax
-        tax
-      end
-
-      def reference
-        id
-      end
-
-      def description
-        description
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-module ActivePayment
-  module Models
-    module Payee
-      extend ActiveSupport::Concern
-
-      included do
-        if superclass == ActiveRecord::Base
-          has_many :received_transactions, foreign_key: 'payee_id', class_name: 'ActivePayment::Transaction'
-        end
-      end
-
-      def to_paypal_hash
-        {
-          email: paypal_identifier,
-          primary: false
-        }
-      end
-
-      def paypal_identifier
-        paypal
-      end
-
-      module ClassMethods
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module ActivePayment
-  module Models
-    module Payer
-      extend ActiveSupport::Concern
-
-      included do
-        if superclass == ActiveRecord::Base
-          has_many :sent_transactions, foreign_key: 'payer_id', class_name: 'ActivePayment::Transaction'
-        end
-      end
-    end
-  end
-end