contentful 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3336395c12c33716d03ef5ccd4ca5662d0c9f0e4
-  data.tar.gz: ff41b0e879b3ab72bc0962abeac4dae2fb49496a
+  metadata.gz: adb51bf63992e8954100bf135c6a03ae27470131
+  data.tar.gz: daaad9d76c496da15b3118caccd6d0c6060cbcbe
 SHA512:
-  metadata.gz: 39692cf6bc73f11ea37ede62a11fc70f9ca5ccc7346cfe415d88dc53c320a30443669b7585df78ef13b657697a7f91fe126f01e26cdbab280ab03ebd5bcbdc5b
-  data.tar.gz: a6d462ef93caf18c9179b36403911f255685bcacd3ff7a06c9f91eca40c5c8e1346474068f20766baa726513d9a63a0c5fee101f0037b6444230062bda5bf65a
+  metadata.gz: 489539c127176b6169dd2da6dc5c0a054e64e02eec27885644b38ac036c26d8dcf43296125a450884fd41a91161806f729e602864de9eaaeb26b63da8627ebaf
+  data.tar.gz: 131a32ea047617743fe160a713d4e4442464c3179949eb11845b10a012415bd380295521dbeb28a319dbd341e0db2e2dfe5eabd7fd1204c2dc098b30bea6a681

data/CHANGELOG.md

@@ -2,11 +2,17 @@
 
 ## Unreleased
 
+## 2.0.1
+
+### Fixed
+* Fixed Integer/Decimal field serializations [#125](https://github.com/contentful/contentful.rb/issues/125)
+* Fixed File coercion for Localized Assets [#129](https://github.com/contentful/contentful.rb/issues/129)
+
 ## 2.0.0
 
 **ATTENTION**: Breaking Changes introduces in order to simplify code and improve the ability to add new features.
 
-## Changed
+### Changed
 
 * The removal of the Client and Request objects from the Resource objects, means that for example: Link#resolve and Array#next_page now require the client as a parameter.
 * Client#entry now uses /entries?sys.id=ENTRY_ID instead of /entries/ENTRY_ID to properly resolve includes.
@@ -20,6 +26,7 @@
 * Resource #inspect now provides a clearer and better output, without all the noise that was previously there
 * CustomResource was removed, now subclasses of Entry should be used instead.
 * `max_include_resolution_depth` option added to the client, defaults to 20.
+* `sys` properties now match accessors.
 * Updated LICENSE
 * Updated examples
 

data/lib/contentful/asset.rb

@@ -7,7 +7,10 @@ module Contentful
   class Asset < FieldsResource
     # @private
     def marshal_dump
-      raw
+      {
+        configuration: @configuration,
+        raw: raw
+      }
     end
 
     # @private
@@ -64,16 +67,16 @@ module Contentful
     private
 
     def create_files!
-      file_json = fields[:file]
+      file_json = raw.fetch('fields', {}).fetch('file', nil)
       return if file_json.nil?
 
       is_localized = file_json.keys.none? { |f| %w(fileName contentType details url).include? f }
       if is_localized
         locales.each do |locale|
-          fields(locale)[:file] = ::Contentful::File.new(file_json[locale.to_s] || {})
+          @fields[locale][:file] = ::Contentful::File.new(file_json[locale.to_s] || {})
         end
       else
-        fields[:file] = ::Contentful::File.new(file_json)
+        @fields[default_locale][:file] = ::Contentful::File.new(file_json)
       end
     end
 

data/lib/contentful/base_resource.rb

@@ -27,12 +27,17 @@ module Contentful
 
     # @private
     def marshal_dump
-      raw
+      {
+        configuration: @configuration,
+        raw: raw
+      }
     end
 
     # @private
     def marshal_load(raw_object)
-      @raw = raw_object
+      @raw = raw_object[:raw]
+      @configuration = raw_object[:configuration]
+      @default_locale = @configuration[:default_locale]
       @sys = hydrate_sys
       @depth = 0
       define_sys_methods!

data/lib/contentful/entry.rb

@@ -63,7 +63,7 @@ module Contentful
     def known_link?(name)
       field_name = name.to_sym
       return true if known_contentful_object?(fields[field_name])
-      fields[field_name].is_a?(Enumerable) && known_contentful_object?(fields[field_name].first)
+      fields[field_name].is_a?(Enumerable) && fields[field_name].any? { |object| known_contentful_object?(object) }
     end
 
     def known_contentful_object?(object)

data/lib/contentful/field.rb

@@ -11,7 +11,7 @@ module Contentful
       'Text'     => TextCoercion,
       'Symbol'   => SymbolCoercion,
       'Integer'  => IntegerCoercion,
-      'Float'    => FloatCoercion,
+      'Number'   => FloatCoercion,
       'Boolean'  => BooleanCoercion,
       'Date'     => DateCoercion,
       'Location' => LocationCoercion,

data/lib/contentful/fields_resource.rb

@@ -42,13 +42,16 @@ module Contentful
 
     # @private
     def marshal_dump
-      raw_with_links
+      {
+        configuration: @configuration,
+        raw: raw_with_links
+      }
     end
 
     # @private
     def marshal_load(raw_object)
       super(raw_object)
-      localized = raw_object.fetch('fields', {}).all? { |_, v| v.is_a?(Hash) }
+      localized = raw_object[:raw].fetch('fields', {}).all? { |_, v| v.is_a?(Hash) }
       @fields = hydrate_fields(localized, [])
       define_fields_methods!
     end

data/lib/contentful/support.rb

@@ -16,14 +16,6 @@ module Contentful
           .downcase
       end
 
-      # Returns true if resource is localized
-      #
-      # @return [true, false]
-      def localized?(value)
-        return false unless value.is_a? ::Hash
-        value.keys.any? { |possible_locale| Contentful::Constants::KNOWN_LOCALES.include?(possible_locale) }
-      end
-
       # Checks if value is a link
       #
       # @param value

data/lib/contentful/version.rb

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

data/spec/asset_spec.rb

@@ -120,4 +120,26 @@ describe Contentful::Asset do
       end
     end
   end
+
+  describe 'issues' do
+    it 'serializes files correctly for every locale - #129' do
+      vcr('assets/issues_129') {
+        client = create_client(
+          space: 'bht13amj0fva',
+          access_token: 'bb703a05e107148bed6ee246a9f6b3678c63fed7335632eb68fe1b689c801534'
+        )
+
+        asset = client.assets('sys.id' => '14bZJKTr6AoaGyeg4kYiWq', locale: '*').first
+
+        expect(asset.file).to be_a ::Contentful::File
+        expect(asset.file.file_name).to eq 'Flag_of_the_United_States.svg'
+
+        expect(asset.fields[:file]).to be_a ::Contentful::File
+        expect(asset.fields[:file].file_name).to eq 'Flag_of_the_United_States.svg'
+
+        expect(asset.fields('es')[:file]).to be_a ::Contentful::File
+        expect(asset.fields('es')[:file].file_name).to eq 'Flag_of_Spain.svg'
+      }
+    end
+  end
 end

data/spec/entry_spec.rb

@@ -329,5 +329,15 @@ describe Contentful::Entry do
         })
       end
     end
