contentful-management 0.2.1 → 0.3.0

data/lib/contentful/management/space.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require_relative 'resource'
 require_relative 'locale'
 require_relative 'space_locale_methods_factory'
@@ -51,7 +50,12 @@ module Contentful
       # Takes a hash of attributes with optional organization id if client has more than one organization.
       # Returns a Contentful::Management::Space.
       def self.create(attributes)
-        request = Request.new('', {'name' => attributes.fetch(:name)}, id = nil, organization_id: attributes[:organization_id])
+        request = Request.new(
+            '',
+            {'name' => attributes.fetch(:name)},
+            id = nil,
+            organization_id: attributes[:organization_id]
+        )
         response = request.post
         result = ResourceBuilder.new(response, {}, {})
         result.run
@@ -61,7 +65,13 @@ module Contentful
       # Takes a hash of attributes with optional organization id if client has more than one organization.
       # Returns a Contentful::Management::Space.
       def update(attributes)
-        request = Request.new("/#{ id }", {'name' => attributes.fetch(:name)}, id = nil, version: sys[:version], organization_id: attributes[:organization_id])
+        request = Request.new(
+            "/#{ id }",
+            {'name' => attributes.fetch(:name)},
+            id = nil,
+            version: sys[:version],
+            organization_id: attributes[:organization_id]
+        )
         response = request.put
         result = ResourceBuilder.new(response, {}, {})
         refresh_data(result.run)
@@ -70,11 +80,11 @@ module Contentful
       # If a space is new, an object gets created in the Contentful, otherwise the existing space gets updated.
       # See README for details.
       def save
-        if id.nil?
+        if id
+          update(name: name, organization_id: organization)
+        else
           new_instance = self.class.create(name: name, organization_id: organization)
           refresh_data(new_instance)
-        else
-          update(name: name, organization_id: organization)
         end
       end
 

data/lib/contentful/management/space_webhook_methods_factory.rb

@@ -5,10 +5,6 @@ module Contentful
     class SpaceWebhookMethodsFactory
       include Contentful::Management::SpaceAssociationMethodsFactory
 
-      def create(_attributes)
-        fail 'Not supported'
-      end
-
       def new
         fail 'Not supported'
       end

data/lib/contentful/management/support.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Contentful
   module Management
     # Utility methods used by the contentful management gem

data/lib/contentful/management/validation.rb

@@ -0,0 +1,34 @@
+require_relative 'resource'
+
+module Contentful
+  module Management
+    # A ContentType's validations schema
+    class Validation
+      include Contentful::Management::Resource
+
+      property :in, :array
+      property :size, :hash
+      property :present, :boolean
+      property :validations, Validation
+      property :regexp, :hash
+      property :linkContentType, :array
+      property :range, :hash
+      property :linkMimetypeGroup, :string
+      property :linkField, :boolean
+
+      def properties_to_hash
+        properties.each_with_object({}) do |(key, value), results|
+          results[key] = value if Field.value_exists?(value)
+        end
+      end
+
+      # Returns type of validation
+      def type
+        properties.keys.each do |type|
+          return type if !self.send(Support.snakify(type)).nil?
+        end
+      end
+
+    end
+  end
+end

data/lib/contentful/management/version.rb

@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 module Contentful
   module Management
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/lib/contentful/management/webhook.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require_relative 'resource'
 
 module Contentful
@@ -17,7 +16,10 @@ module Contentful
       # Takes an id of space and hash of parameters.
       # Returns a Contentful::Management::Array of Contentful::Management::Webhook.
       def self.all(space_id, parameters = {})
-        request = Request.new("/#{ space_id }/webhook_definitions", parameters)
+        request = Request.new(
+            "/#{ space_id }/webhook_definitions",
+            parameters
+        )
         response = request.get
         result = ResourceBuilder.new(response, {}, {})
         result.run
@@ -37,8 +39,12 @@ module Contentful
       # Takes a space id and hash with attributes (url, httpBasicUsername, httpBasicPassword)
       # Returns a Contentful::Management::Webhook.
       def self.create(space_id, attributes)
-        request = Request.new("/#{ space_id }/webhook_definitions/#{ attributes[:id] || ''}", endpoint_parameters(attributes))
-        response = attributes[:id].nil? ? request.post : request.put
+        id = attributes[:id]
+        request = Request.new(
+            "/#{ space_id }/webhook_definitions/#{ id }",
+            endpoint_parameters(attributes)
+        )
+        response = id.nil? ? request.post : request.put
         ResourceBuilder.new(response, {}, {}).run
       end
 
@@ -46,7 +52,12 @@ module Contentful
       # Takes a hash with attributes.
       # Returns a Contentful::Management::Webhook.
       def update(attributes)
-        request = Request.new("/#{ space.id }/webhook_definitions/#{ id }", self.class.endpoint_parameters(attributes), id = nil, version: sys[:version])
+        request = Request.new(
+            "/#{ space.id }/webhook_definitions/#{ id }",
+            self.class.endpoint_parameters(attributes),
+            id = nil,
+            version: sys[:version]
+        )
         response = request.put
         result = ResourceBuilder.new(response, {}, {})
         refresh_data(result.run)
@@ -66,11 +77,7 @@ module Contentful
       end
 
       def self.endpoint_parameters(attributes)
-        parameters = {}
-        parameters.merge!(url: attributes[:url]) if attributes[:url]
-        parameters.merge!(httpBasicUsername: attributes[:httpBasicUsername]) if  attributes[:httpBasicUsername]
-        parameters.merge!(httpBasicPassword: attributes[:httpBasicPassword]) if attributes[:httpBasicPassword]
-        parameters
+        attributes.select { |key, _value| [:httpBasicUsername, :httpBasicPassword, :url].include? key }
       end
     end
   end

data/spec/fixtures/vcr_cassettes/content_type/validation/in.yml

@@ -0,0 +1,588 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/v2umtz8ths9v
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.2.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:
+      "^access-Control-Expose-Headers":
+      - Etag
+      Accept-Ranges:
+      - bytes
+      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-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Wed, 15 Oct 2014 08:39:10 GMT
+      Etag:
+      - '"35407b8a88882fe5717a4701910f6ce7"'
+      Server:
+      - nginx
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - f1c-2117926825
+      Content-Length:
+      - '459'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Space",
+            "id":"v2umtz8ths9v",
+            "version":1,
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "createdAt":"2014-08-21T13:32:11Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "updatedAt":"2014-08-21T13:32:12Z"
+          },
+          "name":"CMA Demo Rails App"}
+    http_version: 
+  recorded_at: Wed, 15 Oct 2014 08:39:10 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/v2umtz8ths9v/content_types
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.2.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:
+      "^access-Control-Expose-Headers":
+      - Etag
+      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-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - v2umtz8ths9v
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Wed, 15 Oct 2014 08:39:11 GMT
+      Etag:
+      - '"2b1db3abe63f59af461175d7191647c5"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '4897'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 3,
+          "skip": 0,
+          "limit": 100,
+          "items": [
+            {
+              "displayField": "title",
+              "name": "Post",
+              "description": "",
+              "fields": [
+                {
+                  "id": "title",
+                  "name": "Title",
+                  "type": "Text",
+                  "localized": true,
+                  "uiid": "2sdir2f8kcg"
+                },
+                {
+                  "id": "author",
+                  "name": "Author",
+                  "type": "Text",
+                  "localized": true,
+                  "uiid": "4x1018907pc"
+                },
+                {
+                  "id": "body",
+                  "name": "Body",
+                  "type": "Text",
+                  "localized": true,
+                  "uiid": "4hj7cda89hc"
+                },
+                {
+                  "id": "title_image",
+                  "name": "Title Image",
+                  "type": "Link",
+                  "linkType": "Asset",
+                  "required": true,
+                  "localized": true,
+                  "uiid": "4gcqrcma8lc"
+                },
+                {
+                  "id": "second_image",
+                  "name": "Second Image",
+                  "type": "Link",
+                  "linkType": "Asset",
+                  "localized": true,
+                  "uiid": "40440elrugw"
+                },
+                {
+                  "id": "category",
+                  "name": "Category",
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "uiid": "49vicjvqsxs",
+                  "localized": true
+                }
+              ],
+              "sys": {
+                "id": "post_content_type",
+                "type": "ContentType",
+                "createdAt": "2014-08-21T13:32:30.401Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "v2umtz8ths9v"
+                  }
+                },
+                "firstPublishedAt": "2014-08-21T13:32:43.385Z",
+                "publishedCounter": 2,
+                "publishedAt": "2014-08-27T09:18:36.995Z",
+                "publishedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "publishedVersion": 11,
+                "version": 12,
+                "updatedAt": "2014-08-27T09:18:37.003Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                }
+              }
+            },
+            {
+              "fields": [
+                {
+                  "name": "testowe",
+                  "id": "testowe",
+                  "type": "Link",
+                  "uiid": "3q907mcb4lc",
+                  "linkType": "Asset",
+                  "required": true,
+                  "localized": true,
+                  "validations": []
+                }
+              ],
+              "name": "test",
+              "sys": {
+                "id": "26eLfV14SIOeQkse44q4sw",
+                "type": "ContentType",
+                "createdAt": "2014-08-22T12:57:43.618Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "v2umtz8ths9v"
+                  }
+                },
+                "firstPublishedAt": "2014-08-22T12:57:53.093Z",
+                "publishedCounter": 2,
+                "version": 17,
+                "updatedAt": "2014-10-14T13:07:06.808Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                }
+              }
+            },
+            {
+              "name": "Category",
+              "description": "",
+              "fields": [
+                {
+                  "id": "name",
+                  "name": "Name",
+                  "type": "Text",
+                  "localized": true,
+                  "validations": [
+                    {
+                      "size": {
+                        "min": 2,
+                        "max": 22
+                      }
+                    },
+                    {
+                      "in": [
+                        "dom",
+                        "chatka"
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "id": "description",
+                  "name": "Description",
+                  "type": "Text"
+                }
+              ],
+              "sys": {
+                "id": "category_content_type",
+                "type": "ContentType",
+                "createdAt": "2014-08-21T13:32:20.955Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "v2umtz8ths9v"
+                  }
+                },
+                "firstPublishedAt": "2014-08-21T13:32:27.109Z",
+                "publishedCounter": 10,
+                "version": 184,
+                "updatedAt": "2014-10-15T08:38:22.574Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "0fn5fOWn4WsKFyYla1gI5h"
+                  }
+                }
+              },
+              "displayField": "name"
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 15 Oct 2014 08:39:11 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/v2umtz8ths9v/content_types/category_content_type
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.2.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:
+      "^access-Control-Expose-Headers":
+      - Etag
+      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-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - v2umtz8ths9v
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Wed, 15 Oct 2014 08:39:12 GMT
+      Etag:
+      - '"3fb7ea2ba823f7d788e8d78aebe26ff4"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '1174'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "name": "Category",
+          "description": "",
+          "fields": [
+            {
+              "id": "name",
+              "name": "Name",
+              "type": "Text",
+              "localized": true,
+              "validations": [
+                {
+                  "size": {
+                    "min": 2,
+                    "max": 22
+                  }
+                },
+                {
+                  "in": [
+                    "dom",
+                    "chatka"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "description",
+              "name": "Description",
+              "type": "Text"
+            }
+          ],
+          "sys": {
+            "id": "category_content_type",
+            "type": "ContentType",
+            "createdAt": "2014-08-21T13:32:20.955Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "v2umtz8ths9v"
+              }
+            },
+            "firstPublishedAt": "2014-08-21T13:32:27.109Z",
+            "publishedCounter": 10,
+            "version": 184,
+            "updatedAt": "2014-10-15T08:38:22.574Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "0fn5fOWn4WsKFyYla1gI5h"
+              }
+            }
+          },
+          "displayField": "name"
+        }
+    http_version: 
+  recorded_at: Wed, 15 Oct 2014 08:39:12 GMT
+- request:
+    method: put
+    uri: https://api.contentful.com/spaces/v2umtz8ths9v/content_types/category_content_type
+    body:
+      encoding: UTF-8
+      string: '{"name":"Category","description":"","fields":[{"id":"name","name":"Name","type":"Text","localized":true,"validations":[{"size":{"min":2,"max":22}},{"in":["dom","chatka"]}]},{"id":"description","name":"Description","type":"Text"},{"id":"valid","name":"Valid","type":"Text","validations":[{"in":["foo","bar","baz"]}]}]}'
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.2.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      X-Contentful-Version:
+      - '184'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      "^access-Control-Expose-Headers":
+      - Etag
+      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-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - v2umtz8ths9v
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Wed, 15 Oct 2014 08:39:13 GMT
+      Etag:
+      - '"5934f75fe998406691c91949a51e7bc0"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '1364'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "name": "Category",
+          "description": "",
+          "fields": [
+            {
+              "id": "name",
+              "name": "Name",
+              "type": "Text",
+              "localized": true,
+              "validations": [
+                {
+                  "size": {
+                    "min": 2,
+                    "max": 22
+                  }
+                },
+                {
+                  "in": [
+                    "dom",
+                    "chatka"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "description",
+              "name": "Description",
+              "type": "Text"
+            },
+            {
+              "id": "valid",
+              "name": "Valid",
+              "type": "Text",
+              "validations": [
+                {
+                  "in": [
+                    "foo",
+                    "bar",
+                    "baz"
+                  ]
+                }
+              ]
+            }
+          ],
+          "sys": {
+            "id": "category_content_type",
+            "type": "ContentType",
+            "createdAt": "2014-08-21T13:32:20.955Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "v2umtz8ths9v"
+              }
+            },
+            "firstPublishedAt": "2014-08-21T13:32:27.109Z",
+            "publishedCounter": 10,
+            "version": 185,
+            "updatedAt": "2014-10-15T08:39:13.285Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Wed, 15 Oct 2014 08:39:13 GMT
+recorded_with: VCR 2.9.2