contentful-management 1.8.1 → 1.9.0

data/spec/lib/contentful/management/client_spec.rb

@@ -210,19 +210,19 @@ module Contentful
       describe '#host_url' do
         describe 'uploads' do
           it 'returns uploads url when its a properly formed upload url' do
-            expect(subject.host_url(RequestDouble.new('/some_space_id/uploads'))).to eq subject.uploads_url
-            expect(subject.host_url(RequestDouble.new('/some_space_id/uploads/upload_id'))).to eq subject.uploads_url
-            expect(subject.host_url(RequestDouble.new('/uploads/uploads/uploads'))).to eq subject.uploads_url
+            expect(subject.host_url(RequestDouble.new('spaces/some_space_id/uploads'))).to eq subject.uploads_url
+            expect(subject.host_url(RequestDouble.new('spaces/some_space_id/uploads/upload_id'))).to eq subject.uploads_url
+            expect(subject.host_url(RequestDouble.new('spaces/uploads/uploads/uploads'))).to eq subject.uploads_url
           end
 
           it 'returns base url for non uploads url' do
-            uploads_as_space_id = '/uploads/entries/upload_id'
+            uploads_as_space_id = 'spaces/uploads/entries/upload_id'
             expect(subject.host_url(RequestDouble.new(uploads_as_space_id))).to eq subject.base_url
 
-            uploads_as_entry_id = '/some_space_id/entries/uploads'
+            uploads_as_entry_id = 'spaces/some_space_id/entries/uploads'
             expect(subject.host_url(RequestDouble.new(uploads_as_entry_id))).to eq subject.base_url
 
-            uploads_as_only_thing = '/uploads'
+            uploads_as_only_thing = 'spaces/uploads'
             expect(subject.host_url(RequestDouble.new(uploads_as_only_thing))).to eq subject.base_url
           end
         end
@@ -253,31 +253,30 @@ module Contentful
         end
       end
 
-      describe '.get_http' do
-        subject { Client }
-        it 'does a GET request' do
-          vcr(:get_request) { subject.get_http('http://example.com', foo: 'bar') }
+      describe 'http methods' do
+        let(:request) { Request.new(client, 'http://example.com', foo: 'bar') }
+        describe '#get' do
+          it 'does a GET request' do
+            vcr(:get_request) { subject.get(Request.new(client, 'http://mockbin.org/bin/be499b1d-286a-4d22-8d26-00a014b83817', foo: 'bar')) }
+          end
         end
-      end
 
-      describe '.post_http' do
-        subject { Client }
-        it 'does a POST request' do
-          vcr(:post_request) { subject.post_http('http://example.com', foo: 'bar') }
+        describe '#post' do
+          it 'does a POST request' do
+            vcr(:post_request) { subject.post(request) }
+          end
         end
-      end
 
-      describe '.put_http' do
-        subject { Client }
-        it 'does a PUT request' do
-          vcr(:put_request) { subject.put_http('http://example.com', foo: 'bar') }
+        describe '#put' do
+          it 'does a PUT request' do
+            vcr(:put_request) { subject.put(request) }
+          end
         end
-      end
 
-      describe '.delete_http' do
-        subject { Client }
-        it 'does a DELETE request' do
-          vcr(:delete_request) { subject.delete_http('http://example.com', foo: 'bar') }
+        describe '#delete' do
+          it 'does a DELETE request' do
+            vcr(:delete_request) { subject.delete(request) }
+          end
         end
       end
 
@@ -292,7 +291,7 @@ module Contentful
 
         it 'effectively requests via proxy' do
           vcr(:proxy_request) {
-            expect(subject.class).to receive(:proxy_send).twice.and_call_original
+            expect(subject).to receive(:proxy_send).twice.and_call_original
             subject.spaces.find('zh42n1tmsaiq')
           }
         end

data/spec/lib/contentful/management/entry_spec.rb

@@ -160,7 +160,7 @@ module Contentful
             expect(result).to be_kind_of Contentful::Management::BadRequest
             expect(result.message).to eq 'Not published'
             expect(result.error[:message]).to eq 'Not published'
-            expect(result.error[:url]).to eq '/yr5m0jky5hsh/entries/4Rouux8SoUCKwkyCq2I0E0/published'
+            expect(result.error[:url]).to eq 'spaces/yr5m0jky5hsh/entries/4Rouux8SoUCKwkyCq2I0E0/published'
             expect(result.error[:details]).to eq "{\n  \"sys\": {\n    \"type\": \"Error\",\n    \"id\": \"BadRequest\"\n  },\n  \"message\": \"Not published\"\n}\n"
           end
         end
@@ -773,18 +773,18 @@ module Contentful
           end
 
           attributes = {
-              name: 'Test name',
-              number: 30,
-              float1: 1.1,
-              boolean: true, date: '2000-07-12T11:11:00+02:00',
-              time: '2000-07-12T11:11:00+02:00',
-              location: location,
-              image: Asset.new,
-              images: [Asset.new, Asset.new],
-              array: %w(PL USD XX),
-              entry: Entry.new,
-              entries: [Entry.new, Entry.new],
-              object_json: {'test' => {'@type' => 'Codequest'}}
+            name: 'Test name',
+            number: 30,
+            float1: 1.1,
+            boolean: true, date: '2000-07-12T11:11:00+02:00',
+            time: '2000-07-12T11:11:00+02:00',
+            location: location,
+            image: Asset.new,
+            images: [Asset.new, Asset.new],
+            array: %w(PL USD XX),
+            entry: Entry.new,
+            entries: [Entry.new, Entry.new],
+            object_json: {'test' => {'@type' => 'Codequest'}}
           }
 
           parsed_attributes = Entry.new.fields_from_attributes(attributes)
@@ -807,7 +807,7 @@ module Contentful
 
         it 'keepd hashes in attributes' do
           attributes = {
-              entries: [{sys: {type: 'Link', linkType: 'Entry', id: nil}}, {sys: {type: 'Link', linkType: 'Entry', id: nil}}]
+            entries: [{sys: {type: 'Link', linkType: 'Entry', id: nil}}, {sys: {type: 'Link', linkType: 'Entry', id: nil}}]
           }
 
           parsed_attributes = Entry.new.fields_from_attributes(attributes)
@@ -1040,53 +1040,53 @@ module Contentful
             end
 
             describe 'without dynamic entries' do
-                it 'on an already populated field' do
-                  vcr('entry/issue_61.7') {
-                    begin
-                      client.configuration[:default_locale] = 'en-GB'
+              it 'on an already populated field' do
+                vcr('entry/issue_61.7') {
+                  begin
+                    client.configuration[:default_locale] = 'en-GB'
 
-                      expected_entry = subject.find('u2viwgfeal0o', 'fIpsfQSOd22IsqMQCiG0K')
+                    expected_entry = subject.find('u2viwgfeal0o', 'fIpsfQSOd22IsqMQCiG0K')
 
-                      expect(expected_entry.value).to eq 'hello'
+                    expect(expected_entry.value).to eq 'hello'
 
-                      expected_entry.value = 'goodbye'
+                    expected_entry.value = 'goodbye'
 
-                      expected_entry.save
-                      expected_entry.publish
+                    expected_entry.save
+                    expected_entry.publish
 
-                      expect(expected_entry.value).to eq 'goodbye'
-                    ensure
-                      expected_entry.value = 'hello'
+                    expect(expected_entry.value).to eq 'goodbye'
+                  ensure
+                    expected_entry.value = 'hello'
 
-                      expected_entry.save
-                      expected_entry.publish
-                    end
-                  }
-                end
+                    expected_entry.save
+                    expected_entry.publish
+                  end
+                }
+              end
 
-                it 'on a previously empty field' do
-                  vcr('entry/issue_61.8') {
-                    begin
-                      client.configuration[:default_locale] = 'en-GB'
+              it 'on a previously empty field' do
+                vcr('entry/issue_61.8') {
+                  begin
+                    client.configuration[:default_locale] = 'en-GB'
 
-                      expected_entry = subject.find('u2viwgfeal0o', '2GmtCwDBcIu4giMgQGIIcq')
+                    expected_entry = subject.find('u2viwgfeal0o', '2GmtCwDBcIu4giMgQGIIcq')
 
-                      expect(expected_entry.value).to eq nil
+                    expect(expected_entry.value).to eq nil
 
-                      expected_entry.value = 'goodbye'
+                    expected_entry.value = 'goodbye'
 
-                      expected_entry.save
-                      expected_entry.publish
+                    expected_entry.save
+                    expected_entry.publish
 
-                      expect(expected_entry.value).to eq 'goodbye'
-                    ensure
-                      expected_entry.value = nil
+                    expect(expected_entry.value).to eq 'goodbye'
+                  ensure
+                    expected_entry.value = nil
 
-                      expected_entry.save
-                      expected_entry.publish
-                    end
-                  }
-                end
+                    expected_entry.save
+                    expected_entry.publish
+                  end
+                }
+              end
             end
           end
         end

data/spec/lib/contentful/management/organization_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'contentful/management/space'
+require 'contentful/management/client'
+
+module Contentful
+  module Management
+    describe Organization do
+      let(:token) { ENV.fetch('CF_TEST_CMA_TOKEN', '<ACCESS_TOKEN>') }
+      let!(:client) { Client.new(token) }
+
+      subject { client.organizations }
+
+      describe '.all' do
+        it 'fetches the list of organizations belonging to the user' do
+          vcr('organization/all') {
+            organizations = subject.all
+            expect(organizations).to be_a Contentful::Management::Array
+
+            expect(organizations.first).to be_a Contentful::Management::Organization
+            expect(organizations.first.name).to eq 'My Test Organization'
+            expect(organizations.first.id).to be_truthy
+          }
+        end
+      end
+
+      describe '.find' do
+        it 'is not supported' do
+          expect { subject.find }.to raise_error 'Not supported'
+        end
+      end
+    end
+  end
+end

data/spec/lib/contentful/management/personal_access_token_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'contentful/management/space'
+require 'contentful/management/client'
+
+module Contentful
+  module Management
+    describe PersonalAccessToken do
+      let(:token) { ENV.fetch('CF_TEST_CMA_TOKEN', '<ACCESS_TOKEN>') }
+      let(:pat_id) { '3XBnbqn5s7oJ5PxyZiTzIg' }
+      let!(:client) { Client.new(token) }
+
+      subject { client.personal_access_tokens }
+
+      describe '.all' do
+        it 'returns a Contentful::Array' do
+          vcr('personal_access_token/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
+        end
+        it 'builds a Contentful::Management::PersonalAccessToken object' do
+          vcr('personal_access_token/all') {
+            token = subject.all.first
+            expect(token).to be_kind_of Contentful::Management::PersonalAccessToken
+            expect(token.name).to eq 'Playground'
+            expect(token.revoked_at).to be_falsey
+            expect(token.scopes).not_to be_empty
+          }
+        end
+      end
+
+      describe '.find' do
+        it 'returns a Contentful::Management::Webhook' do
+          vcr('personal_access_token/find') { expect(subject.find(pat_id)).to be_kind_of Contentful::Management::PersonalAccessToken }
+        end
+        it 'returns webhook for a given key' do
+          vcr('personal_access_token/find') do
+            token = subject.find(pat_id)
+            expect(token.id).to eql pat_id
+            expect(token.name).to eq 'Playground'
+            expect(token.revoked_at).to be_falsey
+            expect(token.scopes).not_to be_empty
+          end
+        end
+        it 'returns an error when content_type does not exists' do
+          vcr('personal_access_token/find_not_found') do
+            result = subject.find('not_exist')
+            expect(result).to be_kind_of Contentful::Management::NotFound
+          end
+        end
+      end
+
+      describe '.create' do
+        it 'builds Contentful::Management::PersonalAccessToken object' do
+          vcr('personal_access_token/create') do
+            token = subject.create(name: 'Test Token', scopes: ["content_management_manage"])
+            expect(token).to be_kind_of Contentful::Management::PersonalAccessToken
+            expect(token.name).to eq 'Test Token'
+            expect(token.token).to eq 'CFPAT-testytest'
+            expect(token.scopes).to eq ['content_management_manage']
+          end
+        end
+      end
+
+      describe '#destroy' do
+        it 'is not supported' do
+          vcr('personal_access_token/find') do
+            token = subject.find(pat_id)
+            expect { token.destroy }.to raise_error 'Not supported'
+          end
+        end
+      end
+
+      describe '#revoke' do
+        it 'revokes a token' do
+          vcr('personal_access_token/revoke') do
+            token = subject.find('4us7wI40rNxTDzLuLl79dA')
+            expect(token.revoked_at).to be_falsey
+
+            token.revoke
+
+            expect(token.revoked_at).to be_truthy
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/contentful/management/snapshot_spec.rb

@@ -5,80 +5,167 @@ require 'contentful/management/client'
 module Contentful
   module Management
     describe Snapshot do
-      let(:token) { '<ACCESS_TOKEN>' }
+      let(:token) { ENV.fetch('CF_TEST_CMA_TOKEN', '<ACCESS_TOKEN>') }
       let(:space_id) { 'facgnwwgj5fe' }
       let(:entry_id) { '5gQdVmPHKwIk2MumquYwOu' }
+      let(:content_type_id) { 'cat' }
       let(:snapshot_id) { '6DglRQMMHWUnzi2F3RjFFo' }
+      let(:ct_snapshot_id) { '5bfy52PVk8HwBfXURLOsWJ' }
       let!(:client) { Client.new(token) }
 
-      subject { client.snapshots }
+      describe 'default behaviour is entry snapshots' do
+        subject { client.snapshots }
 
-      describe '.all' do
-        it 'class method also works' do
-          vcr('snapshot/all') { expect(Contentful::Management::Snapshot.all(client, space_id, entry_id)).to be_kind_of Contentful::Management::Array }
-        end
-        it 'returns a Contentful::Array' do
-          vcr('snapshot/all') { expect(subject.all(space_id, entry_id)).to be_kind_of Contentful::Management::Array }
-        end
-        it 'builds a Contentful::Management::Snapshot object' do
-          vcr('snapshot/all') { expect(subject.all(space_id, entry_id).first).to be_kind_of Contentful::Management::Snapshot }
+        describe '.all' do
+          it 'class method also works' do
+            vcr('snapshot/all') { expect(Contentful::Management::Snapshot.all(client, space_id, entry_id)).to be_kind_of Contentful::Management::Array }
+          end
+          it 'returns a Contentful::Array' do
+            vcr('snapshot/all') { expect(subject.all(space_id, entry_id)).to be_kind_of Contentful::Management::Array }
+          end
+          it 'builds a Contentful::Management::Snapshot object' do
+            vcr('snapshot/all') { expect(subject.all(space_id, entry_id).first).to be_kind_of Contentful::Management::Snapshot }
+          end
         end
-      end
 
-      describe '.find' do
-        it 'class method also works' do
-          vcr('snapshot/find') { expect(Contentful::Management::Snapshot.find(client, space_id, entry_id, snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
-        end
-        it 'returns a Contentful::Management::Snapshot' do
-          vcr('snapshot/find') { expect(subject.find(space_id, entry_id, snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
+        describe '.find' do
+          it 'class method also works' do
+            vcr('snapshot/find') { expect(Contentful::Management::Snapshot.find(client, space_id, entry_id, snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
+          end
+          it 'returns a Contentful::Management::Snapshot' do
+            vcr('snapshot/find') { expect(subject.find(space_id, entry_id, snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
+          end
+          it 'returns snapshot for a given key' do
+            vcr('snapshot/find') do
+              snapshot = subject.find(space_id, entry_id, snapshot_id)
+              expect(snapshot.id).to eql snapshot_id
+            end
+          end
+          it 'returns an error when snapshot does not exist' do
+            vcr('snapshot/find_not_found') do
+              result = subject.find(space_id, entry_id, 'not_exist')
+              expect(result).to be_kind_of Contentful::Management::NotFound
+            end
+          end
         end
-        it 'returns snapshot for a given key' do
-          vcr('snapshot/find') do
-            snapshot = subject.find(space_id, entry_id, snapshot_id)
-            expect(snapshot.id).to eql snapshot_id
+
+        describe '.create' do
+          it 'is not supported' do
+            expect { subject.create }.to raise_error 'Not supported'
           end
         end
-        it 'returns an error when snapshot does not exist' do
-          vcr('snapshot/find_not_found') do
-            result = subject.find(space_id, entry_id, 'not_exist')
-            expect(result).to be_kind_of Contentful::Management::NotFound
+
+        describe '#update' do
+          it 'is not supported' do
+            vcr('snapshot/find') do
+              snapshot = subject.find(space_id, entry_id, snapshot_id)
+
+              expect { snapshot.update }.to raise_error 'Not supported'
+            end
           end
         end
-      end
 
-      describe '.create' do
-        it 'is not supported' do
-          expect { subject.create }.to raise_error 'Not supported'
+        describe '#destroy' do
+          it 'is not supported' do
+            vcr('snapshot/find') do
+              snapshot = subject.find(space_id, entry_id, snapshot_id)
+
+              expect { snapshot.destroy }.to raise_error 'Not supported'
+            end
+          end
         end
-      end
 
-      describe '#update' do
-        it 'is not supported' do
-          vcr('snapshot/find') do
-            snapshot = subject.find(space_id, entry_id, snapshot_id)
+        describe 'properties' do
+          it '.snapshot' do
+            vcr('snapshot/properties') do
+              snapshot = subject.find(space_id, entry_id, snapshot_id)
 
-            expect { snapshot.update }.to raise_error 'Not supported'
+              expect(snapshot.snapshot).to be_a Contentful::Management::Entry
+              expect(snapshot.snapshot.name['en-US']).to eq 'something else'
+            end
           end
         end
       end
 
-      describe '#destroy' do
-        it 'is not supported' do
-          vcr('snapshot/find') do
-            snapshot = subject.find(space_id, entry_id, snapshot_id)
+      describe 'entry snapshots' do
+        subject { client.entry_snapshots }
 
-            expect { snapshot.destroy }.to raise_error 'Not supported'
+        describe '.all' do
+          it 'class method also works' do
+            vcr('snapshot/all') { expect(Contentful::Management::Snapshot.all(client, space_id, entry_id)).to be_kind_of Contentful::Management::Array }
+          end
+          it 'returns a Contentful::Array' do
+            vcr('snapshot/all') { expect(subject.all(space_id, entry_id)).to be_kind_of Contentful::Management::Array }
+          end
+          it 'builds a Contentful::Management::Snapshot object' do
+            vcr('snapshot/all') {
+              snapshot = subject.all(space_id, entry_id).first
+              expect(snapshot).to be_kind_of Contentful::Management::Snapshot
+              expect(snapshot.snapshot).to be_kind_of Contentful::Management::DynamicEntry
+            }
+          end
+        end
+
+        describe '.find' do
+          it 'class method also works' do
+            vcr('snapshot/find') { expect(Contentful::Management::Snapshot.find(client, space_id, entry_id, snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
+          end
+          it 'returns a Contentful::Management::Snapshot' do
+            vcr('snapshot/find') { expect(subject.find(space_id, entry_id, snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
+          end
+          it 'returns snapshot for a given key' do
+            vcr('snapshot/find') do
+              snapshot = subject.find(space_id, entry_id, snapshot_id)
+              expect(snapshot.id).to eql snapshot_id
+            end
+          end
+          it 'returns an error when snapshot does not exist' do
+            vcr('snapshot/find_not_found') do
+              result = subject.find(space_id, entry_id, 'not_exist')
+              expect(result).to be_kind_of Contentful::Management::NotFound
+            end
           end
         end
       end
 
-      describe 'properties' do
-        it '.snapshot' do
-          vcr('snapshot/properties') do
-            snapshot = subject.find(space_id, entry_id, snapshot_id)
+      describe 'describe content type snapshots' do
+        subject { client.content_type_snapshots }
 
-            expect(snapshot.snapshot).to be_a Contentful::Management::Entry
-            expect(snapshot.snapshot.name['en-US']).to eq 'something else'
+        describe '.all' do
+          it 'class method also works' do
+            vcr('snapshot/ct_all') { expect(Contentful::Management::Snapshot.all(client, space_id, content_type_id, 'content_types')).to be_kind_of Contentful::Management::Array }
+          end
+          it 'returns a Contentful::Array' do
+            vcr('snapshot/ct_all') { expect(subject.all(space_id, content_type_id)).to be_kind_of Contentful::Management::Array }
+          end
+          it 'builds a Contentful::Management::Snapshot object' do
+            vcr('snapshot/ct_all') {
+              snapshot = subject.all(space_id, content_type_id).first
+              expect(snapshot).to be_kind_of Contentful::Management::Snapshot
+              expect(snapshot.snapshot).to be_kind_of Contentful::Management::ContentType
+            }
+          end
+        end
+
+        describe '.find' do
+          it 'class method also works' do
+            vcr('snapshot/ct_find') { expect(Contentful::Management::Snapshot.find(client, space_id, content_type_id, ct_snapshot_id, 'content_types')).to be_kind_of Contentful::Management::Snapshot }
+          end
+          it 'returns a Contentful::Management::Snapshot' do
+            vcr('snapshot/ct_find') { expect(subject.find(space_id, content_type_id, ct_snapshot_id)).to be_kind_of Contentful::Management::Snapshot }
+          end
+          it 'returns snapshot for a given key' do
+            vcr('snapshot/ct_find') do
+              snapshot = subject.find(space_id, content_type_id, ct_snapshot_id)
+              expect(snapshot.id).to eql ct_snapshot_id
+              expect(snapshot.snapshot.id).to eq content_type_id
+            end
+          end
+          it 'returns an error when snapshot does not exist' do
+            vcr('snapshot/ct_find_not_found') do
+              result = subject.find(space_id, content_type_id, 'not_exist')
+              expect(result).to be_kind_of Contentful::Management::NotFound
+            end
           end
         end
       end