contentful-management 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4351225d59ca9af60725c79bd71d0717449e68e6
-  data.tar.gz: fd90f9d188c96f5446f9f920fe6272ca579a45b6
+  metadata.gz: 7bb620d6df69c4e84f671fe8a91e91f1fae53310
+  data.tar.gz: f1cb940d955248205c1c564d45aa25e8c59de0d4
 SHA512:
-  metadata.gz: fc14898bf09f8bbf6f21324bb549708e887a4dc43e132cfe615ef06dc04cfd1f6736566675060aa613d3e6fbecca9017547b247f8c47465bb11979150c25d37e
-  data.tar.gz: da8832650d78644687acebd327c84ee7477f7b9013730af37d5815a7ee31804cb9c53a08fffb951e5ac7b3a39f7a6af4db03867529e2ad062b426b3a44b6daa6
+  metadata.gz: e7b895437b69329cab7a8d4e45454cf304bcedbb911463ed5fd5b92d37b1cc479c31a164ee96ee46991ced0eddcbf38c186544eeeef135a38b819e6382a78d34
+  data.tar.gz: ba872718b2b957c72a36956c72db232b1edbb537d14bd18520ccb32a1921666ae423b8b2172c73a1c84894edd40db732f8bddf775af5751294af4a2fa21f3d66

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## 1.0.1
+### Changed
+* Changed locale selection priority when requesting fields [#91](https://github.com/contentful/contentful-management.rb/issues/91)
+
 ## 1.0.0
 ### Breaking Changes
 * `Client` is no longer a singleton. Therefore all `Resource` class calls (`Entry`, `Space`, `ContentType`, etc...) require an instance of a client.

data/lib/contentful/management/entry.rb

@@ -71,8 +71,8 @@ module Contentful
       # @param [String] wanted_locale
       #
       # @return [Hash] localized fields
-      def fields(wanted_locale = default_locale)
-        requested_locale = locale || wanted_locale
+      def fields(wanted_locale = locale)
+        requested_locale = wanted_locale || default_locale
         @fields[requested_locale] = {} unless @fields[requested_locale]
 
         default_fields = @fields[default_locale] || {}

data/lib/contentful/management/version.rb

@@ -3,6 +3,6 @@ module Contentful
   # Management Namespace
   module Management
     # Gem Version
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/fixtures/vcr_cassettes/entry/issue_91.yml

@@ -0,0 +1,256 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/iv4sic0eru9h/entries/5GrMLWzfyMs0eKoi4sg2ug
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/1.0.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Connection:
+      - close
+      Host:
+      - api.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:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - iv4sic0eru9h
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Tue, 29 Mar 2016 14:44:50 GMT
+      Etag:
+      - '"713c1a621dc27a6680086a0b7095a50a"'
+      Server:
+      - nginx
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - content-api:5rY7VFgKiseaqGmoIkemKk
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '1101'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_298_673446=mwF2XL/LHQwHYwYtJrYiBOKU+lYAAAAA9krrCagofL8MiLJ5sMlDYA==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=UpBdbmCArwwN0HWPaoBaJgAAAADmzA/SEcWb9AhSVHk0UwGu; path=/; Domain=.contentful.com
+      - visid_incap_673446=lUndMoT/Sg2k89hEPcQuKuKU+lYAAAAAQUIPAAAAAAC5JEUUCubFQpBRGmE0ZymW;
+        expires=Tue, 28 Mar 2017 23:23:00 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 0-49836165-49836186 NNNN CT(142 141 0) RT(1459262688720 114) q(0 0 3 -1) r(12
+        12) U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "id": "5GrMLWzfyMs0eKoi4sg2ug",
+            "type": "Entry",
+            "createdAt": "2016-03-29T14:43:21.462Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "iv4sic0eru9h"
+              }
+            },
+            "contentType": {
+              "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "localeTest"
+              }
+            },
+            "firstPublishedAt": "2016-03-29T14:43:38.029Z",
+            "publishedCounter": 1,
+            "publishedAt": "2016-03-29T14:43:38.029Z",
+            "publishedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "publishedVersion": 8,
+            "version": 9,
+            "updatedAt": "2016-03-29T14:43:38.036Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            }
+          },
+          "fields": {
+            "test": {
+              "en-US": "foo",
+              "es": "bar"
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Tue, 29 Mar 2016 14:44:50 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/iv4sic0eru9h/content_types/localeTest
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/1.0.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Connection:
+      - close
+      Host:
+      - api.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:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - iv4sic0eru9h
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Tue, 29 Mar 2016 14:44:52 GMT
+      Etag:
+      - '"ca61fa30dee92a108318d69e9755340d"'
+      Server:
+      - nginx
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - content-api:1yyOlhYoI4U8cAos06Ee2y
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '1146'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_298_673446=Okc9Vzd1z0mtZQYtJrYiBOOU+lYAAAAAbIDRY0WivDZALbvilASlag==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=l8eTKu2a0Gda1EdUaoBaJgAAAABkAEu5aWbUIOVMVgkyz7J3; path=/; Domain=.contentful.com
+      - visid_incap_673446=bTnpq/PaTGWA7Z6KC2Mg/OOU+lYAAAAAQUIPAAAAAACdCN48/foqfFg6cCCRX408;
+        expires=Tue, 28 Mar 2017 23:23:00 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 1-71448780-71448803 NNNN CT(156 138 0) RT(1459262690162 102) q(0 0 3 -1) r(13
+        13) U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "name": "LocaleTest",
+          "fields": [
+            {
+              "name": "test",
+              "id": "test",
+              "type": "Symbol",
+              "localized": true,
+              "validations": [],
+              "required": false,
+              "disabled": false
+            }
+          ],
+          "displayField": "test",
+          "description": "",
+          "sys": {
+            "id": "localeTest",
+            "type": "ContentType",
+            "createdAt": "2016-03-29T14:43:00.128Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "iv4sic0eru9h"
+              }
+            },
+            "firstPublishedAt": "2016-03-29T14:43:00.564Z",
+            "publishedCounter": 1,
+            "publishedAt": "2016-03-29T14:43:00.564Z",
+            "publishedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "publishedVersion": 1,
+            "version": 2,
+            "updatedAt": "2016-03-29T14:43:00.580Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Tue, 29 Mar 2016 14:44:52 GMT
+recorded_with: VCR 2.9.3

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

@@ -780,6 +780,19 @@ module Contentful
             }
           end
 
+          it 'fields_for_query get properly updated when setting a field using _with_locales - #91' do
+            vcr('entry/issue_91') {
+              entry = client.entries.find('iv4sic0eru9h', '5GrMLWzfyMs0eKoi4sg2ug')
+
+              expect(entry.test_with_locales).to eq('en-US' => 'foo', 'es' => 'bar')
+
+              entry.test_with_locales = {'en-US' => 'baz', 'es' => 'foobar'}
+
+              expect(entry.test_with_locales).to eq('en-US' => 'baz', 'es' => 'foobar')
+              expect(entry.fields_for_query).to eq(test: { 'en-US' => 'baz', 'es' => 'foobar' })
+            }
+          end
+
           describe 'it can properly assign, save and publish - #61' do
             describe 'on an entry created through the api' do
               describe 'before refetch' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Piotr Protas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -391,6 +391,7 @@ files:
 - spec/fixtures/vcr_cassettes/entry/issue_61_spaces.yml
 - spec/fixtures/vcr_cassettes/entry/issue_70.yml
 - spec/fixtures/vcr_cassettes/entry/issue_73.yml
+- spec/fixtures/vcr_cassettes/entry/issue_91.yml
 - spec/fixtures/vcr_cassettes/entry/limited_entries.yml
 - spec/fixtures/vcr_cassettes/entry/locales/fallback_to_default_locale.yml
 - spec/fixtures/vcr_cassettes/entry/locales/retrieve_localized.yml
@@ -667,6 +668,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/entry/issue_61_spaces.yml
 - spec/fixtures/vcr_cassettes/entry/issue_70.yml
 - spec/fixtures/vcr_cassettes/entry/issue_73.yml
+- spec/fixtures/vcr_cassettes/entry/issue_91.yml
 - spec/fixtures/vcr_cassettes/entry/limited_entries.yml
 - spec/fixtures/vcr_cassettes/entry/locales/fallback_to_default_locale.yml
 - spec/fixtures/vcr_cassettes/entry/locales/retrieve_localized.yml