smart_search 0.0.68 → 0.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f60a9bffb75ceceade932e2331a8f14f1ff1b6ae
-  data.tar.gz: 6f24ec4a0817fd3a165a85d8f5fc37020cdd9c8d
+  metadata.gz: dfd2dd9fd04bc74f2c8697af8b3ee58145f9f64a
+  data.tar.gz: 8021f287ed9b035434f002837ec3a9eef612253d
 SHA512:
-  metadata.gz: 0d9560a45cd4924650aad7b77b5c8d368b4f4bec1aac7d343ce4fdab8f9753ca216b1174858273a175911f81347235e18341771ca50e79748c5d2c40e70bc8ea
-  data.tar.gz: ab00b0d1a76232e7e755610ca4010b9bfa93d60aa568149a9302c623d19cc68b2b97818d58d6072827d64f7bbff3ec5143a335b3e44559fad4a982b2eecc6d9d
+  metadata.gz: b1ec9e9a8c55ce8cda457288a7dc1dff33adfd5f847fd13d33f90601410759313f23b1352ef4efd7cbaf0f49c5d2f86919ecdd4c5c05402364bd4e5575eb99d3
+  data.tar.gz: ca66520132e062cd2cc711e5ffefc3f8f40ae04c524f8032fe07010d7b3064e396294912390a4c0d697b85c76533e580abab6170d35f4bdd0574f7ce46de951e

data/lib/smart_search.rb

@@ -31,8 +31,8 @@ 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)
-            self.send(:before_destroy, :create_search_tags)
+            self.send(:after_save, :create_search_tags) unless options[:auto] == false
+            self.send(:before_destroy, :clear_search_tags)
             self.enable_similarity ||= true
             
             attr_accessor :query_score
@@ -143,7 +143,6 @@ module SmartSearch
       s = self.all.size.to_f
       self.all.each_with_index do |a, i|
         a.create_search_tags
-        a.send(:update_without_callbacks)
         done = ((i+1).to_f/s)*100
         printf "Set search index for #{self.name}: #{done}%%                  \r"
       end  
@@ -191,7 +190,7 @@ module SmartSearch
           tag[:search_tags] << tagx.to_s  
         end
         
-        tag[:search_tags] = tag[:search_tags].split(" ").uniq.join(" ").downcase   
+        tag[:search_tags] = tag[:search_tags].split(" ").uniq.join(" ").downcase.clear_html   
         tags << tag
       end
       
@@ -199,18 +198,25 @@ module SmartSearch
       self.clear_search_tags
       
       # Merge search tags with same boost
-      #merged_tags = {}
-      #tags.each do |t|
-      #  if merged_tags[t[:boost]]
-      #    merged_tags[t[:boost]][:field_name] << ",#{t[:field_name].to_s}"
-      #    merged_tags[t[:boost]][:search_tags] << " #{t[:search_tags]}"
-      #  else
-      #    merged_tags[t[:boost]] = {:field_name => t[:field_name].to_s, :search_tags => t[:search_tags], :boost => t[:boost] }
-      #  end    
-      #end  
+      @merged_tags = {}
       
       tags.each do |t|
-        SmartSearchTag.create(t.merge!(:table_name => self.class.table_name, :entry_id => self.id))
+        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  
+      
+      @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  
       end
       
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_search
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.72
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 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: