contentful 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0113f1da37746a15f2e342b3d7248ea3edffce5e
-  data.tar.gz: a3c9f048f5f9a8fd6dc2ecf978af27c2dc986952
+  metadata.gz: e018b3e026198922d69a821134ba088e962b750f
+  data.tar.gz: f0237cee08b92e9e17864831e20f91d74afb8733
 SHA512:
-  metadata.gz: 79d39379d1187ab7037fb11000ca0233ff0c101c855a6ef01e651244ec0516e49822a5afd1e5d9b94fa9c20d487fa13bbd51c9abeff7467e6b84ca0930a96a2a
-  data.tar.gz: 84443697de10d3b27db87d08f7fd5b5385de83bfd32e44bdc3c58e8374f127772becb209e1e155e85957cf61aaa6fe20c7c4921d9d781df02a8c9b1a0f4ec0bf
+  metadata.gz: 4c11bc9897c16a237b5afac122f95d0fc4f1bdee794e68cdbc06f8526f4b0417f9bae230ef944c49609666adc923fbd6dfd0e5ec91db524ef0fbeb572f521d26
+  data.tar.gz: c7aeb7db69f75723d92964142ca0a2355509049bc2df34842430fb5c9b2f33fae43e71bb763ca00ccf045d3c07377bb7b00d3a730c7b9f3f538b5bfe13959a8f

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
   - 2.1.1
   - 2.1
   - 2.0.0
-  - 1.9.3
 notifications:
   slack:
     secure: Zr3mKCiTb0vaTD4MPtTG8BbyYyErFuoxioM25QyrqePKVkDFeZC1MtGmg5klQQrJiWTKZPa/zB8NAHYkoUxg9I+z15JK0hYfz9KRubEpCrXCaqTC9Vzq88kJ3LN8YsTyBF66izaBH2KLsOfaJRxwplFzZqgpg4GG2DUBPtrGtes=

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 1.0.1
+### Fixed
+* Fix Link resolution on localized content
+
+### Changed
+* Removed dependency lock specific for Ruby < 2.0 support
+
 ## 1.0.0
 
 **ATTENTION**: Breaking changes on how JSON Fields are parsed. All keys are now symbolized, including

data/README.md

@@ -372,11 +372,6 @@ first_entry = client.sync(initial: true, type: 'Entry').first_page.items.first
 first_entry.fields('de-DE') # Returns German localizations
 ```
 
-## Rate-limit
-The library does not make assumptions on the rate limit but reacts to `HTTP 429` by raising or returning an error (see [Client Configuration Options](#client-configuration-options)).
-You should handle this within your code and either do the delay calculation naive (fixed amount of seconds) or more elaborated (exponential increase) depending by the structure of your code.
-
-
 ## Workarounds
 
 - When an entry has related entries that are unpublished, they still end up in the resource as unresolved links. We consider this correct, because it is in line with the API responses and our other SDKs. However, you can use the workaround from [issue #60](/../../issues/60) if you happen to want this working differently.

data/contentful.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'http', '~> 1.0'
   gem.add_dependency 'multi_json', '~> 1'
-  gem.add_dependency 'json', '~> 1.8'
 
   gem.add_development_dependency 'bundler', '~> 1.5'
   gem.add_development_dependency 'rake', '~> 10'

data/lib/contentful/resource.rb

@@ -61,14 +61,6 @@ module Contentful
       false
     end
 
-    # Returns true if resource is localized
-    #
-    # @return [Boolean]
-    def localized?(value)
-      return false unless value.is_a? ::Hash
-      value.keys.any? { |possible_locale| Contentful::Constants::KNOWN_LOCALES.include?(possible_locale) }
-    end
-
     # Resources that don't include SystemProperties return nil for #sys
     def sys
       nil
@@ -146,7 +138,7 @@ module Contentful
       @fields = {}
 
       object['fields'].each do |field_name, nested_child_object|
-        if localized?(nested_child_object)
+        if Support.localized?(nested_child_object)
           nested_child_object.each do |object_locale, real_child_object|
             @fields[object_locale] ||= {}
             @fields[object_locale].merge! extract_from_object(

data/lib/contentful/resource/fields.rb

@@ -58,12 +58,12 @@ module Contentful
         end
       end
 
-      private
-
       def locales
         @fields.keys
       end
 
+      private
+
       def extract_fields_from_object!(object)
         initialize_fields_for_localized_resource(object)
       end

data/lib/contentful/resource_builder.rb

@@ -182,8 +182,17 @@ module Contentful
       @known_resources[res.type][res.id] = res if res.sys && res.id && res.type != 'Link'
     end
 
+    def localized_entry?(object, property_name, potential_objects)
+      object['sys']['type'] == 'Entry' &&
+        property_name == 'fields' &&
+        potential_objects.is_a?(::Hash) &&
+        potential_objects.any? { |_, p| Support.localized?(p) }
+    end
+
     def replace_children(res, object)
       object.each do |name, potential_objects|
+        replace_localized_children(res, object, name, potential_objects)
+
         detect_child_objects(potential_objects).each do |child_name, child_object|
           res.public_send(name)[child_name.to_sym] = create_resource(child_object)
         end
@@ -194,6 +203,17 @@ module Contentful
       end
     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
+        end
+      end
+    end
+
     def replace_child_array(child_array)
       child_array.map! { |resource_object| create_resource(resource_object) }
     end
@@ -214,9 +234,19 @@ module Contentful
     def replace_links_with_known_resources(res, seen_resource_ids = [])
       seen_resource_ids << res.id
 
-      property_containers = [:properties, :sys, :fields].map do |property_container_name|
+      property_containers = [:properties, :sys].map do |property_container_name|
         res.public_send(property_container_name)
-      end.compact
+      end
+
+      if res.is_a?(Entry)
+        res.locales.each do |locale|
+          property_containers << res.fields(locale)
+        end
+      else
+        property_containers << res.fields
+      end
+
+      property_containers.compact!
 
       property_containers.each do |property_container|
         replace_links_in_properties(property_container, seen_resource_ids)

data/lib/contentful/support.rb

@@ -11,6 +11,14 @@ module Contentful
         snake = String(object).gsub(/(?<!^)[A-Z]/) { "_#{$&}" }
         snake.downcase
       end
+
+      # Returns true if resource is localized
+      #
+      # @return [Boolean]
+      def localized?(value)
+        return false unless value.is_a? ::Hash
+        value.keys.any? { |possible_locale| Contentful::Constants::KNOWN_LOCALES.include?(possible_locale) }
+      end
     end
   end
 end

data/lib/contentful/version.rb

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

data/spec/entry_spec.rb

@@ -80,6 +80,24 @@ describe Contentful::Entry do
           expect(nyancat.fields_with_locales[:name][:es]).to eq("Gato Nyan")
         }
       end
+
+      it 'can have references in multiple locales and they are properly solved' do
+        vcr('multi_locale_reference') {
+          client = create_client(
+            space: '1sjfpsn7l90g',
+            access_token: 'e451a3cdfced9000220be41ed9c899866e8d52aa430eaf7c35b09df8fc6326f9',
+            dynamic_entries: :auto
+          )
+
+          entry = client.entries(locale: '*').first
+
+          expect(entry.image).to be_a ::Contentful::Asset
+          expect(entry.fields('zh')[:image]).to be_a ::Contentful::Asset
+          expect(entry.fields('es')[:image]).to be_a ::Contentful::Asset
+
+          expect(entry.image.id).not_to eq entry.fields('zh')[:image].id
+        }
+      end
     end
   end
 

data/spec/fixtures/vcr_cassettes/multi_locale_reference.yml

@@ -0,0 +1,214 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer e451a3cdfced9000220be41ed9c899866e8d52aa430eaf7c35b09df8fc6326f9
+      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:
+      - '"a684f9ee6d6e80804ecfc6ad741f3b28"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - eaef9f65adddf842356893d4ff94a061
+      Content-Length:
+      - '809'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 29 Sep 2016 22:12:09 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '3732'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7125-GRU
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1475187129.479343,VS0,VE0
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 1,
+          "skip": 0,
+          "limit": 1000,
+          "items": [
+            {
+              "sys": {
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "1sjfpsn7l90g"
+                  }
+                },
+                "id": "test",
+                "type": "ContentType",
+                "createdAt": "2016-09-29T14:46:41.071Z",
+                "updatedAt": "2016-09-29T14:46:41.071Z",
+                "revision": 1
+              },
+              "displayField": null,
+              "name": "Test",
+              "description": "",
+              "fields": [
+                {
+                  "id": "image",
+                  "name": "Image",
+                  "type": "Link",
+                  "localized": true,
+                  "required": false,
+                  "disabled": false,
+                  "omitted": false,
+                  "linkType": "Asset"
+                }
+              ]
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Thu, 29 Sep 2016 22:12:09 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/entries?locale=*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer e451a3cdfced9000220be41ed9c899866e8d52aa430eaf7c35b09df8fc6326f9
+      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/"d74db949e37697354c70ebc8d3ac5301"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - 5a58a9b54ff533c49bab5b96f4654c08
+      Content-Length:
+      - '880'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 29 Sep 2016 22:12:14 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '3737'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7120-GRU
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '20'
+      X-Timer:
+      - S1475187134.558426,VS0,VE0
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+2WXW/aMBSG7/srUK4HsR0nwb1DVYWqbu06itA2VVVCHDAk
+        ISOhDCr++2yHgCEhoxtrVWm5gPjj2Ofj9eM8n9VqWrJItPPaM3/ljXQRU97S
+        WtOps9B43+qDmJNOUifg/VC2kjGLeQPIRsBCloohkLVZSkOx4He5YLbs3i5y
+        pyR2+mKrfEbWqfgiOmRn7tNHFo01sef24btH4/u1zx254t4E5olwYDLy4ySy
+        AwIGIqr8WW3eZZzZo2U2GI0vR8ubEQmv+gzRRfv2qsPulPU3jl1G6XShDvSn
+        1Emp1xJ50RCAVh2QOiL3EJ+bxrmJGwayv6kGs9h7mcGUPrGETaK8JmvP+5Mo
+        pVG6zsjpUnuhrFua4JQm6YHErvO6SbDmMxp4W80J1zUWOoOCGmhU73b2JFIi
+        pXXsFTKRMt0KpZUkNN0TivBBSsX6EkxG5NPVz9v5AMzR+MeF0+sgNTZ+KFQJ
+        qfnQ6G5cMjb1gK0lJrpP5C/qtT/H8QIHTqvXG3RZrw1Qp3Wsv8vhq+d3OR6G
+        0wu2vJ7dddugG369prhX4e/2iOZKkv+iBg+SQCzqBzNPybyWFThn0JZCpcUo
+        JVHpTFnN48tWxqONzA4RqUpcmUAPFHxHhhuMF5SuVbMJWQ1sQZVN3ONqOpWa
+        qHzaFlBhbAkERHJZGuxjgHfnINBcpz8eTCezyKtLYtSJZTcRqBEL1GwEdgi0
+        kxCfVa2rglIWeTYVt52m63KXpLHmqj8L+Guoq8XTy+uhG8SEyIYQEAqJQ7Hp
+        Iui6AGMXYdegff1ALI88lkceS2MUD4qM8mjqsKAIGel1wpYiecjEBjF2MS3H
+        yyArBuTgnHmpgAHfumjKx4eUDYbiQuMTFPxl1ioQRY9ym66XFwW4cUL5cfFH
+        ke9ebVks+iimO/f53ukpoiMPbVvxEjy/NyIcuLJORgQTk5cSoWjyj4iQYeCJ
+        0XkdQoMgYL4pDMpLoWMLuzYGDml6HAkEmCY2fdv2TMt3DBe5GWfqahin4AA0
+        kFk8zMdxgGOoaKpywMJ/y4Fi7aqD/o8ACdMduOZfreVfVSdDALatlyKgaPJa
+        CMBvi4DSUuhO0ycAmMQ1Xd+zELAJbELso75BPd9xcBEBuPo0HPMpAA3YtN4V
+        An4T9GkQIL8LHvjv6mx19gvB1oxYBREAAA==
+    http_version: 
+  recorded_at: Thu, 29 Sep 2016 22:12:14 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -40,20 +40,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -400,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_reference.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml
 - spec/fixtures/vcr_cassettes/ratelimit.yml
@@ -496,6 +483,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_reference.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml
 - spec/fixtures/vcr_cassettes/ratelimit.yml