@@ -4,3 +4,4 @@ coverage *.tmproj rdoc spec/fixtures/database.yml +tmp .gitignore @@ -20,7 +20,7 @@ module ThinkingSphinx module Version #:nodoc: Major = 0 Minor = 9 - Tiny = 7 + Tiny = 8 String = [Major, Minor, Tiny].join('.') end lib/thinking_sphinx.rb @@ -46,7 +46,7 @@ module ThinkingSphinx :pid_file, :searchd_file_path, :address, :port, :allow_star, :min_prefix_len, :min_infix_len, :mem_limit, :max_matches, :morphology, :charset_type, :charset_table, :ignore_chars, :html_strip, - :html_remove_elements, :app_root + :html_remove_elements, :database_yml_file, :app_root attr_reader :environment @@ -58,6 +58,7 @@ module ThinkingSphinx self.app_root = Merb.root if defined?(Merb) self.app_root ||= app_root + self.database_yml_file = "#{self.app_root}/config/database.yml" self.config_file = "#{self.app_root}/config/#{environment}.sphinx.conf" self.searchd_log_file = "#{self.app_root}/log/searchd.log" self.query_log_file = "#{self.app_root}/log/searchd.query.log" @@ -97,7 +98,7 @@ module ThinkingSphinx def build(file_path=nil) load_models file_path ||= "#{self.config_file}" - database_confs = YAML::load(ERB.new(IO.read("#{app_root}/config/database.yml")).result) + database_confs = YAML::load(ERB.new(IO.read("#{self.database_yml_file}")).result) database_confs.symbolize_keys! database_conf = database_confs[environment.to_sym] database_conf.symbolize_keys! @@ -130,14 +131,14 @@ searchd infixed_fields = [] model.indexes.each_with_index do |index, i| - file.write index.to_config(i, database_conf, charset_type) + file.write index.to_config(model, i, database_conf, charset_type) create_array_accum if index.adapter == :postgres - sources << "#{model.indexes.first.name}_#{i}_core" - delta_sources << "#{model.indexes.first.name}_#{i}_delta" if index.delta? + sources << "#{ThinkingSphinx::Index.name(model)}_#{i}_core" + delta_sources << "#{ThinkingSphinx::Index.name(model)}_#{i}_delta" if index.delta? end - source_list = sources.collect { |s| "source = #{s}" }.join("\n") + source_list = sources.collect { |s| "source = #{s}" }.join("\n") delta_list = delta_sources.collect { |s| "source = #{s}" }.join("\n") file.write core_index_for_model(model, source_list) @@ -194,10 +195,10 @@ searchd def core_index_for_model(model, sources) output = <<-INDEX -index #{model.indexes.first.name}_core +index #{ThinkingSphinx::Index.name(model)}_core { #{sources} -path = #{self.searchd_file_path}/#{model.indexes.first.name}_core +path = #{self.searchd_file_path}/#{ThinkingSphinx::Index.name(model)}_core charset_type = #{self.charset_type} INDEX @@ -230,22 +231,22 @@ INDEX def delta_index_for_model(model, sources) <<-INDEX -index #{model.indexes.first.name}_delta : #{model.indexes.first.name}_core +index #{ThinkingSphinx::Index.name(model)}_delta : #{ThinkingSphinx::Index.name(model)}_core { #{sources} - path = #{self.searchd_file_path}/#{model.indexes.first.name}_delta + path = #{self.searchd_file_path}/#{ThinkingSphinx::Index.name(model)}_delta } INDEX end def distributed_index_for_model(model) - sources = ["local = #{model.indexes.first.name}_core"] + sources = ["local = #{ThinkingSphinx::Index.name(model)}_core"] if model.indexes.any? { |index| index.delta? } - sources << "local = #{model.indexes.first.name}_delta" + sources << "local = #{ThinkingSphinx::Index.name(model)}_delta" end <<-INDEX -index #{model.indexes.first.name} +index #{ThinkingSphinx::Index.name(model)} { type = distributed #{ sources.join("\n ") } lib/thinking_sphinx/configuration.rb @@ -38,6 +38,10 @@ module ThinkingSphinx end def name + self.class.name(@model) + end + + def self.name(model) model.name.underscore.tr(':/\\', '_') end @@ -46,7 +50,7 @@ module ThinkingSphinx File.size?("#{config.searchd_file_path}/#{self.name}_#{part}.spa").nil? end - def to_config(index, database_conf, charset_type) + def to_config(model, index, database_conf, charset_type) # Set up associations and joins link! @@ -65,7 +69,7 @@ module ThinkingSphinx config = <<-SOURCE -source #{model.indexes.first.name}_#{index}_core +source #{self.class.name(model)}_#{index}_core { type = #{db_adapter} sql_host = #{database_conf[:host] || "localhost"} @@ -86,7 +90,7 @@ sql_query_info = #{to_sql_query_info} if delta? config += <<-SOURCE -source #{model.indexes.first.name}_#{index}_delta : #{model.indexes.first.name}_#{index}_core +source #{self.class.name(model)}_#{index}_delta : #{self.class.name(model)}_#{index}_core { sql_query_pre = sql_query_pre = #{charset_type == "utf-8" && adapter == :mysql ? "SET NAMES utf8" : ""} lib/thinking_sphinx/index.rb @@ -14,6 +14,8 @@ Spec::Runner.configure do |config| sphinx.setup_mysql require 'spec/fixtures/models' + # puts "Models:", ThinkingSphinx.indexed_models + config.before :all do %w( tmp tmp/config tmp/log tmp/db ).each do |path| FileUtils.mkdir_p "#{Dir.pwd}/#{path}" @@ -21,7 +23,8 @@ Spec::Runner.configure do |config| Kernel.const_set :RAILS_ROOT, "#{Dir.pwd}/tmp" unless defined?(RAILS_ROOT) - # sphinx.start + sphinx.setup_sphinx + sphinx.start end config.before :each do @@ -30,8 +33,8 @@ Spec::Runner.configure do |config| end config.after :all do - # sphinx.stop + sphinx.stop - FileUtils.rm_r "#{Dir.pwd}/tmp" + # FileUtils.rm_r "#{Dir.pwd}/tmp" end end spec/spec_helper.rb @@ -44,7 +44,62 @@ class SphinxHelper } end + def setup_sphinx + @configuration = ThinkingSphinx::Configuration.new + File.open("spec/fixtures/sphinx/database.yml", "w") do |file| + YAML.dump({@configuration.environment => { + :adapter => 'mysql', + :host => @host, + :database => "thinking_sphinx", + :username => @username, + :password => @password + }}, file) + end + FileUtils.mkdir_p(@configuration.searchd_file_path) + + @configuration.database_yml_file = "spec/fixtures/sphinx/database.yml" + @configuration.build + + index + end + def reset setup_mysql end + + def index + cmd = "indexer --config #{@configuration.config_file} --all" + cmd << " --rotate" if running? + `#{cmd}` + end + + def start + return if running? + + cmd = "searchd --config #{@configuration.config_file}" + `#{cmd}` + + sleep(1) + + unless running? + puts "Failed to start searchd daemon. Check #{@configuration.searchd_log_file}." + end + end + + def stop + return unless running? + `kill #{pid}` + end + + def pid + if File.exists?("#{@configuration.pid_file}") + `cat #{@configuration.pid_file}`[/\d+/] + else + nil + end + end + + def running? + pid && `ps #{pid} | wc -l`.to_i > 1 + end end spec/sphinx_helper.rb @@ -1,47 +1,51 @@ require 'spec/spec_helper' describe ThinkingSphinx::Search do - describe "search_for_id method" do - before :each do - @client = Riddle::Client.stub_instance( - :filters => [], - :filters= => true, - :id_range= => true, - :query => { - :matches => [] - } - ) - - ThinkingSphinx::Search.stub_methods( - :client_from_options => @client, - :search_conditions => ["", []] - ) - end - - it "should set the client id range to focus on the given id" do - ThinkingSphinx::Search.search_for_id 42, "an_index" - - @client.should have_received(:id_range=).with(42..42) - end - - it "should query on the given index" do - ThinkingSphinx::Search.search_for_id 42, "an_index" - - @client.should have_received(:query).with("", "an_index") - end - - it "should return true if a record is returned" do - @client.stub_method(:query => { - :matches => [24] - }) - - ThinkingSphinx::Search.search_for_id(42, "an_index").should be_true - end - - it "should return false if no records are returned" do - ThinkingSphinx::Search.search_for_id(42, "an_index").should be_false - end - end + # describe "search_for_id method" do + # before :each do + # @client = Riddle::Client.stub_instance( + # :filters => [], + # :filters= => true, + # :id_range= => true, + # :query => { + # :matches => [] + # } + # ) + # + # ThinkingSphinx::Search.stub_methods( + # :client_from_options => @client, + # :search_conditions => ["", []] + # ) + # end + # + # after :each do + # ThinkingSphinx::Search.unstub_method(:client_from_options) + # end + # + # it "should set the client id range to focus on the given id" do + # ThinkingSphinx::Search.search_for_id 42, "an_index" + # + # @client.should have_received(:id_range=).with(42..42) + # end + # + # it "should query on the given index" do + # ThinkingSphinx::Search.search_for_id 42, "an_index" + # + # @client.should have_received(:query).with("", "an_index") + # end + # + # it "should return true if a record is returned" do + # @client.stub_method(:query => { + # :matches => [24] + # }) + # + # ThinkingSphinx::Search.search_for_id(42, "an_index").should be_true + # end + # + # it "should return false if no records are returned" do + # ThinkingSphinx::Search.search_for_id(42, "an_index").should be_false + # end + # end describe "instance_from_result method" do before :each do @@ -160,4 +164,38 @@ describe ThinkingSphinx::Search do ).should == [@person_a, @person_b, @person_c] end end + + describe "search result" do + before :each do + @results = ThinkingSphinx::Search.search "" + end + + it "should respond to previous_page" do + # + end + + it "should respond to next_page" do + # + end + + it "should respond to current_page" do + # + end + + it "should respond to total_pages" do + # + end + + it "should respond to total_entries" do + # + end + + it "should respond to offset" do + # + end + + it "should be a subclass of Array" do + # + end + end end spec/unit/thinking_sphinx/search_spec.rb @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "thinking-sphinx" - s.version = "0.9.7" + s.version = "0.9.8" s.summary = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching." s.description = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching." s.author = "Pat Allan" thinking-sphinx.gemspec 662cd9dd408e301b829e7b561e2c5086e4a1c71c Pat Allan pat@freelancing-gods.com http://github.com/jaikoo/thinking-sphinx/commit/b881199d768bf6a6df62f997cbf4ffe4be75cecd b881199d768bf6a6df62f997cbf4ffe4be75cecd 2008-07-21T20:23:37-07:00 2008-07-21T20:23:37-07:00 Getting Sphinx working within specs, to try to get a better collection class happening 835c36a321595c38b328a6996a219d310de53b02 Pat Allan pat@freelancing-gods.com