texticle 1.0.4.20101004123327 → 2.0.pre

data/CHANGELOG.rdoc

@@ -1,3 +1,27 @@
+=== 2.0rc1
+
+* Complete refactoring of Texticle
+
+  * For users:
+
+    * Texticle should only be used for its simplicity; if you need to deeply configure your text search, please give `gem install pg_search` a try.
+    * #search method is now included in all ActiveRecord models by default, and searches across a model's :string columns.
+    * #search_by_<column> dynamic methods are now available.
+    * #search can now be chained; Game.search_by_title("Street Fighter").search_by_system("PS3") works.
+    * #search now accepts a hash to specify columns to be searched, e.g. Game.search(:name => "Mario")
+    * No more access to #rank values for results (though they're still ordered by rank).
+    * No way to give different weights to different columns in this release.
+
+  * For devs:
+
+    * We now have actual tests to run against; this will make accepting pull requests much more enjoyable.
+
+=== HEAD (unreleased)
+
+* 1 minor bugfix
+
+  * Multiple named indices are now supported.
+
 === 1.0.4 / 2010-08-19
 
 * 2 major enhancements

data/README.rdoc

@@ -1,12 +1,11 @@
 = texticle
 
-* http://texticle.rubyforge.org/
+* http://tenderlove.github.com/texticle
 
 == DESCRIPTION:
 
-Texticle exposes full text search capabilities from PostgreSQL, and allows
-you to declare full text indexes.  Texticle will extend ActiveRecord with
-named_scope methods making searching easy and fun!
+Texticle exposes full text search capabilities from PostgreSQL,
+extending ActiveRecord with scopes making search easy and fun!
 
 == FEATURES/PROBLEMS:
 
@@ -14,82 +13,40 @@ named_scope methods making searching easy and fun!
 
 == SYNOPSIS:
 
-=== Rails 3 Configuration
+=== Configuration
 
-In the project's Gemfile add
-
-    gem 'texticle', '1.0.4'
-
-=== Rails 2 Configuration
+* Rails 3
 
-In environment.rb:
+In the project's Gemfile add
 
-  config.gem 'texticle'
+    gem 'texticle', '~> 2.0rc1', :require => 'texticle/rails'
 
-In your Rakefile:
+* ActiveRecord outside of Rails 3
 
-  require 'rubygems'
-  require 'texticle/tasks'
+    require 'texticle'
+    ActiveRecord::Base.extend(Texticle)
 
 === Usage
 
-Declare your index in your model:
-
-  class Product < ActiveRecord::Base
-    index do
-      name
-      description
-    end
-  end
-
-Use the search method
-
-  Product.search('hello world')
-
-Full text searches can be sped up by creating indexes. To create them, run:
-
-  $ rake texticle:create_indexes
-
-Alternatively, you can create a migration that will build your indexes:
-
-  $ rake texticle:migration
-
-== BETA: FUZZY SEARCH
-
-We're adding support for Postgres' optional trigram matching module, which allows for fuzzier text searches.
-
-Since it's an optional module, first step is to install it into the current database:
-	
-	$ rake texticle:install_trigram
-
-If you installed Postgres with its optional 'contrib' modules, you should be safe.
-
-Declare your indexes as you normally would:
-
-	class Book < ActiveRecord::Base
-		index { title }
-	end
-	
-Finally, say hello to #tsearch:
+Your models now have access to the search method:
 
-	Book.create :title => "_why's Poignant Guide to Ruby"
-	Book.tsearch "_whys Poignnt Gd t Rb" # => [#<Book title: "_why's Poignant Guide to Ruby">]
-	
-Trigram searching is still in beta, so expect the API to change and/or improve.
+  Game.search('Sonic') # will search through the model's :string columns
+  Game.search(:title => 'Mario')
+  Game.search_by_title('Street Fighter').search_by_system('PS3')
 
 == REQUIREMENTS:
 
-* Texticle may be used outside rails, but works best with rails.
+* ActiveRecord
 
 == INSTALL:
 
-* sudo gem install texticle
+* gem install texticle
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2009 Aaron Patterson
+Copyright (c) 2011 Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,14 +1,20 @@
-# -*- ruby -*-
-
 require 'rubygems'
-require 'hoe'
 
-Hoe.plugin :gemspec
-Hoe.spec 'texticle' do
-  developer('Aaron Patterson', 'aaronp@rubyforge.org')
-  self.readme_file   = 'README.rdoc'
-  self.history_file  = 'CHANGELOG.rdoc'
-  self.extra_rdoc_files  = FileList['*.rdoc']
-end
+require 'rake'
+require 'pg'
+require 'active_record'
+require 'benchmark'
 
-# vim: syntax=Ruby
+require File.expand_path(File.dirname(__FILE__) + '/spec/spec_helper')
+
+namespace :db do
+  desc 'Run migrations for test database'
+  task :migrate do
+    ActiveRecord::Migration.instance_eval do
+      create_table :games do |table|
+        table.string :system
+        table.string :title
+      end
+    end
+  end
+end

data/lib/texticle/{railtie.rb → rails.rb}

@@ -1,12 +1,8 @@
 # Module used to conform to Rails 3 plugin API
-require File.expand_path( File.dirname(__FILE__) + '/../texticle')
+require File.expand_path(File.dirname(__FILE__) + '/../texticle')
 
 module Texticle
   class Railtie < Rails::Railtie
-    rake_tasks do
-      load File.dirname(__FILE__) + '/tasks.rb'
-    end
-
     initializer "texticle.configure_rails_initialization" do
       ActiveRecord::Base.extend(Texticle)
     end

data/lib/texticle.rb

@@ -1,113 +1,86 @@
-require 'texticle/full_text_index'
-require 'texticle/railtie' if defined?(Rails) and Rails::VERSION::MAJOR > 2
-
-####
-# Texticle exposes full text search capabilities from PostgreSQL, and allows
-# you to declare full text indexes.  Texticle will extend ActiveRecord with
-# named_scope methods making searching easy and fun!
-#
-# Texticle.index is automatically added to ActiveRecord::Base.
-#
-# To declare an index on a model, just use the index method:
-#
-#   class Product < ActiveRecord::Base
-#     index do
-#       name
-#       description
-#     end
-#   end
-#
-# This will allow you to do full text search on the name and description
-# columns for the Product model.  It defines a named_scope method called
-# "search", so you can take advantage of the search like this:
-#
-#   Product.search('foo bar')
-#
-# Indexes may also be named.  For example:
-#
-#   class Product < ActiveRecord::Base
-#     index 'author' do
-#       name
-#       author
-#     end
-#   end
-#
-# A named index will add a named_scope with the index name prefixed by
-# "search".  In order to take advantage of the "author" index, just call:
-#
-#   Product.search_author('foo bar')
-#
-# Finally, column names can be ranked.  The ranks are A, B, C, and D.  This
-# lets us declare that matches in the "name" column are more important
-# than matches in the "description" column:
-#
-#   class Product < ActiveRecord::Base
-#     index do
-#       name          'A'
-#       description   'B'
-#     end
-#   end
+require 'active_record'
+
 module Texticle
-  # The version of Texticle you are using.
-  VERSION = '1.0.4' unless defined?(Texticle::VERSION)
-
-  # A list of full text indexes
-  attr_accessor :full_text_indexes
-
-  ###
-  # Create an index with +name+ using +dictionary+
-  def index name = nil, dictionary = 'english', &block
-    search_name = ['search', name].compact.join('_')
-
-    scope_lamba = lambda { |term|
-      # Let's extract the individual terms to allow for quoted and wildcard terms.
-      term = term.scan(/"([^"]+)"|(\S+)/).flatten.compact.map do |lex|
-        lex =~ /(.+)\*\s*$/ ? "'#{$1}':*" : "'#{lex}'"
-      end.join(' & ')
-
-      {
-        :select => "#{table_name}.*, ts_rank_cd((#{full_text_indexes.first.to_s}),
-          to_tsquery(#{connection.quote(term)})) as rank",
-        :conditions =>
-          ["#{full_text_indexes.first.to_s} @@ to_tsquery(?)", term],
-        :order => 'rank DESC'
-      }
-    }
-    
-    # tsearch, i.e. trigram search
-    trigram_scope_lambda = lambda { |term|
-      term = "'#{term.gsub("'", "''")}'"
-
-      similarities = full_text_indexes.first.index_columns.values.flatten.inject([]) do |array, index|
-        array << "similarity(#{index}, #{term})"
-      end.join(" + ")
-      
-      conditions = full_text_indexes.first.index_columns.values.flatten.inject([]) do |array, index|
-        array << "(#{index} % #{term})"
-      end.join(" OR ")
-      
-      {
-        :select => "#{table_name}.*, #{similarities} as rank",
-        :conditions => conditions,
-        :order => 'rank DESC'
-      }
-    }
-
-    class_eval do
-      # Trying to avoid the deprecation warning when using :named_scope
-      # that Rails 3 emits. Can't use #respond_to?(:scope) since scope
-      # is a protected method in Rails 2, and thus still returns true.
-      if self.respond_to?(:scope) and not protected_methods.include?('scope')
-        scope search_name.to_sym, scope_lamba
-        scope ('t' + search_name).to_sym, trigram_scope_lambda
-      elsif self.respond_to? :named_scope
-        named_scope search_name.to_sym, scope_lamba
-        named_scope ('t' + search_name).to_sym, trigram_scope_lambda
+
+  def search(query = {})
+    language = connection.quote('english')
+
+    exclusive = true
+
+    unless query.is_a?(Hash)
+      exclusive = false
+      query = columns.select {|column| column.type == :string }.map(&:name).inject({}) do |terms, column|
+        terms.merge column => query.to_s
+      end
+    end
+
+    similarities = []
+    conditions = []
+
+    query.each do |column, search_term|
+      column = connection.quote_column_name(column)
+      search_term = connection.quote normalize(Helper.normalize(search_term))
+      similarities << "ts_rank(to_tsvector(#{quoted_table_name}.#{column}), to_tsquery(#{search_term}))"
+      conditions << "to_tsvector(#{language}, #{column}) @@ to_tsquery(#{search_term})"
+    end
+
+    rank = connection.quote_column_name('rank' + rand.to_s)
+
+    select("#{quoted_table_name}.*, #{similarities.join(" + ")} AS #{rank}").
+      where(conditions.join(exclusive ? " AND " : " OR ")).
+      order("#{rank} DESC")
+  end
+
+  def method_missing(method, *search_terms)
+    if Helper.dynamic_search_method?(method, self.columns)
+      columns = Helper.dynamic_search_columns(method)
+      metaclass = class << self; self; end
+      metaclass.__send__(:define_method, method) do |*args|
+        query = columns.inject({}) do |query, column|
+          query.merge column => args.shift
+        end
+        search(query)
       end
+      __send__(method, *search_terms)
+    else
+      super
     end
+  end
+
+  def respond_to?(method)
+    Helper.dynamic_search_method?(method, self.columns) ? true : super
+  end
+
+  private
 
-    index_name = [table_name, name, 'fts_idx'].compact.join('_')
-    (self.full_text_indexes ||= []) <<
-      FullTextIndex.new(index_name, dictionary, self, &block)
+  def normalize(query)
+    query
   end
+
+  module Helper
+    class << self
+      def normalize(query)
+        query.to_s.gsub(' ', '\\\\ ')
+      end
+
+      def dynamic_search_columns(method)
+        if match = method.to_s.match(/search_by_(?<columns>[_a-zA-Z]\w*)/)
+          match[:columns].split('_and_')
+        else
+          []
+        end
+      end
+
+      def dynamic_search_method?(method, class_columns)
+        string_columns = class_columns.select {|column| column.type == :string }.map(&:name)
+        columns = dynamic_search_columns(method)
+        unless columns.empty?
+          columns.all? {|column| string_columns.include?(column) }
+        else
+          false
+        end
+      end
+    end
+  end
+
 end

data/spec/config.yml

@@ -0,0 +1,4 @@
+database: texticle
+username: <username>
+pool: 5
+timeout: 5000

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'yaml'
+require 'texticle'
+require 'shoulda'
+require 'ruby-debug'
+
+config = YAML.load_file File.expand_path(File.dirname(__FILE__) + '/config.yml')
+ActiveRecord::Base.establish_connection config.merge(:adapter => :postgresql)

data/spec/texticle_spec.rb

@@ -0,0 +1,119 @@
+# coding: utf-8
+require 'spec_helper'
+
+class Game < ActiveRecord::Base
+  # string :system
+  # string :title
+
+  def to_s
+    "#{system}: #{title}"
+  end
+end
+
+class TexticleTest < Test::Unit::TestCase
+
+  context "after extending an ActiveRecord::Base subclass" do
+    setup do
+      Game.extend(Texticle)
+      @zelda = Game.create :system => "NES",     :title => "Legend of Zelda"
+      @mario = Game.create :system => "NES",     :title => "Super Mario Bros."
+      @sonic = Game.create :system => "Genesis", :title => "Sonic the Hedgehog"
+      @dkong = Game.create :system => "SNES",    :title => "Diddy's Kong Quest"
+      @megam = Game.create :system => nil,       :title => "Mega Man"
+      @sfnes = Game.create :system => "SNES",    :title => "Street Fighter 2"
+      @sfgen = Game.create :system => "Genesis", :title => "Street Fighter 2"
+      @takun = Game.create :system => "Saturn",  :title => "Magical Tarurūto-kun"
+    end
+
+    teardown do
+      Game.delete_all
+    end
+
+    should "define a #search method" do
+      assert Game.respond_to?(:search)
+    end
+
+    context "when searching with a String argument" do
+      should "search across all :string columns if no indexes have been specified" do
+        assert_equal @mario, Game.search("Mario").first
+        assert_equal 1,      Game.search("Mario").count
+
+        assert (Game.search("NES") && [@mario, @zelda]) == [@mario, @zelda]
+        assert_equal 2,      Game.search("NES").count
+      end
+
+      should "work if the query contains an apostrophe" do
+        assert_equal @dkong, Game.search("Diddy's").first
+        assert_equal 1,      Game.search("Diddy's").count
+      end
+
+      should "work if the query contains whitespace" do
+        assert_equal @megam, Game.search("Mega Man").first
+      end
+
+      should "work if the query contains an accent" do
+        assert_equal @takun, Game.search("Tarurūto-kun").first
+      end
+
+      should "search across records with NULL values" do
+        assert_equal @megam, Game.search("Mega").first
+      end
+
+      should "scope consecutively" do
+        assert_equal @sfgen, Game.search("Genesis").search("Street Fighter").first
+      end
+    end
+
+    context "when searching with a Hash argument" do
+      should "search across the given columns" do
+        assert Game.search(:title => "NES").empty?
+        assert Game.search(:system => "Mario").empty?
+        puts Game.search(:system => "NES", :title => "Sonic").to_a
+        assert Game.search(:system => "NES", :title => "Sonic").empty?
+
+        assert_equal @mario, Game.search(:title => "Mario").first
+        assert_equal 1,      Game.search(:title => "Mario").count
+
+        assert_equal 2,      Game.search(:system => "NES").count
+
+        assert_equal @zelda, Game.search(:system => "NES", :title => "Zelda").first
+        assert_equal @megam, Game.search(:title => "Mega").first
+      end
+
+      should "scope consecutively" do
+        assert_equal @sfgen, Game.search(:system => "Genesis").search(:title => "Street Fighter").first
+      end
+    end
+
+    context "when using dynamic search methods" do
+      should "generate methods for each :string column" do
+        assert_equal @mario, Game.search_by_title("Mario").first
+        assert_equal @takun, Game.search_by_system("Saturn").first
+      end
+
+      should "generate methods for any combination of :string columns" do
+        assert_equal @mario, Game.search_by_title_and_system("Mario", "NES").first
+        assert_equal @sonic, Game.search_by_system_and_title("Genesis", "Sonic").first
+        assert_equal @mario, Game.search_by_title_and_title("Mario", "Mario").first
+      end
+
+      should "scope consecutively" do
+        assert_equal @sfgen, Game.search_by_system("Genesis").search_by_title("Street Fighter").first
+      end
+
+      should "not generate methods for non-:string columns" do
+        assert_raise(NoMethodError) { Game.search_by_id }
+      end
+
+      should "work with #respond_to?" do
+        assert Game.respond_to?(:search_by_system)
+        assert Game.respond_to?(:search_by_title)
+        assert Game.respond_to?(:search_by_system_and_title)
+        assert Game.respond_to?(:search_by_title_and_title_and_title)
+
+        assert !Game.respond_to?(:search_by_id)
+      end
+    end
+  end
+
+end

metadata

@@ -1,62 +1,56 @@
 --- !ruby/object:Gem::Specification 
 name: texticle
 version: !ruby/object:Gem::Version 
-  hash: 40202008246577
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  - 20101004123327
-  version: 1.0.4.20101004123327
+  prerelease: 4
+  version: 2.0.pre
 platform: ruby
 authors: 
+- ecin
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -04:00
-default_executable: 
+date: 2011-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: pg
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: 0.11.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
+        version: 2.11.3
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id003
 description: |-
-  Texticle exposes full text search capabilities from PostgreSQL, and allows
-  you to declare full text indexes.  Texticle will extend ActiveRecord with
-  named_scope methods making searching easy and fun!
+  Texticle exposes full text search capabilities from PostgreSQL, extending
+      ActiveRecord with scopes making search easy and fun!
 email: 
-- aaronp@rubyforge.org
+- ecin@copypastel.com
 executables: []
 
 extensions: []
@@ -66,21 +60,16 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.rdoc
 files: 
-- .autotest
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/texticle.rb
-- lib/texticle/full_text_index.rb
-- lib/texticle/railtie.rb
-- lib/texticle/tasks.rb
-- rails/init.rb
-- test/helper.rb
-- test/test_full_text_index.rb
-- test/test_texticle.rb
-has_rdoc: true
-homepage: http://texticle.rubyforge.org/
+- lib/texticle/rails.rb
+- spec/spec_helper.rb
+- spec/texticle_spec.rb
+- spec/config.yml
+homepage: http://tenderlove.github.com/texticle
 licenses: []
 
 post_install_message: 
@@ -94,26 +83,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: texticle
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Texticle exposes full text search capabilities from PostgreSQL, and allows you to declare full text indexes
+summary: Texticle exposes full text search capabilities from PostgreSQL
 test_files: 
-- test/test_full_text_index.rb
-- test/test_texticle.rb
+- spec/spec_helper.rb
+- spec/texticle_spec.rb
+- spec/config.yml

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/lib/texticle/full_text_index.rb

@@ -1,58 +0,0 @@
-module Texticle
-  class FullTextIndex # :nodoc:
-    attr_accessor :index_columns
-
-    def initialize name, dictionary, model_class, &block
-      @name           = name
-      @dictionary     = dictionary
-      @model_class    = model_class
-      @index_columns  = {}
-      @string         = nil
-      instance_eval(&block)
-    end
-
-    def self.find_constant_of(filename)
-      File.basename(filename, '.rb').pluralize.classify.constantize
-    end
-
-    def create
-      @model_class.connection.execute create_sql
-    end
-
-    def destroy
-      @model_class.connection.execute destroy_sql
-    end
-
-    def create_sql
-      <<-eosql.chomp
-CREATE index #{@name}
-      ON #{@model_class.table_name}
-      USING gin((#{to_s}))
-      eosql
-    end
-
-    def destroy_sql
-      "DROP index IF EXISTS #{@name}"
-    end
-
-    def to_s
-      return @string if @string
-      vectors = []
-      @index_columns.sort_by { |k,v| k }.each do |weight, columns|
-        c = columns.map { |x| "coalesce(\"#{@model_class.table_name}\".\"#{x}\", '')" }
-        if weight == 'none'
-          vectors << "to_tsvector('#{@dictionary}', #{c.join(" || ' ' || ")})"
-        else
-          vectors <<
-        "setweight(to_tsvector('#{@dictionary}', #{c.join(" || ' ' || ")}), '#{weight}')"
-        end
-      end
-      @string = vectors.join(" || ' ' || ")
-    end
-
-    def method_missing name, *args
-      weight = args.shift || 'none'
-      (index_columns[weight] ||= []) << name.to_s
-    end
-  end
-end

data/lib/texticle/tasks.rb

@@ -1,90 +0,0 @@
-require 'rake'
-require 'texticle'
-
-namespace :texticle do
-  desc "Create full text index migration"
-  task :migration => :environment do
-    now = Time.now.utc
-    filename = "#{now.strftime('%Y%m%d%H%M%S')}_full_text_search_#{now.to_i}.rb"
-    File.open(Rails.root + 'db' + 'migrate' + filename, 'wb') do |fh|
-      up_sql_statements = []
-      dn_sql_statements = []
-
-      Dir[Rails.root + 'app' + 'models' + '*.rb'].each do |f|
-        klass = Texticle::FullTextIndex.find_constant_of(f)
-        if klass.respond_to?(:full_text_indexes)
-          (klass.full_text_indexes || []).each do |fti|
-            up_sql_statements << fti.destroy_sql
-            up_sql_statements << fti.create_sql
-            dn_sql_statements << fti.destroy_sql
-          end
-        end
-      end
-
-      fh.puts "class FullTextSearch#{now.to_i} < ActiveRecord::Migration"
-      fh.puts "  def self.up"
-      insert_sql_statements_into_migration_file(up_sql_statements, fh)
-      fh.puts "  end"
-      fh.puts ""
-
-      fh.puts "  def self.down"
-      insert_sql_statements_into_migration_file(dn_sql_statements, fh)
-      fh.puts "  end"
-      fh.puts "end"
-    end
-  end
-
-  desc "Create full text indexes"
-  task :create_indexes => ['texticle:destroy_indexes'] do
-    Dir[Rails.root + 'app' + 'models' + '*.rb'].each do |f|
-      klass = Texticle::FullTextIndex.find_constant_of(f)
-      if klass.respond_to?(:full_text_indexes)
-        (klass.full_text_indexes || []).each do |fti|
-          begin
-            fti.create
-          rescue ActiveRecord::StatementInvalid => e
-            warn "WARNING: Couldn't create index for #{klass.to_s}, skipping..."
-          end
-        end
-      end
-    end
-  end
-
-  desc "Destroy full text indexes"
-  task :destroy_indexes => [:environment] do
-    Dir[Rails.root + 'app' + 'models' + '*.rb'].each do |f|
-      klass = Texticle::FullTextIndex.find_constant_of(f)
-      if klass.respond_to?(:full_text_indexes)
-        (klass.full_text_indexes || []).each do |fti|
-          fti.destroy
-        end
-      end
-    end
-  end
-
-  desc "Install trigram text search module"
-  task :install_trigram => [:environment] do
-    share_dir = `pg_config --sharedir`.chomp
-    raise RuntimeError, 'cannot find Postgres\' shared directory' unless $?.exitstatus.zero?
-    trigram = "#{share_dir}/contrib/pg_trgm.sql"
-    unless system("ls #{trigram}")
-      raise RuntimeError, 'cannot find trigram module; was it compiled and installed?'
-    end
-    db_name = ActiveRecord::Base.connection.current_database
-    unless system("psql -d #{db_name} -f #{trigram}")
-      raise RuntimeError, "`psql -d #{db_name} -f #{trigram}` cannot complete successfully"
-    end
-    puts "Trigram text search module successfully installed into '#{db_name}' database."
-  end
-
-  def insert_sql_statements_into_migration_file statements, fh
-    statements.each do |statement|
-      fh.puts <<-eostmt
-    execute(<<-'eosql'.strip)
-      #{statement}
-    eosql
-      eostmt
-    end
-  end
-end
-

data/rails/init.rb

@@ -1,3 +0,0 @@
-require 'texticle'
-
-ActiveRecord::Base.extend(Texticle)

data/test/helper.rb

@@ -1,44 +0,0 @@
-require "test/unit"
-require "texticle"
-
-class TexticleTestCase < Test::Unit::TestCase
-  unless RUBY_VERSION >= '1.9'
-    undef :default_test
-  end
-
-  def setup
-    warn "#{name}" if ENV['TESTOPTS'] == '-v'
-  end
-
-  def fake_model
-    Class.new do
-      @connected    = false
-      @executed     = []
-      @named_scopes = []
-
-      class << self
-        attr_accessor :connected, :executed, :named_scopes
-
-        def connection
-          @connected = true
-          self
-        end
-
-        def execute sql
-          @executed << sql
-        end
-
-        def table_name; 'fake_model'; end
-
-        def named_scope *args
-          @named_scopes << args
-        end
-        alias :scope :named_scope
-
-        def quote thing
-          "'#{thing}'"
-        end
-      end
-    end
-  end
-end

data/test/test_full_text_index.rb

@@ -1,74 +0,0 @@
-require 'helper'
-
-class TestFullTextIndex < TexticleTestCase
-  def setup
-    super
-    @fm = fake_model
-  end
-
-  def test_initialize
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name
-      value 'A'
-    end
-    assert_equal 'name',  fti.index_columns['none'].first
-    assert_equal 'value', fti.index_columns['A'].first
-  end
-
-  def test_destroy
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name
-      value 'A'
-    end
-    fti.destroy
-    assert @fm.connected
-    assert_equal 1, @fm.executed.length
-    executed = @fm.executed.first
-    assert_match "DROP index IF EXISTS #{fti.instance_variable_get(:@name)}", executed
-  end
-
-  def test_create
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name
-      value 'A'
-    end
-    fti.create
-    assert @fm.connected
-    assert_equal 1, @fm.executed.length
-    executed = @fm.executed.first
-    assert_match fti.to_s, executed
-    assert_match "CREATE index #{fti.instance_variable_get(:@name)}", executed
-    assert_match "ON #{@fm.table_name}", executed
-  end
-
-  def test_to_s_no_weight
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name
-    end
-    assert_equal "to_tsvector('english', coalesce(\"#{@fm.table_name}\".\"name\", ''))", fti.to_s
-  end
-
-  def test_to_s_A_weight
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name 'A'
-    end
-    assert_equal "setweight(to_tsvector('english', coalesce(\"#{@fm.table_name}\".\"name\", '')), 'A')", fti.to_s
-  end
-
-  def test_to_s_multi_weight
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name  'A'
-      value 'A'
-      description 'B'
-    end
-    assert_equal "setweight(to_tsvector('english', coalesce(\"#{@fm.table_name}\".\"name\", '') || ' ' || coalesce(\"#{@fm.table_name}\".\"value\", '')), 'A') || ' ' || setweight(to_tsvector('english', coalesce(\"#{@fm.table_name}\".\"description\", '')), 'B')", fti.to_s
-  end
-
-  def test_mixed_weight
-    fti = Texticle::FullTextIndex.new('ft_index', 'english', @fm) do
-      name
-      value 'A'
-    end
-    assert_equal "setweight(to_tsvector('english', coalesce(\"#{@fm.table_name}\".\"value\", '')), 'A') || ' ' || to_tsvector('english', coalesce(\"#{@fm.table_name}\".\"name\", ''))", fti.to_s
-  end
-end

data/test/test_texticle.rb

@@ -1,76 +0,0 @@
-require 'helper'
-
-class TestTexticle < TexticleTestCase
-  def test_index_method
-    x = fake_model
-    x.class_eval do
-      extend Texticle
-      index do
-        name
-      end
-    end
-    assert_equal 1, x.full_text_indexes.length
-    # One named_scope for search, another for trigram search
-    assert_equal 2, x.named_scopes.length
-
-    x.full_text_indexes.first.create
-    assert_match "#{x.table_name}_fts_idx", x.executed.first
-    assert_equal :search, x.named_scopes.first.first
-    assert_equal :tsearch, x.named_scopes[1].first
-  end
-
-  def test_named_index
-    x = fake_model
-    x.class_eval do
-      extend Texticle
-      index('awesome') do
-        name
-      end
-    end
-    assert_equal 1, x.full_text_indexes.length
-    assert_equal 2, x.named_scopes.length
-
-    x.full_text_indexes.first.create
-    assert_match "#{x.table_name}_awesome_fts_idx", x.executed.first
-    assert_equal :search_awesome, x.named_scopes.first.first
-    assert_equal :tsearch_awesome, x.named_scopes[1].first
-  end
-
-  def test_named_scope_select
-    x = fake_model
-    x.class_eval do
-      extend Texticle
-      index('awesome') do
-        name
-      end
-    end
-    ns = x.named_scopes.first[1].call('foo')
-    assert_match(/^#{x.table_name}\.\*/, ns[:select])
-  end
-  
-  def test_double_quoted_queries
-    x = fake_model
-    x.class_eval do
-      extend Texticle
-      index('awesome') do
-        name
-      end
-    end
-    
-    ns = x.named_scopes.first[1].call('foo bar "foo bar"')
-    assert_match(/'foo' & 'bar' & 'foo bar'/, ns[:select])
-  end
-  
-  def test_wildcard_queries
-    x = fake_model
-    x.class_eval do
-      extend Texticle
-      index('awesome') do
-        name
-      end
-    end
-    
-    ns = x.named_scopes.first[1].call('foo bar*')
-    assert_match(/'foo' & 'bar:*'/, ns[:select])
-  end
-end