jekyll-contentful-data-import 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50fa600dbbf4c6ac9235bf8e440dfbbda08d5cf7
-  data.tar.gz: 2cf3e07eca850d26feff0aa892c409091f0a2e6a
+  metadata.gz: b070683edf1ce2aaac689f088b6913804b8cc6be
+  data.tar.gz: 957112e98c2d0318336e8b709a1900c9a9fc752c
 SHA512:
-  metadata.gz: 87d4845489e419e741b65b0410d977b8961b10d06ab7bcbc2b435d0745c3bcededdac3678cdd05b7fdd94efdaf29e52b99015df3a6d4354136dca7ccdce115ef
-  data.tar.gz: 14ca204c5cbfa850a351be792ef194a5e6a6bc156ed0bfcca0579aa687dba1a205f7516a2bade109f145b7bec01874429663ccb10df7b7c778fd56512698ca4e
+  metadata.gz: c2ddbe6c4e3a7bfb1d85de3f720100e4d3603b1b573647f9f5419da341cbea327df443e112f894f25568a9496374b314a40943ef57b03518d7c97ed4f17ea0e7
+  data.tar.gz: f01b63f3eef1da47fb685eb713ce44d03ed30d2a7ee5cb969f0a17d9d19a97aaf17aa42732bafdae54ddcfc31d68633c432213e976508c6b4e442cef608115d8

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,38 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-04-11 11:57:26 -0300 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 20
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 120
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 3
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 100
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 25
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Style/FileName:
+  Exclude:
+    - 'lib/jekyll-contentful-data-import.rb'

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
 ## Unreleased
+
+## v1.5.0
+
+### Changed
+* Updated CDA SDK to 2.0
+
 ### Added
+* Added more metadata to `sys` attributes in entries
+* Added `sys` attributes for serialized assets
+
+### Fixed
+* Updated code to match style guide
 
 ### v1.4.3
 * Added use of `map_field` without localizing for custom mappers that map `sys` properties when `locale='*'` is being sent.

data/Guardfile

@@ -1,5 +1,10 @@
-guard :rspec, cmd: 'rspec --format documentation --color' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+group :green_red_refactor, halt_on_fail: true do
+  guard :rspec, cmd: 'rspec --format documentation --color' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/.+\.rb$})       { "spec" }
+    watch('spec/spec_helper.rb')  { "spec" }
+  end
+
+  guard :rubocop, cmd: "rubocop", cli: 'lib' do
+  end
 end

data/README.md

@@ -67,7 +67,7 @@ all_entries_page_size | Integer, the amount of maximum entries per CDA Request w
 content_types         | Hash describing the mapping applied to entries of the imported content types
 client_options        | Hash describing Contentful::Client configuration. See [contentful.rb](https://github.com/contentful/contentful.rb) for more info.
 base_path             | String with path to your Jekyll Application, defaults to current directory. Path is relative to your current location.
-destination           | String with path within _data under which to store the output yaml file. Defaults to contentful/spaces
+destination           | String with path within `_data` under which to store the output yaml file. Defaults to contentful/spaces
 
 You can add multiple spaces to your configuration
 
@@ -123,33 +123,35 @@ Then proceed to run: `bundle exec rake contentful`
 In most cases you may want to avoid including your credentials in publicly available sites,
 therefore you can do the following:
 
-1. `bundle update`—make sure your gem version supports ENV_ variables
+1. `bundle update`—make sure your gem version supports `ENV_` variables
 
-2. Set up your _config like so:
+2. Set up your `_config` like so:
 
-   ```yaml
-   contentful:
-     spaces:
-       - example:
-           space:        ENV_CONTENTFUL_SPACE_ID
-           access_token: ENV_CONTENTFUL_ACCESS_TOKEN
-   ```
-   (Your Space ID will be looked upon on `ENV['CONTENTFUL_SPACE_ID']` and your Access Token
-   on `ENV['CONTENTFUL_ACCESS_TOKEN']`.)
+  ```yaml
+  contentful:
+    spaces:
+      - example:
+          space:        ENV_CONTENTFUL_SPACE_ID
+          access_token: ENV_CONTENTFUL_ACCESS_TOKEN
+  ```
+
+  (Your Space ID will be looked upon on `ENV['CONTENTFUL_SPACE_ID']` and your Access Token on `ENV['CONTENTFUL_ACCESS_TOKEN']`.)
 
 3. Either add the following variables to your shell's configuration file (.bashrc or .bash_profile, for example):
 
-   ```bash
-   export CONTENTFUL_ACCESS_TOKEN=abc123
-   export CONTENTFUL_SPACE_ID=abc123
-   ```
-   (And run `source ~/.bashrc` or open new terminal to enable changes.)
+  ```bash
+  export CONTENTFUL_ACCESS_TOKEN=abc123
+  export CONTENTFUL_SPACE_ID=abc123
+  ```
+
+  (And run `source ~/.bashrc` or open new terminal to enable changes.)
+
+  Or specify them on the command line:
 
-   Or specify them on the command line:
+  ```bash
+  CONTENTFUL_ACCESS_TOKEN=abc123 CONTENTFUL_SPACE_ID=abc123 jekyll contentful
+  ```
 
-   ```bash
-   CONTENTFUL_ACCESS_TOKEN=abc123 CONTENTFUL_SPACE_ID=abc123 jekyll contentful
-   ```
 4. Party.
 
 This way, it is safe to share your code without having to worry

data/jekyll-contentful.gemspec

@@ -22,15 +22,18 @@ Gem::Specification.new do |s|
   s.add_dependency("jekyll", ">= 2.5.0", "< 4")
 
   # Additional dependencies
-  s.add_dependency("contentful", '~> 1.0')
+  s.add_dependency("contentful", '>= 2.0.1', '~> 2.0')
 
   s.add_development_dependency 'rubygems-tasks', '~> 0.2'
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
+  s.add_development_dependency 'guard-rubocop'
   s.add_development_dependency "bundler", "~> 1.6"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "vcr"
   s.add_development_dependency "webmock"
   s.add_development_dependency "pry"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "rubocop"
 end

data/lib/jekyll-contentful-data-import.rb

@@ -1,5 +1,5 @@
 require 'jekyll-contentful-data-import/version'
 
-%w{contentful}.each do |file|
+%w(contentful).each do |file|
   require File.expand_path("jekyll/commands/#{file}.rb", File.dirname(__FILE__))
 end

data/lib/jekyll-contentful-data-import/data_exporter.rb

@@ -2,10 +2,13 @@ require 'jekyll-contentful-data-import/serializer'
 
 module Jekyll
   module Contentful
+    # Data Exporter Class
+    #
+    # Serializes Contentful data into YAML files
     class DataExporter
-      DATA_FOLDER = '_data'
-      CONTENTFUL_FOLDER = 'contentful'
-      SPACES_FOLDER = 'spaces'
+      DATA_FOLDER = '_data'.freeze
+      CONTENTFUL_FOLDER = 'contentful'.freeze
+      SPACES_FOLDER = 'spaces'.freeze
 
       attr_reader :name, :entries, :config
 
@@ -19,20 +22,37 @@ module Jekyll
         setup_directory
 
         File.open(destination_file, 'w') do |file|
-          file.write(::Jekyll::Contentful::Serializer.new(entries, config).to_yaml)
+          file.write(
+            ::Jekyll::Contentful::Serializer.new(
+              entries,
+              config
+            ).to_yaml
+          )
         end
       end
 
       def base_directory
         directory = File.expand_path(Dir.pwd)
-        directory = File.join(directory, config['base_path']) if config.key?('base_path')
+        if config.key?('base_path')
+          directory = File.join(
+            directory,
+            config['base_path']
+          )
+        end
 
         directory
       end
 
       def destination_directory
-        destination_dir = File.join(base_directory, DATA_FOLDER, CONTENTFUL_FOLDER, SPACES_FOLDER)
-        destination_dir = File.join(base_directory, DATA_FOLDER, config['destination']) if config.key?('destination')
+        destination_dir = File.join(
+          base_directory, DATA_FOLDER,
+          CONTENTFUL_FOLDER, SPACES_FOLDER
+        )
+        if config.key?('destination')
+          destination_dir = File.join(
+            base_directory, DATA_FOLDER, config['destination']
+          )
+        end
 
         destination_dir
       end

data/lib/jekyll-contentful-data-import/importer.rb

@@ -3,6 +3,9 @@ require 'jekyll-contentful-data-import/data_exporter'
 
 module Jekyll
   module Contentful
+    # Importer class
+    #
+    # Entry fetching logic
     class Importer
       attr_reader :config
 
@@ -18,14 +21,18 @@ module Jekyll
             client_options(options.fetch('client_options', {}))
           )
 
-          Jekyll::Contentful::DataExporter.new(
-            name,
-            get_entries(space_client, options),
-            options
-          ).run
+          export_data(name, space_client, options)
         end
       end
 
+      def export_data(name, space_client, options)
+        Jekyll::Contentful::DataExporter.new(
+          name,
+          get_entries(space_client, options),
+          options
+        ).run
+      end
+
       def value_for(options, key)
         potential_value = options[key]
         return ENV[potential_value.gsub('ENV_', '')] if potential_value.start_with?('ENV_')
@@ -33,7 +40,7 @@ module Jekyll
       end
 
       def spaces
-        config['spaces'].map { |space_data| space_data.first }
+        config['spaces'].map(&:first)
       end
 
       def get_entries(space_client, options)
@@ -70,7 +77,11 @@ module Jekyll
       private
 
       def client_options(options)
-        options = options.each_with_object({}){|(k,v), memo| memo[k.to_sym] = v; memo}
+        options = options.each_with_object({}) do |(k, v), memo|
+          memo[k.to_sym] = v
+          memo
+        end
+
         options.delete(:dynamic_entries)
         options.delete(:raise_errors)
         options

data/lib/jekyll-contentful-data-import/mappers/base.rb

@@ -2,7 +2,11 @@ require 'contentful'
 
 module Jekyll
   module Contentful
+    # Mappers module
     module Mappers
+      # Base Mapper Class
+      #
+      # Logic for mapping entries into simplified serialized representations
       class Base
         def self.mapper_for(entry, config)
           ct = entry.content_type
@@ -23,20 +27,30 @@ module Jekyll
           @config = config
         end
 
+        def map_entry_metadata
+          content_type = entry.sys.fetch(:content_type, nil)
+          {
+            'id' => entry.sys.fetch(:id, nil),
+            'created_at' => entry.sys.fetch(:created_at, nil),
+            'updated_at' => entry.sys.fetch(:updated_at, nil),
+            'content_type_id' => content_type.nil? ? nil : content_type.id
+          }
+        end
+
         def map
-          result = {'sys' => {'id' => entry.id}}
+          result = { 'sys' => map_entry_metadata }
 
-          fields = has_multiple_locales? ? entry.fields_with_locales : entry.fields
+          fields = multiple_locales? ? entry.fields_with_locales : entry.fields
 
           fields.each do |k, v|
-            name, value = map_field(k, v, has_multiple_locales?)
+            name, value = map_field(k, v, multiple_locales?)
             result[name] = value
           end
 
           result
         end
 
-        def has_multiple_locales?
+        def multiple_locales?
           config.fetch('cda_query', {}).fetch('locale', nil) == '*'
         end
 
@@ -52,7 +66,7 @@ module Jekyll
             value_mapping = map_value(field_value)
           end
 
-          return field_name.to_s, value_mapping
+          [field_name.to_s, value_mapping]
         end
 
         def map_value(value, locale = nil)
@@ -63,7 +77,7 @@ module Jekyll
             map_location(value)
           when ::Contentful::Link
             map_link(value)
-          when ::Contentful::DynamicEntry
+          when ::Contentful::Entry
             map_entry(value)
           when ::Array
             map_array(value, locale)
@@ -80,12 +94,21 @@ module Jekyll
           end
         end
 
+        def map_asset_metadata(asset)
+          {
+            'id' => asset.id,
+            'created_at' => asset.sys.fetch(:created_at, nil),
+            'updated_at' => asset.sys.fetch(:updated_at, nil)
+          }
+        end
+
         def map_asset(asset, locale = nil)
           if locale
             file = asset.fields(locale)[:file]
             file_url = file.nil? ? '' : file.url
 
             return {
+              'sys' => map_asset_metadata(asset),
               'title' => asset.fields(locale)[:title],
               'description' => asset.fields(locale)[:description],
               'url' => file_url
@@ -96,6 +119,7 @@ module Jekyll
           file_url = file.nil? ? '' : file.url
 
           {
+            'sys' => map_asset_metadata(asset),
             'title' => asset.title,
             'description' => asset.description,
             'url' => file_url
@@ -115,11 +139,15 @@ module Jekyll
         end
 
         def map_link(link)
-          {'sys' => {'id' => link.id}}
+          {
+            'sys' => {
+              'id' => link.id
+            }
+          }
         end
 
         def map_array(array, locale)
-          array.map {|element| map_value(element, locale)}
+          array.map { |element| map_value(element, locale) }
         end
       end
     end

data/lib/jekyll-contentful-data-import/serializer.rb

@@ -3,6 +3,9 @@ require 'jekyll-contentful-data-import/mappers'
 
 module Jekyll
   module Contentful
+    # Serializer class
+    #
+    # Transforms the serialized entries to YAML
     class Serializer
       attr_reader :entries, :config
 

data/lib/jekyll-contentful-data-import/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Contentful
-    VERSION = "1.4.3"
+    VERSION = '1.5.0'.freeze
   end
 end

data/lib/jekyll/commands/contentful.rb

@@ -1,41 +1,51 @@
 require 'jekyll-contentful-data-import/importer'
 
 module Jekyll
+  # Module for Jekyll Commands
   module Commands
+    # jekyll contentful Command
     class Contentful < Command
       def self.init_with_program(prog)
         prog.command(:contentful) do |c|
           c.syntax 'contentful [OPTIONS]'
           c.description 'Imports data from Contentful'
 
-          options.each {|opt| c.option(*opt) }
+          options.each { |opt| c.option(*opt) }
 
-          c.action do |args, options|
-            contentful_config = Jekyll.configuration['contentful']
-            process args, options, contentful_config
-          end
+          add_build_options(c)
+
+          command_action(c)
         end
       end
 
       def self.options
         [
-          ['rebuild', '-r', '--rebuild', 'Rebuild Jekyll Site after fetching data'],
+          [
+            'rebuild', '-r', '--rebuild',
+            'Rebuild Jekyll Site after fetching data'
+          ]
         ]
       end
 
+      def self.command_action(command)
+        command.action do |args, options|
+          jekyll_options = configuration_from_options(options)
+          contentful_config = jekyll_options['contentful']
+          process args, options, contentful_config
+        end
+      end
 
-      def self.process(args = [], options = {}, contentful_config = {})
+      def self.process(_args = [], options = {}, contentful_config = {})
         Jekyll.logger.info 'Starting Contentful import'
 
         Jekyll::Contentful::Importer.new(contentful_config).run
 
         Jekyll.logger.info 'Contentful import finished'
 
-        if options['rebuild']
-          Jekyll.logger.info 'Starting Jekyll Rebuild'
+        return unless options['rebuild']
 
-          Jekyll::Commands::Build.process(options)
-        end
+        Jekyll.logger.info 'Starting Jekyll Rebuild'
+        Jekyll::Commands::Build.process(options)
       end
     end
   end

data/spec/jekyll-contentful/mappers/base_spec.rb

@@ -34,10 +34,11 @@ describe Jekyll::Contentful::Mappers::Base do
 
       class AssetDouble < Contentful::Asset
         attr_reader :title, :description, :file
-        def initialize(title, description, url, fields = nil)
+        def initialize(title, description, url, sys = {}, fields = nil)
           @title = title
           @description = description
           @file = FileDouble.new(url)
+          @sys = sys
           @fields = {
             'en-US' => {
               title: title,
@@ -49,6 +50,10 @@ describe Jekyll::Contentful::Mappers::Base do
           @fields ||= fields
         end
 
+        def id
+          @sys[:id]
+        end
+
         def fields(locale = nil)
           return { title: title, description: description, file: file } if locale.nil?
           @fields[locale]
@@ -75,13 +80,20 @@ describe Jekyll::Contentful::Mappers::Base do
       end
 
       it 'maps a simple entry' do
-        expected = { 'sys' => { 'id' => 'foo' } }
+        expected = {
+          'sys' => {
+            'id' => 'foo',
+            'created_at' => nil,
+            'updated_at' => nil,
+            'content_type_id' => 'content_type'
+          }
+        }
         expect(subject.map).to eq expected
       end
 
       it 'maps a complete entry' do
         entry = EntryDouble.new('foo', ContentTypeDouble.new, {
-          'asset' => AssetDouble.new('some_title', 'foo', 'some_url'),
+          'asset' => AssetDouble.new('some_title', 'foo', 'some_url', {id: 'asset'}),
           'location' => LocationDouble.new(12.32, 43.34),
           'link' => LinkDouble.new('bar'),
           'entry' => EntryDouble.new('baz'),
@@ -95,8 +107,18 @@ describe Jekyll::Contentful::Mappers::Base do
         subject.instance_variable_set(:@entry, entry)
 
         expected = {
-          'sys' => { 'id' => 'foo' },
+          'sys' => {
+            'id' => 'foo',
+            'created_at' => nil,
+            'updated_at' => nil,
+            'content_type_id' => 'content_type'
+          },
           'asset' => {
+            'sys' => {
+              'id' => 'asset',
+              'created_at' => nil,
+              'updated_at' => nil,
+            },
             'title' => 'some_title',
             'description' => 'foo',
             'url' => 'some_url'
@@ -109,7 +131,12 @@ describe Jekyll::Contentful::Mappers::Base do
             'sys' => { 'id' => 'bar' }
           },
           'entry' => {
-            'sys' => { 'id' => 'baz' }
+            'sys' => {
+              'id' => 'baz',
+              'created_at' => nil,
+              'updated_at' => nil,
+              'content_type_id' => 'content_type'
+            },
           },
           'array' => [
             { 'sys' => { 'id' => 'foobar' } },
@@ -135,7 +162,12 @@ describe Jekyll::Contentful::Mappers::Base do
         mapper = described_class.new(entry, config)
 
         expected = {
-          'sys' => { 'id' => 'foo' },
+          'sys' => {
+            'id' => 'foo',
+            'created_at' => nil,
+            'updated_at' => nil,
+            'content_type_id' => 'content_type'
+          },
           'foo' => {
             'en-US' => 'bar',
             'de-DE' => 'baz'
@@ -154,7 +186,7 @@ describe Jekyll::Contentful::Mappers::Base do
             'asset' => AssetDouble.new('some_title', 'foo', 'some_url')
           },
           'de-DE' => {
-            'asset' => AssetDouble.new('some_title', 'foo', 'some_url', {
+            'asset' => AssetDouble.new('some_title', 'foo', 'some_url', {id: 'foo'}, {
                 'de-DE' => {
                   title: 'other_title',
                   description: 'other description',
@@ -167,14 +199,29 @@ describe Jekyll::Contentful::Mappers::Base do
         mapper = described_class.new(entry, config)
 
         expected = {
-          'sys' => { 'id' => 'foo' },
+          'sys' => {
+            'id' => 'foo',
+            'created_at' => nil,
+            'updated_at' => nil,
+            'content_type_id' => 'content_type'
+          },
           'asset' => {
             "en-US" => {
+              "sys" => {
+                "id" => nil,
+                "created_at" => nil,
+                "updated_at" => nil
+              },
               "title" => "some_title",
               "description" => "foo",
               "url" => 'some_url'
             },
             "de-DE" => {
+              "sys" => {
+                "id" => "foo",
+                "created_at" => nil,
+                "updated_at" => nil
+              },
               "title" => "other_title",
               "description" => "other description",
               "url" => 'other_url'

data/spec/jekyll-contentful/serializer_spec.rb

@@ -23,14 +23,37 @@ describe Jekyll::Contentful::Serializer do
       end
 
       it 'serializes a single entry without fields' do
-        expected = {'content_type' => [{'sys' => {'id' => 'foo'}}]}
+        expected = {
+          'content_type' => [
+            {
+              'sys' => {
+                'id' => 'foo',
+                'created_at' => nil,
+                'updated_at' => nil,
+                'content_type_id' => 'content_type'
+              }
+            }
+          ]
+        }
         expect(subject.serialize).to eq(expected)
       end
 
       it 'serializes a single entry with fields' do
         subject.instance_variable_set(:@entries, [EntryDouble.new('foo', ContentTypeDouble.new, {'foobar' => 'bar'})])
 
-        expected = {'content_type' => [{'sys' => {'id' => 'foo'}, 'foobar' => 'bar'}]}
+        expected = {
+          'content_type' => [
+            {
+              'sys' => {
+                'id' => 'foo',
+                'created_at' => nil,
+                'updated_at' => nil,
+                'content_type_id' => 'content_type'
+              },
+              'foobar' => 'bar'
+            }
+          ]
+        }
         expect(subject.serialize).to eq(expected)
       end
 
@@ -43,7 +66,27 @@ describe Jekyll::Contentful::Serializer do
           })
         ])
 
-        expected = {'content_type' => [{'sys' => {'id' => 'foo'}, 'foobar' => {'sys' => {'id' => 'foobar'}, 'baz' => 1}}]}
+        expected = {
+          'content_type' => [
+            {
+              'sys' => {
+                'id' => 'foo',
+                'created_at' => nil,
+                'updated_at' => nil,
+                'content_type_id' => 'content_type'
+              },
+              'foobar' => {
+                'sys' => {
+                  'id' => 'foobar',
+                  'created_at' => nil,
+                  'updated_at' => nil,
+                  'content_type_id' => 'content_type'
+                },
+                'baz' => 1
+              }
+            }
+          ]
+        }
         expect(subject.serialize).to eq(expected)
       end
 
@@ -55,8 +98,24 @@ describe Jekyll::Contentful::Serializer do
 
         expected = {
           'content_type' => [
-            {'sys' => {'id' => 'foo'}, 'foobar' => 'bar'},
-            {'sys' => {'id' => 'bar'}, 'foobar' => 'baz'}
+            {
+              'sys' => {
+                'id' => 'foo',
+                'created_at' => nil,
+                'updated_at' => nil,
+                'content_type_id' => 'content_type'
+              },
+              'foobar' => 'bar'
+            },
+            {
+              'sys' => {
+                'id' => 'bar',
+                'created_at' => nil,
+                'updated_at' => nil,
+                'content_type_id' => 'content_type'
+              },
+              'foobar' => 'baz'
+            }
           ]
         }
         expect(subject.serialize).to match(expected)

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 $LOAD_PATH.unshift File.expand_path('lib', __FILE__)
 
 require 'vcr'
@@ -37,13 +40,15 @@ class ContentTypeDouble
   end
 end
 
-class EntryDouble < Contentful::DynamicEntry
+class EntryDouble < Contentful::Entry
   attr_reader :id, :content_type
 
   def initialize(id = '', content_type = ContentTypeDouble.new, fields = {}, locales = false)
     @id = id
     @content_type = content_type
 
+    @sys = { id: id, content_type: content_type, locale: 'en-US' }
+
     if locales
       @fields = fields
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-contentful-data-import
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Contentful GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -34,16 +34,22 @@ dependencies:
   name: contentful
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +190,34 @@ 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: rubocop
+  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'
 description: Load blog posts and other managed content into Jekyll
 email:
 - david.litvak@contentful.com
@@ -178,6 +226,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md