killbill 9.4.0 → 9.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5f16eb8d2d7d84e106cd72a7641f4c5df8e1c1
-  data.tar.gz: 808645deb5a84812d8cdd31e3333d07c25288d83
+  metadata.gz: b2ed9bf17849149d7c821a00f0b72a71944bf65e
+  data.tar.gz: 00e2b87c71e9840ffea55aaf5b1c81bec35d6459
 SHA512:
-  metadata.gz: 984159049756726d30838852e556628bf8357b3700ac176dd19aece003f79e625778cf5a326ab08f0fd04463f249fe672619173685fa662d67d4a7e0d8020e88
-  data.tar.gz: 268ee0eb07937c1cd1664d23daf43bd43591fa280c1e64db6c40504eaf869f8890a088578517e8cc02aeeecc48e2c7498d2df06ebef10b58bbf48f86717a4bcc
+  metadata.gz: 6c4bbbea7c699ab7a6bb98bbd8942a6fdb0c29eeaca8e18707029eede4bbd650b36ac1bff3a90bcf2220a65904a73c13c9fbeb299d1f4cb04a4ed7ee827b1358
+  data.tar.gz: b5837953b7f37a6cdd46ebf4feaa35113fd510012d319fbe8bbc710f1c8aef0a0744796e7cd5b03ca54e74d54ef3e58ef84a04a76f37a68352fcc7595270ff68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (9.4.0)
+    killbill (9.4.1)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)

data/NEWS

@@ -1,3 +1,7 @@
+9.4.1
+    Make max_nb_records query configurable
+    https://github.com/killbill/killbill-plugin-framework-ruby/issues/54
+
 9.4.0
     Update to Kill Bill 0.19.18 APIs
 

data/lib/killbill/gen/api/account.rb

@@ -164,13 +164,13 @@ module Killbill
           # conversion for time_zone [type = org.joda.time.DateTimeZone]
           @time_zone = j_obj.time_zone
           if !@time_zone.nil?
-            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id) rescue @time_zone.get_id
           end
 
           # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
           @fixed_offset_time_zone = j_obj.fixed_offset_time_zone
           if !@fixed_offset_time_zone.nil?
-            @fixed_offset_time_zone = TZInfo::Timezone.get(@fixed_offset_time_zone.get_id)
+            @fixed_offset_time_zone = TZInfo::Timezone.get(@fixed_offset_time_zone.get_id) rescue @fixed_offset_time_zone.get_id
           end
 
           # conversion for reference_time [type = org.joda.time.DateTime]

data/lib/killbill/gen/api/account_data.rb

@@ -148,7 +148,7 @@ module Killbill
           # conversion for time_zone [type = org.joda.time.DateTimeZone]
           @time_zone = j_obj.time_zone
           if !@time_zone.nil?
-            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id) rescue @time_zone.get_id
           end
 
           # conversion for locale [type = java.lang.String]

data/lib/killbill/gen/api/immutable_account_data.rb

@@ -82,13 +82,13 @@ module Killbill
           # conversion for time_zone [type = org.joda.time.DateTimeZone]
           @time_zone = j_obj.time_zone
           if !@time_zone.nil?
-            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id) rescue @time_zone.get_id
           end
 
           # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
           @fixed_offset_time_zone = j_obj.fixed_offset_time_zone
           if !@fixed_offset_time_zone.nil?
-            @fixed_offset_time_zone = TZInfo::Timezone.get(@fixed_offset_time_zone.get_id)
+            @fixed_offset_time_zone = TZInfo::Timezone.get(@fixed_offset_time_zone.get_id) rescue @fixed_offset_time_zone.get_id
           end
 
           # conversion for reference_time [type = org.joda.time.DateTime]

data/lib/killbill/gen/api/mutable_account_data.rb

@@ -148,7 +148,7 @@ module Killbill
           # conversion for time_zone [type = org.joda.time.DateTimeZone]
           @time_zone = j_obj.time_zone
           if !@time_zone.nil?
-            @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
+            @time_zone = TZInfo::Timezone.get(@time_zone.get_id) rescue @time_zone.get_id
           end
 
           # conversion for locale [type = java.lang.String]

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -198,7 +198,7 @@ module Killbill
             pagination                  = ::Killbill::Plugin::Model::Pagination.new
             pagination.current_offset   = offset
             pagination.total_nb_records = self.count_by_sql(self.search_query(search_key, kb_tenant_id))
