sunspot_rails 1.2.1 → 1.3.0.rc6

data/spec/rails_template/app/controllers/application_controller.rb

@@ -0,0 +1,10 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+  protect_from_forgery # See ActionController::RequestForgeryProtection for details
+
+  # Scrub sensitive parameters from your log
+  # filter_parameter_logging :password
+end

data/spec/rails_template/app/controllers/posts_controller.rb

@@ -0,0 +1,6 @@
+class PostsController < ApplicationController
+  def create
+    PostWithAuto.create(params[:post])
+    render :nothing => true
+  end
+end

data/spec/rails_template/app/models/author.rb

@@ -0,0 +1,8 @@
+class Author < ActiveRecord::Base
+  set_table_name :writers
+  set_primary_key :writer_id
+
+  searchable do
+    string :name
+  end
+end

data/spec/rails_template/app/models/blog.rb

@@ -0,0 +1,12 @@
+class Blog < ActiveRecord::Base
+  has_many :posts
+  has_many :comments, :through => :posts
+
+  searchable :include => { :posts => :author } do
+    string :subdomain
+    text :name
+  end
+
+  # Make sure that includes are added to with multiple searchable calls
+  searchable(:include => :comments) {}
+end

data/spec/rails_template/app/models/location.rb

@@ -0,0 +1,2 @@
+class Location < ActiveRecord::Base
+end

data/spec/rails_template/app/models/photo_post.rb

@@ -0,0 +1,2 @@
+class PhotoPost < PostWithAuto
+end

data/spec/rails_template/app/models/post.rb

@@ -0,0 +1,11 @@
+class Post < ActiveRecord::Base
+  belongs_to :location
+  belongs_to :author
+  has_many :comments
+
+  searchable :auto_index => false, :auto_remove => false do
+    string :title
+    text :body, :more_like_this => true
+    location :location
+  end
+end

data/spec/rails_template/app/models/post_with_auto.rb

@@ -0,0 +1,10 @@
+class PostWithAuto < ActiveRecord::Base
+  def self.table_name
+    'posts'
+  end
+
+  searchable :ignore_attribute_changes_of => [ :updated_at ] do
+    string :title
+    text :body, :more_like_this => true
+  end
+end

data/spec/rails_template/app/models/post_with_default_scope.rb

@@ -0,0 +1,11 @@
+class PostWithDefaultScope < ActiveRecord::Base
+  def self.table_name
+    'posts'
+  end
+
+  default_scope :order => :title
+
+  searchable :auto_index => false, :auto_remove => false do
+    string :title
+  end
+end

data/spec/rails_template/config/boot.rb

@@ -0,0 +1,127 @@
+if defined?(RAILS_GEM_VERSION) && RAILS_GEM_VERSION =~ /^2/ # Rails 2 only
+  RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+  module Rails
+    class << self
+      def boot!
+        unless booted?
+          preinitialize
+          pick_boot.run
+        end
+      end
+
+      def booted?
+        defined? Rails::Initializer
+      end
+
+      def pick_boot
+        (vendor_rails? ? VendorBoot : GemBoot).new
+      end
+
+      def vendor_rails?
+        File.exist?("#{RAILS_ROOT}/vendor/rails")
+      end
+
+      def preinitialize
+        load(preinitializer_path) if File.exist?(preinitializer_path)
+      end
+
+      def preinitializer_path
+        "#{RAILS_ROOT}/config/preinitializer.rb"
+      end
+    end
+
+    class Boot
+      def run
+        load_initializer
+        Rails::Initializer.run(:set_load_path)
+      end
+    end
+
+    class VendorBoot < Boot
+      def load_initializer
+        require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+        Rails::Initializer.run(:install_gem_spec_stubs)
+        Rails::GemDependency.add_frozen_gem_path
+      end
+    end
+
+    class GemBoot < Boot
+      def load_initializer
+        self.class.load_rubygems
+        load_rails_gem
+        require 'initializer'
+      end
+
+      def load_rails_gem
+        if version = self.class.gem_version
+          gem 'rails', version
+        else
+          gem 'rails'
+        end
+      rescue Gem::LoadError => load_error
+        if load_error.message =~ /Could not find RubyGem rails/
+          STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+          exit 1
+        else
+          raise
+        end
+      end
+
+      class << self
+        def rubygems_version
+          Gem::RubyGemsVersion rescue nil
+        end
+
+        def gem_version
+          if defined? RAILS_GEM_VERSION
+            RAILS_GEM_VERSION
+          elsif ENV.include?('RAILS_GEM_VERSION')
+            ENV['RAILS_GEM_VERSION']
+          else
+            parse_gem_version(read_environment_rb)
+          end
+        end
+
+        def load_rubygems
+          min_version = '1.3.2'
+          require 'rubygems'
+          unless rubygems_version >= min_version
+            $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+            exit 1
+          end
+
+        rescue LoadError
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+          exit 1
+        end
+
+        def parse_gem_version(text)
+          $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+        end
+
+        private
+          def read_environment_rb
+            File.read("#{RAILS_ROOT}/config/environment.rb")
+          end
+      end
+    end
+  end
+
+  class Rails::Boot
+    def run
+      load_initializer
+
+      Rails::Initializer.class_eval do
+        def load_gems
+          @bundler_loaded ||= Bundler.require :default, Rails.env
+        end
+      end
+
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  # All that for this:
+  Rails.boot!
+end

data/spec/rails_template/config/preinitializer.rb

@@ -0,0 +1,22 @@
+if defined?(RAILS_GEM_VERSION) && RAILS_GEM_VERSION =~ /^2/ # Rails 2 only
+  begin
+    require "rubygems"
+    require "bundler"
+  rescue LoadError
+    raise "Could not load the bundler gem. Install it with `gem install bundler`."
+  end
+
+  if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+    raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
+     "Run `gem install bundler` to upgrade."
+  end
+
+  begin
+    # Set up load paths for all bundled gems
+    ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+    Bundler.setup
+  rescue Bundler::GemNotFound
+    raise RuntimeError, "Bundler couldn't find some gems." +
+      "Did you run `bundle install`?"
+  end
+end

data/spec/rails_template/config/routes.rb

@@ -0,0 +1,9 @@
+if Rails::VERSION::MAJOR == 2
+  ActionController::Routing::Routes.draw do |map|
+    map.resources :posts, :only => :create
+  end
+elsif Rails::VERSION::MAJOR == 3
+  Rails.application.routes.draw do
+    resources :posts, :only => :create
+  end
+end

data/spec/rails_template/config/sunspot.yml

@@ -0,0 +1,22 @@
+test:
+  solr:
+    hostname: localhost
+    port: 8980
+development:
+  solr:
+    hostname: localhost
+    port: 8981
+config_test:
+  solr:
+    hostname: some.host
+    port: 1234
+    path: /solr/idx
+    log_level: WARNING
+    data_path: /my_superior_path/data
+    pid_dir: /my_superior_path/pids
+    solr_home: /my_superior_path
+    bind_address: 127.0.0.1
+  auto_commit_after_request: false
+  auto_commit_after_delete_request: true
+config_disabled_test:
+  disabled: true

data/spec/rails_template/db/schema.rb

@@ -0,0 +1,27 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :posts, :force => true do |t|
+    t.string :title
+    t.string :type
+    t.integer :location_id
+    t.text :body
+    t.references :blog
+    t.timestamps
+  end
+
+  create_table :locations, :force => true do |t|
+    t.float :lat
+    t.float :lng
+  end
+
+  create_table :blogs, :force => true do |t|
+    t.string :name
+    t.string :subdomain
+    t.timestamps
+  end
+
+  create_table :writers, :force => true, :primary_key => :writer_id do |t|
+    t.string :name
+    t.timestamps
+  end
+
+end

data/spec/request_lifecycle_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe PostsController, :type => :controller do
   begin

data/spec/searchable_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe Sunspot::Rails::Searchable do
+  describe '#searchable' do
+    it "should register models with Sunspot.searchable (via Sunspot.setup)" do
+      Sunspot.searchable.should_not be_empty
+      Sunspot.searchable.should include(Author)
+      Sunspot.searchable.should include(Blog)
+      Sunspot.searchable.should include(Post)
+    end
+  end
+end

data/spec/server_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Sunspot::Rails::Server do
   before :each do
@@ -11,12 +11,8 @@ describe Sunspot::Rails::Server do
     @server.solr_home.should == @solr_home
   end
 
-  it "sets the correct Solr library path" do
-    @server.lib_path.should == File.join(@solr_home, 'lib')
-  end
-
   it "sets the correct Solr PID path" do
-    @server.pid_path.should == File.join(Rails.root, 'tmp', 'pids', 'sunspot-solr-test.pid')
+    @server.pid_path.should == File.join(@server.pid_dir, 'sunspot-solr-test.pid')
   end
 
   it "sets the correct Solr data dir" do

data/spec/session_spec.rb

@@ -1,7 +1,25 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'thread'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'Sunspot::Rails session' do
-  it 'should be a different object for each thread' 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
@@ -10,6 +28,21 @@ describe 'Sunspot::Rails session' do
   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)

data/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/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/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.join(File.dirname(__FILE__), 'rails3')
 if rsolr_version = ENV['RSOLR_GEM_VERSION']
   STDERR.puts("Forcing RSolr version #{rsolr_version}")
   gem "rsolr", rsolr_version
@@ -31,13 +30,16 @@ def silence_stderr(&block)
   $stderr = stderr
 end
 
-rspec = 
+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

data/spec/stub_session_proxy_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'rails', 'spec_helper')
+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