contentful_middleman 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e9ffdf90b11369b5a8889218f9b961c1fb32273b2acf2eae06785e944a27a539
-  data.tar.gz: 47679bc6168d7cfd968a1e226fc01ce25ea4e4e44bcd9ef2a5e128c873bb00c6
+SHA1:
+  metadata.gz: e51a2eac628788ddb604e97937212f087b37e0ab
+  data.tar.gz: 45ee41c807a5d790d4e5a997db1f7004fa1f4adf
 SHA512:
-  metadata.gz: 275ea6a5292da0585fe3ae0f9cf3b7c23ebf3dcd05eb23966a5b0fedc9078508ea6586f90a7b41d704b69b90aa603c6a6cb10631ddeb818ed3f7d3b0a5ccaf54
-  data.tar.gz: 659f627c6a8b70cce3b29f27ee90c0dc840f34a67834c3c89d888b816646d613548e75536f302f4f71ff95002ae9a606a9c97e59805103ec605a0bb53d5cb284
+  metadata.gz: d9db96ccef66c5c8d299aea7fbd3e34b5ebea4b4e70e903ca87a2388bd7e73527885068a3c28ea9b1578c8828543065ac3be50a5a4af28cfb304455166119e84
+  data.tar.gz: c8e1c9569519691d2c5c0d55ca9f647da672545c658b4785abdd7528343efa9bf3e9d21e70920b4e42be84d6e73f5584865e29a80402730618e770ca79ce5ee7

data/.travis.yml

@@ -1,12 +1,19 @@
 rvm:
-  - 2.2.3
-  - 2.3.1
-  - 2.4.1
+  - 2.2.2
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - jruby
 
 script: "bundle exec rake test"
 
 before_install: gem install bundler -v 1.10.6
 
+env: TEST=true JRUBY_OPTS='--2.0'
 notifications:
   slack:
     secure: MMWxqKMT4m2UhZ+Ix4wgCs1nLvu9hUFCbyV/qJWmIFif7V4GUKXi6h9krMqGqBAd3YV3pP/InPlw3QoKBUGIAIr5GzDpSnU5ACv7E61v548qViEvPBqsfhRHha2M164rUHn32tpejJnIizVUyND/hIzNviIrab+G8uOaZXUtB5I=
+
+matrix:
+  allow_failures:
+    - rvm: jruby

data/CHANGELOG.md

@@ -1,9 +1,12 @@
 # Change Log
 ## Unreleased
 
-## 3.0.1
-### Fixed
-* Allow usage of `use_camel_case` in client options.
+## 4.0.0
+
+### Changed
+* Middleman v4 is now the supported Middleman version.
+
+This release symbolises the break in compatibility from Middleman v3 - moving the main development branch to Middleman v4.
 
 ## 3.0.0
 
@@ -34,11 +37,11 @@ will stay compatible with.
 
 ## 2.0.0
 
-## Changed
+### Changed
 * Upgraded to 2.0.1 Ruby CDA SDK which solves a number of pre-existing bugs [#116](https://github.com/contentful/contentful_middleman/issues/116) [#113](https://github.com/contentful/contentful_middleman/issues/113) [#103](https://github.com/contentful/contentful_middleman/issues/103)
 * Field IDs will now be `snake_cased` following the 2.0.1 Ruby CDA SDK Upgrade
 
-## Added
+### Added
 * Added `_meta` to all entries and assets [#117](https://github.com/contentful/contentful_middleman/issues/117) [#93](https://github.com/contentful/contentful_middleman/issues/93)
 * Added `client_options` to extension options to control Client instantiation
 

data/DEPLOYING.md

@@ -21,24 +21,6 @@
 
 ---
 
-# Netlify
-
-## Requirements for Build
-
-> Minimum requirements for a clean build of a Contentful Middleman app on Netlify
-
-Steps to solve:
-
-1. add `.*-space-hash` to .gitignore
-2. add `/data` to .gitignore
-3. add a .ruby-version file
-4. add a .nvmrc file
-5. Netlify Site > Settings > Deploy Settings > Build Command: `middleman contentful --rebuild && middleman build`
-
-> Contributed by @joshRpowell
-
----
-
 # Placeholder Platform
 
 ## Placeholder Caveat

data/Gemfile

@@ -2,7 +2,8 @@
 # the following line to use "https"
 source 'http://rubygems.org'
 
-gem "middleman-core", '~> 3.4'
+gem "middleman-core", '~> 4.0'
+gem "middleman-cli", '~> 4.0'
 
 # Specify your gem's dependencies in contentful_middleman.gemspec
 gemspec

data/README.md

@@ -6,10 +6,9 @@ Contentful Middleman is a [Middleman](http://middlemanapp.com/) extension to use
 
 Experience the power of Middleman while staying sane as a developer by letting end-users edit content in a web-based interface.
 
-> The main release works for Middleman v3 - The most used version
+> The main release works for Middleman v4 starting on version `4.0.0`.
 >
-> If you are using Middleman v4, consider trying out our [experimental branch](https://github.com/contentful/contentful_middleman/tree/dl/upgrade-to-v4).
-> Feel free to communicate with us if you are experiencing any bugs.
+> If you are using Middleman v3, use older releases. Latest stable release is `3.0.0`
 
 
 ## Installation

data/contentful_middleman.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # The version of middleman-core your extension depends on
-  s.add_dependency("middleman-core", ["~> 3.4"])
+  s.add_dependency("middleman-core", ["~> 4.0"])
+  s.add_dependency("middleman-cli", ["~> 4.0"])
 
   # Additional dependencies
   s.add_dependency("contentful", '~> 2.1')

data/examples/mappers/backref.rb

@@ -48,7 +48,7 @@ def self.BackrefMapper(content_type_id, content_type_field, backref_field)
 
     def map(context, entry)
       super
-      content_type_entries = @entries.select { |e| e.sys[:content_type].id == @@content_type_id }
+      content_type_entries = @entries.select { |e| e.sys[:contentType].id == @@content_type_id }
       referencing_entries = content_type_entries.select{ |e| e.send(@@content_type_field).map{|x| x.id}.include? entry.id }
       referencing_ids = referencing_entries.map{ |e| e.id }
       context.set(@@backref_field, map_value(referencing_ids))

data/lib/contentful_middleman/commands/contentful.rb

@@ -1,4 +1,4 @@
-require 'middleman-core/cli'
+require 'middleman-cli'
 require 'date'
 require 'digest'
 require 'contentful_middleman/commands/context'
@@ -12,7 +12,7 @@ module Middleman
   module Cli
     # This class provides an "contentful" command for the middleman CLI.
 
-    class Contentful < Thor
+    class Contentful < Thor::Group
       include Thor::Actions
 
       # Path where Middleman expects the local data to be stored
@@ -20,10 +20,7 @@ module Middleman
 
       check_unknown_options!
 
-      namespace :contentful
-      desc 'contentful', 'Import data from Contentful'
-
-      method_option "rebuild",
+      class_option "rebuild",
         aliases: "-r",
         desc: "Rebuilds the site if there were changes in the imported data"
 
@@ -37,7 +34,7 @@ module Middleman
       end
 
       def contentful
-        if shared_instance.respond_to? :contentful_instances
+        if contentful_instances.size > 0
           ContentfulMiddleman::VersionHash.source_root    = self.class.source_root
           ContentfulMiddleman::LocalData::Store.base_path = MIDDLEMAN_LOCAL_DATA_FOLDER
           ContentfulMiddleman::LocalData::File.thor       = self
@@ -50,31 +47,36 @@ module Middleman
           end
 
           Middleman::Cli::Build.new.build if hash_local_data_changed && options[:rebuild]
-          shared_instance.logger.info 'Contentful Import: Done!'
+          logger.info 'Contentful Import: Done!'
         else
           raise Thor::Error.new "You need to activate the contentful extension in config.rb before you can import data from Contentful"
         end
       end
 
       private
-        def contentful_instances
-          shared_instance.contentful_instances
-        end
+      def logger
+        ::Middleman::Logger.singleton
+      end
 
-        def create_import_task(instance)
-          space_name           = instance.space_name.to_s
-          content_type_names   = instance.content_types_ids_to_names
-          content_type_mappers = instance.content_types_ids_to_mappers
+      def contentful_instances
+        app.contentful_instances
+      end
 
-          ContentfulMiddleman::ImportTask.new(space_name, content_type_names, content_type_mappers, instance)
+      def app
+        @app ||= ::Middleman::Application.new do
+          config[:mode] = :contentful
         end
+      end
 
-        def shared_instance
-          @shared_instance ||= ::Middleman::Application.server.inst do
-            set :environment, :contentful
-          end
-        end
-    end
+      def create_import_task(instance)
+        space_name           = instance.space_name.to_s
+        content_type_names   = instance.content_types_ids_to_names
+        content_type_mappers = instance.content_types_ids_to_mappers
 
+        ContentfulMiddleman::ImportTask.new(space_name, content_type_names, content_type_mappers, instance)
+      end
+
+      Base.register(self, 'contentful', 'contentful [--rebuild]', 'Import Contentful data to your Data folder')
+    end
   end
 end

data/lib/contentful_middleman/core.rb

@@ -54,6 +54,14 @@ module ContentfulMiddleman
 
 
     helpers ContentfulMiddleman::Helpers
+    include ContentfulMiddleman::Helpers
+
+    expose_to_application contentful_instances: :contentful_instances
+
+    expose_to_template localize_entry: :localize_entry
+    expose_to_template localize: :localize
+    expose_to_template localize_array: :localize_array
+    expose_to_template localize_value: :localize_value
 
     attr_reader :middleman_app
     def initialize(app, options_hash = {}, &block)

data/lib/contentful_middleman/import_task.rb

@@ -6,7 +6,6 @@ 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
@@ -14,7 +13,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, @use_camel_case)
+      new_version_hash = ContentfulMiddleman::VersionHash.write_for_space_with_entries(@space_name, entries)
 
       @changed_local_data = new_version_hash != old_version_hash
     end
@@ -34,18 +33,12 @@ 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_key].id, nil)
+        content_type_mapper_class = @content_type_mappers.fetch(entry.sys[:content_type].id, nil)
 
         next unless content_type_mapper_class
 
-        content_type_name = @content_type_names.fetch(entry.sys[content_type_key].id).to_s
+        content_type_name = @content_type_names.fetch(entry.sys[:content_type].id).to_s
         context = ContentfulMiddleman::Context.new
 
         content_type_mapper = content_type_mapper_class.new(entries, @contentful.options)

data/lib/contentful_middleman/instance.rb

@@ -67,7 +67,7 @@ module ContentfulMiddleman
           dynamic_entries:  :auto,
           raise_errors:     true,
           default_locale:   options.default_locale,
-          integration_name: 'middleman',
+          integration_name: 'middleman.v4',
           integration_version: ContentfulMiddleman::VERSION
       }.merge(options.client_options)
 

