smart_search 0.0.96 → 0.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eea1ae08ee42a272bb6c46e9be0879bdc998e45
-  data.tar.gz: eb172e38f3cfac374fc8f2dc7f42a0cee93ee152
+  metadata.gz: c97bb0dff9b1f7173a7598a8f34999a6314da64f
+  data.tar.gz: f94b277431d1ac6b6a0e13e822fdec73636f9ac3
 SHA512:
-  metadata.gz: 10d57223b4205896105c73232d15501d2d28f54de3ea6f95f223e444c61d027751ef499b40e03be6ba2eb0587851ed51b0fac509c9fe934b054a123571122969
-  data.tar.gz: 6938b923f45869af837e34c333f3105cc8e3da3577373bf4c3942253b085ed73aa1a54899aea64245655a886ca832ebc568b8da5651220ccb60c52fc49310962
+  metadata.gz: c5292dbce629bba65a4e58ef2434fbcb772aec3f41b7f331d90e85bf2bca9dc2ea3e8ba80cee85d8df3cf7640499a9923869aa6eff1ceb4212a80271fdbbd25d
+  data.tar.gz: daa9ba025fabc9a3410f1f182f16d7ec4bcd26d4c9db5f637f50e3b957dad971a191a8def6ad3a6b8d796492ae7dff0c26dc841fea172943e8dd1ac7f7b1c2f1

data/lib/smart_search.rb

@@ -31,24 +31,24 @@ module SmartSearch
 
           cattr_accessor :condition_default, :group_default, :tags, :order_default, :enable_similarity, :default_template_path
           send :include, InstanceMethods
-            self.send(:after_save, :create_search_tags, :if => :update_search_tags?) unless options[:auto] == false
-            self.send(:before_destroy, :clear_search_tags)
-            self.enable_similarity ||= true
-
-            attr_accessor :query_score, :dont_update_search_tags
-
-            # options zuweisen
-            if options[:conditions].is_a?(String) && !options[:conditions].blank?
-              self.condition_default = options[:conditions]
-            elsif !options[:conditions].nil?
-              raise ArgumentError, ":conditions must be a valid SQL Query"
-            else
-              self.condition_default = nil
-            end
+          self.send(:after_save, :create_search_tags, :if => :update_search_tags?) unless options[:auto] == false
+          self.send(:before_destroy, :clear_search_tags)
+          self.enable_similarity ||= true
+
+          attr_accessor :query_score, :dont_update_search_tags
+
+          # options zuweisen
+          if options[:conditions].is_a?(String) && !options[:conditions].blank?
+            self.condition_default = options[:conditions]
+          elsif !options[:conditions].nil?
+            raise ArgumentError, ":conditions must be a valid SQL Query"
+          else
+            self.condition_default = nil
+          end
 
-            self.order_default = options[:order]
+          self.order_default = options[:order]
 
-            self.tags = options[:on] || []
+          self.tags = options[:on] || []
         end
       end
     end
@@ -93,89 +93,91 @@ module SmartSearch
         # Load ranking from Search tags
         result_ids = []
         result_scores = {}
-          SmartSearchTag.connection.select_all("select entry_id, sum(boost) as score, group_concat(search_tags) as grouped_tags
+        SmartSearchTag.connection.select_all("select entry_id, sum(boost) as score, group_concat(search_tags) as grouped_tags
         from smart_search_tags where `table_name`= '#{self.table_name}' and
 
         (#{tags.join(' OR ')}) group by entry_id having (#{tags.join(' AND ').gsub('search_tags', 'grouped_tags')}) order by score DESC").each do |r|
-          result_ids << r["entry_id"].to_i
-          result_scores[r["entry_id"].to_i] = r['score'].to_f
-        end
-
-        # Enable unscoped searching
-        if options[:unscoped] == true
-          results     =  self.unscoped.where(:id => result_ids)
-        else
-          results     =  self.where(:id => result_ids)
-        end
+        result_ids << r["entry_id"].to_i
+        result_scores[r["entry_id"].to_i] = r['score'].to_f
+      end
 
-        if options[:conditions]
-          results = results.where(options[:conditions])
-        end
+      # Enable unscoped searching
+      if options[:unscoped] == true
+        results     =  self.unscoped.where(:id => result_ids)
+      else
+        results     =  self.where(:id => result_ids)
+      end
 
-        if !self.condition_default.blank?
-          results = results.where(self.condition_default)
-        end
+      if options[:conditions]
+        results = results.where(options[:conditions])
+      end
 
-        if options[:group]
-          results = results.group(options[:group])
-        end
+      if !self.condition_default.blank?
+        results = results.where(self.condition_default)
+      end
 
-        if options[:order] || self.order_default
-          results = results.order(options[:order] || self.order_default)
-        else
-          ordered_results = []
-          results.each do |r|
-            r.query_score = result_scores[r.id]
-            ordered_results[result_ids.index(r.id)] = r
-          end
+      if options[:group]
+        results = results.group(options[:group])
+      end
 
-          results = ordered_results.compact
+      if options[:order] || self.order_default
+        results = results.order(options[:order] || self.order_default)
+      else
+        ordered_results = []
+        results.each do |r|
+          r.query_score = result_scores[r.id]
+          ordered_results[result_ids.index(r.id)] = r
         end
 
-        return results
-      else
-        raise "#{self.inspect} is not a SmartSearch"
+        results = ordered_results.compact
       end
-    end
 
-    # reload search_tags for entire table based on the attributes defined in ':on' option passed to the 'smart_search' method
-    def set_search_index
-      s = self.all.size.to_f
-      self.all.each_with_index do |a, i|
-        a.create_search_tags
-        done = ((i+1).to_f/s)*100
-      end
+      return results
+    else
+      raise "#{self.inspect} is not a SmartSearch"
     end
+  end
 
-    # Load all search tags for this table into similarity index
-    def set_similarity_index
-      search_tags_list = self.connection.select_all("SELECT search_tags from #{SmartSearchTag.table_name} where `table_name` = #{self.table_name}").map {|r| r["search_tags"]}
-
-      SmartSimilarity.create_from_text(search_tags_list.join(" "))
+  # reload search_tags for entire table based on the attributes defined in ':on' option passed to the 'smart_search' method
+  def set_search_index
+    s = self.all.size.to_f
+    self.all.each_with_index do |a, i|
+      a.create_search_tags
+      done = ((i+1).to_f/s)*100
     end
+  end
+
+  # Load all search tags for this table into similarity index
+  def set_similarity_index
+    search_tags_list = self.connection.select_all("SELECT search_tags from #{SmartSearchTag.table_name} where `table_name` = #{self.table_name}").map {|r| r["search_tags"]}
 
+    SmartSimilarity.create_from_text(search_tags_list.join(" "))
   end
 
-  # Instance Methods for ActiveRecord
-  module InstanceMethods
+end
 
-    # Load the result template path for this instance
-    def result_template_path
-      self.class.result_template_path
-    end
+# Instance Methods for ActiveRecord
+module InstanceMethods
 
-    def dont_update_search_tags!
-      self.dont_update_search_tags = true
-    end
+  # Load the result template path for this instance
+  def result_template_path
+    self.class.result_template_path
+  end
 
-    def update_search_tags?
-      !self.dont_update_search_tags
-    end
+  def dont_update_search_tags!
+    self.dont_update_search_tags = true
+  end
 
-    # create search tags for this very record based on the attributes defined in ':on' option passed to the 'Class.smart_search' method
-    def create_search_tags
-      tags      = []
+  def update_search_tags?
+    !self.dont_update_search_tags
+  end
 
+  # create search tags for this very record based on the attributes defined in ':on' option passed to the 'Class.smart_search' method
+  def create_search_tags
+    # storing tags must never fail the systems
+    begin
+      tags      = []
+         
       self.class.tags.each do |tag|
 
         if !tag.is_a?(Hash)
@@ -228,37 +230,47 @@ module SmartSearch
           end
         end
       end
-
+        
+    rescue Exception => e
+      Rails.logger.error "SMART SEARCH FAILED TO TO STORE SEARCH TAGS #{self.class.name} #{self.id}"
+      Rails.logger.error e.message
+      Rails.logger.error puts e.backtrace
     end
+      
+      
 
-    # Remove search data for the instance from the index
-    def clear_search_tags
-      if !self.id.nil?
-        SmartSearchTag.connection.execute("DELETE from #{SmartSearchTag.table_name} where `table_name` = '#{self.class.table_name}' and entry_id = #{self.id}") rescue nil
-      end
-    end
+      
 
   end
 
+  # Remove search data for the instance from the index
+  def clear_search_tags
+    if !self.id.nil?
+      SmartSearchTag.connection.execute("DELETE from #{SmartSearchTag.table_name} where `table_name` = '#{self.class.table_name}' and entry_id = #{self.id}") rescue nil
+    end
+  end
+
+end
 
-  class Config
 
-    cattr_accessor  :search_models
-    cattr_accessor  :public_models
+class Config
 
-    self.search_models = []
-    self.public_models = []
+  cattr_accessor  :search_models
+  cattr_accessor  :public_models
 
-    def self.get_search_models
-      self.search_models.map {|m| m.constantize}
-    end
+  self.search_models = []
+  self.public_models = []
 
-    def self.get_public_models
-      self.public_models.map {|m| m.constantize}
-    end
+  def self.get_search_models
+    self.search_models.map {|m| m.constantize}
+  end
 
+  def self.get_public_models
+    self.public_models.map {|m| m.constantize}
   end
 
+end
+
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_search
 version: !ruby/object:Gem::Version
-  version: 0.0.96
+  version: 0.0.97
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails