texticle 1.0.2 → 1.0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+=== 1.0.3 / 2010-07-07
+
+* 1 major enhancement
+
+  * Added Rails 3 support.
+
+* 1 bugfix
+
+  * Model names that end in double 's's (like Address) don't choke the rake tasks anymore.
+
 === 1.0.2 / 2009-10-17
 
 * 1 bugfix

data/Manifest.txt

@@ -5,6 +5,7 @@ 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

data/README.rdoc

@@ -14,10 +14,25 @@ named_scope methods making searching easy and fun!
 
 == SYNOPSIS:
 
+=== Rails 3 Configuration
+
+In the project's Gemfile add
+
+    gem 'texticle', '1.0.2', :git => 'git://github.com/tenderlove/texticle'
+
+=== Rails 2 Configuration
+
 In environment.rb:
 
   config.gem 'texticle'
 
+In your Rakefile:
+
+  require 'rubygems'
+  require 'texticle/tasks'
+
+=== Usage
+
 Declare your index in your model:
 
   class Product < ActiveRecord::Base
@@ -31,13 +46,7 @@ Use the search method
 
   Product.search('hello world')
 
-Full text searches can be sped up by creating indexes.  To create the
-indexes, add these lines to your Rakefile:
-
-  require 'rubygems'
-  require 'texticle/tasks'
-
-Then run:
+Full text searches can be sped up by creating indexes. To create them, run:
 
   $ rake texticle:create_indexes
 

data/lib/texticle.rb

@@ -1,4 +1,5 @@
 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
@@ -48,7 +49,7 @@ require 'texticle/full_text_index'
 #   end
 module Texticle
   # The version of Texticle you are using.
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
   # A list of full text indexes
   attr_accessor :full_text_indexes
@@ -58,17 +59,19 @@ module Texticle
   def index name = nil, dictionary = 'english', &block
     search_name = ['search', name].compact.join('_')
 
-    class_eval(<<-eoruby)
-      named_scope :#{search_name}, lambda { |term|
+    class_eval do
+      named_scope search_name.to_sym, lambda { |term|
+        # Let's extract the individual terms to allow for quoted terms.
+        term = term.scan(/"([^"]+)"|(\S+)/).flatten.compact.map {|lex| "'#{lex}'"}.join(' & ')
         {
-          :select => "\#{table_name}.*, ts_rank_cd((\#{full_text_indexes.first.to_s}),
-            plainto_tsquery(\#{connection.quote(term)\})) as rank",
+          :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} @@ plainto_tsquery(?)", term],
+            ["#{full_text_indexes.first.to_s} @@ to_tsquery(?)", term],
           :order => 'rank DESC'
         }
       }
-    eoruby
+    end
     index_name = [table_name, name, 'fts_idx'].compact.join('_')
     (self.full_text_indexes ||= []) <<
       FullTextIndex.new(index_name, dictionary, self, &block)

data/lib/texticle/railtie.rb

@@ -0,0 +1,14 @@
+# Module used to conform to Rails 3 plugin API
+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
+  end
+end

data/lib/texticle/tasks.rb

@@ -10,7 +10,7 @@ namespace :texticle do
       fh.puts "class FullTextSearch#{now.to_i} < ActiveRecord::Migration"
       fh.puts "  def self.up"
       Dir[File.join(RAILS_ROOT, 'app', 'models', '*.rb')].each do |f|
-        klass = File.basename(f, '.rb').classify.constantize
+        klass = File.basename(f, '.rb').pluralize.classify.constantize
         if klass.respond_to?(:full_text_indexes)
           (klass.full_text_indexes || []).each do |fti|
             fh.puts <<-eostmt
@@ -32,10 +32,14 @@ namespace :texticle do
   desc "Create full text indexes"
   task :create_indexes => ['texticle:destroy_indexes'] do
     Dir[File.join(RAILS_ROOT, 'app', 'models', '*.rb')].each do |f|
-      klass = File.basename(f, '.rb').classify.constantize
+      klass = File.basename(f, '.rb').pluralize.classify.constantize
       if klass.respond_to?(:full_text_indexes)
         (klass.full_text_indexes || []).each do |fti|
-          fti.create
+          begin
+            fti.create
+          rescue ActiveRecord::StatementInvalid => e
+            warn "WARNING: Couldn't create index for #{klass.to_s}, skipping..."
+          end
         end
       end
     end
@@ -44,7 +48,7 @@ namespace :texticle do
   desc "Destroy full text indexes"
   task :destroy_indexes => [:environment] do
     Dir[File.join(RAILS_ROOT, 'app', 'models', '*.rb')].each do |f|
-      klass = File.basename(f, '.rb').classify.constantize
+      klass = File.basename(f, '.rb').pluralize.classify.constantize
       if klass.respond_to?(:full_text_indexes)
         (klass.full_text_indexes || []).each do |fti|
           fti.destroy

data/test/test_texticle.rb

@@ -44,4 +44,17 @@ class TestTexticle < TexticleTestCase
     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
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: texticle
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  hash: 17
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,19 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 -07:00
+date: 2010-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  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
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id002
 description: |-
   Texticle exposes full text search capabilities from PostgreSQL, and allows
   you to declare full text indexes.  Texticle will extend ActiveRecord with
@@ -44,6 +72,7 @@ files:
 - Rakefile
 - lib/texticle.rb
 - lib/texticle/full_text_index.rb
+- lib/texticle/railtie.rb
 - lib/texticle/tasks.rb
 - rails/init.rb
 - test/helper.rb
@@ -60,21 +89,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: texticle
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Texticle exposes full text search capabilities from PostgreSQL, and allows you to declare full text indexes