contentful 1.2.2 → 2.0.0

data/spec/fixtures/vcr_cassettes/unauthorized.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/wrong/entries/nyancat
+    uri: https://cdn.contentful.com/spaces/wrong/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/unavailable.yml

@@ -2,17 +2,21 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/wrong/entries/nyancat
+    uri: https://cdn.contentful.com/spaces/wrong/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - RubyContentfulGem/0.1.1
+      - RubyContentfulGem/1.2.0
       Authorization:
       - Bearer credentials
       Content-Type:
       - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
       Host:
       - cdn.contentful.com
   response:
@@ -20,45 +24,53 @@ http_interactions:
       code: 503
       message: ServiceUnavailable
     headers:
-      Date:
-      - Wed, 16 Apr 2014 09:00:24 GMT
-      Server:
-      - nginx/1.1.19
       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
+      - 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
+      Server:
+      - Contentful
+      X-Contentful-Request-Id:
+      - 2c869757aa2dca0bddce49574f85e62b
       Content-Length:
-      - '179'
+      - '198'
       Accept-Ranges:
       - bytes
+      Date:
+      - Tue, 20 Dec 2016 16:27:17 GMT
       Via:
       - 1.1 varnish
+      Connection:
+      - close
       X-Served-By:
-      - cache-am72-AMS
+      - cache-fra1238-FRA
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
+      X-Timer:
+      - S1482251237.033636,VS0,VE114
     body:
-      encoding: UTF-8
+      encoding: ASCII-8BIT
       string: |
         {
           "sys": {
             "type": "Error",
-            "id": "ServiceUnavailable"
+            "id": "AccessTokenInvalid"
           },
-          "message": "Service Unavailable, contenful.com API seems to be down",
-          "requestId": "85f-649640521"
+          "message": "The access token you sent could not be found or is invalid.",
+          "requestId": "2c869757aa2dca0bddce49574f85e62b"
         }
     http_version: 
-  recorded_at: Wed, 16 Apr 2014 09:00:24 GMT
-recorded_with: VCR 2.9.0
+  recorded_at: Tue, 20 Dec 2016 16:27:17 GMT
+recorded_with: VCR 3.0.3

data/spec/link_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Contentful::Link do
+  let(:client) { create_client }
   let(:entry) { vcr('entry') { create_client.entry('nyancat') } }
   let(:link) { entry.space }
   let(:content_type_link) { entry.content_type }
@@ -27,13 +28,13 @@ describe Contentful::Link do
   describe '#resolve' do
     it 'queries the api for the resource' do
       vcr('space')do
-        expect(link.resolve).to be_a Contentful::Space
+        expect(link.resolve(client)).to be_a Contentful::Space
       end
     end
 
     it 'queries the api for the resource (different link object)' do
       vcr('content_type')do
-        expect(content_type_link.resolve).to be_a Contentful::ContentType
+        expect(content_type_link.resolve(client)).to be_a Contentful::ContentType
       end
     end
   end

data/spec/locale_spec.rb

@@ -4,11 +4,6 @@ describe Contentful::Locale do
   let(:locale) { vcr('locale') { create_client.space.locales.first } }
 
   describe 'Properties' do
-    it 'has a #properties getter returning a hash with symbol keys' do
-      expect(locale.properties).to be_a Hash
-      expect(locale.properties.keys.sample).to be_a Symbol
-    end
-
     it 'has #code' do
       expect(locale.code).to eq 'en-US'
     end

data/spec/location_spec.rb

@@ -12,11 +12,6 @@ describe Contentful::Location do
   end
 
   describe 'Properties' do
-    it 'has a #properties getter returning a hash with symbol keys' do
-      expect(location.properties).to be_a Hash
-      expect(location.properties.keys.sample).to be_a Symbol
-    end
-
     it 'has #lat' do
       expect(location.lat).to be_a Float
       expect(location.lat.to_i).to eq 36
@@ -24,7 +19,7 @@ describe Contentful::Location do
 
     it 'has #lon' do
       expect(location.lon).to be_a Float
-      expect(location.lon.to_i).to eq -94
+      expect(location.lon.to_i).to eq(-94)
     end
   end
 end

data/spec/request_spec.rb

@@ -4,10 +4,11 @@ describe Contentful::Request do
   describe '#get' do
     it 'calls client' do
       client = create_client
-      stub(client).get
       request = Contentful::Request.new(client, '/content_types', nil, 'nyancat')
+
+      expect(client).to receive(:get).with(request)
+
       request.get
-      expect(client).to have_received.get(request)
     end
   end
 

data/spec/resource_building_spec.rb

@@ -2,27 +2,30 @@ require 'spec_helper'
 
 describe 'Resource Building Examples' do
   it 'can deal with arrays' do
-    response = Contentful::Response.new raw_fixture('link_array')
-    resource = Contentful::ResourceBuilder.new(create_client, response).run
+    request = Contentful::Request.new(nil, 'entries')
+    response = Contentful::Response.new(raw_fixture('link_array'), request)
+    resource = Contentful::ResourceBuilder.new(response.object).run
 
     expect(resource.fields[:links]).to be_a Array
     expect(resource.fields[:links].first).to be_a Contentful::Link
   end
 
   it 'replaces links with included versions if present' do
-    response = Contentful::Response.new raw_fixture('includes')
-    resource = Contentful::ResourceBuilder.new(create_client, response).run.first
+    request = Contentful::Request.new(nil, 'entries')
+    response = Contentful::Response.new(raw_fixture('includes'), request)
+    resource = Contentful::ResourceBuilder.new(response.object).run.first
 
     expect(resource.fields[:links]).to be_a Array
     expect(resource.fields[:links].first).to be_a Contentful::Entry
   end
 
   it 'can also reference itself' do
-    response = Contentful::Response.new raw_fixture('self_link')
-    resource = Contentful::ResourceBuilder.new(create_client, response).run.first
+    request = Contentful::Request.new(nil, 'entries')
+    response = Contentful::Response.new(raw_fixture('self_link'), request)
+    resource = Contentful::ResourceBuilder.new(response.object).run.first
 
     other_resource = resource.fields[:e]
     expect(other_resource).to be_a Contentful::Entry
-    expect(other_resource.fields[:e]).to be resource
+    expect(other_resource.fields[:e]).to eq resource
   end
 end

data/spec/response_spec.rb

@@ -38,7 +38,7 @@ describe Contentful::Response do
 
     it 'returns :error for responses without content' do
       raw_response = ''
-      stub(raw_response).status { 204 }
+      allow(raw_response).to receive(:status) { 204 }
       no_content_response = Contentful::Response.new raw_response
       expect(no_content_response.status).to eq :no_content
     end

data/spec/space_spec.rb

@@ -19,11 +19,6 @@ describe Contentful::Space do
   end
 
   describe 'Properties' do
-    it 'has a #properties getter returning a hash with symbol keys' do
-      expect(space.properties).to be_a Hash
-      expect(space.properties.keys.sample).to be_a Symbol
-    end
-
     it 'has #name' do
       expect(space.name).to eq 'Contentful Example API'
     end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rspec'
 require 'contentful'
 require 'securerandom'

data/spec/support/json_responses.rb

@@ -2,9 +2,9 @@ require 'multi_json'
 
 def raw_fixture(which, status = 200, _as_json = false)
   object = Object.new
-  stub(object).status { status }
-  stub(object).headers { {} }
-  stub(object).to_s { File.read File.dirname(__FILE__) + "/../fixtures/json_responses/#{which}.json" }
+  allow(object).to receive(:status) { status }
+  allow(object).to receive(:headers) { {} }
+  allow(object).to receive(:to_s) { File.read File.dirname(__FILE__) + "/../fixtures/json_responses/#{which}.json" }
 
   object
 end

data/spec/sync_page_spec.rb

@@ -16,14 +16,9 @@ describe Contentful::SyncPage do
   end
 
   describe 'Properties' do
-    it 'has a #properties getter returning a hash with symbol keys' do
-      expect(page.properties).to be_a Hash
-      expect(page.properties.keys.sample).to be_a Symbol
-    end
-
     it 'has #items which contain resources' do
       expect(page_with_more.items).to be_a Array
-      expect(page_with_more.items.sample).to be_a Contentful::Resource
+      expect(page_with_more.items.sample).to be_a Contentful::BaseResource
     end
   end
 

data/spec/sync_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Contentful::Sync do
+  before :each do
+    Contentful::ContentTypeCache.clear!
+  end
+
   let(:first_page) do
     vcr('sync_page')do
       create_client.sync(initial: true).first_page
@@ -76,7 +80,7 @@ describe Contentful::Sync do
       sync = create_client.sync(initial: true)
       vcr('sync_page'){ vcr('sync_page_2'){
         sync.each_item do |item|
-          expect(item).to be_a Contentful::Resource
+          expect(item).to be_a Contentful::BaseResource
         end
       }}
     end
@@ -88,12 +92,12 @@ describe Contentful::Sync do
       vcr('sync_page') {
         asset = sync.first_page.items.select { |item| item.is_a?(Contentful::Asset) }.first
 
-        expect(asset.file.properties[:fileName]).to eq 'doge.jpg'
-        expect(asset.file.properties[:contentType]).to eq 'image/jpeg'
-        expect(asset.file.properties[:details]['image']['width']).to eq 5800
-        expect(asset.file.properties[:details]['image']['height']).to eq 4350
-        expect(asset.file.properties[:details]['size']).to eq 522943
-        expect(asset.file.properties[:url]).to eq '//images.contentful.com/cfexampleapi/1x0xpXu4pSGS4OukSyWGUK/cc1239c6385428ef26f4180190532818/doge.jpg'
+        expect(asset.file.file_name).to eq 'doge.jpg'
+        expect(asset.file.content_type).to eq 'image/jpeg'
+        expect(asset.file.details['image']['width']).to eq 5800
+        expect(asset.file.details['image']['height']).to eq 4350
+        expect(asset.file.details['size']).to eq 522943
+        expect(asset.file.url).to eq '//images.contentful.com/cfexampleapi/1x0xpXu4pSGS4OukSyWGUK/cc1239c6385428ef26f4180190532818/doge.jpg'
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -255,25 +269,66 @@ files:
 - RELEASE.md
 - Rakefile
 - contentful.gemspec
+- coverage/.last_run.json
+- coverage/.resultset.json
+- coverage/.resultset.json.lock
+- coverage/assets/0.10.0/application.css
+- coverage/assets/0.10.0/application.js
+- coverage/assets/0.10.0/colorbox/border.png
+- coverage/assets/0.10.0/colorbox/controls.png
+- coverage/assets/0.10.0/colorbox/loading.gif
+- coverage/assets/0.10.0/colorbox/loading_background.png
+- coverage/assets/0.10.0/favicon_green.png
+- coverage/assets/0.10.0/favicon_red.png
+- coverage/assets/0.10.0/favicon_yellow.png
+- coverage/assets/0.10.0/loading.gif
+- coverage/assets/0.10.0/magnify.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_222222_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_454545_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_888888_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/index.html
 - doc/Contentful.html
 - doc/Contentful/AccessDenied.html
 - doc/Contentful/Array.html
+- doc/Contentful/ArrayCoercion.html
+- doc/Contentful/ArrayLike.html
 - doc/Contentful/Asset.html
 - doc/Contentful/BadRequest.html
+- doc/Contentful/BaseCoercion.html
+- doc/Contentful/BaseResource.html
+- doc/Contentful/BooleanCoercion.html
 - doc/Contentful/Client.html
 - doc/Contentful/Constants.html
 - doc/Contentful/ContentType.html
+- doc/Contentful/ContentTypeCache.html
+- doc/Contentful/DateCoercion.html
 - doc/Contentful/DeletedAsset.html
 - doc/Contentful/DeletedEntry.html
 - doc/Contentful/DynamicEntry.html
 - doc/Contentful/Entry.html
 - doc/Contentful/Error.html
 - doc/Contentful/Field.html
+- doc/Contentful/FieldsResource.html
 - doc/Contentful/File.html
+- doc/Contentful/FloatCoercion.html
+- doc/Contentful/IntegerCoercion.html
 - doc/Contentful/Link.html
+- doc/Contentful/LinkCoercion.html
 - doc/Contentful/Locale.html
 - doc/Contentful/Location.html
+- doc/Contentful/LocationCoercion.html
 - doc/Contentful/NotFound.html
+- doc/Contentful/ObjectCoercion.html
 - doc/Contentful/RateLimitExceeded.html
 - doc/Contentful/Request.html
 - doc/Contentful/Resource.html
@@ -292,9 +347,12 @@ files:
 - doc/Contentful/ServerError.html
 - doc/Contentful/ServiceUnavailable.html
 - doc/Contentful/Space.html
+- doc/Contentful/StringCoercion.html
 - doc/Contentful/Support.html
+- doc/Contentful/SymbolCoercion.html
 - doc/Contentful/Sync.html
 - doc/Contentful/SyncPage.html
+- doc/Contentful/TextCoercion.html
 - doc/Contentful/Unauthorized.html
 - doc/Contentful/UnparsableJson.html
 - doc/Contentful/UnparsableResource.html
@@ -315,34 +373,29 @@ files:
 - doc/method_list.html
 - doc/top-level-namespace.html
 - examples/custom_classes.rb
-- examples/dynamic_entries.rb
 - examples/example_queries.rb
 - examples/raise_errors.rb
 - examples/raw_mode.rb
-- examples/resource_mapping.rb
 - lib/contentful.rb
 - lib/contentful/array.rb
+- lib/contentful/array_like.rb
 - lib/contentful/asset.rb
+- lib/contentful/base_resource.rb
 - lib/contentful/client.rb
-- lib/contentful/constants.rb
+- lib/contentful/coercions.rb
 - lib/contentful/content_type.rb
+- lib/contentful/content_type_cache.rb
 - lib/contentful/deleted_asset.rb
 - lib/contentful/deleted_entry.rb
-- lib/contentful/dynamic_entry.rb
 - lib/contentful/entry.rb
 - lib/contentful/error.rb
 - lib/contentful/field.rb
+- lib/contentful/fields_resource.rb
 - lib/contentful/file.rb
 - lib/contentful/link.rb
 - lib/contentful/locale.rb
 - lib/contentful/location.rb
 - lib/contentful/request.rb
-- lib/contentful/resource.rb
-- lib/contentful/resource/array_like.rb
-- lib/contentful/resource/asset_fields.rb
-- lib/contentful/resource/custom_resource.rb
-- lib/contentful/resource/fields.rb
-- lib/contentful/resource/system_properties.rb
 - lib/contentful/resource_builder.rb
 - lib/contentful/response.rb
 - lib/contentful/space.rb
@@ -355,11 +408,9 @@ files:
 - spec/auto_includes_spec.rb
 - spec/client_class_spec.rb
 - spec/client_configuration_spec.rb
-- spec/coercions_spec.rb
 - spec/content_type_spec.rb
 - spec/deleted_asset_spec.rb
 - spec/deleted_entry_spec.rb
-- spec/dynamic_entry_spec.rb
 - spec/entry_spec.rb
 - spec/error_class_spec.rb
 - spec/error_requests_spec.rb
@@ -387,6 +438,7 @@ files:
 - spec/fixtures/vcr_cassettes/entries/issue_117.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry/custom_resource.yml
+- spec/fixtures/vcr_cassettes/entry/include_resolution.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
@@ -424,7 +476,6 @@ files:
 - spec/location_spec.rb
 - spec/request_spec.rb
 - spec/resource_building_spec.rb
-- spec/resource_spec.rb
 - spec/response_spec.rb
 - spec/space_spec.rb
 - spec/spec_helper.rb
@@ -463,11 +514,9 @@ test_files:
 - spec/auto_includes_spec.rb
 - spec/client_class_spec.rb
 - spec/client_configuration_spec.rb
-- spec/coercions_spec.rb
 - spec/content_type_spec.rb
 - spec/deleted_asset_spec.rb
 - spec/deleted_entry_spec.rb
-- spec/dynamic_entry_spec.rb
 - spec/entry_spec.rb
 - spec/error_class_spec.rb
 - spec/error_requests_spec.rb
@@ -495,6 +544,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/entries/issue_117.yml
 - spec/fixtures/vcr_cassettes/entry.yml
 - spec/fixtures/vcr_cassettes/entry/custom_resource.yml
+- spec/fixtures/vcr_cassettes/entry/include_resolution.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
@@ -532,7 +582,6 @@ test_files:
 - spec/location_spec.rb
 - spec/request_spec.rb
 - spec/resource_building_spec.rb
-- spec/resource_spec.rb
 - spec/response_spec.rb
 - spec/space_spec.rb
 - spec/spec_helper.rb