rsolr-direct 0.0.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Matt Mitchell
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,44 @@
+= rsolr-direct
+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...
+
+==Using :solr_home
+  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'
+
+==Using a Java::OrgApacheSolrCore::SolrCore instance
+  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
+
+==Using a 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
+
+= Why
+Using a direct connection to Solr can speed up indexing. How much faster? I have no idea yet. Numbers to come?
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2010 Matt Mitchell. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "rsolr-direct"
+    gem.summary = %Q{A JRuby, direct connection for RSolr}
+    gem.description = %Q{Provides a non-http connection to your solr/lucene index}
+    gem.email = "goodieboy@gmail.com"
+    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.files = FileList['lib/**/*.rb', 'LICENSE', 'README.rdoc', 'VERSION']
+    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
+  end
+  # Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rsolr-direct #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.0

data/lib/rsolr-direct.rb

@@ -0,0 +1,113 @@
+#require 'java'
+require 'rubygems'
+require 'rsolr'
+
+#
+# Connection for JRuby + DirectSolrConnection
+#
+module RSolr::Direct
+  
+  module Connectable
+    
+    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 block_given?
+          yield client
+          client.connection.close
+          nil
+        else
+          client
+        end
+      else
+        # use the original connect method
+        super *args, &blk
+      end
+    end
+    
+  end
+  
+  RSolr.extend RSolr::Direct::Connectable
+  
+  class Connection
+    
+    include RSolr::Connection::Requestable
+    
+    attr_accessor :opts
+    
+    class MissingRequiredJavaLibs < RuntimeError
+    end
+    
+    class InvalidSolrHome < RuntimeError
+    end
+    
+    # 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[:solr_home] is absolute path to solr home (the directory with "data", "config" etc.)
+    def initialize opts
+      opts ||= {}
+      
+      begin
+        org.apache.solr.servlet.DirectSolrConnection
+      rescue NameError
+        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] ||= ''
+        raise InvalidSolrHome unless File.exists?(opts[:solr_home])
+        opts[:data_dir] ||= File.join(opts[:solr_home], 'data')
+        @opts = 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)
+      )
+    end
+    
+    def close
+      if @connection
+        @connection.close
+        @connection=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)
+      begin
+        body = connection.request(url, data)
+      rescue
+        raise RSolr::RequestError.new($!.message)
+      end
+      {
+        :status_code => 200,
+        :url=>url,
+        :body=>body,
+        :path=>path,
+        :params=>params,
+        :data=>data,
+        :headers => {},
+        :message => ''
+      }
+    end
+    
+  end
+  
+end

data/solr/example/solr/README.txt

@@ -0,0 +1,54 @@
+# 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.
+
+
+Example "Solr Home" Directory
+=============================
+
+This directory is provided as an example of what a "Solr Home" directory
+should look like.
+
+It's not strictly necessary that you copy all of the files in this
+directory when setting up a new instance of Solr, but it is recommended.
+
+
+Basic Directory Structure
+-------------------------
+
+The Solr Home directory typically contains the following subdirectories...
+
+   conf/
+        This directory is mandatory and must contain your solrconfig.xml
+        and schema.xml.  Any other optional configuration files would also 
+        be kept here.
+
+   data/
+        This directory is the default location where Solr will keep your
+        index, and is used by the replication scripts for dealing with
+        snapshots.  You can override this location in the solrconfig.xml
+        and scripts.conf files. Solr will create this directory if it
+        does not already exist.
+
+   lib/
+        This directory is optional.  If it exists, Solr will load any Jars
+        found in this directory and use them to resolve any "plugins"
+        specified in your solrconfig.xml or schema.xml (ie: Analyzers,
+        Request Handlers, etc...).  Alternatively you can use the <lib>
+        syntax in solrconfig.xml to direct Solr to your plugins.  See the
+        example solrconfig.xml file for details.
+
+   bin/
+        This directory is optional.  It is the default location used for
+        keeping the replication scripts.

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

@@ -0,0 +1,36 @@
+<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>

data/spec/rsolr-direct_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe RSolr::Direct do
+  
+  context 'initialization' do
+    
+    it 'should modifiy RSolr' do
+      RSolr.should be_a(RSolr::Direct::Connectable)
+    end
+    
+    it 'should not change the default connect behavior' do
+      RSolr.connect.connection.should be_a(RSolr::Connection::NetHttp)
+    end
+    
+    it 'should attempt to use a direct connect if :solr_home is set but raise a MissingRequiredJavaLibs' do
+      lambda{
+        RSolr.connect(:solr_home=>'')
+      }.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=>'')
+      }.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)
+    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.should be_a(RSolr::Client)
+      rsolr.connection.should be_a(RSolr::Direct::Connection)
+      core.close
+    end
+    
+    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.should be_a(RSolr::Client)
+      rsolr.connection.should be_a(RSolr::Direct::Connection)
+      dc.close
+    end
+    
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,69 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rsolr-direct'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+  # returns true/false depending on whether or not JRuby is running
+  def jruby?; defined?(JRUBY_VERSION) end
+  
+  # returns absolute path to solr distribution dir
+  def solr_dist_dir
+    File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
+  end
+  
+  # returns absolute path to solr home dir
+  def solr_home_dir
+    File.expand_path(File.join(solr_dist_dir, 'example', 'solr'))
+  end
+  
+  # returns absolute path to solr data dir
+  def solr_data_dir
+    File.expand_path(File.join(solr_home_dir, 'data'))
+  end
+  
+  def load_required_java_libs
+    # $stderr.puts "Loading jar files from #{solr_dist_dir}..."
+    ['lib', 'dist'].each do |sub|
+      Dir[File.join(solr_dist_dir, sub, '*.jar')].each do |jar|
+        # $stderr.puts "Loading #{jar}"
+        require jar
+      end
+    end
+  end
+  
+  def new_direct_solr_connection solr_home_path, solr_data_path
+    org.apache.solr.servlet.DirectSolrConnection.new(solr_home_path, solr_data_path, nil)
+  end
+  
+  # creates a new SolrCore
+  def new_solr_core solr_home_path, solr_data_path
+
+    import org.apache.solr.core.SolrResourceLoader
+    import org.apache.solr.core.CoreContainer
+    import org.apache.solr.core.SolrConfig
+    import org.apache.solr.core.CoreDescriptor
+    import org.apache.solr.schema.IndexSchema
+    import org.apache.solr.core.SolrCore
+
+    config_file = SolrConfig::DEFAULT_CONF_FILE
+
+    resource_loader = SolrResourceLoader.new(solr_home_path)
+    cores = CoreContainer.new(resource_loader)
+
+    solr_config = SolrConfig.new(solr_home_path, config_file, nil)
+
+    dcore = CoreDescriptor.new(cores, "", solr_config.getResourceLoader().getInstanceDir())
+
+    index_schema = IndexSchema.new(solr_config, "#{solr_home_dir}/conf/schema.xml", nil)
+
+    core = SolrCore.new( nil, solr_data_path, solr_config, index_schema, dcore)
+
+    cores.register("", core, false)
+
+    core
+  end
+  
+end

metadata

@@ -0,0 +1,111 @@
+--- !ruby/object:Gem::Specification 
+name: rsolr-direct
+version: !ruby/object:Gem::Version 
+  version: 0.0.0
+platform: ruby
+authors: 
+- Matt Mitchell
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-02-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rsolr
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.1
+    version: 
+description: Provides a non-http connection to your solr/lucene index
+email: goodieboy@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- LICENSE
+- README.rdoc
+- VERSION
+- lib/rsolr-direct.rb
+has_rdoc: true
+homepage: http://github.com/mwmitchell/rsolr-direct
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: A JRuby, direct connection for RSolr
+test_files: 
+- spec/rsolr-direct_spec.rb
+- 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