+
+    it 'Number (Integer and Decimal) values get properly serialized - #125' do
+      vcr('entries/issue_125') {
+        client = create_client(space: 'zui87wsu8q80', access_token: '64ff902c58cd14ea063d3ded810d1111a0266537e9aba283bad3319b1762c302', dynamic_entries: :auto)
+        entry = client.entries.first
+
+        expect(entry.integer).to eq 123
+        expect(entry.decimal).to eq 12.3
+      }
+    end
   end
 end

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

@@ -0,0 +1,90 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/assets?locale=*&sys.id=14bZJKTr6AoaGyeg4kYiWq
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/2.0.0
+      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-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"7e90131294f96e196d1e6c2dddb41ccb"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - e5083424335e7ca4ebfead1b0fb34a1e
+      Content-Length:
+      - '508'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Apr 2017 15:49:25 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-lax8637-LAX
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1491407366.696669,VS0,VE230
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA61UTY/aMBC98yuQry3EzhcJN6RuK7XVXmBVdasKOc6EdclX
+        Y4NKV/z32k6yMSwrLav6Eo89njfz3kweR+MxEgeB5uNHtVWGPNSgLLRoGnpA
+        6uz4XvvIStJcnRNjiS2vlYGNkfOCS32FW5tLKHTAHyZgG/YMxSCJmjIN1Xu0
+        h1Yu+sAc9jl95eUWacxhKfRyu+pyXpqIZw481eUkD5J4tPiFsz3VVfXr+LQ3
+        dbYLtW+In9x//rJqwkVFPx1g42+/82+/rfgDWUKAtC9YA1RCutC8IBeTcELw
+        BAcr4s89MvfCKY7ce/vBrk6ve9DAngtelZr4LvGnClDGIU8HUXVVSHKZP6Mb
+        ysndUud4czteGQebPQQ6BrpZdncXuUpBsIbXss3lREw7+gfL7TKG7XERKeMv
+        F2DjqmJ3jW5W5DhUKyOmrCollDLb5WpbOHY3OJdldoiXYZyk2SxgxHMxDgkD
+        f0aoF0UEIo84H3O6WVfZWj7A+q5UXZ+ul1KJKKZivznvwhQk5fmpJF2zCf5X
+        6xLF8UlnW/1o9NPV39LCDOdV0F3t/ZDwgm7AUSm++1PkJ6PwXJb/z2oQYMLi
+        iLlxSLPZLIkpSyghfgjUA5cMrKpZ5uXbmAyxGwRXc/ki4Kv5G5q2H0jz1b+Y
+        n6Pj6B/AhXSYbAUAAA==
+    http_version: 
+  recorded_at: Wed, 05 Apr 2017 15:49:25 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/entries/issue_125.yml

@@ -0,0 +1,198 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/zui87wsu8q80/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/2.0.0
+      Authorization:
+      - Bearer 64ff902c58cd14ea063d3ded810d1111a0266537e9aba283bad3319b1762c302
+      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/"b8403cd0f2664e6663a4ed099c5a0ad1"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - b2a122d2f0e4f510fd5b77d0f6e213f5
+      Content-Length:
+      - '371'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Apr 2017 15:22:28 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-lax8637-LAX
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1491405748.191815,VS0,VE196
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA71SsW7CMBDd+QrkuVQOKgWxoVaVKlVdytSKwSRHdcJxgu20
+        Coh/r8/GIURhYKkVKb47+91773wYDIfM1IbNhwe3dYGtS3ARW2gtauZyxzs6
+        YwsrpMsnPjJbLF3AfSAxR0slzkMCLeSE+OURA26njW9lSpFSr3giJFtkKOGT
+        kdQbqi2jpufl2qvt8kT6wyN2DmBGevYVzqa/pprtZpxkxXVs9l5oWCzcsWBs
+        C62h8VQoC8r6rq1LqQZhIVuQGWzMk+mIP4z4ZJlM5u7jyf2YP362L1RldtsF
+        DT9osFDk9olsw5plaEop6hcESYpVJWUkx5TI/VSXbUUsA5NqLG1AZA01tiGM
+        8wjJlIshBXvQufAN+sLvptNrXzHOsbcoi1RI3AOR3whpoD1HpmFXob5SdNLF
+        Wl4pFu55urFE1L5594jLIMXcPfkLEtHG575iFPde5euuK/+u7aRy5f/0xleD
+        4+APz7KeV+4DAAA=
+    http_version: 
+  recorded_at: Wed, 05 Apr 2017 15:22:28 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/zui87wsu8q80/entries
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/2.0.0
+      Authorization:
+      - Bearer 64ff902c58cd14ea063d3ded810d1111a0266537e9aba283bad3319b1762c302
+      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:
+      - '"8a73a5579355b16a76b6c6827be4cb40"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 8c83e246e7803d22fb0a7f97f684952b
+      Content-Length:
+      - '735'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Apr 2017 15:22:29 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '315'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-lax8649-LAX
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1491405749.281463,VS0,VE0
+      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": "zui87wsu8q80"
+                  }
+                },
+                "id": "dzNHzcQaVGwgouGswEoSm",
+                "type": "Entry",
+                "createdAt": "2017-04-05T15:15:27.632Z",
+                "updatedAt": "2017-04-05T15:15:27.632Z",
+                "revision": 1,
+                "contentType": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "ContentType",
+                    "id": "test"
+                  }
+                },
+                "locale": "en-US"
+              },
+              "fields": {
+                "integer": 123,
+                "decimal": 12.3
+              }
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 05 Apr 2017 15:22:29 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.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -432,10 +432,12 @@ files:
 - spec/fixtures/vcr_cassettes/asset/select_no_sys.yml
 - 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/bad_request.yml
 - spec/fixtures/vcr_cassettes/content_type.yml
 - spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/entries/issue_117.yml
+- spec/fixtures/vcr_cassettes/entries/issue_125.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry/custom_resource.yml
 - spec/fixtures/vcr_cassettes/entry/include_resolution.yml
@@ -538,10 +540,12 @@ test_files:
 - spec/fixtures/vcr_cassettes/asset/select_no_sys.yml
 - 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/bad_request.yml
 - spec/fixtures/vcr_cassettes/content_type.yml
 - spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/entries/issue_117.yml
+- spec/fixtures/vcr_cassettes/entries/issue_125.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry/custom_resource.yml
 - spec/fixtures/vcr_cassettes/entry/include_resolution.yml