mwmitchell-rsolr 0.9.1 → 0.9.5

data/test/message_test.rb

@@ -3,12 +3,16 @@ require 'helper'
 
 module MessageTestMethods
   
+  def builder
+    @builder ||= RSolr::Message::Builder.new
+  end
+  
   # call all of the simple methods...
   # make sure the xml string is valid
   # ensure the class is actually Solr::XML
   def test_simple_methods
     [:optimize, :rollback, :commit].each do |meth|
-      result = RSolr::Message.send(meth)
+      result = self.builder.send(meth)
       assert_equal "<#{meth}/>", result.to_s
       assert_equal String, result.class
     end
@@ -17,7 +21,7 @@ module MessageTestMethods
   def test_add_yields_doc_objects_if_block_given
     documents = [{:id=>1, :name=>'sam', :cat=>['cat 1', 'cat 2']}]
     add_attrs = {:boost=>200.00}
-    result = RSolr::Message.add(documents, add_attrs) do |doc|
+    result = self.builder.add(documents, add_attrs) do |doc|
       doc.field_by_name(:name).attrs[:boost] = 10
       assert_equal 4, doc.fields.size
       assert_equal 2, doc.fields_by_name(:cat).size
@@ -38,25 +42,25 @@ module MessageTestMethods
   end
 
   def test_delete_by_id
-    result = RSolr::Message.delete_by_id(10)
+    result = self.builder.delete_by_id(10)
     assert_equal String, result.class
     assert_equal '<delete><id>10</id></delete>', result.to_s
   end
 
   def test_delete_by_multiple_ids
-    result = RSolr::Message.delete_by_id([1, 2, 3])
+    result = self.builder.delete_by_id([1, 2, 3])
     assert_equal String, result.class
     assert_equal '<delete><id>1</id><id>2</id><id>3</id></delete>', result.to_s
   end
 
   def test_delete_by_query
-    result = RSolr::Message.delete_by_query('status:"LOST"')
+    result = self.builder.delete_by_query('status:"LOST"')
     assert_equal String, result.class
     assert_equal '<delete><query>status:"LOST"</query></delete>', result.to_s
   end
 
   def test_delete_by_multiple_queries
-    result = RSolr::Message.delete_by_query(['status:"LOST"', 'quantity:0'])
+    result = self.builder.delete_by_query(['status:"LOST"', 'quantity:0'])
     assert_equal String, result.class
     assert_equal '<delete><query>status:"LOST"</query><query>quantity:0</query></delete>', result.to_s
   end
@@ -67,8 +71,8 @@ module MessageTestMethods
       :id=>1,
       :name=>'matt'
     }
-    assert RSolr::Message.add(data).to_s =~ /<field name="name">matt<\/field>/
-    assert RSolr::Message.add(data).to_s =~ /<field name="id">1<\/field>/
+    assert self.builder.add(data).to_s =~ /<field name="name">matt<\/field>/
+    assert self.builder.add(data).to_s =~ /<field name="id">1<\/field>/
   end
 
   # add an array of hashes
@@ -84,7 +88,7 @@ module MessageTestMethods
       }
     ]
   
-    message = RSolr::Message.add(data)
+    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>/
@@ -98,7 +102,7 @@ module MessageTestMethods
       :name => ['matt1', 'matt2']
     }
   
-    result = RSolr::Message.add(data)
+    result = self.builder.add(data)
   
     assert result.to_s =~ /<field name="name">matt1<\/field>/
     assert result.to_s =~ /<field name="name">matt2<\/field>/
@@ -108,7 +112,7 @@ module MessageTestMethods
     document = RSolr::Message::Document.new
     document.add_field('id', 1)
     document.add_field('name', 'matt', :boost => 2.0)
-    result = RSolr::Message.add(document)
+    result = self.builder.add(document)
   
     assert result.to_s =~ /<field name="id">1<\/field>/
   
@@ -127,7 +131,7 @@ module MessageTestMethods
       doc.add_field('name', "matt#{i}")
       doc
     end
-    result = RSolr::Message.add(documents)
+    result = self.builder.add(documents)
 
     assert result.to_s =~ /<field name="name">matt1<\/field>/
     assert result.to_s =~ /<field name="name">matt2<\/field>/
@@ -143,7 +147,7 @@ unless defined?(JRUBY_VERSION)
     include MessageTestMethods
   
     def setup
-      RSolr::Message.builder = RSolr::Message::Builders::Libxml.new
+      self.builder.adapter = RSolr::Message::Adapter::Libxml.new
     end
   
   end
@@ -157,8 +161,7 @@ class BuilderMessageTest < RSolrBaseTest
   include MessageTestMethods
   
   def setup
-    # RSolr::Message::Builders::Libxml.new
-    RSolr::Message.builder = RSolr::Message::Builders::Builder.new
+    self.builder.adapter = RSolr::Message::Adapter::Builder.new
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.5
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,17 +37,14 @@ files:
 - examples/http.rb
 - examples/direct.rb
 - lib/rsolr.rb
-- lib/rsolr/adapter/direct.rb
-- lib/rsolr/adapter/http.rb
-- lib/rsolr/adapter.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/adapter.rb
 - lib/rsolr/http_client.rb
-- lib/rsolr/message/builders/builder.rb
-- lib/rsolr/message/builders/libxml.rb
-- lib/rsolr/message/builders.rb
+- lib/rsolr/message/adapter/builder.rb
+- lib/rsolr/message/adapter/libxml.rb
 - lib/rsolr/message.rb
 - LICENSE
 - Rakefile
@@ -56,6 +53,7 @@ files:
 - CHANGES.txt
 has_rdoc: true
 homepage: http://github.com/mwmitchell/rsolr
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A Ruby client for Apache Solr

data/lib/rsolr/adapter.rb

@@ -1,6 +0,0 @@
-module RSolr::Adapter
-  
-  autoload :Direct, 'rsolr/adapter/direct'
-  autoload :HTTP, 'rsolr/adapter/http'
-  
-end

data/lib/rsolr/http_client/adapter.rb

@@ -1,6 +0,0 @@
-module RSolr::HTTPClient::Adapter
-  
-  autoload :Curb, 'rsolr/http_client/adapter/curb'
-  autoload :NetHTTP, 'rsolr/http_client/adapter/net_http'
-  
-end

data/lib/rsolr/message/builders.rb

@@ -1,6 +0,0 @@
-module RSolr::Message::Builders
-
-  autoload :Builder, 'rsolr/message/builders/builder'
-  autoload :Libxml, 'rsolr/message/builders/libxml'
-
-end