websolr-rails 2.3.2 → 2.3.3

data/CHANGELOG

@@ -0,0 +1,3 @@
+2.3.3
+- added a CHANGELOG
+- Fixed "master_session" bug with Sunspot

data/README.rdoc

@@ -18,6 +18,10 @@ initializer, etc:
   # WEBSOLR_URL must already be defined.
   require "websolr-rails"
 
+== Semantic Versioning
+
+This library obeys the definition of "Semantic Versioning" at http://semver.org/.  YMMV with its dependencies.
+
 == Copyright
 
 Copyright (c) 2009 Kyle Maxwell. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-2.3.2
+2.3.3

data/lib/websolr-rails.rb

@@ -37,10 +37,16 @@ if ENV["WEBSOLR_URL"]
             def included(base) #:nodoc:
               base.after_filter do
                 begin
+                  # Sunspot moved the location of the commit_if_dirty method around.
+                  # Let's support multiple versions for now.
+                  session = Sunspot::Rails.respond_to?(:master_session) ? 
+                              Sunspot::Rails.master_session : 
+                              Sunspot
+                              
                   if Sunspot::Rails.configuration.auto_commit_after_request?
-                    Sunspot::Rails.master_session.commit_if_dirty
+                    session.commit_if_dirty
                   elsif Sunspot::Rails.configuration.auto_commit_after_delete_request?
-                    Sunspot::Rails.master_session.commit_if_delete_dirty
+                    session.commit_if_delete_dirty
                   end
                 rescue Exception => e
                   ActionController::Base.logger.error e.message

data/websolr-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-rails}
-  s.version = "2.3.2"
+  s.version = "2.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-12-15}
   s.default_executable = %q{websolr}
   s.description = %q{Makes Sunspot and acts_as_solr play with WebSolr}
   s.email = %q{kyle@kylemaxwell.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-12-15 00:00:00 -08:00
 default_executable: websolr
 dependencies: []
 
@@ -25,6 +25,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile