DrMark-thinking-sphinx 1.2.5 → 1.2.6

data/README.textile

@@ -147,3 +147,4 @@ Since I first released this library, there's been quite a few people who have su
 * J.D. Hollis
 * Jeffrey Chupp
 * Rob Anderton
+* Zach Inglis

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 5
+:patch: 6

data/lib/thinking_sphinx/configuration.rb

@@ -157,7 +157,9 @@ module ThinkingSphinx
     # messy dependencies issues).
     # 
     def load_models
-      return if defined?(Rails) && Rails.configuration.cache_classes
+      return if defined?(Rails) &&
+        Rails.configuration.cache_classes &&
+        Rails::VERSION::STRING.to_f > 2.1
       
       self.model_directories.each do |base|
         Dir["#{base}**/*.rb"].each do |file|

data/lib/thinking_sphinx/search.rb

@@ -25,7 +25,7 @@ module ThinkingSphinx
     HashOptions   = [:conditions, :with, :without, :with_all]
     ArrayOptions  = [:classes, :without_ids]
     
-    attr_reader :args, :options, :results
+    attr_reader :args, :options
     
     # Deprecated. Use ThinkingSphinx.search
     def self.search(*args)
@@ -68,6 +68,24 @@ module ThinkingSphinx
       @array
     end
     
+    # Indication of whether the request has been made to Sphinx for the search
+    # query.
+    # 
+    # @return [Boolean] true if the results have been requested.
+    # 
+    def populated?
+      !!@populated
+    end
+    
+    # The query result hash from Riddle.
+    # 
+    # @return [Hash] Raw Sphinx results
+    # 
+    def results
+      populate
+      @results
+    end
+    
     def method_missing(method, *args, &block)
       if is_scope?(method)
         add_scope(method, *args, &block)

data/lib/thinking_sphinx/tasks.rb

@@ -43,11 +43,14 @@ namespace :thinking_sphinx do
   
   desc "Stop Sphinx using Thinking Sphinx's settings"
   task :stop => :app_env do
-    raise RuntimeError, "searchd is not running." unless sphinx_running?
-    config = ThinkingSphinx::Configuration.instance
-    pid    = sphinx_pid
-    system! "#{config.bin_path}#{config.searchd_binary_name} --stop --config \"#{config.config_file}\""
-    puts "Stopped search daemon (pid #{pid})."
+    unless sphinx_running?
+      puts "searchd is not running"
+    else
+      config = ThinkingSphinx::Configuration.instance
+      pid    = sphinx_pid
+      system! "#{config.bin_path}#{config.searchd_binary_name} --stop --config \"#{config.config_file}\""
+      puts "Stopped search daemon (pid #{pid})."
+    end
   end
   
   desc "Restart Sphinx"

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -32,6 +32,31 @@ describe ThinkingSphinx::Search do
     end
   end
   
+  describe '#populated?' do
+    before :each do
+      @search = ThinkingSphinx::Search.new
+    end
+    
+    it "should be false if the client request has not been made" do
+      @search.populated?.should be_false
+    end
+    
+    it "should be true once the client request has been made" do
+      @search.first
+      @search.populated?.should be_true
+    end
+  end
+  
+  describe '#results' do
+    it "should populate search results before returning" do
+      @search = ThinkingSphinx::Search.new
+      @search.populated?.should be_false
+      
+      @search.results
+      @search.populated?.should be_true
+    end
+  end
+  
   describe '#method_missing' do
     before :each do
       Alpha.sphinx_scope(:by_name) { |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DrMark-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 -07:00
+date: 2009-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency