sunspot_rails 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.1
+* Fix Solr logging compatibility with RSolr 0.12.1
+
 == 1.0.0
 * Sunspot::Rails::Server subclasses Sunspot::Server; no longer needs to shell out
 * Use Sunspot built-in session proxies in Sunspot::Rails

data/dev_tasks/gemspec.rake

@@ -27,7 +27,6 @@ TEXT
     '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', Sunspot::Rails::VERSION
   s.add_development_dependency 'rspec', '~> 1.2'
   s.add_development_dependency 'rspec-rails', '~> 1.2'

data/lib/sunspot/rails/solr_logging.rb

@@ -51,4 +51,8 @@ module Sunspot
   end
 end
 
-RSolr::Connection::Base.module_eval { include(Sunspot::Rails::SolrLogging) }
+begin
+  RSolr::Client.module_eval { include(Sunspot::Rails::SolrLogging) }
+rescue NameError # RSolr 0.9.6
+  RSolr::Connection::Base.module_eval { include(Sunspot::Rails::SolrLogging) }
+end

data/lib/sunspot/rails/version.rb

@@ -1,5 +1,5 @@
 module Sunspot
   module Rails
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 ENV['RAILS_ENV'] = 'test'
 ENV['RAILS_ROOT'] ||= File.join(File.dirname(__FILE__), 'mock_app')
+if rsolr_version = ENV['RSOLR_GEM_VERSION']
+  STDERR.puts("Forcing RSolr version #{rsolr_version}")
+  gem "rsolr", rsolr_version
+end
 
 if File.exist?(sunspot_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'sunspot', 'lib')))
   STDERR.puts("Using sunspot lib at #{sunspot_lib}")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Mat Brown
@@ -20,41 +20,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: escape
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sunspot
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -63,11 +49,11 @@ dependencies:
         - 2
         version: "1.2"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -76,7 +62,7 @@ dependencies:
         - 2
         version: "1.2"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: |
   Sunspot::Rails is an extension to the Sunspot library for Solr search.
   Sunspot::Rails adds integration between Sunspot and ActiveRecord, including