outoftime-sunspot_rails 0.9.11 → 0.9.12

data/README.rdoc

@@ -238,6 +238,7 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 
 Mat Brown (mat@patch.com)
 Peer Allan (peer.allan@gmail.com)
+Michael Moen (michael@underpantsgnome.com)
 
 == License
 

data/VERSION.yml

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

data/lib/sunspot/rails/configuration.rb

@@ -54,7 +54,8 @@ module Sunspot #:nodoc:
       end
 
       #
-      # The URL to call if you are running Solr with multicore. Default '/solr'.
+      # The path to the Solr servlet (useful if you are running multicore).
+      # Default '/solr'.
       #
       # ==== Returns
       #
@@ -83,8 +84,7 @@ module Sunspot #:nodoc:
             path = File.join(::Rails.root, 'config', 'sunspot.yml')
             if File.exist?(path)
               File.open(path) do |file|
-                # only changed this to allow me to test the path attribute
-                YAML.load(file)[RAILS_ENV]
+                YAML.load(file)[::Rails.env]
               end
             end
           end

data/spec/configuration_spec.rb

@@ -2,16 +2,15 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "Configuration" do
   it "should handle the 'path' property when not set" do
-    config ||= Sunspot::Rails::Configuration.new
+    config = Sunspot::Rails::Configuration.new
     config.path.should == '/solr'
   end
 
   it "should handle the 'path' property when set" do
     silence_stderr do
-      RAILS_ENV = 'path_test'
-      config ||= Sunspot::Rails::Configuration.new
+      Rails.stub!(:env => 'path_test')
+      config = Sunspot::Rails::Configuration.new
       config.path.should == '/solr/path_test'
-      RAILS_ENV = 'test'
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
 - Mat Brown