[MODEL] Added proper support for the new "multi_fields" in the mapping DSL

This branch updates the `mapping` DSL to have nested `indexes` calls produce
embedded fields (instead of properties) for the core types where this is
appropriate.

This is allowed starting with [elasticsearch 1.0][es10mf] as a replacement for
`multi_field`.

[es10mf]: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/_multi_fields.html

`type: "multi_field"` will still work as before; this change should not break
backwards compatibility.

Closes elastic#138

Author: rsutphin

elasticsearch-model/lib/elasticsearch/model/indexing.rb

@@ -36,6 +36,9 @@ def as_json(options={})
       class Mappings
         attr_accessor :options, :type
 
+        # @private
+        TYPES_WITH_EMBEDDED_PROPERTIES = %w(object nested)
+
         def initialize(type, options={})
           raise ArgumentError, "`type` is missing" if type.nil?
 
@@ -49,7 +52,7 @@ def indexes(name, options = {}, &block)
 
           if block_given?
             @mapping[name][:type] ||= 'object'
-            properties = @mapping[name][:type] == 'multi_field' ? :fields : :properties
+            properties = TYPES_WITH_EMBEDDED_PROPERTIES.include?(@mapping[name][:type]) ? :properties : :fields
 
             @mapping[name][properties] ||= {}
 

elasticsearch-model/test/unit/indexing_test.rb

@@ -90,27 +90,36 @@ class NotFound < Exception; end
         assert_equal 'string', mappings.to_hash[:mytype][:properties][:bar][:type]
       end
 
-      should "define embedded properties" do
-        mappings = Elasticsearch::Model::Indexing::Mappings.new :mytype
+      %w(string long double boolean multi_field).each do |outer_type|
+        should "define embedded fields for #{outer_type}" do
+          mappings = Elasticsearch::Model::Indexing::Mappings.new :mytype
 
-        mappings.indexes :foo do
-          indexes :bar
-        end
+          mappings.indexes :foo, type: outer_type do
+            indexes :raw, analyzer: 'keyword'
+          end
 
-        mappings.indexes :multi, type: 'multi_field' do
-          indexes :multi, analyzer: 'snowball'
-          indexes :raw,   analyzer: 'keyword'
+          foo_mapping = mappings.to_hash[:mytype][:properties][:foo]
+
+          assert_equal outer_type, foo_mapping[:type]
+          assert_nil foo_mapping[:properties]
+          assert_equal 'string', foo_mapping[:fields][:raw][:type]
         end
+      end
 
-        assert_equal 'object', mappings.to_hash[:mytype][:properties][:foo][:type]
-        assert_equal 'string', mappings.to_hash[:mytype][:properties][:foo][:properties][:bar][:type]
+      %w(object nested).each do |outer_type|
+        should "define embedded properties for #{outer_type}" do
+          mappings = Elasticsearch::Model::Indexing::Mappings.new :mytype
 
-        assert_equal 'multi_field', mappings.to_hash[:mytype][:properties][:multi][:type]
-        assert_equal 'snowball', mappings.to_hash[:mytype][:properties][:multi][:fields][:multi][:analyzer]
-        assert_equal 'keyword',  mappings.to_hash[:mytype][:properties][:multi][:fields][:raw][:analyzer]
-      end
+          mappings.indexes :foo, type: outer_type do
+            indexes :bar
+          end
 
-      should "define multi_field properties" do
+          foo_mapping = mappings.to_hash[:mytype][:properties][:foo]
+
+          assert_equal outer_type, foo_mapping[:type]
+          assert_nil foo_mapping[:fields]
+          assert_equal 'string', foo_mapping[:properties][:bar][:type]
+        end
       end
     end