data/lib/contentful_middleman/mappers/base.rb

@@ -9,9 +9,6 @@ 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)
@@ -28,10 +25,6 @@ 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
@@ -68,8 +61,8 @@ module ContentfulMiddleman
 
       def map_asset_metadata(asset)
         context = Context.new
-        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.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.id = asset.sys[:id]
 
         context
@@ -94,9 +87,9 @@ module ContentfulMiddleman
 
       def map_entry_metadata(entry)
         context = Context.new
-        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.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.id = entry.sys[:id]
 
         context

data/lib/contentful_middleman/version.rb

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

data/lib/contentful_middleman/version_hash.rb

@@ -10,10 +10,9 @@ module ContentfulMiddleman
         ::File.read(hashfilename_for_space) if File.exist? hashfilename_for_space
       end
 
-      def write_for_space_with_entries(space_name, entries, use_camel_case = false)
-        updated_at_key = use_camel_case ? :updatedAt : :updated_at
+      def write_for_space_with_entries(space_name, entries)
         sorted_entries           = entries.sort {|a, b| a.id <=> b.id}
-        ids_and_revisions_string = sorted_entries.map {|e| "#{e.id}#{e.public_send(updated_at_key)}"}.join
+        ids_and_revisions_string = sorted_entries.map {|e| "#{e.id}#{e.updated_at}"}.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/core_spec.rb

@@ -4,7 +4,7 @@ class MapperDouble
 end
 
 describe ContentfulMiddleman::Core do
-  subject { described_class.new Middleman::Application }
+  subject { described_class.new Middleman::Application.new }
   let(:options) { subject.options }
 
   before(:each) do
@@ -74,7 +74,7 @@ describe ContentfulMiddleman::Core do
       it 'does not get called if rebuild_on_webhook is false' do
         expect(ContentfulMiddleman::WebhookHandler).not_to receive(:start)
 
-        subject.middleman_app.run_hook(:before_server)
+        subject.app.execute_callbacks(:before_server)
       end
 
       it 'gets called if rebuild_on_webhook is true' do
@@ -82,7 +82,7 @@ describe ContentfulMiddleman::Core do
 
         expect(ContentfulMiddleman::WebhookHandler).to receive(:start)
 
-        subject.middleman_app.run_hook(:before_server)
+        subject.app.execute_callbacks(:before_server)
       end
     end
   end

data/spec/contentful_middleman/import_task_spec.rb

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

data/spec/contentful_middleman/instance_spec.rb

@@ -88,7 +88,7 @@ describe ContentfulMiddleman::Instance do
       subject = described_class.new(extension)
 
       vcr('client') {
-        expect(subject.client.integration_info).to eq(name: 'middleman', version: ContentfulMiddleman::VERSION)
+        expect(subject.client.integration_info).to eq(name: 'middleman.v4', version: ContentfulMiddleman::VERSION)
       }
     end
 

data/spec/contentful_middleman/mappers/base_spec.rb

@@ -160,37 +160,6 @@ 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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/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/environments/master/entries?locale=*
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/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/environments/master/entries?locale=*
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/v0h47qlgo3zl/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/environments/master/entries?content_type=destination&select=fields.name,fields.coordinates,sys&sys.id=4ik8UErhRmIwomiQs8EUkI
+    uri: https://cdn.contentful.com/spaces/v0h47qlgo3zl/entries?content_type=destination&select=fields.name,fields.coordinates,sys&sys.id=4ik8UErhRmIwomiQs8EUkI
     body:
       encoding: US-ASCII
       string: ''

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/environments/master/content_types?limit=1000
+    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/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/environments/master/entries?sys.id=6C4T3KAZUWaysA6ooQOWiE
+    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/a80guayqr8ut/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/environments/master/entries?sys.id=DT1yQgZABwuWeY842sGYY
+    uri: https://cdn.contentful.com/spaces/a80guayqr8ut/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/environments/master/content_types?limit=1000
+    uri: https://preview.contentful.com/spaces/cfexampleapi/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/environments/master/entries
+    uri: https://preview.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?limit=1
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?limit=1000&order=sys.createdAt&skip=0
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?limit=1
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?limit=100&order=sys.createdAt&skip=0
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?sys.id=nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?include=1&locale=*
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?include=1&locale=*
     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/environments/master/assets/nyancat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/assets/happycat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/assets
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/assets?order=sys.createdAt
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?content_type=cat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?sys.id=garfield
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/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/environments/master/entries?sys.id=happycat
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?sys.id=happycat
     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/environments/master/content_types?limit=1000
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
     body:
       encoding: US-ASCII
       string: ''

data/spec/spec_helper.rb

@@ -85,20 +85,13 @@ end
 class EntryDouble
   attr_reader :id, :sys, :fields
 
-  def initialize(id, sys_data = {}, fields = {}, updated_at = nil, camel_case = false)
+  def initialize(id, sys_data = {}, fields = {}, updated_at = nil)
     @id = id
     sys_data[:id] = id
-    sys_data[camel_case ? :updatedAt : :updated_at] = updated_at
-    sys_data[camel_case ? :contentType : :content_type] = ContentTypeDouble.new("#{id}_ct")
+    sys_data[:updated_at] = updated_at
+    sys_data[: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|
@@ -108,4 +101,8 @@ 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.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -17,14 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: middleman-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: contentful
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +273,6 @@ 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
@@ -299,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Include mangablable content from the Contentful CMS and API into your Middleman
@@ -327,7 +340,6 @@ 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

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

@@ -1,244 +0,0 @@
----
-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