mwmitchell-solr 0.5.4 → 0.5.5

data/CHANGES.txt

@@ -1,3 +1,21 @@
+0.5.5 - December 29, 2008
+
+	Fixed bug where accessing a field by method name failed:
+		
+		docs.each do |doc|
+			doc.timestamp
+		end
+	
+	Fixed bug where using the #has? method on a doc failed:
+		
+		docs.each do |doc|
+			doc.has?('timestamp')
+		end
+	
+	Removed invalid autoload in Solr module
+	
+	Fixed spelling error in Solr::Connection::SearchExt (thanks to matthewrudy)
+	
 0.5.4 - December 29, 2008
 	
 	Re-organized the main Solr adapters, they're now in Solr::Connection::Adapter instead of Solr::Adapter

data/README.rdoc

@@ -27,9 +27,11 @@ Once you have a connection, you can execute queries, updates etc..
 
 
 === Querying
-  response = solr.query(:q=>'washington', :facet=>true, :facet.limit=>-1, :facet.field=>cat, :facet.field=>inStock)
+  response = solr.query(:q=>'washington', :facet=>true, :facet.limit=>-1, :facet.field=>'cat', :facet.field=>'inStock')
   response = solr.find_by_id(1)
 
+* thanks to a little Ruby magic, we can chain symbols to create Solr "dot" syntax: :facet.field=>'cat'
+
 Using the #search method makes building more complex Solr queries easier:
   
   response = solr.search 'my search', :filters=>{:price=>(0.00..10.00)}
@@ -167,18 +169,22 @@ Solr (ruby) comes with a simple indexer that makes use of the Solr mapper. Here'
 
   solr = Solr.connect(:http)
   i = Solr::Indexer.new(solr, mapping)
-  i.index(data_source)
+  i.index(mapped_data)
 
 
 ==HTTP Client Adapter
-You can specify the Ruby http client to use by setting Solr::Adapter::HTTP.client_adapter to one of:
+You can specify the Ruby http client to use by setting Solr::Connection::Adapter::HTTP.client_adapter to one of:
   :net_http     uses the standard Net::HTTP library
   :curb         uses the Ruby "curl" bindings
 
 Example:
 	
-	hclient = Solr::HTTPClient.connect(url, :curb)
-	hclient = Solr::HTTPClient.connect(url, :net_http)
+  Solr::Connection::Adapter::HTTP.client_adapter = :curb
+	
+Example of using the HTTP client only:
+  
+  hclient = Solr::HTTPClient.connect(url, :curb)
+  hclient = Solr::HTTPClient.connect(url, :net_http)
 
 After reading this http://apocryph.org/2008/11/09/more_indepth_analysis_ruby_http_client_performance/ - I would recommend using the :curb adapter. NOTE: You can't use the :curb adapter under jRuby. To install curb:
 

data/examples/direct.rb

@@ -13,4 +13,8 @@ response = solr.search 'ipod', :filters=>{:price=>(0..50)}, :per_page=>2, :page=
 
 solr.delete_by_query('*:*')
 
-puts response.inspect
+response.docs.each do |doc|
+  if doc.has?('timestamp')
+    puts doc.timestamp
+  end
+end

data/examples/http.rb

@@ -9,4 +9,8 @@ response = solr.search 'ipod', :filters=>{:price=>(0..50)}, :per_page=>2, :page=
 
 solr.delete_by_query('*:*')
 
-puts response.inspect
+response.docs.each do |doc|
+  if doc.has?('timestamp')
+    puts doc.timestamp
+  end
+end

data/lib/solr.rb

@@ -7,12 +7,11 @@ proc {|base, files|
 
 module Solr
   
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
   
   autoload :Message, 'solr/message'
   autoload :Response, 'solr/response'
   autoload :Connection, 'solr/connection'
-  autoload :Ext, 'solr/ext'
   autoload :Mapper, 'solr/mapper'
   autoload :Indexer, 'solr/indexer'
   autoload :HTTPClient, 'solr/http_client'

data/lib/solr/connection/base.rb

@@ -7,7 +7,7 @@ class Solr::Connection::Base
   
   include Solr::Connection::SearchExt
   
-  # conection is instance of:
+  # "adapter" is instance of:
   #   Solr::Adapter::HTTP
   #   Solr::Adapter::Direct (jRuby only)
   def initialize(adapter, opts={})

data/lib/solr/connection/search_ext.rb

@@ -14,7 +14,7 @@ module Solr::Connection::SearchExt
         params.merge!({:facet => true})
         params.merge! build_facets(facets)          
       elsif facets.is_a?(Hash)
-        params.mrege!({:facet => true})
+        params.merge!({:facet => true})
         #params += build_facet(facets)
       elsif facets.is_a?(String)
         #params += facets

data/lib/solr/http_client.rb

@@ -1,7 +1,7 @@
-require 'uri'
+#require 'uri'
 
-# A simple wrapper for different http client implementations
-# that supports #get and #post
+# 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/
 # Net::HTTP is the default adapter
 
@@ -15,10 +15,10 @@ require 'uri'
 #   :headers
 
 # Example:
-#hclient = Solr::HTTPClient.connect('http://www.google.com', :net_http)
-#response = hclient.get('/search', :hl=>:en, :q=>:ruby, :btnG=>:Search)
-#puts response[:status_code]
-#puts response[:body]
+#   hclient = Solr::HTTPClient.connect('http://www.google.com', :net_http)
+#   response = hclient.get('/search', :hl=>:en, :q=>:ruby, :btnG=>:Search)
+#   puts response[:status_code]
+#   puts response[:body]
 
 module Solr::HTTPClient
   

data/lib/solr/response/base.rb

@@ -9,7 +9,8 @@ class Solr::Response::Base
   
   def initialize(data)
     if data.is_a?(Hash) and data.has_key?(:body)
-      @data = Kernel.eval(data[:body])
+      @raw_response = data[:body]
+      @data = Kernel.eval(@raw_response)
       @source = data
     else
       if data.is_a?(String)

data/lib/solr/response/query.rb

@@ -1,23 +1,26 @@
 # response module for queries
 module Solr::Response::Query
   
-  # module for adding some helper methods for each document
+  # module for adding helper methods to each Hash document
   module DocExt
     
-    # Provide "method accessors" to the data.
-    # This might be better implemented using instance_eval
-    # to create the methods?
-    def method_missing(k, *args)
-      has_key?(k) ? self[k] : super(k, *args)
+    def self.extended(base)
+      base.keys.each do |k,v|
+        base.instance_eval <<-EOF
+        def #{k}; self['#{k.to_s}']; end
+        EOF
+      end
     end
     
-    # Helper method to check if value/values exist for a given key.
+    # Helper method to check if value/multi-values exist for a given key.
     # The value can be a string, or a RegExp
     # Example:
+    # doc.has?(:location_facet)
     # doc.has?(:location_facet, 'Clemons')
     # doc.has?(:id, 'h009', /^u/i)
     def has?(k, *values)
       return if self[k].nil?
+      return true if self.has_key?(k) and values.empty?
       target = self[k]
       if target.is_a?(Array)
         values.each do |val|

data/test/connection/test_methods.rb

@@ -56,6 +56,31 @@ module ConnectionTestMethods
     end
   end
   
+  def test_query_response_docs
+    @solr.add(:id=>1, :price=>1.00, :cat=>['electronics', 'something else'])
+    @solr.commit
+    r = @solr.query(:q=>'*:*')
+    assert r.is_a?(Solr::Response::Query::Base)
+    assert_equal Array, r.docs.class
+    first = r.docs.first
+    assert first.respond_to?(:price)
+    assert first.respond_to?(:cat)
+    assert first.respond_to?(:id)
+    assert first.respond_to?(:timestamp)
+    
+    # test the has? method
+    assert first.has?('price', 1.00)
+    assert first.has?('cat', 'electronics')
+    assert first.has?('cat', 'something else')
+    
+    assert first.has?('cat', /something/)
+    
+    # has? only works with strings at this time
+    assert_nil first.has?(:cat)
+    
+    assert false == first.has?('cat', /zxcv/)
+  end
+  
   def test_add
     assert_equal 0, @solr.query(:q=>'*:*').total
     response = @solr.add(:id=>100)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-solr
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Matt Mitchell