2.5.2

CHANGELOG.rdoc

@@ -1,6 +1,11 @@
+== 2.5.2
+
+* removed ssl expiration check
+* lazy initialize Configuration.logger when directly instantiating configuration
+
 == 2.5.1
 
-* lazy initialize Configuration.logger at the class level
+* lazy initialize Configuration.logger to fix bug with ssl expiration check
 
 == 2.5.0
 

lib/braintree.rb

@@ -39,7 +39,6 @@ module Braintree
 require "braintree/gateway"
 require "braintree/http"
 require "braintree/resource_collection"
-require "braintree/ssl_expiration_check"
 require "braintree/subscription"
 require "braintree/subscription_gateway"
 require "braintree/subscription_search"
@@ -65,5 +64,3 @@ module Braintree
 require "braintree/xml/rexml"
 require "braintree/xml/parser"
 
-Braintree::SSLExpirationCheck.check_dates
-

lib/braintree/configuration.rb

@@ -6,7 +6,7 @@ class Configuration
     class << self
       attr_writer :custom_user_agent, :logger, :merchant_id, :public_key, :private_key
     end
-    attr_reader :logger, :merchant_id, :public_key, :private_key
+    attr_reader :merchant_id, :public_key, :private_key
 
     def self.expectant_reader(*attributes) # :nodoc:
       attributes.each do |attribute|
@@ -77,6 +77,10 @@ def http # :nodoc:
       Http.new(self)
     end
 
+    def logger
+      @logger ||= self.class._default_logger
+    end
+
     def port # :nodoc:
       case @environment
       when :development

lib/braintree/version.rb

@@ -2,7 +2,7 @@ module Braintree
   module Version
     Major = 2
     Minor = 5
-    Tiny = 1
+    Tiny = 2
 
     String = "#{Major}.#{Minor}.#{Tiny}"
   end

spec/unit/braintree/configuration_spec.rb

@@ -63,6 +63,18 @@
     end
   end
 
+  describe "logger" do
+    it "defaults to logging to stdout with log_level info" do
+      config = Braintree::Configuration.new
+      config.logger.level.should == Logger::INFO
+    end
+
+    it "lazily initializes so that you can do Braintree::Configuration.logger.level = when configuring the client lib" do
+      config = Braintree::Configuration.new :logger => nil
+      config.logger.should_not == nil
+    end
+  end
+
   describe "self.environment" do
     it "raises an exception if it hasn't been set yet" do
       Braintree::Configuration.instance_variable_set(:@environment, nil)

spec/unit/braintree_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe Braintree do
-  xit "ssl warning -- doesn't produce warnings if loading braintree.rb twice" do
+  it "doesn't produce warnings if loading braintree.rb twice" do
     lib_dir = File.dirname(__FILE__) + "/../../lib"
     braintree_file = "#{lib_dir}/braintree.rb"
     File.exist?(braintree_file).should == true