sunspot_rails 1.1.0 → 1.2.0

data/spec/model_spec.rb

@@ -15,6 +15,11 @@ describe 'ActiveRecord mixin' do
       Sunspot.commit
       Post.search.results.should == [@post]
     end
+
+    it "should not blow up if there's a default scope specifying order" do
+      posts = Array.new(2) { |j| PostWithDefaultScope.create! :title => (10-j).to_s }
+      lambda { PostWithDefaultScope.index(:batch_size => 1) }.should_not raise_error
+    end
   end
 
   describe 'single table inheritence' do
@@ -70,7 +75,7 @@ describe 'ActiveRecord mixin' do
 
   describe 'remove_all_from_index' do
     before :each do
-      @posts = Array.new(10) { Post.create! }.each { |post| Sunspot.index(post) }
+      @posts = Array.new(2) { Post.create! }.each { |post| Sunspot.index(post) }
       Sunspot.commit
       Post.remove_all_from_index
     end
@@ -87,7 +92,7 @@ describe 'ActiveRecord mixin' do
 
   describe 'remove_all_from_index!' do
     before :each do
-      Array.new(10) { Post.create! }.each { |post| Sunspot.index(post) }
+      Array.new(2) { Post.create! }.each { |post| Sunspot.index(post) }
       Sunspot.commit
       Post.remove_all_from_index!
     end
@@ -115,15 +120,8 @@ describe 'ActiveRecord mixin' do
       end.results.should be_empty
     end
     
-    it 'should find ActiveRecord objects with an integer, not a string' do
-      Post.should_receive(:all).with(hash_including(:conditions => { "id" => [@post.id.to_i] })).and_return([@post])
-      Post.search do
-        with :title, 'Test Post'
-      end.results.should == [@post]
-    end
-    
     it 'should use the include option on the data accessor when specified' do
-      Post.should_receive(:find).with(anything(), hash_including(:include => [:blog])).and_return([@post])
+      Post.should_receive(:all).with(hash_including(:include => [:blog])).and_return([@post])
       Post.search do
         with :title, 'Test Post'
         data_accessor_for(Post).include = [:blog]
@@ -131,14 +129,14 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should pass :include option from search call to data accessor' do
-      Post.should_receive(:find).with(anything(), hash_including(:include => [:blog])).and_return([@post])
+      Post.should_receive(:all).with(hash_including(:include => [:blog])).and_return([@post])
       Post.search(:include => [:blog]) do
         with :title, 'Test Post'
       end.results.should == [@post]
     end
     
     it 'should use the select option from search call to data accessor' do
-      Post.should_receive(:find).with(anything(), hash_including(:select => 'title, published_at')).and_return([@post])
+      Post.should_receive(:all).with(hash_including(:select => 'title, published_at')).and_return([@post])
       Post.search(:select => 'title, published_at') do
         with :title, 'Test Post'
       end.results.should == [@post]
@@ -149,7 +147,7 @@ describe 'ActiveRecord mixin' do
     end
     
     it 'should use the select option on the data accessor when specified' do
-      Post.should_receive(:find).with(anything(), hash_including(:select => 'title, published_at')).and_return([@post])
+      Post.should_receive(:all).with(hash_including(:select => 'title, published_at')).and_return([@post])
       Post.search do
         with :title, 'Test Post'
         data_accessor_for(Post).select = [:title, :published_at]
@@ -157,7 +155,7 @@ describe 'ActiveRecord mixin' do
     end
     
     it 'should not use the select option on the data accessor when not specified' do
-      Post.should_receive(:find).with(anything(), hash_not_including(:select)).and_return([@post])
+      Post.should_receive(:all).with(hash_not_including(:select)).and_return([@post])
       Post.search do
         with :title, 'Test Post'
       end.results.should == [@post]
@@ -177,7 +175,7 @@ describe 'ActiveRecord mixin' do
       post.location = Location.create!(:lat => 40.0, :lng => -70.0)
       post.save
       post.index!
-      Post.search { near([40.0, -70.0], :distance => 1) }.results.should == [post]
+      Post.search { with(:location).near(40.0, -70.0) }.results.should == [post]
     end
 
   end
@@ -285,7 +283,7 @@ describe 'ActiveRecord mixin' do
   describe "reindex()" do
   
     before(:each) do
-      @posts = Array.new(10) { Post.create }
+      @posts = Array.new(2) { Post.create }
     end
 
     describe "when not using batches" do
@@ -309,16 +307,16 @@ describe 'ActiveRecord mixin' do
           params[:limit].should == 500
           params[:include].should == []
           params[:conditions].should == ['posts.id > ?', 0]
-          params[:order].should == 'id'
+          params[:order].should == 'posts.id'
         end.and_return(@posts)
         Post.reindex
       end
 
       it "should set the conditions using the overridden table attributes" do
-        @posts = Array.new(10) { Author.create }
+        @posts = Array.new(2) { Author.create }
         Author.should_receive(:all).with do |params|
           params[:conditions].should == ['writers.writer_id > ?', 0]
-          params[:order].should == 'writer_id'
+          params[:order].should == 'writers.writer_id'
         end.and_return(@posts)
         Author.reindex
       end
@@ -345,7 +343,7 @@ describe 'ActiveRecord mixin' do
       end
       
       it "should set the include option from the searchable options" do
-        @blogs = Array.new(10) { Blog.create }
+        @blogs = Array.new(2) { Blog.create }
         Blog.should_receive(:all).with do |params|
           params[:include].should == [{ :posts => :author }, :comments]
           @blogs
@@ -355,7 +353,7 @@ describe 'ActiveRecord mixin' do
 
       it "should commit after indexing each batch" do
         Sunspot.should_receive(:commit).twice
-        Post.reindex(:batch_size => 5)
+        Post.reindex(:batch_size => 1)
       end
 
       it "should commit after indexing everything" do

data/spec/request_lifecycle_spec.rb

@@ -1,6 +1,12 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe 'request lifecycle', :type => :controller do
+describe PostsController, :type => :controller do
+  begin
+    include ::RSpec::Rails::ControllerExampleGroup
+  rescue NameError
+    # Silent -- rspec-rails 1.x catches the :type => :controller
+  end
+
   before(:each) do
     Sunspot::Rails.configuration = @configuration = Sunspot::Rails::Configuration.new
   end
@@ -8,7 +14,10 @@ describe 'request lifecycle', :type => :controller do
   after(:each) do
     Sunspot::Rails.configuration = nil
   end
-  controller_name :posts
+
+  unless respond_to?(:describes)
+    controller_name :posts  # RSpec 1
+  end
 
   it 'should automatically commit after each action if specified' do
     @configuration.user_configuration = { 'auto_commit_after_request' => true }

data/spec/server_spec.rb

@@ -3,7 +3,8 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe Sunspot::Rails::Server do
   before :each do
     @server = Sunspot::Rails::Server.new
-    @solr_home = File.expand_path(File.join(Rails.root, 'solr'))
+    @config = Sunspot::Rails::Configuration.new
+    @solr_home = File.join(@config.solr_home)
   end
 
   it "sets the correct Solr home" do

data/spec/spec_helper.rb

@@ -1,22 +1,21 @@
 ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.join(File.dirname(__FILE__), 'mock_app')
+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
 end
 
-if File.exist?(sunspot_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'sunspot', 'lib')))
-  STDERR.puts("Using sunspot lib at #{sunspot_lib}")
-  $: << sunspot_lib
-end
-
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config', 'environment.rb'))
+require File.expand_path('config/environment', ENV['RAILS_ROOT'])
 
-require 'spec'
-require 'spec/rails'
+begin
+  require 'rspec'
+  require 'rspec/rails'
+rescue LoadError => e
+  require 'spec'
+  require 'spec/rails'
+end
 require 'rake'
-require 'ruby-debug' unless RUBY_VERSION > '1.9'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'rails', 'solr_logging')
+require File.join('sunspot', 'rails', 'solr_logging')
 
 def load_schema
   stdout = $stdout
@@ -32,20 +31,16 @@ def silence_stderr(&block)
   $stderr = stderr
 end
 
-Spec::Runner.configure do |config|
+rspec = 
+  begin
+    RSpec
+  rescue NameError, ArgumentError
+    Spec::Runner
+  end
+
+rspec.configure do |config|
   config.before(:each) do
     load_schema
     Sunspot.remove_all!
   end
 end
-
-module Spec
-  module Mocks
-    module Methods
-      def should_respond_to_and_receive(*args, &block)
-        respond_to?(args.first).should ==(true)
-        should_receive(*args, &block)
-      end
-    end
-  end
-end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Mat Brown
@@ -22,30 +23,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sunspot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -56,9 +61,11 @@ dependencies:
   name: rspec-rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -81,61 +88,47 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
-- TODO
-- History.txt
 - VERSION.yml
+- TESTING.md
+- Rakefile
+- MIT-LICENSE
 - LICENSE
-- lib/sunspot/rails/spec_helper.rb
-- lib/sunspot/rails/searchable.rb
+- History.txt
+- TODO
+- README.rdoc
+- lib/sunspot_rails.rb
+- lib/sunspot/rails/solr_logging.rb
+- lib/sunspot/rails/railtie.rb
 - lib/sunspot/rails/version.rb
-- lib/sunspot/rails/stub_session_proxy.rb
-- lib/sunspot/rails/adapters.rb
-- lib/sunspot/rails/configuration.rb
 - lib/sunspot/rails/server.rb
-- lib/sunspot/rails/tasks.rb
+- lib/sunspot/rails/configuration.rb
 - lib/sunspot/rails/request_lifecycle.rb
-- lib/sunspot/rails/solr_logging.rb
+- lib/sunspot/rails/stub_session_proxy.rb
+- lib/sunspot/rails/spec_helper.rb
+- lib/sunspot/rails/tasks.rb
+- lib/sunspot/rails/searchable.rb
+- lib/sunspot/rails/adapters.rb
+- lib/sunspot/rails/init.rb
 - lib/sunspot/rails.rb
-- dev_tasks/gemspec.rake
-- dev_tasks/todo.rake
-- dev_tasks/rdoc.rake
+- lib/generators/sunspot_rails.rb
+- lib/generators/sunspot_rails/install/install_generator.rb
+- lib/generators/sunspot_rails/install/templates/config/sunspot.yml
+- dev_tasks/spec.rake
 - dev_tasks/release.rake
-- generators/sunspot/sunspot_generator.rb
+- dev_tasks/rdoc.rake
+- dev_tasks/todo.rake
 - generators/sunspot/templates/sunspot.yml
+- generators/sunspot/sunspot_generator.rb
 - install.rb
-- rails/init.rb
-- spec/spec_helper.rb
 - spec/session_spec.rb
-- spec/stub_session_proxy_spec.rb
-- spec/server_spec.rb
+- spec/schema.rb
 - spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
-- spec/schema.rb
-- spec/model_spec.rb
+- spec/spec_helper.rb
+- spec/stub_session_proxy_spec.rb
 - spec/request_lifecycle_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/location.rb
-- spec/mock_app/app/models/photo_post.rb
-- spec/mock_app/app/models/blog.rb
-- spec/mock_app/app/models/post_with_auto.rb
-- spec/mock_app/app/models/author.rb
-- spec/mock_app/app/models/post.rb
-- spec/mock_app/db/schema.rb
-- spec/mock_app/db/test.db
-- spec/mock_app/config/database.yml
-- 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/sunspot.yml
-- spec/mock_app/config/environments/development.rb
-- spec/mock_app/config/environments/test.rb
-- spec/mock_app/config/routes.rb
-- spec/mock_app/config/boot.rb
+- spec/model_spec.rb
+- spec/server_spec.rb
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot_rails
 licenses: []
@@ -146,23 +139,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library

data/dev_tasks/gemspec.rake

@@ -1,33 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'tools', 'gem_tasks')
-
-Sunspot::GemTasks.new do |s|
-  require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'rails', 'version')
-
-  s.name = 'sunspot_rails'
-  s.version = Sunspot::Rails::VERSION
-  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 = <<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', 'Adam Salter', 'Brandon Keepers', 'Paul Canavese', 'John Eberly', 'Gert Thiel']
-  s.rubyforge_project = 'sunspot'
-  s.files = FileList['[A-Z]*',
-    '{lib,tasks,dev_tasks}/**/*',
-    'generators/**/*',
-    'install.rb',
-    'MIT-LICENSE',
-    'rails/*',
-    'spec/*.rb',
-    'spec/mock_app/{app,lib,db,vendor,config}/**/*',
-    'spec/mock_app/{tmp,log,solr}']
-  s.add_dependency 'sunspot', Sunspot::Rails::VERSION
-  s.add_development_dependency 'rspec', '~> 1.2'
-  s.add_development_dependency 'rspec-rails', '~> 1.2'
-end

data/spec/mock_app/app/controllers/application.rb

@@ -1,10 +0,0 @@
-# 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/mock_app/app/controllers/application_controller.rb

@@ -1,10 +0,0 @@
-# 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/mock_app/app/controllers/posts_controller.rb

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

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

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

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

@@ -1,12 +0,0 @@
-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/mock_app/app/models/location.rb

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

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

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

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

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

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

@@ -1,10 +0,0 @@
-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/mock_app/config/boot.rb

@@ -1,110 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-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
-      $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
-    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
-        require 'rubygems'
-        min_version = '1.3.1'
-        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
-
-# All that for this:
-Rails.boot!

data/spec/mock_app/config/database.yml

@@ -1,4 +0,0 @@
-test: &test
-  :adapter: sqlite3
-  :database: db/test.db
-development: *test