websolr-rails 2.0.5 → 2.1.0

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.1.0

data/lib/websolr-rails.rb

@@ -1,61 +1,47 @@
 # Post-require hooks for acts_as_solr and sunspot if this 
 # gem is loaded and WEBSOLR_URL is defined.
 
-if ENV["WEBSOLR_URL"] && !$websolr_already
-  $websolr_already = true
+if ENV["WEBSOLR_URL"]
   require "uri"
   
-  def websolr_install_sunspot
-    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
+  begin
+    require "sunspot/rails/configuration"
+    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
-    RUBY
+    end
+  rescue LoadError
+    #ignore
   end
 
-  def websolr_install_acts_as_solr
-    eval <<-RUBY
-      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
+  begin
+    require "acts_as_solr"
+    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
         end
       end
-    RUBY
-  end
-  
-  websolr_install_sunspot
-  websolr_install_acts_as_solr
-  
-  module Kernel #:nodoc: all
-    alias_method :require_without_solr_hooks, :require
-    def require(string)
-      require_without_solr_hooks(string)
-      case string
-      when "acts_as_solr"
-        websolr_install_acts_as_solr
-      when "sunspot"
-        websolr_install_sunspot
-      end
     end
+  rescue LoadError
+    #ignore
   end
+
 end

data/websolr-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-rails}
-  s.version = "2.0.5"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors: 
 - Kyle Maxwell