contentful 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b4bdb550ac66dfda8c5fe4ced4b3bde07415da83
-  data.tar.gz: 65aee7c14dc1473b04af7dc44815573b296db99b
+SHA256:
+  metadata.gz: ff3b16a838646c1c0c399926f04bd69663c9d6517cb9167f37ac740fc90ca9ca
+  data.tar.gz: eb3f1acd093e200ab5b6cc6f8ee109bfe09d75a3b9ca4fe0b197ec0fa39ec95c
 SHA512:
-  metadata.gz: 7cd6e8ae3e2dcf16568e11cc92df868e829e7eee8d44c22ab968b59233c6dfdece51c0fe34a05102eb4a7d35ea78d187c9d9332afdd371f019ec80cdb043a26e
-  data.tar.gz: d78e37cdae252aa9b8d7da50e588b7fd5c87982dc81db77907e520160c02d18a768be890e398975b7f31f8088c884666b3abd6e2f54b14310000da3565d3942e
+  metadata.gz: 232a38cd11a80e04ee4e4fb22f7d74e47591340a9209fdee88ade19267e43a791205e93516964aa1bbe02556dde9f3bd09a956d44927698e2c4e02ea062846b5
+  data.tar.gz: '0787ffe99edaa76e132ed2cbbfc26328fc52f28d250cff848a648b8b02a12b58eb954ff2276c2e1dd9cedb5403f7642a3e5ac1dd544c8ad0a09fe0e5ada2c89c'

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 2.6.0
+### Changed
+* Makes all routes environment aware. This change is not backwards incompatible.
+
+### Added
+* Added `locales` endpoint to retrieve locales from an environment.
+
 ## 2.5.0
 ### Added
 * Add filtering of invalid entries from API responses.

data/README.md

@@ -169,6 +169,14 @@ Required option. The name of the space you want to access.
 
 Required option. The space's secret token.
 
+### :default_locale
+
+Defines default locale for the client. Defaults to `en-US`.
+
+### :environment
+
+Defines default environment to access. Defaults to `master`.
+
 ### :secure
 
 Whether to use https. Defaults to `true`.

data/lib/contentful/array.rb

@@ -59,9 +59,18 @@ module Contentful
     # @return [Contentful::Array, false]
     def next_page(client = nil)
       return false if client.nil?
+      return false if items.first.nil?
 
       new_skip = (skip || 0) + (limit || DEFAULT_LIMIT)
-      client.send(endpoint.delete('/'), limit: limit, skip: new_skip)
+
+      plurals = {
+        'Space' => 'spaces',
+        'ContentType' => 'content_types',
+        'Entry' => 'entries',
+        'Asset' => 'assets',
+        'Locale' => 'locales'
+      }
+      client.public_send(plurals[items.first.type], limit: limit, skip: new_skip)
     end
   end
 end

data/lib/contentful/asset.rb

@@ -44,19 +44,12 @@ module Contentful
     # @option options [String] :focus
     # @option options [String] :fit
     # @option options [String] :fl File Layering - 'progressive'
+    # @option options [String] :background
     # @see _ https://www.contentful.com/developers/documentation/content-delivery-api/#image-asset-resizing
     #
     # @return [String] Image API URL
     def image_url(options = {})
-      query = {
-        w: options[:w] || options[:width],
-        h: options[:h] || options[:height],
-        fm: options[:fm] || options[:format],
-        q: options[:q] || options[:quality],
-        f: options[:f] || options[:focus],
-        fit: options[:fit],
-        fl: options[:fl]
-      }.reject { |_k, v| v.nil? }
+      query = build_query(options)
 
       if query.empty?
         file.url
@@ -69,6 +62,19 @@ module Contentful
 
     private
 
+    def build_query(options)
+      {
+        w: options[:w] || options[:width],
+        h: options[:h] || options[:height],
+        fm: options[:fm] || options[:format],
+        q: options[:q] || options[:quality],
+        f: options[:f] || options[:focus],
+        bg: options[:bg] || options[:background],
+        fit: options[:fit],
+        fl: options[:fl]
+      }.reject { |_k, v| v.nil? }
+    end
+
     def create_files!
       file_json = raw.fetch('fields', {}).fetch('file', nil)
       return if file_json.nil?

data/lib/contentful/client.rb

@@ -20,6 +20,7 @@ module Contentful
       dynamic_entries: :manual,
       api_url: 'cdn.contentful.com',
       api_version: 1,
+      environment: 'master',
       authentication_mechanism: :header,
       resource_builder: ResourceBuilder,
       resource_mapping: {},
@@ -129,7 +130,7 @@ module Contentful
     #
     # @return [Contentful::ContentType]
     def content_type(id, query = {})
-      Request.new(self, '/content_types', query, id).get
+      Request.new(self, environment_url('/content_types'), query, id).get
     end
 
     # Gets a collection of content types
@@ -138,7 +139,7 @@ module Contentful
     #
     # @return [Contentful::Array<Contentful::ContentType>]
     def content_types(query = {})
-      Request.new(self, '/content_types', query).get
+      Request.new(self, environment_url('/content_types'), query).get
     end
 
     # Gets a specific entry
@@ -150,7 +151,7 @@ module Contentful
     def entry(id, query = {})
       normalize_select!(query)
       query['sys.id'] = id
-      entries = Request.new(self, '/entries', query).get
+      entries = Request.new(self, environment_url('/entries'), query).get
 
       return entries if configuration[:raw_mode]
 
@@ -164,7 +165,7 @@ module Contentful
     # @return [Contentful::Array<Contentful::Entry>]
     def entries(query = {})
       normalize_select!(query)
-      Request.new(self, '/entries', query).get
+      Request.new(self, environment_url('/entries'), query).get
     end
 
     # Gets a specific asset
@@ -174,7 +175,7 @@ module Contentful
     #
     # @return [Contentful::Asset]
     def asset(id, query = {})
-      Request.new(self, '/assets', query, id).get
+      Request.new(self, environment_url('/assets'), query, id).get
     end
 
     # Gets a collection of assets
@@ -184,7 +185,16 @@ module Contentful
     # @return [Contentful::Array<Contentful::Asset>]
     def assets(query = {})
       normalize_select!(query)
-      Request.new(self, '/assets', query).get
+      Request.new(self, environment_url('/assets'), query).get
+    end
+
+    # Gets a collection of locales for the current environment
+    #
+    # @param [Hash] query
+    #
+    # @return [Contentful::Array<Contentful::Locale>]
+    def locales(query = {})
+      Request.new(self, environment_url('/locales'), query).get
     end
 
     # Returns the base url for all of the client's requests
@@ -193,6 +203,12 @@ module Contentful
       "http#{configuration[:secure] ? 's' : ''}://#{configuration[:api_url]}/spaces/#{configuration[:space]}"
     end
 
+    # Returns the url aware of the currently selected environment
+    # @private
+    def environment_url(path)
+      "/environments/#{configuration[:environment]}#{path}"
+    end
+
     # Returns the formatted part of the X-Contentful-User-Agent header
     # @private
     def format_user_agent_header(key, values)
@@ -380,6 +396,8 @@ module Contentful
     #
     # @return [Contentful::Sync]
     def sync(options = { initial: true })
+      fail ArgumentError, 'Sync is not supported for non master environments' unless configuration[:environment] == 'master'
+
       Sync.new(self, options)
     end
 

data/lib/contentful/locale.rb

@@ -1,13 +1,16 @@
+require_relative 'base_resource'
+
 module Contentful
   # A Locale definition as included in Space
   # Read more about Localization at https://www.contentful.com/developers/documentation/content-delivery-api/#i18n
-  class Locale
-    attr_reader :code, :name, :default
+  class Locale < BaseResource
+    attr_reader :code, :name, :default, :fallback_code
 
-    def initialize(json)
-      @code = json.fetch('code', nil)
-      @name = json.fetch('name', nil)
-      @default = json.fetch('default', false)
+    def initialize(item, *)
+      @code = item.fetch('code', nil)
+      @name = item.fetch('name', nil)
+      @default = item.fetch('default', false)
+      @fallback_code = item.fetch('fallbackCode', nil)
     end
   end
 end

data/lib/contentful/resource_builder.rb

@@ -7,6 +7,7 @@ require_relative 'array'
 require_relative 'link'
 require_relative 'deleted_entry'
 require_relative 'deleted_asset'
+require_relative 'locale'
 
 module Contentful
   # Transforms a Contentful::Response into a Contentful::Resource or a Contentful::Error
@@ -22,7 +23,8 @@ module Contentful
       'Array' => Array,
       'Link' => Link,
       'DeletedEntry' => DeletedEntry,
-      'DeletedAsset' => DeletedAsset
+      'DeletedAsset' => DeletedAsset,
+      'Locale' => Locale
     }
     # Default Entry Mapping
     # @see _ README for more information on Entry Mapping
@@ -73,7 +75,7 @@ module Contentful
     end
 
     def build_item(item, includes = [], errors = [])
-      buildables = %w(Entry Asset ContentType Space DeletedEntry DeletedAsset)
+      buildables = %w(Entry Asset ContentType Space DeletedEntry DeletedAsset Locale)
       item_type = buildables.detect { |b| b.to_s == item['sys']['type'] }
       fail UnparsableResource, 'Item type is not known, could not parse' if item_type.nil?
       item_class = resource_class(item)

data/lib/contentful/version.rb

@@ -1,5 +1,5 @@
 # Contentful Namespace
 module Contentful
   # Gem Version
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/asset_spec.rb

@@ -54,9 +54,9 @@ describe Contentful::Asset do
     end
 
     it 'adds image options if given' do
-      url = asset.image_url(width: 100, format: 'jpg', quality: 50, focus: 'top_right', fit: 'thumb', fl: 'progressive')
+      url = asset.image_url(width: 100, format: 'jpg', quality: 50, focus: 'top_right', fit: 'thumb', fl: 'progressive', background: 'rgb:ff0000')
       expect(url).to include asset.file.url
-      expect(url).to include '?w=100&fm=jpg&q=50&f=top_right&fit=thumb&fl=progressive'
+      expect(url).to include '?w=100&fm=jpg&q=50&f=top_right&bg=rgb%3Aff0000&fit=thumb&fl=progressive'
     end
   end
 
@@ -66,9 +66,9 @@ describe Contentful::Asset do
     end
 
     it 'adds image options if given' do
-      url = asset.url(width: 100, format: 'jpg', quality: 50, focus: 'top_right', fit: 'thumb', fl: 'progressive')
+      url = asset.url(width: 100, format: 'jpg', quality: 50, focus: 'top_right', fit: 'thumb', fl: 'progressive', background: 'rgb:ff0000')
       expect(url).to include asset.file.url
-      expect(url).to include '?w=100&fm=jpg&q=50&f=top_right&fit=thumb&fl=progressive'
+      expect(url).to include '?w=100&fm=jpg&q=50&f=top_right&bg=rgb%3Aff0000&fit=thumb&fl=progressive'
     end
   end
 

data/spec/client_class_spec.rb

@@ -6,7 +6,7 @@ describe Contentful::Client do
     let(:proxy_client) { create_client(proxy_host: '183.207.232.194',
                                        proxy_port: 8080,
                                        secure: false) }
-    let(:request) { Contentful::Request.new(nil, '/content_types', nil, 'cat') }
+    let(:request) { Contentful::Request.new(nil, client.environment_url('/content_types'), nil, 'cat') }
 
     it 'uses #base_url' do
       expect(client).to receive(:base_url).and_call_original

data/spec/fixtures/vcr_cassettes/array.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/array/marshal_custom_classes.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -80,7 +80,7 @@ http_interactions:
   recorded_at: Thu, 17 Aug 2017 12:23:27 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/entries?content_type=parent
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/environments/master/entries?content_type=parent
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/array/nested_resources.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -80,7 +80,7 @@ http_interactions:
   recorded_at: Thu, 03 Aug 2017 16:22:25 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/entries?content_type=child
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/environments/master/entries?content_type=child
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/arrayField.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/wl1z0pal05vy/content_types/2PqfXUJwE8qSYKuM0U6w8M
+    uri: https://cdn.contentful.com/spaces/wl1z0pal05vy/environments/master/content_types/2PqfXUJwE8qSYKuM0U6w8M
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/array_page_1.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=2&skip=3
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=2&skip=3
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/array_page_2.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=2&skip=5
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=2&skip=5
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/asset.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets/nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets/nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/asset/select_empty_array.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets?select=sys&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets?select=sys&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/asset/select_no_sys.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets?select=fields,sys&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets?select=fields,sys&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/asset/select_one_field.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets?select=sys,fields.file
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets?select=sys,fields.file
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/asset/select_only_sys.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets?select=sys
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets?select=sys
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/assets/issues_129.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/bht13amj0fva/assets?locale=*&sys.id=14bZJKTr6AoaGyeg4kYiWq
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/environments/master/assets?locale=*&sys.id=14bZJKTr6AoaGyeg4kYiWq
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/assets/issues_jekyll_46.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/bht13amj0fva/assets?locale=es&sys.id=14bZJKTr6AoaGyeg4kYiWq
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/environments/master/assets?locale=es&sys.id=14bZJKTr6AoaGyeg4kYiWq
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/bad_request.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?some=parameter
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?some=parameter
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/content_type.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types/cat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types/cat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entries.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entries/issue_117.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/8jbbayggj9gj/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/8jbbayggj9gj/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -87,7 +87,7 @@ http_interactions:
   recorded_at: Tue, 03 Jan 2017 11:34:30 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/8jbbayggj9gj/entries
+    uri: https://cdn.contentful.com/spaces/8jbbayggj9gj/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entries/issue_125.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/zui87wsu8q80/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/zui87wsu8q80/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -86,7 +86,7 @@ http_interactions:
   recorded_at: Wed, 05 Apr 2017 15:22:28 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/zui87wsu8q80/entries
+    uri: https://cdn.contentful.com/spaces/zui87wsu8q80/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entries/unresolvable_filter.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/011npgaszg5o/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/011npgaszg5o/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -80,7 +80,7 @@ http_interactions:
   recorded_at: Mon, 05 Mar 2018 15:21:05 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/011npgaszg5o/entries?sys.id=1HR1QvURo4MoSqO0eqmUeO
+    uri: https://cdn.contentful.com/spaces/011npgaszg5o/environments/master/entries?sys.id=1HR1QvURo4MoSqO0eqmUeO
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/custom_resource.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/g2b4ltw00meh/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/g2b4ltw00meh/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -86,7 +86,7 @@ http_interactions:
   recorded_at: Mon, 07 Dec 2015 17:08:37 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/g2b4ltw00meh/entries
+    uri: https://cdn.contentful.com/spaces/g2b4ltw00meh/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/include_resolution.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?include=2&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?include=2&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/include_resolution_uniques.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/v7cxgyxt0w5x/entries?include=10&sys.id=1nLXjjWvk4MEeWeQCWmymc
+    uri: https://cdn.contentful.com/spaces/v7cxgyxt0w5x/environments/master/entries?include=10&sys.id=1nLXjjWvk4MEeWeQCWmymc
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/json_objects.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/h425t6gef30p/entries
+    uri: https://cdn.contentful.com/spaces/h425t6gef30p/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/json_objects_client.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/h425t6gef30p/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/h425t6gef30p/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/marshal_138.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -80,7 +80,7 @@ http_interactions:
   recorded_at: Tue, 25 Jul 2017 20:12:57 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/entries?sys.id=5aV3O0l5jU0cwQ2OkyYsyU
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/environments/master/entries?sys.id=5aV3O0l5jU0cwQ2OkyYsyU
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/marshall.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?include=2&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?include=2&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/raw.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''
@@ -101,7 +101,7 @@ http_interactions:
   recorded_at: Tue, 20 Dec 2016 15:27:44 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/search_link_to_asset.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?links_to_asset=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?links_to_asset=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/search_link_to_entry.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?links_to_entry=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?links_to_entry=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/search_link_to_entry_with_custom_query.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?content_type=cat&links_to_entry=nyancat&select=fields.name,sys
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?content_type=cat&links_to_entry=nyancat&select=fields.name,sys
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/select_empty_array.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?select=sys&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?select=sys&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/select_no_sys.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?select=fields,sys&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?select=fields,sys&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/select_one_field.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?select=sys,fields.name&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?select=sys,fields.name&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/select_one_field_proper.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?content_type=cat&select=sys,fields.name&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?content_type=cat&select=sys,fields.name&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry/select_only_sys.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?select=sys&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?select=sys&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry_cache.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/entry_locales.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?locale=*&sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?locale=*&sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/field.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types/cat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types/cat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/human.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=finn
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=finn
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/linkField.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types/cat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types/cat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/locale_from_environment.yml

@@ -0,0 +1,121 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/facgnwwgj5fe/environments/testing/locales
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.4.0; platform ruby/2.4.1; os macOS/16;
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation,X-Contentful-User-Agent,X-Contentful-Enable-Alpha-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"933cd424e0bbb10faa1c119a7c478a36"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - b203a8e779b889882f508d217513881c
+      Content-Length:
+      - '779'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Tue, 27 Feb 2018 10:39:00 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '1019'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-hhn1545-HHN
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1519727940.115595,VS0,VE1
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 3,
+          "skip": 0,
+          "limit": 1000,
+          "items": [
+            {
+              "code": "en-US",
+              "name": "U.S. English",
+              "default": true,
+              "fallbackCode": null,
+              "sys": {
+                "id": "1NkEdf220AtNFVgJO9fFQ2",
+                "type": "Locale",
+                "version": 1
+              }
+            },
+            {
+              "code": "foo",
+              "name": "foobar",
+              "default": false,
+              "fallbackCode": null,
+              "sys": {
+                "id": "2QKRtwD3DKOkYKXJJsYdHk",
+                "type": "Locale",
+                "version": 1
+              }
+            },
+            {
+              "code": "foo-BB",
+              "name": "Foo (BarBaz)",
+              "default": false,
+              "fallbackCode": "en-US",
+              "sys": {
+                "id": "4YnLeSNLymCAZ6eYwJmhzu",
+                "type": "Locale",
+                "version": 1
+              }
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Tue, 27 Feb 2018 10:39:00 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/location.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/lzjz8hygvfgu/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/lzjz8hygvfgu/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -93,7 +93,7 @@ http_interactions:
   recorded_at: Tue, 20 Dec 2016 16:26:49 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/lzjz8hygvfgu/entries?sys.id=3f6fq5ylFCi4kIYAQKsAYG
+    uri: https://cdn.contentful.com/spaces/lzjz8hygvfgu/environments/master/entries?sys.id=3f6fq5ylFCi4kIYAQKsAYG
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cma9f9g4dxvs/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cma9f9g4dxvs/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -89,7 +89,7 @@ http_interactions:
   recorded_at: Thu, 05 Jan 2017 20:41:38 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cma9f9g4dxvs/entries?content_type=test&locale=*
+    uri: https://cdn.contentful.com/spaces/cma9f9g4dxvs/environments/master/entries?content_type=test&locale=*
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/multi_locale_reference.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -117,7 +117,7 @@ http_interactions:
   recorded_at: Thu, 29 Sep 2016 22:12:09 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/entries?locale=*
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/environments/master/entries?locale=*
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/not_found.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types/not%20found
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types/not%20found
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/nyancat.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/ratelimit.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/wrong/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/wrong/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/ratelimit_retry.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/assets
+    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/environments/master/assets
     body:
       encoding: US-ASCII
       string: ''
@@ -65,7 +65,7 @@ http_interactions:
   recorded_at: Tue, 09 Aug 2016 08:46:00 GMT
 - request:
     method: get
-    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/assets
+    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/environments/master/assets
     body:
       encoding: US-ASCII
       string: ''
@@ -141,7 +141,7 @@ http_interactions:
   recorded_at: Tue, 09 Aug 2016 08:46:00 GMT
 - request:
     method: get
-    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/assets
+    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/environments/master/assets
     body:
       encoding: US-ASCII
       string: ''
@@ -217,7 +217,7 @@ http_interactions:
   recorded_at: Tue, 09 Aug 2016 08:46:00 GMT
 - request:
     method: get
-    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/assets
+    uri: https://cdnorigin.flinkly.com/spaces/164vhtp008kz/environments/master/assets
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/reloaded_entry.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/unauthorized.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/wrong/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/wrong/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/unavailable.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/wrong/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/wrong/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/locale_spec.rb

@@ -16,4 +16,22 @@ describe Contentful::Locale do
       expect(locale.default).to eq true
     end
   end
+
+  describe 'locales endpoint' do
+    it 'locales can be fetched from environments' do
+      vcr('locale_from_environment') {
+        client = create_client(
+          space: 'facgnwwgj5fe',
+          access_token: '<ACCESS_TOKEN>',
+          environment: 'testing'
+        )
+
+        locales = client.locales
+
+        expect(locales).to be_a ::Contentful::Array
+        expect(locales.first).to be_a ::Contentful::Locale
+        expect(locales.first.code).to eq 'en-US'
+      }
+    end
+  end
 end

data/spec/sync_spec.rb

@@ -19,6 +19,12 @@ describe Contentful::Sync do
     end
   end
 
+  describe 'environments' do
+    it 'raises an error on non master environments' do
+      expect { create_client(environment: 'foo').sync }.to raise_exception
+    end
+  end
+
   describe '#initialize' do
     it 'takes an options hash on initialization' do
       expect do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -476,6 +476,7 @@ files:
 - spec/fixtures/vcr_cassettes/human.yml
 - spec/fixtures/vcr_cassettes/linkField.yml
 - spec/fixtures/vcr_cassettes/locale.yml
+- spec/fixtures/vcr_cassettes/locale_from_environment.yml
 - spec/fixtures/vcr_cassettes/location.yml
 - spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml
 - spec/fixtures/vcr_cassettes/multi_locale_reference.yml
@@ -526,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: contentful
@@ -614,6 +615,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/human.yml
 - spec/fixtures/vcr_cassettes/linkField.yml
 - spec/fixtures/vcr_cassettes/locale.yml
+- spec/fixtures/vcr_cassettes/locale_from_environment.yml
 - spec/fixtures/vcr_cassettes/location.yml
 - spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml
 - spec/fixtures/vcr_cassettes/multi_locale_reference.yml