contentful 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed4d3309966895ce684008c996e75049713e264
-  data.tar.gz: 40123f61c8a46803a3c4ad2e880c4d5aeb7dcffc
+  metadata.gz: 6a904e1decfbc78bc44ca0dff8882e712b1342c3
+  data.tar.gz: 9e4e1fbe1a6f851cd1294cf6e937f5dd42df01f5
 SHA512:
-  metadata.gz: 176f36cc905b504589f0a382435a441b1138fe7d91dc96c867fd512b54470bbf8da95d5e2a9b9c5d5f08f3a26b3d27571c2dec5ca10be38afef61cbf2aedd215
-  data.tar.gz: 89203b3ace82cc92b9e6b3f6d689b100e433c82a0b50ebc7b2713e05c0197c331b3dd35ff250be58c444f25d408fd53f5a44dd9167d18783dbff61ea88a2279a
+  metadata.gz: 914f9f1a62d29730cedb7863191f240e873f6b9d28532dbda5412662be8899f832855ec62f9b0b02435afb36c85b3c9d5bac616b45998fbd9085739256af51f0
+  data.tar.gz: 73819d1c7c6bc21ca72aa2e183f2b013899349dc0877f7fa6313f62f1e242381d7d401a892683c0ee37d251e9259e36bc3b1f3efc033dbe4868d0c9d87ab9555

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 ## Unreleased
 
+## 0.7.0
+### Added
+* Add support for querying a field's `linkType` [#75](https://github.com/contentful/contentful.rb/pull/75)
+* Handles multiple locales when requesting with `locale: "*"` [contentful_middleman/#39](https://github.com/contentful-labs/contentful_middleman/issues/39)
+
+### Fixed
+* Fix Custom Resource creation parameters [#69](https://github.com/contentful/contentful.rb/issues/69)
+* `Sync API` now works with `:raw_mode` enabled [#68](https://github.com/contentful/contentful.rb/issues/68)
+* Bugfix for `Field.items` [#76](https://github.com/contentful/contentful.rb/pull/76)
+
 ## 0.6.0
 ### Fixed
 * Parse nested locales in `AssetFields` [#66](https://github.com/contentful/contentful.rb/pull/66)

data/lib/contentful/dynamic_entry.rb

@@ -28,8 +28,8 @@ module Contentful
 
       Class.new DynamicEntry do
         content_type.fields.each do |f|
-          define_method Support.snakify(f.id).to_sym do
-            fields[f.id.to_sym]
+          define_method Support.snakify(f.id).to_sym do |wanted_locale = default_locale|
+            fields(wanted_locale)[f.id.to_sym]
           end
         end
 

data/lib/contentful/field.rb

@@ -9,6 +9,7 @@ module Contentful
     property :id, :string
     property :name, :string
     property :type, :string
+    property :linkType, :string
     property :items, Field
     property :required, :boolean
     property :localized, :boolean

data/lib/contentful/resource.rb

@@ -21,7 +21,7 @@ module Contentful
 
     attr_reader :properties, :request, :client, :default_locale
 
-    def initialize(object, request = nil, client = nil, nested_locale_fields = false, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale])
+    def initialize(object = nil, request = nil, client = nil, nested_locale_fields = false, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale])
       self.class.update_coercions!
       @nested_locale_fields = nested_locale_fields
       @default_locale = default_locale
@@ -104,11 +104,38 @@ module Contentful
         nil
       elsif value.is_a? ::Array
         value.map { |v| coerce_or_create_class(v, what) }
+      elsif should_coerce_hash?(value)
+        ::Hash[value.map { |k, v|
+          to_coerce = v.is_a?(Hash) ? v : v.to_s
+          coercion = v.is_a?(Numeric) ? v : coerce_or_create_class(to_coerce, what)
+          [k.to_sym, coercion]
+        }]
       else
         coerce_or_create_class(value, what)
       end
     end
 
+    def should_coerce_hash?(value)
+      value.is_a?(::Hash) &&
+        !self.is_a?(Asset) &&
+        !self.is_a?(Field) &&
+        !is_location?(value) &&
+        !is_link?(value) &&
+        !is_image?(value)
+    end
+
+    def is_location?(value)
+      value.has_key?("lat") || value.has_key?("lon")
+    end
+
+    def is_link?(value)
+      value.has_key?("sys") && value["sys"]["type"] == "Link"
+    end
+
+    def is_image?(value)
+      value.has_key?("image")
+    end
+
     def coerce_or_create_class(value, what)
       case what
       when Symbol

data/lib/contentful/resource/fields.rb

@@ -7,12 +7,12 @@ module Contentful
     module Fields
       # Returns all fields of the asset
       def fields(wanted_locale = default_locale)
-        @fields[locale || wanted_locale]
+        @fields.has_key?(wanted_locale) ? @fields[wanted_locale] : @fields[locale]
       end
 
-      def initialize(object, *)
+      def initialize(object = nil, *)
         super
-        extract_fields_from_object! object
+        extract_fields_from_object! object if object
       end
 
       def inspect(info = nil)

data/lib/contentful/resource/system_properties.rb

@@ -15,9 +15,9 @@ module Contentful
       }
       attr_reader :sys
 
-      def initialize(object, *)
+      def initialize(object = nil, *)
         super
-        @sys = extract_from_object object['sys'], :sys
+        @sys = object ? extract_from_object(object['sys'], :sys) : {}
       end
 
       def inspect(info = nil)

data/lib/contentful/response.rb

@@ -1,5 +1,6 @@
 require_relative 'error'
 require 'multi_json'
+require 'zlib'
 
 module Contentful
   # An object representing an answer by the contentful service. It is later used

data/lib/contentful/sync.rb

@@ -51,6 +51,10 @@ module Contentful
         page = Request.new(@client, '/sync', options_or_url).get
       end
 
+      if @client.configuration[:raw_mode]
+        return page
+      end
+
       link_page_to_sync! page
       update_sync_state_from! page
 

data/lib/contentful/version.rb

@@ -1,3 +1,3 @@
 module Contentful
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/entry_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Contentful::ContentType do
+describe Contentful::Entry do
   let(:entry) { vcr('entry') { create_client.entry 'nyancat' } }
 
   describe 'SystemProperties' do
@@ -50,4 +50,14 @@ describe Contentful::ContentType do
     end
   end
 
+  describe 'multiple locales' do
+    it 'can handle multiple locales' do
+      vcr('entry_locales') {
+        cat = create_client.entries(locale: "*").items.first
+        expect(cat.fields[:name][:'en-US']).to eq "Nyan Cat"
+        expect(cat.fields[:name][:'es']).to eq "Gato Nyan"
+      }
+    end
+  end
+
 end

data/spec/field_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe Contentful::Field do
   let(:field) { vcr('field') { create_client.content_type('cat').fields.first } }
+  let(:linkField) { vcr('linkField') {
+    create_client.content_type('cat').fields.select { |f| f.id == 'image' }.first
+  } }
+  let(:arrayField) { vcr('arrayField') {
+    Contentful::Client.new(
+        space: 'wl1z0pal05vy',
+        access_token: '9b76e1bbc29eb513611a66b9fc5fb7acd8d95e83b0f7d6bacfe7ec926c819806'
+    ).content_type('2PqfXUJwE8qSYKuM0U6w8M').fields.select { |f| f.id == 'categories' }.first
+  } }
 
   describe 'Properties' do
     it 'has a #properties getter returning a hash with symbol keys' do
@@ -33,4 +42,25 @@ describe Contentful::Field do
       expect(field.required).to be_truthy
     end
   end
+
+  describe 'Link field properties' do
+    it 'has #type' do
+      expect(linkField.type).to eq 'Link'
+    end
+
+    it 'has #linkType' do
+      expect(linkField.link_type).to eq 'Asset'
+    end
+  end
+
+  describe 'Array field properties' do
+    it 'has #type' do
+      expect(arrayField.type).to eq 'Array'
+    end
+
+    it 'has #items' do
+      expect(arrayField.items.type).to eq 'Link'
+      expect(arrayField.items.link_type).to eq 'Entry'
+    end
+  end
 end

data/spec/fixtures/vcr_cassettes/arrayField.yml

@@ -0,0 +1,87 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/wl1z0pal05vy/content_types/2PqfXUJwE8qSYKuM0U6w8M
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.6.0
+      Authorization:
+      - Bearer 9b76e1bbc29eb513611a66b9fc5fb7acd8d95e83b0f7d6bacfe7ec926c819806
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  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
+      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-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Server:
+      - nginx
+      X-Contentful-Request-Id:
+      - 90a-2073223720
+      Content-Length:
+      - '639'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 05 Nov 2015 15:43:28 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-lcy1124-LCY
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA5VV32/iMAx+56+I+jy2FgZjfeO4ncTtNnEq6Hab9hBawyJC
+        W5IU1k373y9pmvUHVXe8VI3t2M5nf/Z7ByFrRYAG3HLRkzwh9J59pTzEW5BS
+        a8aiIPEFys5nRksCpYu17r6iEmmcXZzDqyguMNglhIG6JlgCmZ8P7e4opEeT
+        dT0Ur8hMDC/dLiNqtXr7DtxnJBYkCutO8/wbLSrPaA3gkTe4mMtXX0wiGrF6
+        EC7VyplfVZ7yhOkWr4/AJ1Wh8TdmDKelHARsVXUNyLKyxvIXCTefhlJO5Vk9
+        QxVvzDkIjausU+vz53jN628WFdnpqZXr+lX8CRawjhiBoyz8Bs3pubTBdBMK
+        VoAtMdxjSgKseq2glCZUUYCMXgrsSRQKCEWOueafNs5Mhg+HeI49Qqa98ab3
+        52BHZLjDpija8DknpDrpMqk/I20v3IwR/6ir4qrQwHWfbJfA2on2jeEwqHfC
+        sips7L1K52lIWzvud4JDQUS5y7NxtDuSm3BTCfT6q/y920U9e75JCpFx9j9D
+        Z7zHhOIlBYRLQ1BPzQMsOREl5BsdSwSe1XysD+IsH4unBaktHmNZyILjFW3W
+        So2w1yjvZV7MhJfKPFvqvNkxpvZgnzYOhE/n5XbWbnIXvdlu9bD4ebgZ7by/
+        t8mdvRgeRnd5KIvBnnA1nF3kOPk9n4HkbjAWqqw927nsOr2uY8+dS9e5cgf2
+        +dWw/2gcJLFkXMl40LWdbl8a992+4/ZH56Pr60eVerZvrKC0D9SaeiEc+ZqJ
+        SOGEAliREDgSL4C4XFa+SBigaIUwyhcGkqzNeW8FhMcUpz/UGlXZlndi56Pz
+        D96xWbNkBwAA
+    http_version: 
+  recorded_at: Thu, 05 Nov 2015 15:43:27 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/entry_locales.yml

@@ -0,0 +1,122 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?locale=*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.1.1
+      Authorization:
+      - Bearer b4c0n73n7fu1
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Host:
+      - cdn.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 16 Apr 2014 09:00:23 GMT
+      Server:
+      - nginx/1.1.19
+      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:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - "\"a9e11c59bf73598894bf05d4db7700cb\""
+      X-Contentful-Request-Id:
+      - 71a-635712892
+      Content-Length:
+      - '882'
+      Accept-Ranges:
+      - bytes
+      Via:
+      - 1.1 varnish
+      Age:
+      - '1'
+      X-Served-By:
+      - cache-am72-AMS
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 10,
+          "skip": 0,
+          "limit": 100,
+          "items": [
+            {
+              "fields": {
+                "name": {"en-US": "Nyan Cat", "es": "Gato Nyan"},
+                "likes": [
+                  "rainbows",
+                  "fish"
+                ],
+                "color": "rainbow",
+                "bestFriend": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Entry",
+                    "id": "happycat"
+                    }
+                },
+                "birthday": "2011-04-04T22:00:00+00:00",
+                "lives": 1337,
+                "image": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Asset",
+                    "id": "nyancat"
+                    }
+                  }
+                },
+              "sys": {
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "cfexampleapi"
+                    }
+                  },
+                "type": "Entry",
+                "contentType": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "ContentType",
+                    "id": "cat"
+                    }
+                  },
+                "id": "nyancat",
+                "revision": 5,
+                "createdAt": "2013-06-27T22:46:19.513Z",
+                "updatedAt": "2013-09-04T09:19:39.027Z",
+                "locale": "en-US"
+              }
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 16 Apr 2014 09:00:23 GMT
+recorded_with: VCR 2.9.0

data/spec/fixtures/vcr_cassettes/linkField.yml

@@ -0,0 +1,83 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types/cat
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.6.0
+      Authorization:
+      - Bearer b4c0n73n7fu1
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  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
+      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-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Server:
+      - nginx
+      X-Contentful-Request-Id:
+      - 405-1374790120
+      Content-Length:
+      - '473'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 05 Nov 2015 14:54:08 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-ams4127-AMS
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA61UO2/CMBjc+RWR54JIoECzAS0SEu1CJqoOJvlCLZxHbUNJ
+        Ef+9zsMhIRZFbZdIuc86n8/nO7YMA/kEqMeRbbzKP8M4Zl+JE09iKMQBoDuF
+        ZX8SfamhIokz1IGDOK9l8LEjDFIWwXZQctDIxZR8lYOM+5SPLzanZAu8ufui
+        Dqvtx4zhRLu/jynXC6hPiIAgdULJkC4o8mUSrCOKCiNOV0S7EY1YU/S0Dl/w
+        lu5UXPtB9RUJa+BixgiEXlPHRM6My6FSsyDh9k8OUkngFHF4CgVLcsf017sm
+        TLx71TtT+Zo0JkrhIxaVPP6LW5T4+pRJ2KDgVzKtVMxDARuo3PLtQsqb9gjH
+        a3rbM9jrBUr4/wVeyRUJ8EbTBvM6/Asv9PmrhmnMOYgiTFLhW2pjXk6yeKY4
+        vyMkPY0pTmZppdXaC3nAXUZiQaIwHTxD9NnJko54cn7yiMfYTbusLKLqNKtF
+        rVSJV8UuMxZ102WXuj4ccBBTwDHRNklJPo1kwEKRvaScpqhjtzip5GSwJzw/
+        jlWscRnI5+GNRXpEq2v22t1B2xo6lmX3B7ZpdUb31koR7mLvcvFDu2s5Zs82
+        +3Z/2BkNeqtU5ql1an0DwOA8wioGAAA=
+    http_version: 
+  recorded_at: Thu, 05 Nov 2015 14:54:08 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/sync_page_short.yml

@@ -0,0 +1,106 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/sync?initial=true
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.1.3
+      Authorization:
+      - Bearer b4c0n73n7fu1
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Host:
+      - cdn.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 25 Apr 2014 13:31:17 GMT
+      Server:
+      - nginx/1.1.19
+      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:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"382e4781b902b58d2edf3f10067167c7"'
+      X-Contentful-Request-Id:
+      - f1c-737770542
+      Content-Length:
+      - '300'
+      Accept-Ranges:
+      - bytes
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      X-Served-By:
+      - cache-fra1229-FRA
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "items": [
+            {
+              "sys": {
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "cfexampleapi"
+                  }
+                },
+                "type": "Entry",
+                "contentType": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "ContentType",
+                    "id": "1t9IbcfdCk6m04uISSsaIK"
+                  }
+                },
+                "id": "5ETMRzkl9KM4omyMwKAOki",
+                "revision": 2,
+                "createdAt": "2014-02-21T13:42:57.752Z",
+                "updatedAt": "2014-04-16T12:44:02.691Z"
+              },
+              "fields": {
+                "name": {
+                  "en-US": "London"
+                },
+                "center": {
+                  "en-US": {
+                    "lat": 51.508515,
+                    "lon": -0.12548719999995228
+                  }
+                }
+              }
+            }
+          ],
+          "nextSyncUrl": "https://cdn.contentful.com/spaces/cfexampleapi/sync?sync_token=w5ZGw6JFwqZmVcKsE8Kow4grw45QdybCr8Okw6AYwqbDksO3ehvDpUPCgcKsKXbCiAwPC8K2w4LDvsOkw6nCjhPDpcOQADElWsOoU8KGR3HCtsOAwqd6wp_Dulp8w6LDsF_CtsK7Kk05wrMvwrLClMOgG2_Dn2sGPg"
+        }
+    http_version:
+  recorded_at: Fri, 25 Apr 2014 13:31:18 GMT
+recorded_with: VCR 2.9.0

data/spec/resource_spec.rb

@@ -16,11 +16,38 @@ describe Contentful::Resource do
 
     it 'can deal with invalid objects' do
       expect do
-        Contentful::ContentType.new({})
+        Contentful::ContentType.new
       end.not_to raise_error
     end
   end
 
+  describe 'custom resource' do
+    class TestCat
+      include Contentful::Resource
+
+      property :name
+      property :likes
+      property :color
+      property :bestFriend
+      property :birthday
+      property :lives
+      property :image
+    end
+
+    it 'can create a custom resource' do
+      cat = TestCat.new("name" => "foobar")
+      expect(cat).to respond_to(:name)
+      expect(cat.name).to eq "foobar"
+    end
+
+    it 'can create a custom resource from API' do
+      vcr('entry') {
+        cat = TestCat.new create_client(raw_mode: true).entry('nyancat').object["fields"]
+        expect(cat.name).to eq "Nyan Cat"
+      }
+    end
+  end
+
   describe '#request' do
     it 'will return a request object, if it has been initialized with one' do
       request  = Contentful::Request.new(nil, 'content_types')

data/spec/sync_spec.rb

@@ -97,4 +97,62 @@ describe Contentful::Sync do
       }
     end
   end
