lolita-paypal 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb78f556fc597ed2399437d646979f307d8e13fd
-  data.tar.gz: 1aa48572ad554388d073642fc9b33ee47555762b
+  metadata.gz: f72f68aa9c08f40b7d7b96b912d234a52d04ec2b
+  data.tar.gz: 39d596dd0d33b3deafd44d1e1ade59636d6f45fc
 SHA512:
-  metadata.gz: 1d78cd37db7fee1223cef26cc2c923bd9345ae3970b7dd91d0e6e84950aeefface11a0e42f6d6d666cfec0575cb67849752e330665ed524ce26f74509f3c7893
-  data.tar.gz: 55542a331afb0af45014145b65debf01db2b5b2ccfe359009ffbaf3323d552f88ad502bc0e6963125be0ab7709ed9b97f7481ba860a4e70e063a675681ea7456
+  metadata.gz: 3bc0c193eb33638d9886b1ed27f768e7de57af21c7e91e34f9ace4b54bf9235a0128ba5d61dbd6a7e6c2803358119c588807c3b543017a2fdc9133c03600094d
+  data.tar.gz: 3cf02a76d8a93ddf587a17d55424258fe85202ab72f327b6fc04aead833bde50addd688552c71b5fd1e0dd35b7b151900bea8f7e901c61df735a2018272d603f

data/app/controllers/lolita_paypal/transactions_controller.rb

@@ -43,7 +43,7 @@ module LolitaPaypal
     def payment_from_ipn
       if subject = params['custom'] || params['cm']
         klass, id = subject.split('___')
-        payment = klass.constantize.find(id)
+        payment = klass.camelize.constantize.find(id)
       end
     end
 

data/app/controllers/lolita_paypal/transactions_controller.rb~

@@ -0,0 +1,74 @@
+module LolitaPaypal
+  class TransactionsController < LolitaPaypal::ApplicationController
+    protect_from_forgery except: :answer
+    before_filter :is_ssl_required
+    before_filter :set_active_payment, :check_valid_payment, only: :checkout
+
+    include ActiveMerchant::Billing::Integrations
+
+    # renders form with encrypted data and redirects to Paypal web interface
+    def checkout
+      @payment_request = LolitaPaypal::Request.new(@payment)
+      render 'lolita_paypal/payment_form'
+    ensure
+      LolitaPaypal.logger.info("[#{session_id}][#{@payment.id}][checkout]")
+    end
+
+    # process ipn request
+    # POST is sent from paypal and will create transaction
+    # GET is a redirect from paypal and will redirect back to return_path
+    def answer
+      if request.post?
+        if ipn_notify.acknowledge
+          LolitaPaypal::Transaction.create_transaction(ipn_notify, payment_from_ipn, request)
+        end
+        render nothing: true
+      else
+        if payment_from_ipn
+          redirect_to payment_from_ipn.paypal_return_path
+        else
+          render text: I18n.t('lolita_paypal.wrong_request'), status: 400
+        end
+      end
+    ensure
+      LolitaPaypal.logger.info("[#{session_id}][#{payment_from_ipn && payment_from_ipn.id}][answer] #{params}")
+    end
+
+    private
+
+    def ipn_notify
+      @ipn_notify ||= Paypal::Notification.new(request.raw_post)
+    end
+
+    def payment_from_ipn
+      if subject = params['custom'] || params['cm']
+        klass, id = subject.split('___')
+        payment = klass.constantize.find(id)
+      end
+    end
+
+    # returns current payment instance from session
+    def set_active_payment
+      @payment ||= session[:payment_data][:billing_class].constantize.find(session[:payment_data][:billing_id])
+    rescue
+      render text: I18n.t('lolita_paypal.wrong_request'), status: 400
+    end
+
+    # payment should not be paid
+    def check_valid_payment
+      if @payment.paid?
+        render text: I18n.t('lolita_paypal.wrong_request'), status: 400
+      end
+    end
+
+    # forces SSL in production mode if availab:le
+    def is_ssl_required
+      ssl_required(:answer, :checkout) if defined?(ssl_required)
+    end
+
+
+    def session_id
+      request.session_options[:id]
+    end
+  end
+end

data/app/models/lolita_paypal/transaction.rb

@@ -1,49 +1,49 @@
-require "ipaddr"
-# Available statuses
-# -----------------
-# Canceled-Reversal
-# Completed
-# Denied
-# Expired
-# Failed
-# In-Progress
-# Partially-Refunded
-# Pending
-# Processed
-# Refunded
-# Reversed
-# Voided
-module LolitaPaypal
-  class Transaction < ActiveRecord::Base
-    self.table_name = "paypal_transactions"
-    belongs_to :paymentable, polymorphic: true
-    after_save :touch_paymentable
-    default_scope -> { order(:id) }
-    validates_associated :paymentable
-
-    def ip
-      IPAddr.new(self[:ip].to_i, Socket::AF_INET).to_s
-    end
-
-    def ip=(x)
-      self[:ip] = IPAddr.new(x).to_i
-    end
-
-    # add new transaction after IPN response
-    def self.create_transaction notify, payment, request
-      self.create!(
-        transaction_id: notify.transaction_id,
-        status: notify.status,
-        paymentable: payment,
-        ip: request.remote_ip
-      )
-    end
-
-    private
-
-    # trigger "paypal_trx_saved" on our paymentable model
-    def touch_paymentable
-      paymentable.paypal_trx_saved(self)
-    end
-  end
-end
+require "ipaddr"
+# Available statuses
+# -----------------
+# Canceled-Reversal
+# Completed
+# Denied
+# Expired
+# Failed
+# In-Progress
+# Partially-Refunded
+# Pending
+# Processed
+# Refunded
+# Reversed
+# Voided
+module LolitaPaypal
+  class Transaction < ActiveRecord::Base
+    self.table_name = "paypal_transactions"
+    belongs_to :paymentable, polymorphic: true
+    after_save :touch_paymentable
+    default_scope -> { order(:id) }
+    validates_associated :paymentable
+
+    def ip
+      IPAddr.new(self[:ip].to_i, Socket::AF_INET).to_s
+    end
+
+    def ip=(x)
+      self[:ip] = IPAddr.new(x).to_i
+    end
+
+    # add new transaction after IPN response
+    def self.create_transaction notify, payment, request
+      self.create!(
+        transaction_id: notify.transaction_id,
+        status: notify.status,
+        paymentable: payment,
+        ip: request.remote_ip
+      )
+    end
+
+    private
+
+    # trigger "paypal_trx_saved" on our paymentable model
+    def touch_paymentable
+      paymentable.paypal_trx_saved(self)
+    end
+  end
+end

data/config/routes.rb

@@ -1,5 +1,5 @@
-Rails.application.routes.draw do
-  get "/paypal/checkout" => "lolita_paypal/transactions#checkout", as: "checkout_paypal"
-  get "/paypal/answer" => "lolita_paypal/transactions#answer", as: "answer_paypal"
-  post "/paypal/answer" => "lolita_paypal/transactions#answer"
-end
+Rails.application.routes.draw do
+  get "/paypal/checkout" => "lolita_paypal/transactions#checkout", as: "checkout_paypal"
+  get "/paypal/answer" => "lolita_paypal/transactions#answer", as: "answer_paypal"
+  post "/paypal/answer" => "lolita_paypal/transactions#answer"
+end

data/lib/generators/lolita_paypal/USAGE

@@ -1,4 +1,4 @@
-Run
-=============
-
-rails generate lolita_paypal
+Run
+=============
+
+rails generate lolita_paypal

data/lib/generators/lolita_paypal/lolita_paypal_generator.rb

@@ -1,12 +1,12 @@
-class LolitaPaypalGenerator < Rails::Generator::Base
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if @args.first == "help"
-  end
-
-  def manifest
-    record do |m|
-      m.migration_template "paypal_transactions.erb", "db/migrate", :migration_file_name => "create_paypal_transactions"
-    end
-  end
-end
+class LolitaPaypalGenerator < Rails::Generator::Base
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if @args.first == "help"
+  end
+
+  def manifest
+    record do |m|
+      m.migration_template "paypal_transactions.erb", "db/migrate", :migration_file_name => "create_paypal_transactions"
+    end
+  end
+end

data/lib/generators/lolita_paypal/templates/paypal_transactions.erb

