Split base #compose result check into 2 methods

lib/chewy/fields/base.rb

@@ -48,14 +48,21 @@ def compose(*objects)
           end
         end
 
-        unless (@options[:ignore_blank] && @options[:ignore_blank] == true && !result.nil? && result.empty?) || (!@options[:ignore_blank] && @options[:type] && @options[:type] == :geo_point)
+        unless field_with_empty_value?(result) || geo_point_field_without_ignore_blank_flag?(result)
           {name => result}
         end
-        # {name => result}
       end
 
     private
 
+      def field_with_empty_value?(result)
+        @options[:ignore_blank] && @options[:ignore_blank] == true && !result.nil? && result.empty?
+      end
+
+      def geo_point_field_without_ignore_blank_flag?(result)
+        !@options[:ignore_blank] && @options[:type] && @options[:type] == :geo_point && !result.nil? && result.empty?
+      end
+
       def evaluate(objects)
         object = objects.first
 

spec/chewy/fields/base_spec.rb

@@ -407,6 +407,8 @@
         stub_model(:country)
 
         City.belongs_to :country
+        Location.belongs_to :city
+        City.has_one :location, -> { order :id }
         Country.has_many :cities, -> { order :id }
       end
 
@@ -516,7 +518,7 @@
 
         let(:country_with_cities) do
           location = Location.create!(lat: '1', lon: '1')
-          cities = [City.create!(id: 1, name: 'City1', location: location), City.create!(id: 2, name: 'City2', location: location)]
+          cities = [City.create!(id: 1, name: 'City1'), City.create!(id: 2, name: 'City2')]
 
           Country.create!(id: 1, cities: cities)
         end
@@ -536,10 +538,7 @@
 
         specify do
           expect(CountriesIndex::Country.root.compose(
-            'id' => 1, 'cities' => [
-              {'id' => 1, 'name' => 'City1'},
-              {'id' => 2, 'name' => 'City2'}]
-            )
+            country_with_cities)
           ).to eq(
             'id' => 1, 'cities' => [
               {'id' => 1, 'name' => 'City1'},