killbill-client 0.7.2 → 0.7.3

data/spec/killbill_client/remote/model_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe KillBillClient::Model do
-  it 'should manipulate accounts' do
+  it 'should manipulate accounts', :integration => true  do
     # In case the remote server has lots of data
     search_limit = 100000
 
@@ -28,6 +28,7 @@ describe KillBillClient::Model do
     account = account.create('KillBill Spec test')
     account.external_key.should == external_key
     account.account_id.should_not be_nil
+    account_id = account.account_id
 
     # Try to retrieve it
     account = KillBillClient::Model::Account.find_by_id account.account_id
@@ -92,11 +93,12 @@ describe KillBillClient::Model do
     # Add a payment method
     pm = KillBillClient::Model::PaymentMethod.new
     pm.account_id = account.account_id
+    pm.is_default = true
     pm.plugin_name = '__EXTERNAL_PAYMENT__'
     pm.plugin_info = {}
     pm.payment_method_id.should be_nil
 
-    pm = pm.create(true, 'KillBill Spec test')
+    pm = pm.create('KillBill Spec test')
     pm.payment_method_id.should_not be_nil
 
     # Try to retrieve it
@@ -133,7 +135,8 @@ describe KillBillClient::Model do
     invoice_item.currency = account.currency
     invoice_item.amount = 123.98
 
-    invoice = invoice_item.create 'KillBill Spec test'
+    invoice_item = invoice_item.create 'KillBill Spec test'
+    invoice = KillBillClient::Model::Invoice.find_by_id_or_number invoice_item.invoice_id
 
     invoice.balance.should == 123.98
 
@@ -168,10 +171,10 @@ describe KillBillClient::Model do
     invoice_with_id.invoice_id.should == invoice_with_number.invoice_id
     invoice_with_id.invoice_number.should == invoice_with_number.invoice_number
 
-    # Create an external payment
-    payment = KillBillClient::Model::Payment.new
-    payment.account_id = account.account_id
-    payment.create true, 'KillBill Spec test'
+    # Create an external payment for each unpaid invoice
+    invoice_payment = KillBillClient::Model::InvoicePayment.new
+    invoice_payment.account_id = account.account_id
+    invoice_payment.bulk_create true, 'KillBill Spec test'
 
     # Try to retrieve it
     payments = KillBillClient::Model::Payment.find_in_batches(0, search_limit)
@@ -188,11 +191,13 @@ describe KillBillClient::Model do
     found.should_not be_nil
 
     # Try to retrieve it (bis repetita placent)
-    payment = KillBillClient::Model::Payment.find_by_id found.payment_id
-    payment.account_id.should == account.account_id
+    invoice_payment = KillBillClient::Model::InvoicePayment.find_by_id found.payment_id
+    invoice_payment.account_id.should == account.account_id
 
     # Try to retrieve it
-    payments = KillBillClient::Model::Payment.find_all_by_invoice_id found.invoice_id
+    invoice = KillBillClient::Model::Invoice.new
+    invoice.invoice_id = invoice_payment.target_invoice_id
+    payments = invoice.payments
     payments.size.should == 1
     payments.first.account_id.should == account.account_id
 
@@ -203,27 +208,31 @@ describe KillBillClient::Model do
     # Verify the timeline
     timeline = KillBillClient::Model::AccountTimeline.find_by_account_id account.account_id
     timeline.payments.should_not be_empty
-    payment = timeline.payments.first
-    payment.refunds.should be_empty
+    invoice_payment = timeline.payments.first
+    timeline.payments.first.transactions.size.should == 1
+    timeline.payments.first.transactions.first.transaction_type.should == 'PURCHASE'
+    invoice_payment.auth_amount.should == 0
+    invoice_payment.captured_amount.should == 0
+    invoice_payment.purchased_amount.should == invoice_payment.purchased_amount
+    invoice_payment.refunded_amount.should == 0
+    invoice_payment.credited_amount.should == 0
 
     # Refund the payment (with item adjustment)
     invoice_item = KillBillClient::Model::Invoice.find_by_id_or_number(invoice_number, true).items.first
-    refund = KillBillClient::Model::Refund.new
-    refund.payment_id = payment.payment_id
-    refund.amount = payment.amount
-    refund.adjusted = true
     item = KillBillClient::Model::InvoiceItem.new
     item.invoice_item_id = invoice_item.invoice_item_id
     item.amount = invoice_item.amount
-    refund.adjustments = [item]
-    refund.create 'KillBill Spec test'
+    refund = KillBillClient::Model::InvoicePayment.refund invoice_payment.payment_id, invoice_payment.purchased_amount, [item], 'KillBill Spec test'
 
     # Verify the refund
     timeline = KillBillClient::Model::AccountTimeline.find_by_account_id account.account_id
     timeline.payments.should_not be_empty
-    payment = timeline.payments.first
-    payment.refunds.should_not be_empty
-    payment.refunds.first.amount.should == invoice_item.amount
+    timeline.payments.size.should == 1
+    timeline.payments.first.transactions.size.should == 2
+    timeline.payments.first.transactions.first.transaction_type.should == 'PURCHASE'
+    refund = timeline.payments.first.transactions.last
+    refund.transaction_type.should == 'REFUND'
+    refund.amount.should == invoice_item.amount
 
     # Create a credit for invoice
     new_credit = KillBillClient::Model::Credit.new
@@ -291,8 +300,8 @@ describe KillBillClient::Model do
     found_tag_definition.is_control_tag.should be_false
   end
 
-  it 'should manipulate tenants' do
-    api_key = Time.now.to_i.to_s
+  it 'should manipulate tenants', :integration => true  do
+    api_key = Time.now.to_i.to_s + Random.rand(100).to_s
     api_secret = 'S4cr3333333t!!!!!!lolz'
 
     tenant = KillBillClient::Model::Tenant.new
@@ -313,6 +322,12 @@ describe KillBillClient::Model do
     tenant.api_key.should == api_key
   end
 
+  it 'should manipulate the catalog', :integration => true do
+    plans = KillBillClient::Model::Catalog::available_base_plans
+    plans.size.should > 0
+    plans[0].plan.should_not be_nil
+  end
+
   #it 'should retrieve users permissions' do
   #  # Tough to verify as it depends on the Kill Bill configuration
   #  puts KillBillClient::Model::Security.find_permissions

data/spec/killbill_client/resource_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe KillBillClient::Model::Resource do
+
+  it 'should be able to be instantiated from hash' do
+    payment1 = KillBillClient::Model::InvoicePayment.new
+    payment1.account_id = '1234'
+    payment1.target_invoice_id = '5678'
+    payment1.purchased_amount = 12.42
+
+    payment2 = KillBillClient::Model::InvoicePayment.new(payment1.to_hash)
+
+    payment2.should == payment1
+    payment2.account_id.should == '1234'
+    payment2.target_invoice_id.should == '5678'
+    payment2.purchased_amount.should == 12.42
+  end
+end

data/spec/spec_helper.rb

@@ -11,10 +11,22 @@ KillBillClient.url = 'http://127.0.0.1:8080'
 KillBillClient.username = 'admin'
 KillBillClient.password = 'password'
 
+
 RSpec.configure do |config|
   config.color_enabled = true
   config.tty = true
   config.formatter = 'documentation'
+
+  config.before(:each, :integration => true) do
+    # Setup a tenant for that test
+    KillBillClient.api_key = Time.now.to_i.to_s + Random.rand(100).to_s
+    KillBillClient.api_secret = 'S4cr3333333t!!!!!!lolz'
+
+    tenant = KillBillClient::Model::Tenant.new
+    tenant.api_key = KillBillClient.api_key
+    tenant.api_secret = KillBillClient.api_secret
+    tenant.create('KillBill Spec test')
+  end
 end
 
 begin

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 description: An API client library for Kill Bill.
@@ -58,8 +58,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -73,7 +73,7 @@ files:
 - lib/killbill_client/models/account_timeline.rb
 - lib/killbill_client/models/audit_log.rb
 - lib/killbill_client/models/bundle.rb
-- lib/killbill_client/models/chargeback.rb
+- lib/killbill_client/models/catalog.rb
 - lib/killbill_client/models/credit.rb
 - lib/killbill_client/models/custom_field.rb
 - lib/killbill_client/models/event_subscription.rb
@@ -85,27 +85,35 @@ files:
 - lib/killbill_client/models/gen/bundle_attributes.rb
 - lib/killbill_client/models/gen/bundle_timeline_attributes.rb
 - lib/killbill_client/models/gen/catalog_attributes_simple.rb
-- lib/killbill_client/models/gen/chargeback_attributes.rb
 - lib/killbill_client/models/gen/credit_attributes.rb
 - lib/killbill_client/models/gen/custom_field_attributes.rb
 - lib/killbill_client/models/gen/deleted_event_subscription_attributes.rb
+- lib/killbill_client/models/gen/direct_payment_attributes.rb
+- lib/killbill_client/models/gen/direct_transaction_attributes.rb
 - lib/killbill_client/models/gen/event_subscription_attributes.rb
+- lib/killbill_client/models/gen/gateway_notification_attributes.rb
+- lib/killbill_client/models/gen/hosted_payment_page_billing_address_attributes.rb
+- lib/killbill_client/models/gen/hosted_payment_page_customer_attributes.rb
+- lib/killbill_client/models/gen/hosted_payment_page_fields_attributes.rb
+- lib/killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes.rb
 - lib/killbill_client/models/gen/invoice_attributes.rb
 - lib/killbill_client/models/gen/invoice_email_attributes.rb
 - lib/killbill_client/models/gen/invoice_item_attributes.rb
+- lib/killbill_client/models/gen/invoice_payment_attributes.rb
+- lib/killbill_client/models/gen/invoice_payment_transaction_attributes.rb
 - lib/killbill_client/models/gen/new_event_subscription_attributes.rb
 - lib/killbill_client/models/gen/notification_attributes.rb
 - lib/killbill_client/models/gen/overdue_state_attributes.rb
 - lib/killbill_client/models/gen/payment_attributes.rb
 - lib/killbill_client/models/gen/payment_method_attributes.rb
 - lib/killbill_client/models/gen/payment_method_plugin_detail_attributes.rb
-- lib/killbill_client/models/gen/payment_method_properties.rb
+- lib/killbill_client/models/gen/payment_transaction_attributes.rb
 - lib/killbill_client/models/gen/phase_attributes.rb
 - lib/killbill_client/models/gen/plan_attributes.rb
 - lib/killbill_client/models/gen/plan_detail_attributes.rb
+- lib/killbill_client/models/gen/plugin_property_attributes.rb
 - lib/killbill_client/models/gen/price_attributes.rb
 - lib/killbill_client/models/gen/product_attributes.rb
-- lib/killbill_client/models/gen/refund_attributes.rb
 - lib/killbill_client/models/gen/require_gen.rb
 - lib/killbill_client/models/gen/session_attributes.rb
 - lib/killbill_client/models/gen/stack_trace_element_attributes.rb
@@ -116,12 +124,18 @@ files:
 - lib/killbill_client/models/gen/tenant_attributes.rb
 - lib/killbill_client/models/gen/tenant_key_attributes.rb
 - lib/killbill_client/models/gen/usage_attributes.rb
+- lib/killbill_client/models/helpers/custom_field_helper.rb
+- lib/killbill_client/models/helpers/tag_helper.rb
 - lib/killbill_client/models/invoice.rb
 - lib/killbill_client/models/invoice_item.rb
+- lib/killbill_client/models/invoice_payment.rb
 - lib/killbill_client/models/models.rb
 - lib/killbill_client/models/payment.rb
 - lib/killbill_client/models/payment_method.rb
-- lib/killbill_client/models/refund.rb
+- lib/killbill_client/models/phase.rb
+- lib/killbill_client/models/plan.rb
+- lib/killbill_client/models/plan_detail.rb
+- lib/killbill_client/models/product.rb
 - lib/killbill_client/models/resource.rb
 - lib/killbill_client/models/resources.rb
 - lib/killbill_client/models/security.rb
@@ -129,6 +143,7 @@ files:
 - lib/killbill_client/models/tag.rb
 - lib/killbill_client/models/tag_definition.rb
 - lib/killbill_client/models/tenant.rb
+- lib/killbill_client/models/transaction.rb
 - lib/killbill_client/models/usage.rb
 - lib/killbill_client/utils.rb
 - lib/killbill_client/version.rb
@@ -137,6 +152,7 @@ files:
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb
+- spec/killbill_client/resource_spec.rb
 - spec/killbill_client/resources_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.killbilling.org
@@ -145,18 +161,18 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -169,5 +185,6 @@ test_files:
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb
+- spec/killbill_client/resource_spec.rb
 - spec/killbill_client/resources_spec.rb
 - spec/spec_helper.rb

data/lib/killbill_client/models/chargeback.rb

@@ -1,36 +0,0 @@
-module KillBillClient
-  module Model
-    class Chargeback < ChargebackAttributes
-      has_many :audit_logs, KillBillClient::Model::AuditLog
-
-        KILLBILL_API_CHARGEBACKS_PREFIX = "#{KILLBILL_API_PREFIX}/chargebacks"
-
-        class << self
-          def find_by_id(chargeback_id, options = {})
-            get "#{KILLBILL_API_CHARGEBACKS_PREFIX}/#{chargeback_id}",
-                {},
-                options
-          end
-
-          def find_all_by_payment_id(payment_id, options = {})
-            get "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/#{payment_id}/chargebacks",
-                {},
-                options
-          end
-        end
-
-        def create(user = nil, reason = nil, comment = nil, options = {})
-          created_chargeback = self.class.post KILLBILL_API_CHARGEBACKS_PREFIX,
-                                            to_json,
-                                            {},
-                                            {
-                                                :user => user,
-                                                :reason => reason,
-                                                :comment => comment,
-                                            }.merge(options)
-          created_chargeback.refresh(options)
-        end
-
-    end
-  end
-end

data/lib/killbill_client/models/refund.rb

@@ -1,55 +0,0 @@
-module KillBillClient
-  module Model
-    class Refund < RefundAttributes
-      KILLBILL_API_REFUNDS_PREFIX = "#{KILLBILL_API_PREFIX}/refunds"
-
-      has_many :audit_logs, KillBillClient::Model::AuditLog
-      has_many :adjustments, KillBillClient::Model::InvoiceItem
-
-      class << self
-        def find_by_id refund_id, options = {}
-          get "#{KILLBILL_API_REFUNDS_PREFIX}/#{refund_id}",
-          {},
-          options
-        end
-
-        def find_all_by_payment_id payment_id, options = {}
-          get "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/#{payment_id}/refunds",
-          {},
-          options
-        end
-
-        def find_in_batches(offset = 0, limit = 100, options = {})
-          get "#{KILLBILL_API_REFUNDS_PREFIX}/#{Resource::KILLBILL_API_PAGINATION_PREFIX}",
-              {
-                  :offset => offset,
-                  :limit => limit
-              },
-              options
-        end
-
-        def find_in_batches_by_search_key(search_key, offset = 0, limit = 100, options = {})
-          get "#{KILLBILL_API_REFUNDS_PREFIX}/search/#{search_key}",
-              {
-                  :offset => offset,
-                  :limit => limit
-              },
-              options
-        end
-      end
-
-      def create(user = nil, reason = nil, comment = nil, options = {})
-        created_refund = self.class.post "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/#{@payment_id}/refunds",
-                                         to_json,
-                                         {},
-                                         {
-                                           :user => user,
-                                           :reason => reason,
-                                           :comment => comment,
-                                         }.merge(options)
-
-        created_refund.refresh(options)
-      end
-    end
-  end
-end