sander6-enygma 0.1.0 → 0.1.1

data/lib/enygma/configuration.rb

@@ -111,18 +111,20 @@ module Enygma
       self.instance_eval(&config)
     end
     
-    attr_reader :adapter, :table, :indexes, :target_attr, :match_mode, :weights, :latitude, :longitude, :resource
+    attr_reader :indexes, :weights, :index_weights, :latitude, :longitude
     
     def initialize(attributes = {}, &block)
-      @adapter      = @@adapter
-      @table        = nil
-      @indexes      = []
-      @target_attr  = @@target_attr
-      @match_mode   = :all
-      @weights      = {}
-      @latitude     = 'lat'
-      @longitude    = 'lng'
-      @key_prefix   = nil
+      @adapter        = @@adapter
+      @table          = nil
+      @indexes        = []
+      @target_attr    = @@target_attr
+      @match_mode     = :all
+      @fragment_mode  = :exact
+      @weights        = {}
+      @index_weights  = {}
+      @latitude       = 'lat'
+      @longitude      = 'lng'
+      @key_prefix     = nil
       attributes.each do |name, value|
         self.__send__(name, value)
       end
@@ -178,8 +180,12 @@ module Enygma
       return @table
     end
     
-    def weight(attribute, value)
-      @weights[attribute.to_s] = value
+    def weight(weights = {})
+      @weights = weights
+    end
+
+    def weight_index(indexes = {})
+      @index_weights = indexes
     end
     
     def index(index)
@@ -191,12 +197,27 @@ module Enygma
       return @match_mode if mode.nil?
       @match_mode = mode
     end
+
+    def fragment_mode(mode = nil)
+      return @fragment_mode if mode.nil?
+      @fragment_mode = mode
+    end
     
     def target_attr(name = nil)
       return @target_attr if name.nil?
       @target_attr = name
     end
     
+    def latitude_attr(name = nil)
+      return @latitude if name.nil?
+      @latitude = name
+    end
+    
+    def longitude_attr(name = nil)
+      return @longitude if name.nil?
+      @latitude = name
+    end
+    
     def sphinx
       @@sphinx
     end    

data/lib/enygma/search.rb

@@ -53,6 +53,18 @@ module Enygma
       :extended       => Sphinx::Client::SPH_SORT_EXTENDED,
       :expression     => Sphinx::Client::SPH_SORT_EXPR
     }
+
+    class InvalidFragementMatchingScheme < StandardError; end
+
+    frag_proc = Proc.new { |s| raise InvalidFragementMatchingScheme }
+    FRAGMENT_MODES = Hash.new(frag_proc).merge({
+      :exact    => Proc.new { |s| s },
+      :start    => Proc.new { |s| s.split(/\s+/).collect {|f| f + '*'}.join(' ') },
+      :end      => Proc.new { |s| s.split(/\s+/).collect {|f| '*' + f }.join(' ') },
+      :fragment => Proc.new { |s| s.split(/\s+/).collect {|f| '*' + f + '*' }.join(' ') },
+      :fuzzy    => Proc.new { |s| '*' + s.delete(' ').split(//).join('*') + '*' },
+      :textmate => Proc.new { |s| '*' + s.delete(' ').split(//).join('*') + '*' }
+    })
        
     def initialize(*args, &block)
       overrides = args.last.is_a?(Hash) ? args.pop : {}
@@ -71,11 +83,12 @@ module Enygma
       }
       @sphinx   = Sphinx::Client.new
 
-      @indexes      = config.indexes
-      @term         = overrides[:term] || ""
-      @target_attr  = config.target_attr
-      @match_mode   = MATCH_MODES[config.match_mode]
-      @key_prefix   = config.key_prefix || ''
+      @indexes        = config.indexes
+      @term           = overrides[:term] || ""
+      @target_attr    = config.target_attr
+      @match_mode     = MATCH_MODES[config.match_mode]
+      @fragment_mode  = config.fragment_mode
+      @key_prefix     = config.key_prefix || ''
       
       @latitude   = config.latitude
       @longitude  = config.longitude
@@ -85,6 +98,13 @@ module Enygma
       @max        = @sphinx.instance_variable_get(:@maxmatches)
       @cutoff     = @sphinx.instance_variable_get(:@cutoff)
 
+      @weights        = config.weights.inject({}) { |weights, (attr, weight)| weights.merge({ attr.to_s => weight })} || {}
+      @index_weights  = config.index_weights.inject({}) { |weights, (index, weight)| weights.merge({ Enygma.indexify(index) => weight })} || {}
+      @sphinx.SetFieldWeights(@weights)
+      @sphinx.SetIndexWeights(@index_weights)
+
+      @fields = []
+
       @return_attributes  = []
 
       @sphinx.SetServer(config.sphinx[:host], config.sphinx[:port])
@@ -113,6 +133,11 @@ module Enygma
       self
     end
     
+    def in_fields(*fields)
+      @fields = fields
+      self
+    end
+    
     def using_match_mode(match_mode)
       @match_mode = MATCH_MODES[match_mode]
       @sphinx.SetMatchMode(@match_mode)
@@ -124,7 +149,12 @@ module Enygma
       self
     end
     alias_method :using_index, :using_indexes
-        
+    
+    def using_fragment_matching(mode)
+      @fragment_mode = mode
+      self
+    end
+    
     def filter(attribute, values, exclude = false)
       attribute = attribute.to_s
       case values
@@ -203,6 +233,18 @@ module Enygma
       set_limits
       self
     end
+
+    def weight(weights = {})
+      @weights.merge!(weights.inject({}) { |weights, (attr, weight)| weights.merge({ attr.to_s => weight })})
+      @sphinx.SetFieldWeights(@weights)
+      self
+    end
+
+    def weight_index(weights = {})
+      @index_weights.merge!(weights.inject({}) { |weights, (index, weight)| weights.merge({ Enygma.indexify(index) => weight })})
+      @sphinx.SetIndexWeights(@index_weights)
+      self
+    end
     
     def within(distance)
       Enygma::GeoDistanceProxy.new(self, distance)
@@ -237,7 +279,10 @@ module Enygma
     end
   
     def query_sphinx
-      sphinx_response = @sphinx.Query(@term, @indexes.join(', '))
+      query_string  = mutate_query_for_field_searching(@term)
+      query_string  = FRAGMENT_MODES[@fragment_mode][query_string]
+      query_indexes = @indexes.join(', ')
+      sphinx_response = @sphinx.Query(query_string, query_indexes)
       raise InvalidSphinxQuery unless sphinx_response
       sphinx_response
     end
@@ -246,5 +291,11 @@ module Enygma
       ids = results['matches'].collect { |match| match['attrs'][@target_attr] }.uniq
       @database[:adapter].query(:table => @database[:table], :ids => ids, :key_prefix => @key_prefix)
     end
+    
+    def mutate_query_for_field_searching(query)
+      return query if @fields.empty?
+      self.using_match_mode(:extended2)
+      "@(#{@fields.collect {|f| f.to_s}.join(',')}) #{query}"
+    end
   end  
 end

data/lib/enygma/version.rb

@@ -2,7 +2,7 @@ module Enygma
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 0 
+    TINY  = 1 
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sander6-enygma
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sander Hartlage