Test pr

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+Description: <brief description of feature>
+Code reviewed by: <reviewer's name>
+Tested by: <tester's name>
+PM reviewed by: <PM name>
+TeamCity passed: [yes]
+Test plan: <URL>
+Risk/complexity: [high|low] 
+Impact/scope: [high|low]

README.md

@@ -0,0 +1,5 @@
+marketo_gem
+===========
+Fork of the original Rapleaf marketo gem to support updates to the Marketo API and fix some bugs.
+
+Use at your own risk.

lib/marketo.rb

@@ -1,14 +1,12 @@
 require 'rubygems'
 require 'savon'
 
-Savon.configure do |config|
-  config.log = false # disable logging
-end
-
 require File.expand_path('marketo/client', File.dirname(__FILE__))
 require File.expand_path('marketo/authentication_header', File.dirname(__FILE__))
 require File.expand_path('marketo/enums', File.dirname(__FILE__))
+require File.expand_path('marketo/key', File.dirname(__FILE__))
 require File.expand_path('marketo/lead_key', File.dirname(__FILE__))
+require File.expand_path('marketo/list_key', File.dirname(__FILE__))
 require File.expand_path('marketo/lead_record', File.dirname(__FILE__))
 
 

lib/marketo/authentication_header.rb

@@ -1,7 +1,7 @@
-module Rapleaf
+module Grabcad
   module Marketo
     # This class exists only to encapsulate the authentication header part of a soap request to marketo
-    # Marketo requires a somewhat complex calculation of an encrypted signature and so it seemed sensible to pull this code out here
+    # It contains a SHA1-based MAC based on a timestamp
     class AuthenticationHeader
       DIGEST = OpenSSL::Digest::Digest.new('sha1')
 
@@ -12,36 +12,25 @@ def initialize(access_key, secret_key, time = DateTime.now)
       end
 
       public
-      # time should be a DateTime instance
       def set_time(time)
         @time = time
       end
 
-      def get_mktows_user_id
-        @access_key
-      end
-
-      def get_request_signature
-        calculate_signature
-      end
-
-      def get_request_timestamp
-        @time.to_s
-      end
-
       def to_hash
         {
-            "mktowsUserId"     => get_mktows_user_id,
-            "requestSignature" => get_request_signature,
-            "requestTimestamp" => get_request_timestamp
+            "mktowsUserId"     => @access_key,
+            "requestSignature" => calculate_signature,
+            "requestTimestamp" => request_timestamp
         }
       end
 
       private
+      def request_timestamp
+        @time.to_s
+      end
+
       def calculate_signature
-        request_timestamp = get_request_timestamp
-        string_to_encrypt = request_timestamp + @access_key
-        OpenSSL::HMAC.hexdigest(DIGEST, @secret_key, string_to_encrypt)
+        OpenSSL::HMAC.hexdigest(DIGEST, @secret_key, request_timestamp + @access_key)
       end
     end
   end