RubyGems - contentful - Versions diffs - 1.0.1 → 1.0.2 - Mend

contentful 1.0.1 → 1.0.2

Files changed (10) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +8 -0
data/lib/contentful/entry.rb +5 -0
data/lib/contentful/resource.rb +5 -0
data/lib/contentful/resource/fields.rb +1 -0
data/lib/contentful/resource_builder.rb +9 -6
data/lib/contentful/version.rb +1 -1
data/spec/entry_spec.rb +24 -0
data/spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml +200 -0
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e018b3e026198922d69a821134ba088e962b750f
-  data.tar.gz: f0237cee08b92e9e17864831e20f91d74afb8733
+  metadata.gz: fa88c4ac86051cce5074ece0a442eba538b391de
+  data.tar.gz: d3b48ffb2e6415fe4ca1181273ea646c50c66ab6
 SHA512:
-  metadata.gz: 4c11bc9897c16a237b5afac122f95d0fc4f1bdee794e68cdbc06f8526f4b0417f9bae230ef944c49609666adc923fbd6dfd0e5ec91db524ef0fbeb572f521d26
-  data.tar.gz: c7aeb7db69f75723d92964142ca0a2355509049bc2df34842430fb5c9b2f33fae43e71bb763ca00ccf045d3c07377bb7b00d3a730c7b9f3f538b5bfe13959a8f
+  metadata.gz: ac44810a4f8fa5e725b2953ae54abfb8bb4987d4af1feecfed38631ce4fdade1096f1cfdede0a67fd20fe039e0939243e87ee946568a1cc59cb5107b0c3ac997
+  data.tar.gz: ca723275d5614061688b12d2cf7d1dcc0ca5881b611378f454b70563297c9df5beea6ef6a9a43606eecf80617e12d9042603714125c5a425fed4410f69675e98

data/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,14 @@
 ## Unreleased
+## 1.0.2
+### Fixed
+* Fix Link resolution for Arrays on localized content
+### Added
+* Add `entry?` method to resources to easily detect entries
+* Add missing documentation for `#locales` method
 ## 1.0.1
 ### Fixed
 * Fix Link resolution on localized content

data/lib/contentful/entry.rb CHANGED Viewed

@@ -32,6 +32,11 @@ module Contentful
       processed_raw
     end
+    # Returns true for resources that are entries
+    def entry?
+      true
+    end
     private
     def known_link?(name)

data/lib/contentful/resource.rb CHANGED Viewed

@@ -56,6 +56,11 @@ module Contentful
       "#<#{self.class}:#{properties_info}#{info}>"
     end
+    # Returns true for resources that are entries
+    def entry?
+      false
+    end
     # Returns true for resources that behave like an array
     def array?
       false

data/lib/contentful/resource/fields.rb CHANGED Viewed

@@ -58,6 +58,7 @@ module Contentful
         end
       end
+      # Provides a list of the available locales for a Resource
       def locales
         @fields.keys
       end

data/lib/contentful/resource_builder.rb CHANGED Viewed

@@ -204,12 +204,15 @@ module Contentful
     end
     def replace_localized_children(result, object, property_name, potential_objects)
-      if localized_entry?(object, property_name, potential_objects)
-        localized_objects = potential_objects.select { |_, p| Support.localized?(p) }
-        localized_objects.each do |field_name, localized_object|
-          detect_child_objects(localized_object).each do |locale, child_object|
-            result.public_send(property_name, locale)[field_name.to_sym] = create_resource(child_object)
-          end
+      return unless localized_entry?(object, property_name, potential_objects)
+      localized_objects = potential_objects.select { |_, p| Support.localized?(p) }
+      localized_objects.each do |field_name, localized_object|
+        detect_child_objects(localized_object).each do |locale, child_object|
+          result.public_send(property_name, locale)[field_name.to_sym] = create_resource(child_object)
+        end
+        detect_child_arrays(localized_object).each do |locale, _child_array|
+          replace_child_array result.public_send(property_name, locale)[field_name.to_sym]
         end
       end
     end

data/lib/contentful/version.rb CHANGED Viewed

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

data/spec/entry_spec.rb CHANGED Viewed

@@ -98,6 +98,30 @@ describe Contentful::Entry do
           expect(entry.image.id).not_to eq entry.fields('zh')[:image].id
         }
       end
+      it 'can have references with arrays in multiple locales and have them properly solved' do
+        vcr('multi_locale_array_reference') {
+          client = create_client(
+            space: 'cma9f9g4dxvs',
+            access_token: '3e4560614990c9ac47343b9eea762bdaaebd845766f619660d7230787fd545e1',
+            dynamic_entries: :auto
+          )
+          entry = client.entries(content_type: 'test', locale: '*').first
+          expect(entry.files).to be_a ::Array
+          expect(entry.references).to be_a ::Array
+          expect(entry.files.first).to be_a ::Contentful::Asset
+          expect(entry.references.first.entry?).to be_truthy
+          expect(entry.fields('zh')[:files]).to be_a ::Array
+          expect(entry.fields('zh')[:references]).to be_a ::Array
+          expect(entry.fields('zh')[:files].first).to be_a ::Contentful::Asset
+          expect(entry.fields('zh')[:references].first.entry?).to be_truthy
+          expect(entry.files.first.id).not_to eq entry.fields('zh')[:files].first.id
+        }
+      end
     end
   end

data/spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml ADDED Viewed

@@ -0,0 +1,200 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cma9f9g4dxvs/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.1
+      Authorization:
+      - Bearer 3e4560614990c9ac47343b9eea762bdaaebd845766f619660d7230787fd545e1
+      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-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"d88da8bd0b663c91b528c893d220e530"
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - a0059b039268294c11c0f01a5debe341
+      Content-Length:
+      - '466'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Oct 2016 10:24:47 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7126-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1475663087.088657,VS0,VE163
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+VVO2/CMBDe+RXIc0EJUFCyoaqdusHUisEkl8rCsVPbQU0R
+        /72288CBUIrKUtULuTvf3XcPf+x6/T6ShURhf6c/taCKDLSE5kLgAmnd/s7c
+        UVxhqvUjK8kNybTgWYGSlCgt+Z5XKoiC1ER8tRHLuEdpbCqZ4cjkqm+USgeM
+        UVhlDeqZsA0ySQ9Hp2ebZQV6YSMeXSCxqSdKcZAEb5P4YytNWfXZN9+20PKg
+        0keBVE60BsYDZwqYslkdp0gAVhDPTTPQyPOnA98bePdL3wv9cTgOhn4QvLgO
+        eRZf5yBgSyThzHS7AtugRjGRGcXFEwFqKmY5pTU4xHBqp7p0K0IxyEiQTJUR
+        UQMNJSbGYYSmKa0hle1JCAXZ6naTp8PUXix3RojyCFPyCQa2Ejm0jALecyKs
+        LcFUto26ZrymZ4xc76WeR6djvaNuWRcWbasx6nnpZtnOrL7Zw7mUoC5uWUdL
+        BSQggEXn+nrO/p+a+8iUsMzU8YQr7cr+Vk/jDxNQwvmN+GcS+rPhbDb9Mf90
+        OlzDP2iNxYFRagJyK/ot/7gJzLwb9jkx1M9jUaRrTtuU5ZLPKcHcjH0OfzPt
+        HdXSqrfvfQFKIERWiQcAAA==
+    http_version:
+  recorded_at: Wed, 05 Oct 2016 10:24:47 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cma9f9g4dxvs/entries?content_type=test&locale=*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.1
+      Authorization:
+      - Bearer 3e4560614990c9ac47343b9eea762bdaaebd845766f619660d7230787fd545e1
+      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-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"8edf1404b7716c31b2d3e1ee5e7bcf1d"
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - 4971acf3134093597e6a745b405ba08e
+      Content-Length:
+      - '1349'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Oct 2016 10:24:47 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7121-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1475663087.427541,VS0,VE185
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        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
+    http_version:
+  recorded_at: Wed, 05 Oct 2016 10:24:47 GMT
+recorded_with: VCR 3.0.3

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -386,6 +386,7 @@ files:
 - spec/fixtures/vcr_cassettes/linkField.yml
 - spec/fixtures/vcr_cassettes/locale.yml
 - spec/fixtures/vcr_cassettes/location.yml
+- spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml
 - spec/fixtures/vcr_cassettes/multi_locale_reference.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml
@@ -483,6 +484,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/linkField.yml
 - spec/fixtures/vcr_cassettes/locale.yml
 - spec/fixtures/vcr_cassettes/location.yml
+- spec/fixtures/vcr_cassettes/multi_locale_array_reference.yml
 - spec/fixtures/vcr_cassettes/multi_locale_reference.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml