mailchimp3 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86cbb578a02bfc1b1f33bf8a3394f5a4d324adb8
-  data.tar.gz: 41a06107a92fce74c0a282972fc9994acd6d7ec5
+  metadata.gz: 10e1e2194f6330bc8836f6449e0d4a34cc94d951
+  data.tar.gz: 9bd5c607f83a710f2a93a70a449407ad4a210daf
 SHA512:
-  metadata.gz: 2f88cecce1c849cfdcb88a77dd4a8b73a4effbd1b0539e7f979d1d2db4d06871c4914de90e058d261860972246efadde5e667d5ee09f3f05cb51b40eb4577cb4
-  data.tar.gz: 40cbb2dcf74b50a58a6faf091904fa24d37c0eeb25a42a1997bff0738d90f592638bfbbd7fb805723b6f62290290c881f8cb4222ab2799ab0595cf20acbd19f8
+  metadata.gz: 03f478d9191b5b0d92534ff773cea17d207de3d14624cc50a2ce2b0d5638bd3e09283a90cd8c87b0d182fa3b779076b7b6cdb4dcffce82326b3c7bcc92016156
+  data.tar.gz: 06caf2489afca52ecdba0ffcb28b5fb2f4e310708b3b3230432b9a1dbdac9907e40f33c023aef22ad04bd25f181cfe3c86130cfbde6382ad9d6a535e048193e9

data/README.md

@@ -112,7 +112,7 @@ gem install mailchimp3
 
    ```ruby
    api = MailChimp3.new(
-     oauth_auth_token: user.mailchimp_auth_token,
+     oauth_access_token: user.mailchimp_auth_token,
      dc: user.mailchimp_data_center
    )
    ```

data/lib/mailchimp3/endpoint.rb

@@ -1,5 +1,5 @@
 require 'faraday'
-require 'faraday_middleware'
+require 'json'
 
 module MailChimp3
   class Endpoint
@@ -65,33 +65,39 @@ module MailChimp3
     private
 
     def _build_response(result)
-      case result.status
+      body = _parse_body(result)
+      case (status = result.status)
       when 200..299
-        result.body
+        body
       when 400
-        fail Errors::BadRequest, result
+        fail Errors::BadRequest, status: status, body: body
       when 401
-        fail Errors::Unauthorized, result
+        fail Errors::Unauthorized, status: status, body: body
       when 403
-        fail Errors::Forbidden, result
+        fail Errors::Forbidden, status: status, body: body
       when 404
-        fail Errors::NotFound, result
+        fail Errors::NotFound, status: status, body: body
       when 405
-        fail Errors::MethodNotAllowed, result
+        fail Errors::MethodNotAllowed, status: status, body: body
       when 422
-        fail Errors::UnprocessableEntity, result
+        fail Errors::UnprocessableEntity, status: status, body: body
       when 400..499
-        fail Errors::ClientError, result
+        fail Errors::ClientError, status: status, body: body
       when 500
-        fail Errors::InternalServerError, result
+        fail Errors::InternalServerError, status: status, body: body
       when 500..599
-        fail Errors::ServerError, result
+        fail Errors::ServerError, status: status, body: body
       else
-        binding.pry
-        fail "unknown status #{result.status}"
+        fail "unknown status #{status}"
       end
     end
 
+    def _parse_body(result)
+      JSON.parse(result.body)
+    rescue JSON::ParserError
+      raise Errors::ServerError, status: result.status, body: result.body
+    end
+
     def _build_endpoint(path)
       @cache[path] ||= begin
         self.class.new(
@@ -114,7 +120,6 @@ module MailChimp3
     def _connection
       @connection ||= Faraday.new(url: url) do |faraday|
         faraday.adapter :excon
-        faraday.response :json, content_type: /\bjson$/
         if @basic_auth_key
           faraday.basic_auth '', @basic_auth_key
         elsif @oauth_access_token

data/lib/mailchimp3/errors.rb

@@ -6,16 +6,16 @@ module MailChimp3
     class BaseError < StandardError
       attr_reader :status, :details
 
-      def initialize(response)
-        @status = response.status
-        @message = if response.body.is_a?(Hash) && response.body['error']
-                     "#{response.body['name']}: #{response.body['error']}"
-                   elsif response.body.is_a?(Hash)
-                     "#{response.body['title']}: #{response.body['detail']}"
+      def initialize(body:, status:)
+        @status = status
+        @message = if body.is_a?(Hash) && body['error']
+                     "#{body['name']}: #{body['error']}"
+                   elsif body.is_a?(Hash)
+                     "#{body['title']}: #{body['detail']}"
                    else
-                     response.body.to_s
+                     body.to_s
                    end
-        @details = response.body if response.body.is_a?(Hash)
+        @details = body if body.is_a?(Hash)
       end
 
       def to_s

data/lib/mailchimp3/version.rb

@@ -1,3 +1,3 @@
 module MailChimp3
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/mailchimp3/endpoint_spec.rb

@@ -68,13 +68,16 @@ describe MailChimp3::Endpoint do
       end
 
       it 'raises a NotFound error' do
-        error = begin
-                  subject.get
-                rescue MailChimp3::Errors::NotFound => e
-                  e
-                end
-        expect(error.status).to eq(404)
-        expect(error.message).to eq('Resource Not Found: The requested resource could not be found.')
+        expect { subject.get }.to raise_error do |error|
+          expect(error).to be_a(MailChimp3::Errors::NotFound)
+          expect(error.status).to eq(404)
+          expect(error.message).to eq('Resource Not Found: The requested resource could not be found.')
+          expect(error.details).to eq(
+            'status' => 404,
+            'title' => 'Resource Not Found',
+            'detail' => 'The requested resource could not be found.'
+          )
+        end
       end
     end
 
@@ -94,9 +97,7 @@ describe MailChimp3::Endpoint do
       end
 
       it 'raises a ClientError error' do
-        expect {
-          subject.get
-        }.to raise_error(MailChimp3::Errors::ClientError)
+        expect { subject.get }.to raise_error(MailChimp3::Errors::ClientError)
       end
     end
 
@@ -116,9 +117,7 @@ describe MailChimp3::Endpoint do
       end
 
       it 'raises a ServerError error' do
-        expect {
-          subject.get
-        }.to raise_error(MailChimp3::Errors::ServerError)
+        expect { subject.get }.to raise_error(MailChimp3::Errors::ServerError)
       end
     end
   end
@@ -132,21 +131,41 @@ describe MailChimp3::Endpoint do
       }
     end
 
-    let(:result) do
-      {
-        'id'   => 'd3ed40bd7c',
-        'name' => 'Foo'
-      }
-    end
+    context do
+      let(:result) do
+        {
+          'id'   => 'd3ed40bd7c',
+          'name' => 'Foo'
+        }
+      end
 
-    before do
-      stub_request(:post, 'https://us2.api.mailchimp.com/3.0/lists')
-        .to_return(status: 201, body: result.to_json, headers: { 'Content-Type' => 'application/json; charset=utf-8' })
-      @result = subject.post(resource)
+      before do
+        stub_request(:post, 'https://us2.api.mailchimp.com/3.0/lists')
+          .to_return(status: 201, body: result.to_json, headers: { 'Content-Type' => 'application/json; charset=utf-8' })
+        @result = subject.post(resource)
+      end
+
+      it 'returns the result of making a POST request to the endpoint' do
+        expect(@result).to eq(result)
+      end
     end
 
-    it 'returns the result of making a POST request to the endpoint' do
-      expect(@result).to eq(result)
+    context 'when the response is not valid JSON' do
+      let(:result) { 'bad' }
+
+      before do
+        stub_request(:post, 'https://us2.api.mailchimp.com/3.0/lists')
+          .to_return(status: 200, body: result, headers: { 'Content-Type' => 'application/json; charset=utf-8' })
+      end
+
+      it 'raises an error' do
+        expect { subject.post(resource) }.to raise_error do |error|
+          expect(error).to be_a(MailChimp3::Errors::ServerError)
+          expect(error.status).to eq(200)
+          expect(error.message).to eq('bad')
+          expect(error.details).to be_nil
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailchimp3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: wrapper for MailChimp's 3.0 API
@@ -156,3 +142,4 @@ test_files:
 - spec/mailchimp3/oauth_spec.rb
 - spec/mailchimp3_spec.rb
 - spec/spec_helper.rb
+has_rdoc: