contentful-management 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24bb75aa07523683bbef6c810f411422deea4140
-  data.tar.gz: c72ae53c5d8505ff32d23f2f5788da180b36945e
+  metadata.gz: 472e8a1070d8702011d2b2c66cf4f91d26b48c9b
+  data.tar.gz: 8e0b324dc7cd6e5ceae3199e37408d8d4e0f326d
 SHA512:
-  metadata.gz: 3ad8b03581cabe9b0e6d084682f0e58b07dad11f3827f87e9c0b9ed08ab197755fddc7f6e02bb196c858833007bdc4638e44cf4e69b1d51f0157404e9318b340
-  data.tar.gz: aacc23cf94ed71c318aa4a9302ee399382f77a0964145833a292d0c094c0d3781c53f5c9612cb67cf1f485c9b04a72cd6385c673d6b496391c79e90a0de1c23d
+  metadata.gz: 082d3ef8a03271e87b57401562294828cddc35f731d162648ba258b481c0a2553266bf0069a911c5ce43e07c3a266b6b4638ac4ab244509b0a5d40b4e4f09f04
+  data.tar.gz: 27db283177c954b7fe65e797dffde774b27b6135dd2224810fa059f8ac8d32baf5c3502cd55fe094f1b100d9eaf326d906962ed1845ec64516d2663b8bcf207e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
-=======
+
+## Master
+
+## 0.7.2
+### Fixed
+* Ensure that `Validation.type` returns correct value [#59](https://github.com/contentful/contentful-management.rb/issues/59), [#66](https://github.com/contentful/contentful-management.rb/issues/66)
+* Ensure that already existing `Space` returns correct `Locale` for `#default_locale` [#60](https://github.com/contentful/contentful-management.rb/issues/60)
+* Remove unintended nested `Validation` [#49](https://github.com/contentful/contentful-management.rb/issues/49)
+
 
 ## 0.7.1
 ### Fixed
@@ -17,7 +25,6 @@
 * Merge values for default locale and current locale [#58](https://github.com/contentful/contentful-management.rb/pull/58)
 
 
-
 ## 0.6.1
 ### Fixed
 * Fix access to space default_locale instance variable [#47](https://github.com/contentful/contentful-management.rb/pull/47)

data/contentful-management.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'reek'
+  spec.add_development_dependency 'reek', '~> 2', '>= 2.0.4'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock', '~> 1', '>= 1.17.3'
 end

data/lib/contentful/management/locale.rb

@@ -13,6 +13,7 @@ module Contentful
       property :contentManagementApi, :boolean
       property :contentDeliveryApi, :boolean
       property :publish, :boolean
+      property :default, :boolean
 
       # Gets a collection of locales.
       # Takes an id of a space.

data/lib/contentful/management/space.rb

@@ -23,6 +23,8 @@ module Contentful
       property :organization, :string
       property :locales, Locale
 
+      attr_accessor :found_locale
+
       # Gets a collection of spaces.
       # Returns a Contentful::Management::Array of Contentful::Management::Space.
       def self.all
@@ -59,7 +61,9 @@ module Contentful
         )
         response = request.post
         result = ResourceBuilder.new(response, {}, {})
-        result.run
+        space = result.run
+        space.found_locale = default_locale if space.is_a? Space
+        space
       end
 
       # Updates a space.
@@ -135,6 +139,19 @@ module Contentful
       def webhooks
         SpaceWebhookMethodsFactory.new(self)
       end
+
+      # Retrieves Default Locale for current Space and leaves it cached
+      def default_locale
+        self.found_locale ||= find_locale
+      end
+
+      # Finds Default Locale Code for current Space
+      # This request makes an API call to the Locale endpoint
+      def find_locale
+        locale = ::Contentful::Management::Locale.all(self.id).detect { |l| l.default }
+        return locale.code unless locale.nil?
+        @default_locale
+      end
     end
   end
 end

data/lib/contentful/management/validation.rb

@@ -9,7 +9,6 @@ module Contentful
       property :in, :array
       property :size, :hash
       property :present, :boolean
-      property :validations, Validation
       property :regexp, :hash
       property :linkContentType, :array
       property :range, :hash
@@ -24,8 +23,9 @@ module Contentful
 
       # Returns type of validation
       def type
-        properties.keys.each do |type|
-          return type if !self.send(Support.snakify(type)).nil?
+        properties.keys.reject { |key| key == :validations }.each do |type|
+          value = self.send(Support.snakify(type))
+          return type if !value.nil? && value
         end
       end
 

data/lib/contentful/management/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module Management
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
   end
 end

data/spec/fixtures/vcr_cassettes/locale/find_default.yml

@@ -0,0 +1,95 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/n6spjc167pc2/locales/0X5xcjckv6RMrd9Trae81p
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 14 Jul 2014 07:44:57 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '703'
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - 85f-1209864303
+      Etag:
+      - '"84473d86f0e8887dd6b44d2ffe155176"'
+      Accept-Ranges:
+      - bytes
+      Cache-Control:
+      - max-age=0
+      Access-Control-Allow-Origin:
+      - "*"
+      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
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Locale",
+            "id":"0X5xcjckv6RMrd9Trae81p",
+            "version":6,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"n6spjc167pc2"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "createdAt":"2014-07-11T10:43:30Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "updatedAt":"2014-07-11T13:29:23Z"
+          },
+          "name":"testNewLocaleName",
+          "code":"pl",
+          "default":true,
+          "contentManagementApi":true,
+          "publish":true,
+          "contentDeliveryApi":true}
+    http_version: 
+  recorded_at: Mon, 14 Jul 2014 07:44:57 GMT
+recorded_with: VCR 2.9.2

data/spec/fixtures/vcr_cassettes/locale/find_not_default.yml

@@ -0,0 +1,95 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/n6spjc167pc2/locales/0X5xcjckv6RMrd9Trae81p
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 14 Jul 2014 07:44:57 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '703'
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - 85f-1209864303
+      Etag:
+      - '"84473d86f0e8887dd6b44d2ffe155176"'
+      Accept-Ranges:
+      - bytes
+      Cache-Control:
+      - max-age=0
+      Access-Control-Allow-Origin:
+      - "*"
+      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
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Locale",
+            "id":"0X5xcjckv6RMrd9Trae81p",
+            "version":6,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"n6spjc167pc2"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "createdAt":"2014-07-11T10:43:30Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "updatedAt":"2014-07-11T13:29:23Z"
+          },
+          "name":"testNewLocaleName",
+          "code":"pl",
+          "default":false,
+          "contentManagementApi":true,
+          "publish":true,
+          "contentDeliveryApi":true}
+    http_version: 
+  recorded_at: Mon, 14 Jul 2014 07:44:57 GMT
+recorded_with: VCR 2.9.2

data/spec/fixtures/vcr_cassettes/space/locale/find_other_locale.yml

@@ -0,0 +1,572 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/yr5m0jky5hsh
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 31 Jul 2014 07:10:02 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '453'
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - 85f-1334431491
+      Etag:
+      - '"cbeabcb3476920c3f3a426f8cf41795d"'
+      Accept-Ranges:
+      - bytes
+      Cache-Control:
+      - max-age=0
+      Access-Control-Allow-Origin:
+      - "*"
+      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
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Space",
+            "id":"yr5m0jky5hsh",
+            "version":8,
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"0fn5fOWn4WsKFyYla1gI5h"
+              }
+            },
+            "createdAt":"2014-07-30T07:46:19Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "updatedAt":"2014-07-31T07:04:29Z"
+          },
+          "name":"NewNameSpace"}
+    http_version: 
+  recorded_at: Thu, 31 Jul 2014 07:10:02 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/yr5m0jky5hsh/content_types
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 31 Jul 2014 07:10:02 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '3054'
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Cf-Space-Id:
+      - yr5m0jky5hsh
+      Etag:
+      - '"4c43b6e34924f7e65971295370191384"'
+      Access-Control-Allow-Origin:
+      - "*"
+      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
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 1,
+          "skip": 0,
+          "limit": 100,
+          "items": [
+            {
+              "fields": [
+                {
+                  "name": "name",
+                  "id": "name",
+                  "type": "Text",
+                  "uiid": "3fflnrplhc0",
+                  "localized": true
+                },
+                {
+                  "name": "age",
+                  "id": "age",
+                  "uiid": "2t5blkc7u2o",
+                  "type": "Integer",
+                  "localized": true
+                },
+                {
+                  "name": "city",
+                  "id": "city",
+                  "type": "Location",
+                  "uiid": "4fzl5jkm1a8",
+                  "localized": false
+                },
+                {
+                  "name": "assets",
+                  "id": "assets",
+                  "uiid": "3aqrgdyesxs",
+                  "type": "Array",
+                  "items": {
+                    "type": "Link",
+                    "linkType": "Asset"
+                  },
+                  "localized": true
+                },
+                {
+                  "name": "entries",
+                  "id": "entries",
+                  "type": "Array",
+                  "uiid": "3xi486kbchs",
+                  "items": {
+                    "type": "Link",
+                    "linkType": "Entry"
+                  }
+                },
+                {
+                  "name": "entry",
+                  "id": "entry",
+                  "type": "Link",
+                  "uiid": "3uxjdd1n5ds",
+                  "linkType": "Entry"
+                },
+                {
+                  "name": "asset",
+                  "id": "asset",
+                  "type": "Link",
+                  "uiid": "40ilp8h1xc0",
+                  "linkType": "Asset"
+                },
+                {
+                  "name": "bool",
+                  "id": "bool",
+                  "type": "Boolean",
+                  "uiid": "2i1bgmn2dj4",
+                  "localized": true
+                },
+                {
+                  "name": "symbols",
+                  "id": "symbols",
+                  "type": "Array",
+                  "uiid": "38rbncxmzuo",
+                  "items": {
+                    "type": "Symbol"
+                  }
+                },
+                {
+                  "name": "birthday",
+                  "id": "birthday",
+                  "type": "Date",
+                  "uiid": "41bdwbk06bk"
+                }
+              ],
+              "name": "Author",
+              "sys": {
+                "id": "5DSpuKrl04eMAGQoQckeIq",
+                "type": "ContentType",
+                "createdAt": "2014-07-30T12:35:01.110Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "yr5m0jky5hsh"
+                  }
+                },
+                "firstPublishedAt": "2014-07-30T12:37:42.035Z",
+                "publishedCounter": 6,
+                "publishedAt": "2014-07-30T14:58:40.786Z",
+                "publishedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "publishedVersion": 177,
+                "version": 178,
+                "updatedAt": "2014-07-30T14:58:40.796Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                }
+              },
+              "description": null,
+              "displayField": "name"
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Thu, 31 Jul 2014 07:10:02 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/yr5m0jky5hsh/locales
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 31 Jul 2014 07:10:03 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '3463'
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - 85f-1334431493
+      Etag:
+      - '"39640635b4519a9604d27cb6b3a979b3"'
+      Accept-Ranges:
+      - bytes
+      Cache-Control:
+      - max-age=0
+      Access-Control-Allow-Origin:
+      - "*"
+      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
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Array"
+          },
+          "items":[
+            {
+              "sys":{
+                "type":"Locale",
+                "id":"42irhRZ5uMrRc9SZ1PyDRk",
+                "version":0,
+                "space":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"Space",
+                    "id":"yr5m0jky5hsh"
+                  }
+                },
+                "createdBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"0fn5fOWn4WsKFyYla1gI5h"
+                  }
+                },
+                "createdAt":"2014-07-30T07:46:19Z",
+                "updatedBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"0fn5fOWn4WsKFyYla1gI5h"
+                  }
+                },
+                "updatedAt":"2014-07-30T07:46:19Z"
+              },
+              "name":"German",
+              "code":"de-DE",
+              "default":true,
+              "contentManagementApi":true,
+              "publish":true,
+              "contentDeliveryApi":true
+            },
+            {
+              "sys":{
+                "type":"Locale",
+                "id":"3QwNQbA5IApftHq2TqWzbw",
+                "version":1,
+                "space":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"Space",
+                    "id":"yr5m0jky5hsh"
+                  }
+                },
+                "createdBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "createdAt":"2014-07-30T11:56:41Z",
+                "updatedBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "updatedAt":"2014-07-30T12:05:44Z"
+              },
+              "name":"Polish - PL",
+              "code":"pl-PL",
+              "default":false,
+              "contentManagementApi":true,
+              "publish":true,
+              "contentDeliveryApi":true
+            },
+            {
+              "sys":{
+                "type":"Locale",
+                "id":"3V5DI3HspzHXRhUuNNW8x8",
+                "version":0,
+                "space":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"Space",
+                    "id":"yr5m0jky5hsh"
+                  }
+                },
+                "createdBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "createdAt":"2014-07-30T11:56:45Z",
+                "updatedBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "updatedAt":"2014-07-30T11:56:45Z"
+              },
+              "name":"Polish",
+              "code":"pl",
+              "default":false,
+              "contentManagementApi":true,
+              "publish":true,
+              "contentDeliveryApi":true
+            },
+            {
+              "sys":{
+                "type":"Locale",
+                "id":"7E40Gt0Du4KBPwfw7pPw2O",
+                "version":0,
+                "space":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"Space",
+                    "id":"yr5m0jky5hsh"
+                  }
+                },
+                "createdBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "createdAt":"2014-07-30T12:07:20Z",
+                "updatedBy":{
+                  "sys":{
+                    "type":"Link",
+                    "linkType":"User",
+                    "id":"1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "updatedAt":"2014-07-30T12:07:20Z"
+              },
+              "name":"Belgium",
+              "code":"bl-BL",
+              "default":false,
+              "contentManagementApi":true,
+              "publish":true,
+              "contentDeliveryApi":true
+            }
+          ],
+          "total":4,
+          "limit":25,
+          "skip":0}
+    http_version: 
+  recorded_at: Thu, 31 Jul 2014 07:10:03 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/yr5m0jky5hsh/locales/42irhRZ5uMrRc9SZ1PyDRk
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 31 Jul 2014 07:10:04 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '700'
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - 85f-1334431494
+      Etag:
+      - '"223ca1fe077cffa1fe228a6303f2b0c8"'
+      Accept-Ranges:
+      - bytes
+      Cache-Control:
+      - max-age=0
+      Access-Control-Allow-Origin:
+      - "*"
+      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
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Locale",
+            "id":"42irhRZ5uMrRc9SZ1PyDRk",
+            "version":0,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"yr5m0jky5hsh"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"0fn5fOWn4WsKFyYla1gI5h"
+              }
+            },
+            "createdAt":"2014-07-30T07:46:19Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"0fn5fOWn4WsKFyYla1gI5h"
+              }
+            },
+            "updatedAt":"2014-07-30T07:46:19Z"
+          },
+          "name":"German",
+          "code":"de-DE",
+          "default":true,
+          "contentManagementApi":true,
+          "publish":true,
+          "contentDeliveryApi":true}
+    http_version: 
+  recorded_at: Thu, 31 Jul 2014 07:10:04 GMT
+recorded_with: VCR 2.9.2

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

@@ -578,6 +578,7 @@ module Contentful
               content_type.fields.create(id: 'valid', name: 'Valid', type: 'Text', validations: [validation_size])
               expect(content_type.fields[2].validations.last.properties[:size]['min']).to eq 10
               expect(content_type.fields[2].validations.last.properties[:size]['max']).to eq 15
+              expect(content_type.fields[2].validations.last.type).to be :size
             end
           end
         end
@@ -591,6 +592,7 @@ module Contentful
               content_type.fields.create(id: 'number', name: 'Number', type: 'Number', validations: [validation_range])
               expect(content_type.fields.first.validations.first.properties[:range]['min']).to eq 30
               expect(content_type.fields.first.validations.first.properties[:range]['max']).to eq 100
+              expect(content_type.fields.first.validations.first.type).to be :range
             end
           end
           it 'change `range` validation to existing field' do
@@ -613,6 +615,7 @@ module Contentful
               validation_present.present = true
               content_type.fields.create(id: 'present', name: 'Present', type: 'Text', validations: [validation_present])
               expect(content_type.fields.last.validations.last.properties[:present]).to be_truthy
+              expect(content_type.fields.last.validations.last.type).to be :present
             end
           end
         end
@@ -625,6 +628,7 @@ module Contentful
               content_type.fields.create(id: 'text', name: 'Text', type: 'Text', validations: [validation_regexp])
               expect(content_type.fields.last.validations.first.properties[:regexp]['pattern']).to eq '^such'
               expect(content_type.fields.last.validations.first.properties[:regexp]['flags']).to eq 'im'
+              expect(content_type.fields.last.validations.first.type).to eq :regexp
             end
           end
         end
@@ -636,6 +640,7 @@ module Contentful
               validation_link_content_type.link_content_type = ['post_content_type']
               content_type.fields.create(id: 'entries', validations: [validation_link_content_type])
               expect(content_type.fields[1].validations.first.properties[:linkContentType]).to eq %w( post_content_type )
+              expect(content_type.fields[1].validations.first.type).to be :linkContentType
             end
           end
         end
@@ -647,6 +652,7 @@ module Contentful
               validation_link_mimetype_group.link_mimetype_group = 'image'
               content_type.fields.create(id: 'entries', validations: [validation_link_mimetype_group])
               expect(content_type.fields[1].validations.first.properties[:linkMimetypeGroup]).to eq 'image'
+              expect(content_type.fields[1].validations.first.type).to be :linkMimetypeGroup
             end
           end
         end
@@ -658,6 +664,7 @@ module Contentful
               validation_link_mimetype_group.link_field = true
               content_type.fields.create(id: 'link_field', validations: [validation_link_mimetype_group])
               expect(content_type.fields.last.validations.first.properties[:linkField]).to be_truthy
+              expect(content_type.fields.last.validations.first.type).to be :linkField
             end
           end
         end

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

