contentful_middleman 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1f2caf1c451b4d1c5775bd1febbf4132438a02c2
-  data.tar.gz: 36e15755edb936f0736c165d035584f12f9b1bb1
+SHA256:
+  metadata.gz: e9ffdf90b11369b5a8889218f9b961c1fb32273b2acf2eae06785e944a27a539
+  data.tar.gz: 47679bc6168d7cfd968a1e226fc01ce25ea4e4e44bcd9ef2a5e128c873bb00c6
 SHA512:
-  metadata.gz: f3a1a10b30f596340df8fc0fc83993a82372f084984266289d682020a072919dec93adf1563de3251bbb7829b1d2c011642192283e6f8e1098a50302818d5332
-  data.tar.gz: 4bd32921dc5d64ffb4254f0d0d5898bdf47105ff8eb5776c546249599a165d628eea2ed8b2cef4a1d93f0f1417277d9ea7822889f0c9e4013f8f15023f8a018c
+  metadata.gz: 275ea6a5292da0585fe3ae0f9cf3b7c23ebf3dcd05eb23966a5b0fedc9078508ea6586f90a7b41d704b69b90aa603c6a6cb10631ddeb818ed3f7d3b0a5ccaf54
+  data.tar.gz: 659f627c6a8b70cce3b29f27ee90c0dc840f34a67834c3c89d888b816646d613548e75536f302f4f71ff95002ae9a606a9c97e59805103ec605a0bb53d5cb284

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 ## Unreleased
 
+## 3.0.1
+### Fixed
+* Allow usage of `use_camel_case` in client options.
+
 ## 3.0.0
 
 This is an atificial version bump, no new features have been added and no breaking change introduced.

data/lib/contentful_middleman/import_task.rb

@@ -6,6 +6,7 @@ module ContentfulMiddleman
       @content_type_mappers = content_type_mappers
       @changed_local_data   = false
       @contentful           = contentful
+      @use_camel_case       = @contentful.options.client_options.fetch(:use_camel_case, false)
     end
 
     def run
@@ -13,7 +14,7 @@ module ContentfulMiddleman
 
       LocalData::Store.new(local_data_files, @space_name).write
 
-      new_version_hash = ContentfulMiddleman::VersionHash.write_for_space_with_entries(@space_name, entries)
+      new_version_hash = ContentfulMiddleman::VersionHash.write_for_space_with_entries(@space_name, entries, @use_camel_case)
 
       @changed_local_data = new_version_hash != old_version_hash
     end
@@ -33,12 +34,18 @@ module ContentfulMiddleman
 
     private
     def local_data_files
+      content_type_key = if @use_camel_case
+                           :contentType
+                         else
+                           :content_type
+                         end
+
       entries.map do |entry|
-        content_type_mapper_class = @content_type_mappers.fetch(entry.sys[:content_type].id, nil)
+        content_type_mapper_class = @content_type_mappers.fetch(entry.sys[content_type_key].id, nil)
 
         next unless content_type_mapper_class
 
-        content_type_name = @content_type_names.fetch(entry.sys[:content_type].id).to_s
+        content_type_name = @content_type_names.fetch(entry.sys[content_type_key].id).to_s
         context = ContentfulMiddleman::Context.new
 
         content_type_mapper = content_type_mapper_class.new(entries, @contentful.options)

data/lib/contentful_middleman/mappers/base.rb

@@ -9,6 +9,9 @@ module ContentfulMiddleman
         @entries = entries
         @options = options
         @children = {}
+        @created_at_key = using_camel_case? ? :createdAt : :created_at
+        @updated_at_key = using_camel_case? ? :updatedAt : :updated_at
+        @content_type_key = using_camel_case? ? :contentType : :content_type
       end
 
       def map(context, entry)
@@ -25,6 +28,10 @@ module ContentfulMiddleman
 
       private
 
+      def using_camel_case?
+        @options.client_options.fetch(:use_camel_case, false)
+      end
+
       def has_multiple_locales?
         @options.cda_query.fetch(:locale, nil) == '*'
       end
@@ -61,8 +68,8 @@ module ContentfulMiddleman
 
       def map_asset_metadata(asset)
         context = Context.new
-        context.updated_at = asset.sys[:updated_at].iso8601 unless asset.sys[:updated_at].nil?
-        context.created_at = asset.sys[:created_at].iso8601 unless asset.sys[:created_at].nil?
+        context.updated_at = asset.sys[@updated_at_key].iso8601 unless asset.sys[@updated_at_key].nil?
+        context.created_at = asset.sys[@created_at_key].iso8601 unless asset.sys[@created_at_key].nil?
         context.id = asset.sys[:id]
 
         context
@@ -87,9 +94,9 @@ module ContentfulMiddleman
 
       def map_entry_metadata(entry)
         context = Context.new
-        context.content_type_id = entry.sys[:content_type].id unless entry.sys[:content_type].nil?
-        context.updated_at = entry.sys[:updated_at].iso8601 unless entry.sys[:updated_at].nil?
-        context.created_at = entry.sys[:created_at].iso8601 unless entry.sys[:created_at].nil?
+        context.content_type_id = entry.sys[@content_type_key].id unless entry.sys[@content_type_key].nil?
+        context.updated_at = entry.sys[@updated_at_key].iso8601 unless entry.sys[@updated_at_key].nil?
+        context.created_at = entry.sys[@created_at_key].iso8601 unless entry.sys[@created_at_key].nil?
         context.id = entry.sys[:id]
 
         context

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/lib/contentful_middleman/version_hash.rb

@@ -10,9 +10,10 @@ module ContentfulMiddleman
         ::File.read(hashfilename_for_space) if File.exist? hashfilename_for_space
       end
 
-      def write_for_space_with_entries(space_name, entries)
+      def write_for_space_with_entries(space_name, entries, use_camel_case = false)
+        updated_at_key = use_camel_case ? :updatedAt : :updated_at
         sorted_entries           = entries.sort {|a, b| a.id <=> b.id}
-        ids_and_revisions_string = sorted_entries.map {|e| "#{e.id}#{e.updated_at}"}.join
+        ids_and_revisions_string = sorted_entries.map {|e| "#{e.id}#{e.public_send(updated_at_key)}"}.join
         entries_hash             = Digest::SHA1.hexdigest( ids_and_revisions_string )
 
         File.open(hashfilename(space_name), 'w') { |file| file.write(entries_hash) }

data/spec/contentful_middleman/import_task_spec.rb

@@ -4,9 +4,10 @@ class ClientDouble
   def entries
     []
   end
-end
 
-class EntryDouble
+  def options
+    OptionsDouble.new
+  end
 end
 
 describe ContentfulMiddleman::ImportTask do

data/spec/contentful_middleman/mappers/base_spec.rb

@@ -160,6 +160,37 @@ describe ContentfulMiddleman::Mapper::Base do
         }
       end
 
+      it 'maps properly when using camel case option' do
+        vcr('entries/map_with_camel_case') {
+          subject = described_class.new entries, OptionsDouble.new(client_options: { use_camel_case: true })
+          expect(context.hashize).to eq ({})
+
+          expected = {
+            :_meta => {
+              :content_type_id=>"test",
+              :updated_at=>"2018-06-14T13:13:17+00:00",
+              :created_at=>"2018-06-14T13:13:17+00:00",
+              :id=>"5xkCBpVmHmS2WwqOW8OSwK"
+            },
+            id: "5xkCBpVmHmS2WwqOW8OSwK",
+            someField: "foobar"
+          }
+
+          client = Contentful::Client.new(
+            space: 'ycz65dz7s75m',
+            access_token: '7790b343268100301696628b99678de6a552c967ded5c448bf9f2cba3de806ca',
+            dynamic_entries: :auto,
+            use_camel_case: true
+          )
+
+          entry = client.entries.first
+
+          subject.map(context, entry)
+
+          expect(context.hashize).to eq(expected)
+        }
+      end
+
       it 'maps entries with multiple locales with nested resources that are also localized' do
         vcr('entries/localized_references_localized_assets') {
           subject = described_class.new entries, OptionsDouble.new(cda_query: {locale: '*'})

data/spec/fixtures/vcr_fixtures/client.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/entries/localized_references.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -117,7 +117,7 @@ http_interactions:
   recorded_at: Thu, 29 Sep 2016 22:30:25 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/entries?locale=*
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/environments/master/entries?locale=*
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/bht13amj0fva/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -119,7 +119,7 @@ http_interactions:
   recorded_at: Wed, 05 Oct 2016 14:33:01 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/bht13amj0fva/entries?locale=*
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/environments/master/entries?locale=*
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/entries/locations.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/v0h47qlgo3zl/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/v0h47qlgo3zl/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -80,7 +80,7 @@ http_interactions:
   recorded_at: Mon, 21 Aug 2017 21:10:22 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/v0h47qlgo3zl/entries?content_type=destination&select=fields.name,fields.coordinates,sys&sys.id=4ik8UErhRmIwomiQs8EUkI
+    uri: https://cdn.contentful.com/spaces/v0h47qlgo3zl/environments/master/entries?content_type=destination&select=fields.name,fields.coordinates,sys&sys.id=4ik8UErhRmIwomiQs8EUkI
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/entries/map_with_camel_case.yml

@@ -0,0 +1,244 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/ycz65dz7s75m/environments/master/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.2.1; platform ruby/2.5.1; os macOS/16;
+      Authorization:
+      - Bearer 7790b343268100301696628b99678de6a552c967ded5c448bf9f2cba3de806ca
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  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,X-Contentful-Enable-Alpha-Feature
+      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:
+      - '"a802c9553879adaad0097a8beedb5ecc"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - b86f4e978f9a1bfee6bc90007bbe9e41
+      Content-Length:
+      - '957'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 14 Jun 2018 13:16:11 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-hhn1532-HHN
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1528982171.382086,VS0,VE270
+      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": "ycz65dz7s75m"
+                  }
+                },
+                "id": "test",
+                "type": "ContentType",
+                "createdAt": "2018-06-14T13:13:07.886Z",
+                "updatedAt": "2018-06-14T13:13:07.886Z",
+                "environment": {
+                  "sys": {
+                    "id": "master",
+                    "type": "Link",
+                    "linkType": "Environment"
+                  }
+                },
+                "revision": 1
+              },
+              "displayField": "someField",
+              "name": "Test",
+              "description": "",
+              "fields": [
+                {
+                  "id": "someField",
+                  "name": "someField",
+                  "type": "Symbol",
+                  "localized": false,
+                  "required": false,
+                  "disabled": false,
+                  "omitted": false
+                }
+              ]
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Thu, 14 Jun 2018 13:16:11 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/ycz65dz7s75m/environments/master/entries
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.2.1; platform ruby/2.5.1; os macOS/16;
+      Authorization:
+      - Bearer 7790b343268100301696628b99678de6a552c967ded5c448bf9f2cba3de806ca
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  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,X-Contentful-Enable-Alpha-Feature
+      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:
+      - '"376db3c86ef859e48397c6520bfcf235"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 6644c1c7f9d2b797077967aa07c407b8
+      Content-Length:
+      - '879'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 14 Jun 2018 13:16:12 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-hhn1526-HHN
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1528982172.794017,VS0,VE278
+      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": "ycz65dz7s75m"
+                  }
+                },
+                "id": "5xkCBpVmHmS2WwqOW8OSwK",
+                "type": "Entry",
+                "createdAt": "2018-06-14T13:13:17.377Z",
+                "updatedAt": "2018-06-14T13:13:17.377Z",
+                "environment": {
+                  "sys": {
+                    "id": "master",
+                    "type": "Link",
+                    "linkType": "Environment"
+                  }
+                },
+                "revision": 1,
+                "contentType": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "ContentType",
+                    "id": "test"
+                  }
+                },
+                "locale": "en-US"
+              },
+              "fields": {
+                "someField": "foobar"
+              }
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Thu, 14 Jun 2018 13:16:12 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_fixtures/entries/nil_file.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/content_types?limit=1000
+    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -79,7 +79,7 @@ http_interactions:
   recorded_at: Tue, 19 Jul 2016 13:49:05 GMT
 - request:
     method: get
-    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/entries?sys.id=6C4T3KAZUWaysA6ooQOWiE
+    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/environments/master/entries?sys.id=6C4T3KAZUWaysA6ooQOWiE
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/entries/repeated_entry.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/a80guayqr8ut/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/a80guayqr8ut/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -90,7 +90,7 @@ http_interactions:
   recorded_at: Tue, 13 Dec 2016 12:56:31 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/a80guayqr8ut/entries?sys.id=DT1yQgZABwuWeY842sGYY
+    uri: https://cdn.contentful.com/spaces/a80guayqr8ut/environments/master/entries?sys.id=DT1yQgZABwuWeY842sGYY
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/helpers/preview.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://preview.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://preview.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -92,7 +92,7 @@ http_interactions:
   recorded_at: Thu, 10 Dec 2015 19:42:11 GMT
 - request:
     method: get
-    uri: https://preview.contentful.com/spaces/cfexampleapi/entries
+    uri: https://preview.contentful.com/spaces/cfexampleapi/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/instance/entries_1.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/instance/entries_2.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -92,7 +92,7 @@ http_interactions:
   recorded_at: Thu, 26 Nov 2015 14:05:49 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?limit=1
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?limit=1
     body:
       encoding: US-ASCII
       string: ''
@@ -176,7 +176,7 @@ http_interactions:
   recorded_at: Thu, 26 Nov 2015 14:05:49 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?limit=1000&order=sys.createdAt&skip=0
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?limit=1000&order=sys.createdAt&skip=0
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/instance/entries_3.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -98,7 +98,7 @@ http_interactions:
   recorded_at: Wed, 07 Sep 2016 22:51:13 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?limit=1
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?limit=1
     body:
       encoding: US-ASCII
       string: ''
@@ -213,7 +213,7 @@ http_interactions:
   recorded_at: Wed, 07 Sep 2016 22:51:13 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?limit=100&order=sys.createdAt&skip=0
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?limit=100&order=sys.createdAt&skip=0
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/instance/include_resolution_1.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -97,7 +97,7 @@ http_interactions:
   recorded_at: Thu, 27 Apr 2017 13:45:07 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?sys.id=nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/mappers/entries.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -321,7 +321,7 @@ http_interactions:
   recorded_at: Wed, 02 Dec 2015 18:20:27 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/mappers/entries_localized.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''
@@ -321,7 +321,7 @@ http_interactions:
   recorded_at: Wed, 02 Dec 2015 18:20:29 GMT
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?include=1&locale=*
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?include=1&locale=*
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/asset.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets/nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets/nyancat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/asset_2.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets/happycat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets/happycat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/assets.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/assets_2.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/assets?order=sys.createdAt
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/assets?order=sys.createdAt
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/entries.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/entries_2.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?content_type=cat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/environments/master/entries?content_type=cat
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_fixtures/tools/preview_helper/entry.yml

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

data/spec/fixtures/vcr_fixtures/tools/preview_helper/entry_2.yml

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

data/spec/spec_helper.rb

@@ -85,13 +85,20 @@ end
 class EntryDouble
   attr_reader :id, :sys, :fields
 
-  def initialize(id, sys_data = {}, fields = {}, updated_at = nil)
+  def initialize(id, sys_data = {}, fields = {}, updated_at = nil, camel_case = false)
     @id = id
     sys_data[:id] = id
-    sys_data[:updated_at] = updated_at
-    sys_data[:content_type] = ContentTypeDouble.new("#{id}_ct")
+    sys_data[camel_case ? :updatedAt : :updated_at] = updated_at
+    sys_data[camel_case ? :contentType : :content_type] = ContentTypeDouble.new("#{id}_ct")
     @sys = sys_data
     @fields = fields
+    @camel_case = camel_case
+
+    sys_data.each do |k, v|
+      define_singleton_method k do
+        v
+      end
+    end
 
     unless fields.nil?
       fields.each do |k, v|
@@ -101,8 +108,4 @@ class EntryDouble
       end
     end
   end
-
-  def updated_at
-    sys[:updated_at]
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -259,6 +259,7 @@ files:
 - spec/fixtures/vcr_fixtures/entries/localized_references.yml
 - spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml
 - spec/fixtures/vcr_fixtures/entries/locations.yml
+- spec/fixtures/vcr_fixtures/entries/map_with_camel_case.yml
 - spec/fixtures/vcr_fixtures/entries/nil_file.yml
 - spec/fixtures/vcr_fixtures/entries/repeated_entry.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
@@ -298,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Include mangablable content from the Contentful CMS and API into your Middleman
@@ -326,6 +327,7 @@ test_files:
 - spec/fixtures/vcr_fixtures/entries/localized_references.yml
 - spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml
 - spec/fixtures/vcr_fixtures/entries/locations.yml
+- spec/fixtures/vcr_fixtures/entries/map_with_camel_case.yml
 - spec/fixtures/vcr_fixtures/entries/nil_file.yml
 - spec/fixtures/vcr_fixtures/entries/repeated_entry.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml