vendor/plugins/thinking-sphinx/lib/thinking_sphinx/index/builder.rb vendor/plugins/thinking-sphinx/lib/thinking_sphinx/index/faux_column.rb @@ -8,8 +8,7 @@ log/*.pid tmp config/database.yml config/*.sphinx.conf -index public/system public/javascripts/less_routes.js test/public/system -vendor/rails \ No newline at end of file +vendor/rails .gitignore @@ -28,7 +28,7 @@ Quick Setup (currently for non-Windows users only - due to ferret gem issues): 1. Edit config/database.yml.tmp to reflect the database names you would like to use. 2. Edit config/environments/production.rb so asset_host reflects the name of the production asset server 3. cp config/database.yml.tmp config/database.yml - 4. MAKE SURE YOU UPGRADE TO GEMS 1.2. + 4. MAKE SURE YOU UPGRADE TO GEMS 1.3. 5. RUN gem sources -a http://gems.github.com 6. rake lovdbyless:getting_started 7. rake test @@ -51,11 +51,6 @@ Install the Required Gems: TIPS: -Installing ferret on Windows -1. Running gem install ferret does not work. Instead, download the gem directly from http://rubyforge.org/frs/?group_id=1028 -2. Download file: ferret-0.11.6-mswin32.gem -3. From the directory you downloaded the gem to: gem install ferret-0.11.6-mswin32.gem - Installing ImageMagick and RMagick See these posts for tips: http://b.lesseverything.com/2007/9/26/installing-imagemagick-and-rmagick-on-mac-os-x @@ -84,11 +79,11 @@ Setup default values: 12. Edit application.css to suite your tastes. 13. Edit app/views/home/terms. -Configure Ferret: +Configure Thinking Sphinx: -14. Feel free to replace ferret with the search engine of your choice. -15. Acts_s_ferret home page: http://projects.jkraemer.net/acts_as_ferret/wiki. -16. We recommend using the drb server as described here: http://projects.jkraemer.net/acts_as_ferret/wiki/DrbServer. +14. rake ts:start +15. rake ts:in +16. Rake ts:start again in sphinx is not running. Start Lovd By Less: README @@ -36,6 +36,6 @@ class Admin::UsersController < ApplicationController else p = [] end - @results = Profile.search_results((p.delete(:q) || ''), :page => @page, :per_page => @per_page) + @results = Profile.search(p.delete(:q) || '') end end app/controllers/admin/users_controller.rb @@ -120,6 +120,6 @@ class ProfilesController < ApplicationController else p = [] end - @results = Profile.search_results((p.delete(:q) || ''), :page => @page, :per_page => @per_page) + @results = Profile.search(p.delete(:q) || '') end end app/controllers/profiles_controller.rb @@ -188,13 +188,6 @@ class Profile < ActiveRecord::Base - def self.search_results query = '', options = {} - arr = self.search(query) - logger.debug arr.inspect - arr - end - - protected def fix_http str app/models/profile.rb @@ -4,7 +4,7 @@ class ProfilesControllerTest < ActionController::TestCase context 'on POST to :search' do setup do - Profile.stubs(:search_results).returns(ThinkingSphinx::Collection.new(1, 1, 1, 1)) + Profile.stubs(:search).returns(ThinkingSphinx::Collection.new(1, 1, 1, 1)) post :search, {:q => 'user'} end @@ -15,7 +15,7 @@ class ProfilesControllerTest < ActionController::TestCase context 'on GET to :index' do setup do - Profile.stubs(:search_results).returns(ThinkingSphinx::Collection.new(1, 1, 1, 1)) + Profile.stubs(:search).returns(ThinkingSphinx::Collection.new(1, 1, 1, 1)) get :index end test/functional/profiles_controller_test.rb @@ -32,7 +32,7 @@ class SpiderTest < ActionController::IntegrationTest def test_spider_admin - Profile.stubs(:search_results).returns(ThinkingSphinx::Collection.new(1, 1, 1, 1)) + Profile.stubs(:search).returns(ThinkingSphinx::Collection.new(1, 1, 1, 1)) puts '' puts 'test_spider_admin' get "/login" test/integration/spider_test.rb c6c274ef4eec8f5441cd9ed0c736c19aba1dbb56 steve steve@lesseverything.com http://github.com/stevenbristol/lovd-by-less/commit/cde8c79b8879af54d2d2fb61b872b640317c812f cde8c79b8879af54d2d2fb61b872b640317c812f 2009-01-31T07:07:21-08:00 2009-01-31T07:07:21-08:00 lovd now runs shpinx ad5b2478c32f6e9a8dddbfb0dab96c2f9feadf9d steve steve@lesseverything.com