@@ -61,6 +61,21 @@ module Contentful
           end
         end
       end
+
+      describe '#default' do
+        it 'is false for non default' do
+          vcr('locale/find_not_default') do
+            locale = subject.find(space_id, locale_id)
+            expect(locale.default).to be_falsey
+          end
+        end
+        it 'is true for default' do
+          vcr('locale/find_default') do
+            locale = subject.find(space_id, locale_id)
+            expect(locale.default).to be_truthy
+          end
+        end
+      end
     end
   end
 end

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

@@ -38,7 +38,7 @@ module Contentful
           end
         end
         it 'returns space for a given key' do
-          vcr('space/find') do
+          vcr('space/locale/find') do
             space = subject.find(space_id)
             expect(space.id).to eql space_id
             expect(space.default_locale).to eql 'en-US'
@@ -152,6 +152,15 @@ 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' }
 

metadata

@@ -1,145 +1,150 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Piotr Protas
 - Tomasz Warkocki
 - Contentful GmbH (Andreas Tiefenthaler)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :runtime
+  name: http
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-  type: :runtime
+  name: multi_json
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rspec-its
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.0.4
+  name: reek
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: vcr
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -148,8 +153,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.3
-  type: :development
+  name: webmock
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -376,7 +382,9 @@ files:
 - spec/fixtures/vcr_cassettes/locale/all_for_space.yml
 - spec/fixtures/vcr_cassettes/locale/create_for_space.yml
 - spec/fixtures/vcr_cassettes/locale/find.yml
+- spec/fixtures/vcr_cassettes/locale/find_default.yml
 - spec/fixtures/vcr_cassettes/locale/find_for_space_not_found.yml
+- spec/fixtures/vcr_cassettes/locale/find_not_default.yml
 - spec/fixtures/vcr_cassettes/locale/reload.yml
 - spec/fixtures/vcr_cassettes/space/all.yml
 - spec/fixtures/vcr_cassettes/space/asset/all.yml
@@ -407,6 +415,7 @@ files:
 - spec/fixtures/vcr_cassettes/space/locale/create_with_the_same_code.yml
 - spec/fixtures/vcr_cassettes/space/locale/find.yml
 - spec/fixtures/vcr_cassettes/space/locale/find_not_found.yml
+- spec/fixtures/vcr_cassettes/space/locale/find_other_locale.yml
 - spec/fixtures/vcr_cassettes/space/locale/update.yml
 - spec/fixtures/vcr_cassettes/space/reload.yml
 - spec/fixtures/vcr_cassettes/space/save_new_space.yml
@@ -437,7 +446,7 @@ homepage: https://github.com/contentful/contentful-management.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -452,9 +461,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: contentful management api
 test_files:
@@ -614,7 +623,9 @@ test_files:
 - spec/fixtures/vcr_cassettes/locale/all_for_space.yml
 - spec/fixtures/vcr_cassettes/locale/create_for_space.yml
 - spec/fixtures/vcr_cassettes/locale/find.yml
+- spec/fixtures/vcr_cassettes/locale/find_default.yml
 - spec/fixtures/vcr_cassettes/locale/find_for_space_not_found.yml
+- spec/fixtures/vcr_cassettes/locale/find_not_default.yml
 - spec/fixtures/vcr_cassettes/locale/reload.yml
 - spec/fixtures/vcr_cassettes/space/all.yml
 - spec/fixtures/vcr_cassettes/space/asset/all.yml
@@ -645,6 +656,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/space/locale/create_with_the_same_code.yml
 - spec/fixtures/vcr_cassettes/space/locale/find.yml
 - spec/fixtures/vcr_cassettes/space/locale/find_not_found.yml
+- spec/fixtures/vcr_cassettes/space/locale/find_other_locale.yml
 - spec/fixtures/vcr_cassettes/space/locale/update.yml
 - spec/fixtures/vcr_cassettes/space/reload.yml
 - spec/fixtures/vcr_cassettes/space/save_new_space.yml