killbill 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b31bab8d27ebb9b8c3db3a90679c41bdccc8503
-  data.tar.gz: 69c4ff0995b68063b3cd424c19ead1c5a918bf26
+  metadata.gz: ab94851c0a209b9e30898e32f1836bdc230e4a0c
+  data.tar.gz: 61e64d8b6b4c8d57d6cd6563360d357667290f49
 SHA512:
-  metadata.gz: e11d3d7fa11e6c45f8b5c7d325f55f891dcac8ba71dbff26e1a3fab7c2d7313e9982478917675929eb20d4f83a66ecd1cab3bc6ac9a7c3ccef1c68ffe0758e59
-  data.tar.gz: 25274635b4306545df67c42a63245e31d15de9fa77c4261359ddcc1df23d3c1b025bb87e4a23648048888020099c018e087d36b312b35c9c56c959679ac4fb8b
+  metadata.gz: 53b4b231ff542655d1627b24e6857f92ec4417da5a007ba3edf8303106f53acf38f9a824aee2a9698346733fce07af70082a7b066db580c171513cda4deb8ad2
+  data.tar.gz: eb723e04306f28c0c83a544aff56ee336e704878f9005ce32fd0f78ed40295b4c5995ee0ae40de379555060a5e3ee2abe58f43f5c7ba78f464539fc989c1b2bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (4.0.0)
+    killbill (4.1.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -48,7 +48,7 @@ GEM
     builder (3.2.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ethon (0.7.3)
+    ethon (0.7.4)
       ffi (>= 1.3.0)
     ffi (1.9.8-java)
     i18n (0.7.0)
@@ -56,14 +56,18 @@ GEM
       maven-tools (~> 0.32.1)
       ruby-maven (~> 3.0.4)
     jdbc-mariadb (1.1.8)
-    jdbc-sqlite3 (3.8.7)
+    jdbc-sqlite3 (3.8.10.1)
+    json (1.8.2)
     json (1.8.2-java)
     maven-tools (0.32.5)
+    mini_portile (0.6.2)
     minitest (5.6.1)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     nokogiri (1.6.6.2-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
@@ -95,6 +99,7 @@ GEM
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     thor (0.19.1)
+    thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tilt (1.4.1)
     typhoeus (0.6.9)
@@ -104,6 +109,7 @@ GEM
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   actionpack (~> 4.1.0)
@@ -123,3 +129,6 @@ DEPENDENCIES
   rspec (~> 2.12.0)
   thor (~> 0.19.1)
   thread_safe (~> 0.3.4)
+
+BUNDLED WITH
+   1.10.4

data/Jarfile

@@ -1,9 +1,10 @@
-jar 'org.kill-bill.billing:killbill-api', '0.14'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.9'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.13.7'
+jar 'org.kill-bill.billing:killbill-api', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.11'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,12 +1,13 @@
-org.kill-bill.billing:killbill-api:jar:0.14
+org.kill-bill.billing:killbill-api:jar:0.18
 com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
 joda-time:joda-time:jar:2.3
-org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.9
-org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.9
-org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.9
-org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.9
-org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.9
-org.kill-bill.billing:killbill-util:jar:tests:0.13.7
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.11
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.11
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.11
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.11
+org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.11
+org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.11
+org.kill-bill.billing:killbill-util:jar:tests:0.14.0
 com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
 com.fasterxml.jackson.core:jackson-core:jar:2.4.3
 com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
@@ -30,7 +31,7 @@ aopalliance:aopalliance:jar:1.0
 com.google.inject.extensions:guice-multibindings:jar:3.0
 org.jdbi:jdbi:jar:2.62
 org.joda:joda-money:jar:0.9
-org.kill-bill.billing:killbill-internal-api:jar:0.13.7
+org.kill-bill.billing:killbill-internal-api:jar:0.14.0
 org.kill-bill.billing:killbill-platform-api:jar:0.2
 org.kill-bill.billing:killbill-platform-base:jar:0.2
 com.google.code.findbugs:annotations:jar:3.0.0

data/README.md

@@ -19,123 +19,134 @@ All plugin types can interact with Kill Bill directly via APIs and expose HTTP e
 How to write a Notification plugin
 ----------------------------------
 
-    require 'killbill'
-
-    class MyNotificationPlugin < Killbill::Plugin::Notification
-      # Overriding this method is optional, only if you need to do some initialization work
-      def start_plugin
-        puts "MyNotificationPlugin plugin starting"
-        super
-        puts "MyNotificationPlugin plugin started"
-      end
-
-      # Invoked each time an event is received
-      def on_event(event)
-        puts "Received Killbill event #{event}"
-      end
-
-      # Overriding this method is optional, only if you need to do some tear down work
-      def stop_plugin
-        puts "MyNotificationPlugin plugin stopping"
-        super
-        puts "MyNotificationPlugin plugin stopped"
-      end
-    end
+```ruby
+require 'killbill'
+
+class MyNotificationPlugin < Killbill::Plugin::Notification
+  # Overriding this method is optional, only if you need to do some initialization work
+  def start_plugin
+    puts "MyNotificationPlugin plugin starting"
+    super
+    puts "MyNotificationPlugin plugin started"
+  end
+
+  # Invoked each time an event is received
+  def on_event(event)
+    puts "Received Killbill event #{event}"
+  end
+
+  # Overriding this method is optional, only if you need to do some tear down work
+  def stop_plugin
+    puts "MyNotificationPlugin plugin stopping"
+    super
+    puts "MyNotificationPlugin plugin stopped"
+  end
+end
+```
 
 Make sure to create the corresponding killbill.properties file:
 
-    mainClass=MyNotificationPlugin
-    pluginType=NOTIFICATION
+```ini
+mainClass=MyNotificationPlugin
+pluginType=NOTIFICATION
+```
 
 How to write a Payment plugin
 -----------------------------
 
-    require 'killbill'
+```ruby
+require 'killbill'
 
-    class MyPaymentPlugin < Killbill::Plugin::Payment
-      def start_plugin
-        puts "MyPaymentPlugin plugin starting"
-        super
-        puts "MyPaymentPlugin plugin started"
-      end
+class MyPaymentPlugin < Killbill::Plugin::Payment
+  def start_plugin
+    puts "MyPaymentPlugin plugin starting"
+    super
+    puts "MyPaymentPlugin plugin started"
+  end
 
-      def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-      end
+  def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+  end
 
-      def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-      end
+  def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+  end
 
-      def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-      end
+  def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+  end
 
-      def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
-      end
+  def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
+  end
 
-      def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-      end
+  def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+  end
 
-      def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
-      end
+  def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+  end
 
-      def get_payment_info(kb_account_id, kb_payment_id, properties, context)
-      end
+  def get_payment_info(kb_account_id, kb_payment_id, properties, context)
+  end
 
-      def search_payments(search_key, offset, limit, properties, context)
-      end
+  def search_payments(search_key, offset, limit, properties, context)
+  end
 
-      def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)
-      end
+  def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)
+  end
 
-      def delete_payment_method(kb_account_id, kb_payment_method_id, properties, context)
-      end
+  def delete_payment_method(kb_account_id, kb_payment_method_id, properties, context)
+  end
 
-      def get_payment_method_detail(kb_account_id, kb_payment_method_id, properties, context)
-      end
+  def get_payment_method_detail(kb_account_id, kb_payment_method_id, properties, context)
+  end
 
-      def set_default_payment_method(kb_account_id, kb_payment_method_id, properties, context)
-      end
+  def set_default_payment_method(kb_account_id, kb_payment_method_id, properties, context)
+  end
 
-      def get_payment_methods(kb_account_id, refresh_from_gateway, properties, context)
-      end
+  def get_payment_methods(kb_account_id, refresh_from_gateway, properties, context)
+  end
 
-      def search_payment_methods(search_key, offset, limit, properties, context)
-      end
+  def search_payment_methods(search_key, offset, limit, properties, context)
+  end
 
-      def reset_payment_methods(kb_account_id, payment_methods, properties, context)
-      end
+  def reset_payment_methods(kb_account_id, payment_methods, properties, context)
+  end
 
-      def build_form_descriptor(kb_account_id, descriptor_fields, properties, context)
-      end
+  def build_form_descriptor(kb_account_id, descriptor_fields, properties, context)
+  end
 
-      def process_notification(notification, properties, context)
-      end
+  def process_notification(notification, properties, context)
+  end
 
-      # Overriding this method is optional, only if you need to do some tear down work
-      def stop_plugin
-        puts "MyPaymentPlugin plugin stopping"
-        super
-        puts "MyPaymentPlugin plugin stopped"
-      end
-    end
+  # Overriding this method is optional, only if you need to do some tear down work
+  def stop_plugin
+    puts "MyPaymentPlugin plugin stopping"
+    super
+    puts "MyPaymentPlugin plugin stopped"
+  end
+end
+```
 
 Make sure to create the corresponding killbill.properties file:
 
-    mainClass=MyPaymentPlugin
-    pluginType=PAYMENT
-
+```ini
+mainClass=MyPaymentPlugin
+pluginType=PAYMENT
+```
 
 How to write a Payment plugin integrated with ActiveMerchant
 ------------------------------------------------------------
 
 Use the plugin generator:
 
-    ./script/generate active_merchant gateway_name /path/to/dir
+```bash
+./script/generate active_merchant gateway_name /path/to/dir
+```
 
 Replace `gateway_name` with the snake case of your ActiveMerchant gateway (e.g. `yandex`, `stripe`, `paypal`, etc.).
 
 This will generate a tree of files ready to be plugged into Kill Bill. To package the plugin, run:
 
-    rake killbill:clean ; rake build ; rake killbill:package
+```bash
+rake killbill:clean ; rake build ; rake killbill:package
+```
 
 Most of the work consists of filling in the blank in `api.rb` (payment plugin API for ActiveMerchant gateways) and `application.rb` (sinatra application for ActiveMerchant integrations). Check the [Stripe plugin](https://github.com/killbill/killbill-stripe-plugin) for an example.
 
@@ -160,14 +171,15 @@ Killbill exports a Rack handler that interfaces directly with the container in w
 
 This basically means that Killbill will understand native Rack config.ru files placed in the root of your plugin, e.g. (using Sinatra):
 
-    require 'sinatra'
-
-    get "/plugins/myPlugin/ping" do
-      status 200
-      "pong"
-    end
-    run Sinatra::Application
+```ruby
+require 'sinatra'
 
+get "/plugins/myPlugin/ping" do
+  status 200
+  "pong"
+end
+run Sinatra::Application
+```
 
 Rake tasks
 ----------
@@ -176,48 +188,59 @@ The killbill gem also ships helpful Rake tasks to package Killbill-ready plugins
 
 To access these tasks, add the following to your Rakefile:
 
-    # Install tasks to package the plugin for Killbill
-    require 'killbill/rake_task'
-    Killbill::PluginHelper.install_tasks
+```ruby
+# Install tasks to package the plugin for Killbill
+require 'killbill/rake_task'
+Killbill::PluginHelper.install_tasks
 
-    # (Optional) Install tasks to build and release your plugin gem
-    require 'bundler/setup'
-    Bundler::GemHelper.install_tasks
+# (Optional) Install tasks to build and release your plugin gem
+require 'bundler/setup'
+Bundler::GemHelper.install_tasks
+```
 
 You can verify these tasks are available by running `rake -T`.
 
 To build the artifacts into pkg/:
 
-    # Cleanup output directories
-    rake killbill:clean
-    # Build your plugin gem in the pkg/ directory
-    rake build
-    # Build the Killbill plugin in the pkg/ directory
-    # The <plugin_name>-<plugin-version>/ directory is used as a staging directory
-    rake killbill:package
+```bash
+# Cleanup output directories
+rake killbill:clean
+# Build your plugin gem in the pkg/ directory
+rake build
+# Build the Killbill plugin in the pkg/ directory
+# The <plugin_name>-<plugin-version>/ directory is used as a staging directory
+rake killbill:package
+```
 
 For quick testing of your plugin, you can use the `deploy` task:
 
-    # Deploy the plugin in /var/tmp/bundles
-    rake killbill:deploy
-    # Deploy the plugin and clobber a previous version if needed
-    rake killbill:deploy[true]
-    # You can also specify a custom plugins directory as such
-    rake killbill:deploy[false,/path/to/bundles]
+```bash
+# Deploy the plugin in /var/tmp/bundles
+rake killbill:deploy
+# Deploy the plugin and clobber a previous version if needed
+rake killbill:deploy[true]
+# You can also specify a custom plugins directory as such
+rake killbill:deploy[false,/path/to/bundles]
+```
 
 To debug packaging issues, pass `true` as the third (optional) parameter:
 
-    rake killbill:deploy[false,/path/to/bundles,true]
-
+```bash
+rake killbill:deploy[false,/path/to/bundles,true]
+```
 
 Development
 -----------
 
 To run unit and remote tests:
 
-    rake
-    rake test:remote:spec
+```bash
+rake
+rake test:remote:spec
+```
 
 To change the database driver:
 
-    AR_ADAPTER=mariadb AR_USERNAME=root AR_PASSWORD=root AR_DATABASE=kbtest rake
+```bash
+AR_ADAPTER=mariadb AR_USERNAME=root AR_PASSWORD=root AR_DATABASE=kbtest rake
+```

data/gen_config/api.conf

@@ -1,6 +1,6 @@
 java -cp target/killbill-java-parser-0.0.1-SNAPSHOT.jar com.ning.killbill.KillbillParser \
 -i \
-file:///PATH_TO_REPO/killbill-api/src/main/java/ \
+file://$PATH_TO_REPO/killbill-api/src/main/java/ \
 -o \
 /tmp/output \
 -t \

data/gen_config/plugin_api.conf

@@ -1,10 +1,11 @@
 java -cp target/killbill-java-parser-0.0.1-SNAPSHOT.jar com.ning.killbill.KillbillParser \
 -i \
-file:///PATH_TO_REPO/killbill-plugin-api/payment/src/main/java, \
-file:///PATH_TO_REPO/killbill-plugin-api/notification/src/main/java, \
-file:///PATH_TO_REPO/killbill-plugin-api/invoice/src/main/java, \
-file:///PATH_TO_REPO/killbill-plugin-api/currency/src/main/java, \
-file:///PATH_TO_REPO/killbill-api/src/main/java/ \
+file://$PATH_TO_REPO/killbill-plugin-api/payment/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/notification/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/invoice/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/currency/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/routing/src/main/java, \
+file://$PATH_TO_REPO/killbill-api/src/main/java/ \
 -o \
 /tmp/output \
 -t \
@@ -14,6 +15,6 @@ org.killbill.billing.payment.plugin.api, \
 org.killbill.billing.notification.plugin.api, \
 org.killbill.billing.invoice.plugin.api \
 org.killbill.billing.currency.plugin.api \
+org.killbill.billing.routing.plugin.api \
 -m \
 JRUBY_PLUGIN_API
-