make-text-search 0.1.1 → 0.1.2

data/README.rdoc

@@ -110,4 +110,5 @@ The query language is the same used by PostgreSQL. See http://www.postgresql.org
 
 * Query builder. Add & and | operators
 * Option :language in #search_text
+* In PostgreSQL, use ts_headline and ts_rank
 * RDoc-ize methods

data/lib/make-text-search.rb

@@ -4,6 +4,7 @@ module MakeTextSearch
     require 'make-text-search/models'
     require 'make-text-search/schema'
     require 'make-text-search/filters'
+    require 'make-text-search/document'
 
     include ModelHelpers
     class ActiveRecord::ConnectionAdapters::AbstractAdapter; include ConnectionAdapterHelpers; end

data/lib/make-text-search/adapters/postgresql_ts.rb

@@ -19,11 +19,10 @@ module MakeTextSearch
       # Schema actions
 
       def create_text_search_documents_table(table_name)
-        connection.execute %[CREATE TABLE #{table_name} (record_type varchar(300) NOT NULL, record_id integer NOT NULL, language varchar(20), document tsvector)]
+        connection.execute %[CREATE TABLE #{table_name} (id serial primary key, record_type varchar(300) NOT NULL, record_id integer NOT NULL, language varchar(20), document tsvector)]
         connection.execute %[CREATE INDEX #{table_name}_idx ON #{table_name} USING gin(document)]
       end
 
-
       # Document actions
 
       def quote(value)
@@ -35,44 +34,27 @@ module MakeTextSearch
         record_class = record.class
         return if record_class.text_search_fields.empty?
 
-        table_name = Rails.application.config.make_text_search.table_name
-        record_type = quote record_class.name
-        record_id = quote record.id
-        language = record.text_search_language
-
-        # If language is nil the tsvector will be generated without language
-        document = "to_tsvector(#{language ? quote(language.to_s) + ", " : ""}#{quote record.text_search_build_document})"
-
-        # Reduce the number of operations in the index using SELECT+UPDATE instead of DELETE+INSERT
-        if connection.select_value("SELECT count(*) FROM #{table_name} WHERE #{_where_record record}").to_i == 0
-          connection.insert(%[INSERT INTO #{table_name}
-                              (record_type, record_id, language, document)
-                             VALUES
-                              (#{record_type}, #{record_id}, #{quote language}, #{document})])
-        else
-          connection.update(%[UPDATE #{table_name} SET document = #{document} WHERE #{_where_record record}])
+        record_type, record_id = record_class.text_search_class_name, record.id
+        unless document = Document.find_by_record_type_and_record_id(record_type, record_id)
+          document = Document.new
+          document.record = record
+          document.save!
         end
-      end
 
-      def remove_document(record)
-        connection.delete "DELETE FROM #{Rails.application.config.make_text_search.table_name} WHERE #{_where_record record}"
+        language = record.text_search_language
+        quoted_language = record.connection.quote(language)
+        ts_vector = "to_tsvector(#{language ? "#{quoted_language}, " : ""}#{record.connection.quote record.text_search_build_document})"
+        Document.update_all "language = #{quoted_language}, document = #{ts_vector}", ["id = ?", document.id]
       end
 
-      def _where_record(record)
-        "record_type = #{quote record.class.name} AND record_id = #{quote record.id}"
+      def remove_document(record)
+        Document.delete_all ["record_type = ? AND record_id = ?", record.class.text_search_class_name, record.id]
       end
 
-
       # Query actions
       def scope_search_text(model, query, language = Rails.application.config.make_text_search.default_language)
-        db_connection = model.connection
-
-        if language
-          query = "to_tsquery(#{db_connection.quote language}, #{db_connection.quote query})"
-        else
-          query = "to_tsquery(#{db_connection.quote query})"
-        end
-        model.where %[#{model.table_name}.id IN (SELECT record_id FROM #{Rails.application.config.make_text_search.table_name} WHERE record_type = #{db_connection.quote model.name} AND document @@ #{query})]
+        document_query = Document.select("record_id").where("record_type = :type AND document @@ to_tsquery(#{language ? ":language, " : ""}:query)", :type => model.text_search_class_name, :language => language, :query => query)
+        model.where %[#{model.table_name}.id IN (#{document_query.to_sql})]
       end
 
     end

data/lib/make-text-search/document.rb

@@ -0,0 +1,7 @@
+module MakeTextSearch
+  class Document < ActiveRecord::Base
+    set_table_name { Rails.application.config.make_text_search.table_name }
+
+    belongs_to :record, :polymorphic => true
+  end
+end

data/lib/make-text-search/models.rb

@@ -28,16 +28,26 @@ module MakeTextSearch
       def search_text(query)
         connection.text_search_adapter.scope_search_text(self, query)
       end
+
+      def text_search_class_name
+        klass = self
+        while klass and klass.superclass != ActiveRecord::Base
+          klass = klass.superclass
+          break
+        end
+
+        klass and klass.name
+      end
     end
 
     def text_search_update_document
-      if not self.class.text_search_fields.empty?
+      if not self.class.text_search_fields.blank?
         self.class.connection.text_search_adapter.update_document self
       end
     end
 
     def text_search_remove_document
-      if not self.class.text_search_fields.empty?
+      if not self.class.text_search_fields.blank?
         self.class.connection.text_search_adapter.remove_document self
       end
     end

data/test/app_template.rb

@@ -12,14 +12,25 @@ gem "make-text-search", :path => ENV["MTS_GEM_PATH"]
 
 generate "text_search:migration"
 generate "model", "Post", "title:string", "content:text"
+generate "model", "User", "name:string", "description:text", "type:string"
 
 File.open("app/models/post.rb", "a") do |f|
   f.puts "\nPost.has_text_search :title, :filter => :substrings"
   f.puts "Post.has_text_search :content, :filter => [:substrings, :strip_html]"
 end
 
+File.open("app/models/user.rb", "a") do |f|
+  f.puts "\nUser.has_text_search :name, :description"
+end
+
+File.open("app/models/admin.rb", "w") do |f|
+  f.puts "class Admin < User\nend"
+end
+
 # Copy tests from the gem
 Dir["#{ENV["MTS_GEM_PATH"]}/test/*_test.rb"].each do |filename|
   file "test/unit/#{File.basename filename}", File.read(filename)
 end
 
+File.unlink "test/fixtures/posts.yml"
+File.unlink "test/fixtures/users.yml"

data/test/basics_test.rb

@@ -62,4 +62,13 @@ class BasicsTest < ActiveSupport::TestCase
     end
   end
 
+  test "STI classes save the top parent" do
+    Admin.create :name => "first admin", :description => "the first user created"
+    assert_equal 1, User.count
+    assert_equal "first admin", User.first.name
+
+    assert_equal 1, User.search_text("first & created").count
+    assert_equal User.first, Admin.search_text("first & created").first
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: make-text-search
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ayose Cazorla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -33,9 +33,10 @@ files:
 - lib/generators/migration.rb
 - lib/make-text-search/html_entities.dat
 - lib/make-text-search/filters.rb
-- lib/make-text-search/models.rb
 - lib/make-text-search/adapters/postgresql_ts.rb
 - lib/make-text-search/schema.rb
+- lib/make-text-search/document.rb
+- lib/make-text-search/models.rb
 - test/schema_test.rb
 - test/app_template.rb
 - test/basics_test.rb