+
+  describe 'raw_mode' do
+    before do
+      @sync = create_client(raw_mode: true).sync(initial: true)
+    end
+
+    it 'should not fail' do
+      vcr('sync_page_short') {
+        expect { @sync.first_page }.not_to raise_error
+      }
+    end
+
+    it 'should return a raw Response' do
+      vcr('sync_page_short') {
+        expect(@sync.first_page).to be_a Contentful::Response
+      }
+    end
+
+    it 'should return JSON' do
+      expected = {
+        "sys" => {"type" => "Array"},
+        "items" => [
+          {
+            "sys" => {
+              "space" => {
+                "sys" => {
+                  "type" => "Link",
+                  "linkType" => "Space",
+                  "id" => "cfexampleapi"}
+              },
+              "type" => "Entry",
+              "contentType" => {
+                "sys" => {
+                  "type" => "Link",
+                  "linkType" => "ContentType",
+                  "id" => "1t9IbcfdCk6m04uISSsaIK"
+                }
+              },
+              "id" => "5ETMRzkl9KM4omyMwKAOki",
+              "revision" => 2,
+              "createdAt" => "2014-02-21T13:42:57.752Z",
+              "updatedAt" => "2014-04-16T12:44:02.691Z"
+            },
+            "fields" => {
+              "name" => {"en-US"=>"London"},
+              "center" => {
+                "en-US" => {"lat"=>51.508515, "lon"=>-0.12548719999995228}
+              }
+            }
+          }
+        ],
+        "nextSyncUrl" => "https://cdn.contentful.com/spaces/cfexampleapi/sync?sync_token=w5ZGw6JFwqZmVcKsE8Kow4grw45QdybCr8Okw6AYwqbDksO3ehvDpUPCgcKsKXbCiAwPC8K2w4LDvsOkw6nCjhPDpcOQADElWsOoU8KGR3HCtsOAwqd6wp_Dulp8w6LDsF_CtsK7Kk05wrMvwrLClMOgG2_Dn2sGPg"
+      }
+      vcr('sync_page_short') {
+        expect(@sync.first_page.object).to eql expected
+      }
+    end
+  end
 end

metadata

@@ -1,129 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
 - Contentful GmbH (Andreas Tiefenthaler)
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-09 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'
-  name: http
-  prerelease: false
   type: :runtime
+  prerelease: false
   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'
-  name: multi_json
-  prerelease: false
   type: :runtime
+  prerelease: false
   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.5'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
+  name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-  name: rubygems-tasks
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rr
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: vcr
-  prerelease: false
   type: :development
+  prerelease: false
   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:
     - - "~>"
@@ -132,9 +133,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.3
-  name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -159,10 +159,7 @@ files:
 - README.md
 - RELEASE.md
 - Rakefile
-- TAGS
 - contentful.gemspec
-- coverage/.last_run.json
-- coverage/.resultset.json
 - examples/custom_classes.rb
 - examples/dynamic_entries.rb
 - examples/example_queries.rb
@@ -220,6 +217,7 @@ files:
 - spec/fixtures/json_responses/self_link.json
 - spec/fixtures/json_responses/unparsable.json
 - spec/fixtures/vcr_cassettes/array.yml
+- spec/fixtures/vcr_cassettes/arrayField.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/array_page_2.yml
 - spec/fixtures/vcr_cassettes/asset.yml
@@ -228,8 +226,10 @@ files:
 - spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry_cache.yml
+- spec/fixtures/vcr_cassettes/entry_locales.yml
 - spec/fixtures/vcr_cassettes/field.yml
 - spec/fixtures/vcr_cassettes/human.yml
+- spec/fixtures/vcr_cassettes/linkField.yml
 - spec/fixtures/vcr_cassettes/locale.yml
 - spec/fixtures/vcr_cassettes/location.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
@@ -242,6 +242,7 @@ files:
 - spec/fixtures/vcr_cassettes/sync_deletion.yml
 - spec/fixtures/vcr_cassettes/sync_page.yml
 - spec/fixtures/vcr_cassettes/sync_page_2.yml
+- spec/fixtures/vcr_cassettes/sync_page_short.yml
 - spec/fixtures/vcr_cassettes/unauthorized.yml
 - spec/fixtures/vcr_cassettes/unavailable.yml
 - spec/link_spec.rb
@@ -262,7 +263,7 @@ homepage: https://github.com/contentful/contentful.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -277,9 +278,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: contentful
 test_files:
@@ -306,6 +307,7 @@ test_files:
 - spec/fixtures/json_responses/self_link.json
 - spec/fixtures/json_responses/unparsable.json
 - spec/fixtures/vcr_cassettes/array.yml
+- spec/fixtures/vcr_cassettes/arrayField.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/array_page_2.yml
 - spec/fixtures/vcr_cassettes/asset.yml
@@ -314,8 +316,10 @@ test_files:
 - spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry_cache.yml
+- spec/fixtures/vcr_cassettes/entry_locales.yml
 - spec/fixtures/vcr_cassettes/field.yml
 - spec/fixtures/vcr_cassettes/human.yml
+- spec/fixtures/vcr_cassettes/linkField.yml
 - spec/fixtures/vcr_cassettes/locale.yml
 - spec/fixtures/vcr_cassettes/location.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
@@ -328,6 +332,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/sync_deletion.yml
 - spec/fixtures/vcr_cassettes/sync_page.yml
 - spec/fixtures/vcr_cassettes/sync_page_2.yml
+- spec/fixtures/vcr_cassettes/sync_page_short.yml
 - spec/fixtures/vcr_cassettes/unauthorized.yml
 - spec/fixtures/vcr_cassettes/unavailable.yml
 - spec/link_spec.rb

data/TAGS

@@ -1,315 +0,0 @@
-
-examples/custom_classes.rb,120
-class MyResourceMyResource
12,406
-class MyBetterArray < Contentful::ArrayMyBetterArray
36,920
-  def lastlast
38,1003
-
-examples/dynamic_entries.rb,0
-
-examples/example_queries.rb,0
-
-examples/raise_errors.rb,0
-
-examples/raw_mode.rb,0
-
-examples/resource_mapping.rb,84
-class MyBetterArray < Contentful::ArrayMyBetterArray
12,377
-  def lastlast
14,460
-
-lib/contentful/array.rb,95
-module ContentfulContentful
4,68
-  class ArrayArray
8,341
-    def next_pagenext_page
21,647
-
-lib/contentful/asset.rb,109
-module ContentfulContentful
4,70
-  class AssetAsset
7,203
-    def image_url(options = {})image_url
19,627
-
-lib/contentful/client.rb,1108
-module ContentfulContentful
8,132
-  class ClientClient
12,295
-    def self.get_http(url, query, headers = {})get_http
30,762
-    def initialize(given_configuration = {})initialize
34,863
-    def default_configurationdefault_configuration
47,1232
-    def space(query = {})space
54,1413
-    def content_type(id, query = {})content_type
61,1618
-    def content_types(query = {})content_types
68,1869
-    def entry(id, query = {})entry
75,2083
-    def entries(query = {})entries
82,2309
-    def asset(id, query = {})asset
89,2511
-    def assets(query = {})assets
96,2735
-    def base_urlbase_url
101,2877
-    def request_headersrequest_headers
106,3066
-    def request_query(query)request_query
115,3536
-    def get(request, build_resource = true)get
126,3874
-    def update_dynamic_entry_cache!update_dynamic_entry_cache!
152,4661
-    def register_dynamic_entry(key, klass)register_dynamic_entry
165,4991
-    def sync(options = { initial: true })sync
172,5231
-    def normalize_configuration!normalize_configuration!
179,5326
-    def validate_configuration!validate_configuration!
184,5576
-
-lib/contentful/content_type.rb,72
-module ContentfulContentful
4,54
-  class ContentTypeContentType
7,201
-
-lib/contentful/deleted_asset.rb,74
-module ContentfulContentful
3,29
-  class DeletedAssetDeletedAsset
6,185
-
-lib/contentful/deleted_entry.rb,74
-module ContentfulContentful
3,29
-  class DeletedEntryDeletedEntry
6,185
-
-lib/contentful/dynamic_entry.rb,130
-module ContentfulContentful
5,92
-  class DynamicEntry < EntryDynamicEntry
6,110
-    def self.create(content_type)create
18,397
-
-lib/contentful/entry.rb,60
-module ContentfulContentful
4,64
-  class EntryEntry
7,198
-
-lib/contentful/error.rb,614
-module ContentfulContentful
1,0
-  class Error < StandardErrorError
4,142
-    def initialize(response)initialize
7,199
-    def self.[](error_status_code)[]
14,396
-  class NotFound < Error; endNotFound
35,733
-  class BadRequest < Error; endBadRequest
38,772
-  class AccessDenied < Error; endAccessDenied
41,813
-  class Unauthorized < Error; endUnauthorized
44,856
-  class ServerError < Error; endServerError
47,899
-  class ServiceUnavailable < Error; endServiceUnavailable
50,941
-  class UnparsableJson < Error; endUnparsableJson
53,1024
-  class UnparsableResource < Error; endUnparsableResource
56,1128
-
-lib/contentful/field.rb,60
-module ContentfulContentful
3,29
-  class FieldField
6,195
-
-lib/contentful/file.rb,57
-module ContentfulContentful
3,29
-  class FileFile
5,73
-
-lib/contentful/link.rb,101
-module ContentfulContentful
3,29
-  class LinkLink
6,160
-    def resolve(query = {})resolve
12,359
-
-lib/contentful/locale.rb,62
-module ContentfulContentful
3,29
-  class LocaleLocale
6,207
-
-lib/contentful/location.rb,66
-module ContentfulContentful
3,29
-  class LocationLocation
6,200
-
-lib/contentful/request.rb,301
-module ContentfulContentful
1,0
-  class RequestRequest
5,234
-    def initialize(client, endpoint, query = {}, id = nil)initialize
8,295
-    def urlurl
27,740
-    def getget
32,870
-    def absolute?absolute?
37,964
-    def copycopy
42,1064
-    def normalize_query(query)normalize_query
49,1139
-
-lib/contentful/resource/array_like.rb,235
-module ContentfulContentful
1,0
-  module ResourceResource
2,18
-    module ArrayLikeArrayLike
5,138
-      def array?array?
9,231
-      def each_item(&block)each_item
14,304
-      def empty?empty?
20,431
-      def sizesize
25,512
-
-lib/contentful/resource/asset_fields.rb,378
-module ContentfulContentful
3,28
-  module ResourceResource
4,46
-    module AssetFieldsAssetFields
8,212
-      def fieldsfields
15,345
-      def initialize(object, *)initialize
19,397
-      def inspect(info = nil)inspect
25,547
-      module ClassMethodsClassMethods
33,713
-        def fields_coercionsfields_coercions
34,739
-      def self.included(base)included
39,818
-
-lib/contentful/resource/fields.rb,482
-module ContentfulContentful
1,0
-  module ResourceResource
2,18
-    module FieldsFields
7,215
-      def fields(wanted_locale = default_locale)fields
9,273
-      def initialize(object, *)initialize
13,374
-      def inspect(info = nil)inspect
18,474
-      def extract_fields_from_object!(object)extract_fields_from_object!
29,656
-      module ClassMethodsClassMethods
46,1227
-        def fields_coercionsfields_coercions
48,1309
-      def self.included(base)included
53,1374
-
-lib/contentful/resource/system_properties.rb,350
-module ContentfulContentful
1,0
-  module ResourceResource
2,18
-    module SystemPropertiesSystemProperties
4,100
-      def initialize(object, *)initialize
18,406
-      def inspect(info = nil)inspect
23,518
-      module ClassMethodsClassMethods
31,675
-        def sys_coercionssys_coercions
32,701
-      def self.included(base)included
37,774
-
-lib/contentful/resource.rb,1041
-module ContentfulContentful
4,62
-  module ResourceResource
13,463
-    def initialize(object, request = nil, client = nil, nested_locale_fields = false, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale] )initialize
24,743
-    def inspect(info = nil)inspect
35,1225
-    def array?array?
41,1458
-    def nested_locale_fields?nested_locale_fields?
46,1585
-    def syssys
51,1727
-    def fieldsfields
56,1838
-    def reloadreload
62,1982
-    def extract_from_object(object, namespace, keys = nil)extract_from_object
72,2091
-    def coerce_value_or_array(value, what = nil)coerce_value_or_array
85,2510
-    def coerce_or_create_class(value, what)coerce_or_create_class
95,2755
-    module ClassMethodsClassMethods
107,3068
-      def nested_locale_fields?nested_locale_fields?
109,3184
-      def property_coercionsproperty_coercions
113,3241
-      def property(name, property_class = nil)property
128,3915
-      def update_coercions!update_coercions!
136,4186
-    def self.included(base)included
155,4775
-
-lib/contentful/resource_builder.rb,2028
-module ContentfulContentful
13,309
-  class ResourceBuilderResourceBuilder
16,470
-    def initialize(client, response, resource_mapping = {}, entry_mapping = {}, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale])initialize
32,904
-    def runrun
45,1502
-    def create_all_resources!create_all_resources!
69,2206
-    def create_resource(object)create_resource
82,2600
-    def find_entry_class(object)find_entry_class
95,3044
-    def try_dynamic_entry(object)try_dynamic_entry
100,3233
-    def get_dynamic_entry(object)get_dynamic_entry
105,3372
-    def content_type_id_for_entry(object)content_type_id_for_entry
112,3600
-    def array_or_sync_page(object)array_or_sync_page
120,3871
-    def detect_resource_class(object)detect_resource_class
135,4329
-    def default_resource_mappingdefault_resource_mapping
151,4728
-    def default_entry_mappingdefault_entry_mapping
156,4837
-    def detect_child_objects(object)detect_child_objects
163,4922
-    def detect_child_arrays(object)detect_child_arrays
171,5091
-    def add_to_known_resources(res)add_to_known_resources
184,5353
-    def replace_children(res, object)replace_children
188,5488
-    def replace_child_array(child_array)replace_child_array
200,5969
-    def create_included_resources!(included_objects)create_included_resources!
204,6097
-    def replace_links_with_known_resources(res, seen_resource_ids = [])replace_links_with_known_resources
217,6436
-    def replace_links_in_properties(property_container, seen_resource_ids)replace_links_in_properties
231,6892
-    def replace_links_in_array(property_container, seen_resource_ids)replace_links_in_array
241,7296
-    def replace_link_or_check_recursively(property_value, property_container, property_name, seen_resource_ids)replace_link_or_check_recursively
247,7574
-    def maybe_replace_link(link, parent, key)maybe_replace_link
255,8011
-    def replace_links_in_included_resources_with_known_resourcesreplace_links_in_included_resources_with_known_resources
262,8243
-
-lib/contentful/response.rb,362
-module ContentfulContentful
6,62
-  class ResponseResponse
24,852
-    def initialize(raw, request = nil)initialize
27,935
-    def service_unavailable_response?service_unavailable_response?
45,1377
-    def no_content_response?no_content_response?
49,1449
-    def parse_json!parse_json!
53,1531
-    def parse_contentful_error!parse_contentful_error!
63,1745
-
-lib/contentful/space.rb,60
-module ContentfulContentful
4,55
-  class SpaceSpace
7,188
-
-lib/contentful/support.rb,103
-module ContentfulContentful
1,0
-  module SupportSupport
3,65
-      def snakify(object)snakify
6,165
-
-lib/contentful/sync.rb,450
-module ContentfulContentful
6,132
-  class SyncSync
7,150
-    def initialize(client, options_or_url)initialize
10,195
-    def each_page(&block)each_page
18,468
-    def first_pagefirst_page
29,680
-    def completed?completed?
34,813
-    def each_item(&block)each_item
39,925
-    def get(options_or_url)get
47,1067
-    def link_page_to_sync!(page)link_page_to_sync!
63,1375
-    def update_sync_state_from!(page)update_sync_state_from!
67,1463
-
-lib/contentful/sync_page.rb,237
-module ContentfulContentful
4,68
-  class SyncPageSyncPage
5,86
-    def self.nested_locale_fields?nested_locale_fields
16,328
-    def next_pagenext_page
20,383
-    def next_page?next_page?
24,454
-    def last_page?last_page?
28,505
-
-lib/contentful/version.rb,33
-module ContentfulContentful
1,0
-
-lib/contentful.rb,0
-
-spec/array_spec.rb,0
-
-spec/asset_spec.rb,0
-
-spec/auto_includes_spec.rb,0
-
-spec/client_class_spec.rb,0
-
-spec/client_configuration_spec.rb,171
-      class MyBetterAsset < Contentful::AssetMyBetterAsset
180,5381
-        def https_image_urlhttps_image_url
181,5427
-      class Cat < Contentful::EntryCat
200,5922
-
-spec/coercions_spec.rb,0
-
-spec/content_type_spec.rb,0
-
-spec/deleted_asset_spec.rb,0
-
-spec/deleted_entry_spec.rb,0
-
-spec/dynamic_entry_spec.rb,0
-
-spec/entry_spec.rb,0
-
-spec/error_class_spec.rb,0
-
-spec/error_requests_spec.rb,0
-
-spec/field_spec.rb,0
-
-spec/file_spec.rb,0
-
-spec/link_spec.rb,0
-
-spec/locale_spec.rb,0
-
-spec/location_spec.rb,0
-
-spec/request_spec.rb,0
-
-spec/resource_building_spec.rb,0
-
-spec/resource_spec.rb,0
-
-spec/response_spec.rb,0
-
-spec/space_spec.rb,0
-
-spec/spec_helper.rb,0
-
-spec/support/client.rb,50
-def create_client(options = {})create_client
1,0
-
-spec/support/json_responses.rb,117
-def raw_fixture(which, as_json = false)raw_fixture
3,22
-def json_fixture(which, as_json = false)json_fixture
7,148
-
-spec/support/vcr.rb,80
-def vcr(name, &block)vcr
10,201
-def expect_vcr(name, &block)expect_vcr
14,261
-
-spec/sync_page_spec.rb,0
-
-spec/sync_spec.rb,0