elasticsearch_autocomplete 0.0.3 → 0.0.4

data/lib/elasticsearch_autocomplete/model_addition.rb

@@ -75,37 +75,41 @@ module ElasticsearchAutocomplete
         ElasticsearchAutocomplete::MODES[ac_opts[:mode]]
       end
 
-      private
-
       def define_ac_index(mode=:word)
-        mode_config = ac_mode_config
+        model = self
         settings ElasticsearchAutocomplete::Analyzers::AC_BASE do
           mapping do
             ac_search_attrs.each do |attr|
-              case mode
-                when :word
-                  indexes attr, :type => 'multi_field', :fields => {
-                      attr => {:type => 'string'},
-                      "#{mode_config[:base]}_#{attr}" => {:type => 'string', :index_analyzer => 'ac_edge_ngram', :search_analyzer => 'ac_search', :include_in_all => false},
-                      "#{mode_config[:word]}_#{attr}" => {:type => 'string', :index_analyzer => 'ac_edge_ngram_word', :search_analyzer => 'ac_search', :include_in_all => false}
-                  }
-                when :phrase
-                  indexes attr, :type => 'multi_field', :fields => {
-                      attr => {:type => 'string'},
-                      "#{mode_config[:base]}_#{attr}" => {:type => 'string', :index_analyzer => 'ac_edge_ngram', :search_analyzer => 'ac_search', :include_in_all => false},
-                  }
-                when :full
-                  indexes attr, :type => 'multi_field', :fields => {
-                      attr => {:type => 'string'},
-                      "#{mode_config[:base]}_#{attr}" => {:type => 'string', :index_analyzer => 'ac_edge_ngram', :search_analyzer => 'ac_search', :include_in_all => false, :boost => 3},
-                      "#{mode_config[:full]}_#{attr}" => {:type => 'string', :index_analyzer => 'ac_edge_ngram_full', :search_analyzer => 'ac_search', :include_in_all => false}
-                  }
-              end
+              indexes attr, model.ac_index_config(attr, mode)
             end
           end
         end
       end
 
+      def ac_index_config(attr, mode=:word)
+        defaults = {:type => 'string', :search_analyzer => 'ac_search', :include_in_all => false}
+        fields = case mode
+                   when :word
+                     {
+                         attr => {:type => 'string'},
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(:index_analyzer => 'ac_edge_ngram'),
+                         "#{ac_mode_config[:word]}_#{attr}" => defaults.merge(:index_analyzer => 'ac_edge_ngram_word')
+                     }
+                   when :phrase
+                     {
+                         attr => {:type => 'string'},
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(:index_analyzer => 'ac_edge_ngram')
+                     }
+                   when :full
+                     {
+                         attr => {:type => 'string'},
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(:index_analyzer => 'ac_edge_ngram', :boost => 3),
+                         "#{ac_mode_config[:full]}_#{attr}" => defaults.merge(:index_analyzer => 'ac_edge_ngram_full')
+                     }
+                 end
+        {:type => 'multi_field', :fields => fields}
+      end
+
       def ac_search_fields
         @ac_search_fields ||= ac_search_attrs.map { |attr| ac_mode_config.values.map { |prefix| "#{prefix}_#{attr}" } }.flatten
       end

data/lib/elasticsearch_autocomplete/version.rb

@@ -1,3 +1,3 @@
 module ElasticsearchAutocomplete
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -2,14 +2,14 @@
 name: elasticsearch_autocomplete
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -638938333914231974
+      hash: 1402164139427117718
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -638938333914231974
+      hash: 1402164139427117718
   none: false
 requirements: []
 rubyforge_project: