contentful 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb51bf63992e8954100bf135c6a03ae27470131
-  data.tar.gz: daaad9d76c496da15b3118caccd6d0c6060cbcbe
+  metadata.gz: a960ca1aedbe17e69082ec7d178fead3cdd5f20b
+  data.tar.gz: 037c897ba9cd30398b8b69568170a15e26613aca
 SHA512:
-  metadata.gz: 489539c127176b6169dd2da6dc5c0a054e64e02eec27885644b38ac036c26d8dcf43296125a450884fd41a91161806f729e602864de9eaaeb26b63da8627ebaf
-  data.tar.gz: 131a32ea047617743fe160a713d4e4442464c3179949eb11845b10a012415bd380295521dbeb28a319dbd341e0db2e2dfe5eabd7fd1204c2dc098b30bea6a681
+  metadata.gz: fcd77594eb1ee64762267caaa90c17f87a3bd8cf266fe3366f3e18cc406174b7f800e78a730ef4606f4b1786dd6d0aa0b729f2199a13e37de11fb28cc4db1c02
+  data.tar.gz: ad74de5177e0c9880e78afe4a2ae2df55ff5ea537a45ac0a1dac58d9857aa8dd44d63bf5ec512130d8f5aee950b547a397df1ce20c98f7e29e9948c6067b77d0

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.4.0
   - 2.3.1
   - 2.2.1
   - 2.1.2

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 2.0.2
+
+### Fixed
+* Asset File Mapping now uses `#internal_resource_locale` to use `Resource#sys[:locale]` if available [jekyll-contentful-data-import #46](https://github.com/contentful/jekyll-contentful-data-import/issues/46)
+
 ## 2.0.1
 
 ### Fixed

data/lib/contentful/asset.rb

@@ -76,7 +76,7 @@ module Contentful
           @fields[locale][:file] = ::Contentful::File.new(file_json[locale.to_s] || {})
         end
       else
-        @fields[default_locale][:file] = ::Contentful::File.new(file_json)
+        @fields[internal_resource_locale][:file] = ::Contentful::File.new(file_json)
       end
     end
 

data/lib/contentful/version.rb

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

data/spec/asset_spec.rb

@@ -141,5 +141,19 @@ describe Contentful::Asset do
         expect(asset.fields('es')[:file].file_name).to eq 'Flag_of_Spain.svg'
       }
     end
+
+    it 'properly serializes files for non-default locales on localized requests - jekyll-contentful-data-import #46' do
+      vcr('assets/issues_jekyll_46') {
+        client = create_client(
+          space: 'bht13amj0fva',
+          access_token: 'bb703a05e107148bed6ee246a9f6b3678c63fed7335632eb68fe1b689c801534',
+        )
+
+        asset = client.assets('sys.id' => '14bZJKTr6AoaGyeg4kYiWq', locale: 'es').first
+
+        expect(asset.file).to be_a ::Contentful::File
+        expect(asset.file.file_name).to eq 'Flag_of_Spain.svg'
+      }
+    end
   end
 end

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

@@ -0,0 +1,115 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/assets?locale=es&sys.id=14bZJKTr6AoaGyeg4kYiWq
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/2.0.1
+      Authorization:
+      - Bearer bb703a05e107148bed6ee246a9f6b3678c63fed7335632eb68fe1b689c801534
+      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,X-Contentful-User-Agent
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"fd221ef596081681476844e76626d81e"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 94c2a00df9e2c852f0d971f0bf6447cd
+      Content-Length:
+      - '901'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 19 Apr 2017 13:30:46 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-lax8647-LAX
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1492608646.119094,VS0,VE415
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 1,
+          "skip": 0,
+          "limit": 100,
+          "items": [
+            {
+              "sys": {
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "bht13amj0fva"
+                  }
+                },
+                "id": "14bZJKTr6AoaGyeg4kYiWq",
+                "type": "Asset",
+                "createdAt": "2016-10-05T14:31:36.082Z",
+                "updatedAt": "2016-10-05T14:31:36.082Z",
+                "revision": 1,
+                "locale": "es"
+              },
+              "fields": {
+                "title": "ES Title",
+                "description": "ES Description",
+                "file": {
+                  "url": "//assets.contentful.com/bht13amj0fva/14bZJKTr6AoaGyeg4kYiWq/5501c98c296af77b9acba1146ea3e211/Flag_of_Spain.svg",
+                  "details": {
+                    "size": 60255
+                  },
+                  "fileName": "Flag_of_Spain.svg",
+                  "contentType": "image/svg+xml"
+                }
+              }
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 19 Apr 2017 13:30:46 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -433,6 +433,7 @@ files:
 - spec/fixtures/vcr_cassettes/asset/select_one_field.yml
 - spec/fixtures/vcr_cassettes/asset/select_only_sys.yml
 - spec/fixtures/vcr_cassettes/assets/issues_129.yml
+- spec/fixtures/vcr_cassettes/assets/issues_jekyll_46.yml
 - spec/fixtures/vcr_cassettes/bad_request.yml
 - spec/fixtures/vcr_cassettes/content_type.yml
 - spec/fixtures/vcr_cassettes/entries.yml
@@ -541,6 +542,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/asset/select_one_field.yml
 - spec/fixtures/vcr_cassettes/asset/select_only_sys.yml
 - spec/fixtures/vcr_cassettes/assets/issues_129.yml
+- spec/fixtures/vcr_cassettes/assets/issues_jekyll_46.yml
 - spec/fixtures/vcr_cassettes/bad_request.yml
 - spec/fixtures/vcr_cassettes/content_type.yml
 - spec/fixtures/vcr_cassettes/entries.yml