rsolr-direct 0.0.0 → 0.1.0

data/README.rdoc

@@ -2,30 +2,27 @@
 rsolr-direct enhances the RSolr core library by adding the ability to connect to Solr directly, using JRuby, sans http. Hotdog!
 
 = How
-Check out the specs to see the various connection methods. Overview below...
+Check out the specs to see the various connection methods.
 
-==Using :solr_home
+== Solr Java libs/jars
+RSolr-Direct comes with the required Solr jars. If you'd like to use them, just call #load_java_libs:
   require 'rsolr-direct'
-  Dir['/path/to/solr/distribution/lib/*.jar', '/path/to/solr/distribution/dist/*.jar'].each do |jar|
-    require jar
-  end
-  connection = RSolr.connect :solr_home => '/absolute/path/to/solr/home'
+  RSolr.load_java_libs
+  # create connection etc..
 
-==Using a Java::OrgApacheSolrCore::SolrCore instance
+==:solr_home
   require 'rsolr-direct'
-  Dir['/path/to/solr/distribution/lib/*.jar', '/path/to/solr/distribution/dist/*.jar'].each do |jar|
-    require jar
-  end
-  core = org.apache.solr.core.SolrCore.new( nil, solr_data_path, solr_config, index_schema, dcore)
-  connection = RSolr.connect core
+  connection = RSolr.connect :direct, :solr_home => '/absolute/path/to/solr/home'
+  
+==Java::OrgApacheSolrCore::SolrCore
+  require 'rsolr-direct'
+  core = org.apache.solr.core.SolrCore.new(nil, solr_data_path, solr_config, index_schema, dcore)
+  connection = RSolr.connect :direct, core
 
-==Using a Java::OrgApacheSolrServlet::DirectSolrConnection
+==Java::OrgApacheSolrServlet::DirectSolrConnection
   require 'rsolr-direct'
-  Dir['/path/to/solr/distribution/lib/*.jar', '/path/to/solr/distribution/dist/*.jar'].each do |jar|
-    require jar
-  end
-  dc = org.apache.solr.servlet.DirectSolrConnection.new(solr_home_path, solr_data_path, nil)
-  connection = RSolr.connect dc
+  dc = org.apache.solr.servlet.DirectSolrConnection.new(solr_home_path, solr_data_path, solr_log_path)
+  connection = RSolr.connect :direct, dc
 
 = Why
 Using a direct connection to Solr can speed up indexing. How much faster? I have no idea yet. Numbers to come?

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency "rsolr", ">= 0.12.1"
     
-    gem.files = FileList['lib/**/*.rb', 'LICENSE', 'README.rdoc', 'VERSION']
+    gem.files = FileList['lib/**/*.rb', 'LICENSE', 'README.rdoc', 'VERSION', 'solr/dist/*', 'solr/lib/*']
     gem.test_files = ['spec/*', 'Rakefile', 'solr/dist/*', 'solr/lib/*', 'solr/example/solr/*']
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/lib/rsolr-direct.rb

@@ -1,4 +1,4 @@
-#require 'java'
+require 'java'
 require 'rubygems'
 require 'rsolr'
 
@@ -9,13 +9,27 @@ module RSolr::Direct
   
   module Connectable
     
+    # load the java libs that ship with rsolr-direct
+    # RSolr.load_java_libs
+    # rsolr = RSolr.connect :direct, :solr_home => ''
+    def load_java_libs
+      @java_libs_loaded ||= (
+        base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
+        ['lib', 'dist'].each do |sub|
+          Dir[File.join(base_dir, sub, '*.jar')].each do |jar|
+            require jar
+          end
+        end
+        true
+      )
+    end
+    
+    # RSolr.connect :direct, :solr_home => 'apache-solr/example/solr'
+    # RSolr.connect :direct, java_solr_core
+    # RSolr.connect :direct, java_direct_solr_connection
     def connect *args, &blk
-      first = args.first
-      use_dc = first.is_a?(Hash) and first[:solr_home]
-      use_dc = use_dc || (first.class.to_s == "Java::OrgApacheSolrCore::SolrCore")
-      use_dc = use_dc || (first.class.to_s == "Java::OrgApacheSolrServlet::DirectSolrConnection")
-      if use_dc
-        client = RSolr::Client.new RSolr::Direct::Connection.new(first)
+      if args.first == :direct
+        client = RSolr::Client.new RSolr::Direct::Connection.new(*args[1..-1])
         if block_given?
           yield client
           client.connection.close
@@ -50,7 +64,6 @@ module RSolr::Direct
     # then...
     # required: opts[:solr_home] is absolute path to solr home (the directory with "data", "config" etc.)
     def initialize opts
-      opts ||= {}
       
       begin
         org.apache.solr.servlet.DirectSolrConnection
@@ -58,30 +71,27 @@ module RSolr::Direct
         raise MissingRequiredJavaLibs
       end
       
-      if defined?(Java::OrgApacheSolrCore::SolrCore) and opts.is_a?(Java::OrgApacheSolrCore::SolrCore)
-        puts "OKOKOKOK a SolrCore!"
-        @connection = org.apache.solr.servlet.DirectSolrConnection.new(opts)
-      elsif defined?(Java::OrgApacheSolrServlet::DirectSolrConnection) and opts.is_a?(Java::OrgApacheSolrServlet::DirectSolrConnection)
-        @connection = opts
-      else
-        opts[:solr_home] ||= ''
+      if opts.is_a?(Hash) and opts[:solr_home]
         raise InvalidSolrHome unless File.exists?(opts[:solr_home])
         opts[:data_dir] ||= File.join(opts[:solr_home], 'data')
         @opts = opts
+      elsif opts.class.to_s == "Java::OrgApacheSolrCore::SolrCore"
+        @direct = org.apache.solr.servlet.DirectSolrConnection.new(opts)
+      elsif opts.class.to_s == "Java::OrgApacheSolrServlet::DirectSolrConnection"
+        @direct = opts
       end
     end
     
-    # sets the @connection instance variable if it has not yet been set
-    def connection
-      @connection ||= (
-        org.apache.solr.servlet.DirectSolrConnection.new(opts[:home_dir], @opts[:data_dir], nil)
-      )
+    # sets the @direct instance variable if it has not yet been set
+    def direct
+      @direct ||= org.apache.solr.servlet.DirectSolrConnection.new(opts[:solr_home], @opts[:data_dir], nil)
     end
     
     def close
-      if @connection
-        @connection.close
-        @connection=nil
+      if @direct
+        @direct.close
+        puts "CLOSING -> #{@direct}"
+        @direct = nil
       end
     end
     
@@ -92,7 +102,7 @@ module RSolr::Direct
       data = data.to_xml if data.respond_to?(:to_xml)
       url = build_url(path, params)
       begin
-        body = connection.request(url, data)
+        body = direct.request(url, data)
       rescue
         raise RSolr::RequestError.new($!.message)
       end

data/spec/rsolr-direct_spec.rb

@@ -14,26 +14,26 @@ describe RSolr::Direct do
     
     it 'should attempt to use a direct connect if :solr_home is set but raise a MissingRequiredJavaLibs' do
       lambda{
-        RSolr.connect(:solr_home=>'')
+        RSolr.connect(:direct, nil)
       }.should raise_error(RSolr::Direct::Connection::MissingRequiredJavaLibs)
     end
     
     it 'should attempt to use a direct connect if :solr_home is set but raise a InvalidSolrHome' do
       load_required_java_libs
       lambda{
-        RSolr.connect(:solr_home=>'')
+        RSolr.connect(:direct, :solr_home=>'')
       }.should raise_error(RSolr::Direct::Connection::InvalidSolrHome)
     end
     
     it 'should create direct connection succesfully' do
       load_required_java_libs
-      RSolr.connect(:solr_home=>solr_home_dir).connection.should be_a(RSolr::Direct::Connection)
+      RSolr.connect(:direct, :solr_home=>solr_home_dir).connection.should be_a(RSolr::Direct::Connection)
     end
     
     it 'should accept a Java::OrgApacheSolrCore::SolrCore' do
       load_required_java_libs
       core = new_solr_core solr_home_dir, solr_data_dir
-      rsolr = RSolr.connect(core)
+      rsolr = RSolr.connect(:direct, core)
       rsolr.should be_a(RSolr::Client)
       rsolr.connection.should be_a(RSolr::Direct::Connection)
       core.close
@@ -42,7 +42,7 @@ describe RSolr::Direct do
     it 'should accept a Java::OrgApacheSolrServlet::DirectSolrConnection' do
       load_required_java_libs
       dc = new_direct_solr_connection solr_home_dir, solr_data_dir
-      rsolr = RSolr.connect(dc)
+      rsolr = RSolr.connect(:direct, dc)
       rsolr.should be_a(RSolr::Client)
       rsolr.connection.should be_a(RSolr::Direct::Connection)
       dc.close
@@ -50,4 +50,58 @@ describe RSolr::Direct do
     
   end
   
+  module ConnectionHelpers
+    
+    def self.included base
+      base.let(:connections){
+        [
+          RSolr.connect(:direct, :solr_home=>solr_home_dir),
+          RSolr.connect(:direct, new_solr_core(solr_home_dir, solr_data_dir)),
+          RSolr.connect(:direct, new_direct_solr_connection(solr_home_dir, solr_data_dir))
+        ]
+      }
+    end
+    
+  end
+  
+  context 'connection closing' do
+    
+    include ConnectionHelpers
+    
+    it '(they) should have connection objects that respond to close, and set the internal "direct" attribute to nil' do
+      connections.each do |rsolr|
+        rsolr.connection.direct # <- connect
+        rsolr.connection.instance_variable_get("@direct").should_not be(nil)
+        rsolr.connection.close
+        rsolr.connection.instance_variable_get("@direct").should be(nil)
+      end
+    end
+    
+    it 'should automatically close when using the block style of connecting' do
+      rsolr = nil
+      RSolr.connect(:direct, :solr_home => solr_home_dir) do |client|
+        rsolr = client
+        client.connection.direct # <- connect
+        rsolr.connection.instance_variable_get("@direct").should_not be(nil)
+      end
+      rsolr.connection.instance_variable_get("@direct").should be(nil)
+    end
+    
+  end
+  
+  context 'querying' do
+    
+    include ConnectionHelpers
+    
+    it '(they) should return a solr response hash when calling select' do
+      connections.each do |rsolr|
+        response = rsolr.select(:q => '*:*')
+        response.should be_a(Hash)
+        response.keys.should include("response", "responseHeader")
+        rsolr.connection.close
+      end
+    end
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-direct
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -05:00
+date: 2010-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,35 @@ files:
 - README.rdoc
 - VERSION
 - lib/rsolr-direct.rb
+- solr/dist/apache-solr-1.4.0.war
+- solr/dist/apache-solr-cell-1.4.0.jar
+- solr/dist/apache-solr-clustering-1.4.0.jar
+- solr/dist/apache-solr-core-1.4.0.jar
+- solr/dist/apache-solr-dataimporthandler-1.4.0.jar
+- solr/dist/apache-solr-dataimporthandler-extras-1.4.0.jar
+- solr/dist/apache-solr-solrj-1.4.0.jar
+- solr/lib/commons-codec-1.3.jar
+- solr/lib/commons-csv-1.0-SNAPSHOT-r609327.jar
+- solr/lib/commons-fileupload-1.2.1.jar
+- solr/lib/commons-httpclient-3.1.jar
+- solr/lib/commons-io-1.4.jar
+- solr/lib/easymock.jar
+- solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
+- solr/lib/jcl-over-slf4j-1.5.5.jar
+- solr/lib/junit-4.3.jar
+- solr/lib/lucene-analyzers-2.9.1.jar
+- solr/lib/lucene-core-2.9.1.jar
+- solr/lib/lucene-highlighter-2.9.1.jar
+- solr/lib/lucene-memory-2.9.1.jar
+- solr/lib/lucene-misc-2.9.1.jar
+- solr/lib/lucene-queries-2.9.1.jar
+- solr/lib/lucene-snowball-2.9.1.jar
+- solr/lib/lucene-spellchecker-2.9.1.jar
+- solr/lib/servlet-api-2.4.jar
+- solr/lib/slf4j-api-1.5.5.jar
+- solr/lib/slf4j-jdk14-1.5.5.jar
+- solr/lib/solr-commons-csv-pom.xml.template
+- solr/lib/wstx-asl-3.2.7.jar
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr-direct
 licenses: []