killbill-paypal-express 4.1.7 → 5.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +34 -34
  3. data/Jarfile +10 -9
  4. data/Jarfile.lock +55 -52
  5. data/NEWS +3 -0
  6. data/README.md +3 -1
  7. data/VERSION +1 -1
  8. data/db/ddl.sql +4 -2
  9. data/db/migrate/20160326090325_add_indexes.rb +7 -0
  10. data/db/schema.rb +3 -0
  11. data/killbill-paypal-express.gemspec +1 -1
  12. data/lib/paypal_express/ext/active_merchant/active_merchant.rb +38 -0
  13. data/pom.xml +1 -1
  14. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5d031e15efa39c3006fbbe35460b9d461d1f2f19
4
- data.tar.gz: 78cd8ac061692599a104827d0eec76d35518bdcf
3
+ metadata.gz: d765db3a2813b2f3a9b7406027a484d10ea9e52f
4
+ data.tar.gz: 87064c5691db0b0e556d1e1213d434a0b57168d0
5
5
  SHA512:
6
- metadata.gz: 0541c0f2d1acfeecfccc2faaee8210f619a22e21dca2b3a0d52fef0abfae75cacb42f80b171ad9d21f179ee8e08097618b7f6371dec8d3b065b6873addfe811f
7
- data.tar.gz: 9528e14bd8965d3d397179ad772ec390a1826e6eb2e67f5c170e25e96d19023d923ae9c51e94cdaad5014ce3888d70dec588163469fc95947eb98e44bb30f174
6
+ metadata.gz: 4abb317a565c2c7cf4b95b4df2f44f5b53aa9a525fb23c97e67817c621d88a58e97155546b955c571d395dc69c4d824a05c7b379cb82d778209a34ef084fdc28
7
+ data.tar.gz: 290092a38ab0a72fe4882e524273ea86da9f02838d99714678a74479f64d71464ed142be83210035d84dbc8e6957d819f6c174ff3b232b7e8885bdb74638fe43
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- killbill-paypal-express (4.1.7)
4
+ killbill-paypal-express (5.0.0)
5
5
  actionpack (~> 4.1.0)
6
6
  actionview (~> 4.1.0)
7
7
  activemerchant (~> 1.53.0)
@@ -9,7 +9,7 @@ PATH
9
9
  activerecord-bogacs (~> 0.3)
10
10
  activerecord-jdbc-adapter (~> 1.3, < 1.5)
11
11
  jruby-openssl (~> 0.9.11)
12
- killbill (~> 7.0)
12
+ killbill (~> 8.0)
13
13
  monetize (~> 1.1.0)
14
14
  money (~> 6.5.1)
15
15
  offsite_payments (~> 2.1.0)
@@ -19,13 +19,13 @@ PATH
19
19
  GEM
20
20
  remote: https://rubygems.org/
21
21
  specs:
22
- actionpack (4.1.15)
23
- actionview (= 4.1.15)
24
- activesupport (= 4.1.15)
22
+ actionpack (4.1.16)
23
+ actionview (= 4.1.16)
24
+ activesupport (= 4.1.16)
25
25
  rack (~> 1.5.2)
26
26
  rack-test (~> 0.6.2)
27
- actionview (4.1.15)
28
- activesupport (= 4.1.15)
27
+ actionview (4.1.16)
28
+ activesupport (= 4.1.16)
29
29
  builder (~> 3.1)
30
30
  erubis (~> 2.7.0)
31
31
  active_utils (3.0.0)
@@ -36,17 +36,17 @@ GEM
36
36
  builder (>= 2.1.2, < 4.0.0)
37
37
  i18n (>= 0.6.9)
38
38
  nokogiri (~> 1.4)
39
- activemodel (4.1.15)
40
- activesupport (= 4.1.15)
39
+ activemodel (4.1.16)
40
+ activesupport (= 4.1.16)
41
41
  builder (~> 3.1)
42
- activerecord (4.1.15)
43
- activemodel (= 4.1.15)
44
- activesupport (= 4.1.15)
42
+ activerecord (4.1.16)
43
+ activemodel (= 4.1.16)
44
+ activesupport (= 4.1.16)
45
45
  arel (~> 5.0.0)
46
- activerecord-bogacs (0.4.1)
47
- activerecord-jdbc-adapter (1.3.20)
46
+ activerecord-bogacs (0.5.0)
47
+ activerecord-jdbc-adapter (1.3.21)
48
48
  activerecord (>= 2.2)
49
- activesupport (4.1.15)
49
+ activesupport (4.1.16)
50
50
  i18n (~> 0.6, >= 0.6.9)
51
51
  json (~> 1.7, >= 1.7.7)
52
52
  minitest (~> 5.1)
@@ -67,35 +67,35 @@ GEM
67
67
  diff-lcs (1.1.3)
68
68
  equalizer (0.0.11)
69
69
  erubis (2.7.0)
70
- ethon (0.9.0)
70
+ ethon (0.9.1)
71
71
  ffi (>= 1.3.0)
72
- ffi (1.9.10-java)
72
+ ffi (1.9.14-java)
73
73
  i18n (0.7.0)
74
- ice_nine (0.11.1)
75
- jar-dependencies (0.3.1)
76
- jbundler (0.9.2)
74
+ ice_nine (0.11.2)
75
+ jar-dependencies (0.3.4)
76
+ jbundler (0.9.3)
77
77
  bundler (~> 1.5)
78
- jar-dependencies (~> 0.2)
79
- maven-tools (~> 1.0.10)
80
- ruby-maven (~> 3.3, >= 3.3.3)
81
- jdbc-mariadb (1.2.3)
78
+ jar-dependencies (~> 0.3)
79
+ maven-tools (~> 1.1)
80
+ ruby-maven (~> 3.3, >= 3.3.8)
81
+ jdbc-mariadb (1.3.4)
82
82
  jdbc-postgres (9.4.1206)
83
83
  jdbc-sqlite3 (3.8.11.2)
84
- jruby-openssl (0.9.17-java)
84
+ jruby-openssl (0.9.18-java)
85
85
  json (1.8.3-java)
86
- killbill (7.0.5)
86
+ killbill (8.3.0)
87
87
  rack (>= 1.5.2)
88
88
  sinatra (~> 1.3.4)
89
89
  typhoeus (~> 0.6.9)
90
90
  tzinfo (~> 1.2.0)
91
- maven-tools (1.0.13)
91
+ maven-tools (1.1.6)
92
92
  virtus (~> 1.0)
93
- minitest (5.8.4)
93
+ minitest (5.9.1)
94
94
  monetize (1.1.0)
95
95
  money (~> 6.5.0)
96
96
  money (6.5.1)
97
97
  i18n (>= 0.6.4, <= 0.7.0)
98
- nokogiri (1.6.7.2-java)
98
+ nokogiri (1.6.8.1-java)
99
99
  offsite_payments (2.1.0)
100
100
  actionpack (>= 3.2.20, < 5.0.0)
101
101
  active_utils (~> 3.0.0)
@@ -109,7 +109,7 @@ GEM
109
109
  rack
110
110
  rack-test (0.6.3)
111
111
  rack (>= 1.0)
112
- rake (10.4.2)
112
+ rake (11.2.2)
113
113
  rspec (2.12.0)
114
114
  rspec-core (~> 2.12.0)
115
115
  rspec-expectations (~> 2.12.0)
@@ -118,11 +118,11 @@ GEM
118
118
  rspec-expectations (2.12.1)
119
119
  diff-lcs (~> 1.1.3)
120
120
  rspec-mocks (2.12.2)
121
- ruby-maven (3.3.8)
122
- ruby-maven-libs (~> 3.3.1)
123
- ruby-maven-libs (3.3.3)
121
+ ruby-maven (3.3.12)
122
+ ruby-maven-libs (~> 3.3.9)
123
+ ruby-maven-libs (3.3.9)
124
124
  rubyzip (1.2.0)
125
- selenium-webdriver (2.53.0)
125
+ selenium-webdriver (2.53.4)
126
126
  childprocess (~> 0.5)
127
127
  rubyzip (~> 1.0)
128
128
  websocket (~> 1.0)
data/Jarfile CHANGED
@@ -1,11 +1,12 @@
1
- jar 'org.kill-bill.billing:killbill-api', '0.32'
2
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
3
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
4
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
5
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
6
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
7
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
8
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
9
- jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
1
+ jar 'org.kill-bill.billing:killbill-api', '0.50'
2
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.23'
3
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.23'
4
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.23'
5
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
6
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
7
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
8
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
9
+ jar 'org.kill-bill.billing:killbill-util:tests', '0.18.0'
10
+ jar 'org.kill-bill.billing:killbill-util', '0.18.0'
10
11
  jar 'org.mockito:mockito-all', '1.10.19'
11
12
  jar 'javax.servlet:javax.servlet-api', '3.1.0'
data/Jarfile.lock CHANGED
@@ -1,63 +1,66 @@
1
1
  ---
2
2
  :runtime:
3
- - org.bouncycastle:bcprov-jdk15on:jar:1.50
4
- - org.bouncycastle:bcpkix-jdk15on:jar:1.50
5
- - org.apache.shiro:shiro-core:jar:1.2.3
3
+ - io.dropwizard.metrics:metrics-core:jar:3.1.1
6
4
  - joda-time:joda-time:jar:2.3
7
- - net.sf.ehcache:ehcache:jar:2.9.1
8
- - aopalliance:aopalliance:jar:1.0
9
- - com.google.code.findbugs:annotations:jar:3.0.0
5
+ - org.weakref:jmxutils:jar:1.18
6
+ - commons-beanutils:commons-beanutils:jar:1.8.3
7
+ - com.google.inject:guice:jar:3.0
10
8
  - org.osgi:org.osgi.core:jar:5.0.0
11
- - org.kill-bill.commons:killbill-concurrent:jar:0.11
12
- - org.slf4j:slf4j-api:jar:1.7.12
13
- - org.kill-bill.commons:killbill-xmlloader:jar:0.11
14
- - org.apache.shiro:shiro-guice:jar:1.2.3
15
- - org.slf4j:jcl-over-slf4j:jar:1.7.12
16
- - org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
17
- - org.apache.commons:commons-email:jar:1.2
9
+ - com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
10
+ - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
11
+ - org.kill-bill.billing:killbill-platform-api:jar:0.36.1
12
+ - com.samskivert:jmustache:jar:1.5
13
+ - org.kill-bill.commons:killbill-clock:jar:0.20
14
+ - org.kill-bill.billing:killbill-util:jar:0.18.0
15
+ - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
16
+ - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
17
+ - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
18
+ - com.h2database:h2:jar:1.4.186
19
+ - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
20
+ - javax.activation:activation:jar:1.1
21
+ - org.javassist:javassist:jar:3.19.0-GA
18
22
  - org.skife.config:config-magic:jar:0.14
23
+ - org.apache.commons:commons-email:jar:1.2
24
+ - org.mockito:mockito-all:jar:1.10.19
19
25
  - antlr:antlr:jar:2.7.7
26
+ - aopalliance:aopalliance:jar:1.0
27
+ - com.zaxxer:HikariCP-java6:jar:2.3.7
28
+ - org.slf4j:slf4j-api:jar:1.7.21
29
+ - com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
20
30
  - org.antlr:stringtemplate:jar:3.2.1
21
- - org.apache.shiro:shiro-ehcache:jar:1.2.3
22
- - org.joda:joda-money:jar:0.9
31
+ - org.slf4j:jcl-over-slf4j:jar:1.7.21
32
+ - javax.mail:mail:jar:1.4.1
33
+ - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
23
34
  - org.jdbi:jdbi:jar:2.62
24
- - com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
25
- - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
26
- - com.google.inject:guice:jar:3.0
27
- - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
28
- - com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
35
+ - com.fasterxml.jackson.core:jackson-core:jar:2.4.5
36
+ - org.bouncycastle:bcpkix-jdk15on:jar:1.54
29
37
  - org.apache.felix:org.apache.felix.framework:jar:4.4.1
30
- - org.kill-bill.billing:killbill-platform-osgi:jar:0.15
31
- - com.samskivert:jmustache:jar:1.5
32
- - org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
33
- - com.h2database:h2:jar:1.4.186
34
- - org.kill-bill.commons:killbill-clock:jar:0.11
35
- - org.kill-bill.billing:killbill-internal-api:jar:0.15.10
36
- - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
37
- - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
38
- - org.kill-bill.billing:killbill-platform-base:jar:0.15
39
- - com.fasterxml.jackson.core:jackson-core:jar:2.4.3
38
+ - org.joda:joda-money:jar:0.9
39
+ - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
40
+ - org.bouncycastle:bcprov-jdk15on:jar:1.54
41
+ - org.apache.shiro:shiro-core:jar:1.2.3
42
+ - org.kill-bill.billing:killbill-internal-api:jar:0.18.0
43
+ - org.kill-bill.billing:killbill-util:jar:tests:0.18.0
44
+ - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.23
45
+ - org.kill-bill.commons:killbill-jdbi:jar:0.20
40
46
  - com.google.guava:guava:jar:r09
41
- - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
42
- - org.kill-bill.billing:killbill-platform-api:jar:0.15
43
- - javax.mail:mail:jar:1.4.1
44
- - javax.activation:activation:jar:1.1
45
- - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
46
- - org.kill-bill.commons:killbill-locker:jar:0.11
47
- - io.dropwizard.metrics:metrics-core:jar:3.1.1
48
- - org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
49
- - org.weakref:jmxutils:jar:1.18
50
- - com.google.inject.extensions:guice-multibindings:jar:3.0
51
- - org.kill-bill.billing:killbill-util:jar:tests:0.15.10
52
- - javax.inject:javax.inject:jar:1
53
- - commons-beanutils:commons-beanutils:jar:1.8.3
54
- - org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
55
- - javax.servlet:javax.servlet-api:jar:3.1.0
56
- - org.kill-bill.billing:killbill-api:jar:0.32
57
- - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
58
- - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
59
- - org.kill-bill.commons:killbill-jdbi:jar:0.11
60
- - org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
61
- - org.mockito:mockito-all:jar:1.10.19
47
+ - org.kill-bill.commons:killbill-queue:jar:0.20
62
48
  - org.osgi:org.osgi.compendium:jar:5.0.0
63
- - org.kill-bill.commons:killbill-queue:jar:0.11
49
+ - org.kill-bill.commons:killbill-xmlloader:jar:0.20
50
+ - javax.servlet:javax.servlet-api:jar:3.1.0
51
+ - org.kill-bill.billing:killbill-platform-osgi:jar:0.36.1
52
+ - org.kill-bill.billing:killbill-platform-base:jar:0.36.1
53
+ - org.apache.shiro:shiro-ehcache:jar:1.2.3
54
+ - javax.inject:javax.inject:jar:1
55
+ - org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
56
+ - org.kill-bill.billing:killbill-api:jar:0.50
57
+ - org.kill-bill.billing:killbill-platform-osgi-api:jar:0.36.1
58
+ - com.google.inject.extensions:guice-multibindings:jar:3.0
59
+ - net.sf.ehcache:ehcache:jar:2.9.1
60
+ - org.kill-bill.commons:killbill-locker:jar:0.20
61
+ - org.kill-bill.commons:killbill-embeddeddb-common:jar:0.20
62
+ - org.apache.shiro:shiro-guice:jar:1.2.3
63
+ - org.kill-bill.commons:killbill-concurrent:jar:0.20
64
+ - org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.23
65
+ - org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.23
66
+ - com.google.code.findbugs:annotations:jar:3.0.0
data/NEWS CHANGED
@@ -1,3 +1,6 @@
1
+ 5.0.0
2
+ Initial release for Kill Bill 0.18.x
3
+
1
4
  4.1.7
2
5
  Update jruby-openssl to 0.9.17 (see jruby/jruby-openssl#94)
3
6
 
data/README.md CHANGED
@@ -5,14 +5,16 @@ Plugin to use [PayPal Express Checkout](https://www.paypal.com/webapps/mpp/expre
5
5
 
6
6
  Release builds are available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.kill-bill.billing.plugin.ruby%22%20AND%20a%3A%22paypal-express-plugin%22) with coordinates `org.kill-bill.billing.plugin.ruby:paypal-express-plugin`.
7
7
 
8
+ A full end-to-end integration demo is available [here](https://github.com/killbill/killbill-paypal-demo).
9
+
8
10
  Kill Bill compatibility
9
11
  -----------------------
10
12
 
11
13
  | Plugin version | Kill Bill version |
12
14
  | -------------: | ----------------: |
13
15
  | 2.x.y | 0.14.z |
14
- | 3.x.y | 0.15.z |
15
16
  | 4.x.y | 0.16.z |
17
+ | 5.x.y | 0.18.z |
16
18
 
17
19
  Requirements
18
20
  ------------
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.1.7
1
+ 5.0.0
data/db/ddl.sql CHANGED
@@ -48,7 +48,8 @@ CREATE TABLE `paypal_express_transactions` (
48
48
  `kb_account_id` varchar(255) NOT NULL,
49
49
  `kb_tenant_id` varchar(255) NOT NULL,
50
50
  PRIMARY KEY (`id`),
51
- KEY `index_paypal_express_transactions_on_kb_payment_id` (`kb_payment_id`)
51
+ KEY `index_paypal_express_transactions_on_kb_payment_id` (`kb_payment_id`),
52
+ KEY `idx_paypal_express_transactions_on_paypal_express_response_id` (`paypal_express_response_id`)
52
53
  ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
53
54
 
54
55
  CREATE TABLE `paypal_express_responses` (
@@ -112,5 +113,6 @@ CREATE TABLE `paypal_express_responses` (
112
113
  `updated_at` datetime NOT NULL,
113
114
  `kb_account_id` varchar(255) DEFAULT NULL,
114
115
  `kb_tenant_id` varchar(255) DEFAULT NULL,
115
- PRIMARY KEY (`id`)
116
+ PRIMARY KEY (`id`),
117
+ KEY `idx_paypal_express_responses_on_kb_payment_id_kb_tenant_id` (`kb_payment_id`, `kb_tenant_id`)
116
118
  ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
data/db/migrate/20160326090325_add_indexes.rb ADDED
@@ -0,0 +1,7 @@
1
+ class AddIndexes < ActiveRecord::Migration
2
+
3
+ def change
4
+ add_index(:paypal_express_transactions, :paypal_express_response_id, :name => 'idx_paypal_express_transactions_on_paypal_express_response_id')
5
+ add_index(:paypal_express_responses, [:kb_payment_id, :kb_tenant_id], :name => 'idx_paypal_express_responses_on_kb_payment_id_kb_tenant_id')
6
+ end
7
+ end
data/db/schema.rb CHANGED
@@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20151008153635) do
52
52
  end
53
53
 
54
54
  add_index(:paypal_express_transactions, :kb_payment_id)
55
+ add_index(:paypal_express_transactions, :paypal_express_response_id, :name => 'idx_paypal_express_transactions_on_paypal_express_response_id')
55
56
 
56
57
  create_table "paypal_express_responses", :force => true do |t|
57
58
  t.string "api_call", :null => false
@@ -114,4 +115,6 @@ ActiveRecord::Schema.define(:version => 20151008153635) do
114
115
  t.string "kb_account_id"
115
116
  t.string "kb_tenant_id"
116
117
  end
118
+
119
+ add_index(:paypal_express_responses, [:kb_payment_id, :kb_tenant_id], :name => 'idx_paypal_express_responses_on_kb_payment_id_kb_tenant_id')
117
120
  end
data/killbill-paypal-express.gemspec CHANGED
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
22
22
 
23
23
  s.rdoc_options << '--exclude' << '.'
24
24
 
25
- s.add_dependency 'killbill', '~> 7.0'
25
+ s.add_dependency 'killbill', '~> 8.0'
26
26
 
27
27
  s.add_dependency 'sinatra', '~> 1.3.4'
28
28
  s.add_dependency 'thread_safe', '~> 0.3.4'
data/lib/paypal_express/ext/active_merchant/active_merchant.rb CHANGED
@@ -1,5 +1,8 @@
1
1
  module ActiveMerchant #:nodoc:
2
2
  module Billing #:nodoc:
3
+
4
+ KB_PLUGIN_VERSION = Gem.loaded_specs['killbill-paypal-express'].version.version rescue nil
5
+
3
6
  module PaypalCommonAPI
4
7
 
5
8
  DUPLICATE_REQUEST_CODE = '11607'
@@ -33,6 +36,41 @@ module ActiveMerchant #:nodoc:
33
36
  xml.target!
34
37
  end
35
38
 
39
+ def commit(action, request)
40
+ response = parse(action, ssl_post(endpoint_url, build_request(request), build_headers))
41
+
42
+ build_response(successful?(response), message_from(response), response,
43
+ :test => test?,
44
+ :authorization => authorization_from(response),
45
+ :fraud_review => fraud_review?(response),
46
+ :avs_result => {:code => response[:avs_code]},
47
+ :cvv_result => response[:cvv2_code])
48
+ end
49
+
50
+ def build_headers
51
+ x_r_id = x_request_id
52
+
53
+ headers = (@options[:headers] || {}).dup
54
+ headers['Content-Type'] ||= 'text/xml'
55
+ headers['User-Agent'] ||= user_agent
56
+ headers['X-Request-Id'] ||= x_r_id unless x_r_id.blank?
57
+ headers
58
+ end
59
+
60
+ def user_agent
61
+ @@ua ||= JSON.dump({
62
+ :bindings_version => KB_PLUGIN_VERSION,
63
+ :lang => 'ruby',
64
+ :lang_version => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
65
+ :platform => RUBY_PLATFORM,
66
+ :publisher => 'killbill'
67
+ })
68
+ end
69
+
70
+ def x_request_id
71
+ # See KillbillMDCInsertingServletFilter
72
+ org::slf4j::MDC::get('req.requestId') rescue nil
73
+ end
36
74
  end
37
75
  end
38
76
  end
data/pom.xml CHANGED
@@ -26,7 +26,7 @@
26
26
  <groupId>org.kill-bill.billing.plugin.ruby</groupId>
27
27
  <artifactId>paypal-express-plugin</artifactId>
28
28
  <packaging>pom</packaging>
29
- <version>4.1.7</version>
29
+ <version>5.0.0</version>
30
30
  <name>paypal-express-plugin</name>
31
31
  <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
32
32
  <description>Plugin for accessing Paypal Express Checkout as a payment gateway</description>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill-paypal-express
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.7
4
+ version: 5.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kill Bill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-13 00:00:00.000000000 Z
11
+ date: 2016-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: killbill
@@ -16,12 +16,12 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: '7.0'
19
+ version: '8.0'
20
20
  requirement: !ruby/object:Gem::Requirement
21
21
  requirements:
22
22
  - - ~>
23
23
  - !ruby/object:Gem::Version
24
- version: '7.0'
24
+ version: '8.0'
25
25
  prerelease: false
26
26
  type: :runtime
27
27
  - !ruby/object:Gem::Dependency
@@ -316,6 +316,7 @@ files:
316
316
  - VERSION
317
317
  - config.ru
318
318
  - db/ddl.sql
319
+ - db/migrate/20160326090325_add_indexes.rb
319
320
  - db/migrate/20160828090851_enlarge_message.rb
320
321
  - db/schema.rb
321
322
  - killbill-paypal-express.gemspec