@@ -1,17 +1,17 @@
-class CreatePaypalTransactions < ActiveRecord::Migration
-  def self.up
-    create_table :paypal_transactions do |t|
-      t.string   :transaction_id
-      t.string   :status
-      t.references :paymentable, polymorphic: true
-      t.string   :ip
-      t.timestamps
-    end
-    add_index :paypal_transactions, :status
-    add_index :paypal_transactions, [:paymentable_type, :paymentable_id]
-  end
-
-  def self.down
-    drop_table :paypal_transactions
-  end
-end
+class CreatePaypalTransactions < ActiveRecord::Migration
+  def self.up
+    create_table :paypal_transactions do |t|
+      t.string   :transaction_id
+      t.string   :status
+      t.references :paymentable, polymorphic: true
+      t.string   :ip
+      t.timestamps
+    end
+    add_index :paypal_transactions, :status
+    add_index :paypal_transactions, [:paymentable_type, :paymentable_id]
+  end
+
+  def self.down
+    drop_table :paypal_transactions
+  end
+end

data/lib/lolita-paypal/billing.rb

@@ -1,74 +1,74 @@
-module LolitaPaypal
-  module Billing
-    def self.included(base)
-      base.has_many :paypal_transactions, as: :paymentable, class_name: 'LolitaPaypal::Transaction', dependent: :destroy
-      base.class_eval do
-
-        # Payment description
-        def description
-          raise 'Redefine this method in your billing model.'
-        end
-
-        # Price of payment in cents
-        def price
-          raise 'Redefine this method in your billing model.'
-        end
-
-        # Currency as 3 letter code as in ISO 4217
-        def currency
-          raise 'Redefine this method in your billing model.'
-        end
-
-        def paypal_trx_saved trx
-          raise 'Redefine this method in your billing model.'
-        end
-
-        # Paypal will redirect to this path after payment
-        def paypal_return_path
-          raise 'Redefine this method in your billing model.'
-        end
-
-        # To pass any extra parameter to paypal, redefine 'paypal_request_variables'
-        # with any of these keys. Keys business, item_name, amount, currency_code - already are added.
-        #+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-        #| business      | Email address on your PayPal account                                                                                                                                                              |
-        #| quantity      | Number of items. This will multiply the amount if greater than one                                                                                                                                |
-        #| item_name     | Name of the item (or a name for the shopping cart). Must be alpha-numeric, with a 127character limit                                                                                              |
-        #| item_number   | Optional pass-through variable for you to track payments. Must be alpha-numeric, with a 127 character limit                                                                                       |
-        #| amount        | Price of the item (the total price of all items in the shopping cart)                                                                                                                             |
-        #| shipping      | The cost of shipping the item                                                                                                                                                                     |
-        #| shipping2     | The cost of shipping each additional item                                                                                                                                                         |
-        #| handling      | The cost of handling                                                                                                                                                                              |
-        #| tax           | Transaction-based tax value. If present, the value passed here will override any profile tax settings you may have (regardless of the buyer's location).                                          |
-        #| no_shipping   | Shipping address. If set to "1," your customer will not be asked for a shipping address. This is optional; if omitted or set to "0," your customer will be prompted to include a shipping address |
-        #| cn            | Optional label that will appear above the note field (maximum 40 characters)                                                                                                                      |
-        #| no_note       | Including a note with payment. If set to "1," your customer will not be prompted to include a note. This is optional; if omitted or set to "0," your customer will be prompted to include a note. |
-        #| on0           | First option field name. 64 character limit                                                                                                                                                       |
-        #| os0           | First set of option value(s). 200 character limit. "on0" must be defined for "os0" to be recognized.                                                                                              |
-        #| on1           | Second option field name. 64 character limit                                                                                                                                                      |
-        #| os1           | Second set of option value(s). 200 character limit. "on1" must be defined for "os1" to be recognized.                                                                                             |
-        #| custom        | Optional pass-through variable that will never be presented to your customer. Can be used to track inventory                                                                                      |
-        #| invoice       | Optional pass-through variable that will never be presented to your customer. Can be used to track invoice numbers                                                                                |
-        #| notify_url    | Only used with IPN. An internet URL where IPN form posts will be sent                                                                                                                             |
-        #| return        | An internet URL where your customer will be returned after completing payment                                                                                                                     |
-        #| cancel_return | An internet URL where your customer will be returned after cancelling payment                                                                                                                     |
-        #| image_url     | The internet URL of the 150 X 50 pixel image you would like to use as your logo                                                                                                                   |
-        #| cs            | Sets the background color of your payment pages. If set to "1," the background color will be black. This is optional; if omitted or set to "0," the background color will be white                |
-        #+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-        # more info at https://www.paypal.com/cgi-bin/webscr?cmd=p/pdn/howto_checkout-outside
-        def paypal_request_variables
-          {}
-        end
-
-        # Add this to your paid? method along with other payment methods
-        # Example:
-        #     def paid?
-        #       paypal_paid? || first_data_paid?
-        #     end
-        def paypal_paid?
-          self.paypal_transactions.where(status: 'Completed').count >= 1
-        end
-      end
-    end
-  end
-end
+module LolitaPaypal
+  module Billing
+    def self.included(base)
+      base.has_many :paypal_transactions, as: :paymentable, class_name: 'LolitaPaypal::Transaction', dependent: :destroy
+      base.class_eval do
+
+        # Payment description
+        def description
+          raise 'Redefine this method in your billing model.'
+        end
+
+        # Price of payment in cents
+        def price
+          raise 'Redefine this method in your billing model.'
+        end
+
+        # Currency as 3 letter code as in ISO 4217
+        def currency
+          raise 'Redefine this method in your billing model.'
+        end
+
+        def paypal_trx_saved trx
+          raise 'Redefine this method in your billing model.'
+        end
+
+        # Paypal will redirect to this path after payment
+        def paypal_return_path
+          raise 'Redefine this method in your billing model.'
+        end
+
+        # To pass any extra parameter to paypal, redefine 'paypal_request_variables'
+        # with any of these keys. Keys business, item_name, amount, currency_code - already are added.
+        #+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+        #| business      | Email address on your PayPal account                                                                                                                                                              |
+        #| quantity      | Number of items. This will multiply the amount if greater than one                                                                                                                                |
+        #| item_name     | Name of the item (or a name for the shopping cart). Must be alpha-numeric, with a 127character limit                                                                                              |
+        #| item_number   | Optional pass-through variable for you to track payments. Must be alpha-numeric, with a 127 character limit                                                                                       |
+        #| amount        | Price of the item (the total price of all items in the shopping cart)                                                                                                                             |
+        #| shipping      | The cost of shipping the item                                                                                                                                                                     |
+        #| shipping2     | The cost of shipping each additional item                                                                                                                                                         |
+        #| handling      | The cost of handling                                                                                                                                                                              |
+        #| tax           | Transaction-based tax value. If present, the value passed here will override any profile tax settings you may have (regardless of the buyer's location).                                          |
+        #| no_shipping   | Shipping address. If set to "1," your customer will not be asked for a shipping address. This is optional; if omitted or set to "0," your customer will be prompted to include a shipping address |
+        #| cn            | Optional label that will appear above the note field (maximum 40 characters)                                                                                                                      |
+        #| no_note       | Including a note with payment. If set to "1," your customer will not be prompted to include a note. This is optional; if omitted or set to "0," your customer will be prompted to include a note. |
+        #| on0           | First option field name. 64 character limit                                                                                                                                                       |
+        #| os0           | First set of option value(s). 200 character limit. "on0" must be defined for "os0" to be recognized.                                                                                              |
+        #| on1           | Second option field name. 64 character limit                                                                                                                                                      |
+        #| os1           | Second set of option value(s). 200 character limit. "on1" must be defined for "os1" to be recognized.                                                                                             |
+        #| custom        | Optional pass-through variable that will never be presented to your customer. Can be used to track inventory                                                                                      |
+        #| invoice       | Optional pass-through variable that will never be presented to your customer. Can be used to track invoice numbers                                                                                |
+        #| notify_url    | Only used with IPN. An internet URL where IPN form posts will be sent                                                                                                                             |
+        #| return        | An internet URL where your customer will be returned after completing payment                                                                                                                     |
+        #| cancel_return | An internet URL where your customer will be returned after cancelling payment                                                                                                                     |
+        #| image_url     | The internet URL of the 150 X 50 pixel image you would like to use as your logo                                                                                                                   |
+        #| cs            | Sets the background color of your payment pages. If set to "1," the background color will be black. This is optional; if omitted or set to "0," the background color will be white                |
+        #+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+        # more info at https://www.paypal.com/cgi-bin/webscr?cmd=p/pdn/howto_checkout-outside
+        def paypal_request_variables
+          {}
+        end
+
+        # Add this to your paid? method along with other payment methods
+        # Example:
+        #     def paid?
+        #       paypal_paid? || first_data_paid?
+        #     end
+        def paypal_paid?
+          self.paypal_transactions.where(status: 'Completed').count >= 1
+        end
+      end
+    end
+  end
+end

data/lib/lolita-paypal/request.rb

@@ -30,7 +30,7 @@ module LolitaPaypal
         'cmd' => '_xclick',
         'business' =>  LolitaPaypal.account_name,
         'item_name' => payment.description,
-        'custom' =>"#{payment.class}___#{payment_id}",
+        'custom' =>"#{payment.class.to_s.underscore}___#{payment_id}",
         'amount' => amount(payment.price),
         'currency_code' => payment.currency,
         'no_note' => '1',

data/lib/lolita-paypal/request.rb~

@@ -0,0 +1,42 @@
+module LolitaPaypal
+
+  class Request
+    attr_reader :payment
+
+    def initialize(payment = nil)
+      @payment = payment
+    end
+
+    def self.encrypt_for_paypal(values)
+      signed = OpenSSL::PKCS7::sign(OpenSSL::X509::Certificate.new(LolitaPaypal.app_cert_pem), OpenSSL::PKey::RSA.new(LolitaPaypal.app_key_pem, ''), values.map { |k, v| "#{k}=#{v}" }.join("\n"), [], OpenSSL::PKCS7::BINARY)
+      OpenSSL::PKCS7::encrypt([OpenSSL::X509::Certificate.new(LolitaPaypal.paypal_cert_pem)], signed.to_der, OpenSSL::Cipher::Cipher::new('DES3'), OpenSSL::PKCS7::BINARY).to_s.gsub("\n", "")
+    end
+
+    def amount(money)
+      cents = money.respond_to?(:cents) ? money.cents : money
+      if money.nil? || cents.to_i <= 0
+        raise ArgumentError, 'money amount must be either a Money object or a positive integer in cents.'
+      end
+      sprintf("%.2f", cents.to_f / 100)
+    end
+
+    def payment_id
+      payment.id
+    end
+
+    def request_variables
+      {
+        'cert_id' => LolitaPaypal.cert_id,
+        'cmd' => '_xclick',
+        'business' =>  LolitaPaypal.account_name,
+        'item_name' => payment.description,
+        'custom' =>"#{payment.class}___#{payment_id}",
+        'amount' => amount(payment.price),
+        'currency_code' => payment.currency,
+        'no_note' => '1',
+        'no_shipping' => '1',
+        'return' => payment.paypal_return_path
+      }.merge(payment.paypal_request_variables)
+    end
+  end
+end

data/lib/lolita-paypal/version.rb

@@ -1,3 +1,3 @@
 module LolitaPaypal
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/lolita-paypal/version.rb~

@@ -0,0 +1,3 @@
+module LolitaPaypal
+  VERSION = "1.0.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolita-paypal
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ITHouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,6 +154,7 @@ files:
 - Rakefile
 - app/controllers/lolita_paypal/application_controller.rb
 - app/controllers/lolita_paypal/transactions_controller.rb
+- app/controllers/lolita_paypal/transactions_controller.rb~
 - app/helpers/lolita_paypal/application_helper.rb
 - app/models/lolita_paypal/transaction.rb
 - app/views/lolita_paypal/payment_form.html.erb
@@ -168,7 +169,9 @@ files:
 - lib/lolita-paypal/custom_logger.rb
 - lib/lolita-paypal/engine.rb
 - lib/lolita-paypal/request.rb
+- lib/lolita-paypal/request.rb~
 - lib/lolita-paypal/version.rb
+- lib/lolita-paypal/version.rb~
 homepage: http://github.com/ithouse/lolita-paypal
 licenses: []
 metadata: {}
@@ -188,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Paypal payment plugin for Lolita