sunspot_rails 0.10.5 → 0.10.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 10
-:patch: 5
 :major: 0
+:minor: 10
+:patch: 7

data/dev_tasks/gemspec.rake

@@ -6,7 +6,14 @@ begin
     s.summary = 'Rails integration for the Sunspot Solr search library'
     s.email = 'mat@patch.com'
     s.homepage = 'http://github.com/outoftime/sunspot_rails'
-    s.description = 'Rails integration for the Sunspot Solr search library'
+    s.description = <<TEXT
+Sunspot::Rails is an extension to the Sunspot library for Solr search.
+Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
+defining search and indexing related methods on ActiveRecord models themselves,
+running a Sunspot-compatible Solr instance for development and test
+environments, and automatically commit Solr index changes at the end of each
+Rails request.
+TEXT
     s.authors = ['Mat Brown', 'Peer Allan', 'Michael Moen', 'Benjamin Krause']
     s.rubyforge_project = 'sunspot'
     s.files = FileList['[A-Z]*',
@@ -17,12 +24,19 @@ begin
                        'spec/*.rb',
                        'spec/mock_app/{app,lib,db,vendor,config}/**/*',
                        'spec/mock_app/{tmp,log,solr}']
-    s.add_dependency 'rails', '~> 2.1'
     s.add_dependency 'escape', '>= 0.0.4'
-    s.add_dependency 'outoftime-sunspot', '>= 0.8.2'
+    s.add_dependency 'sunspot', '~> 0.10.0' 
     s.add_development_dependency 'rspec', '~> 1.2'
     s.add_development_dependency 'rspec-rails', '~> 1.2'
     s.add_development_dependency 'ruby-debug', '~> 0.10'
     s.add_development_dependency 'technicalpickles-jeweler', '~> 1.0'
   end
+
+  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
+end
+
+namespace :release do
+  desc "Release gem to RubyForge and GitHub"
+  task :all => [:"rubyforge:release:gem", :"gemcutter:release"]
 end

data/lib/sunspot/rails/request_lifecycle.rb

@@ -9,7 +9,7 @@ module Sunspot #:nodoc:
       class <<self
         def included(base) #:nodoc:
           base.after_filter do
-            Sunspot.commit_if_dirty if Sunspot::Rails.configuration.auto_commit_after_request?
+            Sunspot::Rails.session.commit_if_dirty if Sunspot::Rails.configuration.auto_commit_after_request?
           end
         end
       end

data/lib/sunspot/rails/searchable.rb

@@ -104,7 +104,7 @@ module Sunspot #:nodoc:
         # Sunspot::Search:: Object containing results, totals, facets, etc.
         #
         def search(&block)
-          Sunspot.search(self, &block)
+          Sunspot::Rails.session.search(self, &block)
         end
 
         # 
@@ -125,7 +125,7 @@ module Sunspot #:nodoc:
         # Remove instances of this class from the Solr index.
         #
         def remove_all_from_index
-          Sunspot.remove_all(self)
+          Sunspot::Rails.session.remove_all(self)
         end
 
         # 
@@ -136,8 +136,8 @@ module Sunspot #:nodoc:
         # XXX Sunspot should implement remove_all!()
         #
         def remove_all_from_index!
-          Sunspot.remove_all(self)
-          Sunspot.commit
+          remove_all_from_index
+          Sunspot::Rails.session.commit
         end
 
         # 
@@ -180,20 +180,20 @@ module Sunspot #:nodoc:
           options = { :batch_size => 500, :batch_commit => true, :include => []}.merge(opts)
           remove_all_from_index
           unless options[:batch_size]
-            Sunspot.index!(all(:include => options[:include]))
+            Sunspot::Rails.session.index!(all(:include => options[:include]))
           else
             record_count = count
             counter = 1
             offset = 0
             while(offset < record_count)
               benchmark options[:batch_size], counter do
-                Sunspot.index(all(:include => options[:include], :offset => offset, :limit => options[:batch_size], :order => primary_key))
+                Sunspot::Rails.session.index(all(:include => options[:include], :offset => offset, :limit => options[:batch_size], :order => primary_key))
               end
-              Sunspot.commit if options[:batch_commit]
+              Sunspot::Rails.session.commit if options[:batch_commit]
               offset += options[:batch_size]
               counter += 1
             end
-            Sunspot.commit unless options[:batch_commit]
+            Sunspot::Rails.session.commit unless options[:batch_commit]
           end
         end
 
@@ -267,14 +267,14 @@ module Sunspot #:nodoc:
         # manually.
         #
         def index
-          Sunspot.index(self)
+          Sunspot::Rails.session.index(self)
         end
 
         # 
         # Index the model in Solr and immediately commit. See #index
         #
         def index!
-          Sunspot.index!(self)
+          Sunspot::Rails.session.index!(self)
         end
         
         # 
@@ -285,19 +285,15 @@ module Sunspot #:nodoc:
         # manually.
         #
         def remove_from_index
-          Sunspot.remove(self)
+          Sunspot::Rails.session.remove(self)
         end
 
         # 
         # Remove the model from the Solr index and commit immediately. See
         # #remove_from_index
         #
-        #---
-        #FIXME Sunspot should implement remove!()
-        #
         def remove_from_index!
-          Sunspot.remove(self)
-          Sunspot.commit
+          Sunspot::Rails.session.remove!(self)
         end
       end
     end

data/lib/sunspot/rails/tasks.rb

@@ -16,7 +16,7 @@ namespace :sunspot do
       [data_path, pid_path].each { |path| FileUtils.mkdir_p(path) }
       port = Sunspot::Rails.configuration.port
       FileUtils.cd(File.join(pid_path)) do
-        command = ['sunspot-solr', 'start', '--', '-p', port.to_s, '-d', data_path]
+        command = ['sunspot-solr', 'start', '-p', port.to_s, '-d', data_path]
         if solr_home
           command << '-s' << solr_home
         end
@@ -33,7 +33,7 @@ namespace :sunspot do
         end
       FileUtils.mkdir_p(data_path)
       port = Sunspot::Rails.configuration.port
-      command = ['sunspot-solr', 'run', '--', '-p', port.to_s, '-d', data_path]
+      command = ['sunspot-solr', 'run', '-p', port.to_s, '-d', data_path]
       if RUBY_PLATFORM =~ /w(in)?32$/
         command.first << '.bat'
       end

data/lib/sunspot/rails.rb

@@ -8,6 +8,19 @@ module Sunspot #:nodoc:
       def configuration
         @configuration ||= Sunspot::Rails::Configuration.new
       end
+
+      def session
+        Thread.current[:sunspot_rails_session] ||=
+          begin
+            session = Sunspot::Session.new
+            session.config.solr.url = URI::HTTP.build(
+              :host => configuration.hostname,
+              :port => configuration.port,
+              :path => configuration.path
+            ).to_s
+            session
+          end
+      end
     end
   end
 end

data/rails/init.rb

@@ -1,9 +1,5 @@
 require 'sunspot'
 
-Sunspot.config.solr.url = URI::HTTP.build(:host => Sunspot::Rails.configuration.hostname,
-                                          :port => Sunspot::Rails.configuration.port,
-                                          :path => Sunspot::Rails.configuration.path).to_s
-
 Sunspot::Adapters::InstanceAdapter.register(Sunspot::Rails::Adapters::ActiveRecordInstanceAdapter, ActiveRecord::Base)
 Sunspot::Adapters::DataAccessor.register(Sunspot::Rails::Adapters::ActiveRecordDataAccessor, ActiveRecord::Base)
 ActiveRecord::Base.module_eval { include(Sunspot::Rails::Searchable) }

data/spec/mock_app/db/test.db

@@ -0,0 +1 @@
+S

data/spec/model_lifecycle_spec.rb

@@ -4,7 +4,7 @@ describe 'searchable with lifecycle' do
   describe 'on create' do
     before :each do
       @post = PostWithAuto.create
-      Sunspot.commit
+      Sunspot::Rails.session.commit
     end
 
     it 'should automatically index' do
@@ -16,7 +16,7 @@ describe 'searchable with lifecycle' do
     before :each do
       @post = PostWithAuto.create
       @post.update_attributes(:title => 'Test 1')
-      Sunspot.commit
+      Sunspot::Rails.session.commit
     end
 
     it 'should automatically update index' do
@@ -28,7 +28,7 @@ describe 'searchable with lifecycle' do
     before :each do
       @post = PostWithAuto.create
       @post.destroy
-      Sunspot.commit
+      Sunspot::Rails.session.commit
     end
 
     it 'should automatically remove it from the index' do

data/spec/model_spec.rb

@@ -12,7 +12,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should index the model' do
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.should == [@post]
     end
   end
@@ -40,7 +40,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should remove the model from the index' do
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.should be_empty
     end
   end
@@ -59,8 +59,8 @@ describe 'ActiveRecord mixin' do
 
   describe 'remove_all_from_index' do
     before :each do
-      @posts = Array.new(10) { Post.create! }.each { |post| Sunspot.index(post) }
-      Sunspot.commit
+      @posts = Array.new(10) { Post.create! }.each { |post| Sunspot::Rails.session.index(post) }
+      Sunspot::Rails.session.commit
       Post.remove_all_from_index
     end
 
@@ -69,15 +69,15 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should remove all instances from the index' do
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.should be_empty
     end
   end
 
   describe 'remove_all_from_index!' do
     before :each do
-      Array.new(10) { Post.create! }.each { |post| Sunspot.index(post) }
-      Sunspot.commit
+      Array.new(10) { Post.create! }.each { |post| Sunspot::Rails.session.index(post) }
+      Sunspot::Rails.session.commit
       Post.remove_all_from_index!
     end
 
@@ -115,7 +115,7 @@ describe 'ActiveRecord mixin' do
   describe 'search_ids()' do
     before :each do
       @posts = Array.new(2) { Post.create! }.each { |post| post.index }
-      Sunspot.commit
+      Sunspot::Rails.session.commit
     end
 
     it 'should return IDs' do
@@ -136,7 +136,7 @@ describe 'ActiveRecord mixin' do
   describe 'index_orphans()' do
     before :each do
       @posts = Array.new(2) { Post.create }.each { |post| post.index }
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       @posts.first.destroy
     end
 
@@ -148,13 +148,13 @@ describe 'ActiveRecord mixin' do
   describe 'clean_index_orphans()' do
     before :each do
       @posts = Array.new(2) { Post.create }.each { |post| post.index }
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       @posts.first.destroy
     end
 
     it 'should remove orphans from the index' do
       Post.clean_index_orphans
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.should == [@posts.last]
     end
   end
@@ -166,7 +166,7 @@ describe 'ActiveRecord mixin' do
 
     it 'should index all instances' do
       Post.reindex(:batch_size => nil)
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.to_set.should == @posts.to_set
     end
 
@@ -175,7 +175,7 @@ describe 'ActiveRecord mixin' do
       old_post.index!
       old_post.destroy
       Post.reindex
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.to_set.should == @posts.to_set
     end
     
@@ -188,7 +188,7 @@ describe 'ActiveRecord mixin' do
 
     it 'should index all instances' do
       Post.reindex(:batch_size => nil)
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.to_set.should == @posts.to_set
     end
 
@@ -197,14 +197,14 @@ describe 'ActiveRecord mixin' do
       old_post.index!
       old_post.destroy
       Post.reindex
-      Sunspot.commit
+      Sunspot::Rails.session.commit
       Post.search.results.to_set.should == @posts.to_set
     end
     
     describe "using batch sizes" do
       it 'should index with a specified batch size' do
         Post.reindex(:batch_size => 1)
-        Sunspot.commit
+        Sunspot::Rails.session.commit
         Post.search.results.to_set.should == @posts.to_set
       end
     end
@@ -263,12 +263,12 @@ describe 'ActiveRecord mixin' do
       end
 
       it "should commit after indexing each batch" do
-        Sunspot.should_receive(:commit).twice
+        Sunspot::Rails.session.should_receive(:commit).twice
         Post.reindex(:batch_size => 5)
       end
 
       it "should commit after indexing everything" do
-        Sunspot.should_receive(:commit).once
+        Sunspot::Rails.session.should_receive(:commit).once
         Post.reindex(:batch_commit => false)
       end
       

data/spec/session_spec.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'Sunspot::Rails session' do
+  it 'should be a different object for each thread' do
+    session1 = nil
+    session2 = nil
+    Thread.new { session1 = Sunspot::Rails.session }.join
+    Thread.new { session2 = Sunspot::Rails.session }.join
+    session1.should_not eql(session2)
+  end
+end

data/spec/spec_helper.rb

@@ -25,8 +25,8 @@ end
 
 Spec::Runner.configure do |config|
   config.before(:each) do
-    Sunspot.remove_all
-    Sunspot.commit
+    Sunspot::Rails.session.remove_all
+    Sunspot::Rails.session.commit
     load_schema
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.7
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,19 +12,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -04:00
+date: 2009-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.1"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: escape
   type: :runtime
@@ -36,14 +26,14 @@ dependencies:
         version: 0.0.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: outoftime-sunspot
+  name: sunspot
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 0.10.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -85,7 +75,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
-description: Rails integration for the Sunspot Solr search library
+description: |
+  Sunspot::Rails is an extension to the Sunspot library for Solr search.
+  Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
+  defining search and indexing related methods on ActiveRecord models themselves,
+  running a Sunspot-compatible Solr instance for development and test
+  environments, and automatically commit Solr index changes at the end of each
+  Rails request.
+
 email: mat@patch.com
 executables: []
 
@@ -99,7 +96,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- TODO
 - VERSION.yml
 - dev_tasks/gemspec.rake
 - dev_tasks/rdoc.rake
@@ -129,10 +125,12 @@ files:
 - spec/mock_app/config/initializers/session_store.rb
 - spec/mock_app/config/routes.rb
 - spec/mock_app/config/sunspot.yml
+- spec/mock_app/db/test.db
 - spec/model_lifecycle_spec.rb
 - spec/model_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb
+- spec/session_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot_rails
@@ -164,6 +162,7 @@ specification_version: 3
 summary: Rails integration for the Sunspot Solr search library
 test_files: 
 - spec/spec_helper.rb
+- spec/session_spec.rb
 - spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
 - spec/schema.rb

data/TODO

@@ -1,4 +0,0 @@
-* Fix final status output for reindex
-* Add batch-per-request option
-* Optionally yield from reindex
-* Access to all searchable classes