mwmitchell-rsolr 0.8.9 → 0.9.0

data/CHANGES.txt

@@ -1,3 +1,7 @@
+0.9.0 - July 17, 2009
+  Added ability to use DirectSolrConnection instance when connecting
+  Loading Java classes using full package name
+
 0.8.9 - June 30, 2009
   Deprecated hash syntax fix from outoftime/rsolr (Mat Brown)
 

data/lib/rsolr/adapter/direct.rb

@@ -9,8 +9,11 @@ class RSolr::Adapter::Direct
   
   include RSolr::HTTPClient::Util
   
-  attr_accessor :opts, :home_dir
+  attr_accessor :opts
   
+  # opts can be an instance of org.apache.solr.servlet.DirectSolrConnection
+  # if opts is NOT an instance of org.apache.solr.servlet.DirectSolrConnection
+  # then...
   # required: opts[:home_dir] is absolute path to solr home (the directory with "data", "config" etc.)
   # opts must also contain either
   #   :dist_dir => 'absolute path to solr distribution root
@@ -20,22 +23,24 @@ class RSolr::Adapter::Direct
   #   :select_path => 'the/select/handler'
   #   :update_path => 'the/update/handler'
   def initialize(opts, &block)
-    @home_dir = opts[:home_dir].to_s
-    opts[:data_dir] ||= File.join(@home_dir, 'data')
-    if opts[:dist_dir] and ! opts[:jar_paths]
-      # add the standard lib and dist directories to the :jar_paths
-      opts[:jar_paths] = [File.join(opts[:dist_dir], 'lib'), File.join(opts[:dist_dir], 'dist')]
+    if defined?(Java::OrgApacheSolrServlet::DirectSolrConnection) and opts.is_a?(Java::OrgApacheSolrServlet::DirectSolrConnection)
+      @connection = opts
+    else
+      opts[:data_dir] ||= File.join(opts[:home_dir].to_s, 'data')
+      if opts[:dist_dir] and ! opts[:jar_paths]
+        # add the standard lib and dist directories to the :jar_paths
+        opts[:jar_paths] = [File.join(opts[:dist_dir], 'lib'), File.join(opts[:dist_dir], 'dist')]
+      end
+      @opts = opts
     end
-    @opts = opts
   end
   
   # loads/imports the java dependencies
-  # sets the @connection instance variable
+  # sets the @connection instance variable if it has not yet been set
   def connection
     @connection ||= (
       require_jars(@opts[:jar_paths]) if @opts[:jar_paths]
-      import_dependencies
-      DirectSolrConnection.new(@home_dir, @opts[:data_dir], nil)
+      org.apache.solr.servlet.DirectSolrConnection.new(opts[:home_dir], @opts[:data_dir], nil)
     )
   end
   
@@ -67,17 +72,13 @@ class RSolr::Adapter::Direct
   
   protected
   
-  # do the java import thingy
-  def import_dependencies
-    import org.apache.solr.servlet.DirectSolrConnection
-  end
-  
   # require the jar files
   def require_jars(paths)
     paths = [paths] unless paths.is_a?(Array)
     paths.each do |path|
+      raise "Invalid jar path: #{path}" unless File.exists?(path)
       jar_pattern = File.join(path,"**", "*.jar")
-      Dir[jar_pattern].each {|jar_file| require jar_file}
+      Dir[jar_pattern].each {|jar_file| require jar_file }
     end
   end
   

data/rsolr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "rsolr"
-  s.version = "0.8.9"
-  s.date = "2009-06-30"
+  s.version = "0.9.0"
+  s.date = "2009-07-17"
   s.summary = "A Ruby client for Apache Solr"
   s.email = "goodieboy@gmail.com"
   s.homepage = "http://github.com/mwmitchell/rsolr"

data/test/connection/direct_test.rb

@@ -7,11 +7,14 @@ if defined?(JRUBY_VERSION)
     
     include ConnectionTestMethods
     
+    attr :dist
+    attr :home
+    
     def setup
       base = File.expand_path( File.dirname(__FILE__) )
-      dist = File.join(base, '..', '..', 'apache-solr')
-      home = File.join(dist, 'example', 'solr')
-      @solr = RSolr.connect(:adapter=>:direct, :home_dir=>home, :dist_dir=>dist)
+      @dist = File.join(base, '..', '..', 'apache-solr')
+      @home = File.join(dist, 'example', 'solr')
+      @solr = RSolr.connect(:adapter=>:direct, :home_dir=>@home, :dist_dir=>@dist)
       @solr.delete_by_query('*:*')
       @solr.commit
     end
@@ -20,6 +23,15 @@ if defined?(JRUBY_VERSION)
       @solr.adapter.close
     end
     
+    def test_new_connection_with_existing_core
+      Dir["#{@dist}/dist/*.jar"].each { |p| require p }
+      dc = org.apache.solr.servlet.DirectSolrConnection.new(@home, "#{@home}/data", nil)
+      adapter = RSolr::Adapter::Direct.new dc
+      s = RSolr::Connection.new(adapter)
+      assert_equal Hash, s.request('/admin/ping').class
+      adapter.close
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency