killbill-paypal-express 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17589cd77e3eb4561552951c616884d665cd5bda
-  data.tar.gz: 6f11a7b31df102eb8696f99607240381ab24eb3b
+  metadata.gz: 568f7f5e8488231a8c9f89f58736dc52f97ce34b
+  data.tar.gz: ba8138f1f45b8c38826b9b21e3b6416ec7ae10cb
 SHA512:
-  metadata.gz: f2ce7bd97592b90118b21212776bce68a03a2c3e4c4b5b1e097a1dc869809902b4e5e305fcc2c0993a0e53a5d88c2fe99e76e4447684efc973c54d2724d71406
-  data.tar.gz: 34662f20c165c48a3e6cc6321f74159ab681eb30e3936083cfad95e5767cdda8e6ff601ef0c7b5bc4b0579e33d73437c8a2f14bcdd02b7a336b36eedf2305235
+  metadata.gz: b5b94c246cd3915f1b307777a335dc969d1a94ef66229474c3a5183bb92b545011a34fa1bdbdd8525efa6f77bdea7586fd10fec19b1c9daeb7d223d3c3a592fb
+  data.tar.gz: 2d7adf5bbdc39e6726e9f6923213721a1c73ad2667a6e0e7e8a383114fc825c4e5f76683e7ce38ea1fd4abd0740723ac93b3688efc9d87350f0b9900fde9ece4

data/.gitignore

@@ -27,13 +27,10 @@ Gemfile.lock
 # Build directory
 killbill-paypal-express/
 
-# Config file
-paypal_express.yml
-
 # Testing database
 test.db
 
 target
 pom.xml.asc
 
-.idea
+.idea/

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec

data/Jarfile

@@ -1,6 +1,8 @@
-jar 'org.kill-bill.billing:killbill-api', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.6.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.6.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.6.4'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.9.1'
+jar 'org.kill-bill.billing:killbill-api', '0.9.8'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.7.4'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.3'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/LICENSE

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 The Billing Project, LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -72,7 +72,7 @@ Configuration
 The plugin expects a `paypal_express.yml` configuration file containing the following:
 
 ```
-:paypal:
+:paypal_express:
   :signature: 'your-paypal-signature'
   :login: 'your-username-facilitator.something.com'
   :password: 'your-password'

data/Rakefile

@@ -7,14 +7,14 @@ Bundler::GemHelper.install_tasks
 # Install test tasks
 require 'rspec/core/rake_task'
 namespace :test do
-  desc "Run RSpec tests"
+  desc 'Run RSpec tests'
   RSpec::Core::RakeTask.new do |task|
     task.name = 'spec'
     task.pattern = './spec/*/*_spec.rb'
   end
 
   namespace :remote do
-    desc "Run RSpec remote tests"
+    desc 'Run RSpec remote tests'
     RSpec::Core::RakeTask.new do |task|
       task.name = 'spec'
       task.pattern = './spec/*/remote/*_spec.rb'

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/config.ru

@@ -1,4 +1,4 @@
 require 'paypal_express'
-require 'paypal_express/config/application'
+require 'paypal_express/application'
 
 run Sinatra::Application

data/db/ddl.sql

@@ -1,13 +1,32 @@
 CREATE TABLE `paypal_express_payment_methods` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_account_id` varchar(255) NOT NULL,
   `kb_payment_method_id` varchar(255) DEFAULT NULL,
   `paypal_express_payer_id` varchar(255) DEFAULT NULL,
-  `paypal_express_baid` varchar(255) DEFAULT NULL,
   `paypal_express_token` varchar(255) NOT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  `cc_first_name` varchar(255) DEFAULT NULL,
+  `cc_last_name` varchar(255) DEFAULT NULL,
+  `cc_type` varchar(255) DEFAULT NULL,
+  `cc_exp_month` int(11) DEFAULT NULL,
+  `cc_exp_year` int(11) DEFAULT NULL,
+  `cc_number` int(11) DEFAULT NULL,
+  `cc_last_4` int(11) DEFAULT NULL,
+  `cc_start_month` varchar(255) DEFAULT NULL,
+  `cc_start_year` varchar(255) DEFAULT NULL,
+  `cc_issue_number` varchar(255) DEFAULT NULL,
+  `cc_verification_value` varchar(255) DEFAULT NULL,
+  `cc_track_data` varchar(255) DEFAULT NULL,
+  `address1` varchar(255) DEFAULT NULL,
+  `address2` varchar(255) DEFAULT NULL,
+  `city` varchar(255) DEFAULT NULL,
+  `state` varchar(255) DEFAULT NULL,
+  `zip` varchar(255) DEFAULT NULL,
+  `country` varchar(255) DEFAULT NULL,
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `index_paypal_express_payment_methods_on_kb_account_id` (`kb_account_id`),
   KEY `index_paypal_express_payment_methods_on_kb_payment_method_id` (`kb_payment_method_id`)
@@ -18,11 +37,16 @@ CREATE TABLE `paypal_express_transactions` (
   `paypal_express_response_id` int(11) NOT NULL,
   `api_call` varchar(255) NOT NULL,
   `kb_payment_id` varchar(255) NOT NULL,
-  `paypal_express_txn_id` varchar(255) NOT NULL,
-  `amount_in_cents` int(11) NOT NULL,
-  `currency` char(3) NOT NULL,
+  `kb_payment_transaction_id` varchar(255) NOT NULL,
+  `transaction_type` varchar(255) NOT NULL,
+  `payment_processor_account_id` varchar(255) DEFAULT NULL,
+  `txn_id` varchar(255) DEFAULT NULL,
+  `amount_in_cents` int(11) DEFAULT NULL,
+  `currency` varchar(255) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) NOT NULL,
+  `kb_tenant_id` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `index_paypal_express_transactions_on_kb_payment_id` (`kb_payment_id`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
@@ -31,6 +55,9 @@ CREATE TABLE `paypal_express_responses` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `api_call` varchar(255) NOT NULL,
   `kb_payment_id` varchar(255) DEFAULT NULL,
+  `kb_payment_transaction_id` varchar(255) DEFAULT NULL,
+  `transaction_type` varchar(255) DEFAULT NULL,
+  `payment_processor_account_id` varchar(255) DEFAULT NULL,
   `message` varchar(255) DEFAULT NULL,
   `authorization` varchar(255) DEFAULT NULL,
   `fraud_review` tinyint(1) DEFAULT NULL,
@@ -83,6 +110,7 @@ CREATE TABLE `paypal_express_responses` (
   `success` tinyint(1) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `index_paypal_express_responses_on_token_and_api_call` (`token`, `api_call`)
+  `kb_account_id` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

data/db/schema.rb

@@ -1,36 +1,64 @@
 require 'active_record'
 
-ActiveRecord::Schema.define(:version => 20130311153635) do
+ActiveRecord::Schema.define(:version => 20140410153635) do
   create_table "paypal_express_payment_methods", :force => true do |t|
-    t.string   "kb_account_id",           :null => false
-    t.string   "kb_payment_method_id"     # NULL before Killbill knows about it
+    t.string   "kb_payment_method_id"     # NULL before Kill Bill knows about it
     t.string   "paypal_express_payer_id"  # NULL before the express checkout is completed
-    t.string   "paypal_express_baid"      # NULL before the express checkout is completed
     t.string   "paypal_express_token",    :null => false, :unique => true
-    t.boolean  "is_deleted",              :null => false, :default => false
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
+    t.string   "token"                    # paypal-express baid, NULL before the express checkout is completed
+    t.string   "cc_first_name"
+    t.string   "cc_last_name"
+    t.string   "cc_type"
+    t.integer  "cc_exp_month"
+    t.integer  "cc_exp_year"
+    t.integer  "cc_number"
+    t.integer  "cc_last_4"
+    t.integer  "cc_start_month"
+    t.integer  "cc_start_year"
+    t.integer  "cc_issue_number"
+    t.integer  "cc_verification_value"
+    t.integer  "cc_track_data"
+    t.string   "address1"
+    t.string   "address2"
+    t.string   "city"
+    t.string   "state"
+    t.string   "zip"
+    t.string   "country"
+    t.boolean  "is_deleted",               :null => false, :default => false
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+    t.string   "kb_account_id"
+    t.string   "kb_tenant_id"
   end
 
   add_index(:paypal_express_payment_methods, :kb_account_id)
   add_index(:paypal_express_payment_methods, :kb_payment_method_id)
 
   create_table "paypal_express_transactions", :force => true do |t|
-    t.integer  "paypal_express_response_id", :null => false
-    t.string   "api_call",                   :null => false
-    t.string   "kb_payment_id",              :null => false
-    t.string   "paypal_express_txn_id",      :null => false
-    t.integer  "amount_in_cents",            :null => false
-    t.string  "currency",                    :null => false
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.integer  "paypal_express_response_id",  :null => false
+    t.string   "api_call",                       :null => false
+    t.string   "kb_payment_id",                  :null => false
+    t.string   "kb_payment_transaction_id",      :null => false
+    t.string   "transaction_type",               :null => false
+    t.string   "payment_processor_account_id"
+    t.string   "txn_id"                          # paypal-express transaction id
+    # Both null for void
+    t.integer  "amount_in_cents"
+    t.string   "currency"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "kb_account_id",                  :null => false
+    t.string   "kb_tenant_id",                   :null => false
   end
 
   add_index(:paypal_express_transactions, :kb_payment_id)
 
   create_table "paypal_express_responses", :force => true do |t|
-    t.string   "api_call",        :null => false
+    t.string   "api_call",          :null => false
     t.string   "kb_payment_id"
+    t.string   "kb_payment_transaction_id"
+    t.string   "transaction_type"
+    t.string   "payment_processor_account_id"
     t.string   "message"
     t.string   "authorization"
     t.boolean  "fraud_review"
@@ -83,7 +111,7 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.boolean  "success"
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
+    t.string   "kb_account_id"
+    t.string   "kb_tenant_id"
   end
-
-  add_index(:paypal_express_responses, [:token, :api_call])
 end