mwmitchell-rsolr 0.8.1 → 0.8.2

data/CHANGES.txt

@@ -1,3 +1,9 @@
+0.8.2 - March 24, 2009
+  Changed RSolr.connect method to accept one options hash argument
+    - This hash gets passed to the Connection object and the adapter
+  Updated tests, examples and README.rdoc to reflect this change
+  Bumped the version up in gemspec and the RSolr module
+
 0.8.1 - March 12, 2009
   Added RSolr.escape and RSolr::Connection.new.escape
     - tests in rsolr_test

data/README.rdoc

@@ -13,10 +13,10 @@ http://groups.google.com/group/rsolr
   require 'rubygems'
   require 'rsolr'
   rsolr = RSolr.connect
-  response = rsolr.select(:q=>'*:*') # becomes /solr/select?q=*:*
+  response = rsolr.select(:q=>'*:*') # sends a request to /solr/select?q=*:*
   
   # can also set the request handler path like:
-  response = rsolr.send_request('/catalog', :q=>'*:*') # becomes /solr/catalog?q=*:*
+  response = rsolr.send_request('/catalog', :q=>'*:*') # sends a request to /solr/catalog?q=*:*
 
 To run tests:
   
@@ -29,10 +29,17 @@ To get a connection in MRI/standard Ruby:
   
   solr = RSolr.connect
 
-To get a direct connection (no http) in jRuby using DirectSolrConnection:
+To change the Solr HTTP host:
   
-  solr = RSolr.connect({:adapter=>:direct}, {:home_dir=>'/path/to/solr/home', :dist_dir=>'/path/to/solr/distribution'})
+  solr = RSolr.connect(:url=>'http://solrserver.com')
 
+To get a direct connection (no http) in jRuby using DirectSolrConnection:
+  
+  solr = RSolr.connect({
+    :adapter=>:direct,
+    :home_dir=>'/path/to/solr/home',
+    :dist_dir=>'/path/to/solr/distribution'
+  )
 
 == Requests
 Once you have a connection, you can execute queries, updates etc..

data/examples/direct.rb

@@ -5,9 +5,14 @@ base = File.expand_path( File.dirname(__FILE__) )
 dist = File.join(base, '..', 'apache-solr')
 home = File.join(dist, 'example', 'solr')
 
-solr = RSolr.connect({:adapter=>:direct}, {:home_dir=>home, :dist_dir=>dist})
+solr = RSolr.connect(:adapter=>:direct, :home_dir=>home, :dist_dir=>dist)
 
-`cd ../apache-solr/example/exampledocs && ./post.sh ./*.xml`
+Dir['../apache-solr/example/exampledocs/*.xml'].each do |xml_file|
+  puts "Updating with #{xml_file}"
+  solr.update File.read(xml_file)
+end
+
+puts
 
 response = solr.select :q=>'ipod', :fq=>'price:[0 TO 50]', :rows=>2, :start=>0
 

data/examples/http.rb

@@ -3,9 +3,14 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'rsolr')
 solr = RSolr.connect
 
 # switch out the http adapter from curb to net_http (just for an example)
-solr.adapter.connector.adapter_name = :net_http
+solr.adapter.connector.adapter_name = :curb
 
-`cd ../apache-solr/example/exampledocs && ./post.sh ./*.xml`
+Dir['../apache-solr/example/exampledocs/*.xml'].each do |xml_file|
+  puts "Updating with #{xml_file}"
+  solr.update File.read(xml_file)
+end
+
+puts
 
 solr.select(:q=>'ipod', :fq=>'price:[0 TO 50]', :rows=>2, :start=>0) do |solr_response,adapter_response|
   puts "URL : #{adapter_response[:url]}"

data/lib/rsolr.rb

@@ -7,7 +7,7 @@ proc {|base, files|
 
 module RSolr
   
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
   
   autoload :Message, 'rsolr/message'
   autoload :Connection, 'rsolr/connection'
@@ -15,18 +15,17 @@ module RSolr
   autoload :HTTPClient, 'rsolr/http_client'
   
   # factory for creating connections
-  # connection_opts[:adapter] is either :http or :direct
-  # connection_opts are sent to the connection instance
-  # adapter_opts are passed to the actually adapter instance
-  def self.connect(connection_opts={}, adapter_opts={})
-    adapter_name = connection_opts[:adapter] ||= :http
+  # "options" is a hash that gets used by the Connection
+  # object AND the adapter object.
+  def self.connect(options={})
+    adapter_name = options[:adapter] ||= :http
     types = {
       :http=>'HTTP',
       :direct=>'Direct'
     }
     adapter_class = RSolr::Adapter.const_get(types[adapter_name])
-    adapter = adapter_class.new(adapter_opts)
-    RSolr::Connection.new(adapter, connection_opts)
+    adapter = adapter_class.new(options)
+    RSolr::Connection.new(adapter, options)
   end
   
   module Char

data/test/connection/direct_test.rb

@@ -11,7 +11,7 @@ if defined?(JRUBY_VERSION)
       base = File.expand_path( File.dirname(__FILE__) )
       dist = File.join(base, '..', '..', 'apache-solr')
       home = File.join(dist, 'example', 'solr')
-      @solr = RSolr.connect({:adapter=>:direct}, {:home_dir=>home, :dist_dir=>dist})
+      @solr = RSolr.connect(:adapter=>:direct, :home_dir=>home, :dist_dir=>dist)
       @solr.delete_by_query('*:*')
       @solr.commit
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-12 00:00:00 -07:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency