patientslikeme-campaign_monitor 1.2.2 → 1.3.0

data/campaign_monitor.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'campaign_monitor'
-  s.version     = "1.2.2"
+  s.version     = "1.3.0"
   s.summary     = 'Provides access to the Campaign Monitor API.'
   s.description = <<-EOF
     A simple wrapper class that provides basic access to the Campaign Monitor API.

data/lib/campaign_monitor.rb

@@ -180,6 +180,13 @@ class CampaignMonitor
     Result.new(Subscriber_Add("ListID" => list_id, "Email" => email, "Name" => name))
   end
   
+  def using_soap
+    driver = wsdl_driver_factory.create_rpc_driver
+    response = yield(driver)
+    driver.reset_stream
+    
+    response
+  end
 
   # Encapsulates
   class SubscriberBounce
@@ -224,6 +231,12 @@ class CampaignMonitor
     end
   end
     
+  protected
+
+    def wsdl_driver_factory
+      SOAP::WSDLDriverFactory.new("#{api_url}?WSDL")
+    end
+  
 end
 
 # If libxml is installed, we use the FasterXmlSimple library, that provides most of the functionality of XmlSimple

data/lib/campaign_monitor/helpers.rb

@@ -13,16 +13,6 @@ class CampaignMonitor
       end      
     end
 
-    def wsdl_driver_factory
-      SOAP::WSDLDriverFactory.new("#{api_url}?WSDL")
-    end
-
-    def using_soap
-      driver = wsdl_driver_factory.create_rpc_driver
-      response = yield(driver)
-      driver.reset_stream
-    end
-
     def timestamp_format
       '%Y-%m-%d %H:%M:%S'
     end

data/lib/campaign_monitor/list.rb

@@ -54,9 +54,9 @@ class CampaignMonitor
     # name            The subscriber's name.
     # custom_fields   A hash of field name => value pairs.
     def add_subscriber_with_custom_fields(email, name, custom_fields)
-      response = using_soap do |driver|
+      response = cm_client.using_soap do |driver|
         driver.addSubscriberWithCustomFields \
-            :ApiKey       => api_key,
+            :ApiKey       => cm_client.api_key,
             :ListID       => self.id,
             :Email        => email,
             :Name         => name,
@@ -70,9 +70,9 @@ class CampaignMonitor
     # name            The subscriber's name.
     # custom_fields   A hash of field name => value pairs.
     def add_and_resubscribe_with_custom_fields(email, name, custom_fields)      
-      response = using_soap do |driver|
+      response = cm_client.using_soap do |driver|
         driver.addAndResubscribeWithCustomFields \
-            :ApiKey       => api_key,
+            :ApiKey       => cm_client.api_key,
             :ListID       => self.id,
             :Email        => email,
             :Name         => name,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: patientslikeme-campaign_monitor
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jeremy Weiskotten