killbill 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce31dbfe71c1ea2aae402a3a5f30d4635f1f44dc
-  data.tar.gz: 028044c61a02e5957099524601055f15c596e9a8
+  metadata.gz: 840154880668dbe44506afa06448cca00b735211
+  data.tar.gz: ab55ade3ab7c798f73dd41ae6ea5416ccee13b54
 SHA512:
-  metadata.gz: 579efbe60b305303205c3e2cedc03b66cd6b2622244f304b0d05f5fe87729edeff61c07c7117819f38d422d48e8cb8d563c5e5f6759f3ba4fd79eaf061ffc55d
-  data.tar.gz: 99c8c98f3085e9fa83b1745cef3bd224c74c23efdd394a56cf9dde919ffc1090f59d96873d8fe7c64a1d0d9eadcef0a72fe7bdcff7d38dbc94310c5e37ad398d
+  metadata.gz: 4a45e5751639706d0796ef92704f9ef92b3ee7ac14ff8e292254560d5b7e4bcb2bf59c0ff019948af8962c3b8810b82f168113d4d514f6746551238c2ae24bd9
+  data.tar.gz: ce45e19db6c7fa36e955fd250c36cbae052f0d4b86761d10974928e03596b98058a045a571eb757704fc8f85aae4ed8635a919091759a44405d3bbd8fadf8744

data/NEWS

@@ -1,3 +1,6 @@
+3.1.7
+    Support more Logger APIs
+
 3.1.6
     Updates to support killbill-api 0.9.8
     Fix properties handling in add_payment_method

data/VERSION

@@ -1 +1 @@
-3.1.6
+3.1.7

data/generators/active_merchant/templates/config.yml.rb

@@ -6,8 +6,13 @@
   :adapter: sqlite3
   :database: test.db
 # For MySQL
-#  :adapter: 'jdbc'
+#  :adapter: 'jdbcmysql'
 #  :username: 'killbill'
 #  :password: 'killbill'
 #  :driver: 'com.mysql.jdbc.Driver'
 #  :url: 'jdbc:mysql://127.0.0.1:3306/killbill'
+# In Kill Bill
+#  :adapter: 'jdbcmysql'
+#  :jndi: 'killbill/osgi/jdbc'
+#  :driver: 'com.mysql.jdbc.Driver'
+#  :connection_alive_sql: 'select 1'

data/lib/killbill/killbill_logger.rb

@@ -8,24 +8,24 @@ module Killbill
       attr_accessor :log_level
 
       def initialize(delegate)
-        @logger = delegate
+        @logger    = delegate
         # Match Logger levels
         @log_level = 1 # Logger::INFO
       end
 
-      def debug(message, &block)
+      def debug(message=nil, &block)
         @logger.log(4, build_message(message, &block))
       end
 
-      def info(message, &block)
+      def info(message=nil, &block)
         @logger.log(3, build_message(message, &block))
       end
 
-      def warn(message, &block)
+      def warn(message=nil, &block)
         @logger.log(2, build_message(message, &block))
       end
 
-      def error(message, &block)
+      def error(message=nil, &block)
         @logger.log(1, build_message(message, &block))
       end
 
@@ -39,15 +39,34 @@ module Killbill
       def close
       end
 
-      def build_message(message, &block)
+      def add(severity, message = nil, progname = nil, &block)
+        case severity
+          when 0 # Logger::DEBUG
+            debug(message || progname, &block)
+          when 1 # Logger::INFO
+            info(message || progname, &block)
+          when 2 # Logger::WARN
+            warn(message || progname, &block)
+          when 3 # Logger::ERROR
+            error(message || progname, &block)
+          when 4 # Logger::FATAL
+            fatal(message || progname, &block)
+          when 5 # Logger::UNKNOWN
+            info(message || progname, &block)
+          else
+            info(message || progname, &block)
+        end
+      end
+
+      def build_message(message=nil, &block)
         if message.nil?
           if block_given?
             message = yield
           else
-            message = "(nil)"
+            message = '(nil)'
           end
         end
-        message.nil? ? "(nil)" : message.to_s
+        message.nil? ? '(nil)' : message.to_s
       end
 
       alias_method :fatal, :error

data/spec/killbill/killbill_logger_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Killbill::Plugin::KillbillLogger do
+
+  it 'should support Logger APIs' do
+    logger = Killbill::Plugin::KillbillLogger.new(::Logger.new(STDOUT))
+    logger.fatal { "Argument 'foo' not given." }
+    logger.error "Argument #{@foo} mismatch."
+    logger.info('initialize') { 'Initializing...' }
+    logger.add(Logger::FATAL) { 'Fatal error!' }
+    logger.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -353,6 +353,7 @@ files:
 - spec/killbill/helpers/transaction_spec.rb
 - spec/killbill/helpers/utils_spec.rb
 - spec/killbill/killbill_integration_spec.rb
+- spec/killbill/killbill_logger_spec.rb
 - spec/killbill/killbillapi_spec.rb
 - spec/killbill/notification_plugin_api_spec.rb
 - spec/killbill/notification_plugin_spec.rb
@@ -400,6 +401,7 @@ test_files:
 - spec/killbill/helpers/transaction_spec.rb
 - spec/killbill/helpers/utils_spec.rb
 - spec/killbill/killbill_integration_spec.rb
+- spec/killbill/killbill_logger_spec.rb
 - spec/killbill/killbillapi_spec.rb
 - spec/killbill/notification_plugin_api_spec.rb
 - spec/killbill/notification_plugin_spec.rb