sunspot_rails 0.11.4 → 0.11.5

data/dev_tasks/gemspec.rake

@@ -1,12 +1,13 @@
-begin
-  gem 'technicalpickles-jeweler', '~> 1.0'
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = 'sunspot_rails'
-    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
+require File.join(File.dirname(__FILE__), '..', '..', 'sunspot', 'lib', 'sunspot', 'gem_tasks')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'rails', 'version')
+
+Sunspot::GemTasks.new do |s|
+  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,
@@ -14,42 +15,21 @@ 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']
-    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 'escape', '>= 0.0.4'
-    s.add_dependency 'sunspot', '>= 0.10.6', '<= 0.10.8'
-    s.add_development_dependency 'rspec', '~> 1.2'
-    s.add_development_dependency 'rspec-rails', '~> 1.2'
-    s.add_development_dependency 'ruby-debug', '~> 0.10'
-    s.add_development_dependency 'technicalpickles-jeweler', '~> 1.0'
-  end
-
-  Jeweler::RubyforgeTasks.new
-  Jeweler::GemcutterTasks.new
-end
-
-namespace :release do
-  task :tag do
-    version = Jeweler::VersionHelper.new(File.join(File.dirname(__FILE__), '..')).to_s
-    `git tag -a -m "Version #{version}" v#{version}`
-    `git push origin v#{version}:v#{version}`
-  end
-
-  task :commit_gemspec do
-    version = Jeweler::VersionHelper.new(File.join(File.dirname(__FILE__), '..')).to_s
-    `git add sunspot_rails.gemspec`
-    `git commit -m "Generate gemspec for v#{version}"`
-  end
-
-  desc "Release gem to RubyForge and GitHub"
-  task :all => [:gemspec, :commit_gemspec, :tag, :"rubyforge:release:gem", :"gemcutter:release"]
+  s.authors = ['Mat Brown', 'Peer Allan', 'Michael Moen', 'Benjamin Krause']
+  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 'escape', '>= 0.0.4'
+  s.add_dependency 'sunspot', '>= 0.10.6', '<= 0.10.8'
+  s.add_development_dependency 'rspec', '~> 1.2'
+  s.add_development_dependency 'rspec-rails', '~> 1.2'
+  s.add_development_dependency 'ruby-debug', '~> 0.10'
+  s.add_development_dependency 'technicalpickles-jeweler', '~> 1.0'
 end

data/lib/sunspot/rails/session_proxy.rb

@@ -6,7 +6,21 @@ module Sunspot
       class <<self
         def instance
           synchronize do
-            @instance ||= new
+            @instance ||=
+              begin
+                configuration = Sunspot::Rails::Configuration.new
+                if configuration.has_master?
+                  new(configuration)
+                else
+                  session = Sunspot::Session.new
+                  session.config.solr.url = URI::HTTP.build(
+                    :host => configuration.hostname,
+                    :port => configuration.port,
+                    :path => configuration.path
+                  ).to_s
+                  session
+                end
+              end
           end
         end
 
@@ -24,8 +38,8 @@ module Sunspot
                :remove_by_id!, :remove_all, :remove_all!, :dirty?, :commit_if_dirty, :batch,
                :to => :write_session
 
-      def initialize
-        @configuration = Sunspot::Rails::Configuration.new
+      def initialize(configuration)
+        @configuration = configuration
       end
 
       private

data/lib/sunspot/rails/util.rb

@@ -10,10 +10,20 @@ module Sunspot #:nodoc:
         
         def index_relevant_attribute_changed?( object )
           class_key = object.class.to_s.underscore.to_sym
-          ignore_attributes = (sunspot_options[class_key][:ignore_attribute_changes_of] || [])
+          ignore_attributes = sunspot_options_for(object.class)[:ignore_attribute_changes_of] || []
           !(object.changes.symbolize_keys.keys - ignore_attributes).blank?
         end
-        
+
+        private
+
+        def sunspot_options_for(clazz)
+          class_key = clazz.to_s.underscore.to_sym
+          if options = sunspot_options[class_key]
+            options
+          elsif superclass = clazz.superclass
+            sunspot_options_for(superclass)
+          end
+        end
       end
     end
   end

data/lib/sunspot/rails/version.rb

@@ -0,0 +1,5 @@
+module Sunspot
+  module Rails
+    VERSION = '0.11.5'
+  end
+end

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

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

data/spec/util_spec.rb

@@ -12,4 +12,10 @@ describe 'ActiveRecord mixin and instance methods' do
     @post.should_receive(:changes).and_return(:updated_at => Date.tomorrow)
     Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == false
   end
+
+  it "should know about relevant index attributes with subclasses" do
+    @post = PhotoPostWithAuto.new
+    @post.should_receive(:changes).and_return(:title => 'new_title')
+    Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,70 +91,70 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- LICENSE
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
+- README.rdoc
 - TODO
-- VERSION.yml
+- History.txt
+- LICENSE
+- lib/sunspot/spec/extension.rb
+- lib/sunspot/rails/searchable.rb
+- lib/sunspot/rails/version.rb
+- lib/sunspot/rails/adapters.rb
+- lib/sunspot/rails/configuration.rb
+- lib/sunspot/rails/server.rb
+- lib/sunspot/rails/tasks.rb
+- lib/sunspot/rails/request_lifecycle.rb
+- lib/sunspot/rails/util.rb
+- lib/sunspot/rails/session_proxy.rb
+- lib/sunspot/rails.rb
 - dev_tasks/gemspec.rake
+- dev_tasks/todo.rake
 - dev_tasks/rdoc.rake
 - dev_tasks/release.rake
-- dev_tasks/todo.rake
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
-- lib/sunspot/rails.rb
-- lib/sunspot/rails/adapters.rb
-- lib/sunspot/rails/configuration.rb
-- lib/sunspot/rails/request_lifecycle.rb
-- lib/sunspot/rails/searchable.rb
-- lib/sunspot/rails/server.rb
-- lib/sunspot/rails/session_proxy.rb
-- lib/sunspot/rails/tasks.rb
-- lib/sunspot/rails/util.rb
-- lib/sunspot/spec/extension.rb
 - rails/init.rb
+- spec/spec_helper.rb
+- spec/session_spec.rb
+- spec/server_spec.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/sunspot_mocking_spec.rb
+- spec/util_spec.rb
+- spec/request_lifecycle_spec.rb
 - spec/mock_app/app/controllers/posts_controller.rb
-- spec/mock_app/app/models/author.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/photo_post_with_auto.rb
 - spec/mock_app/app/models/post_with_auto.rb
-- spec/mock_app/config/boot.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/initializers/new_rails_defaults.rb
-- spec/mock_app/config/initializers/session_store.rb
 - spec/mock_app/config/routes.rb
-- spec/mock_app/config/sunspot.yml
-- spec/mock_app/db/schema.rb
-- spec/mock_app/db/test.db
-- spec/model_lifecycle_spec.rb
-- spec/model_spec.rb
-- spec/request_lifecycle_spec.rb
-- spec/schema.rb
-- spec/server_spec.rb
-- spec/session_spec.rb
-- spec/spec_helper.rb
-- spec/sunspot_mocking_spec.rb
-- spec/util_spec.rb
+- spec/mock_app/config/boot.rb
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot_rails
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -176,29 +176,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library
-test_files: 
-- spec/spec_helper.rb
-- spec/session_spec.rb
-- spec/server_spec.rb
-- spec/configuration_spec.rb
-- spec/model_lifecycle_spec.rb
-- spec/schema.rb
-- spec/model_spec.rb
-- spec/sunspot_mocking_spec.rb
-- spec/util_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_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/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/routes.rb
-- spec/mock_app/config/boot.rb
-- spec/request_lifecycle_spec.rb
+test_files: []
+

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:patch: 4
-:major: 0
-:minor: 11