bronto 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ecef6f6a33b18193065318d61c2c05ad66eb6bc
-  data.tar.gz: 5bc7a98913ab5d3adc1c35cb149065c2a8715606
+  metadata.gz: b3a718a328693429d18167f9175b9aca02526a48
+  data.tar.gz: b40542d8e2d99e15ffaf3b8ed020cf6932d3eda7
 SHA512:
-  metadata.gz: 9414d10e373c8483bea255a4f465d2593edf20b3413cb83ab365185ffc83f40d553da3d44284f05916cd8a896ee44ec9caf211f3427ede18f30383a19ed42ebd
-  data.tar.gz: 562a6880bbe7f0b4d2693a1725ef105e412d799f9e9678c3834fb2bbe5ff634810e3d41e68aeff730cf24e8b13bdd92e79582ebefdb68963030fa5b1dea2d530
+  metadata.gz: dabc2a81c8582050ddbe3a06d2b7df310bf383a57a4de5cceeadc8acb98462021a58c2c5dd35e440a510c1ee4b15dc24f35f2dedb43c6f137174ffb9340baff6
+  data.tar.gz: 04204bdb29158c915fab4ebb16afbb032e67a9b76db1c6b6fe6b18a1149fb6c9330159ed01c6336de5ca8a0f564156f081106f5123342bf16b20613f49ab290d

data/lib/bronto/base.rb

@@ -20,6 +20,10 @@ module Bronto
       @@api_key
     end
 
+    def self.connection_cache
+      @@connection_cache ||= {}
+    end
+
     # Simple helper method to convert class name to downcased pluralized version (e.g., Field -> fields).
     def self.plural_class_name
       self.to_s.split("::").last.downcase.pluralize
@@ -37,28 +41,37 @@ module Bronto
 
       resp = api(api_key).call(method.to_sym, message: message)
 
-      @last_used = Time.now
+      connection_cache[api_key][:last_used] = Time.now
 
       resp.body["#{method}_response".to_sym]
     end
 
     # Sets up the Savon SOAP client object, including sessionHeaders and returns the client.
     def self.api(api_key, refresh = false)
-      return @api unless refresh || session_expired || @api.nil?
+      return connection_cache[api_key][:client] unless refresh || session_expired(api_key) || connection_cache[api_key].nil?
 
-      client = Savon.client(wsdl: 'https://api.bronto.com/v4?wsdl', ssl_version: :TLSv1)
+      client = Savon.client(wsdl: 'https://api.bronto.com/v4?wsdl', ssl_version: :TLSv1_2)
       resp = client.call(:login, message: { api_token: api_key })
 
-      @api = Savon.client(wsdl: 'https://api.bronto.com/v4?wsdl', soap_header: {
-                                                                   "tns:sessionHeader" => { session_id: resp.body[:login_response][:return] }
-                                                                  },
-                                                                  read_timeout: 600) # Give Bronto up to 10 minutes to reply
+      connection_cache[api_key] = {
+        client: Savon.client(
+          wsdl: 'https://api.bronto.com/v4?wsdl',
+          soap_header: {
+            "tns:sessionHeader" => { session_id: resp.body[:login_response][:return] }
+          },
+          read_timeout: 600 # Give Bronto up to 10 minutes to reply
+        ),
+        last_used: nil
+      }
+      connection_cache[api_key][:client]
     end
 
     # returns true if a cached session identifier is missing or is too old
-    def self.session_expired
-      return true if (@last_used == nil)
-      return true if (Time.now.tv_sec - @last_used.tv_sec > SESSION_REUSE_SECONDS)
+    def self.session_expired(api_key)
+      return true if (connection_cache[api_key].nil?)
+      last_used = connection_cache[api_key][:last_used]
+      return true if (last_used == nil)
+      return true if (Time.now.tv_sec - last_used.tv_sec > SESSION_REUSE_SECONDS)
 
       false
     end

data/lib/bronto/delivery.rb

@@ -33,9 +33,10 @@ module Bronto
       end
 
       hash = {
-        id: id, start: start_val, message_id: message_id, from_email: from_email, from_name: from_name,
+        id: id, start: start_val, message_id: message_id, type: type, from_email: from_email, from_name: from_name,
         reply_email: reply_email, recipients: recipients, fields: fields, authentication: authentication,
-        reply_tracking: reply_tracking
+        reply_tracking: reply_tracking,
+        type: type,
       }
       hash.each { |k,v| hash.delete(k) if v.blank? }
       hash

data/lib/bronto/list.rb

@@ -17,6 +17,9 @@ module Bronto
     def initialize(options = {})
       super(options)
       self.active_count ||= 0
+      if !self.label.present?
+        self.label = self.name
+      end
     end
 
     def add_to_list(*contacts)

data/lib/bronto/version.rb

@@ -1,3 +1,3 @@
 module Bronto
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/base_test.rb

@@ -0,0 +1,26 @@
+require_relative 'test_helper'
+
+class BaseTest < Test::Unit::TestCase
+  context "" do
+    teardown do
+      reset_all
+    end
+
+    should "reuse clients when the api key is the same" do
+      client1 = Bronto::Base.api('api-key-1')
+      client2 = Bronto::Base.api('api-key-1')
+
+      assert client1.is_a?(Savon::Client)
+      assert_equal client1, client2
+    end
+
+    should "not reuse clients when the api key is different" do
+      client1 = Bronto::Base.api('api-key-1')
+      client2 = Bronto::Base.api('api-key-2')
+
+      assert client1.is_a?(Savon::Client)
+      assert client2.is_a?(Savon::Client)
+      assert_not_equal client1, client2
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bronto
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Martin Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -92,6 +92,7 @@ files:
 - lib/core_ext/array.rb
 - lib/core_ext/object.rb
 - lib/core_ext/string.rb
+- test/base_test.rb
 - test/contact_test.rb
 - test/delivery_test.rb
 - test/field_test.rb
@@ -118,15 +119,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Bronto SOAP API
 test_files:
+- test/base_test.rb
 - test/contact_test.rb
 - test/delivery_test.rb
 - test/field_test.rb
 - test/list_test.rb
 - test/message_test.rb
 - test/test_helper.rb
-has_rdoc: