gibbon 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9948496f6f0ccccd5c2796b5d6ad2e1c656e3fd4db624bbb36a24e81d9161be7
-  data.tar.gz: 16ae83c4ec4af77425a9534b0c8c037fde234e694f21e77aa3572cad035867b4
+  metadata.gz: 6078387c488e567cb48e2c113c1201d412de3989ce740e04149bf77f37aaad97
+  data.tar.gz: 7adbe131b1b495bb3e8296edd7682b50db0fd5e886eae80668d45e442662b46e
 SHA512:
-  metadata.gz: 6e68e1c2b1e77f738e48a6a7256fb35c0904ae1d7f487daaeccd9b65cfc98ab57d3244f5f3fa1e699cd424fbaf36561ae83d3891f02029317595831c031c65d0
-  data.tar.gz: 443c2f49c096106061887b29d052d05064a23b508740da354aea4f49bbed3201366c9a548155da051664906fc40b39e4bf9611571707db82bcb542859e7402c2
+  metadata.gz: ad43e961eba03d11441173b136e6b75315ab0a46ac54714caf85ea68d50a44fda5fb1e70f596fd61f3337a8759a7d3da878467e1be890927816ec290038ffeb8
+  data.tar.gz: cc37182cfaf77bd044d01a812ef3ba5d7d5a5c3475aaceb1b4c84b915fa9772b8b33317dff78b0ac2878925a53885e1bcbc5cc41d978e04d1d05f9c5c047fb40

data/.travis.yml

@@ -4,8 +4,9 @@ cache: bundler
 before_install:
   - gem install bundler # -v 1.7.14 if a specific version is needed
 rvm:
-  - 2.1.5
-  - 2.2.2
-  - 2.3.8
   - 2.4.5
-  - 2.5.3
+  - 2.5.7
+  - 2.6.5
+  - 2.7
+  - 3.0.0
+

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 ## [Unreleased][unreleased]
 
-## [3.2.1] - 2019-10-02
+
+## [3.4.0] - 2021-03-12
+- Support for Faraday 1.x.x and higer
+
+## [3.3.4] - 2020-04-01
+- Added support for setting API key via environment variable for Export API
+- Updated webmock
+
+## [3.3.3] - 2020-02-07
+- Removes bit of extra conditional logic that was part of supporting older versions of Faraday
+
+## [3.3.2] - 2020-01-19
+- Bumped minimum version of Faraday 0.16.0 due to compatibility issues with legacy versions
+
+## [3.3.1] - 2019-11-08
+- Fix statically setting `faraday_adapter` did not set adapter on new requests
+
+## [3.3.0] - 2019-10-02
 - Fixed compatibility with Faraday 0.16.2+
 - Set minimum Ruby to 2.3.8
 

data/Gemfile

@@ -1,12 +1,11 @@
 source "https://rubygems.org"
 
 platforms :rbx do
-  gem 'rubysl', '~> 2.2.0'
   gem 'rubinius-developer_tools'
 end
 
 group :development, :test do
-  gem 'webmock', '~>1.24.0'
+  gem 'webmock', '~> 3.8'
 end
 
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 Amro Mousa
+Copyright (c) 2010-2020 Amro Mousa
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -2,7 +2,7 @@
 
 Gibbon is an API wrapper for MailChimp's [API](http://kb.mailchimp.com/api/).
 
-[![Build Status](https://secure.travis-ci.org/amro/gibbon.svg)](http://travis-ci.org/amro/gibbon)
+[![Build Status](https://travis-ci.com/amro/gibbon.svg?branch=master)](https://travis-ci.com/amro/gibbon)
 
 ## Important Notes
 
@@ -185,7 +185,7 @@ gibbon.lists(list_id).members(lower_case_md5_hashed_email_address).retrieve
 Add tags to a subscriber:
 
 ```ruby
-gibbon.lists(list_id).members(Digest::MD5.hexdigest(email)).tags.create(
+gibbon.lists(list_id).members(Digest::MD5.hexdigest(lower_case_email_address)).tags.create(
   body: {
     tags: [{name:"referred-from-xyz", status:"active"},{name:"pro-plan",status:"active"}]
   }
@@ -506,5 +506,5 @@ Thanks to everyone who has [contributed](https://github.com/amro/gibbon/contribu
 
 ## Copyright
 
-* Copyright (c) 2010-2018 Amro Mousa. See LICENSE.txt for details.
-* MailChimp (c) 2001-2018 The Rocket Science Group.
+* Copyright (c) 2010-2020 Amro Mousa. See LICENSE.txt for details.
+* MailChimp (c) 2001-2020 The Rocket Science Group.

data/gibbon.gemspec

@@ -13,19 +13,17 @@ Gem::Specification.new do |s|
   s.description = %q{A wrapper for MailChimp API 3.0 and Export API}
   s.license     = "MIT"
 
-  s.rubyforge_project = "gibbon"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.3.8'
+  s.required_ruby_version = '>= 2.4.0'
 
-  s.add_dependency('faraday', '>= 0.9.1')
+  s.add_dependency('faraday', '>= 0.16.0')
   s.add_dependency('multi_json', '>= 1.11.0')
 
   s.add_development_dependency 'rake'
   s.add_development_dependency "rspec", "3.5.0"
-  s.add_development_dependency 'webmock', '~> 1.21.0'
+  s.add_development_dependency 'webmock', '~> 3.8'
 
 end

data/lib/gibbon/api_request.rb

@@ -109,10 +109,7 @@ module Gibbon
       error_params = {}
 
       begin
-        # Faraday::ClientError is used in Faraday 0.16.0+
-        # Faraday::Error::ClientError was used before 0.16.0
-        client_error = error.is_a?(Faraday::ClientError) || error.is_a?(Faraday::Error::ClientError)
-        if client_error && error.response
+        if (error.is_a?(Faraday::ClientError) || error.is_a?(Faraday::ServerError)) && error.response
           error_params[:status_code] = error.response[:status]
           error_params[:raw_body] = error.response[:body]
 

data/lib/gibbon/export.rb

@@ -7,7 +7,7 @@ module Gibbon
     attr_accessor :api_key, :timeout
 
     def initialize(api_key: nil, timeout: nil)
-      @api_key = api_key || self.class.api_key
+      @api_key = api_key || self.class.api_key || ENV['MAILCHIMP_API_KEY']
       @timeout = timeout || self.class.timeout || 600
     end
 

data/lib/gibbon/request.rb

@@ -13,7 +13,7 @@ module Gibbon
       @timeout = timeout || self.class.timeout || DEFAULT_TIMEOUT
       @open_timeout = open_timeout || self.class.open_timeout || DEFAULT_OPEN_TIMEOUT
       @proxy = proxy || self.class.proxy || ENV['MAILCHIMP_PROXY']
-      @faraday_adapter = faraday_adapter || Faraday.default_adapter
+      @faraday_adapter = faraday_adapter || self.class.faraday_adapter || Faraday.default_adapter
       @symbolize_keys = symbolize_keys || self.class.symbolize_keys || false
       @debug = debug || self.class.debug || false
       @logger = logger || self.class.logger || ::Logger.new(STDOUT)

data/lib/gibbon/version.rb

@@ -1,3 +1,3 @@
 module Gibbon
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 end

data/spec/gibbon/api_request_spec.rb

@@ -6,20 +6,21 @@ describe Gibbon::APIRequest do
 
   before do
     @gibbon = Gibbon::Request.new(api_key: api_key)
-    @api_root = "https://apikey:#{api_key}@us1.api.mailchimp.com/3.0"
+    @api_root = "https://us1.api.mailchimp.com/3.0"
+    @basic_auth_credentials = ['apikey', api_key]
   end
 
   shared_examples_for 'client error handling' do
     it "surfaces client request exceptions as a Gibbon::MailChimpError" do
       exception = error_class.new("the server responded with status 503")
-      stub_request(:get, "#{@api_root}/lists").to_raise(exception)
+      stub_request(:get, "#{@api_root}/lists").with(basic_auth: @basic_auth_credentials).to_raise(exception)
       expect { @gibbon.lists.retrieve }.to raise_error(Gibbon::MailChimpError)
     end
 
     it "surfaces an unparseable client request exception as a Gibbon::MailChimpError" do
       exception = error_class.new(
         "the server responded with status 503")
-      stub_request(:get, "#{@api_root}/lists").to_raise(exception)
+      stub_request(:get, "#{@api_root}/lists").with(basic_auth: @basic_auth_credentials).to_raise(exception)
       expect { @gibbon.lists.retrieve }.to raise_error(Gibbon::MailChimpError)
     end
 
@@ -27,7 +28,7 @@ describe Gibbon::APIRequest do
       response_values = {:status => 503, :headers => {}, :body => '[foo]'}
       exception = error_class.new("the server responded with status 503", response_values)
 
-      stub_request(:get, "#{@api_root}/lists").to_raise(exception)
+      stub_request(:get, "#{@api_root}/lists").with(basic_auth: @basic_auth_credentials).to_raise(exception)
       expect { @gibbon.lists.retrieve }.to raise_error(Gibbon::MailChimpError)
     end
 
@@ -60,12 +61,6 @@ describe Gibbon::APIRequest do
     end
   end
 
-  context 'Faraday::Error::ClientError' do
-    let(:error_class) { Faraday::Error::ClientError }
-
-    include_examples 'client error handling'
-  end
-
   context 'Faraday::ClientError' do
     let(:error_class) { Faraday::ClientError }
 

data/spec/gibbon/export_spec.rb

@@ -17,6 +17,13 @@ describe Gibbon::Export do
     expect {@export.list(id: "123456")}.to raise_error(Gibbon::GibbonError)
   end
 
+  it "sets an API key from the 'MAILCHIMP_API_KEY' ENV variable" do
+    ENV['MAILCHIMP_API_KEY'] = 'TESTKEY-us1'
+    @export = Gibbon::Export.new
+    expect(@export.api_key).to eq('TESTKEY-us1')
+    ENV.delete('MAILCHIMP_API_KEY')
+  end
+
   it "sets correct endpoint from api key" do
     @api_key = "TESTKEY-us1"
     @export.api_key = @api_key

data/spec/gibbon/upsert_spec.rb

@@ -17,8 +17,8 @@ describe Gibbon do
   end
 
   it 'supports upsert request' do
-    stub_request(:put, "https://apikey:1234-us1@us1.api.mailchimp.com/3.0/lists/#{list_id}/members/#{member_id}")
-      .with(body: MultiJson.dump(request_body))
+    stub_request(:put, "https://us1.api.mailchimp.com/3.0/lists/#{list_id}/members/#{member_id}")
+      .with(body: MultiJson.dump(request_body), basic_auth: ['apikey', '1234-us1'])
       .to_return(status: 200)
 
     Gibbon::Request.new(api_key: api_key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gibbon
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Amro Mousa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '3.8'
 description: A wrapper for MailChimp API 3.0 and Export API
 email:
 - amromousa@gmail.com
@@ -116,7 +116,7 @@ homepage: http://github.com/amro/gibbon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,15 +124,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: A wrapper for MailChimp API 3.0 and Export API
 test_files: