rsolr 1.0.0 → 1.0.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 A simple, extensible Ruby client for Apache Solr.
 
-Notice: This document is only for the the 1.0 (pre-release) in the master branch. The last stable gem release documentation can be found here: http://github.com/mwmitchell/rsolr/tree/v0.12.1
+Notice: This document is only for the the 1.0 in the master. The last pre-1.0 gem release documentation can be found here: http://github.com/mwmitchell/rsolr/tree/v0.12.1
 
 ==Documentation
 The code docs can be viewed here : http://rdoc.info/projects/mwmitchell/rsolr

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/rsolr/client.rb

@@ -5,12 +5,14 @@ class RSolr::Client
   def initialize connection, options = {}
     @connection = connection
     unless false === options[:url]
-      url = options[:url] || 'http://127.0.0.1:8983/solr/'
+      url = options[:url] ? options[:url].dup : 'http://127.0.0.1:8983/solr/'
       url << "/" unless url[-1] == ?/
-      proxy_url = options[:proxy]
-      proxy_url << "/" unless proxy_url.nil? or proxy_url[-1] == ?/
       @uri = RSolr::Uri.create url
-      @proxy = RSolr::Uri.create proxy_url if proxy_url
+      if options[:proxy]
+        proxy_url = options[:proxy].dup
+        proxy_url << "/" unless proxy_url.nil? or proxy_url[-1] == ?/
+        @proxy = RSolr::Uri.create proxy_url if proxy_url
+      end
     end
     @options = options
     extend RSolr::Pagination::Client
@@ -223,7 +225,7 @@ class RSolr::Client
   end
   
   # evaluates the response[:body],
-  # attemps to bring the ruby string to life.
+  # attempts to bring the ruby string to life.
   # If a SyntaxError is raised, then
   # this method intercepts and raises a
   # RSolr::Error::InvalidRubyResponse
@@ -237,4 +239,4 @@ class RSolr::Client
     end
   end
   
-end
+end

data/lib/rsolr/connection.rb

@@ -61,7 +61,7 @@ class RSolr::Connection
     #       request_context[:path],
     #       :file => io)
     # else
-      raw_request = http_method.new request_context[:uri].to_s
+      raw_request = http_method.new request_context[:uri].request_uri
     # end
     raw_request.initialize_http_header headers
     raw_request

data/lib/rsolr/error.rb

@@ -25,6 +25,10 @@ module RSolr::Error
     def parse_solr_error_response body
       begin
         info = body.scan(/<pre>(.*)<\/pre>/mi)[0]
+        info = info.join if info.respond_to? :join
+
+        info ||= body  # body may not contain <pre> elements
+
         partial = info.to_s.split("\n")[0..10]
         partial.join("\n").gsub("&gt;", ">").gsub("&lt;", "<")
       rescue
@@ -110,4 +114,4 @@ module RSolr::Error
     
   end
   
-end
+end

data/lib/rsolr/pagination.rb

@@ -17,6 +17,7 @@ module RSolr::Pagination
     
     # A paginated request method.
     def paginate page, per_page, path, opts = nil
+      warn "DEPRECATION WARNING: RSolr::Pagination / pagination functionality will be removed in 1.1.0. It will instead be available in RSolr::Ext 1.1.0"
       request_context = build_paginated_request page, per_page, path, opts
       execute request_context
     end

data/lib/rsolr-direct.rb

@@ -0,0 +1,111 @@
+require 'java'
+require 'rubygems'
+require 'rsolr'
+
+#
+# Connection for JRuby + DirectSolrConnection
+#
+module RSolr::Direct
+  
+  # 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
+        client
+      end
+    end
+  end
+  
+  class Connection
+    
+    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
+      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')
+        @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
+      opts[:auto_connect] = true unless opts.key?(:auto_connect)
+      self.direct if opts[:auto_connect]
+    end
+    
+    # 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
+    
+    # rsolr.connection.open
+    alias_method :open, :direct
+    
+    def close
+      if @direct
+        @direct.close
+        @direct = nil
+      end
+    end
+    
+    # send a request to the connection
+    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, request_context[:data])
+      rescue
+        $!.extend RSolr::Error::SolrContext
+        $!.request = request_context
+        raise $!
+      end
+      {
+        :status => 200,
+        :body => body,
+        :headers => {}
+      }
+    end
+    
+  end
+  
+end

data/lib/rsolr.rb

@@ -13,7 +13,9 @@ module RSolr
   VERSION = self.version
   
   def self.connect *args
-    Client.new Connection.new, *args
+    driver = Class === args[0] ? args[0] : RSolr::Connection
+    opts = Hash === args[-1] ? args[-1] : {}
+    Client.new driver.new, opts
   end
   
   # RSolr.escape

data/spec/api/connection_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 describe "RSolr::Connection" do
   
-  # context "execute" do
-  #   c = RSolr::Connection.new
-  #   base_url = "http://localhost:8983/solr"
-  #   client = RSolr::Client.new c, :url => base_url
-  #   c.execute client, {:method => :get, :uri => URI.parse(base_url + "/select")}
-  # end
+  context "setup_raw_request" do
+    c = RSolr::Connection.new
+    base_url = "http://localhost:8983/solr"
+    client = RSolr::Client.new c, :url => base_url
+    req = c.send :setup_raw_request, {:headers => {"content-type" => "text/xml"}, :method => :get, :uri => URI.parse(base_url + "/select?q=*:*")}
+    req.path.should == "/solr/select?q=*:*"
+    headers = {}
+    req.each_header{|k,v| headers[k] = v}
+    headers.should == {"content-type"=>"text/xml"}
+  end
   
 end

data/spec/api/error_spec.rb

@@ -1,4 +1,56 @@
 require 'spec_helper'
 describe "RSolr::Error" do
-  
-end
+  def generate_error_with_backtrace(request, response)
+    raise RSolr::Error::Http.new request, response
+  rescue RSolr::Error::Http => exception
+    exception
+  end
+
+  context "when the response body is wrapped in a <pre> element" do
+    before do
+      response_lines = (1..15).to_a.map { |i| "line #{i}" }
+
+      @request  = mock :[] => "mocked"
+      @response = {
+        :body   => "<pre>" + response_lines.join("\n") + "</pre>",
+        :status => 400
+      }
+    end
+
+    it "only shows the first eleven lines of the response" do
+      error = generate_error_with_backtrace @request, @response
+      error.to_s.should match(/line 1\n.+line 11\n\n/m)
+    end
+
+    it "shows only one line when the response is one line long" do
+      @response[:body] = "<pre>failed</pre>"
+
+      error = generate_error_with_backtrace @request, @response
+      error.to_s.should match(/Error: failed/)
+    end
+  end
+
+  context "when the response body is not wrapped in a <pre> element" do
+    before do
+      response_lines = (1..15).to_a.map { |i| "line #{i}" }
+
+      @request  = mock :[] => "mocked"
+      @response = {
+        :body   => response_lines.join("\n"),
+        :status => 400
+      }
+    end
+
+    it "only shows the first eleven lines of the response" do
+      error = generate_error_with_backtrace @request, @response
+      error.to_s.should match(/line 1\n.+line 11\n\n/m)
+    end
+
+    it "shows only one line when the response is one line long" do
+      @response[:body] = "failed"
+
+      error = generate_error_with_backtrace @request, @response
+      error.to_s.should match(/Error: failed/)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'rsolr')
+require File.expand_path('../../lib/rsolr', __FILE__)

data/tasks/rdoc.rake

@@ -1,9 +1,11 @@
 # Rdoc
+require "rdoc/task"
+
 desc 'Generate documentation for the rsolr gem.'
-Rake::RDocTask.new(:doc) do |rdoc|
+RDoc::Task.new(:doc) do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title = 'RSolr'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/tasks/spec.rake

@@ -1,9 +1,6 @@
-gem 'rspec'
-
-# $stderr.puts `gem list`
-
-require 'spec'
-require 'spec/rake/spectask'
+require "rubygems"
+require 'rspec'
+require 'rspec/core/rake_task'
 
 namespace :spec do
   
@@ -20,23 +17,23 @@ namespace :spec do
   end
   
   desc 'run api specs (mock out Solr dependency)'
-  Spec::Rake::SpecTask.new(:api) do |t|
+  RSpec::Core::RakeTask.new(:api) do |t|
     
-    t.spec_files = [File.join('spec', 'spec_helper.rb')]
-    t.spec_files += FileList[File.join('spec', 'api', '**', '*_spec.rb')]
+    t.pattern = [File.join('spec', 'spec_helper.rb')]
+    t.pattern += FileList[File.join('spec', 'api', '**', '*_spec.rb')]
     
     t.verbose = true
-    t.spec_opts = ['--color']
+    t.rspec_opts = ['--color']
   end
   
   desc 'run integration specs'
-  Spec::Rake::SpecTask.new(:integration) do |t|
+  RSpec::Core::RakeTask.new(:integration) do |t|
     
-    t.spec_files = [File.join('spec', 'spec_helper.rb')]
-    t.spec_files += FileList[File.join('spec', 'integration', '**', '*_spec.rb')]
+    t.pattern = [File.join('spec', 'spec_helper.rb')]
+    t.pattern += FileList[File.join('spec', 'integration', '**', '*_spec.rb')]
     
     t.verbose = true
-    t.spec_opts = ['--color']
+    t.rspec_opts = ['--color']
   end
   
 end

metadata

@@ -1,29 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Matt Mitchell
+- Jeremy Hinegardner
+- Mat Brown
+- Mike Perham
+- Nathan Witmer
+- Peter Kieltyka
+- Randy Souza
+- shairon toledo
+- shima
+- Chris Beer
+- Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -05:00
+date: 2011-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -44,6 +57,7 @@ files:
 - LICENSE
 - README.rdoc
 - VERSION
+- lib/rsolr-direct.rb
 - lib/rsolr.rb
 - lib/rsolr/char.rb
 - lib/rsolr/client.rb
@@ -52,33 +66,49 @@ files:
 - lib/rsolr/pagination.rb
 - lib/rsolr/uri.rb
 - lib/rsolr/xml.rb
+- spec/api/char_spec.rb
+- spec/api/client_spec.rb
+- spec/api/connection_spec.rb
+- spec/api/error_spec.rb
+- spec/api/pagination_spec.rb
+- spec/api/rsolr_spec.rb
+- spec/api/uri_spec.rb
+- spec/api/xml_spec.rb
+- spec/spec_helper.rb
+- Rakefile
+- tasks/spec.rake
+- tasks/rdoc.rake
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby client for Apache Solr