-            pagination.max_nb_records   = self.where(:success => true).count
+            pagination.max_nb_records   = self.max_nb_records
             pagination.next_offset      = (!pagination.total_nb_records.nil? && offset + limit >= pagination.total_nb_records) ? nil : offset + limit
             # Reduce the limit if the specified value is larger than the number of records
             actual_limit                = [pagination.max_nb_records, limit].min
@@ -218,6 +218,10 @@ module Killbill
             []
           end
 
+          def self.max_nb_records
+            self.where(:success => true).count
+          end
+
           # Override in your plugin if needed
           def txn_id
             authorization

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '9.4.0'
+  VERSION = '9.4.1'
 end

data/spec/killbill/gen_conversions_spec.rb

@@ -53,6 +53,51 @@ describe Killbill::Plugin do
     check_notification(jgw_notification2)
   end
 
+  it 'should be able to handle UTC as the fixed offset timezone' do
+    jaccount = ::Killbill::Plugin::Model::Account.new
+    jaccount.id = java.util.UUID.fromString('cf5a597a-cf15-45d3-8f02-95371be7f927')
+    jaccount.time_zone = org.joda.time.DateTimeZone.forID('Etc/UTC')
+    jaccount.reference_time = org.joda.time.DateTime.new('2015-09-01T08:01:01.000Z')
+    jaccount.fixed_offset_time_zone = org.killbill.billing.util.account.AccountDateTimeUtils.getFixedOffsetTimeZone(jaccount)
+
+    raccount = Killbill::Plugin::Model::Account.new.to_ruby(jaccount)
+    raccount.id.should == 'cf5a597a-cf15-45d3-8f02-95371be7f927'
+    raccount.time_zone.should be_an_instance_of TZInfo::DataTimezone
+    raccount.time_zone.to_s.should == 'Etc - UTC'
+    raccount.reference_time.should == '2015-09-01T08:01:01.000Z'
+    raccount.fixed_offset_time_zone.should be_an_instance_of TZInfo::DataTimezone
+    raccount.fixed_offset_time_zone.to_s.should == 'UTC'
+
+    jaccount2 = raccount.to_java
+    jaccount2.id.should == jaccount.id
+    jaccount2.time_zone.should == jaccount.time_zone
+    jaccount2.reference_time.to_s.should == '2015-09-01T08:01:01.000Z'
+    jaccount2.fixed_offset_time_zone.should == jaccount.fixed_offset_time_zone
+  end
+
+  it 'should be able to handle a non-UTC fixed offset timezone' do
+    jaccount = ::Killbill::Plugin::Model::Account.new
+    jaccount.id = java.util.UUID.fromString('cf5a597a-cf15-45d3-8f02-95371be7f927')
+    # Alaska Standard Time
+    jaccount.time_zone = org.joda.time.DateTimeZone.forID('America/Juneau')
+    # Time zone is AKDT (UTC-8h) between March and November
+    jaccount.reference_time = org.joda.time.DateTime.new('2015-09-01T08:01:01.000Z')
+    jaccount.fixed_offset_time_zone = org.killbill.billing.util.account.AccountDateTimeUtils.getFixedOffsetTimeZone(jaccount)
+
+    raccount = Killbill::Plugin::Model::Account.new.to_ruby(jaccount)
+    raccount.id.should == 'cf5a597a-cf15-45d3-8f02-95371be7f927'
+    raccount.time_zone.should be_an_instance_of TZInfo::DataTimezone
+    raccount.time_zone.to_s.should == 'America - Juneau'
+    raccount.reference_time.should == '2015-09-01T08:01:01.000Z'
+    raccount.fixed_offset_time_zone.should == '-08:00'
+
+    jaccount2 = raccount.to_java
+    jaccount2.id.should == jaccount.id
+    jaccount2.time_zone.should == jaccount.time_zone
+    jaccount2.reference_time.to_s.should == '2015-09-01T08:01:01.000Z'
+    jaccount2.fixed_offset_time_zone.should == jaccount.fixed_offset_time_zone
+  end
+
   private
 
   def check_notification(notification)

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -367,6 +367,14 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
       results.count.should == 1
       results.last.kb_payment_id.to_s.should == response.kb_payment_id
     end
+
+    it "supports decimal currencies" do
+      plugin.to_cents(BigDecimal.new('100'), 'USD').should == 10000
+    end
+
+    it "supports non-decimal currencies" do
+      plugin.to_cents(BigDecimal.new('100'), 'JPY').should == 100
+    end
   end
 
   context 'with a dummy gateway' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.4.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement