killbill-client 0.5.4 → 0.5.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e0db1e2e526ed9e16ee35f1c47831dad9c7bd2a
+  data.tar.gz: 69bb1815ea15b3055edfa0ab6909ff1adcf2bdd4
+SHA512:
+  metadata.gz: 59957a26919c8c96eaf24dbe9578d056e33422eab28ea87b83ebfdf0df677b1d94dceb03961eb8cba9bad00af03705ee5bc20a28ad340f2806b3607282cf035a
+  data.tar.gz: e02d2802fb9c83bcb769abe14c4a4b47d03af061fd897035fcf175e629322352c3657679dd3cf9bef45b256465765c5fcd54573082cb501b04b7875bb25bc07c

data/lib/killbill_client/models/account.rb

@@ -4,6 +4,13 @@ module KillBillClient
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      AUTO_PAY_OFF_ID = '00000000-0000-0000-0000-000000000001'
+      AUTO_INVOICING_ID = '00000000-0000-0000-0000-000000000002'
+      OVERDUE_ENFORCEMENT_OFF_ID = '00000000-0000-0000-0000-000000000003'
+      WRITTEN_OFF_ID = '00000000-0000-0000-0000-000000000004'
+      MANUAL_PAY_ID = '00000000-0000-0000-0000-000000000005'
+      TEST_ID = '00000000-0000-0000-0000-000000000006'
+
       KILLBILL_API_ACCOUNTS_PREFIX = "#{KILLBILL_API_PREFIX}/accounts"
 
       class << self
@@ -91,7 +98,7 @@ module KillBillClient
       end
 
       def add_tag(tag_name, user = nil, reason = nil, comment = nil, options = {})
-        tag_definition = TagDefinition.find_by_name(tag_name)
+        tag_definition = TagDefinition.find_by_name(tag_name, options)
         if tag_definition.nil?
           tag_definition = TagDefinition.new
           tag_definition.name = tag_name
@@ -99,18 +106,7 @@ module KillBillClient
           tag_definition = TagDefinition.create(user, options)
         end
 
-        created_tag = self.class.post "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/tags",
-                                      {},
-                                      {
-                                          :tagList => tag_definition.id
-                                      },
-                                      {
-                                          :user => user,
-                                          :reason => reason,
-                                          :comment => comment,
-                                      }.merge(options),
-                                      Tag
-        created_tag.refresh(options)
+        add_tag_from_definition_id(tag_definition.id, user, reason, comment, options)
       end
 
       def remove_tag(tag_name, user = nil, reason = nil, comment = nil, options = {})
@@ -127,6 +123,81 @@ module KillBillClient
                               :comment => comment,
                           }.merge(options)
       end
+
+
+      def auto_pay_off?(options)
+        control_tag_off?(AUTO_PAY_OFF_ID, options)
+      end
+
+      def set_auto_pay_off(user = nil, reason = nil, comment = nil, options)
+        add_tag_from_definition_id(AUTO_PAY_OFF_ID, user, reason, comment, options)
+      end
+
+      def auto_invoicing?(options)
+        control_tag_off?(AUTO_INVOICING_ID, options)
+      end
+
+      def set_auto_invoicing(user = nil, reason = nil, comment = nil, options)
+        add_tag_from_definition_id(AUTO_INVOICING_ID, user, reason, comment, options)
+      end
+
+      def overdue_enforcement_off?(options)
+        control_tag_off?(OVERDUE_ENFORCEMENT_OFF_ID, options)
+      end
+
+      def set_overdue_enforcement_off(user = nil, reason = nil, comment = nil, options)
+        add_tag_from_definition_id(OVERDUE_ENFORCEMENT_OFF_ID, user, reason, comment, options)
+      end
+
+      def written_off?(options)
+        control_tag_off?(WRITTEN_OFF_ID, options)
+      end
+
+      def set_written_off( user = nil, reason = nil, comment = nil, options)
+        add_tag_from_definition_id(WRITTEN_OFF_ID, user, reason, comment, options)
+      end
+
+      def manual_pay?(options)
+        control_tag_off?(MANUAL_PAY_ID, options)
+      end
+
+      def set_manual_pay(user = nil, reason = nil, comment = nil, options)
+        add_tag_from_definition_id(MANUAL_PAY_ID, user, reason, comment, options)
+      end
+
+
+      def test?(options)
+        control_tag_off?(TEST_ID, options)
+      end
+
+      def set_test(user = nil, reason = nil, comment = nil, options)
+        add_tag_from_definition_id(TEST_ID, user, reason, comment, options)
+      end
+
+      private
+
+      def control_tag_off?(control_tag_definition_id, options)
+        res = tags('NONE', options)
+        !((res || []).select do |t|
+          t.tag_definition_id == control_tag_definition_id
+        end.first.nil?)
+      end
+
+      def add_tag_from_definition_id(tag_definition_id, user = nil, reason = nil, comment = nil, options = {})
+        created_tag = self.class.post "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/tags",
+                                      {},
+                                      {
+                                          :tagList => tag_definition_id
+                                      },
+                                      {
+                                          :user => user,
+                                          :reason => reason,
+                                          :comment => comment,
+                                      }.merge(options),
+                                      Tag
+        created_tag.refresh(options)
+      end
+
     end
   end
 end

data/lib/killbill_client/models/bundle.rb

@@ -32,10 +32,11 @@ module KillBillClient
 
 
       # Transfer the bundle to the new account. the new account_id should be set in this object
-      def transfer(bundle_id, requested_date = nil, user = nil, reason = nil, comment = nil, options = {})
+      def transfer(bundle_id, requested_date = nil, billing_policy = nil, user = nil, reason = nil, comment = nil, options = {})
 
         params = {}
         params[:requestedDate] = requested_date unless requested_date.nil?
+        params[:billingPolicy] = billing_policy unless billing_policy.nil?
         result = self.class.put "#{KILLBILL_API_BUNDLES_PREFIX}/#{bundle_id}",
                                 to_json,
                                 params,

data/lib/killbill_client/models/invoice.rb

@@ -13,11 +13,35 @@ module KillBillClient
         def find_by_id_or_number(id_or_number, with_items = true, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/#{id_or_number}",
               {
-                :withItems => with_items,
-                :audit => audit
+                  :withItems => with_items,
+                  :audit => audit
               },
               options
         end
+
+        def trigger_invoice(account_id, target_date, dry_run, user = nil, reason = nil, comment = nil, options = {})
+          query_map = {:accountId => account_id}
+          query_map[:targetDate] = target_date if !target_date.nil?
+          query_map[:dryRun] = dry_run if !dry_run.nil?
+
+          begin
+            res = post "#{KILLBILL_API_INVOICES_PREFIX}",
+                 {},
+                 query_map,
+                 {
+                     :user => user,
+                     :reason => reason,
+                     :comment => comment,
+                 }.merge(options),
+                 Invoice
+
+            res.refresh(options)
+
+          rescue KillBillClient::API::BadRequest => e
+            # No invoice to generate : TODO parse json to verify this is indeed the case
+          end
+        end
+
       end
     end
   end

data/lib/killbill_client/models/tag.rb

@@ -5,9 +5,10 @@ module KillBillClient
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
       class << self
-        def find_all_by_account_id account_id, audit = "NONE", options = {}
+        def find_all_by_account_id account_id, included_deleted = false, audit = "NONE", options = {}
           get "#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/tags",
               {
+                  :includedDeleted => included_deleted,
                   :audit => audit
               },
               options

data/lib/killbill_client/version.rb

@@ -2,7 +2,7 @@ module KillBillClient
   module Version
     MAJOR = 0
     MINOR = 5
-    PATCH = 4
+    PATCH = 5
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
-  prerelease: false
-  type: :development
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -144,7 +137,8 @@ files:
 homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options:
 - "--exclude"
 - "."
@@ -155,22 +149,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.2.0
+signing_key: 
+specification_version: 4
 summary: Kill Bill client library.
 test_files:
 - spec/killbill_client/model_relation_spec.rb