texticle 2.0.pre2 → 2.0.pre3

data/CHANGELOG.rdoc

@@ -1,3 +1,19 @@
+== 2.0.pre3
+
+* 1 new feature
+
+  * #select calls now limit the columns that are searched
+
+* 1 bugfix
+
+  * #search calls without an argument assume an empty string as a search term (it errored out previously)
+
+== 2.0.pre2
+
+* 1 bugfix
+
+  * #respond_to? wasn't overwritten correctly
+
 === 2.0.pre
 
 * Complete refactoring of Texticle

data/lib/texticle.rb

@@ -2,14 +2,15 @@ require 'active_record'
 
 module Texticle
 
-  def search(query = {})
+  def search(query = "")
     language = connection.quote('english')
 
     exclusive = true
+    string_columns = columns.select {|column| column.type == :string }.map(&:name)
 
     unless query.is_a?(Hash)
       exclusive = false
-      query = columns.select {|column| column.type == :string }.map(&:name).inject({}) do |terms, column|
+      query = string_columns.inject({}) do |terms, column|
         terms.merge column => query.to_s
       end
     end
@@ -17,6 +18,11 @@ module Texticle
     similarities = []
     conditions = []
 
+    select_values = scoped.select_values.map(&:to_s) & string_columns
+    query.select! do |column, search_term|
+      select_values.include? column
+    end unless select_values.empty?
+
     query.each do |column, search_term|
       column = connection.quote_column_name(column)
       search_term = connection.quote normalize(Helper.normalize(search_term))
@@ -26,7 +32,7 @@ module Texticle
 
     rank = connection.quote_column_name('rank' + rand.to_s)
 
-    select("#{quoted_table_name}.*, #{similarities.join(" + ")} AS #{rank}").
+    select("#{quoted_table_name + '.*,' if select_values.empty?} #{similarities.join(" + ")} AS #{rank}").
       where(conditions.join(exclusive ? " AND " : " OR ")).
       order("#{rank} DESC")
   end

data/spec/texticle_spec.rb

@@ -118,6 +118,19 @@ class TexticleTest < Test::Unit::TestCase
         assert Game.respond_to?(:normalize, true)
       end
     end
+
+    context "when searching after selecting columns to return" do
+      should "limit the search to the selected columns" do
+        assert_empty Game.select(:system).search("Mario")
+        assert_equal @mario.title, Game.select(:title).search("Mario").first.title
+      end
+
+      should "not fetch extra columns" do
+        assert_raise(ActiveModel::MissingAttributeError) do
+          Game.select(:title).search("Mario").first.system
+        end
+      end
+    end
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: texticle
 version: !ruby/object:Gem::Version 
   prerelease: 4
-  version: 2.0.pre2
+  version: 2.0.pre3
 platform: ruby
 authors: 
 - ecin
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 Z
+date: 2011-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pg