websolr-rails 2.0.4 → 2.0.5

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/websolr-rails.rb

@@ -3,44 +3,49 @@
 
 if ENV["WEBSOLR_URL"] && !$websolr_already
   $websolr_already = true
+  require "uri"
   
   def websolr_install_sunspot
-    puts "Using websolr-rails for sunspot at #{ENV["WEBSOLR_URL"]}"
-    Sunspot.config.solr.url = ENV["WEBSOLR_URL"]
+    eval <<-RUBY
+      module Sunspot #:nodoc:
+        module Rails #:nodoc:
+          class Configuration
+            def hostname
+              URI.parse(ENV["WEBSOLR_URL"]).host
+            end
+            def port
+              URI.parse(ENV["WEBSOLR_URL"]).port
+            end
+            def path
+              URI.parse(ENV["WEBSOLR_URL"]).path
+            end
+          end
+        end
+      end
+    RUBY
   end
-    
+
   def websolr_install_acts_as_solr
-    puts "Using websolr-rails for acts_as_solr at #{ENV["WEBSOLR_URL"]}"
     eval <<-RUBY
-      module ::ActsAsSolr
+      module ActsAsSolr
         class Post        
-            def self.execute(request)
-              begin
-                connection = Solr::Connection.new(ENV["WEBSOLR_URL"])
-                return connection.send(request)
-              rescue 
-                raise "Couldn't connect to the Solr server at #{url}. #{$!}"
-                false
-              end
+          def self.execute(request)
+            begin
+              connection = Solr::Connection.new(ENV["WEBSOLR_URL"])
+              return connection.send(request)
+            rescue 
+              raise "Couldn't connect to the Solr server at \#{url}. \#{$!}"
+              false
             end
           end
         end
       end
     RUBY
-  end   
-  
-  begin
-    ActsAsSolr
-    websolr_install_acts_as_solr
-  rescue NameError
-  end
-
-  begin
-    Sunspot
-    websolr_install_acts_as_solr
-  rescue NameError
   end
   
+  websolr_install_sunspot
+  websolr_install_acts_as_solr
+  
   module Kernel #:nodoc: all
     alias_method :require_without_solr_hooks, :require
     def require(string)
@@ -53,5 +58,4 @@ if ENV["WEBSOLR_URL"] && !$websolr_already
       end
     end
   end
-  
 end

data/websolr-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-rails}
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "lib/websolr-rails-adapter.rb",
      "lib/websolr-rails.rb",
      "lib/websolr.rb",
      "websolr-rails.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -29,7 +29,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/websolr-rails-adapter.rb
 - lib/websolr-rails.rb
 - lib/websolr.rb
 - websolr-rails.gemspec

data/lib/websolr-rails-adapter.rb

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/websolr-rails"