smart_search 0.0.4 → 0.0.7

data/test/test_helper.rb

@@ -0,0 +1,77 @@
+# -*- encoding : utf-8 -*-
+require 'rubygems'
+require 'bundler'
+require 'test/unit'
+require 'active_support'
+require 'active_record'
+require 'active_model'
+
+require "smart_search"
+require "smart_search/smart_search_engine"
+
+
+ActiveRecord::Base.establish_connection(:adapter => "mysql2", :database => "smart_search_test")
+
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :users do |t|
+      t.string  :first_name
+      t.string  :last_name
+      t.integer :office_id
+      t.date    :birthday
+      t.timestamps
+    end
+    
+    create_table :customers do |t|
+      t.string  :first_name
+      t.string  :last_name
+      t.integer :user_id
+      t.date    :birthday
+      t.timestamps
+    end
+    
+    create_table  :offices do |t|  
+      t.string  :name
+      t.timestamps
+    end
+    
+      
+  end  
+# 
+# def drop_db
+#   ActiveRecord::Base.connection.tables.each do |table|
+#     ActiveRecord::Base.connection.drop_table(table)
+#   end
+# end
+# 
+class User < ActiveRecord::Base
+  
+  belongs_to :office, :class_name => "Office", :foreign_key => "office_id"
+  
+  smart_search :on => [:full_name, 'office.name']
+  
+  def full_name
+    "#{self.first_name} #{self.last_name}"
+  end  
+end
+
+class Customer < ActiveRecord::Base
+  smart_search :on => [:first_name, :last_name, 'user.full_name', 'user.office.name', :birthday]
+  
+  def user
+    User.find(self.user_id)
+  end  
+  
+end        
+
+# This one has not included smart-search yet
+class Office < ActiveRecord::Base
+  smart_search :on => [:name, :user_names]
+  
+  def user_names
+    self.users.map {|u| u.full_name }.join(" ")
+  end
+  
+  def users
+    User.find_all_by_office_id(self.id)
+  end    
+end  

data/test/unit/01_smart_search_test.rb

@@ -0,0 +1,81 @@
+# -*- encoding : utf-8 -*-
+require "test_helper"
+class SmartSearchTest < Test::Unit::TestCase
+
+  def test_simple_search_tags_should_be_saved
+    office_name = "Office1"
+    office = Office.create(:name => office_name)
+    
+    Office.enable_similarity = false
+    
+    assert_equal office, Office.find_by_tags(office_name).first
+  end
+  
+  def test_search_tags_should_cross_reference
+    
+    office_name = "Office2"
+    
+    office  = Office.create(:name => office_name)
+    user    = User.create(:first_name => "My", :last_name => "User", :office_id => office.id)
+    
+    assert_equal user, User.find_by_tags("My User").first
+    assert_equal user, User.find_by_tags(office_name).first
+    
+    # test that all is linked correctly
+    assert_equal user.office, office
+    assert_equal user.office_id, office.id
+    assert_equal 1, office.users.size
+    
+    # test for loading user names to office
+    office.save
+    
+    assert_equal office, Office.find_by_tags("My User").first
+    
+  end     
+  
+  def test_should_use_default_conditions
+    office_id_ok  = 4
+    office_id_nok = 5
+    
+    User.smart_search :on => [:full_name], :conditions => "office_id <> #{office_id_nok}", :force => true
+    User.enable_similarity = false
+    
+    user    = User.create(:first_name => "Unknown", :last_name => "User", :office_id => office_id_nok)
+    user    = User.create(:first_name => "Public", :last_name => "User", :office_id => office_id_ok)
+    
+    assert_equal User.find_by_tags("unknown").size, 0
+    assert_equal User.find_by_tags("public").size, 1
+  end
+  
+  def test_should_use_default_order_and_order_should_be_overwriteable
+    User.smart_search :on => [:full_name], :order => :first_name, :force => true
+    User.enable_similarity = false
+    
+    user_c    = User.create(:first_name => "C", :last_name => "Test1")
+    user_a    = User.create(:first_name => "A", :last_name => "Test3")
+    user_b    = User.create(:first_name => "B", :last_name => "Test2")
+    
+    
+    assert_equal  user_a, User.find_by_tags("test").first
+    assert_equal  user_c, User.find_by_tags("test").last
+    
+    assert_equal  user_c, User.find_by_tags("test", :order => :last_name).first
+    assert_equal  user_a, User.find_by_tags("test", :order => :last_name).last
+  end
+  
+  def test_search_tags_should_work_with_array_of_strings   
+    User.smart_search :on => %w(first_name last_name office.name), :force => true
+    o = Office.create(:name => "Neandertal")
+    u = User.create(:first_name => "Homo", :last_name => "Sapiens", :office_id => o.id)
+    
+  end  
+  
+  
+  def test_should_create_search_history
+    User.find_by_tags("XXXYYY")
+
+    assert_not_equal 0, SmartSearchHistory.where(:query => "XXXYYY").size
+  end  
+  
+  
+end  

data/test/unit/02_smart_search_similarity_test.rb

@@ -0,0 +1,32 @@
+# -*- encoding : utf-8 -*-
+require "test_helper"
+class SmartSearchSimilartyTest < Test::Unit::TestCase
+  
+  def test_similarity_should_load_from_file
+    testfile_1 = File.expand_path("../../test_document_one_line.txt", __FILE__)
+    testfile_2 = File.expand_path("../../test_document_multi_line.txt", __FILE__)
+    SmartSimilarity.connection.execute "Truncate table #{SmartSimilarity.table_name}"
+    
+    assert_equal 0, SmartSimilarity.count
+    SmartSimilarity.load_file(testfile_2)
+    new_count = SmartSimilarity.count
+    assert_not_equal 0, new_count
+    
+    SmartSimilarity.load_file(testfile_1)
+    assert_not_equal new_count, SmartSimilarity.count
+  end
+  
+  def test_similarity_should_load_from_url
+    count = SmartSimilarity.count
+    SmartSimilarity.load_url("https://github.com/florianeck/smart_search")
+    assert_not_equal count, SmartSimilarity.count
+  end
+  
+  def test_similarity_should_load_from_history
+    count = SmartSimilarity.count
+    User.find_by_tags("this is history now")
+    SmartSimilarity.load_from_query_history
+    assert_not_equal count, SmartSimilarity.count
+  end      
+  
+end  

data/test/unit/03_smart_search_boost_test.rb

@@ -0,0 +1,60 @@
+# -*- encoding : utf-8 -*-
+require "test_helper"
+class SmartSearchBoostTest < Test::Unit::TestCase
+
+  def test_boost_search_index_cols_should_be_created
+    SmartSearchTag.connection.execute("TRUNCATE #{SmartSearchTag.table_name}")
+    Customer.smart_search :on => [
+      {:field_name => :first_name, :boost => 1},
+      {:field_name => :last_name, :boost => 2},
+      {:field_name => "user.full_name", :boost => 0.5},
+      ], :force => true
+    
+    user = User.create(:first_name => "Pi", :last_name => "Pa")
+    
+    Customer.create(:first_name => "Lorem", :last_name => "Ipsum", :user_id => user.id)
+    
+    assert_equal 1, SmartSearchTag.where(:field_name => "first_name", :boost => 1).count
+    assert_equal 1, SmartSearchTag.where(:field_name => "last_name", :boost => 2).count
+    assert_equal 1, SmartSearchTag.where(:field_name => "user.full_name", :boost => 0.5).count
+  end
+  
+  def test_boost_search__results_should_order_by_score
+    Customer.smart_search :on => [
+      {:field_name => :first_name, :boost => 1},
+      {:field_name => :last_name, :boost => 2},
+      {:field_name => "user.full_name", :boost => 0.5},
+      ], :force => true
+    
+    user = User.create(:first_name => "Rudi", :last_name => "Piff")
+    
+    c1 = Customer.create(:first_name => "Rudi", :last_name => "Rolle", :user_id => user.id)
+    c2 = Customer.create(:first_name => "Rolle", :last_name => "Rudi", :user_id => user.id)
+    c3 = Customer.create(:first_name => "Jackie", :last_name => "Brown", :user_id => user.id)
+    
+    results = Customer.find_by_tags("Rudi")
+    
+    assert_equal c1, results[1]
+    assert_equal c2, results[0]
+    assert_equal c3, results[2]
+  end
+  
+  
+  def test_same_boost_search_index_cols_should_be_grouped
+    
+    Customer.smart_search :on => [
+      {:field_name => :first_name, :boost => 2},
+      {:field_name => :last_name, :boost => 2},
+      {:field_name => "user.full_name", :boost => 0.5},
+      ], :force => true
+    
+    user = User.create(:first_name => "Pipi", :last_name => "Papa")
+    
+    customer = Customer.create(:first_name => "Lorem", :last_name => "Ipsum", :user_id => user.id)
+    
+    assert_equal 2, SmartSearchTag.where(:table_name => Customer.table_name, :entry_id => customer.id).count
+  end
+ 
+  
+  
+end  

metadata

@@ -1,66 +1,123 @@
 --- !ruby/object:Gem::Specification
 name: smart_search
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
-dependencies: []
-description: Adds easy to use full-text search to ActiveRecord models, based the attributes
-  you want to search. Including Controllers
+date: 2014-05-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+- !ruby/object:Gem::Dependency
+  name: amatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: friendly_extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.61
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.61
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+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
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/add_search_tags.rb
-- lib/smart_search.rb
-- app/controllers/search_controller.rb
-- app/views/search/_results_small.html.erb
-- app/views/search/all.html.erb
-- app/views/search/results/_ansprechpartner.html.erb
-- app/views/search/results/_calendar_entry.html.erb
-- app/views/search/results/_company.html.erb
-- app/views/search/results/_concept.html.erb
-- app/views/search/results/_customer.html.erb
-- app/views/search/results/_family.html.erb
-- app/views/search/results/_firma.html.erb
-- app/views/search/results/_product.html.erb
-- app/views/search/results/_smart_document.html.erb
-- app/views/search/results/_topic.html.erb
-- app/views/search/results/_umsatz.html.erb
-- app/views/search/results/_umsatz_refactor.html.erb
-- app/views/search/results/_umsatz_storno.html.erb
-- app/views/search/results/_user.html.erb
-- app/views/search/results/_wiki_page.html.erb
+- config/database.yml
 - config/routes.rb
-homepage: https://rubygems.org/gems/smart_search
+- lib/smart_search.rb
+- lib/smart_search/smart_search_engine.rb
+- lib/smart_search_history.rb
+- lib/smart_search_ignore_word.rb
+- lib/smart_search_tag.rb
+- lib/smart_similarity.rb
+- lib/tasks/smart_search.rake
+- lib/tasks/testing.rake
+- test/test_document_multi_line.txt
+- test/test_document_one_line.txt
+- test/test_helper.rb
+- test/unit/01_smart_search_test.rb
+- test/unit/02_smart_search_similarity_test.rb
+- test/unit/03_smart_search_boost_test.rb
+homepage: https://github.com/florianeck/smart_search
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: Simple, easy to use search.
-test_files: []
+specification_version: 4
+summary: Simple, easy to use search MySQL based search for ActiveRecord
+test_files:
+- test/test_document_multi_line.txt
+- test/test_document_one_line.txt
+- test/test_helper.rb
+- 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: 

data/app/controllers/search_controller.rb

@@ -1,46 +0,0 @@
-# -*- encoding : utf-8 -*-
-class SearchController < ApplicationController
-  
-  def all
-    
-    if params[:search]
-      @query = params[:search][:query]
-    else
-      @query = params[:query]  
-    end  
-
-    unless @query.blank?
-      team = current_user.get_team_tree(:get_ids => true )
-      @results = []
-      SmartSearch::Config.get_search_models.each do |m|
-        if params[:only].nil? || params[:only] == m.to_s.split("::").last 
-          #if (admin? || backoffice? || controller? || backoffice_vertrieb?) || !m.column_names.include?("user_id") || SmartSearch::Config.get_public_models.include?(m)
-          
-          if SmartSearch::Config.get_public_models.include?(m)   
-            @results << m.find_by_tags(@query)
-          elsif m.column_names.include?("user_id")
-            @results << m.find_by_tags(@query, {:user_id => team})
-          elsif m.column_names.include?("account_id")     
-            @results << m.find_by_tags(@query, {:account_id => current_user.account_id})
-          else
-            
-          end  
-        end  
-      end  
-    
-      @empty = @results.flatten.empty?
-    
-      if request.xhr?
-        render :partial => "/search/results_small", :locals => {:results => @results, :no_limit => !params[:only].nil?}, :layout => params[:layout]
-      end
-    else
-      render :text => "Bitte geben Sie einen Suchbegriff ein"    
-    end  
-    
-  end  
-  
-end
-
-
-
-# (admin? || backoffice? || controller? || backoffice_vertrieb?) ||

data/app/views/search/_results_small.html.erb

@@ -1,25 +0,0 @@
-<div id="smartsearch-results-container-small">
-  <div class="bold teaser">
-      <%= "keine " if @empty %>Suchergebnisse für 
-       <%= form_for :search, :url => {:controller => "search", :action => "all", :layout => "info_overlay"}, :html => default_ajax_link(:update => FOOTER_SEARCH_RESULTS_ID).merge!(:style => "display: inline;") do |f| %>
-          <%= f.text_field :query, :value => "Suchbegriff eingeben", :value => @query, :style => "width: 25%" %>
-        <% end %>
-    </div>
-  <% @results.each do |results| %>
-    <% limit = no_limit ? results.size : 5 %>
-    <% unless results.empty? %>
-      <h3 class="result-small-header cf"><%= "Suchergebnisse in #{(results[0].class.name+'_results').to_label}" %> <%= " - Zeige #{limit} von #{results.size}" if (results.size > limit) %>  <%#= link_to_if(results.size > limit, "Alle  (#{results.size})", ) %> 
-        <% if (results.size > limit) %>
-          <span class="metainfo"><%= link_to "Zeige alle Ergebnisse", { :controller => "/search", :action => "all", :only => results[0].class.name, :query => (params[:search][:query] rescue params[:query]), :layout => params[:layout]}, default_ajax_link(:update => FOOTER_SEARCH_RESULTS_ID, :load_message => true, :class => "next-link") %></span>
-        <% elsif no_limit %>
-          <span class="metainfo"><%= link_to "zurück", { :controller => "/search", :action => "all", :query => (params[:search][:query] rescue params[:query]), :layout => params[:layout]}, default_ajax_link(:update => FOOTER_SEARCH_RESULTS_ID, :load_message => true, :class => "prev-link") %></span>
-        <% end %>
-      </h3>
-        <% results.first(limit).each do |r| %>
-          <div class="result-block-small"><%= render :partial => r.result_template_path, :locals => {:result => r, :small => true} %></div>
-        <% end %>
-        <div class="seperator small">&nbsp;</div>
-    <% end %>  
-  <% end %>
- 
-</div>

data/app/views/search/all.html.erb

@@ -1,15 +0,0 @@
-<div class="search-">
-<%= page_title "Suchergebnisse für '#{@query}'" %>
-
-<div id="smartsearch-results-container">
-  <% @results.each do |results| %>
-    <% if results.empty? %>
-    <% else %>
-      <h3>Suchergebnisse in <%= "#{results[0].class.name}_results".to_label %> (<%= results.size %>)</h3>
-      <% results.each do |r| %>
-        <%= render :partial => r.result_template_path, :locals => {:result => r } %>
-      <% end %>
-      <%= seperator %>
-    <% end %>  
-  <% end %>  
-</div>

data/app/views/search/results/_ansprechpartner.html.erb

@@ -1,8 +0,0 @@
-<div class="spacer highlighter">
-  <div class="field-container-4-cols  cf">
-     <div class="container"><%= link_to result.company.name, {:controller => "/companies", :action => "show", :id => result.company.id}, default_ajax_link() %><br /></div>
-     <div class="center-left"><%= result.name %> (<%= result.art %>)</div>
-     <div class="center-right"><%= result.phone %></div>
-     <div class="container"><%= email_link(result.email) %></div>
-  </div>
-</div>

data/app/views/search/results/_calendar_entry.html.erb

@@ -1,29 +0,0 @@
-<% small ||= false %>
-
-  <% if small == false %>
-    <div class="highlighter <%= cycle('odd', 'even', :name => "customer_results") %> <%= result.css_class %>">
-    <b><%= link_to result.name, {} %></b><br />
-    <div class="field-container-4-cols cf">
-      <div class="container">
-        <div class="metainfo">Status</div>
-        <div><%= result.type(:name) %></div>
-        <div><%= result.status %></div>
-      </div>
-      <div class="center-left">
-        <div class="metainfo">Beginn/Ende</div>
-        <div>von <%= result.starts_at.to_de %></div>
-        <div>bis <%= result.ends_at.to_de %></div>
-      </div>  
-      <div class="center-right">
-        <div class="metainfo">Berater</div>
-        <div><%= result.user.full_name %></div>
-      </div>  
-      <div class="container">
-      </div>
-    </div>
-    </div>
-  <% else %>
-    <%= link_to result.name, {} %> (<span class="metainfo"><%= result.user.full_name rescue "-" %></span>)
-  	<br />
-    <%= result.type(:name) %> | <%= result.status %> | <%= result.starts_at.to_de %>
-  <% end %>

data/app/views/search/results/_company.html.erb

@@ -1,25 +0,0 @@
-<% small ||= false %>
-
-<% if small == false %>
-<div class="highlighter <%= cycle('odd', 'even', :name => "company_results") %>">
-  <b><%= link_to result.name, {} %></b><br />
-  <div class="field-container-4-cols cf">
-    <div class="container">
-      <div class="metainfo">Anbindung</div>
-      <div><%= result.direct ? "Direktanbindung" : "keine Direktanbindung" %></div>
-    </div>
-    <div class="center-left">
-      <div class="metainfo">VP-Nr</div>
-      <div><%= result.direct ? result.vp_nr : "keine VP-Nummer" %></div>
-    </div>  
-    <div class="center-right">
-      
-    </div>  
-    <div class="container">
-    </div>
-  </div>
-</div>
-<% else %>
-  <%= link_to result.name, {:controller => "/companies", :action => "show", :id => result.id}, default_ajax_link() %><br />
-  <%#= result.direct ? "Direktanbindung" : "keine Direktanbindung" %> / <%#= result.direct ? "VP-Nr: #{result.vp_nr}" : "keine VP-Nummer" %>
-<% end %>

data/app/views/search/results/_concept.html.erb

@@ -1,26 +0,0 @@
-<div class="highlighter <%= cycle('odd', 'even', :name => "customer_results") %>">
-  <b><%= link_to result.customer.full_name, :controller => "/concepts", :action => "data_form", :concept_id => result.id %></b><br />
-  <div class="field-container-4-cols cf">
-    <div class="container">
-      <div class="metainfo">Status</div>
-        <div>
-        <% if result.firma_concept %>
-          Firmenkonzept
-        <% elsif result.family_concept %>  
-          Familienkonzept
-        <% else %>
-          Standardkonzept
-        <% end %>
-        <%= progress_bar(result.ist_concept.progress_percent) %>
-      </div>
-    </div>
-    <div class="center-left">
-      <div class="metainfo">Datum</div>
-      <div>erstellt: <%= result.created_at.to_de %></div>
-    </div>  
-    <div class="center-right">
-    </div>  
-    <div class="container">
-    </div>
-  </div>
-</div>

data/app/views/search/results/_customer.html.erb

@@ -1,51 +0,0 @@
-<% small ||= false %>
-  
-  <% if small == false %>
-<div class="highlighter <%= cycle('odd', 'even', :name => "customer_results") %>">
-    <b><%= link_to result.full_name, :controller => "/customers", :action => "show", :id => result.id %></b><br />
-    <div><%= result.notes.clear_html rescue nil %></div>
-    <div class="field-container-4-cols cf">
-      <div class="container">
-        <div class="metainfo">Kontaktdaten</div>
-        <div><%= result.personal_data.phone %></div>
-        <div><%= result.personal_data.mobile %></div>
-        <div><%= result.personal_data.email %></div>
-      </div>
-      <div class="center-left">
-        <div class="metainfo">Anschrift</div>
-        <div><%= result.personal_data.adress %></div>
-      </div>  
-      <div class="center-right">
-        <div class="metainfo">Persönliches</div>
-        <div>geb. <%= result.personal_data.birthday %></div>
-      </div>  
-      <div class="container">
-        <div class="metainfo">
-            <% if result.concepts.empty? %>
-              keine Konzepte
-            <% else %>
-              <%= result.ist_concepts.size %> Konzept(e)
-            <% end %>  
-        </div>
-          <% result.ist_concepts.each do |concept| %>
-            <% if concept.firma_concept %>
-              Firmenkonzept
-            <% elsif concept.family_concept %>  
-              Familienkonzept
-            <% else %>
-              Standardkonzept
-            <% end %> (<%= concept.created_at.to_de %>)
-            <%= progress_bar(concept.progress_percent, :size => :small) %>
-          <% end %>
-      </div>
-    </div>
-  </div>  
-  <% else %>  
-    <div class="field-container-4-cols highlighter  cf">
-       <div class="container"><%= link_to(result.full_name, {:controller => "/customers", :action => "customer_detail_ajax", :id => result.id, :layout => "ajax_overlay"}, default_ajax_link()) %> </div>
-       <div class="center-left metainfo"><%= result.user.full_name rescue "-" %></div>
-       <div class="center-right"></div>
-       <div class="container"></div>
-    </div>
-	    	
-  <% end %>

data/app/views/search/results/_family.html.erb

@@ -1 +0,0 @@
-<%= render :partial => "/smart/search/results/customer", :locals => {:result => result, :small => small} %>

data/app/views/search/results/_firma.html.erb

@@ -1 +0,0 @@
-<%= render :partial => "/smart/search/results/customer", :locals => {:result => result} %>