contentful_middleman 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0206f855bb8bfb8c037a5aabc0c0d1b668db0a
-  data.tar.gz: bfc915bd5b1d17c43f8c339fda06af0fa594417a
+  metadata.gz: afab6f9f2082efc2316157faf338a513c2e6e6eb
+  data.tar.gz: 40656a4aec70d29441724ade7b93ef12b48b7f79
 SHA512:
-  metadata.gz: 5661015434c5c51b32aeab1c1c735eaee5cc41f053c2e618e15bde6ab874743af5877ab594fcdad6659b2602cdf0c56bab443368398efae8a3c9c63cfc68f005
-  data.tar.gz: 0a23c10c9ee693e9c3a2f1f8dcf28232c3025ebf0528c055d7e0a9841bcd6448b0ce169a43b8937af36ff654e442f0cee9fdd7885f7688b9ef931c2ece593715
+  metadata.gz: 8cf2b26d03c3f463dce1bcb6ea57c5b8e0e76424752bfd00d0afdad350fc1ba9fadb70acfab4cf1d1eecad4ee6ea8e2473076eade4216431a3638a3a7b68c577
+  data.tar.gz: 60c4bc8fe795b67fdd33188c9de8349aa09ece3f8168a0fecea667283fb122bf368789e66812db330cc0c07eff5c57176fb9f0dd2b789d8b994009e8869984f7

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 ## Unreleased
 
+## 1.3.2
+### Fixed
+* Fixed Entry ID fetch on import task when having an ID field in the Content Type[#77](https://github.com/contentful/contentful_middleman/issues/77)
+* Fixed `NoMethodError` when Entry has no populated fields[#76](https://github.com/contentful/contentful_middleman/issues/76)
+
 ## 1.3.1
 ### Fixed
 * Middleman not loading extension due to `@app` reassignment

data/lib/contentful_middleman/import_task.rb

@@ -22,6 +22,15 @@ module ContentfulMiddleman
       @changed_local_data
     end
 
+    def entries
+      @entries ||= @contentful.entries
+    end
+
+    def file_name(content_type_name, entry)
+      entry_id = entry.sys.key?(:id) ? entry.sys[:id] : entry.id
+      File.join(@space_name, content_type_name, entry_id.to_s)
+    end
+
     private
     def local_data_files
       entries.map do |entry|
@@ -35,12 +44,8 @@ module ContentfulMiddleman
         content_type_mapper = content_type_mapper_class.new(entries, @contentful.options)
         content_type_mapper.map(context, entry)
 
-        LocalData::File.new(context.to_yaml, File.join(@space_name, content_type_name, entry.id))
+        LocalData::File.new(context.to_yaml, file_name(content_type_name, entry))
       end.compact
     end
-
-    def entries
-      @entries ||= @contentful.entries
-    end
   end
 end

data/lib/contentful_middleman/mappers/base.rb

@@ -64,6 +64,9 @@ module ContentfulMiddleman
 
         fields = has_multiple_locales? ? entry.fields_with_locales : entry.fields
 
+        # Prevent entries with no values from breaking the import
+        fields ||= []
+
         fields.each {|k, v| map_field context, k, v}
       end
 

data/lib/contentful_middleman/tools/backup.rb

@@ -15,7 +15,7 @@ module ContentfulMiddleman
         end
 
         def ensure_backup_path!
-          return if ::File.exists? basepath
+          return if ::File.exist? basepath
 
           FileUtils.mkdir_p basepath
         end

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/spec/contentful_middleman/import_task_spec.rb

@@ -6,9 +6,13 @@ class ClientDouble
   end
 end
 
+class EntryDouble
+end
+
 describe ContentfulMiddleman::ImportTask do
   let(:path) { File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures', 'space_hash_fixtures')) }
-  subject { described_class.new 'foobar', {}, {}, ClientDouble.new }
+  let(:client) { ClientDouble.new }
+  subject { described_class.new 'foobar', {}, {}, client }
 
   describe 'instance methods' do
     before do
@@ -37,5 +41,22 @@ describe ContentfulMiddleman::ImportTask do
         expect(subject.changed_local_data?).to eq(true)
       end
     end
+
+    it '#entries' do
+      expect(subject.entries).to eq client.entries
+    end
+
+    describe '#file_name' do
+      it 'uses entry.sys[:id] over entry.id' do
+        entry = EntryDouble.new('foo', {}, {id: 'bar'})
+        client.entries << entry
+
+        expect(entry.id).not_to eq entry.sys[:id]
+        expect(entry.id).to eq 'bar'
+        expect(entry.sys[:id]).to eq 'foo'
+
+        expect(subject.file_name('baz', entry)).to eq File.join('foobar', 'baz', 'foo')
+      end
+    end
   end
 end

data/spec/contentful_middleman/mappers/base_spec.rb

@@ -85,4 +85,14 @@ describe ContentfulMiddleman::Mapper::Base do
       expect(subject.entries).to match(entries)
     end
   end
+
+  describe 'issues' do
+    it 'should not fail on empty entry - #76' do
+      entry = EntryDouble.new('foo', {}, nil)
+      context = ContentfulMiddleman::Context.new
+
+      expect { subject.map(context, entry) }.not_to raise_error
+      expect(context.hashize).to eq(id: 'foo')
+    end
+  end
 end

data/spec/contentful_middleman/version_hash_spec.rb

@@ -1,14 +1,5 @@
 require 'spec_helper'
 
-class EntryDouble
-  attr_reader :id, :updated_at
-
-  def initialize(id, updated_at)
-    @id = id
-    @updated_at = updated_at
-  end
-end
-
 describe ContentfulMiddleman::VersionHash do
   let(:path) { File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures', 'space_hash_fixtures')) }
   describe 'class methods' do
@@ -32,7 +23,7 @@ describe ContentfulMiddleman::VersionHash do
     end
 
     describe '::write_for_space_with_entries' do
-      let(:entries) { [EntryDouble.new(1, '2015-11-25'), EntryDouble.new(2, '2015-11-25')] }
+      let(:entries) { [EntryDouble.new(1, {}, {}, '2015-11-25'), EntryDouble.new(2, {}, {}, '2015-11-25')] }
 
       before do
         described_class.source_root = path

data/spec/spec_helper.rb

@@ -64,3 +64,27 @@ class OptionsDouble
     end
   end
 end
+
+class EntryDouble
+  attr_reader :id, :sys, :fields
+
+  def initialize(id, sys_data = {}, fields = {}, updated_at = nil)
+    @id = id
+    sys_data[:id] = id
+    sys_data[:updated_at] = updated_at
+    @sys = sys_data
+    @fields = fields
+
+    unless fields.nil?
+      fields.each do |k, v|
+        define_singleton_method k do
+          v
+        end
+      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: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core