braintree 2.5.1 → 2.5.2

data/lib/braintree.rb

@@ -39,7 +39,6 @@ require "braintree/errors"
 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 @@ require "braintree/xml/libxml"
 require "braintree/xml/rexml"
 require "braintree/xml/parser"
 
-Braintree::SSLExpirationCheck.check_dates
-

data/lib/braintree/configuration.rb

@@ -6,7 +6,7 @@ module Braintree
     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 @@ module Braintree
       Http.new(self)
     end
 
+    def logger
+      @logger ||= self.class._default_logger
+    end
+
     def port # :nodoc:
       case @environment
       when :development

data/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

data/spec/unit/braintree/configuration_spec.rb

@@ -63,6 +63,18 @@ describe Braintree::Configuration do
     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)

data/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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 2
   - 5
-  - 1
-  version: 2.5.1
+  - 2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Braintree Payment Solutions
@@ -22,11 +21,9 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,7 +61,6 @@ files:
 - lib/braintree/http.rb
 - lib/braintree/modification.rb
 - lib/braintree/resource_collection.rb
-- lib/braintree/ssl_expiration_check.rb
 - lib/braintree/subscription.rb
 - lib/braintree/subscription_gateway.rb
 - lib/braintree/subscription_search.rb
@@ -97,7 +93,6 @@ files:
 - spec/integration/braintree/customer_spec.rb
 - spec/integration/braintree/error_codes_spec.rb
 - spec/integration/braintree/http_spec.rb
-- spec/integration/braintree/ssl_expiration_check_spec.rb
 - spec/integration/braintree/subscription_spec.rb
 - spec/integration/braintree/test/transaction_amounts_spec.rb
 - spec/integration/braintree/transaction_search_spec.rb
@@ -147,27 +142,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: braintree
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library

data/lib/braintree/ssl_expiration_check.rb

@@ -1,27 +0,0 @@
-module Braintree
-  module SSLExpirationCheck # :nodoc:
-    class << self
-      attr_reader :ssl_expiration_dates_checked
-    end
-
-    def self.check_dates # :nodoc:
-      {
-        "Sandbox" => sandbox_expiration_date,
-        "Production" => production_expiration_date
-      }.each do |host, expiration_date|
-        if Date.today + (3 * 30) > expiration_date
-          Configuration.logger.warn "[Braintree] The SSL Certificate for the #{host} environment will expire on #{expiration_date}. Please check for an updated client library."
-        end
-      end
-      @ssl_expiration_dates_checked = true
-    end
-
-    def self.production_expiration_date # :nodoc:
-      Date.civil(2012, 1, 8)
-    end
-
-    def self.sandbox_expiration_date # :nodoc:
-      Date.civil(2010, 12, 1)
-    end
-  end
-end

data/spec/integration/braintree/ssl_expiration_check_spec.rb

@@ -1,93 +0,0 @@
-require File.dirname(__FILE__) + "/../spec_helper"
-
-# Helper method to confirm we have the right values
-def fetch_expiration_date(host, port=443)
-  cmd = "echo | openssl s_client -connect #{host}:#{port} 2>&1 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | openssl x509 -noout -subject -dates | grep notAfter"
-  date = `#{cmd}`.sub(/^.*=/, '')
-
-  Date.parse(date)
-end
-
-describe Braintree::SSLExpirationCheck do
-  SANDBOX = "sandbox.braintreegateway.com"
-  PRODUCTION = "www.braintreegateway.com"
-
-  describe "check_dates" do
-    it "is done when the client library is loaded" do
-      Braintree::SSLExpirationCheck.ssl_expiration_dates_checked.should == true
-    end
-
-    describe "Sandbox Cert" do
-      it "logs when the cert is expired" do
-        Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today - 1)
-
-        output = StringIO.new
-        Braintree::Configuration.logger = Logger.new(output)
-        Braintree::Configuration.logger.level = Logger::WARN
-
-        Braintree::SSLExpirationCheck.check_dates
-
-        output.string.should match(/\[Braintree\] The SSL Certificate for the Sandbox environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
-      end
-
-      it "logs when the cert is close to expiring" do
-        Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today)
-        output = StringIO.new
-        Braintree::Configuration.logger = Logger.new(output)
-        Braintree::Configuration.logger.level = Logger::WARN
-
-        Braintree::SSLExpirationCheck.check_dates
-
-        output.string.should match(/\[Braintree\] The SSL Certificate for the Sandbox environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
-      end
-
-      it "doesn't log when the cert is not expired" do
-        Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today + 365)
-        output = StringIO.new
-        Braintree::Configuration.logger = Logger.new(output)
-        Braintree::Configuration.logger.level = Logger::WARN
-
-        Braintree::SSLExpirationCheck.check_dates
-
-        output.string.should == ""
-      end
-    end
-
-    # We assume that testing logging for one is good enough for all, so we won't duplicate those tests from above
-    it "checks the sandbox cert" do
-      Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today)
-      output = StringIO.new
-      Braintree::Configuration.logger = Logger.new(output)
-      Braintree::Configuration.logger.level = Logger::WARN
-
-      Braintree::SSLExpirationCheck.check_dates
-
-      output.string.should match(/\[Braintree\] The SSL Certificate for the Sandbox environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
-    end
-
-    it "checks the production server cert" do
-      Braintree::SSLExpirationCheck.stub(:production_expiration_date).and_return(Date.today)
-      output = StringIO.new
-      Braintree::Configuration.logger = Logger.new(output)
-      Braintree::Configuration.logger.level = Logger::WARN
-
-      Braintree::SSLExpirationCheck.check_dates
-
-      output.string.should match(/\[Braintree\] The SSL Certificate for the Production environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
-    end
-  end
-
-  describe "production_expiration_date" do
-    it "is the date the production cert expires" do
-      Braintree::SSLExpirationCheck.production_expiration_date.should be_a(Date)
-      Braintree::SSLExpirationCheck.production_expiration_date.should == fetch_expiration_date(PRODUCTION)
-    end
-  end
-
-  describe "sandbox_expiration_date" do
-    it "is the date the Sandbox cert expires" do
-      Braintree::SSLExpirationCheck.sandbox_expiration_date.should be_a(Date)
-      Braintree::SSLExpirationCheck.sandbox_expiration_date.should == fetch_expiration_date(SANDBOX)
-    end
-  end
-end