Merge pull request #51 from DripEmail/update-subscriber-using-drip-id

Update subscriber using Drip ID

Author: will-in-wi

.rubocop.yml

@@ -28,3 +28,7 @@ Layout/MultilineOperationIndentation:
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: 'indented'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'test/**/*'

.rubocop_todo.yml

@@ -23,11 +23,6 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 46
 
-# Offense count: 3
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 173
-
 # Offense count: 4
 # Configuration parameters: CountComments.
 Metrics/MethodLength:

CHANGELOG.md

@@ -6,8 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-[master]: https://github.com/DripEmail/drip-ruby/compare/v3.0.0...HEAD
+[master]: https://github.com/DripEmail/drip-ruby/compare/v3.1.1...HEAD
 
+- Allow `#create_or_update_subscriber` to work with Drip id. Fixes [#50](https://github.com/DripEmail/drip-ruby/issues/50)
 - Your contribution here!
 
 ## [3.1.1] - 2018-06-06

lib/drip/client/subscribers.rb

@@ -31,8 +31,10 @@ def subscriber(id_or_email)
 
       # Public: Create or update a subscriber.
       #
-      # email   - Required. The String subscriber email address.
+      # email   - Optional. The String subscriber email address. (Deprecated in favor of a hash argument)
       # options - A Hash of options.
+      #           - email         - Required (or id). Lookup the subscriber by email.
+      #           - id            - Required (or email). Lookup the subscriber by Drip ID.
       #           - new_email     - Optional. A new email address for the subscriber.
       #                             If provided and a subscriber with the email above
       #                             does not exist, this address will be used to
@@ -44,8 +46,11 @@ def subscriber(id_or_email)
       #
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#create_or_update_subscriber
-      def create_or_update_subscriber(email, options = {})
-        data = options.merge(email: email)
+      def create_or_update_subscriber(*args)
+        data = {}
+        data[:email] = args[0] if args[0].is_a? String
+        data.merge!(args.last) if args.last.is_a? Hash
+        raise ArgumentError, 'email: or id: parameter required' if !data.key?(:email) && !data.key?(:id)
         post "#{account_id}/subscribers", generate_resource("subscribers", data)
       end
 

test/drip/client/subscribers_test.rb

@@ -65,9 +65,22 @@ def setup
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
-    should "send the right request" do
+    should "allow request with legacy email argument" do
       expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.create_or_update_subscriber(@email, @data)
+      assert_requested :post, "https://api.getdrip.com/v2/12345/subscribers", body: '{"subscribers":[{"email":"derrick@getdrip.com","time_zone":"America/Los_Angeles"}]}', times: 1
+    end
+
+    should "allow request with email keyword argument" do
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
+      assert_equal expected, @client.create_or_update_subscriber(email: @email)
+      assert_requested :post, "https://api.getdrip.com/v2/12345/subscribers", body: '{"subscribers":[{"email":"derrick@getdrip.com"}]}', times: 1
+    end
+
+    should "allow request with drip id keyword argument" do
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
+      assert_equal expected, @client.create_or_update_subscriber(id: 123456)
+      assert_requested :post, "https://api.getdrip.com/v2/12345/subscribers", body: '{"subscribers":[{"id":123456}]}', times: 1
     end
   end