contentful 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c2a767a88bc7cf15bde4fcc9173611d0c2a116
-  data.tar.gz: d99bee10915e4128e254b9f41fb4ad8472ec2f83
+  metadata.gz: 0113f1da37746a15f2e342b3d7248ea3edffce5e
+  data.tar.gz: a3c9f048f5f9a8fd6dc2ecf978af27c2dc986952
 SHA512:
-  metadata.gz: e0118fccbdb2a308c14b89748a5f9fdc42f32bf1593e6917897e2edb0613ea98843fdb47dda3642a722a475dad7f75df4297c9500638e185e14109b52a829532
-  data.tar.gz: e6c7aff051696aa83e5c9fa0d52c021bffec3535c04e45650f0b00d4dcf4364f0d18089010af3fd5b11153851b25e64c59e9e359eb75da7034d51fce7f40e394
+  metadata.gz: 79d39379d1187ab7037fb11000ca0233ff0c101c855a6ef01e651244ec0516e49822a5afd1e5d9b94fa9c20d487fa13bbd51c9abeff7467e6b84ca0930a96a2a
+  data.tar.gz: 84443697de10d3b27db87d08f7fd5b5385de83bfd32e44bdc3c58e8374f127772becb209e1e155e85957cf61aaa6fe20c7c4921d9d781df02a8c9b1a0f4ec0bf

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,8 +1,48 @@
 # Change Log
+
 ## Unreleased
 
-## 0.12.0
+## 1.0.0
+
+**ATTENTION**: Breaking changes on how JSON Fields are parsed. All keys are now symbolized, including
+nested hashes. Parsing errors have been fixed, particularly for `array`, `null` and `boolean` present on the first
+level of the JSON field. Also, on release 0.11.0, it was fixed that JSON Fields were being treated as locales.
+This change increases consistency for the SDK, treating everything the same way. We strive for consistency and
+quality in our tools.
+
+The following `diff` shows previous and current state. This is the contents of the JSON Field we test this feature against.
+
+```diff
+- {:null=>"",
+-  :text=>"some text",
+-  :array=>"[1, 2, 3]",
+-  :number=>123,
+-  :object=>
+-   {"null"=>nil,
+-    "text"=>"bar",
+-    "array"=>[1, 2, 3],
+-    "number"=>123,
+-    "object"=>{"foo"=>"bar"},
+-    "boolean"=>false},
+-  :boolean=>"true"}
++ {:null=>nil,
++  :text=>"some text",
++  :array=>[1, 2, 3],
++  :number=>123,
++  :object=>
++   {:null=>nil,
++   :text=>"bar",
++   :array=>[1, 2, 3],
++   :number=>123,
++   :object=>{:foo=>"bar"},
++   :boolean=>false},
++  :boolean=>true}
+```
 
+### Fixed
+* Fixed JSON Field Parsing [#96](https://github.com/contentful/contentful.rb/issues/96)
+
+## 0.12.0
 ### Added
 * Added Rate Limit automatic handling
 

data/contentful.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.summary       = 'contentful'
   gem.description   = 'Ruby client for the https://www.contentful.com Content Delivery API'
   gem.license       = 'MIT'
-  gem.authors       = ['Contentful GmbH (Jan Lelis)', 'Contentful GmbH (Andreas Tiefenthaler)']
+  gem.authors       = ['Contentful GmbH (Jan Lelis)', 'Contentful GmbH (Andreas Tiefenthaler)', 'Contentful GmbH (David Litvak Bruno)']
   gem.email         = 'rubygems@contentful.com'
   gem.homepage      = 'https://github.com/contentful/contentful.rb'
 

data/lib/contentful/resource.rb

@@ -178,7 +178,7 @@ module Contentful
         value.map { |v| coerce_or_create_class(v, what) }
       elsif should_coerce_hash?(value)
         ::Hash[value.map do |k, v|
-          to_coerce = v.is_a?(Hash) ? v : v.to_s
+          to_coerce = pre_coerce(v)
           coercion = v.is_a?(Numeric) ? v : coerce_or_create_class(to_coerce, what)
           [k.to_sym, coercion]
         end]
@@ -187,6 +187,23 @@ module Contentful
       end
     end
 
+    def pre_coerce(value)
+      case value
+      when Numeric, true, false, nil
+        value
+      when Hash
+        result = {}
+        value.each_key do |k|
+          result[k.to_sym] = pre_coerce(value[k])
+        end
+        result
+      when ::Array
+        value.map { |e| pre_coerce(e) }
+      else
+        value.to_s
+      end
+    end
+
     def should_coerce_hash?(value)
       value.is_a?(::Hash) &&
         !is_a?(Asset) &&

data/lib/contentful/version.rb

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

data/spec/dynamic_entry_spec.rb

@@ -31,4 +31,45 @@ describe Contentful::DynamicEntry do
       expect(nyancat.birthday).to be_a DateTime
     end
   end
+
+  describe 'issues' do
+    describe 'JSON Fields should not be treated as locale data - #96' do
+      before do
+        vcr('entry/json_objects_client') {
+          @client = create_client(
+            space: 'h425t6gef30p',
+            access_token: '278f7aa72f2eb90c0e002d60f85bf2144c925acd2d37dd990d3ca274f25076cf',
+            dynamic_entries: :auto
+          )
+
+        }
+        vcr('entry/json_objects') {
+          @entry = @client.entries.first
+        }
+      end
+
+      it 'only has default locale' do
+        expect(@entry.instance_variable_get(:@fields).keys).to eq ['en-US']
+      end
+
+      it 'can obtain all values properly' do
+        expect(@entry.name).to eq('Test')
+        expect(@entry.object_test).to eq({
+          null: nil,
+          text: 'some text',
+          array: [1, 2, 3],
+          number: 123,
+          boolean: true,
+          object: {
+            null: nil,
+            text: 'bar',
+            array: [1, 2, 3],
+            number: 123,
+            boolean: false,
+            object: {foo: 'bar'}
+          }
+        })
+      end
+    end
+  end
 end

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

@@ -0,0 +1,88 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/h425t6gef30p/entries
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.12.0
+      Authorization:
+      - Bearer 278f7aa72f2eb90c0e002d60f85bf2144c925acd2d37dd990d3ca274f25076cf
+      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
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"ef08daf55d889bfac04481b2b1c2df2d"
+      Server:
+      - nginx
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 4c3-1865000018
+      Content-Length:
+      - '452'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Tue, 23 Aug 2016 16:02:57 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7124-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA61TO2/CMBDe+RWR54KcJygbRaiq6BaqSq0YTGJal8SOHKdq
+        hPjv9TmEOAjapR4S3/u783eHkeOgqqlQ7Bz0VQuqKamW0FxK0iCtO96BjxKK
+        5FrvGqnas1IL2Ag5K5gCE25lpmgBCd9MwjbtRRVTqSpJCqU6j1ZpYQGFUXaY
+        nhjfI6jZH12d79cnzInJeOHAMmjnI/BCFb3TnY9L6Ko7x/Pd9Nke1MYEUXKP
+        V9M6Ch7Zw2qReC9LESRW/jOwJVeysQ2ppETRbA5zQR52ozGejT1/7YZxEMTu
+        dBLO8KsdUJfZrYDQjz08wcFsECDpF6uY4LqAZyFPBVeUq9NE/m+0Cyvv1QGL
+        7SdN1ZpW6u/x5iIluWEZ5ePnpAs4vwDaMZpnPSnhVRAnhQkxJayOrcIXXOJ1
+        DpSFnw0ZKfpt3qUSBXWMMDATw/yOvx0nDPH7Y80clL5l3Ayy8brYUqnTuZ4/
+        MLS4tcF+JOjzOmpYgxPuLZGXJL+O2WnX9RfcQ+SOM8BuwFxHr0038GvLTggY
+        L8AczMzaMICEtkLklACDdySvqL2Vg0n1fkrWvVu3uu0fvpvRcfQDnv3xztIE
+        AAA=
+    http_version: 
+  recorded_at: Tue, 23 Aug 2016 16:02:58 GMT
+recorded_with: VCR 3.0.3

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

@@ -0,0 +1,86 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/h425t6gef30p/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.12.0
+      Authorization:
+      - Bearer 278f7aa72f2eb90c0e002d60f85bf2144c925acd2d37dd990d3ca274f25076cf
+      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
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"eb9d46f11dd1b96e6e6323d12c51b2bb"
+      Server:
+      - nginx
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - ddd-1897159726
+      Content-Length:
+      - '373'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Tue, 23 Aug 2016 16:02:57 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7121-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA8VSPW/CMBDd+RXIc6kSAqhlQ5U6Ve0AUytUmeRorzixa5tK
+        KeK/12eT4FAYOtVLcl/v3ru7Xa/fZ6Y2bNrfuV9n2FqBs9hMa14z59tfUY6V
+        lgvnT71lNqickXhDYImWQkkSHGihJMQXjxhwT9r4VkbxnHo1GcEZkSGHdzak
+        HrDaMGp6fK59tVkcSM894kkCFqTnfTQc28kbrLNEkazm7dt/LzQ8Fmrk6gNy
+        uwBjI8yWzJ2sLFTW945Kcw3cQjGjkbBhkk4Gyc1gmC3S8XSUTrPsenSbPscF
+        W1X8rUDDFxqUFc38QLnlzgo0SvD6HkF43RUvj/SC5bxPv5WxAkyuUdmAzFqK
+        bE1Yx4XSiDorC8PqNKKcttljTMFHmn3O63IlRWdhTMicC/wGYr/mwkC8Tqbh
+        c4v6QtBp5ytxISjdlbq9NKjn1n5G1dkTiLSF+Kvt3kgkMUz6nyUexC79ly5+
+        2dv3fgBbrE0p/AMAAA==
+    http_version: 
+  recorded_at: Tue, 23 Aug 2016 16:02:57 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
 - Contentful GmbH (Andreas Tiefenthaler)
+- Contentful GmbH (David Litvak Bruno)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -388,6 +389,8 @@ files:
 - spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry/custom_resource.yml
+- spec/fixtures/vcr_cassettes/entry/json_objects.yml
+- spec/fixtures/vcr_cassettes/entry/json_objects_client.yml
 - spec/fixtures/vcr_cassettes/entry/marshall.yml
 - spec/fixtures/vcr_cassettes/entry/raw.yml
 - spec/fixtures/vcr_cassettes/entry_cache.yml
@@ -445,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: contentful
@@ -482,6 +485,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry/custom_resource.yml
+- spec/fixtures/vcr_cassettes/entry/json_objects.yml
+- spec/fixtures/vcr_cassettes/entry/json_objects_client.yml
 - spec/fixtures/vcr_cassettes/entry/marshall.yml
 - spec/fixtures/vcr_cassettes/entry/raw.yml
 - spec/fixtures/vcr_cassettes/entry_cache.yml