killbill-client 0.4.2 → 0.4.3

data/killbill_client.gemspec

@@ -39,6 +39,8 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
+  s.add_dependency 'json', '~> 1.8.0'
+
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
 end

data/lib/killbill_client.rb

@@ -95,4 +95,30 @@ module KillBillClient
   require 'killbill_client/version'
 end
 
+begin
+  require 'securerandom'
+  SecureRandom.uuid
+rescue LoadError, NoMethodError
+  begin
+    # See http://jira.codehaus.org/browse/JRUBY-6176
+    module SecureRandom
+      def self.uuid
+        ary = self.random_bytes(16).unpack("NnnnnN")
+        ary[2] = (ary[2] & 0x0fff) | 0x4000
+        ary[3] = (ary[3] & 0x3fff) | 0x8000
+        "%08x-%04x-%04x-%04x-%04x%08x" % ary
+      end unless respond_to?(:uuid)
+    end
+  rescue TypeError
+    class SecureRandom
+      def self.uuid
+        ary = self.random_bytes(16).unpack("NnnnnN")
+        ary[2] = (ary[2] & 0x0fff) | 0x4000
+        ary[3] = (ary[3] & 0x3fff) | 0x8000
+        "%08x-%04x-%04x-%04x-%04x%08x" % ary
+      end unless respond_to?(:uuid)
+    end
+  end
+end
+
 require 'rails/killbill_client' if defined? Rails::Railtie

data/lib/killbill_client/models/payment.rb

@@ -8,6 +8,20 @@ module KillBillClient
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
       create_alias :bundle_keys, :external_bundle_keys
+
+      def create(external_payment = false, user = nil, reason = nil, comment = nil, options = {})
+        # Nothing to return (nil)
+        self.class.post "#{Invoice::KILLBILL_API_INVOICES_PREFIX}/payments",
+                        to_json,
+                        {
+                            :externalPayment => external_payment
+                        },
+                        {
+                            :user => user,
+                            :reason => reason,
+                            :comment => comment,
+                        }.merge(options)
+      end
     end
   end
 end

data/lib/killbill_client/models/refund.rb

@@ -7,7 +7,6 @@ module KillBillClient
       has_many :adjustments, KillBillClient::Model::InvoiceItem
 
       class << self
-        
         def find_by_id refund_id, options = {}
           get "#{KILLBILL_API_REFUNDS_PREFIX}/#{refund_id}",
           {},
@@ -24,17 +23,16 @@ module KillBillClient
 
       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)
+                                         to_json,
+                                         {},
+                                         {
+                                           :user => user,
+                                           :reason => reason,
+                                           :comment => comment,
+                                         }.merge(options)
 
         created_refund.refresh(options)
       end
-
     end
   end
 end

data/lib/killbill_client/models/resource.rb

@@ -177,12 +177,22 @@ module KillBillClient
          self.class.json_attributes.each do |name|
            value = self.send(name)
            unless value.nil?
-             json_hash[Utils.camelize name, :lower] = value.is_a?(Resource) ? value.to_hash : value
+             json_hash[Utils.camelize name, :lower] = _to_hash(value)
            end
          end
          json_hash
        end
 
+       def _to_hash(value)
+         if value.is_a?(Resource)
+           value.to_hash
+         elsif value.is_a?(Array)
+           value.map { |v| _to_hash(v) }
+         else
+           value
+         end
+       end
+
        def to_json
          to_hash.to_json
        end

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/remote/model_spec.rb

@@ -88,7 +88,7 @@ describe KillBillClient::Model do
 
     timeline.account.external_key.should == external_key
     timeline.account.account_id.should_not be_nil
-    
+
     timeline.invoices.should be_a_kind_of Array
     timeline.invoices.should_not be_empty
     timeline.payments.should be_a_kind_of Array
@@ -104,6 +104,40 @@ 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'
+
+    # Check the account balance
+    account = KillBillClient::Model::Account.find_by_id account.account_id, true
+    account.account_balance.should == 0
+
+    # 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
+
+    # 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'
+
+    # 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
   end
 
   it 'should manipulate tag definitions' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -553160826528474314
+      hash: -442212084689921420
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25