contentful-management 0.0.2 → 0.0.3

data/lib/contentful/management/request.rb

@@ -8,6 +8,8 @@ module Contentful
       attr_reader :client, :type, :query, :id
 
       def initialize(endpoint, query = {}, id = nil, header = {})
+        @header = header
+        @initial_id = id
         @client = Contentful::Management::Client.shared_instance
         @client.version = header[:version] if  header[:version]
         @client.organization_id = header[:organization_id] if  header[:organization_id]
@@ -60,7 +62,7 @@ module Contentful
 
       # Returns a new Request object with the same data
       def copy
-        Marshal.load(Marshal.dump(self))
+        self.class.new(@endpoint, @query, @initial_id, @header)
       end
 
 
@@ -72,7 +74,7 @@ module Contentful
               [
                   key.to_sym,
                   value
-              # TODO why there was this line? value.is_a?(::Array) ? value.join(',') : value
+                  # value.is_a?(::Array) ? value.join(',') : value
               ]
             end
         ]

data/lib/contentful/management/resource.rb

@@ -59,14 +59,9 @@ module Contentful
         nil
       end
 
-      # Issues the request that was made to fetch this response again.
-      # Only works for top-level resources
-      def reload
-        if request
-          request.get
-        else
-          false
-        end
+      # Shared instance of the API client
+      def client
+        Contentful::Management::Client.shared_instance
       end
 
       private
@@ -115,6 +110,11 @@ module Contentful
           @property_coercions ||= {}
         end
 
+        # Shared instance of the API client
+        def client
+          Contentful::Management::Client.shared_instance
+        end
+
         # Defines which properties of a resource your class expects
         # Define them in :camelCase, they will be available as #snake_cased methods
         #

data/lib/contentful/management/resource/refresher.rb

@@ -5,13 +5,20 @@ module Contentful
       # Adds the feature to have properties and system data reload for Resource.
       module Refresher
 
+        # Reload an object
+        # Updates the current version of the object to the version on the system
+        def reload
+          resource = self.is_a?(Space) ? self.class.find(id) : self.class.find(space.id, id)
+          refresh_data(resource) if resource.is_a? self.class
+        end
+
         def refresh_data(resource)
           if resource.is_a? Error
             resource
           else
             @properties = resource.instance_variable_get(:@properties)
             @fields = resource.instance_variable_get(:@fields) if self.is_a?(Contentful::Management::Entry)
-            @sys = resource.instance_variable_get(:@sys)
+            @sys = resource.instance_variable_get(:@sys).merge(locale: locale)
             self
           end
         end

data/lib/contentful/management/resource_builder.rb

@@ -26,13 +26,13 @@ module Contentful
 
       attr_reader :client, :response, :resource_mapping, :entry_mapping, :resource
 
-      def initialize(client, response, resource_mapping = {}, entry_mapping = {})
+      def initialize(response, resource_mapping = {}, entry_mapping = {})
         @response = response
-        @client = client
+        @client = Contentful::Management::Client.shared_instance
         @included_resources = {}
         @known_resources = Hash.new { |h, k| h[k] = {} }
         @nested_locales = true
-        @default_locale = (Contentful::Management::Client.shared_instance.configuration || Contentful::Client::DEFAULT_CONFIGURATION)[:default_locale]
+        @default_locale = (client.configuration || Contentful::Client::DEFAULT_CONFIGURATION)[:default_locale]
         @resource_mapping = default_resource_mapping.merge(resource_mapping)
         @entry_mapping = default_entry_mapping.merge(entry_mapping)
       end

data/lib/contentful/management/response.rb

@@ -25,11 +25,14 @@ module Contentful
       attr_reader :raw, :object, :status, :error_message, :request
 
       def initialize(raw, request = nil)
-        @raw = raw
+        @raw     = raw
         @request = request
-        @status = :ok
+        @status  = :ok
 
-        if no_content_response?
+        if service_unavailable_response?
+          @status = :service_unavailable
+          @error_message = 'Service Unavailable, contenful.com API seems to be down'
+        elsif no_content_response?
           @status = :no_content
           @object = true
         elsif parse_json!
@@ -39,6 +42,10 @@ module Contentful
 
       private
 
+      def service_unavailable_response?
+        @raw.status == 503
+      end
+
       def no_content_response?
         @raw.to_s == '' && @raw.status == 204
       end

data/lib/contentful/management/space.rb

@@ -23,9 +23,9 @@ module Contentful
       def self.all
         request = Request.new('')
         response = request.get
-        result = ResourceBuilder.new(self, response, {}, {})
+        result = ResourceBuilder.new(response, {}, {})
         spaces = result.run
-        Contentful::Management::Client.shared_instance.update_dynamic_entry_cache_for_spaces!(spaces)
+        client.update_dynamic_entry_cache_for_spaces!(spaces)
         spaces
       end
 
@@ -35,9 +35,9 @@ module Contentful
       def self.find(space_id)
         request = Request.new("/#{ space_id }")
         response = request.get
-        result = ResourceBuilder.new(self, response, {}, {})
+        result = ResourceBuilder.new(response, {}, {})
         space = result.run
-        Contentful::Management::Client.shared_instance.update_dynamic_entry_cache_for_space!(space) if space.is_a? Space
+        client.update_dynamic_entry_cache_for_space!(space) if space.is_a? Space
         space
       end
 
@@ -47,7 +47,7 @@ module Contentful
       def self.create(attributes)
         request = Request.new('', {'name' => attributes.fetch(:name)}, id = nil, organization_id: attributes[:organization_id])
         response = request.post
-        result = ResourceBuilder.new(self, response, {}, {})
+        result = ResourceBuilder.new(response, {}, {})
         result.run
       end
 
@@ -57,7 +57,7 @@ module Contentful
       def update(attributes)
         request = Request.new("/#{ id }", { 'name' => attributes.fetch(:name) }, id = nil, version: sys[:version], organization_id: attributes[:organization_id])
         response = request.put
-        result = ResourceBuilder.new(self, response, {}, {})
+        result = ResourceBuilder.new(response, {}, {})
         refresh_data(result.run)
       end
 
@@ -80,7 +80,7 @@ module Contentful
         if response.status == :no_content
           return true
         else
-          ResourceBuilder.new(self, response, {}, {}).run
+          ResourceBuilder.new(response, {}, {}).run
         end
       end
 
@@ -92,8 +92,8 @@ module Contentful
 
         content_types.instance_exec(self) do |space|
 
-          define_singleton_method(:all) do
-            ContentType.all(space.id)
+          define_singleton_method(:all) do |attributes = {}|
+            ContentType.all(space.id, attributes)
           end
 
           define_singleton_method(:create) do |params|
@@ -144,8 +144,8 @@ module Contentful
         assets = nil
 
         assets.instance_exec(self) do |space|
-          define_singleton_method(:all) do
-            Asset.all(space.id)
+          define_singleton_method(:all) do |attributes = {}|
+            Asset.all(space.id,attributes)
           end
 
           define_singleton_method(:find) do |asset_id|

data/lib/contentful/management/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Contentful
   module Management
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

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

@@ -0,0 +1,151 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.contentful.com/spaces/bfsvtul0c41g/assets/
+    body:
+      encoding: UTF-8
+      string: '{"fields":{"title":{"pl-PL":"Title PL"},"description":{"pl-PL":"Description
+        PL"},"file":{"pl-PL":{"contentType":"image/jpeg","fileName":"pic1.jpg","upload":"https://upload.wikimedia.org/wikipedia/commons/c/c7/Gasometer_Berlin_Sch%C3%B6neberg_2011.jpg"}}}}'
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.2
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 19 Aug 2014 09:33:18 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '945'
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Cf-Space-Id:
+      - bfsvtul0c41g
+      Etag:
+      - '"172bc1b440a6d45f2d26c5c4b7d640d8"'
+      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: |
+        {
+          "fields": {
+            "title": {
+              "pl-PL": "Title PL"
+            },
+            "description": {
+              "pl-PL": "Description PL"
+            },
+            "file": {
+              "pl-PL": {
+                "contentType": "image/jpeg",
+                "fileName": "pic1.jpg",
+                "upload": "https://upload.wikimedia.org/wikipedia/commons/c/c7/Gasometer_Berlin_Sch%C3%B6neberg_2011.jpg"
+              }
+            }
+          },
+          "sys": {
+            "id": "6HW6OmvN3UMgysEIicCmCC",
+            "type": "Asset",
+            "version": 1,
+            "createdAt": "2014-08-19T09:33:18.308Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "bfsvtul0c41g"
+              }
+            },
+            "updatedAt": "2014-08-19T09:33:18.308Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Tue, 19 Aug 2014 09:33:15 GMT
+- request:
+    method: put
+    uri: https://api.contentful.com/spaces/bfsvtul0c41g/assets/6HW6OmvN3UMgysEIicCmCC/files/pl-PL/process
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.2
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      X-Contentful-Version:
+      - '1'
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 19 Aug 2014 09:33:18 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Cf-Space-Id:
+      - bfsvtul0c41g
+      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: ''
+    http_version: 
+  recorded_at: Tue, 19 Aug 2014 09:33:15 GMT
+recorded_with: VCR 2.9.2

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

@@ -0,0 +1,123 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/bfsvtul0c41g/assets?limit=20&skip=2
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.2
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 18 Aug 2014 11:35:20 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '96'
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Cf-Space-Id:
+      - bfsvtul0c41g
+      Etag:
+      - '"254a0144c2cebdfa3c927ed18df93e57"'
+      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": 2,
+          "limit": 20,
+          "items": []
+        }
+    http_version: 
+  recorded_at: Mon, 18 Aug 2014 11:35:22 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/bfsvtul0c41g/assets?limit=20&skip=22
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.2
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 18 Aug 2014 11:35:38 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '97'
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Cf-Space-Id:
+      - bfsvtul0c41g
+      Etag:
+      - '"2b8587e6e9441d7e11a0bb162725080d"'
+      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": 22,
+          "limit": 20,
+          "items": []
+        }
+    http_version: 
+  recorded_at: Mon, 18 Aug 2014 11:35:40 GMT
+recorded_with: VCR 2.9.2