smart_search 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4452571bb09d489fdd980a8b151245b891470c2
-  data.tar.gz: d5d8f1b4a301583170703bf6f7c0e322d3b1c59a
+  metadata.gz: 869d08c2cff4be98569eb734dfdce5d675807fc2
+  data.tar.gz: bc6139fd0e37f7c0fc5c9d74d056d91a5132d6e6
 SHA512:
-  metadata.gz: 001028ede264fd11fad4bbf5a2a1c106c28fa3d5581ef23f1c5839e432b4b66286efc55152b35738187da969a606277c86bb2e2bce9b9839e0dfefe7c5ef2697
-  data.tar.gz: 770d3e266a57b8e1adf23893c85893c2d3248e840974cbd050fad9f110930bebd8561365b377287688d2570d02173491e7a9b55b472e9969ce097b1cb06fb311
+  metadata.gz: 4d195f3d1ab9c0a5a7317ffc5412b4708ad440aa10e05079e5729ee3865866f79f0ddd820634ed189920811e859f6f72b648aa655a4d83ff261885a72872772f
+  data.tar.gz: 31f672e5448d8b491016c132f34b7288b8e057b8b98e039466c83a89d564b99c0c7781ece2812005c4e50dbff6871aa19facf20c0a378bda0ea26023f04a5cb1

data/lib/smart_search.rb

@@ -10,11 +10,11 @@ require "smart_search_tag"
 
 
 module SmartSearch
-  
+
   def self.included(base)
     base.extend ClassMethods
-  end  
-  
+  end
+
   # Class Methods for ActiveRecord
   module ClassMethods
     # Enable SmartSearch for the current ActiveRecord model.
@@ -28,228 +28,234 @@ module SmartSearch
       if table_exists?
         # Check if search_tags exists
         if !is_smart_search? || options[:force] == true || Rails.env == "test"
-          
+
           cattr_accessor :condition_default, :group_default, :tags, :order_default, :enable_similarity, :default_template_path
           send :include, InstanceMethods
-            self.send(:after_save, :create_search_tags)
+            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
-            
+
+            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"  
+              raise ArgumentError, ":conditions must be a valid SQL Query"
             else
               self.condition_default = nil
-            end  
-          
+            end
+
             self.order_default = options[:order]
 
             self.tags = options[:on] || []
         end
-      end  
+      end
     end
-    
+
     # Verify if SmartSearch already loaded for this model
     def is_smart_search?
       self.included_modules.include?(InstanceMethods)
     end
-    
+
     # defines where to look for a partial to load when displaying results for this model
     def result_template_path
       "/search/results/#{self.name.split("::").last.underscore}"
-    end  
-    
+    end
+
     # Serach database for given search tags
     def find_by_tags(tags = "", options = {})
       if self.is_smart_search?
-        
+
+        tags = tags.join(" ") if tags.is_a?(Array)
+
         # Save Data for similarity analysis
         if tags.size > 3
           self.connection.execute("INSERT INTO `#{::SmartSearchHistory.table_name}` (`query`) VALUES ('#{tags.gsub(/[^a-zA-ZäöüÖÄÜß\ ]/, '')}');")
-        end  
-        
-        tags = tags.split(/[\ -]/).select {|t| !t.blank?}
-        
+        end
+
+        tags = tags.gsub(/[\(\)\[\]\'\"\*\%\|]/, '').split(/[\ -]/).select {|t| !t.blank?}
+
         # Fallback for Empty String
         tags << "#" if tags.empty?
-        
+
         # Similarity
         if self.enable_similarity == true
-          tags.map! do |t|   
+          tags.map! do |t|
             similars = SmartSimilarity.similars(t, :increment_counter => true).join("|")
             "search_tags REGEXP '#{similars}'"
-          end  
-          
+          end
+
         else
           tags.map! {|t| "search_tags LIKE '%#{t}%'"}
-        end  
-        
+        end
+
         # 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 
-        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 
+          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  
-        
+        end
+
         # Enable unscoped searching
         if options[:unscoped] == true
           results     =  self.unscoped.where(:id => result_ids)
-        else  
+        else
           results     =  self.where(:id => result_ids)
-        end  
-        
-        
-        
+        end
+
         if options[:conditions]
           results = results.where(options[:conditions])
         end
-        
+
         if !self.condition_default.blank?
           results = results.where(self.condition_default)
-        end  
-        
-        if options[:group] 
+        end
+
+        if options[:group]
           results = results.group(options[:group])
-        end  
-        
+        end
+
         if options[:order] || self.order_default
           results = results.order(options[:order] || self.order_default)
         else
           ordered_results = []
-          results.each do |r| 
+          results.each do |r|
             r.query_score = result_scores[r.id]
             ordered_results[result_ids.index(r.id)] = r
-          end  
-          
+          end
+
           results = ordered_results.compact
-        end      
-                
+        end
+
         return results
-      else                      
+      else
         raise "#{self.inspect} is not a SmartSearch"
-      end  
+      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
-        printf "Set search index for #{self.name}: #{done}%%                  \r"
-      end  
-    end  
-    
+      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  
-         
-  end  
-  
+    end
+
+  end
+
   # Instance Methods for ActiveRecord
   module InstanceMethods
-    
+
     # Load the result template path for this instance
     def result_template_path
       self.class.result_template_path
-    end  
-    
+    end
+
+    def dont_update_search_tags!
+      self.dont_update_search_tags = true
+    end
+
+    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
       tags      = []
-      
+
       self.class.tags.each do |tag|
-        
+
         if !tag.is_a?(Hash)
-          tag = {:field_name => tag, :boost => 1, :search_tags => ""} 
+          tag = {:field_name => tag, :boost => 1, :search_tags => ""}
         else
           tag[:search_tags] = ""
           tag[:boost] ||= 1
-        end    
-        
+        end
+
         if tag[:field_name].is_a?(Symbol)
           tag[:search_tags] << self.send(tag[:field_name]).to_s
         elsif tag[:field_name].is_a?(String)
-          tag_methods = tag[:field_name].split(".")  
+          tag_methods = tag[:field_name].split(".")
           tagx = self.send(tag_methods[0])
           tag_methods[1..-1].each do |x|
             tagx = tagx.send(x) rescue ""
           end
-          tag[:search_tags] << tagx.to_s  
+          tag[:search_tags] << tagx.to_s
         end
-        
-        tag[:search_tags] = tag[:search_tags].split(" ").uniq.join(" ").downcase.clear_html   
+
+        tag[:search_tags] = tag[:search_tags].split(" ").uniq.join(" ").downcase.clear_html
         tags << tag
       end
-      
-      
+
+
       self.clear_search_tags
-      
+
       # Merge search tags with same boost
       @merged_tags = {}
-      
+
       tags.each do |t|
         boost = t[:boost]
-        
+
         if @merged_tags[boost]
-        
+
           @merged_tags[boost][:field_name] << ",#{t[:field_name]}"
           @merged_tags[boost][:search_tags] << " #{t[:search_tags]}"
         else
           @merged_tags[boost] = {:field_name => "#{t[:field_name]}", :search_tags => t[:search_tags], :boost => boost }
-        end    
-        
-      end  
-      
+        end
+
+      end
+
       @merged_tags.values.each do |t|
         if !t[:search_tags].blank? && t[:search_tags].size > 1
-          SmartSearchTag.create(t.merge!(:table_name => self.class.table_name, :entry_id => self.id, :search_tags => t[:search_tags].strip.split(" ").uniq.join(" "))) 
-        end  
+          SmartSearchTag.create(t.merge!(:table_name => self.class.table_name, :entry_id => self.id, :search_tags => t[:search_tags].strip.split(" ").uniq.join(" ")))
+        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}")
-      end  
-    end    
-    
-  end    
-        
+        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
-    
+
     self.search_models = []
     self.public_models = []
-    
+
     def self.get_search_models
-      self.search_models.map {|m| m.constantize}  
+      self.search_models.map {|m| m.constantize}
     end
-    
+
     def self.get_public_models
-      self.public_models.map {|m| m.constantize}  
-    end  
-    
-  end  
-  
-  
+      self.public_models.map {|m| m.constantize}
+    end
+
+  end
+
+
 end
 
 

data/lib/tasks/smart_search.rake

@@ -4,7 +4,7 @@ namespace :smart_search do
     require File.expand_path("../../smart_similarity", __FILE__)
     SmartSimilarity.load_from_query_history
   end
-  
+
   desc "Load similarity data from file - Use FILE=path/to/file to specify file"
   task :similarity_from_file => :environment do
     require File.expand_path("../../smart_similarity", __FILE__)
@@ -12,47 +12,47 @@ namespace :smart_search do
       raise ArgumentError, "No file specified. "
     elsif !File.exist?(ENV['FILE_PATH'])
       raise ArgumentError, "File not found "
-    else    
+    else
       SmartSimilarity.load_file(ENV['FILE_PATH'])
-    end  
+    end
   end
-  
+
   desc "Load similarity data from url - Use URL=http://.../ to specify url - Requires 'curl'"
   task :similarity_from_url => :environment do
     require File.expand_path("../../smart_similarity", __FILE__)
     if ENV['URL'].nil?
       raise ArgumentError, "No URL specified. "
-    else    
+    else
       SmartSimilarity.load_url(ENV['URL'])
-    end  
+    end
   end
-  
-  
-  
+
+
+
   desc "load ignore words list"
   task :load_ignore_words => :environment do
     require File.expand_path("../../smart_search_ignore_word", __FILE__)
-    
+
     dic_path = File.expand_path("../../../dictionaries/*", __FILE__)
-    
+
     raise dic_path.inspect
-    
+
     dic_folders = Dir.glob(dic_path).select {|d| File.directory?(d)}
-    
+
     dic_folders.each do |folder|
       locale = folder.split("/").last
       word_file = File.join(folder, "#{locale}.ignore_words.dic")
       if File.exists?(word_file)
         File.open(word_file, "r").each_line do |word|
           SmartSearchIgnoreWord.create(:word => word.strip.downcase, :locale => locale)
-        end  
-      end  
-    end  
-  end   
-  
-  
-
-    
-end  
+        end
+      end
+    end
+  end
+
+
+
+
+end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_search
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: friendly_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.61
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.61
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
 description: SmartSearch adds full-text search functions to ActiveRecord running with
   MySQL, including search for similiar words. Its fast, simple, and works with almost
   zero-config!
-email: it-support@friends-systems.de
+email: florian.eck@el-digital.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Simple, easy to use search MySQL based search for ActiveRecord
@@ -120,4 +120,3 @@ test_files:
 - test/unit/01_smart_search_test.rb
 - test/unit/02_smart_search_similarity_test.rb
 - test/unit/03_smart_search_boost_test.rb
-has_rdoc: