elasticsearch_autocomplete 0.0.4 → 0.1.0

data/lib/elasticsearch_autocomplete/model_addition.rb

@@ -43,7 +43,14 @@ module ElasticsearchAutocomplete
             end
           end
 
-          sort { by options[:order], options[:sort_mode] || 'asc' } if options[:order].present?
+          sort do
+            if options[:geo_order] && options[:with]
+              lat = options[:with].delete('lat').presence
+              lon = options[:with].delete('lon').presence
+              by('_geo_distance', {'lat_lon' => [lat, lon].join(','), 'order' => 'asc', 'unit' => 'km'}) if lat && lon
+            end
+            by(options[:order], options[:sort_mode] || 'asc') if options[:order].present?
+          end
 
           filter(:and, :filters => options[:with].map { |k, v| {:terms => {k => ElasticsearchAutocomplete.val_to_array(v)}} }) if options[:with].present?
           if options[:without].present?
@@ -67,10 +74,6 @@ module ElasticsearchAutocomplete
             end
       end
 
-      def for_input_token(r, attr='name_ru')
-        {:name => r[attr], :id => r.id}
-      end
-
       def ac_mode_config
         ElasticsearchAutocomplete::MODES[ac_opts[:mode]]
       end

data/lib/elasticsearch_autocomplete/version.rb

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

metadata

@@ -2,14 +2,14 @@
 name: elasticsearch_autocomplete
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-18 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: 1402164139427117718
+      hash: 1737804148958330559
   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: 1402164139427117718
+      hash: 1737804148958330559
   none: false
 requirements: []
 rubyforge_project: