mwmitchell-rsolr 0.6.4 → 0.6.5

data/CHANGES.txt

@@ -1,3 +1,14 @@
+0.6.5 - January 26, 2009
+	Removed to_mash everywhere, except for usage in RSolr::Response
+	Added a #close method to the Direct adapter
+		- this closes the connection and sets the @connection variable to nil
+	Removed to_mash in RSolr::Connection::Base
+	Changed RSolr::Response::Query::Doc to DocExt
+		- this no longer extends Mash
+		- each doc in the response now uses the #extend method to mixin the new DocExt module
+	Added #teardown method in direct connection test, this method closes the connection
+	Updated the connection test methods a bit
+
 0.6.4 - January 26, 2009
 	Updated the mapping output for the :filters and :phrase_filters (when using the #search method)
 		- now sending multiple fq's instead of one

data/examples/direct.rb

@@ -5,7 +5,7 @@ base = File.expand_path( File.dirname(__FILE__) )
 dist = File.join(base, '..', 'apache-solr')
 home = File.join(dist, 'example', 'solr')
 
-solr = RSolr.connect(: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`
 

data/examples/http.rb

@@ -1,7 +1,7 @@
 # Must be executed using jruby
 require File.join(File.dirname(__FILE__), '..', 'lib', 'rsolr')
 
-solr = RSolr.connect(:http)
+solr = RSolr.connect
 
 `cd ../apache-solr/example/exampledocs && ./post.sh ./*.xml`
 

data/lib/mash.rb

@@ -1,6 +1,5 @@
-
-# From the ExtLib gem library: http://github.com/sam/extlib/tree/master
-
+# This class has dubious semantics and we only have it so that people can write
+# params[:key] instead of params['key'].
 class Mash < Hash
 
   # @param constructor<Object>

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

@@ -23,7 +23,7 @@ class RSolr::Connection::Adapter::Direct
   def initialize(opts, &block)
     @home_dir = opts[:home_dir].to_s
     opts[:data_dir] ||= File.join(@home_dir, 'data')
-    if opts[:dist_dir]
+    if opts[:dist_dir] and ! opts[:jar_paths]
       # add the standard lib and dist directories to the :jar_paths
       opts[:jar_paths] = [File.join(opts[:dist_dir], 'lib'), File.join(opts[:dist_dir], 'dist')]
     end
@@ -40,6 +40,13 @@ class RSolr::Connection::Adapter::Direct
     )
   end
   
+  def close
+    if @connection
+      @connection.close
+      @connection=nil
+    end
+  end
+  
   # send a request to the connection
   # request '/update', :wt=>:xml, '</commit>'
   def send_request(path, params={}, data=nil)

data/lib/rsolr/connection/base.rb

@@ -29,7 +29,7 @@ class RSolr::Connection::Base
   # sets default params etc.. - could be used as a mapping hook
   # type of request should be passed in here? -> map_params(:query, {})
   def map_params(params)
-    {}.merge(@opts[:global_params]).merge(params).to_mash
+    {}.merge(@opts[:global_params]).merge(params)
   end
   
   # send request (no param mapping) to the select handler

data/lib/rsolr/response/query.rb

@@ -2,7 +2,7 @@
 module RSolr::Response::Query
   
   # module for adding helper methods to each Hash document
-  class Doc < Mash
+  module DocExt
     
     # Helper method to check if value/multi-values exist for a given key.
     # The value can be a string, or a RegExp
@@ -149,7 +149,7 @@ module RSolr::Response::Query
     def initialize(data)
       super(data)
       @response = @data[:response]
-      @docs = @response[:docs].collect{ |d| Doc.new(d) }
+      @docs = @response[:docs].collect{ |d| d=d.to_mash; d.extend(DocExt); d }
       @num_found = @response[:numFound]
       @start = @response[:start]
     end

data/lib/rsolr.rb

@@ -7,7 +7,7 @@ proc {|base, files|
 
 module RSolr
   
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
   
   autoload :Message, 'rsolr/message'
   autoload :Response, 'rsolr/response'
@@ -20,7 +20,6 @@ module RSolr
   # opts are sent to the adapter instance (:url for http, :dist_dir for :direct etc.)
   # and to the connection instance
   def self.connect(opts={})
-    opts = opts.to_mash
     adapter_name = opts[:adapter] ||= :http
     types = {
       :http=>'HTTP',

data/test/connection/direct_test.rb

@@ -17,6 +17,10 @@ class ConnectionDirectTest < RSolrBaseTest
     @solr.commit
   end
   
+  def teardown
+    @solr.adapter.close
+  end
+  
 end
 
 end

data/test/connection/test_methods.rb

@@ -13,12 +13,9 @@ module ConnectionTestMethods
   #end
   
   def test_default_options
-    target = {
-      :select_path => '/select',
-      :update_path => '/update',
-      :luke_path => '/admin/luke'
-    }
-    assert_equal target, @solr.adapter.default_options
+    assert_equal '/select', @solr.adapter.default_options[:select_path]
+    assert_equal '/update', @solr.adapter.default_options[:update_path]
+    assert_equal '/admin/luke', @solr.adapter.default_options[:luke_path]
   end
   
   # setting adapter options in Solr.connect method should set them in the adapter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Matt Mitchell