drip-ruby 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0116b3930cb8e30ecf0291777d9acd336661f6c600a594632cd8b831bf042b9b
-  data.tar.gz: ecf5f5ea8225363976fb5993aa0a3fd29be1796261508a829027e71f6d458d65
+SHA1:
+  metadata.gz: e94a763ab5337f4f242daa28a135553e23969965
+  data.tar.gz: aaa3aa129287f0f640dd03e96dcd441abb362c98
 SHA512:
-  metadata.gz: ce290db0ffdae723d78d12d71e7f71f47c0b632c50d3d63d8f1c544d90e0cf367f43c4c73cab06b8321daf4d20764bc1ad4b5e0fb6e7086c93d6a95d85278880
-  data.tar.gz: e2f2f8f62441222da207c808f63b130c8be44ce6808faee5d681d6653481a2620d552f79487bdb8daeb45bcd24092b0ea19386342b9da72427e190b6b304e5ac
+  metadata.gz: 5f8426121809e826beded4b6715b3d986d5a446d82f02881cf539d0a2393755bd00a03e71437a0e71c631bd2a7417882edfd360f16e52048f6dc4dd0fa50f3a4
+  data.tar.gz: f28420d43b416f076c3f61df6b6da1224983124c7181b96d0e8db142fdcd260704a5c13214f4553b18d493dc3cfdfd56da156b64e6334d6fe5cfac5c0208a952

data/.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: '2.1'
   Exclude:
     - 'test/fixtures/**/*'
 
@@ -14,4 +15,16 @@ Layout/DotPosition:
   EnforcedStyle: trailing
 
 Style/BracesAroundHashParameters:
-  Enabled: false
+  Enabled: false
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Metrics/LineLength:
+  Enabled: false
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: 'indented'
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: 'indented'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-12-22 12:38:29 -0600 using RuboCop version 0.49.1.
+# on 2018-05-24 10:21:33 -0500 using RuboCop version 0.56.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,127 +8,93 @@
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/ElseAlignment:
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
   Exclude:
-    - 'lib/drip/response.rb'
+    - 'lib/drip/client.rb'
+    - 'lib/drip/collection.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'drip-ruby.gemspec'
+Metrics/AbcSize:
+  Max: 26
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
-  EnforcedStyle: consistent
+# Offense count: 5
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 46
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 173
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 26
 
 # Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
+Performance/InefficientHashSearch:
   Exclude:
+    - 'lib/drip/resource.rb'
     - 'lib/drip/response.rb'
 
-# Offense count: 1
+# Offense count: 23
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'lib/drip/collection.rb'
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 45
+Style/Documentation:
+  Enabled: false
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Lint/EndAlignment:
+Style/Encoding:
   Exclude:
-    - 'lib/drip/response.rb'
+    - 'drip-ruby.gemspec'
 
-# Offense count: 1
-Lint/ScriptPermission:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
   Exclude:
-    - 'Rakefile'
+    - 'drip-ruby.gemspec'
+    - 'test/test_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'lib/drip/response.rb'
+    - 'lib/drip/client.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
+Style/IfUnlessModifier:
   Exclude:
     - 'lib/drip/client.rb'
-    - 'lib/drip/collection.rb'
-
-# Offense count: 7
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 48
 
 # Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 189
-
-# Offense count: 78
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 108
-
-# Offense count: 4
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 16
-
-# Offense count: 22
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Offense count: 42
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 2
-Style/MethodMissing:
+Style/MissingRespondToMissing:
   Exclude:
     - 'lib/drip/resource.rb'
     - 'lib/drip/response.rb'
 
-# Offense count: 9
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 8
 
-# Offense count: 494
+# Offense count: 605
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'test/drip/client_test.rb'

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 sudo: false
 rvm:
   - 2.3.4
+  - 2.1
   - jruby-19mode

data/CHANGELOG.md

@@ -0,0 +1,62 @@
+# Changelog
+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.0.0] - 2018-05-29
+
+[3.0.0]: https://github.com/DripEmail/drip-ruby/compare/v2.0.0...v3.0.0
+
+### Added
+- `Drip::Client#url_prefix` method to enable pointing client at different endpoints (mostly useful for internal testing and mocking).
+
+### Changed
+- Switched from Faraday to Net::HTTP. This also removes the `Drip::Client#connection` method, as it directly exposed Faraday.
+
+### Removed
+- Removed deprecated `#create_purchase` call.
+
+## [2.0.0] - 2018-03-27
+
+[2.0.0]: https://github.com/DripEmail/drip-ruby/compare/v1.0.0...v2.0.0
+
+- Purchases endpoint removed and replaced with orders.
+
+## [1.0.0] - 2017-12-27
+
+[1.0.0]: https://github.com/DripEmail/drip-ruby/compare/v0.0.12...v1.0.0
+
+- Add broadcasts endpoints
+- Add account fetch
+- Add campaign and campaign subscription endpoints
+- Add conversion endpoints
+- Add custom field endpoints
+- Add event action endpoints
+- Add form endpoints
+- Add unsubscribe features
+- Add webhook api endpoints
+
+## [0.0.12] - 2017-09-21
+
+[0.0.12]: https://github.com/DripEmail/drip-ruby/compare/v0.0.11...v0.0.12
+
+- Update Faraday from 0.9 to 0.13
+
+## [0.0.11] - 2017-06-20
+
+[0.0.11]: https://github.com/DripEmail/drip-ruby/compare/v0.0.10...v0.0.11
+
+- Handle rate limiting
+
+## [0.0.10] - 2017-02-21
+
+[0.0.10]: https://github.com/DripEmail/drip-ruby/compare/v0.0.9...v0.0.10
+
+- Tag initializer bugfix
+
+## [0.0.9] - 2017-02-21
+
+[0.0.9]: https://github.com/DripEmail/drip-ruby/compare/v0.0.8...v0.0.9
+
+- Tag constant name typo bugfix

data/Rakefile

@@ -1,7 +1,9 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
+
 Rake::TestTask.new do |t|
   t.libs << "lib"
   t.pattern = "test/**/*_test.rb"
@@ -9,4 +11,4 @@ Rake::TestTask.new do |t|
 end
 
 desc "Run tests"
-task default: :test
+task default: %i[rubocop test]

data/drip-ruby.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'drip/version'
@@ -18,14 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "mocha", "~> 1.1"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rubocop", "~> 0.56.0"
   spec.add_development_dependency "shoulda-context", "~> 1.0"
-  spec.add_development_dependency "mocha", "~> 1.1"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_runtime_dependency "faraday", "~> 0.13"
-  spec.add_runtime_dependency "faraday_middleware", "~> 0.12"
+  spec.add_development_dependency "webmock", "~> 3.4"
 end

data/lib/drip/client.rb

@@ -1,3 +1,4 @@
+require "drip/errors"
 require "drip/response"
 require "drip/client/accounts"
 require "drip/client/broadcasts"
@@ -8,14 +9,13 @@ require "drip/client/custom_fields"
 require "drip/client/events"
 require "drip/client/forms"
 require "drip/client/orders"
-require "drip/client/purchases"
 require "drip/client/subscribers"
 require "drip/client/tags"
 require "drip/client/webhooks"
 require "drip/client/workflows"
 require "drip/client/workflow_triggers"
-require "faraday"
-require "faraday_middleware"
+require "net/http"
+require "uri"
 require "json"
 
 module Drip
@@ -29,19 +29,21 @@ module Drip
     include Events
     include Forms
     include Orders
-    include Purchases
     include Subscribers
     include Tags
     include Webhooks
     include Workflows
     include WorkflowTriggers
 
-    attr_accessor :access_token, :api_key, :account_id
+    REDIRECT_LIMIT = 10
+
+    attr_accessor :access_token, :api_key, :account_id, :url_prefix
 
     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/"
       yield(self) if block_given?
     end
 
@@ -54,30 +56,57 @@ module Drip
     end
 
     def get(url, options = {})
-      make_request(:get, url, options)
+      make_request(Net::HTTP::Get, make_uri(url), options)
     end
 
     def post(url, options = {})
-      make_request(:post, url, options)
+      make_request(Net::HTTP::Post, make_uri(url), options)
     end
 
     def put(url, options = {})
-      make_request(:put, url, options)
+      make_request(Net::HTTP::Put, make_uri(url), options)
     end
 
     def delete(url, options = {})
-      make_request(:delete, url, options)
+      make_request(Net::HTTP::Delete, make_uri(url), options)
     end
 
-    def make_request(verb, url, options)
+  private
+
+    def make_uri(path)
+      URI(url_prefix) + URI(path)
+    end
+
+    def make_request(verb_klass, uri, options, step = 0)
+      raise TooManyRedirectsError, 'too many HTTP redirects' if step >= REDIRECT_LIMIT
+
       build_response do
-        connection.send(verb) do |req|
-          req.url url
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+          if verb_klass.is_a? Net::HTTP::Get
+            uri.query = URI.encode_www_form(options)
+          end
+
+          request = verb_klass.new uri
+
+          unless verb_klass.is_a? Net::HTTP::Get
+            request.body = options.to_json
+          end
 
-          if verb == :get
-            req.params = options
+          request['User-Agent'] = "Drip Ruby v#{Drip::VERSION}"
+          request['Content-Type'] = content_type
+          request['Accept'] = "*/*"
+
+          if access_token
+            request['Authorization'] = "Bearer #{access_token}"
           else
-            req.body = options.to_json
+            request.basic_auth api_key, ""
+          end
+
+          response = http.request request
+          if response.is_a?(Net::HTTPRedirection)
+            return make_request(verb_klass, URI(response["Location"]), options, step + 1)
+          else
+            response
           end
         end
       end
@@ -85,25 +114,7 @@ module Drip
 
     def build_response(&block)
       response = yield
-      Drip::Response.new(response.status, response.body)
-    end
-
-    def connection
-      @connection ||= Faraday.new do |f|
-        f.url_prefix = "https://api.getdrip.com/v2/"
-        f.headers['User-Agent'] = "Drip Ruby v#{Drip::VERSION}"
-        f.headers['Content-Type'] = content_type
-        f.headers['Accept'] = "*/*"
-
-        if access_token
-          f.headers['Authorization'] = "Bearer #{access_token}"
-        else
-          f.basic_auth api_key, ""
-        end
-
-        f.response :json, content_type: /\bjson$/
-        f.adapter :net_http
-      end
+      Drip::Response.new(response.code.to_i, response.body)
     end
   end
 end