contentful-management 1.10.1 → 2.0.0

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

@@ -10,7 +10,7 @@ module Contentful
       let(:membership_id) { '6RdRdobdQzh8zKe1Hogiz4' }
       let(:client) { Client.new(token, raise_errors: true) }
 
-      subject { client.space_memberships }
+      subject { client.space_memberships(space_id) }
 
       describe 'class methods' do
         describe '::create_attributes' do
@@ -68,12 +68,12 @@ module Contentful
 
       describe '.all' do
         it 'returns a Contentful::Array' do
-          vcr('space_memberships/all') { expect(subject.all(space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('space_memberships/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
         end
 
         it 'builds a Contentful::Management::SpaceMembership' do
           vcr('space_memberships/all') {
-            memberships = subject.all(space_id)
+            memberships = subject.all
 
             admin_membership, normal_membership = memberships.items
 
@@ -95,7 +95,7 @@ module Contentful
       describe '.find' do
         it 'returns a Contentful::Management::SpaceMembership' do
           vcr('space_memberships/find') {
-            membership = subject.find(space_id, membership_id)
+            membership = subject.find(membership_id)
 
             expect(membership).to be_a Contentful::Management::SpaceMembership
             expect(membership.admin).to eq false
@@ -108,7 +108,6 @@ module Contentful
         it 'creates a Contentful::Management::SpaceMembership' do
           vcr('space_memberships/create') {
             membership = subject.create(
-              space_id,
               admin: false,
               roles: [
                 {
@@ -132,13 +131,13 @@ module Contentful
       describe '#destroy' do
         it 'deletes the membership' do
           vcr('space_memberships/delete') {
-            membership = subject.find(space_id, '7pcydolqtgMaSLwmXMvGqW')
+            membership = subject.find('7pcydolqtgMaSLwmXMvGqW')
 
             expect(membership.id).to be_truthy
 
             membership.destroy
 
-            expect { subject.find(space_id, '7pcydolqtgMaSLwmXMvGqW') }.to raise_error Contentful::Management::NotFound
+            expect { subject.find('7pcydolqtgMaSLwmXMvGqW') }.to raise_error Contentful::Management::NotFound
           }
         end
       end

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

@@ -22,22 +22,6 @@ module Contentful
         it 'builds a Contentful::Management::Space object' do
           vcr('space/all') { expect(subject.all.first).to be_kind_of Contentful::Management::Space }
         end
-        describe 'content type caching' do
-          it 'fetches all content types when finding a space' do
-            vcr('space/all') do
-              space = subject.all
-              expect(client.dynamic_entry_cache).not_to be_empty
-            end
-          end
-          it 'doesnt fetch content types when explicitly disabled' do
-            vcr('space/all_disabled_cache') do
-              client = Client.new(token, disable_content_type_caching: true)
-              subject = client.spaces
-              space = subject.all
-              expect(client.dynamic_entry_cache).to be_empty
-            end
-          end
-        end
       end
 
       describe '.find' do
@@ -66,24 +50,6 @@ module Contentful
             expect(space.default_locale).to eql 'en-US'
           end
         end
-        describe 'content type caching' do
-          it 'fetches all content types when finding a space' do
-            vcr('space/find') do
-              space = subject.find(space_id)
-              expect(client.dynamic_entry_cache).not_to be_empty
-              expect(client.dynamic_entry_cache.key?('5DSpuKrl04eMAGQoQckeIq'.to_sym)).to be_truthy
-            end
-          end
-          it 'does not fetch content types when explicitly disabled' do
-            vcr('space/disabled_cache') do
-              client = Client.new(token, disable_content_type_caching: true)
-              subject = client.spaces
-
-              space = subject.find('facgnwwgj5fe')
-              expect(client.dynamic_entry_cache).to be_empty
-            end
-          end
-        end
       end
 
       describe '#destroy' do
@@ -131,7 +97,6 @@ module Contentful
               space = subject.create(name: 'pl space', organization_id: '1EQPR5IHrPx94UY4AViTYO', default_locale: 'pl-pl')
               expect(space).to be_kind_of Contentful::Management::Space
               expect(space.name).to eq 'pl space'
-              expect(space.locales.all.first.code).to eql 'pl-pl'
             end
           end
           it 'creates a space within a client default locale' do
@@ -140,7 +105,6 @@ module Contentful
               space = client.spaces.create(name: 'new space', organization_id: '4SsuxQCaMaemfIms52Jr8s')
               expect(space).to be_kind_of Contentful::Management::Space
               expect(space.name).to eq 'new space'
-              expect(space.locales.all.first.code).to eql 'pl-PL'
               expect(space.default_locale).to eql 'pl-PL'
             end
           end
@@ -166,40 +130,6 @@ module Contentful
         end
       end
 
-      describe '#content_types' do
-        let(:content_type_id) { '5DSpuKrl04eMAGQoQckeIq' }
-        let(:content_type_name) { 'ContentTypeForSpace' }
-
-        it 'creates content type' do
-          vcr('space/content_type/create') do
-            content_type = subject.find(space_id).content_types.create(name: content_type_name)
-            expect(content_type).to be_kind_of Contentful::Management::ContentType
-            expect(content_type.name).to eq content_type_name
-          end
-        end
-        it '#content_types.find' do
-          vcr('space/content_type/find') do
-            content_type = subject.find(space_id).content_types.find('1AZQOWKr2I8W2ugY0KiGEU')
-            expect(content_type).to be_kind_of Contentful::Management::ContentType
-            expect(content_type.name).to eq content_type_name
-          end
-        end
-        it '.content_types.all' do
-          vcr('space/content_type/all') do
-            content_types = subject.find(space_id).content_types.all
-            expect(content_types).to be_kind_of Contentful::Management::Array
-          end
-        end
-
-        it '.content_types.all_published' do
-          space_id = 'bjwq7b86vgmm'
-          vcr('space/content_type/all_public') do
-            content_types = subject.find(space_id).content_types.all_published
-            expect(content_types).to be_kind_of Contentful::Management::Array
-          end
-        end
-      end
-
       describe '#api_keys' do
         let!(:space_id) { 'bjwq7b86vgmm' }
         let(:api_key_id) { '6vbW35TjBTc8FyRTAuXZZe' }
@@ -228,79 +158,6 @@ module Contentful
         end
       end
 
-      describe '#default_locale' do
-        it 'can set default locales from space locales on already existing spaces' do
-          vcr('space/locale/find_other_locale') do
-            space = subject.find(space_id)
-            expect(space.default_locale).to eql 'de-DE'
-          end
-        end
-      end
-
-      describe '#locales' do
-        let(:locale_id) { '42irhRZ5uMrRc9SZ1PyDRk' }
-
-        it '#locales.all' do
-          vcr('space/locale/all') do
-            locales = subject.find(space_id).locales.all
-            expect(locales).to be_kind_of Contentful::Management::Array
-          end
-        end
-        it 'builds a Contentful::Management::Local object' do
-          vcr('space/locale/all') { expect(subject.find(space_id).locales.all.first).to be_kind_of Contentful::Management::Locale }
-        end
-        it '#locales.find' do
-          vcr('space/locale/find') do
-            locales = subject.find(space_id).locales.find(locale_id)
-            expect(locales).to be_kind_of Contentful::Management::Locale
-            expect(locales.code).to eql 'en-US'
-          end
-        end
-
-        it 'when locale not found' do
-          vcr('space/locale/find_not_found') do
-            locale = subject.find(space_id).locales.find('invalid_id')
-            expect(locale).to be_kind_of Contentful::Management::NotFound
-          end
-        end
-
-        it 'creates locales to space' do
-          vcr('space/locale/create') do
-            locale = subject.find(space_id).locales.create(name: 'ru-RU',
-                                                           contentManagementApi: true,
-                                                           publish: true,
-                                                           contentDeliveryApi: true,
-                                                           code: 'ru-RU')
-            expect(locale).to be_kind_of Contentful::Management::Locale
-            expect(locale.name).to eql 'ru-RU'
-          end
-        end
-
-        it 'returns error when locale already exists' do
-          vcr('space/locale/create_with_the_same_code') do
-            space = subject.find(space_id)
-            locale = space.locales.create(name: 'ru-RU',
-                                          contentManagementApi: true,
-                                          publish: true,
-                                          contentDeliveryApi: true,
-                                          code: 'ru-RU')
-            expect(locale).to be_kind_of Contentful::Management::UnprocessableEntity
-            expect(locale.response.error_message).to eql 'The resource you sent in the body is invalid.'
-          end
-        end
-
-        it '#update when all params are given' do
-          vcr('space/locale/update') do
-            locale = subject.find(space_id).locales.find('6vn9hLab7q0D44XgRUwpoO')
-            initial_version = locale.sys[:version]
-            locale.update(name: 'Russia', contentManagementApi: true, publish: true, contentDeliveryApi: true)
-            expect(locale).to be_kind_of Contentful::Management::Locale
-            expect(locale.name).to eql 'Russia'
-            expect(locale.sys[:version]).to eql initial_version + 1
-          end
-        end
-      end
-
       describe '#save' do
         let(:new_name) { 'SaveNewName' }
         it ' new space' do
@@ -323,122 +180,6 @@ module Contentful
         end
       end
 
-      describe '#assets' do
-        it '#assets.all' do
-          vcr('space/asset/all') do
-            assets = subject.find(space_id).assets.all
-            expect(assets).to be_kind_of Contentful::Management::Array
-          end
-        end
-        it 'builds a Contentful::Management::Asset object' do
-          vcr('space/asset/all') { expect(subject.find(space_id).assets.all.first).to be_kind_of Contentful::Management::Asset }
-        end
-
-        it 'return asset for a given key' do
-          vcr('space/asset/find') do
-            result = subject.find(space_id).assets.find('6zEogZjpO8cq6YOOQigiAw')
-            expect(result).to be_kind_of Contentful::Management::Asset
-            expect(result.id).to eql '6zEogZjpO8cq6YOOQigiAw'
-          end
-        end
-        it '#assets.all(skip: 3, limit: 5)' do
-          vcr('space/asset/all_with_skip_and_limit') do
-            assets = subject.find('bfsvtul0c41g').assets.all(limit: 5, skip: 3)
-            expect(assets).to be_kind_of Contentful::Management::Array
-            expect(assets.limit).to eq 5
-          end
-        end
-
-        it '#assets.all_published' do
-          space_id = 'bjwq7b86vgmm'
-          vcr('space/asset/all_public') do
-            assets = subject.find(space_id).assets.all_published
-            expect(assets).to be_kind_of Contentful::Management::Array
-          end
-        end
-
-        it 'create asset for space' do
-          vcr('space/asset/create') do
-            file = Contentful::Management::File.new
-            file.properties[:contentType] = 'image/jpeg'
-            file.properties[:fileName] = 'codequest.jpg'
-            file.properties[:upload] = 'http://static.goldenline.pl/firm_logo/082/firm_225106_22f37f_small.jpg'
-
-            space_assets = subject.find(space_id).assets
-            asset = space_assets.create(title: 'CodeQuest', description: 'Logo of Codequest', file: file)
-            expect(asset).to be_kind_of Contentful::Management::Asset
-            expect(asset.title).to eql 'CodeQuest'
-            expect(asset.description).to eql 'Logo of Codequest'
-          end
-        end
-
-        it 'creates asset with  multiple locales ' do
-          vcr('space/asset/create_with_multiple_locales') do
-            file = Contentful::Management::File.new
-            file.properties[:contentType] = 'image/jpeg'
-            file.properties[:fileName] = 'codequest.jpg'
-            file.properties[:upload] = 'http://static.goldenline.pl/firm_logo/082/firm_225106_22f37f_small.jpg'
-            space = subject.find(space_id)
-            asset = space.assets.new
-            asset.title_with_locales = {'en-US' => 'Company logo', 'pl' => 'Firmowe logo'}
-            asset.title = 'Logo of Codequest comapny'
-            asset.description_with_locales = {'en-US' => 'Company logo codequest', 'pl' => 'Logo firmy Codequest'}
-            asset.file_with_locales = {'en-US' => file, 'pl' => file}
-            asset.save
-
-            expect(asset).to be_kind_of Contentful::Management::Asset
-            expect(asset.title).to eq 'Logo of Codequest comapny'
-            expect(asset.description).to eq 'Company logo codequest'
-            asset.locale = 'pl'
-            expect(asset.title).to eq 'Firmowe logo'
-            expect(asset.description).to eq 'Logo firmy Codequest'
-          end
-        end
-      end
-      describe '#assets.all(limit: 2, skip: 1).next_page' do
-        it 'returns assets to limited number of assets' do
-          vcr('space/asset/with_skipped_and_limited_assets_next_page') do
-            space = subject.find('bfsvtul0c41g')
-            assets = space.assets.all(limit: 2, skip: 1).next_page
-            expect(assets).to be_kind_of Contentful::Management::Array
-            expect(assets.first).to be_kind_of Contentful::Management::Asset
-            expect(assets.limit).to eq 2
-            expect(assets.skip).to eq 3
-          end
-        end
-      end
-
-      describe '#entries' do
-        it '#entries.all' do
-          vcr('space/entry/all') do
-            entries = subject.find(space_id).entries.all
-            expect(entries).to be_kind_of Contentful::Management::Array
-          end
-        end
-        it 'builds a Contentful::Management::Entry object' do
-          vcr('space/entry/all') { expect(subject.find(space_id).entries.all.first).to be_kind_of Contentful::Management::Entry }
-        end
-
-        it '#entries.all_published' do
-          space_id = 'bjwq7b86vgmm'
-          vcr('space/entry/all_public') do
-            entries = subject.find(space_id).entries.all_published
-            expect(entries).to be_kind_of Contentful::Management::Array
-          end
-        end
-
-        it 'return entry for a given key' do
-          vcr('space/entry/find') do
-            result = subject.find(space_id).entries.find('4Rouux8SoUCKwkyCq2I0E0')
-            expect(result).to be_kind_of Contentful::Management::Entry
-            expect(result.id).to eql '4Rouux8SoUCKwkyCq2I0E0'
-            expect(result.name_with_locales['en-US']).to eq 'Tom Handy'
-            expect(result.class.to_s).to eq "Contentful::Management::DynamicEntry[#{ result.class.content_type.id }]"
-            expect(result.class.inspect).to eq "Contentful::Management::DynamicEntry[#{ result.class.content_type.id }]"
-          end
-        end
-      end
-
       describe '#webhooks' do
         let(:space_id) { 'bfsvtul0c41g' }
         it 'return all webhooks' do
@@ -467,29 +208,6 @@ module Contentful
           end
         end
       end
-      describe '#entries.all(content_type: content_type_id)' do
-        it 'returns entries to specified content type' do
-          vcr('space/entry/content_type_entires') do
-            space = subject.find('9lxkhjnp8gyx')
-            entries = space.entries.all(content_type: 'category_content_type')
-            expect(entries).to be_kind_of Contentful::Management::Array
-            expect(entries.first).to be_kind_of Contentful::Management::Entry
-            expect(entries.first.sys[:contentType].id).to eq 'category_content_type'
-          end
-        end
-      end
-      describe '#entries.all(limit: 2, skip: 1).next_page' do
-        it 'returns entries to limited number of entries' do
-          vcr('space/entry/with_skipped_and_limited_entires_next_page') do
-            space = subject.find('sueu9bzev6qn')
-            entries = space.entries.all(limit: 2, skip: 1).next_page
-            expect(entries).to be_kind_of Contentful::Management::Array
-            expect(entries.first).to be_kind_of Contentful::Management::Entry
-            expect(entries.limit).to eq 2
-            expect(entries.skip).to eq 3
-          end
-        end
-      end
       describe '#reload' do
         let(:space_id) { 'bfsvtul0c41g' }
         it 'update the current version of the object to the version on the system' do

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

@@ -11,7 +11,7 @@ module Contentful
       let(:extension_id) { '2ZJduY1pKEma6G8Y2ImqYU' }
       let(:client) { Client.new(token, raise_errors: true) }
 
-      subject { client.ui_extensions }
+      subject { client.ui_extensions(space_id, 'master') }
 
       describe 'class methods' do
         describe '::valid_extension' do
@@ -202,12 +202,12 @@ module Contentful
 
       describe '.all' do
         it 'returns a Contentful::Array' do
-          vcr('ui_extension/all') { expect(subject.all(space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('ui_extension/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
         end
 
         it 'builds a Contentful::Management::UIExtension' do
           vcr('ui_extension/all') {
-            extension = subject.all(space_id).first
+            extension = subject.all.first
 
             expect(extension).to be_kind_of Contentful::Management::UIExtension
             expect(extension.name).to eq 'My awesome extension by srcDoc'
@@ -219,14 +219,14 @@ module Contentful
         end
 
         it 'class method also works' do
-          vcr('ui_extension/all') { expect(Contentful::Management::UIExtension.all(client, space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('ui_extension/all') { expect(Contentful::Management::UIExtension.all(client, space_id, 'master')).to be_kind_of Contentful::Management::Array }
         end
       end
 
       describe '.find' do
         it 'returns a Contentful::Management::UIExtension' do
           vcr('ui_extension/find') {
-            extension = subject.find(space_id, extension_id)
+            extension = subject.find(extension_id)
 
             expect(extension).to be_kind_of Contentful::Management::UIExtension
             expect(extension.name).to eq 'My awesome extension by srcDoc'
@@ -241,7 +241,7 @@ module Contentful
       describe '.create' do
         it 'creates a Contentful::Management::UIExtension' do
           vcr('ui_extension/create') {
-            extension = subject.create(playground_space_id, extension: {
+            extension = client.ui_extensions(playground_space_id, 'master').create(extension: {
               'name' => 'test extension',
               'fieldTypes' => [{"type"=>"Symbol"}, {"type"=>"Text"}],
               'srcdoc' => "<!doctype html><html lang='en'><head><meta charset='UTF-8'/><title>Sample Editor Extension</title><link rel='stylesheet' href='https://contentful.github.io/ui-extensions-sdk/cf-extension.css'><script src='https://contentful.github.io/ui-extensions-sdk/cf-extension-api.js'></script></head><body><div id='content'></div><script>window.contentfulExtension.init(function (extension) {window.alert(extension);var value = extension.field.getValue();extension.field.setValue('Hello world!');extension.field.onValueChanged(function(value) {if (value !== currentValue) {extension.field.setValue('Hello world!');}});});</script></body></html>",
@@ -261,13 +261,13 @@ module Contentful
       describe '#destroy' do
         it 'deletes the extension' do
           vcr('ui_extension/delete') {
-            extension = subject.find(playground_space_id, '2rf6QdckyoECCsQeE6gIOg')
+            extension = client.ui_extensions(playground_space_id, 'master').find('2rf6QdckyoECCsQeE6gIOg')
 
             expect(extension.id).to be_truthy
 
             extension.destroy
 
-            expect { subject.find(playground_space_id, '2rf6QdckyoECCsQeE6gIOg') }.to raise_error Contentful::Management::NotFound
+            expect { client.ui_extensions(playground_space_id, 'master').find('2rf6QdckyoECCsQeE6gIOg') }.to raise_error Contentful::Management::NotFound
           }
         end
       end