mm_es_search 0.0.3 → 0.0.4

data/lib/mm_es_search.rb

@@ -54,6 +54,7 @@ module MmEsSearch
   
   smart_load "mm_es_search/api/query/and_filter"
   smart_load "mm_es_search/api/query/bool_filter"
+  smart_load "mm_es_search/api/query/geo_distance_range_filter"
   smart_load "mm_es_search/api/query/has_child_filter"
   smart_load "mm_es_search/api/query/has_parent_filter"
   smart_load "mm_es_search/api/query/match_all_filter"

data/lib/mm_es_search/api/facet/geo_distance_facet.rb

@@ -2,7 +2,36 @@ module MmEsSearch
   module Api
     module Facet
       
-      
+      class GeoDistanceFacet < AbstractFacet
+        
+        key  :field, String
+        many :ranges, :class_name => 'MmEsSearch::Api::Facet::RangeItem'
+        key  :key_field, String
+        key  :value_field, String
+        key  :key_script, String
+        key  :value_script, String
+        key  :params, Hash
+        
+        key :center #any of the valid formats, see http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-filter.html
+        key :unit, String, :default => "km"
+        
+        def to_es_query
+          
+          range_params = {field => center, :unit => unit}
+          range_params.merge!(:ranges => ranges.map(&:attributes))
+          range_params.merge!(:key_field => size)            if key_field?
+          range_params.merge!(:value_field => size)          if value_field?
+          range_params.merge!(:key_script => size)           if key_script?
+          range_params.merge!(:value_script => size)         if value_script?
+          range_params.merge!(:params => params)             unless params.empty?
+          
+          facet_params = {:geo_distance => range_params}.merge(super)
+          
+          return {label => facet_params}
+          
+        end
+        
+      end
       
     end
   end

data/lib/mm_es_search/api/query/geo_distance_range_filter.rb

@@ -0,0 +1,60 @@
+module MmEsSearch
+  module Api
+    module Query
+      
+      class GeoDistanceRangeFilter < AbstractQuery
+        
+        key :field, String
+        key :path, String
+        
+        key :center #any of the valid formats, see http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-filter.html
+        key :unit, String, :default => "km"
+        
+        key :from
+        key :to
+        key :include_lower, :default => true
+        key :include_upper, :default => true
+        key :boost, Float
+        
+        # def to_mongo_query(options = {})
+#           
+          # range_params = {}
+#           
+          # if from
+            # cmd = include_lower ? '$gte' : '$gt'
+            # range_params.merge!({cmd => from})
+          # end
+#           
+          # if to
+            # cmd = include_upper ? '$lte' : '$lt'
+            # range_params.merge!({cmd => to})
+          # end
+#           
+          # if options[:negated]
+            # return {mongo_abs_field => {"$not" => range_params}}
+          # else
+            # return {mongo_abs_field => range_params}
+          # end
+#           
+        # end
+        
+        def to_es_query
+          
+          raise "must have either :from or :to" if from.nil? and to.nil?
+          
+          range_params = {es_abs_field => center, :unit => unit}
+          range_params.merge!({:from => from}) unless from.nil?
+          range_params.merge!({:to => to}) unless to.nil?
+          range_params.merge!({:include_lower => include_lower}) unless (from.nil? or include_lower == true)
+          range_params.merge!({:include_upper => include_upper}) unless (to.nil? or include_upper == true)
+          range_params.merge!({:boost => boost}) unless boost.nil?
+      
+          return {:geo_distance_range => range_params}
+          
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/mm_es_search/models/abstract_range_facet_model.rb

@@ -36,7 +36,7 @@ module MmEsSearch
           transitions :to => :need_row_data, :from => [:need_field_stats, :need_row_data]
         end
         
-        aasm_event :prepare_for_new_data, :after => :prune_unchecked_rows do
+        aasm_event :prepare_for_new_data, :after => :reinitialize do
           transitions :to => :need_field_stats, :from => [:ready_for_display, :need_field_stats, :need_row_data]
         end
         
@@ -52,6 +52,11 @@ module MmEsSearch
     
       end
       
+      def reinitialize
+        prune_unchecked_rows
+        field_stats_set if is_distance?
+      end
+      
       def result_name
         'ranges'
       end
@@ -60,6 +65,10 @@ module MmEsSearch
         false
       end
       
+      def is_distance?
+        false
+      end
+      
       def timezone_matters?
         true
       end
@@ -89,17 +98,42 @@ module MmEsSearch
         # nil
       # end
   
+      def es_facet_class
+        if is_distance?
+          GeoDistanceFacet
+        else
+          RangeFacet
+        end
+      end
+      
+      def es_filter_class
+        if is_distance?
+          GeoDistanceRangeFilter
+        else
+          RangeFilter
+        end
+      end
+      
+      def distance_center
+        "gcpvj32dx" #London, UK
+      end
+  
       def to_facet
         case display_mode || select_display_mode
         when "range"
           initialize_rows
-          RangeFacet.new(
+          f = es_facet_class.new(
             default_params.merge(
               :label        => prefix_label('display_result'),
               :ranges       => rows.map(&:to_range_item),
               :facet_filter => facet_filter
             )
           )
+          if is_distance?
+            f.center = distance_center
+            f.unit   = distance_unit
+          end
+          f
         when "histogram"
           raise NotImplementedError
         else
@@ -122,6 +156,8 @@ module MmEsSearch
         @transform_lookup = {}
         if is_time?
           initialize_time_rows
+        elsif is_distance?
+          initialize_distance_rows
         else
           initialize_numeric_rows
         end
@@ -332,6 +368,15 @@ module MmEsSearch
         build_rows(values)
       end
       
+      def distance_unit
+        @distance_unit ||= "km"
+      end
+      
+      def initialize_distance_rows
+        values = [0, 1, 5, 10, 50, 100]
+        build_rows(values)
+      end
+      
       def build_rows(values)
         self.rows = checked_rows #NOTE: we preserve selected rows
         if (num_values = values.length) == 2

data/lib/mm_es_search/version.rb

@@ -1,3 +1,3 @@
 module MmEsSearch
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jonathan Chambers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-27 00:00:00 +00:00
+date: 2013-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - lib/mm_es_search/api/query/custom_score_query.rb
 - lib/mm_es_search/api/query/dismax_query.rb
 - lib/mm_es_search/api/query/filtered_query.rb
+- lib/mm_es_search/api/query/geo_distance_range_filter.rb
 - lib/mm_es_search/api/query/has_child_filter.rb
 - lib/mm_es_search/api/query/has_child_query.rb
 - lib/mm_es_search/api/query/has_parent_filter.rb