Check the presence of corresponding _id value instead of itself

Roman Trofimov committed Jan 16, 2018

commit fe32c081a064ca8a1241419e274f39d8fb4fba2b

Showing 2 changed files with 26 additions and 18 deletions

locomotive/steam/liquid/drops/content_entry.rb b/lib/locomotive/steam/liquid/drops/content_entry.rb +1 -1

@@	@@ -67,7 +67,7 @@ module Locomotive
	@_source.content_type.fields_by_name.each do \|name, field\|
	case field.type
	when :belongs_to
-	hash[name] = @_source.send(name).presence && liquify_entry(@_source.send(name))._slug
+	hash[name] = liquify_entry(@_source.send(name))._slug if hash["#{name}_id"].present?
	when :many_to_many
	hash[name] = (@_source.send(name) \|\| []).all.map { \|e\| liquify_entry(e)._slug }.compact
	when :file

spec/unit/liquid/drops/content_entry_spec.rb +25 -17

@@	@@ -108,30 +108,38 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do

	describe '#to_hash' do

-	let(:entry) { instance_double('Article', _id: 42, localized_attributes: {}, content_type: type, title: 'Hello world', _label: 'Hello world', _slug: 'hello-world', _translated: false, seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', created_at: 0, updated_at: 1, author: author) }
-	let(:type) { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), author: instance_double('Author', type: :belongs_to), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
-	let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }
+	describe 'belong_to content type' do

-	before do
-	allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })
-	allow(entry).to receive(:category).and_return('Test')
-	end
+	let(:entry) { instance_double('Article', _id: 42, localized_attributes: {}, content_type: type, title: 'Hello world', _label: 'Hello world', _slug: 'hello-world', _translated: false, seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', created_at: 0, updated_at: 1, author: author) }
+	let(:type) { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), author: instance_double('Author', type: :belongs_to), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
+	let(:author) { instance_double('Author', _slug: 'john-doe', localized_attributes: {}) }
+	let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }

-	subject { drop.to_hash.stringify_keys }
+	before do
+	allow(entry).to receive(:category).and_return('Test')
+	end

-	context 'belongs to content type is not nil' do
+	subject { drop.to_hash.stringify_keys }

-	let(:author) { instance_double('Author', _slug: 'john-doe', localized_attributes: {}) }
+	context 'corresponding hash value for id is not nil' do

-	it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author' => 'john-doe') }
+	before do
+	allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42, 'author_id' => 64 })
+	end

-	end
+	it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author_id' => 64, 'author' => 'john-doe') }
+
+	end
+
+	context 'corresponding hash value for id is nil' do

-	context 'belongs to content type is nil' do
+	before do
+	allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })
+	end

-	let(:author) { nil }
+	it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test') }

-	it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author' => nil) }
+	end

	end

@@	@@ -146,13 +154,13 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
	let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }

	before do
-	allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })
+	allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42, 'author_id' => 64 })
	allow(entry).to receive(:category).and_return('Test')
	end

	subject { drop.as_json }

-	it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author' => 'john-doe', 'authors' => ['john-doe']) }
+	it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author_id' => 64, 'author' => 'john-doe', 'authors' => ['john-doe']) }

	end