braintree 1.1.2 → 1.1.3

data/lib/braintree/configuration.rb

@@ -90,6 +90,15 @@ module Braintree
       end
     end
 
+    def self.custom_user_agent=(custom_user_agent)
+      @custom_user_agent = custom_user_agent
+    end
+
+    def self.user_agent
+      base_user_agent = "Braintree Ruby Gem #{Braintree::Version::String}"
+      @custom_user_agent ? "#{base_user_agent} (#{@custom_user_agent})" : base_user_agent
+    end
+
     def self._default_logger # :nodoc:
       logger = Logger.new(STDOUT)
       logger.level = Logger::INFO

data/lib/braintree/credit_card.rb

@@ -191,11 +191,7 @@ module Braintree
     end
 
     def self._create_signature # :nodoc:
-      [
-        :customer_id, :cardholder_name, :cvv, :number, :expiration_date, :expiration_month, :expiration_year, :token,
-        {:options => [:verify_card]},
-        {:billing_address => [:first_name, :last_name, :company, :country_name, :extended_address, :locality, :region, :postal_code, :street_address]}
-      ]
+      _update_signature + [:customer_id]
     end
 
     def self._new(*args) # :nodoc:
@@ -226,9 +222,9 @@ module Braintree
 
     def self._update_signature # :nodoc:
       [
-        :cardholder_name, :cvv, :number, :expiration_date, :expiration_month, :expiration_year, :token,
+        :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number, :token,
         {:options => [:verify_card]},
-        {:billing_address => [:first_name, :last_name, :company, :country_name, :extended_address, :locality, :region, :postal_code, :street_address]}
+        {:billing_address => [:company, :country_name, :extended_address, :first_name, :last_name, :locality, :postal_code, :region, :street_address]}
       ]
     end
 

data/lib/braintree/customer.rb

@@ -79,7 +79,7 @@ module Braintree
     end
 
     def self.find(customer_id)
-      raise ArgumentError, "customer_id should be a string" unless customer_id.is_a?(String)
+      raise ArgumentError, "customer_id contains invalid characters" unless customer_id.to_s =~ /\A[\w-]+\z/
       raise ArgumentError, "customer_id cannot be blank" if customer_id.to_s == ""
       response = Http.get("/customers/#{customer_id}")
       new(response[:customer])

data/lib/braintree/http.rb

@@ -53,7 +53,7 @@ module Braintree
       connection.start do |http|
         request = http_verb.new("#{Configuration.base_merchant_path}#{path}")
         request["Accept"] = "application/xml"
-        request["User-Agent"] = "Braintree Ruby Gem #{Braintree::Version::String}"
+        request["User-Agent"] = Configuration.user_agent
         request["Accept-Encoding"] = "gzip"
         request["X-ApiVersion"] = Configuration::API_VERSION
         request.basic_auth Configuration.public_key, Configuration.private_key

data/lib/braintree/util.rb

@@ -1,7 +1,7 @@
 module Braintree
   module Util # :nodoc:
     def self.extract_attribute_as_array(hash, attribute)
-      value = hash.delete(attribute)
+      value = hash.has_key?(attribute) ? hash.delete(attribute) : []
       value.is_a?(Array) ? value : [value]
     end
 

data/lib/braintree/version.rb

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

data/spec/integration/braintree/customer_spec.rb

@@ -498,13 +498,13 @@ describe Braintree::Customer do
     it "raises an ArgumentError if customer_id is not a string" do
       expect do
         Braintree::Customer.find(Object.new)
-      end.to raise_error(ArgumentError, "customer_id should be a string")
+      end.to raise_error(ArgumentError, "customer_id contains invalid characters")
     end
 
     it "raises an ArgumentError if customer_id is blank" do
       expect do
         Braintree::Customer.find("")
-      end.to raise_error(ArgumentError, "customer_id cannot be blank")
+      end.to raise_error(ArgumentError, "customer_id contains invalid characters")
     end
 
     it "raises a NotFoundError exception if customer cannot be found" do

data/spec/integration/braintree/subscription_spec.rb

@@ -198,10 +198,11 @@ describe Braintree::Subscription do
           :payment_method_token => @credit_card.token,
           :plan_id => TrialPlan[:id],
           :trial_period => true,
+          :trial_duration => 2,
           :trial_duration_unit => nil
         )
         result.success?.should == false
-        result.errors.for(:subscription)[0].message.should == "Trial Duration Unit is invalid."
+        result.errors.for(:subscription).on(:trial_duration_unit)[0].message.should == "Trial Duration Unit is invalid."
       end
 
     end

data/spec/unit/braintree/configuration_spec.rb

@@ -197,4 +197,19 @@ describe Braintree::Configuration do
     end
   end
 
+  describe "self.user_agent" do
+    after :each do
+      Braintree::Configuration.custom_user_agent = nil
+    end
+
+    it "appends the default user_agent with the given value" do
+      Braintree::Configuration.custom_user_agent = "ActiveMerchant 1.2.3"
+      Braintree::Configuration.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String} (ActiveMerchant 1.2.3)"
+    end
+
+    it "does not append anything if there is no custom_user_agent" do
+      Braintree::Configuration.custom_user_agent = nil
+      Braintree::Configuration.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String}"
+    end
+  end
 end

data/spec/unit/braintree/credit_card_spec.rb

@@ -9,6 +9,18 @@ describe Braintree::CreditCard do
     end
   end
 
+  describe "self.create_signature" do
+    it "should include customer_id" do
+      Braintree::CreditCard._create_signature.should include(:customer_id)
+    end
+  end
+
+  describe "self.update_signature" do
+    it "should not include customer_id" do
+      Braintree::CreditCard._update_signature.should_not include(:customer_id)
+    end
+  end
+
   describe "self.create_from_transparent_redirect" do
     it "raises an exception if the query string is forged" do
       expect do

data/spec/unit/braintree/util_spec.rb

@@ -137,6 +137,12 @@ describe Braintree::Util do
       result = Braintree::Util.extract_attribute_as_array(hash, :foo)
       result.should == ["one", "two"]
     end
+
+    it "returns empty array if the attribute is not in the hash" do
+      hash = {:foo => ["one", "two"], :bar => :baz}
+      result = Braintree::Util.extract_attribute_as_array(hash, :quz)
+      result.should == []
+    end
   end
 
   describe "self.hash_to_query_string" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Braintree Payment Solutions
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -05:00
+date: 2010-04-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -109,18 +114,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: braintree
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library