mwmitchell-rsolr 0.7.1 → 0.8.0

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

@@ -32,8 +32,8 @@ class RSolr::HTTPClient::Adapter::NetHTTP
     full_url += url
     {
       :status_code=>net_http_response.code.to_i,
-      :body=>net_http_response.body,
       :url=>full_url,
+      :body=>net_http_response.body,
       :path=>path,
       :params=>params,
       :data=>data,

data/lib/rsolr/message.rb

@@ -1,4 +1,3 @@
-
 # http://builder.rubyforge.org/
 require 'rubygems'
 require 'builder'
@@ -10,13 +9,13 @@ class RSolr::Message
   class << self
     
     def xml
-      Builder::XmlMarkup.new
+      ::Builder::XmlMarkup.new
     end
     
     # add({})
     # add([{}, {}])
     # add(docs) do |doc|
-    #   doc.boost = 10.0
+    #   doc[:boost] = 10.0
     # end
     def add(data, opts={}, &block)
       data = [data] if data.respond_to?(:each_pair) # if it's a hash, put it in an array
@@ -25,11 +24,11 @@ class RSolr::Message
           add_xml.doc do |doc_xml|
             # convert keys into strings and perform an alpha sort (easier testing between ruby and jruby)
             # but probably not great for performance? whatever...
-            sorted_items = item.inject({}) {|acc,(k,v)| acc.merge({k.to_s=>v})}
-            sorted_items.keys.sort.each do |k|
+            #sorted_items = item.inject({}) {|acc,(k,v)| acc.merge({k.to_s=>v})}
+            item.keys.each do |k|
               doc_attrs = {:name=>k}
               yield item, doc_attrs if block_given?
-              [sorted_items[k]].flatten.each do |v| # multiValued attributes
+              [item[k]].flatten.each do |v| # multiValued attributes
                 doc_xml.field(v, doc_attrs)
               end
             end

data/test/connection/direct_test.rb

@@ -1,26 +1,25 @@
 if defined?(JRUBY_VERSION)
-
-require File.join(File.dirname(__FILE__), '..', 'test_helpers')
-
-require File.join(File.dirname(__FILE__), 'test_methods')
-
-class ConnectionDirectTest < RSolrBaseTest
   
-  include ConnectionTestMethods
+  require 'helper'
+  require 'connection/test_methods'
   
-  def setup
-    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.delete_by_query('*:*')
-    @solr.commit
+  class ConnectionDirectTest < RSolrBaseTest
+    
+    include ConnectionTestMethods
+    
+    def setup
+      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.delete_by_query('*:*')
+      @solr.commit
+    end
+    
+    def teardown
+      @solr.adapter.close
+    end
+    
   end
   
-  def teardown
-    @solr.adapter.close
-  end
-  
-end
-
 end

data/test/connection/http_test.rb

@@ -1,9 +1,8 @@
 unless defined?(JRUBY_VERSION)
-
-  require File.join(File.dirname(__FILE__), '..', 'test_helpers')
   
-  require File.join(File.dirname(__FILE__), 'test_methods')
-
+  require 'helper'
+  require 'connection/test_methods'
+  
   class AdapterHTTPTest < RSolrBaseTest
   
     include ConnectionTestMethods

data/test/connection/test_methods.rb

@@ -9,99 +9,89 @@ module ConnectionTestMethods
   #def teardown
   #  @solr.delete_by_query('id:[* TO *]')
   #  @solr.commit
-  #  assert_equal 0, @solr.query(:q=>'*:*').docs.size
+  #  assert_equal 0, @solr.select(:q=>'*:*').docs.size
   #end
   
-  # setting connection options in Solr.connect method should set them in the connection
-  def test_set_connection_options
-    solr = RSolr.connect(:default_wt=>:json)
-    assert_equal :json, solr.opts[:default_wt]
-  end
-  
-  # If :wt is NOT :ruby, the format doesn't get wrapped in a Solr::Response class
+  # If :wt is NOT :ruby, the format doesn't get converted into a Mash (special Hash; see lib/mash.rb)
   # Raw ruby can be returned by using :wt=>'ruby', not :ruby
   def test_raw_response_formats
-    ruby_response = @solr.query(:q=>'*:*', :wt=>'ruby')
-    assert ruby_response[:body].is_a?(String)
-    assert ruby_response[:body]=~%r('wt'=>'ruby')
+    ruby_response = @solr.select(:q=>'*:*', :wt=>'ruby')
+    assert ruby_response.is_a?(String)
+    assert ruby_response =~ %r('wt'=>'ruby')
     # xml?
-    xml_response = @solr.query(:q=>'*:*', :wt=>'xml')
-    assert xml_response[:body]=~%r(<str name="wt">xml</str>)
+    xml_response = @solr.select(:q=>'*:*', :wt=>'xml')
+    assert xml_response.is_a?(String)
+    assert xml_response =~ %r(<str name="wt">xml</str>)
     # json?
-    json_response = @solr.query(:q=>'*:*', :wt=>'json')
-    assert json_response[:body]=~%r("wt":"json")
+    json_response = @solr.select(:q=>'*:*', :wt=>'json')
+    assert json_response.is_a?(String)
+    assert json_response =~ %r("wt":"json")
   end
   
-  def test_query_responses
-    r = @solr.query(:q=>'*:*')
-    assert r.is_a?(RSolr::Response::Query::Base)
-    # catch exceptions for bad queries
+  def test_raise_on_invalid_query
     assert_raise RSolr::RequestError do
-      @solr.query(:q=>'!')
+      @solr.select(:q=>'!')
     end
   end
   
-  def test_query_response_docs
+  def test_select_response_docs
     @solr.add(:id=>1, :price=>1.00, :cat=>['electronics', 'something else'])
     @solr.commit
-    r = @solr.query(:q=>'*:*')
-    assert r.is_a?(RSolr::Response::Query::Base)
-    assert_equal Array, r.docs.class
-    first = r.docs.first
+    r = @solr.select(:q=>'*:*')
+    assert r.is_a?(Mash)
     
-    # test the has? method
-    assert first.has?('price', 1.00)
-    assert ! first.has?('price', 10.00)
-    assert first.has?('cat', 'electronics')
-    assert first.has?('cat', 'something else')
-    assert first.has?(:cat, 'something else')
+    docs = r[:response][:docs]
+    assert_equal Array, docs.class
+    first = docs.first
     
-    assert first.has?('cat', /something/)
+    # test the has? method
+    assert_equal 1.00, first[:price]
     
-    # has? only works with strings at this time
-    assert first.has?(:cat)
+    assert_equal Array, first[:cat].class
+    assert first[:cat].include?('electronics')
+    assert first[:cat].include?('something else')
+    assert first[:cat].include?('something else')
     
-    assert false == first.has?('cat', /zxcv/)
   end
   
   def test_add
-    assert_equal 0, @solr.query(:q=>'*:*').total
+    assert_equal 0, @solr.select(:q=>'*:*')[:response][:numFound]
     update_response = @solr.add(:id=>100)
-    assert update_response.is_a?(RSolr::Response::Update)
+    assert update_response.is_a?(Mash)
     #
     @solr.commit
-    assert_equal 1, @solr.query(:q=>'*:*').total
+    assert_equal 1, @solr.select(:q=>'*:*')[:response][:numFound]
   end
   
   def test_delete_by_id
     @solr.add(:id=>100)
     @solr.commit
-    total = @solr.query(:q=>'*:*').total
+    total = @solr.select(:q=>'*:*')[:response][:numFound]
     assert_equal 1, total
     delete_response = @solr.delete_by_id(100)
     @solr.commit
-    assert delete_response.is_a?(RSolr::Response::Update)
-    total = @solr.query(:q=>'*:*').total
+    assert delete_response.is_a?(Mash)
+    total = @solr.select(:q=>'*:*')[:response][:numFound]
     assert_equal 0, total
   end
   
   def test_delete_by_query
     @solr.add(:id=>1, :name=>'BLAH BLAH BLAH')
     @solr.commit
-    assert_equal 1, @solr.query(:q=>'*:*').total
+    assert_equal 1, @solr.select(:q=>'*:*')[:response][:numFound]
     response = @solr.delete_by_query('name:BLAH BLAH BLAH')
     @solr.commit
-    assert response.is_a?(RSolr::Response::Update)
-    assert_equal 0, @solr.query(:q=>'*:*').total
+    assert response.is_a?(Mash)
+    assert_equal 0, @solr.select(:q=>'*:*')[:response][:numFound]
   end
   
-  def test_index_info
-    response = @solr.index_info
-    assert response.is_a?(RSolr::Response::IndexInfo)
+  def test_admin_luke_index_info
+    response = @solr.send_request('/admin/luke', :numTerms=>0)
+    assert response.is_a?(Mash)
     # make sure the ? methods are true/false
-    assert [true, false].include?(response.current?)
-    assert [true, false].include?(response.optimized?)
-    assert [true, false].include?(response.has_deletions?)
+    assert [true, false].include?(response[:index][:current])
+    assert [true, false].include?(response[:index][:optimized])
+    assert [true, false].include?(response[:index][:hasDeletions])
   end
   
 end

data/test/http_client/curb_test.rb

@@ -2,14 +2,13 @@
 # the curb gem is a c extension based gem, jruby has no support for this
 unless defined?(JRUBY_VERSION)
 
-  require File.join(File.dirname(__FILE__), '..', 'test_helpers')
-  
-  require File.join(File.dirname(__FILE__), 'test_methods')
+  require 'helper'
+  require 'http_client/test_methods'
 
   class CurbTest < RSolrBaseTest
   
     def setup
-      @c ||= RSolr::HTTPClient.connect(URL, :curb)
+      @c ||= RSolr::HTTPClient::Connector.new(:curb).connect(URL)
     end
   
     include HTTPClientTestMethods

data/test/http_client/net_http_test.rb

@@ -1,11 +1,10 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helpers')
-
-require File.join(File.dirname(__FILE__), 'test_methods')
+require 'helper'
+require 'http_client/test_methods'
 
 class NetHTTPTest < RSolrBaseTest
   
   def setup
-    @c ||= RSolr::HTTPClient.connect(URL, :net_http)
+    @c ||= RSolr::HTTPClient::Connector.new(:net_http).connect(URL)
   end
   
   include HTTPClientTestMethods

data/test/http_client/test_methods.rb

@@ -4,7 +4,7 @@ module HTTPClientTestMethods
   
   def test_raise_unknown_adapter
     assert_raise RSolr::HTTPClient::UnkownAdapterError do
-      c = RSolr::HTTPClient.connect(URL, :blah)
+      c = RSolr::HTTPClient::Connector.new(:blah).connect(URL)
     end
   end
   

data/test/http_client/util_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+require 'helper'
 
 class HTTPUtilTest < RSolrBaseTest
   

data/test/message_test.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), 'test_helpers')
+
+require 'helper'
 
 class MessageTest < RSolrBaseTest
   
@@ -52,9 +53,8 @@ class MessageTest < RSolrBaseTest
       :id=>1,
       :name=>'matt'
     }
-    
-    expected = '<add><doc><field name="id">1</field><field name="name">matt</field></doc></add>'
-    assert_equal expected, RSolr::Message.add(data).to_s
+    assert RSolr::Message.add(data).to_s =~ /<field name="name">matt<\/field>/
+    assert RSolr::Message.add(data).to_s =~ /<field name="id">1<\/field>/
   end
   
   # add an array of hashes
@@ -73,7 +73,8 @@ class MessageTest < RSolrBaseTest
     message = RSolr::Message.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_equal expected, message.to_s
+    assert message.to_s=~/<field name="name">matt<\/field>/
+    assert message.to_s=~/<field name="name">sam<\/field>/
   end
   
   # multiValue field support test, thanks to Fouad Mardini!
@@ -82,8 +83,8 @@ class MessageTest < RSolrBaseTest
       :id   => 1,
       :name => ['matt1', 'matt2']
     }
-    expected = '<add><doc><field name="id">1</field><field name="name">matt1</field><field name="name">matt2</field></doc></add>'
-    assert_equal expected, RSolr::Message.add(data).to_s
+    assert RSolr::Message.add(data).to_s =~ /<field name="name">matt1<\/field>/
+    assert RSolr::Message.add(data).to_s =~ /<field name="name">matt2<\/field>/
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 -08:00
+date: 2009-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,24 +39,16 @@ files:
 - lib/core_ext.rb
 - lib/mash.rb
 - lib/rsolr.rb
-- lib/rsolr/connection/adapter/common_methods.rb
-- lib/rsolr/connection/adapter/direct.rb
-- lib/rsolr/connection/adapter/http.rb
-- lib/rsolr/connection/adapter.rb
-- lib/rsolr/connection/base.rb
+- lib/rsolr/adapter/common_methods.rb
+- lib/rsolr/adapter/direct.rb
+- lib/rsolr/adapter/http.rb
+- lib/rsolr/adapter.rb
 - lib/rsolr/connection.rb
 - lib/rsolr/http_client/adapter/curb.rb
 - lib/rsolr/http_client/adapter/net_http.rb
 - lib/rsolr/http_client/adapter.rb
 - lib/rsolr/http_client.rb
-- lib/rsolr/indexer.rb
 - lib/rsolr/message.rb
-- lib/rsolr/response/base.rb
-- lib/rsolr/response/index_info.rb
-- lib/rsolr/response/query.rb
-- lib/rsolr/response/update.rb
-- lib/rsolr/response.rb
-- lib/rsolr/query.rb
 - LICENSE
 - Rakefile
 - README.rdoc
@@ -96,12 +88,6 @@ test_files:
 - test/http_client/net_http_test.rb
 - test/http_client/test_methods.rb
 - test/http_client/util_test.rb
-- test/indexer.rb
 - test/message_test.rb
-- test/query_helper_test.rb
-- test/response/base_test.rb
-- test/response/pagination_test.rb
-- test/response/query_test.rb
 - test/rsolr_test
-- test/ruby-lang.org.rss.xml
 - test/test_helpers.rb

data/lib/rsolr/connection/adapter.rb

@@ -1,7 +0,0 @@
-module RSolr::Connection::Adapter
-  
-  autoload :Direct, 'rsolr/connection/adapter/direct'
-  autoload :HTTP, 'rsolr/connection/adapter/http'
-  autoload :CommonMethods, 'rsolr/connection/adapter/common_methods'
-  
-end

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

@@ -1,50 +0,0 @@
-# This module is for HTTP + DirectSolrConnection (jruby) connections
-# It provides common methods.
-# The main query, update and index_info methods are here
-# The classes that include this module only need to provide a request method like:
-#   send_request(request_path, params, data)
-# where:
-#   request_path is a string to a handler (/select etc.)
-#   params is a hash for query string params
-#   data is optional string of xml
-module RSolr::Connection::Adapter::CommonMethods
-  
-  # send a request to the "select" handler
-  # the first argument is the select handler path
-  # the last argument is a hash of params
-  def query(*args)
-    params = args.extract_options!
-    path = args.first || @opts[:select_path]
-    self.send_request "/#{path}", params
-  end
-  
-  # sends a request to the admin luke handler to get info on the index
-  # the first argument is the admin/luke request handler path
-  # the last argument is a hash of params
-  def index_info(*args)
-    params = args.extract_options!
-    path = args.first || @opts[:luke_path]
-    params[:numTerms]||=0
-    self.send_request "/#{path}", params
-  end
-  
-  # sends data to the update handler
-  # If 2 arguments are passed in:
-  #   - the first should be the POST data string
-  #   - the second can be an optional url params hash
-  #   - the path is defaulted to '/update'
-  # If 3 arguments are passed in:
-  #   - the first argument should be the url path ('/my-update-handler' etc.)
-  #   - the second should be the POST data string
-  #   - the last/third should be an optional url params hash
-  # data can be:
-  #   string (valid solr update xml)
-  #   object with respond_to?(:to_xml)
-  def update(*args)
-    params = args.extract_options!
-    data = args.last
-    path = args.size == 2 ? args.first : @opts[:update_path]
-    self.send_request "/#{path}", params, data
-  end
-  
-end