sunspot_rails 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
data/History.txt CHANGED
@@ -1,3 +1,6 @@
1
+ == 1.0.1
2
+ * Fix Solr logging compatibility with RSolr 0.12.1
3
+
1
4
  == 1.0.0
2
5
  * Sunspot::Rails::Server subclasses Sunspot::Server; no longer needs to shell out
3
6
  * Use Sunspot built-in session proxies in Sunspot::Rails
@@ -27,7 +27,6 @@ TEXT
27
27
  'spec/*.rb',
28
28
  'spec/mock_app/{app,lib,db,vendor,config}/**/*',
29
29
  'spec/mock_app/{tmp,log,solr}']
30
- s.add_dependency 'escape', '>= 0.0.4'
31
30
  s.add_dependency 'sunspot', Sunspot::Rails::VERSION
32
31
  s.add_development_dependency 'rspec', '~> 1.2'
33
32
  s.add_development_dependency 'rspec-rails', '~> 1.2'
@@ -51,4 +51,8 @@ module Sunspot
51
51
  end
52
52
  end
53
53
 
54
- RSolr::Connection::Base.module_eval { include(Sunspot::Rails::SolrLogging) }
54
+ begin
55
+ RSolr::Client.module_eval { include(Sunspot::Rails::SolrLogging) }
56
+ rescue NameError # RSolr 0.9.6
57
+ RSolr::Connection::Base.module_eval { include(Sunspot::Rails::SolrLogging) }
58
+ end
@@ -1,5 +1,5 @@
1
1
  module Sunspot
2
2
  module Rails
3
- VERSION = '1.0.0'
3
+ VERSION = '1.0.1'
4
4
  end
5
5
  end
data/spec/spec_helper.rb CHANGED
@@ -1,5 +1,9 @@
1
1
  ENV['RAILS_ENV'] = 'test'
2
2
  ENV['RAILS_ROOT'] ||= File.join(File.dirname(__FILE__), 'mock_app')
3
+ if rsolr_version = ENV['RSOLR_GEM_VERSION']
4
+ STDERR.puts("Forcing RSolr version #{rsolr_version}")
5
+ gem "rsolr", rsolr_version
6
+ end
3
7
 
4
8
  if File.exist?(sunspot_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'sunspot', 'lib')))
5
9
  STDERR.puts("Using sunspot lib at #{sunspot_lib}")
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 0
8
- - 0
9
- version: 1.0.0
8
+ - 1
9
+ version: 1.0.1
10
10
  platform: ruby
11
11
  authors:
12
12
  - Mat Brown
@@ -20,41 +20,27 @@ autorequire:
20
20
  bindir: bin
21
21
  cert_chain: []
22
22
 
23
- date: 2010-03-04 00:00:00 -05:00
23
+ date: 2010-03-05 00:00:00 -05:00
24
24
  default_executable:
25
25
  dependencies:
26
- - !ruby/object:Gem::Dependency
27
- name: escape
28
- prerelease: false
29
- requirement: &id001 !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- segments:
34
- - 0
35
- - 0
36
- - 4
37
- version: 0.0.4
38
- type: :runtime
39
- version_requirements: *id001
40
26
  - !ruby/object:Gem::Dependency
41
27
  name: sunspot
42
28
  prerelease: false
43
- requirement: &id002 !ruby/object:Gem::Requirement
29
+ requirement: &id001 !ruby/object:Gem::Requirement
44
30
  requirements:
45
31
  - - "="
46
32
  - !ruby/object:Gem::Version
47
33
  segments:
48
34
  - 1
49
35
  - 0
50
- - 0
51
- version: 1.0.0
36
+ - 1
37
+ version: 1.0.1
52
38
  type: :runtime
53
- version_requirements: *id002
39
+ version_requirements: *id001
54
40
  - !ruby/object:Gem::Dependency
55
41
  name: rspec
56
42
  prerelease: false
57
- requirement: &id003 !ruby/object:Gem::Requirement
43
+ requirement: &id002 !ruby/object:Gem::Requirement
58
44
  requirements:
59
45
  - - ~>
60
46
  - !ruby/object:Gem::Version
@@ -63,11 +49,11 @@ dependencies:
63
49
  - 2
64
50
  version: "1.2"
65
51
  type: :development
66
- version_requirements: *id003
52
+ version_requirements: *id002
67
53
  - !ruby/object:Gem::Dependency
68
54
  name: rspec-rails
69
55
  prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ requirement: &id003 !ruby/object:Gem::Requirement
71
57
  requirements:
72
58
  - - ~>
73
59
  - !ruby/object:Gem::Version
@@ -76,7 +62,7 @@ dependencies:
76
62
  - 2
77
63
  version: "1.2"
78
64
  type: :development
79
- version_requirements: *id004
65
+ version_requirements: *id003
80
66
  description: |
81
67
  Sunspot::Rails is an extension to the Sunspot library for Solr search.
82
68
  Sunspot::Rails adds integration between Sunspot and ActiveRecord, including