drip-ruby 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94a763ab5337f4f242daa28a135553e23969965
-  data.tar.gz: aaa3aa129287f0f640dd03e96dcd441abb362c98
+  metadata.gz: cde072743a9010ff142889179cd1c5cb57eb6009
+  data.tar.gz: 2c94bb250107e5412a1e85ca418845ce81242711
 SHA512:
-  metadata.gz: 5f8426121809e826beded4b6715b3d986d5a446d82f02881cf539d0a2393755bd00a03e71437a0e71c631bd2a7417882edfd360f16e52048f6dc4dd0fa50f3a4
-  data.tar.gz: f28420d43b416f076c3f61df6b6da1224983124c7181b96d0e8db142fdcd260704a5c13214f4553b18d493dc3cfdfd56da156b64e6334d6fe5cfac5c0208a952
+  metadata.gz: 229a86bbc7153395d73659ea272c9d2467678bf812ca2c687903701969dfd55281eed4c0c45e7eebd536bd3755f5ac31c6312d4f92e13fadac985c9ec804880d
+  data.tar.gz: 6032350979b07376d2de554ac22675a77d8a56a20492431df760e5f02793ce6e4a164013daa76bb9bbe02f8e85b42415a5054a473fa68b8aac3722bd88f8f7e4

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.4
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
   - 2.1
   - jruby-19mode

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.1.0] - 2018-06-05
+
+[3.1.0]: https://github.com/DripEmail/drip-ruby/compare/v3.0.0...v3.1.0
+
+### Fixed
+- [#46](https://github.com/DripEmail/drip-ruby/pull/46): Fix verb class equality check - [@marcinbunsch](https://github.com/marcinbunsch)
+
+### Added
+- [#43](https://github.com/DripEmail/drip-ruby/pull/43): Additional timeout parameters for client - [@tboyko](https://github.com/tboyko)
+
 ## [3.0.0] - 2018-05-29
 
 [3.0.0]: https://github.com/DripEmail/drip-ruby/compare/v2.0.0...v3.0.0

data/README.md

@@ -122,8 +122,6 @@ as methods on the client object. The following methods are currently available:
 
 #### Orders
 
-**Note:** The beta purchases endpoint has been deprecated and its methods have been removed from the gem except `create_purchase`, which now sends requests to the Order creation endpoint [here](https://developer.drip.com/#orders)
-
 | Actions                    | Methods                                              |
 | :------------------------- | :--------------------------------------------------- |
 | Create or update an order  | `#create_or_update_order(email, options = {})`       |

data/lib/drip/client.rb

@@ -37,13 +37,15 @@ module Drip
 
     REDIRECT_LIMIT = 10
 
-    attr_accessor :access_token, :api_key, :account_id, :url_prefix
+    attr_accessor :access_token, :api_key, :account_id, :url_prefix, :http_open_timeout, :http_timeout
 
     def initialize(options = {})
       @account_id = options[:account_id]
       @access_token = options[:access_token]
       @api_key = options[:api_key]
       @url_prefix = options[:url_prefix] || "https://api.getdrip.com/v2/"
+      @http_open_timeout = options[:http_open_timeout]
+      @http_timeout = options[:http_timeout]
       yield(self) if block_given?
     end
 
@@ -81,14 +83,14 @@ module Drip
       raise TooManyRedirectsError, 'too many HTTP redirects' if step >= REDIRECT_LIMIT
 
       build_response do
-        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-          if verb_klass.is_a? Net::HTTP::Get
+        Net::HTTP.start(uri.host, uri.port, connection_options(uri.scheme)) do |http|
+          if verb_klass == Net::HTTP::Get
             uri.query = URI.encode_www_form(options)
           end
 
           request = verb_klass.new uri
 
-          unless verb_klass.is_a? Net::HTTP::Get
+          unless verb_klass == Net::HTTP::Get
             request.body = options.to_json
           end
 
@@ -116,5 +118,18 @@ module Drip
       response = yield
       Drip::Response.new(response.code.to_i, response.body)
     end
+
+    def connection_options(uri_scheme)
+      options = { use_ssl: uri_scheme == "https" }
+
+      if @http_open_timeout
+        options[:open_timeout] = @http_open_timeout
+        options[:ssl_timeout] = @http_open_timeout
+      end
+
+      options[:read_timeout] = @http_timeout if @http_timeout
+
+      options
+    end
   end
 end

data/lib/drip/version.rb

@@ -1,3 +1,3 @@
 module Drip
-  VERSION = "3.0.0".freeze
+  VERSION = "3.1.0".freeze
 end

data/test/drip/client_test.rb

@@ -44,12 +44,16 @@ class Drip::ClientTest < Drip::TestCase
       client = Drip::Client.new(
         account_id: "1234567",
         api_key: "aaaa",
-        access_token: "bbbb"
+        access_token: "bbbb",
+        http_open_timeout: 20,
+        http_timeout: 25
       )
 
       assert_equal "1234567", client.account_id
       assert_equal "aaaa", client.api_key
       assert_equal "bbbb", client.access_token
+      assert_equal 20, client.http_open_timeout
+      assert_equal 25, client.http_timeout
     end
   end
 
@@ -146,4 +150,34 @@ class Drip::ClientTest < Drip::TestCase
       assert_requested :get, "https://api.example.com/mytestpath", times: 5
     end
   end
+
+  context "given a get request" do
+    setup do
+      @client = Drip::Client.new
+      @response = mock
+      @response.stubs(:code).returns('200')
+      @response.stubs(:body).returns('mybody')
+
+      @http = mock
+      @http.expects(:request).returns(@response)
+
+      @request = mock
+      @request.stubs(:[]=)
+      @request.stubs(:basic_auth)
+    end
+
+    should "encode query and not set body" do
+      stub_request(:get, "https://api.getdrip.com/v2/testpath").
+        to_return(status: 200, body: "mybody")
+
+      Net::HTTP::Get.expects(:new).returns(@request)
+      Net::HTTP.expects(:start).yields(@http).returns(@response)
+
+      @request.expects(:body=).never
+      URI.expects(:encode_www_form).once
+
+      response = @client.get("testpath")
+      assert_equal "mybody", response.body
+    end
+  end
 end

metadata

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