thinking-sphinx 1.3.19 → 1.3.20

data/VERSION

@@ -1 +1 @@
-1.3.19
+1.3.20

data/features/thinking_sphinx/models/alpha.rb

@@ -14,6 +14,7 @@ class Alpha < ActiveRecord::Base
     
     has value, created_at, created_on
     has cost, :facet => true
+    has active
     
     set_property :field_weights => {'alternative_name' => 10}
     

data/lib/thinking_sphinx.rb

@@ -10,6 +10,7 @@ require 'thinking_sphinx/property'
 require 'thinking_sphinx/active_record'
 require 'thinking_sphinx/association'
 require 'thinking_sphinx/attribute'
+require 'thinking_sphinx/bundled_search'
 require 'thinking_sphinx/configuration'
 require 'thinking_sphinx/context'
 require 'thinking_sphinx/excerpter'

data/lib/thinking_sphinx/auto_version.rb

@@ -5,6 +5,8 @@ module ThinkingSphinx
       case version
       when '0.9.8', '0.9.9'
         require "riddle/#{version}"
+      when '1.10-beta'
+        require 'riddle/1.10'
       else
         STDERR.puts %Q{
 Sphinx cannot be found on your system. You may need to configure the following

data/lib/thinking_sphinx/bundled_search.rb

@@ -0,0 +1,44 @@
+module ThinkingSphinx
+  class BundledSearch
+    attr_reader :client
+    
+    def initialize
+      @searches = []
+    end
+    
+    def search(*args)
+      @searches << ThinkingSphinx.search(*args)
+      @searches.last.append_to client
+    end
+    
+    def search_for_ids(*args)
+      @searches << ThinkingSphinx.search_for_ids(*args)
+      @searches.last.append_to client
+    end
+    
+    def searches
+      populate
+      @searches
+    end
+    
+    private
+    
+    def client
+      @client ||= ThinkingSphinx::Configuration.instance.client
+    end
+    
+    def populated?
+      @populated
+    end
+    
+    def populate
+      return if populated?
+      
+      @populated = true
+      
+      client.run.each_with_index do |results, index|
+        searches[index].populate_from_queue results
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/search.rb

@@ -57,20 +57,16 @@ module ThinkingSphinx
       ThinkingSphinx.facets *args
     end
     
-    def self.bundle_searches(enum)
-      client = ThinkingSphinx::Configuration.instance.client
+    def self.bundle_searches(enum = nil)
+      bundle = ThinkingSphinx::BundledSearch.new
       
-      searches = enum.collect { |item|
-        search = yield ThinkingSphinx, item
-        search.append_to client
-        search
-      }
-      
-      client.run.each_with_index.collect { |results, index|
-        searches[index].populate_from_queue results
-      }
+      if enum.nil?
+        yield bundle
+      else
+        enum.each { |item| yield bundle, item }
+      end
       
-      searches
+      bundle.searches
     end
     
     def self.matching_fields(fields, bitmask)

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -22,6 +22,14 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
     
+    it "should require 1.10-beta if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/1.10')
+      
+      @config.stub!(:version => '1.10-beta')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
     it "should output a warning if the detected version is something else" do
       STDERR.should_receive(:puts)
       

data/tasks/distribution.rb

@@ -29,7 +29,7 @@ Jeweler::Tasks.new do |gem|
     "spec/**/*_spec.rb"
   ]
   
-  gem.add_dependency 'activerecord', '>= 1.15.6'
+  gem.add_dependency 'activerecord', '>= 1.15.6', '< 3.0.0'
   gem.add_dependency 'riddle',       '>= 1.0.10'
   gem.add_dependency 'after_commit', '>= 1.0.6'
   

data/tasks/testing.rb

@@ -7,7 +7,7 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts << "-c"
 end
-task :spec => :check_dependencies
+# task :spec => :check_dependencies
 
 desc "Run all feature-set configurations"
 task :features do |t|

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 61
   prerelease: false
   segments: 
   - 1
   - 3
-  - 19
-  version: 1.3.19
+  - 20
+  version: 1.3.20
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +08:00
+date: 2010-09-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 1
         - 15
         - 6
         version: 1.15.6
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +47,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 0
@@ -58,7 +62,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 0
@@ -74,7 +77,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -88,7 +90,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -104,7 +105,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -118,7 +118,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 3
@@ -134,7 +133,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -150,7 +148,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 3
@@ -185,6 +182,7 @@ files:
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/auto_version.rb
+- lib/thinking_sphinx/bundled_search.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/context.rb
@@ -343,7 +341,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -352,7 +349,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"