sunspot_solr 2.0.0.pre.120720 → 2.0.0.pre.120924

data/sunspot_rails/spec/session_spec.rb

@@ -0,0 +1,57 @@
+require 'thread'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe 'Sunspot::Rails session' do
+  it 'is a different object for each thread' do
+    # Queue is just a convenient thread-safe container
+    sessions_queue = Queue.new
+
+    # Create some threads which dump their session into the queue
+    Array.new(2) {
+      Thread.new { sessions_queue << Sunspot.session.session }
+    }.each { |thread| thread.join }
+
+    # Collect the items from the queue
+    sessions = []
+    until sessions_queue.empty?
+      sessions << sessions_queue.pop
+    end
+
+    # There should be no items in the queue with the same object_id
+    object_ids = sessions.map(&:object_id)
+    object_ids.uniq.should == object_ids
+  end
+
+  it 'should create a separate master/slave session if configured' do
+  end
+
+  it 'should not create a separate master/slave session if no master configured' do
+  end
+
+  context 'disabled' do
+    before do
+      Sunspot::Rails.reset
+      ::Rails.stub!(:env).and_return("config_disabled_test")
+    end
+
+    after do
+      Sunspot::Rails.reset
+    end
+
+    it 'sets the session proxy as a stub' do
+      Sunspot::Rails.build_session.should be_a_kind_of(Sunspot::Rails::StubSessionProxy)
+    end
+  end
+
+  private
+
+  def with_configuration(options)
+    original_configuration = Sunspot::Rails.configuration
+    Sunspot::Rails.reset
+    Sunspot::Rails.configuration = Sunspot::Rails::Configuration.new
+    Sunspot::Rails.configuration.user_configuration = options
+    yield
+    Sunspot::Rails.reset
+    Sunspot::Rails.configuration = original_configuration
+  end
+end

data/sunspot_rails/spec/shared_examples/indexed_after_save.rb

@@ -0,0 +1,8 @@
+shared_examples_for 'indexed after save' do
+  it 'should be indexed after save' do
+    subject.save!
+    Sunspot.commit
+
+    subject.class.search.results.should include(subject)
+  end
+end

data/sunspot_rails/spec/shared_examples/not_indexed_after_save.rb

@@ -0,0 +1,8 @@
+shared_examples_for 'not indexed after save' do
+  it 'should not be indexed after save' do
+    subject.save!
+    Sunspot.commit
+
+    subject.class.search.results.should_not include(subject)
+  end
+end

data/sunspot_rails/spec/spec_helper.rb

@@ -0,0 +1,48 @@
+ENV['RAILS_ENV'] = 'test'
+if rsolr_version = ENV['RSOLR_GEM_VERSION']
+  STDERR.puts("Forcing RSolr version #{rsolr_version}")
+  gem "rsolr", rsolr_version
+end
+
+require File.expand_path('config/environment', ENV['RAILS_ROOT'])
+
+begin
+  require 'rspec'
+  require 'rspec/rails'
+rescue LoadError => e
+  require 'spec'
+  require 'spec/rails'
+end
+require 'rake'
+require File.join('sunspot', 'rails', 'solr_logging')
+
+def load_schema
+  stdout = $stdout
+  $stdout = StringIO.new # suppress output while building the schema
+  load File.join(ENV['RAILS_ROOT'], 'db', 'schema.rb')
+  $stdout = stdout
+end
+
+def silence_stderr(&block)
+  stderr = $stderr
+  $stderr = StringIO.new
+  yield
+  $stderr = stderr
+end
+
+rspec =
+  begin
+    RSpec
+  rescue NameError, ArgumentError
+    Spec::Runner
+  end
+
+# Load all shared examples
+Dir[File.expand_path("shared_examples/*.rb", File.dirname(__FILE__))].each {|f| require f}
+
+rspec.configure do |config|
+  config.before(:each) do
+    load_schema
+    Sunspot.remove_all!
+  end
+end

data/sunspot_rails/spec/stub_session_proxy_spec.rb

@@ -0,0 +1,122 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path('../lib/sunspot/rails/spec_helper', File.dirname(__FILE__))
+
+describe 'specs with Sunspot stubbed' do
+  disconnect_sunspot
+
+  before :each do
+    @session = Sunspot.session.original_session
+    @post = Post.create!
+  end
+
+  it 'should not send index to session' do
+    @session.should_not_receive(:index)
+    @post.index
+  end
+
+  it 'should not send index! to session' do
+    @session.should_not_receive(:index!)
+    @post.index!
+  end
+
+  it 'should not send commit to session' do
+    @session.should_not_receive(:commit)
+    Sunspot.commit
+  end
+
+  it 'should not send remove to session' do
+    @session.should_not_receive(:remove)
+    @post.remove_from_index
+  end
+
+  it 'should not send remove! to session' do
+    @session.should_not_receive(:remove)
+    @post.remove_from_index!
+  end
+
+  it 'should not send remove_by_id to session' do
+    @session.should_not_receive(:remove_by_id)
+    Sunspot.remove_by_id(Post, 1)
+  end
+
+  it 'should not send remove_by_id! to session' do
+    @session.should_not_receive(:remove_by_id!)
+    Sunspot.remove_by_id!(Post, 1)
+  end
+
+  it 'should not send remove_all to session' do
+    @session.should_not_receive(:remove_all)
+    Post.remove_all_from_index
+  end
+
+  it 'should not send remove_all! to session' do
+    @session.should_not_receive(:remove_all!)
+    Post.remove_all_from_index!
+  end
+
+  it 'should return false for dirty?' do
+    @session.should_not_receive(:dirty?)
+    Sunspot.dirty?.should == false
+  end
+
+  it 'should not send commit_if_dirty to session' do
+    @session.should_not_receive(:commit_if_dirty)
+    Sunspot.commit_if_dirty
+  end
+
+  it 'should return false for delete_dirty?' do
+    @session.should_not_receive(:delete_dirty?)
+    Sunspot.delete_dirty?.should == false
+  end
+
+  it 'should not send commit_if_delete_dirty to session' do
+    @session.should_not_receive(:commit_if_delete_dirty)
+    Sunspot.commit_if_delete_dirty
+  end
+
+  it 'should not execute a search when #search called' do
+    @session.should_not_receive(:search)
+    Post.search
+  end
+
+  it 'should not execute a search when #search called with parameters' do
+    @session.should_not_receive(:search)
+    Post.search(:include => :blog, :select => 'id, title')
+  end
+
+  it 'should return a new search' do
+    @session.should_not_receive(:new_search)
+    Sunspot.new_search(Post).should respond_to(:execute)
+  end
+
+  it 'should not send more_like_this to session' do
+    @session.should_not_receive(:more_like_this)
+    Sunspot.more_like_this(@post)
+  end
+
+  describe 'stub search' do
+    before :each do
+      @search = Post.search
+    end
+
+    it 'should return empty results' do
+      @search.results.should == []
+    end
+
+    it 'should return empty hits' do
+      @search.hits.should == []
+    end
+
+    it 'should return zero total' do
+      @search.total.should == 0
+    end
+
+    it 'should return nil for a given facet' do
+      @search.facet(:category_id).should be_nil
+    end
+
+    it 'should return nil for a given dynamic facet' do
+      @search.dynamic_facet(:custom).should be_nil
+    end
+  end
+end

data/sunspot_rails/sunspot_rails.gemspec

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../../sunspot/lib/', __FILE__)
+
+$:.unshift(lib) unless $:.include?(lib)
+
+require 'sunspot/version'
+
+Gem::Specification.new do |s|
+  s.name        = "sunspot_rails"
+  s.version     = Sunspot::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch',
+                  'Brian Atkinson', 'Tom Coleman', 'Matt Mitchell', 'Nathan Beyer', 'Kieran Topping', 'Nicolas Braem', 'Jeremy Ashkenas',
+                  'Dylan Vaughn', 'Brian Durand', 'Sam Granieri', 'Nick Zadrozny', 'Jason Ronallo']
+  s.email       = ["mat@patch.com"]
+  s.homepage = 'http://github.com/outoftime/sunspot/tree/master/sunspot_rails'
+  s.summary     = '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.rubyforge_project = "sunspot"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'sunspot', Sunspot::VERSION
+  s.add_dependency 'nokogiri'
+
+  s.add_development_dependency 'rspec', '~> 1.2'
+  s.add_development_dependency 'rspec-rails', '~> 1.2'
+
+  s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
+                  '--title' << 'Sunspot-Rails - Rails integration for the Sunspot Solr search library - API Documentation' <<
+                  '--main' << 'README.rdoc'
+end

data/{lib → sunspot_solr/lib}/sunspot/solr/server.rb

@@ -1,4 +1,3 @@
-require 'shellwords'
 require 'set'
 require 'tempfile'
 require 'sunspot/solr/java'
@@ -101,7 +100,7 @@ module Sunspot
         command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
         command << '-jar' << File.basename(solr_jar)
         FileUtils.cd(File.dirname(solr_jar)) do
-          exec(Shellwords.shelljoin(command))
+          exec(*command)
         end
       end
 

data/tools/gem_tasks.rb

@@ -0,0 +1,69 @@
+require 'rubygems/specification'
+
+module Sunspot
+  class GemTasks
+    PROJECT_ROOT = File.dirname(Rake.application.rakefile_location)
+
+    def initialize(dependencies = {}, &block)
+      @dependencies = dependencies
+      @gemspec_block = block
+
+      task(:gemspec, "Write gemspec")
+      task(:build, "Build gem")
+      task(:tag, "Tag version in Git and push to origin")
+      task(:release, "Release gem to Gemcutter")
+    end
+
+    def build
+      run_dependencies(:build)
+      filename = Gem::Builder.new(spec).build
+      FileUtils.mv(filename, File.join(PROJECT_ROOT, 'pkg'))
+      File.join('pkg', filename)
+    end
+
+    def tag
+      tag_name = "v#{spec.version}"
+      puts `git tag -m "Released gem version #{spec.version}" #{tag_name}`
+      puts `git push origin #{tag_name}:#{tag_name}`
+    end
+
+    def release
+      validate_or_abort
+      tag
+      puts `gem push #{build}`
+    end
+
+    def gemspec
+      File.open(File.join(PROJECT_ROOT, "#{spec.name}.gemspec"), 'w') do |file|
+        file << spec.to_ruby
+      end
+    end
+
+    def spec
+      @spec ||= Gem::Specification.new(&@gemspec_block)
+    end
+
+    def validate_or_abort
+      begin
+        spec.validate
+      rescue Gem::InvalidSpecificationException => e
+        abort("Gemspec is invalid: #{e.message}")
+      end
+    end
+
+    private
+
+    def task(name, description)
+      Rake.application.last_description = description
+      Rake::Task.define_task(name) { send(name) }
+    end
+
+    def run_dependencies(task)
+      if @dependencies[task]
+        Array(@dependencies[task]).each do |dependency|
+          Rake::Task[dependency].invoke
+        end
+      end
+    end
+  end
+end