drip-ruby 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34ab6a491e2d7b0bdf33b525a11c7d5499bd0e2f
-  data.tar.gz: d5b703ea0a8f113be93b5c19bbf13849f7fbb6b7
+  metadata.gz: 70f3d91d9c2443f74403c190edb0cf38e67f6659
+  data.tar.gz: '0759cfde4ef6ed2361b909c6f765a9cec2579a14'
 SHA512:
-  metadata.gz: ffb4cacb8da55651f34b33c9377de84104fa5913eb520f7437a2b0cf045eba8da1743043538c10ee00be64b562697128d22e35225307d5f4dee1c318c5022bdc
-  data.tar.gz: 3bce36166a411416f7258939b2283c403ec35903b882144538f95b893f56a61bd7bb3f90503ae61f7c318a834356ca073b594555fbc62f6185f4d8d6fa29908c
+  metadata.gz: cad33578769c6b1e0d45dec91e9f4fd691eb32f36df440b82b41649ea723bf5906c3bc4fa0a5341920e17e2720857c94e6da1459ebe18df023a12c1fc28686f7
+  data.tar.gz: c03a67601a4d2cd13154002460576ffe475049d00e5beadb84b49a7b9ba263c6806624aa847767473cf6caaa972d8d46c43edbddf2a7b4f3be55919e680237dc

data/.rubocop.yml

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

data/.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:

data/CHANGELOG.md

@@ -6,10 +6,17 @@ 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.2.0...HEAD
 
 - Your contribution here!
 
+## [3.2.0] - 2018-08-15
+
+[3.2.0]: https://github.com/DripEmail/drip-ruby/compare/v3.1.1...v3.2.0
+
+- Allow `#create_or_update_subscriber` to work with Drip id. Fixes [#50](https://github.com/DripEmail/drip-ruby/issues/50)
+- [#52](https://github.com/DripEmail/drip-ruby/pull/52): Fix `#custom_fields` to accept the API response without error. Fixes [#30](https://github.com/DripEmail/drip-ruby/issues/30)
+
 ## [3.1.1] - 2018-06-06
 
 [3.1.1]: https://github.com/DripEmail/drip-ruby/compare/v3.1.0...v3.1.1

data/lib/drip/client/subscribers.rb

@@ -31,8 +31,10 @@ module Drip
 
       # 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 @@ module Drip
       #
       # 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
 

data/lib/drip/collection.rb

@@ -24,7 +24,7 @@ module Drip
 
     def parse_items
       raw_items.map do |raw_item|
-        item_class.new(raw_item)
+        raw_item.is_a?(String) ? raw_item : item_class.new(raw_item)
       end
     end
 

data/lib/drip/version.rb

@@ -1,3 +1,3 @@
 module Drip
-  VERSION = "3.1.1".freeze
+  VERSION = "3.2.0".freeze
 end

data/test/drip/client/custom_fields_test.rb

@@ -8,7 +8,15 @@ class Drip::Client::CustomFieldsTest < Drip::TestCase
   context "#custom_fields" do
     setup do
       @response_status = 200
-      @response_body = "{}"
+      @response_body = <<-JSON
+        {
+          "custom_field_identifiers":[
+            "custom_field_1",
+            "custom_field_2",
+            "custom_field_3"
+          ]
+        }
+      JSON
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/custom_field_identifiers").
         to_return(status: @response_status, body: @response_body, headers: {})

data/test/drip/client/subscribers_test.rb

@@ -65,9 +65,22 @@ class Drip::Client::SubscribersTest < Drip::TestCase
         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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drip-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler