websolr-rails 2.3.2 → 2.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,3 @@
1
+ 2.3.3
2
+ - added a CHANGELOG
3
+ - Fixed "master_session" bug with Sunspot
@@ -18,6 +18,10 @@ initializer, etc:
18
18
  # WEBSOLR_URL must already be defined.
19
19
  require "websolr-rails"
20
20
 
21
+ == Semantic Versioning
22
+
23
+ This library obeys the definition of "Semantic Versioning" at http://semver.org/. YMMV with its dependencies.
24
+
21
25
  == Copyright
22
26
 
23
27
  Copyright (c) 2009 Kyle Maxwell. See LICENSE for details.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.2
1
+ 2.3.3
@@ -37,10 +37,16 @@ if ENV["WEBSOLR_URL"]
37
37
  def included(base) #:nodoc:
38
38
  base.after_filter do
39
39
  begin
40
+ # Sunspot moved the location of the commit_if_dirty method around.
41
+ # Let's support multiple versions for now.
42
+ session = Sunspot::Rails.respond_to?(:master_session) ?
43
+ Sunspot::Rails.master_session :
44
+ Sunspot
45
+
40
46
  if Sunspot::Rails.configuration.auto_commit_after_request?
41
- Sunspot::Rails.master_session.commit_if_dirty
47
+ session.commit_if_dirty
42
48
  elsif Sunspot::Rails.configuration.auto_commit_after_delete_request?
43
- Sunspot::Rails.master_session.commit_if_delete_dirty
49
+ session.commit_if_delete_dirty
44
50
  end
45
51
  rescue Exception => e
46
52
  ActionController::Base.logger.error e.message
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{websolr-rails}
8
- s.version = "2.3.2"
8
+ s.version = "2.3.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Kyle Maxwell"]
12
- s.date = %q{2009-10-28}
12
+ s.date = %q{2009-12-15}
13
13
  s.default_executable = %q{websolr}
14
14
  s.description = %q{Makes Sunspot and acts_as_solr play with WebSolr}
15
15
  s.email = %q{kyle@kylemaxwell.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
21
21
  s.files = [
22
22
  ".document",
23
23
  ".gitignore",
24
+ "CHANGELOG",
24
25
  "LICENSE",
25
26
  "README.rdoc",
26
27
  "Rakefile",
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: websolr-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.2
4
+ version: 2.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kyle Maxwell
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-10-28 00:00:00 -07:00
12
+ date: 2009-12-15 00:00:00 -08:00
13
13
  default_executable: websolr
14
14
  dependencies: []
15
15
 
@@ -25,6 +25,7 @@ extra_rdoc_files:
25
25
  files:
26
26
  - .document
27
27
  - .gitignore
28
+ - CHANGELOG
28
29
  - LICENSE
29
30
  - README.rdoc
30
31
  - Rakefile