stripe 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6007a4a7e4fe882d757b6d98c32a8c4ebe5cd0
-  data.tar.gz: 11fd5cc602368b14af8e2026d7e4443b1ea5e8be
+  metadata.gz: 93c701571b0b8167fe9a2816d458715fe646e0fa
+  data.tar.gz: 27a4af6cf8afca19384f7d9901b2980ac8da0d93
 SHA512:
-  metadata.gz: '0499ecd568b1dc51b3dba91ca087640d68201858de6d836cd0fbaf4ef8762e7264144ac45cd4e4e5c1c4795aa58bbc81f3b4b9d125006540549e08fe7c16fafb'
-  data.tar.gz: 59c86405800248611f69e91a55bbf32d3885beb90ee06cd36e89bad93ee84bf0927624f292b694e99c94e286164136aff9da6eb64a33a5f9bfd47fca417444ec
+  metadata.gz: f8ebb06861148fe8e40b2737cf5f65f00e11921e6b6d4ddd790126da4d3dfa5be3ed01353a5538bfaccfc8d0fa2027d96b2ae40659e22f8b88a99f897928640f
+  data.tar.gz: 1971744e0adf6616d472967740b8bd321cd1dc6d639ec582d436560eca093446021435f702c8662632ece248eff119019322a7e327f8b79bb025877ca589bc89

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.3.0 2017-08-11
+
+* Add support for standard library logger interface with `Stripe.logger`
+* Error logs now go to stderr if using `Stripe.log_level`/`STRIPE_LOG`
+* `Stripe.log_level`/`STRIPE_LOG` now support `Stipe::LEVEL_ERROR`
+
 === 3.2.0 2017-08-03
 
 * Add logging for request retry account and `Stripe-Account` header

data/README.md

@@ -150,7 +150,7 @@ There are a few options for enabling it:
 
 2. Set `Stripe.log_level`:
    ``` ruby
-   Stripe.log_level = "info"
+   Stripe.log_level = Stripe::LEVEL_INFO
    ```
 
 ### Writing a Plugin

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/stripe.rb

@@ -1,6 +1,7 @@
 # Stripe Ruby bindings
 # API spec at https://stripe.com/docs/api
 require 'cgi'
+require 'logger'
 require 'openssl'
 require 'rbconfig'
 require 'set'
@@ -84,6 +85,7 @@ module Stripe
   @uploads_base = 'https://uploads.stripe.com'
 
   @log_level = nil
+  @logger = nil
 
   @max_network_retries = 0
   @max_network_retry_delay = 2
@@ -144,24 +146,51 @@ module Stripe
     end
   end
 
-  LEVEL_DEBUG = "debug"
-  LEVEL_INFO = "info"
+  # map to the same values as the standard library's logger
+  LEVEL_DEBUG = Logger::DEBUG
+  LEVEL_ERROR = Logger::ERROR
+  LEVEL_INFO = Logger::INFO
 
-  # When set prompts the library to log some extra information to $stdout about
-  # what it's doing. For example, it'll produce information about requests,
-  # responses, and errors that are received. Valid log levels are `debug` and
-  # `info`, with `debug` being a little more verbose in places.
+  # When set prompts the library to log some extra information to $stdout and
+  # $stderr about what it's doing. For example, it'll produce information about
+  # requests, responses, and errors that are received. Valid log levels are
+  # `debug` and `info`, with `debug` being a little more verbose in places.
+  #
+  # Use of this configuration is only useful when `.logger` is _not_ set. When
+  # it is, the decision what levels to print is entirely deferred to the logger.
   def self.log_level
     @log_level
   end
 
   def self.log_level=(val)
-    if val != nil && ![LEVEL_DEBUG, LEVEL_INFO].include?(val)
+    # Backwards compatibility for values that we briefly allowed
+    if val == "debug"
+      val = LEVEL_DEBUG
+    elsif val == "info"
+      val = LEVEL_INFO
+    end
+
+    if val != nil && ![LEVEL_DEBUG, LEVEL_ERROR, LEVEL_INFO].include?(val)
       raise ArgumentError, "log_level should only be set to `nil`, `debug` or `info`"
     end
     @log_level = val
   end
 
+  # Sets a logger to which logging output will be sent. The logger should
+  # support the same interface as the `Logger` class that's part of Ruby's
+  # standard library (hint, anything in `Rails.logger` will likely be
+  # suitable).
+  #
+  # If `.logger` is set, the value of `.log_level` is ignored. The decision on
+  # what levels to print is entirely deferred to the logger.
+  def self.logger
+    @logger
+  end
+
+  def self.logger=(val)
+    @logger = val
+  end
+
   def self.max_network_retries
     @max_network_retries
   end

data/lib/stripe/stripe_client.rb

@@ -279,7 +279,7 @@ module Stripe
     end
 
     def specific_api_error(resp, error_data, context)
-      Util.log_info('Stripe API error',
+      Util.log_error('Stripe API error',
         status: resp.http_status,
         error_code: error_data['code'],
         error_message: error_data['message'],
@@ -336,7 +336,7 @@ module Stripe
     def specific_oauth_error(resp, error_code, context)
       description = resp.data[:error_description] || error_code
 
-      Util.log_info('Stripe OAuth error',
+      Util.log_error('Stripe OAuth error',
         status: resp.http_status,
         error_code: error_code,
         error_description: description,
@@ -364,7 +364,7 @@ module Stripe
     end
 
     def handle_network_error(e, context, num_retries, api_base=nil)
-      Util.log_info('Stripe OAuth error',
+      Util.log_error('Stripe network error',
         error_message: e.message,
         idempotency_key: context.idempotency_key,
         request_id: context.request_id
@@ -481,7 +481,7 @@ module Stripe
     private :log_response
 
     def log_response_error(context, request_start, e)
-      Util.log_info("Request error",
+      Util.log_error("Request error",
         elapsed: Time.now - request_start,
         error_message: e.message,
         idempotency_key: context.idempotency_key,

data/lib/stripe/util.rb

@@ -89,17 +89,27 @@ module Stripe
       end
     end
 
+    def self.log_error(message, data = {})
+      if !Stripe.logger.nil? ||
+          !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_ERROR
+        log_internal(message, data, color: :cyan,
+          level: Stripe::LEVEL_ERROR, logger: Stripe.logger, out: $stderr)
+      end
+    end
+
     def self.log_info(message, data = {})
-      if Stripe.log_level == Stripe::LEVEL_DEBUG ||Stripe.log_level == Stripe::LEVEL_INFO
+      if !Stripe.logger.nil? ||
+          !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_INFO
         log_internal(message, data, color: :cyan,
-          level: Stripe::LEVEL_INFO, out: $stdout)
+          level: Stripe::LEVEL_INFO, logger: Stripe.logger, out: $stdout)
       end
     end
 
     def self.log_debug(message, data = {})
-      if Stripe.log_level == Stripe::LEVEL_DEBUG
+      if !Stripe.logger.nil? ||
+          !Stripe.log_level.nil? && Stripe.log_level <= Stripe::LEVEL_DEBUG
         log_internal(message, data, color: :blue,
-          level: Stripe::LEVEL_DEBUG, out: $stdout)
+          level: Stripe::LEVEL_DEBUG, logger: Stripe.logger, out: $stdout)
       end
     end
 
@@ -338,23 +348,39 @@ module Stripe
     end
     private_class_method :colorize
 
+    # Turns an integer log level into a printable name.
+    def self.level_name(level)
+      case level
+      when LEVEL_DEBUG then "debug"
+      when LEVEL_ERROR then "error"
+      when LEVEL_INFO  then "info"
+      else level
+      end
+    end
+    private_class_method :level_name
+
     # TODO: Make these named required arguments when we drop support for Ruby
     # 2.0.
-    def self.log_internal(message, data = {}, color: nil, level: nil, out: nil)
+    def self.log_internal(message, data = {}, color: nil, level: nil, logger: nil, out: nil)
       data_str = data.select { |k,v| !v.nil? }.
         map { |(k,v)|
           "%s=%s" % [
-            colorize(k, color, out.isatty),
+            colorize(k, color, !out.nil? && out.isatty),
             wrap_logfmt_value(v)
           ]
         }.join(" ")
 
-      if out.isatty
+      if !logger.nil?
+        # the library's log levels are mapped to the same values as the
+        # standard library's logger
+        logger.log(level,
+          "message=%s %s" % [wrap_logfmt_value(message), data_str])
+      elsif out.isatty
         out.puts "%s %s %s" %
-          [colorize(level[0, 4].upcase, color, out.isatty), message, data_str]
+          [colorize(level_name(level)[0, 4].upcase, color, out.isatty), message, data_str]
       else
         out.puts "message=%s level=%s %s" %
-          [wrap_logfmt_value(message), level, data_str]
+          [wrap_logfmt_value(message), level_name(level), data_str]
       end
     end
     private_class_method :log_internal

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/test/stripe/stripe_client_test.rb

@@ -240,7 +240,7 @@ module Stripe
             param: 'param',
             type: 'type',
           }
-          Util.expects(:log_info).with('Stripe API error',
+          Util.expects(:log_error).with('Stripe API error',
             status: 500,
             error_code: error['code'],
             error_message: error['message'],
@@ -282,7 +282,7 @@ module Stripe
             status: 400
           )
 
-          Util.expects(:log_info).with('Stripe OAuth error',
+          Util.expects(:log_error).with('Stripe OAuth error',
             status: 400,
             error_code: "invalid_request",
             error_description: "No grant type specified",

data/test/stripe/util_test.rb

@@ -168,12 +168,16 @@ module Stripe
         @old_log_level = Stripe.log_level
         Stripe.log_level = nil
 
+        @old_stderr = $stderr
+        $stderr = StringIO.new
+
         @old_stdout = $stdout
         $stdout = StringIO.new
       end
 
       teardown do
         Stripe.log_level = @old_log_level
+        $stderr = @old_stderr
         $stdout = @old_stdout
       end
 
@@ -189,6 +193,12 @@ module Stripe
           assert_equal "message=foo level=debug \n", $stdout.string
         end
 
+        should "not log if level set to error" do
+          Stripe.log_level = Stripe::LEVEL_ERROR
+          Util.log_debug("foo")
+          assert_equal "", $stdout.string
+        end
+
         should "not log if level set to info" do
           Stripe.log_level = Stripe::LEVEL_INFO
           Util.log_debug("foo")
@@ -196,6 +206,31 @@ module Stripe
         end
       end
 
+      context ".log_error" do
+        should "not log if logging is disabled" do
+          Util.log_error("foo")
+          assert_equal "", $stdout.string
+        end
+
+        should "log if level set to debug" do
+          Stripe.log_level = Stripe::LEVEL_DEBUG
+          Util.log_error("foo")
+          assert_equal "message=foo level=error \n", $stderr.string
+        end
+
+        should "log if level set to error" do
+          Stripe.log_level = Stripe::LEVEL_ERROR
+          Util.log_error("foo")
+          assert_equal "message=foo level=error \n", $stderr.string
+        end
+
+        should "log if level set to info" do
+          Stripe.log_level = Stripe::LEVEL_INFO
+          Util.log_error("foo")
+          assert_equal "message=foo level=error \n", $stderr.string
+        end
+      end
+
       context ".log_info" do
         should "not log if logging is disabled" do
           Util.log_info("foo")
@@ -208,6 +243,12 @@ module Stripe
           assert_equal "message=foo level=info \n", $stdout.string
         end
 
+        should "not log if level set to error" do
+          Stripe.log_level = Stripe::LEVEL_ERROR
+          Util.log_debug("foo")
+          assert_equal "", $stdout.string
+        end
+
         should "log if level set to info" do
           Stripe.log_level = Stripe::LEVEL_INFO
           Util.log_info("foo")
@@ -216,6 +257,42 @@ module Stripe
       end
     end
 
+    context ".log_* with a logger" do
+      setup do
+        @out = StringIO.new
+        logger = ::Logger.new(@out)
+
+        # Set a really simple formatter to make matching output as easy as
+        # possible.
+        logger.formatter = proc { |_severity, _datetime, _progname, message|
+          message
+        }
+
+        Stripe.logger = logger
+      end
+
+      context ".log_debug" do
+        should "log to the logger" do
+          Util.log_debug("foo")
+          assert_equal "message=foo ", @out.string
+        end
+      end
+
+      context ".log_error" do
+        should "log to the logger" do
+          Util.log_error("foo")
+          assert_equal "message=foo ", @out.string
+        end
+      end
+
+      context ".log_info" do
+        should "log to the logger" do
+          Util.log_info("foo")
+          assert_equal "message=foo ", @out.string
+        end
+      end
+    end
+
     context ".normalize_headers" do
       should "normalize the format of a header key" do
         assert_equal({ "Request-Id" => nil },
@@ -255,6 +332,14 @@ module Stripe
       end
     end
 
+    context ".level_name" do
+      should "convert levels to names" do
+        assert_equal "debug", Util.send(:level_name, LEVEL_DEBUG)
+        assert_equal "error", Util.send(:level_name, LEVEL_ERROR)
+        assert_equal "info", Util.send(:level_name, LEVEL_INFO)
+      end
+    end
+
     context ".log_internal" do
       should "log in a terminal friendly way" do
         out = StringIO.new
@@ -267,7 +352,7 @@ module Stripe
         end
 
         Util.send(:log_internal, "message", { foo: "bar" },
-          color: :green, level: Stripe::LEVEL_DEBUG, out: out)
+          color: :green, level: Stripe::LEVEL_DEBUG, logger: nil, out: out)
         assert_equal "\e[0;32;49mDEBU\e[0m message \e[0;32;49mfoo\e[0m=bar\n",
           out.string
       end
@@ -275,10 +360,26 @@ module Stripe
       should "log in a data friendly way" do
         out = StringIO.new
         Util.send(:log_internal, "message", { foo: "bar" },
-          color: :green, level: Stripe::LEVEL_DEBUG, out: out)
+          color: :green, level: Stripe::LEVEL_DEBUG, logger: nil, out: out)
         assert_equal "message=message level=debug foo=bar\n",
           out.string
       end
+
+      should "log to a logger if set" do
+        out = StringIO.new
+        logger = ::Logger.new(out)
+
+        # Set a really simple formatter to make matching output as easy as
+        # possible.
+        logger.formatter = proc { |_severity, _datetime, _progname, message|
+          message
+        }
+
+        Util.send(:log_internal, "message", { foo: "bar" },
+          color: :green, level: Stripe::LEVEL_DEBUG, logger: logger, out: nil)
+        assert_equal "message=message foo=bar",
+          out.string
+      end
     end
 
     context ".wrap_logfmt_value" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday