rsolr 0.9.6 → 0.9.7.1

data/test/connection/direct_test.rb

@@ -12,7 +12,7 @@ if defined?(JRUBY_VERSION)
     
     def setup
       base = File.expand_path( File.dirname(__FILE__) )
-      @dist = File.join(base, '..', '..', 'apache-solr')
+      @dist = File.join(base, '..', '..', 'solr')
       @home = File.join(dist, 'example', 'solr')
       @solr = RSolr.connect(:direct, :home_dir=>@home, :dist_dir=>@dist)
       @solr.delete_by_query('*:*')
@@ -26,7 +26,7 @@ if defined?(JRUBY_VERSION)
     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::Connection::Adapter::Direct.new dc
+      adapter = RSolr::Connection::Direct.new dc
       s = RSolr::Connection::Base.new(adapter)
       assert_equal Hash, s.request('/admin/ping').class
       adapter.close

data/test/connection/{http_test.rb → net_http_test.rb}

@@ -3,12 +3,12 @@ unless defined?(JRUBY_VERSION)
   require 'helper'
   require 'connection/test_methods'
   
-  class AdapterHTTPTest < RSolrBaseTest
+  class NetHttpTest < RSolrBaseTest
   
     include ConnectionTestMethods
     
     def setup
-      @solr = RSolr.connect(:http)
+      @solr = RSolr.connect
       @solr.delete_by_query('*:*')
       @solr.commit
     end

data/test/{http_client/util_test.rb → connection/utils_test.rb}

@@ -3,7 +3,7 @@ require 'helper'
 class HTTPUtilTest < RSolrBaseTest
   
   class DummyClass
-    include RSolr::HTTPClient::Util
+    include RSolr::Connection::Utils
   end
   
   def setup

data/test/message_test.rb

@@ -1,7 +1,7 @@
 
 require 'helper'
 
-module MessageTestMethods
+class BuilderMessageTest < RSolrBaseTest
   
   def builder
     @builder ||= RSolr::Message::Builder.new
@@ -90,7 +90,7 @@ module MessageTestMethods
   
     message = self.builder.add(data)
     expected = '<add><doc><field name="id">1</field><field name="name">matt</field></doc><doc><field name="id">2</field><field name="name">sam</field></doc></add>'
-  
+    
     assert message.to_s=~/<field name="name">matt<\/field>/
     assert message.to_s=~/<field name="name">sam<\/field>/
   end
@@ -137,31 +137,4 @@ module MessageTestMethods
     assert result.to_s =~ /<field name="name">matt2<\/field>/
   end
   
-end
-
-#####
-
-unless defined?(JRUBY_VERSION)
-  class LibxmlMessageTest < RSolrBaseTest
-  
-    include MessageTestMethods
-  
-    def setup
-      self.builder.adapter = RSolr::Message::Adapter::Libxml.new
-    end
-  
-  end
-end
-
-
-#####
-
-class BuilderMessageTest < RSolrBaseTest
-  
-  include MessageTestMethods
-  
-  def setup
-    self.builder.adapter = RSolr::Message::Adapter::Builder.new
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7.1
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -04:00
+date: 2009-11-05 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.2
-    version: 
+dependencies: []
+
 description: RSolr is a Ruby gem for working with Apache Solr!
 email: goodieboy@gmail.com
 executables: []
@@ -34,22 +25,17 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGES.txt
 files: 
-- examples/http.rb
 - examples/direct.rb
-- lib/rsolr.rb
-- lib/rsolr/connection/adapter/direct.rb
-- lib/rsolr/connection/adapter/http.rb
+- examples/http.rb
+- lib/rsolr/connection/direct.rb
+- lib/rsolr/connection/net_http.rb
 - lib/rsolr/connection.rb
-- lib/rsolr/http_client/adapter/curb.rb
-- lib/rsolr/http_client/adapter/net_http.rb
-- lib/rsolr/http_client.rb
-- lib/rsolr/message/adapter/builder.rb
-- lib/rsolr/message/adapter/libxml.rb
 - lib/rsolr/message.rb
+- lib/rsolr.rb
+- lib/xout.rb
 - LICENSE
 - Rakefile
 - README.rdoc
-- rsolr.gemspec
 - CHANGES.txt
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr
@@ -75,18 +61,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Ruby client for Apache Solr
 test_files: 
 - test/connection/direct_test.rb
-- test/connection/http_test.rb
+- test/connection/net_http_test.rb
 - test/connection/test_methods.rb
+- test/connection/utils_test.rb
 - test/helper.rb
-- test/http_client/curb_test.rb
-- test/http_client/net_http_test.rb
-- test/http_client/test_methods.rb
-- test/http_client/util_test.rb
 - test/message_test.rb
 - test/rsolr_test.rb

data/lib/rsolr/connection/adapter/http.rb

@@ -1,42 +0,0 @@
-#
-# Connection for standard HTTP Solr server
-#
-class RSolr::Connection::Adapter::HTTP
-  
-  include RSolr::HTTPClient::Util
-  
-  attr_reader :opts
-  
-  # opts can have:
-  #   :url => 'http://localhost:8080/solr'
-  def initialize(opts={}, &block)
-    opts[:url] ||= 'http://127.0.0.1:8983/solr'
-    @opts = opts
-  end
-  
-  def connection
-    @connection ||= RSolr::HTTPClient.connect(@opts)
-  end
-  
-  # send a request to the connection
-  # request '/update', :wt=>:xml, '</commit>'
-  def request(path, params={}, *extra)
-    opts = extra[-1].kind_of?(Hash) ? extra.pop : {}
-    data = extra[0]
-    # force a POST, use the query string as the POST body
-    if opts[:method] == :post and data.to_s.empty?
-      http_context = connection.post(path, hash_to_query(params), {}, {'Content-Type' => 'application/x-www-form-urlencoded'})
-    else
-      if data
-        # standard POST, using "data" as the POST body
-        http_context = connection.post(path, data, params, {"Content-Type" => 'text/xml; charset=utf-8'})
-      else
-        # standard GET
-        http_context = connection.get(path, params)
-      end
-    end
-    raise RSolr::RequestError.new(http_context[:body]) unless http_context[:status_code] == 200
-    http_context
-  end
-  
-end

data/lib/rsolr/http_client/adapter/curb.rb

@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'curb'
-
-class RSolr::HTTPClient::Adapter::Curb
-  
-  include RSolr::HTTPClient::Util
-  
-  attr :uri
-  attr :connection
-  
-  def initialize(opts={})
-    @uri = URI.parse(opts[:url])
-    @connection = ::Curl::Easy.new
-  end
-  
-  def get(path, params={})
-    @connection.url = _build_url(path, params)
-    @connection.multipart_form_post = false
-    @connection.perform
-    create_http_context(path, params)
-  end
-  
-  def post(path, data, params={}, headers={})
-    @connection.url = _build_url(path, params)
-    @connection.headers = headers
-    @connection.http_post(data)
-    create_http_context(path, params, data, headers)
-  end
-  
-  protected
-  
-  def create_http_context(path, params, data=nil, headers={})
-    {
-      :status_code=>@connection.response_code.to_i,
-      :url=>@connection.url,
-      :body=>@connection.body_str,
-      :path=>path,
-      :params=>params,
-      :data=>data,
-      :headers=>headers
-    }
-  end
-  
-  def _build_url(path, params={})
-    url = @uri.scheme + '://' + @uri.host
-    url += ':' + @uri.port.to_s if @uri.port
-    url += @uri.path + path
-    build_url(url, params, @uri.query) # build_url is coming from RSolr::HTTPClient::Util
-  end
-  
-end

data/lib/rsolr/http_client/adapter/net_http.rb

@@ -1,48 +0,0 @@
-require 'net/http'
-
-class RSolr::HTTPClient::Adapter::NetHTTP
-  
-  include RSolr::HTTPClient::Util
-  
-  attr :uri
-  attr :connection
-  
-  def initialize(opts={})
-    @uri = URI.parse(opts[:url])
-    @connection = Net::HTTP.new(@uri.host, @uri.port)
-  end
-  
-  def get(path, params={})
-    url = _build_url(path, params)
-    net_http_response = @connection.get(url)
-    create_http_context(net_http_response, url, path, params)
-  end
-  
-  def post(path, data, params={}, headers={})
-    url = _build_url(path, params)
-    net_http_response = @connection.post(url, data, headers)
-    create_http_context(net_http_response, url, path, params, data, headers)
-  end
-  
-  protected
-  
-  def create_http_context(net_http_response, url, path, params, data=nil, headers={})
-    full_url = "#{@uri.scheme}://#{@uri.host}"
-    full_url += @uri.port ? ":#{@uri.port}" : ''
-    full_url += url
-    {
-      :status_code=>net_http_response.code.to_i,
-      :url=>full_url,
-      :body=>net_http_response.body,
-      :path=>path,
-      :params=>params,
-      :data=>data,
-      :headers=>headers
-    }
-  end
-  
-  def _build_url(path, params={})
-    build_url(@uri.path + path, params, @uri.query) # build_url is coming from RSolr::HTTPClient::Util
-  end
-  
-end

data/lib/rsolr/http_client.rb

@@ -1,149 +0,0 @@
-# A simple wrapper for different http client implementations.
-# Supports #get and #post
-# This was motivated by: http://apocryph.org/2008/11/09/more_indepth_analysis_ruby_http_client_performance/
-
-# Each adapters' response should be a hash with the following keys:
-#   :status_code
-#   :url
-#   :body
-#   :path
-#   :params
-#   :data
-#   :headers
-
-# Example:
-#   hclient = RSolr::HTTPClient.connect('http://www.google.com')
-#   # SAME AS
-#   hclient = RSolr::HTTPClient.connect(:net_http, 'http://www.google.com')
-#   hclient = RSolr::HTTPClient.connect(:curb, 'http://www.google.com')
-#   response = hclient.get('/search', :hl=>:en, :q=>:ruby, :btnG=>:Search)
-#   puts response[:status_code]
-#   puts response[:body]
-
-require 'uri'
-
-module RSolr::HTTPClient
-  
-  module Adapter
-    autoload :Curb, 'rsolr/http_client/adapter/curb'
-    autoload :NetHTTP, 'rsolr/http_client/adapter/net_http'
-  end
-  
-  class UnkownAdapterError < RuntimeError
-  end
-  
-  class Base
-
-    attr_reader :adapter
-  
-    # requires an instace of RSolr::HTTPClient::*
-    def initialize(adapter)
-      @adapter = adapter
-    end
-  
-    # sends a GET reqest to the "path" variable
-    # an optional hash of "params" can be used,
-    # which is later transformed into a GET query string
-    def get(path, params={})
-      begin
-        http_context = @adapter.get(path, params)
-      rescue
-        raise RSolr::RequestError.new($!)
-      end
-      http_context
-    end
-  
-    # sends a POST request to the "path" variable
-    # "data" is required, and must be a string
-    # "params" is an optional hash for query string params...
-    # "headers" is a hash for setting request header values.
-    def post(path, data, params={}, headers={})
-      begin
-        http_context = @adapter.post(path, data, params, headers)
-      rescue
-        raise RSolr::RequestError.new($!)
-      end
-      http_context
-    end
-    
-  end
-  
-  # Factory for creating connections.
-  # Can specify the connection type by
-  # using :net_http or :curb for the first argument.
-  # The ending arguments are always used for the connection adapter instance.
-  #
-  # Examples:
-  # # default net_http connection
-  # RSolr::HTTPClient.connect :url=>''
-  # # SAME AS
-  # RSolr::HTTPClient.connect :net_http, :url=>''
-  # # curb connection
-  # RSolr.connect :curb, :url=>''
-  def self.connect(*args)
-    type = args.first.is_a?(Symbol) ? args.shift : :net_http
-    opts = args
-    klass = case type
-    when :net_http,nil
-      'NetHTTP'
-    when :curb
-      'Curb'
-    else
-      raise UnkownAdapterError.new("Invalid adapter type: #{type} - use :curb or :net_http or blank for :net_http/default")
-    end
-    begin
-      Base.new Adapter.const_get(klass).new(*args)
-    end
-  end
-  
-  module Util
-    
-    # Performs URI escaping so that you can construct proper
-    # query strings faster.  Use this rather than the cgi.rb
-    # version since it's faster.  (Stolen from Rack).
-    def escape(s)
-      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-        '%'+$1.unpack('H2'*$1.size).join('%').upcase
-      }.tr(' ', '+')
-    end
-    
-    # creates and returns a url as a string
-    # "url" is the base url
-    # "params" is an optional hash of GET style query params
-    # "string_query" is an extra query string that will be appended to the 
-    # result of "url" and "params".
-    def build_url(url='', params={}, string_query='')
-      queries = [string_query, hash_to_query(params)]
-      queries.delete_if{|i| i.to_s.empty?}
-      url += "?#{queries.join('&')}" unless queries.empty?
-      url
-    end
-    
-    # converts a key value pair to an escaped string:
-    # Example:
-    # build_param(:id, 1) == "id=1"
-    def build_param(k,v)
-      "#{escape(k)}=#{escape(v)}"
-    end
-    
-    #
-    # converts hash into URL query string, keys get an alpha sort
-    # if a value is an array, the array values get mapped to the same key:
-    #   hash_to_query(:q=>'blah', :fq=>['blah', 'blah'], :facet=>{:field=>['location_facet', 'format_facet']})
-    # returns:
-    #   ?q=blah&fq=blah&fq=blah&facet.field=location_facet&facet.field=format.facet
-    #
-    # if a value is empty/nil etc., the key is not added
-    def hash_to_query(params)
-      params.map { |k, v|
-        if v.class == Array
-          hash_to_query(v.map { |x| [k, x] })
-        else
-          build_param k, v
-        end
-      }.join("&")
-    end
-    
-  end
-  
-end

data/lib/rsolr/message/adapter/builder.rb

@@ -1,85 +0,0 @@
-require 'builder'
-
-class RSolr::Message::Adapter::Builder
-  
-  # shortcut method -> xml = RSolr::Message.xml
-  def xml
-    ::Builder::XmlMarkup.new
-  end
-
-  # generates "add" xml for updating solr
-  # "data" can be a hash or an array of hashes.
-  # - each hash should be a simple key=>value pair representing a solr doc.
-  # If a value is an array, multiple fields will be created.
-  #
-  # "add_attrs" can be a hash for setting the add xml element attributes.
-  # 
-  # This method can also accept a block.
-  # The value yielded to the block is a Message::Document; for each solr doc in "data".
-  # You can set xml element attributes for each "doc" element or individual "field" elements.
-  #
-  # For example:
-  #
-  # solr.add({:id=>1, :nickname=>'Tim'}, {:boost=>5.0, :commitWithin=>1.0}) do |doc_msg|
-  #   doc_msg.attrs[:boost] = 10.00 # boost the document
-  #   nickname = doc_msg.field_by_name(:nickname)
-  #   nickname.attrs[:boost] = 20 if nickname.value=='Tim' # boost a field
-  # end
-  #
-  # would result in an add element having the attributes boost="10.0"
-  # and a commitWithin="1.0".
-  # Each doc element would have a boost="10.0".
-  # The "nickname" field would have a boost="20.0"
-  # if the doc had a "nickname" field with the value of "Tim".
-  #
-  def add(documents, add_attrs={})
-    xml.add(add_attrs) do |add_node|
-      documents.each do |doc|
-        # create doc, passing in fields
-        add_node.doc(doc.attrs) do |doc_node|
-          doc.fields.each do |field_obj|
-            doc_node.field(field_obj.value, field_obj.attrs)
-          end
-        end
-      end
-    end
-  end
-
-  # generates a <commit/> message
-  def commit(opts={})
-    xml.commit(opts)
-  end
-
-  # generates a <optimize/> message
-  def optimize(opts={})
-    xml.optimize(opts)
-  end
-
-  # generates a <rollback/> message
-  def rollback
-    xml.rollback
-  end
-
-  # generates a <delete><id>ID</id></delete> message
-  # "ids" can be a single value or array of values
-  def delete_by_id(ids)
-    ids = [ids] unless ids.is_a?(Array)
-    xml.delete do |xml|
-      ids.each do |id|
-        xml.id(id)
-      end
-    end
-  end
-
-  # generates a <delete><query>ID</query></delete> message
-  # "queries" can be a single value or an array of values
-  def delete_by_query(queries)
-    queries = [queries] unless queries.is_a?(Array)
-    xml.delete do |xml|
-      queries.each do |query|
-        xml.query(query)
-      end
-    end
-  end
-
-end

data/lib/rsolr/message/adapter/libxml.rb

@@ -1,59 +0,0 @@
-require 'libxml'
-
-class RSolr::Message::Adapter::Libxml
-  
-  def add(documents, attributes = {})
-    add_node = new_node('add', attributes)
-    for document in documents
-      add_node << doc_node = new_node('doc', document.attrs)
-      for field in document.fields
-        doc_node << field_node = new_node('field', field.attrs)
-        field_node << field.value
-      end
-    end
-    add_node.to_s(:indent => false)
-  end
-
-  def delete_by_id(ids)
-    delete = new_node('delete')
-    for id in Array(ids)
-      id_node = new_node('id')
-      id_node << id
-      delete << id_node
-    end
-    delete.to_s(:indent => false)
-  end
-
-  def delete_by_query(queries)
-    delete = new_node('delete')
-    for query in Array(queries)
-      query_node = new_node('query')
-      query_node << query
-      delete << query_node
-    end
-    delete.to_s(:indent => false)
-  end
-
-  def optimize(opts)
-    new_node('optimize', opts).to_s
-  end
-
-  def rollback
-    new_node('rollback').to_s
-  end
-
-  def commit(opts = {})
-    new_node('commit', opts).to_s
-  end
-
-  private
-
-  def new_node(name, opts = {})
-    node = LibXML::XML::Node.new(name)
-    opts.each_pair do |attr, value|
-      node[attr.to_s] = value.to_s
-    end
-    node
-  end
-  
-end

data/rsolr.gemspec

@@ -1,46 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = "rsolr"
-  s.version = "0.9.6"
-  s.date = "2009-09-12"
-  s.summary = "A Ruby client for Apache Solr"
-  s.email = "goodieboy@gmail.com"
-  s.homepage = "http://github.com/mwmitchell/rsolr"
-  s.description = "RSolr is a Ruby gem for working with Apache Solr!"
-  s.has_rdoc = true
-  s.authors = ["Matt Mitchell"]
-  
-  s.files = [
-    "examples/http.rb",
-    "examples/direct.rb",
-    "lib/rsolr.rb",
-    "lib/rsolr/connection/adapter/direct.rb",
-    "lib/rsolr/connection/adapter/http.rb",
-    "lib/rsolr/connection.rb",
-    "lib/rsolr/http_client/adapter/curb.rb",
-    "lib/rsolr/http_client/adapter/net_http.rb",
-    "lib/rsolr/http_client.rb",
-    "lib/rsolr/message/adapter/builder.rb",
-    "lib/rsolr/message/adapter/libxml.rb",
-    "lib/rsolr/message.rb",
-    "LICENSE",
-    "Rakefile",
-    "README.rdoc",
-    "rsolr.gemspec",
-    "CHANGES.txt"
-  ]
-  s.test_files = [
-    "test/connection/direct_test.rb",
-    "test/connection/http_test.rb",
-    "test/connection/test_methods.rb",
-    "test/helper.rb",
-    "test/http_client/curb_test.rb",
-    "test/http_client/net_http_test.rb",
-    "test/http_client/test_methods.rb",
-    "test/http_client/util_test.rb",
-    "test/message_test.rb",
-    "test/rsolr_test.rb"
-  ]
-  #s.rdoc_options = ["--main", "README.rdoc"]
-  s.extra_rdoc_files = %w(LICENSE Rakefile README.rdoc CHANGES.txt)
-  s.add_dependency("builder", [">= 2.1.2"])
-end

data/test/http_client/curb_test.rb

@@ -1,18 +0,0 @@
-# don't run this test in jruby,
-# the curb gem is a c extension based gem, jruby has no support for this
-unless defined?(JRUBY_VERSION)
-
-  require 'helper'
-  require 'http_client/test_methods'
-
-  class CurbTest < RSolrBaseTest
-  
-    def setup
-      @c ||= RSolr::HTTPClient::connect(:curb, :url=>URL)
-    end
-  
-    include HTTPClientTestMethods
-  
-  end
-  
-end

data/test/http_client/net_http_test.rb

@@ -1,12 +0,0 @@
-require 'helper'
-require 'http_client/test_methods'
-
-class NetHTTPTest < RSolrBaseTest
-  
-  def setup
-    @c ||= RSolr::HTTPClient::connect(:url=>URL)
-  end
-  
-  include HTTPClientTestMethods
-  
-end