gibbon 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbdff62baa93bc714bc199105fa84691067cec6650a1a5c06dbde64da52c8bd6
-  data.tar.gz: 5e115ce632e5e3229692f3975c0819cc165eec6a2ef41ab0fa76704ce9c83955
+  metadata.gz: 6e71b5768a6197caeec4d088be1af914201e7973cdc6ca403032f3882624ec5d
+  data.tar.gz: 58385112982bd7840d654f518c9dc93515311e27520aaf17f1f1cf062407315b
 SHA512:
-  metadata.gz: dec423c9924c775b88110218b948f2685daa949f03ea3ee7eef7bafd4c9b97ed5db201167cb9aae66edfb9be964e227c864c2536f9ab6407e1f50b14ec2061c3
-  data.tar.gz: dfca56671affd0cffc57cb19b4292eed8f70e7a8de60b5a8524660cb2fe44ae947f794c540781039a1de77cf2ca5918c4bb0f6cbaadfe375bd5ed916e3d84c1a
+  metadata.gz: 7084f3258f25872b23bec63378b8a7c7e72e8d29ede58937c18ebe3fc59449cbdef5fa6332e145bbfb1c344dca78c9ff9027c0ce5574302a112d16ea96a11564
+  data.tar.gz: c15e6b1f690b74bf90748c41f3d528fc1d4eb01fbe21ec743cb5bc1e2554421792e4a88660d950852747030b836e4d80a2d4802b92cfb35399e47f5db016f2bb

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased][unreleased]
 
-## [3.3.3] - 2020-02-7
+## [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

data/Gemfile

@@ -6,7 +6,7 @@ platforms :rbx do
 end
 
 group :development, :test do
-  gem 'webmock', '~>1.24.0'
+  gem 'webmock', '~> 3.8'
 end
 
 gemspec

data/gibbon.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
 
   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/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/version.rb

@@ -1,3 +1,3 @@
 module Gibbon
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 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
 

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.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Amro Mousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -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