Update Mapper to use new Locale Handling and Added Localize Specs

README.md

@@ -269,6 +269,6 @@ agnostic wrapper of these methods.
 
 If your fields are not localized, the value of the field will be returned.
 
-In case of the field being localized but the locale not found, it will use
+In case of the field being localized but no value being set for a given entry, it will use
 a fallback locale, by default is `en-US` but can be specified as an additional
 parameter in all the mentioned calls.

contentful_middleman.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency("middleman-core", ["~> 3.3"])
 
   # Additional dependencies
-  s.add_dependency("contentful", '~> 0.7')
+  s.add_dependency("contentful", '~> 0.8')
   s.add_dependency("contentful-webhook-listener", '~> 0.1')
 
   s.add_development_dependency 'rubygems-tasks', '~> 0.2'

lib/contentful_middleman/import_task.rb

@@ -32,7 +32,7 @@ def local_data_files
         content_type_name         = @content_type_names.fetch(entry.content_type.id).to_s
         context                   = ContentfulMiddleman::Context.new
 
-        content_type_mapper = content_type_mapper_class.new(entries)
+        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))

lib/contentful_middleman/instance.rb

@@ -34,6 +34,10 @@ def content_types_ids_to_names
       end
     end
 
+    def options
+      @extension.options
+    end
+
     private
 
     def all_entries(cda_query)
@@ -67,9 +71,5 @@ def client_options
       client_options[:api_url] = API_PREVIEW_URL if options.use_preview_api
       client_options
     end
-
-    def options
-      @extension.options
-    end
   end
 end

lib/contentful_middleman/mappers/base.rb

@@ -5,8 +5,9 @@ module Mapper
     class Base
       attr_reader :entries
 
-      def initialize(entries)
+      def initialize(entries, options)
         @entries = entries
+        @options = options
         @children = {}
       end
 
@@ -24,6 +25,10 @@ def map(context, entry)
 
       private
 
+      def has_multiple_locales?
+        @options.cda_query.fetch(:locale, nil) == '*'
+      end
+
       def map_field(context, field_name, field_value)
         value_mapping = map_value(field_value)
         context.set(field_name, value_mapping)
@@ -56,7 +61,10 @@ def map_asset(asset)
 
       def map_entry_full(entry, context)
         context.id = entry.id
-        entry.fields.each {|k, v| map_field context, k, v}
+
+        fields = has_multiple_locales? ? entry.fields_with_locales : entry.fields
+
+        fields.each {|k, v| map_field context, k, v}
       end
 
       def map_entry(entry)

spec/contentful_middleman/helpers_spec.rb

@@ -8,6 +8,21 @@ class InstanceDouble
 end
 
 describe ContentfulMiddleman::Helpers do
+  let(:entry) do
+    {
+      value_field: {
+        'es' => 'foo',
+        'en-US' => 'bar'
+      },
+      array_field: [
+        {
+          'es' => 'foobar',
+          'en-US' => 'baz'
+        }
+      ]
+    }
+  end
+
   subject { HelpersMock.new }
 
   before(:each) do
@@ -28,5 +43,57 @@ class InstanceDouble
         expect(subject.contentful_instances.size).to eq(2)
       end
     end
+
+    describe 'localization helpers' do
+      describe '#localize_value' do
+        it 'returns value if not a hash independently of locale' do
+          expect(subject.localize_value('foo', 'es')).to eq('foo')
+        end
+
+        describe 'value is a hash' do
+          it 'returns fallback_locale value if locale not found' do
+            expect(subject.localize_value({'en-US' => 'foo'}, 'es')).to eq('foo')
+            expect(subject.localize_value({'de-DE' => 'bar'}, 'es', 'de-DE')).to eq('bar')
+          end
+
+          it 'returns localized value if locale found' do
+            expect(subject.localize_value({'es' => 'foobar'}, 'es')).to eq('foobar')
+          end
+
+          it 'fails if locale or fallback_locale not found' do
+            expect { subject.localize_value({'de-DE' => 'baz'}, 'es') }.to raise_error KeyError
+          end
+        end
+      end
+
+      describe '#localize_array' do
+        it 'calls #localize_value for every element in the array' do
+          expect(subject).to receive(:localize_value).with({'es' => 'foo'}, 'es', 'en-US')
+
+          subject.localize_array([{'es' => 'foo'}], 'es')
+        end
+      end
+
+      describe '#localize' do
+        it 'calls #localize_value for a value field' do
+          expect(subject).to receive(:localize_value).with({'es' => 'foo', 'en-US' => 'bar'}, 'es', 'en-US').and_call_original
+
+          expect(subject.localize(entry, :value_field, 'es')).to eq('foo')
+        end
+
+        it 'calls #localize_array for an array field' do
+          expect(subject).to receive(:localize_array).with([{'es' => 'foobar', 'en-US' => 'baz'}], 'es', 'en-US').and_call_original
+
+          expect(subject.localize(entry, :array_field, 'es')).to eq(['foobar'])
+        end
+      end
+
+      it '#localize_entry' do
+        expect(subject.localize_entry(entry, 'es')).to eq({
+          value_field: 'foo',
+          array_field: ['foobar']
+        })
+      end
+    end
   end
 end

spec/contentful_middleman/instance_spec.rb

@@ -1,26 +1,5 @@
 require 'spec_helper'
 
-class OptionsDouble
-  DEFAULT_OPTIONS = {
-    space: {id: 'cfexampleapi', name: 'cats'},
-    access_token: 'b4c0n73n7fu1',
-    cda_query: {},
-    content_types: {},
-    use_preview_api: false,
-    all_entries: false,
-    rebuild_on_webhook: false,
-    webhook_timeout: 300
-  }
-
-  def initialize(options = DEFAULT_OPTIONS)
-    options.each do |field, value|
-      define_singleton_method(field.to_sym) do
-        value
-      end
-    end
-  end
-end
-
 class ExtensionDouble
   attr_reader :options
   def initialize(options = OptionsDouble.new)

spec/contentful_middleman/mappers/base_spec.rb

@@ -12,27 +12,71 @@
       client.entries
     }
   end
-  subject { described_class.new entries }
+
+  let(:entries_localized) do
+    vcr('mappers/entries_localized') {
+      client = Contentful::Client.new(
+        access_token: 'b4c0n73n7fu1',
+        space: 'cfexampleapi',
+        dynamic_entries: :auto
+      )
+
+      client.entries(locale: '*', include: 1)
+    }
+  end
+
+  let(:options) { OptionsDouble.new }
+  subject { described_class.new entries, options }
 
   describe 'instance methods' do
     let(:context) { ContentfulMiddleman::Context.new }
 
-    it '#map' do
-      expect(context.hashize).to eq({})
+    describe '#map' do
+      it 'maps entries without multiple locales' do
+        expect(context.hashize).to eq({})
+
+        expected = {
+          :id=>"6KntaYXaHSyIw8M6eo26OK",
+          :name=>"Doge",
+          :image=> {
+            :title=>"Doge",
+            :url=> "//images.contentful.com/cfexampleapi/1x0xpXu4pSGS4OukSyWGUK/cc1239c6385428ef26f4180190532818/doge.jpg"
+          },
+          :description=>"such json\nwow"
+        }
+
+        subject.map(context, entries.first)
+
+        expect(context.hashize).to eq(expected)
+      end
+
+      it 'maps entries with multiple locales' do
+        subject = described_class.new entries, OptionsDouble.new(cda_query: {locale: '*'})
+        expect(context.hashize).to eq({})
 
-      expected = {
-        :id=>"6KntaYXaHSyIw8M6eo26OK",
-        :name=>"Doge",
-        :image=> {
-          :title=>"Doge",
-          :url=> "//images.contentful.com/cfexampleapi/1x0xpXu4pSGS4OukSyWGUK/cc1239c6385428ef26f4180190532818/doge.jpg"
-        },
-        :description=>"such json\nwow"
-      }
+        expected = {
+          :id=>"6KntaYXaHSyIw8M6eo26OK",
+          :name=> {
+            :'en-US'=>"Doge"
+          },
+          :image=>{
+            :'en-US'=>{
+              "sys"=>{
+                "type"=>"Link",
+                "linkType"=>"Asset",
+                "id"=>"1x0xpXu4pSGS4OukSyWGUK"
+              }
+            }
+          },
+          :description=>{
+            :'en-US'=>"such json\nwow"
+          }
+        }
 
-      subject.map(context, entries.first)
+        subject.map(context, entries_localized.first)
 
-      expect(context.hashize).to eq(expected)
+        expect(context.hashize).to eq(expected)
+      end
     end
   end