rsolr-direct 0.1.0 → 1.0.0

data/README.rdoc

@@ -7,25 +7,31 @@ Check out the specs to see the various connection methods.
 == 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'
-  RSolr.load_java_libs
+  RSolr::Direct.load_java_libs "path/to/solr/distribution"
   # create connection etc..
 
 ==:solr_home
   require 'rsolr-direct'
-  connection = RSolr.connect :direct, :solr_home => '/absolute/path/to/solr/home'
+  connection = RSolr.direct_connect(
+    :solr_home => '/absolute/path/to/solr/home',
+    :data_dir => "/optional/path/to/data/dir")
   
 ==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
+  connection = RSolr.direct_connect core
 
 ==Java::OrgApacheSolrServlet::DirectSolrConnection
   require 'rsolr-direct'
   dc = org.apache.solr.servlet.DirectSolrConnection.new(solr_home_path, solr_data_path, solr_log_path)
-  connection = RSolr.connect :direct, dc
+  connection = RSolr.direct_connect dc
 
 = Why
-Using a direct connection to Solr can speed up indexing. How much faster? I have no idea yet. Numbers to come?
+Using a direct connection to Solr can speed up indexing. How much faster? A page on the Solr Wiki says ~ 50% faster.
+
+= Testing
+Clone it, cd into the project dir and run:
+  jruby -S rake spec
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -11,10 +11,10 @@ begin
     gem.homepage = "http://github.com/mwmitchell/rsolr-direct"
     gem.authors = ["Matt Mitchell"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "rsolr", ">= 0.12.1"
+    gem.add_dependency "rsolr", ">= 1.0.0"
     
-    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.files = FileList['lib/**/*.rb', 'LICENSE', 'README.rdoc', 'VERSION']
+    gem.test_files = ['spec/*', 'Rakefile', 'solr/example/solr/*']
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.0
+1.0.0

data/lib/rsolr-direct.rb

@@ -7,53 +7,45 @@ require 'rsolr'
 #
 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
-      if args.first == :direct
-        client = RSolr::Client.new RSolr::Direct::Connection.new(*args[1..-1])
-        if block_given?
-          yield client
-          client.connection.close
-          nil
-        else
-          client
+  # load the java libs that ship with rsolr-direct
+  # RSolr.load_java_libs
+  # rsolr = RSolr.connect :direct, :solr_home => ''
+  def self.load_java_libs apache_solr_dir
+    @java_libs_loaded ||= (
+      base_dir = File.expand_path(apache_solr_dir)
+      ['lib', 'dist'].each do |sub|
+        Dir[File.join(base_dir, sub, '*.jar')].each do |jar|
+          require jar
         end
+      end
+      true
+    )
+  end
+  
+  RSolr.class_eval do
+    # RSolr.direct_connect :solr_home => 'apache-solr/example/solr'
+    # RSolr.direct_connect java_solr_core
+    # RSolr.direct_connect java_direct_solr_connection
+    def self.direct_connect *args, &blk
+      client = RSolr::Client.new(RSolr::Direct::Connection.new(*args), :url => false)
+      if block_given?
+        yield client
+        client.connection.close
+        nil
       else
-        # use the original connect method
-        super *args, &blk
+        client
       end
     end
-    
   end
   
-  RSolr.extend RSolr::Direct::Connectable
-  
   class Connection
     
-    include RSolr::Connection::Requestable
-    
     attr_accessor :opts
     
     class MissingRequiredJavaLibs < RuntimeError
+      def to_s
+        "#{self.class} => Try loading with RSolr::Direct.load_java_libs(\"/path/to/solr-distribution\")"
+      end
     end
     
     class InvalidSolrHome < RuntimeError
@@ -64,13 +56,11 @@ module RSolr::Direct
     # then...
     # required: opts[:solr_home] is absolute path to solr home (the directory with "data", "config" etc.)
     def initialize opts
-      
       begin
         org.apache.solr.servlet.DirectSolrConnection
       rescue NameError
         raise MissingRequiredJavaLibs
       end
-      
       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')
@@ -80,6 +70,7 @@ module RSolr::Direct
       elsif opts.class.to_s == "Java::OrgApacheSolrServlet::DirectSolrConnection"
         @direct = opts
       end
+      self.direct
     end
     
     # sets the @direct instance variable if it has not yet been set
@@ -87,34 +78,33 @@ module RSolr::Direct
       @direct ||= org.apache.solr.servlet.DirectSolrConnection.new(opts[:solr_home], @opts[:data_dir], nil)
     end
     
+    # rsolr.connection.open
+    alias_method :open, :direct
+    
     def close
       if @direct
         @direct.close
-        puts "CLOSING -> #{@direct}"
         @direct = nil
       end
     end
     
-    # send a request to the connection
-    # request '/select', :q=>'something'
-    # request '/update', :wt=>:xml, '</commit>'
-    def request(path, params={}, data=nil, opts={})
-      data = data.to_xml if data.respond_to?(:to_xml)
-      url = build_url(path, params)
+    # send a request to the connection (this is called by rsolr)
+    def execute client, request_context
+      #data = request_context[:data]
+      #data = data.to_xml if data.respond_to?(:to_xml)
+      url = [request_context[:path], request_context[:query]].join("?")
+      url = "/" + url unless url[0].chr == "/"
       begin
-        body = direct.request(url, data)
+        body = direct.request(url, request_context[:data])
       rescue
-        raise RSolr::RequestError.new($!.message)
+        $!.extend RSolr::Error::SolrContext
+        $!.request = request_context
+        raise $!
       end
       {
-        :status_code => 200,
-        :url=>url,
-        :body=>body,
-        :path=>path,
-        :params=>params,
-        :data=>data,
-        :headers => {},
-        :message => ''
+        :status => 200,
+        :body => body,
+        :headers => {}
       }
     end
     

data/spec/rsolr-direct_spec.rb

@@ -5,35 +5,35 @@ describe RSolr::Direct do
   context 'initialization' do
     
     it 'should modifiy RSolr' do
-      RSolr.should be_a(RSolr::Direct::Connectable)
+      RSolr.should respond_to(:direct_connect)
     end
     
     it 'should not change the default connect behavior' do
-      RSolr.connect.connection.should be_a(RSolr::Connection::NetHttp)
+      RSolr.connect.connection.should be_a(RSolr::Connection)
     end
     
     it 'should attempt to use a direct connect if :solr_home is set but raise a MissingRequiredJavaLibs' do
       lambda{
-        RSolr.connect(:direct, nil)
+        RSolr.direct_connect(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(:direct, :solr_home=>'')
+        RSolr.direct_connect(:solr_home=>'')
       }.should raise_error(RSolr::Direct::Connection::InvalidSolrHome)
     end
     
     it 'should create direct connection succesfully' do
       load_required_java_libs
-      RSolr.connect(:direct, :solr_home=>solr_home_dir).connection.should be_a(RSolr::Direct::Connection)
+      RSolr.direct_connect(: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(:direct, core)
+      rsolr = RSolr.direct_connect(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(:direct, dc)
+      rsolr = RSolr.direct_connect(dc)
       rsolr.should be_a(RSolr::Client)
       rsolr.connection.should be_a(RSolr::Direct::Connection)
       dc.close
@@ -55,9 +55,9 @@ describe RSolr::Direct do
     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))
+          RSolr.direct_connect(:solr_home=>solr_home_dir),
+          RSolr.direct_connect(new_solr_core(solr_home_dir, solr_data_dir)),
+          RSolr.direct_connect(new_direct_solr_connection(solr_home_dir, solr_data_dir))
         ]
       }
     end
@@ -79,7 +79,7 @@ describe RSolr::Direct do
     
     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.direct_connect(:solr_home => solr_home_dir) do |client|
         rsolr = client
         client.connection.direct # <- connect
         rsolr.connection.instance_variable_get("@direct").should_not be(nil)
@@ -95,7 +95,7 @@ describe RSolr::Direct do
     
     it '(they) should return a solr response hash when calling select' do
       connections.each do |rsolr|
-        response = rsolr.select(:q => '*:*')
+        response = rsolr.select(:params => {:q => '*:*'})
         response.should be_a(Hash)
         response.keys.should include("response", "responseHeader")
         rsolr.connection.close

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr-direct
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -05:00
+date: 2011-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rsolr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
 description: Provides a non-http connection to your solr/lucene index
 email: goodieboy@gmail.com
 executables: []
@@ -46,35 +59,6 @@ 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: []
@@ -88,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A JRuby, direct connection for RSolr
@@ -108,33 +94,4 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - Rakefile
-- 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
 - solr/example/solr/README.txt

data/solr/lib/solr-commons-csv-pom.xml.template

@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-parent</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-commons-csv</artifactId>
-  <name>Solr Specific Commons CSV</name>
-  <version>@maven_version@</version>
-  <description>Solr Specific Commons CSV</description>
-  <packaging>jar</packaging>
-</project>