sunspot_rails 2.0.0.pre.120925 → 2.0.0.pre.130115

data/dev_tasks/spec.rake

@@ -27,7 +27,7 @@ namespace :spec do
 
     unless File.exist?(ENV['BUNDLE_PATH'])
       puts "Installing gems for Rails #{version} (this will only be done once)..."
-      system("bundle install #{ENV['BUNDLE_ARGS']}") || exit(1)
+      sh("bundle install #{ENV['BUNDLE_ARGS']}") || exit(1)
     end
   end
 
@@ -40,9 +40,9 @@ namespace :spec do
 
       puts "Generating Rails #{version} application..."
       if version.start_with?("2")
-        system("#{rails_cmd} \"#{app_path}\" --force") || exit(1)
+        sh("#{rails_cmd} \"#{app_path}\" --force") || exit(1)
       elsif version.start_with?("3")
-        system("#{rails_cmd} new \"#{app_path}\" --force --skip-git --skip-javascript --skip-gemfile --skip-sprockets") || exit(1)
+        sh("#{rails_cmd} new \"#{app_path}\" --force --skip-git --skip-javascript --skip-gemfile --skip-sprockets") || exit(1)
       end
     end
   end
@@ -66,7 +66,7 @@ namespace :spec do
                      "rspec"
                    end
 
-    system "bundle exec #{spec_command} #{ENV['SPEC'] || 'spec/*_spec.rb'} --color"
+    sh "bundle exec #{spec_command} #{ENV['SPEC'] || 'spec/*_spec.rb'} --color"
   end
 end
 

data/gemfiles/rails-2.3.14

@@ -9,4 +9,5 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
 	gem 'rspec-rails', '~> 1.3.4'
+  gem 'test-unit', '~> 1.2.3', :platform => :mri_19
 end

data/gemfiles/{rails-3.0.15 → rails-3.0.17}

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.0.15'
+gem 'rails', '3.0.17'
 gem 'sqlite3-ruby', '~> 1.3.1'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)

data/gemfiles/{rails-3.1.6 → rails-3.1.8}

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.1.6'
+gem 'rails', '3.1.8'
 gem 'sqlite3-ruby', '~> 1.3.1'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)

data/gemfiles/{rails-3.2.6 → rails-3.2.9}

@@ -1,7 +1,7 @@
 source :rubygems
 
-gem 'rails', '3.2.6'
-gem 'sqlite3-ruby', '~> 1.3.1'
+gem 'rails', '3.2.9'
+gem 'sqlite3', '~> 1.3.3'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
 gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)

data/lib/sunspot/rails.rb

@@ -11,7 +11,7 @@ module Sunspot #:nodoc:
     begin
       require 'sunspot_solr'
       autoload :Server, File.join(File.dirname(__FILE__), 'rails', 'server')
-    rescue LoadError => e
+    rescue LoadError
       # We're fine
     end
 

data/lib/sunspot/rails/adapters.rb

@@ -20,7 +20,8 @@ module Sunspot #:nodoc:
 
       class ActiveRecordDataAccessor < Sunspot::Adapters::DataAccessor
         # options for the find
-        attr_accessor :include, :select
+        attr_accessor :include
+        attr_reader :select
 
         def initialize(clazz)
           super(clazz)
@@ -78,8 +79,8 @@ module Sunspot #:nodoc:
         
         def options_for_find
           options = {}
-          options[:include] = @include unless @include.blank?
-          options[:select]  =  @select unless  @select.blank?
+          options[:include] = @include unless !defined?(@include) || @include.blank?
+          options[:select]  =  @select unless !defined?(@select)  || @select.blank?
           options
         end
       end

data/lib/sunspot/rails/log_subscriber.rb

@@ -19,7 +19,7 @@ module Sunspot
       end
       
       def self.logger
-        @logger
+        @logger if defined?(@logger)
       end
       
       def logger

data/lib/sunspot/rails/searchable.rb

@@ -46,6 +46,11 @@ module Sunspot #:nodoc:
         # :ignore_attribute_changes_of<Array>::
         #   Define attributes, that should not trigger a reindex of that
         #   object. Usual suspects are updated_at or counters.
+        # :only_reindex_attribute_changes_of<Array>::
+        #   Define attributes, that are the only attributes that should
+        #   trigger a reindex of that object. Useful if there are a small
+        #   number of searchable attributes and a large number of attributes
+        #   to ignore.
         # :include<Mixed>::
         #   Define default ActiveRecord includes, set this to allow ActiveRecord
         #   to load required associations when indexing. See ActiveRecord's 
@@ -294,7 +299,7 @@ module Sunspot #:nodoc:
             solr_ids.concat ids
           end
 
-          return solr_ids - self.connection.select_values(select(:id).arel).collect(&:to_i)
+          return solr_ids - self.connection.select_values("SELECT id FROM #{quoted_table_name}").collect(&:to_i)
         end
 
         # 
@@ -465,6 +470,8 @@ module Sunspot #:nodoc:
             @marked_for_auto_indexing =
               if !new_record? && ignore_attributes = self.class.sunspot_options[:ignore_attribute_changes_of]
                 !(changed.map { |attr| attr.to_sym } - ignore_attributes).blank?
+              elsif !new_record? && only_attributes = self.class.sunspot_options[:only_reindex_attribute_changes_of]
+                !(changed.map { |attr| attr.to_sym } & only_attributes).blank?
               else
                 true
               end

data/lib/sunspot_rails.rb

@@ -1,11 +1,11 @@
 # This needs to be loaded before sunspot/search/paginated_collection
 # or #to_json gets defined in Object breaking delegation to Array via
 # method_missing
-require 'active_support/core_ext/object/to_json' if Rails::VERSION::MAJOR == 3
+require 'active_support/core_ext/object/to_json' if ::Rails.version >= '3'
 
 require 'sunspot/rails'
 
-if Rails::VERSION::MAJOR == 3
+if ::Rails.version >= '3'
   require 'sunspot/rails/railtie'
 else
   require 'sunspot/rails/init'

data/spec/model_lifecycle_spec.rb

@@ -37,7 +37,7 @@ describe 'searchable with lifecycle' do
       @post.save!
     end
   end
-  
+
   describe 'on destroy' do
     before :each do
       @post = PostWithAuto.create
@@ -49,15 +49,33 @@ describe 'searchable with lifecycle' do
       PostWithAuto.search_ids.should be_empty
     end
   end
-end
 
-describe 'searchable with lifecycle - ignoring specific attributes' do
-  before(:each) do
-    @post = PostWithAuto.create
+  describe 'ignoring specific attributes' do
+    before(:each) do
+      @post = PostWithAuto.create
+    end
+
+    it "should not reindex the object on an update_at change, because it is marked as to-ignore" do
+      Sunspot.should_not_receive(:index).with(@post)
+      @post.update_attribute :updated_at, 123.seconds.from_now
+    end
   end
-  
-  it "should not reindex the object on an update_at change, because it is marked as to-ignore" do
-    Sunspot.should_not_receive(:index).with(@post)
-    @post.update_attribute :updated_at, 123.seconds.from_now
+
+  describe 'only paying attention to specific attributes' do
+    before(:each) do
+      @post = PostWithOnlySomeAttributesTriggeringReindex.create
+    end
+
+    it "should not reindex the object on an update_at change, because it is not in the whitelist" do
+      Sunspot.should_not_receive(:index).with(@post)
+      @post.update_attribute :updated_at, 123.seconds.from_now
+    end
+
+    it "should reindex the object on a title change, because it is in the whitelist" do
+      Sunspot.should_receive(:index).with(@post)
+      @post.update_attribute :title, "brand new title"
+    end
+
   end
 end
+

data/spec/model_spec.rb

@@ -211,12 +211,6 @@ describe 'ActiveRecord mixin' do
     it 'should return IDs of objects that are in the index but not the database' do
       Post.index_orphans.should == [@posts.first.id]
     end
-
-    it 'should find the orphans in batches to improve performance' do
-      Post.should_receive(:find_each).with(hash_including(:batch_size => 10)).and_return([])
-      Post.index_orphans(:batch_size => 10)
-    end
-
   end
 
   describe 'clean_index_orphans()' do

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

@@ -0,0 +1,12 @@
+class PostWithOnlySomeAttributesTriggeringReindex < ActiveRecord::Base
+  def self.table_name
+    'posts'
+  end
+
+  attr_accessible :title, :type, :location_id, :body, :blog
+
+  searchable :only_reindex_attribute_changes_of => [ :title, :body ] do
+    string :title
+    text :body, :more_like_this => true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.120925
+  version: 2.0.0.pre.130115
   prerelease: 6
 platform: ruby
 authors:
@@ -27,52 +27,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot
-  requirement: &70271798724000 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120925
+        version: 2.0.0.pre.130115
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *70271798724000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre.130115
+    none: false
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70271798723340 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *70271798723340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271798722140 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *70271798722140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70271798721500 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *70271798721500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
 description: ! "    Sunspot::Rails is an extension to the Sunspot library for Solr
   search.\n    Sunspot::Rails adds integration between Sunspot and ActiveRecord, including\n
   \   defining search and indexing related methods on ActiveRecord models themselves,\n
@@ -97,9 +117,9 @@ files:
 - dev_tasks/spec.rake
 - dev_tasks/todo.rake
 - gemfiles/rails-2.3.14
-- gemfiles/rails-3.0.15
-- gemfiles/rails-3.1.6
-- gemfiles/rails-3.2.6
+- gemfiles/rails-3.0.17
+- gemfiles/rails-3.1.8
+- gemfiles/rails-3.2.9
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -134,6 +154,7 @@ files:
 - spec/rails_template/app/models/post.rb
 - spec/rails_template/app/models/post_with_auto.rb
 - spec/rails_template/app/models/post_with_default_scope.rb
+- spec/rails_template/app/models/post_with_only_some_attributes_triggering_reindex.rb
 - spec/rails_template/config/boot.rb
 - spec/rails_template/config/preinitializer.rb
 - spec/rails_template/config/routes.rb
@@ -162,20 +183,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library
@@ -192,6 +213,7 @@ test_files:
 - spec/rails_template/app/models/post.rb
 - spec/rails_template/app/models/post_with_auto.rb
 - spec/rails_template/app/models/post_with_default_scope.rb
+- spec/rails_template/app/models/post_with_only_some_attributes_triggering_reindex.rb
 - spec/rails_template/config/boot.rb
 - spec/rails_template/config/preinitializer.rb
 - spec/rails_template/config/routes.rb