sunspot_rails 0.10.4 → 0.10.5

data/TODO

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

data/VERSION.yml

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

data/dev_tasks/gemspec.rake

@@ -8,6 +8,7 @@ begin
     s.homepage = 'http://github.com/outoftime/sunspot_rails'
     s.description = 'Rails integration for the Sunspot Solr search library'
     s.authors = ['Mat Brown', 'Peer Allan', 'Michael Moen', 'Benjamin Krause']
+    s.rubyforge_project = 'sunspot'
     s.files = FileList['[A-Z]*',
                        '{lib,tasks,dev_tasks}/**/*',
                        'install.rb',
@@ -18,7 +19,7 @@ begin
                        'spec/mock_app/{tmp,log,solr}']
     s.add_dependency 'rails', '~> 2.1'
     s.add_dependency 'escape', '>= 0.0.4'
-    s.add_dependency 'sunspot', '>= 0.8.2'
+    s.add_dependency 'outoftime-sunspot', '>= 0.8.2'
     s.add_development_dependency 'rspec', '~> 1.2'
     s.add_development_dependency 'rspec-rails', '~> 1.2'
     s.add_development_dependency 'ruby-debug', '~> 0.10'

data/dev_tasks/release.rake

@@ -0,0 +1,4 @@
+namespace :release do
+  desc 'Release gem on RubyForge and GitHub'
+  task :all => [:release, :"rubyforge:release:gem"]
+end

data/lib/sunspot/rails/configuration.rb

@@ -25,6 +25,7 @@ module Sunspot #:nodoc:
     # <code>rake sunspot:solr:start</code> task.
     #
     class Configuration
+      attr_writer :user_configuration
       #
       # The host name at which to connect to Solr. Default 'localhost'.
       #
@@ -33,10 +34,7 @@ module Sunspot #:nodoc:
       # String:: host name
       #
       def hostname
-        @hostname ||=
-          if user_configuration.has_key?('solr')
-            user_configuration['solr']['hostname']
-          end || 'localhost'
+        @hostname ||= (user_configuration_from_key('solr', 'hostname') || 'localhost')
       end
 
       #
@@ -47,10 +45,7 @@ module Sunspot #:nodoc:
       # Integer:: port
       #
       def port
-        @port ||=
-          if user_configuration.has_key?('solr')
-            user_configuration['solr']['port']
-          end || 8983
+        @port ||= (user_configuration_from_key('solr', 'port') || 8983).to_i
       end
 
       #
@@ -62,13 +57,36 @@ module Sunspot #:nodoc:
       # String:: path
       #
       def path
-        @path ||=
-          if user_configuration.has_key?('solr')
-            "#{user_configuration['solr']['path'] || '/solr'}"
-          end
+        @path ||= (user_configuration_from_key('solr', 'path') || '/solr')
+      end
+      
+      #
+      # Should the solr index receive a commit after each http-request.
+      # Default true
+      #
+      # ==== Returns
+      #
+      # Boolean:: bool
+      #
+      
+      def auto_commit_after_request?
+        @auto_commit_after_request ||= 
+          user_configuration_from_key('auto_commit_after_request') != false
       end
 
       private
+      
+      # 
+      # return a specific key from the user configuration in config/sunspot.yml
+      #
+      # ==== Returns
+      #
+      # 
+      def user_configuration_from_key( *keys )
+        keys.inject(user_configuration) do |hash, key|
+          hash[key] if hash
+        end
+      end
 
       #
       # Memoized hash of configuration options for the current Rails environment
@@ -86,6 +104,8 @@ module Sunspot #:nodoc:
               File.open(path) do |file|
                 YAML.load(file)[::Rails.env]
               end
+            else
+              {}
             end
           end
       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
+            Sunspot.commit_if_dirty if Sunspot::Rails.configuration.auto_commit_after_request?
           end
         end
       end

data/lib/sunspot/rails/searchable.rb

@@ -208,7 +208,8 @@ module Sunspot #:nodoc:
         #
         # Array:: Collection of IDs that exist in Solr but not in the database
         def index_orphans
-          indexed_ids = search_ids.to_set
+          count = self.count
+          indexed_ids = search_ids { paginate(:page => 1, :per_page => count) }.to_set
           all(:select => 'id').each do |object|
             indexed_ids.delete(object.id)
           end

data/lib/sunspot/rails.rb

@@ -3,6 +3,8 @@ require 'sunspot'
 module Sunspot #:nodoc:
   module Rails #:nodoc:
     class <<self
+      attr_writer :configuration
+
       def configuration
         @configuration ||= Sunspot::Rails::Configuration.new
       end

data/spec/configuration_spec.rb

@@ -1,16 +1,53 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe "Configuration" do
+describe Sunspot::Rails::Configuration, "default values" do
+  before(:each) do
+    File.should_receive(:exist?).and_return(false)
+  end
+  
+  it "should handle the 'hostname' property when not set" do
+    config = Sunspot::Rails::Configuration.new
+    config.hostname.should == 'localhost'
+  end  
+  
   it "should handle the 'path' property when not set" do
     config = Sunspot::Rails::Configuration.new
     config.path.should == '/solr'
   end
 
+  it "should handle the 'port' property when not set" do
+    config = Sunspot::Rails::Configuration.new
+    config.port.should == 8983
+  end
+
+  it "should handle the 'auto_commit_after_request' propery when not set" do
+    config = Sunspot::Rails::Configuration.new
+    config.auto_commit_after_request?.should == true
+  end
+end
+
+describe Sunspot::Rails::Configuration, "user settings" do
+  before(:each) do
+    Rails.stub!(:env => 'config_test')
+  end
+
+  it "should handle the 'hostname' property when not set" do
+    config = Sunspot::Rails::Configuration.new
+    config.hostname.should == 'some.host'
+  end
+
+  it "should handle the 'port' property when not set" do
+    config = Sunspot::Rails::Configuration.new
+    config.port.should == 1234
+  end
+  
   it "should handle the 'path' property when set" do
-    silence_stderr do
-      Rails.stub!(:env => 'path_test')
-      config = Sunspot::Rails::Configuration.new
-      config.path.should == '/solr/path_test'
-    end
+    config = Sunspot::Rails::Configuration.new
+    config.path.should == '/solr/idx'
+  end
+
+  it "should handle the 'auto_commit_after_request' propery when set" do
+    config = Sunspot::Rails::Configuration.new
+    config.auto_commit_after_request?.should == false
   end
 end

data/spec/mock_app/config/sunspot.yml

@@ -6,8 +6,9 @@ development:
   solr:
     hostname: localhost
     port: 8981
-path_test:
+config_test:
   solr:
-    hostname: localhost
-    port: 8981
-    path: /solr/path_test
+    hostname: some.host
+    port: 1234
+    path: /solr/idx
+  auto_commit_after_request: false

data/spec/request_lifecycle_spec.rb

@@ -1,10 +1,30 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'request lifecycle', :type => :controller do
+  before(:each) do
+    Sunspot::Rails.configuration = @configuration = Sunspot::Rails::Configuration.new
+  end
+
+  after(:each) do
+    Sunspot::Rails.configuration = nil
+  end
   controller_name :posts
 
-  it 'should automatically commit after each action' do
+  it 'should automatically commit after each action if specified' do
+    @configuration.user_configuration = { 'auto_commit_after_request' => true }
+    Sunspot.should_receive(:commit_if_dirty)
+    post :create, :post => { :title => 'Test 1' }
+  end
+  
+  it 'should not commit, if configuration is set to false' do
+    @configuration.user_configuration = { 'auto_commit_after_request' => false }
+    Sunspot.should_not_receive(:commit_if_dirty)
+    post :create, :post => { :title => 'Test 1' }
+  end
+
+  it 'should commit if configuration is not specified' do
+    @configuration.user_configuration = {}
+    Sunspot.should_receive(:commit_if_dirty)
     post :create, :post => { :title => 'Test 1' }
-    PostWithAuto.search { with :title, 'Test 1' }.results.should_not be_empty
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config', 'environment.rb'
 
 require 'spec'
 require 'spec/rails'
+require 'rake'
 require 'ruby-debug'
+require 'sunspot/rails/tasks'
 
 def load_schema
   stdout = $stdout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
         version: 0.0.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sunspot
+  name: outoftime-sunspot
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -99,9 +99,11 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION.yml
 - dev_tasks/gemspec.rake
 - dev_tasks/rdoc.rake
+- dev_tasks/release.rake
 - dev_tasks/todo.rake
 - install.rb
 - lib/sunspot/rails.rb
@@ -155,28 +157,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.3
+rubyforge_project: sunspot
+rubygems_version: 1.3.2
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library
 test_files: 
+- spec/spec_helper.rb
 - spec/configuration_spec.rb
-- spec/mock_app/app/controllers/application.rb
-- spec/mock_app/app/controllers/application_controller.rb
+- spec/model_lifecycle_spec.rb
+- spec/schema.rb
+- spec/model_spec.rb
 - spec/mock_app/app/controllers/posts_controller.rb
+- spec/mock_app/app/controllers/application_controller.rb
+- spec/mock_app/app/controllers/application.rb
 - spec/mock_app/app/models/blog.rb
-- spec/mock_app/app/models/post.rb
 - spec/mock_app/app/models/post_with_auto.rb
-- spec/mock_app/config/boot.rb
+- spec/mock_app/app/models/post.rb
 - spec/mock_app/config/environment.rb
+- spec/mock_app/config/initializers/session_store.rb
+- spec/mock_app/config/initializers/new_rails_defaults.rb
 - spec/mock_app/config/environments/development.rb
 - spec/mock_app/config/environments/test.rb
-- spec/mock_app/config/initializers/new_rails_defaults.rb
-- spec/mock_app/config/initializers/session_store.rb
 - spec/mock_app/config/routes.rb
-- spec/model_lifecycle_spec.rb
-- spec/model_spec.rb
+- spec/mock_app/config/boot.rb
 - spec/request_lifecycle_spec.rb
-- spec/schema.rb
-- spec/spec_helper.rb