mwmitchell-rsolr 0.5.8 → 0.5.9

data/CHANGES.txt

@@ -1,3 +1,11 @@
+0.5.9 - January 7, 2009
+	Finally brought in the ExtLib Mash classes for incoming params and response hashes from solr
+	  - this gives the ability to access/set values for hashes using strings OR symbols (HashWithIndifferentAccess)
+	Organized response tests
+	Added more response tests
+	Simplified the RSolr::Response::Base class by supporting only raw/string ruby input
+	Added method to Response::IndexInfo for grabbing a Solr field list
+	
 0.5.7 - January 5, 2009
 	Changed name from Solr to RSolr, changed all references to Solr to RSolr
 	Added new tests for RSolr::Mapper and RSolr::Message

data/lib/rsolr/connection/search_ext.rb

@@ -1,5 +1,7 @@
 module RSolr::Connection::SearchExt
   
+  # TODO : clean this thing up dude
+  
   def search(params={})
     params = params.to_mash
     if params[:fields]
@@ -12,14 +14,19 @@ module RSolr::Connection::SearchExt
       phrase_filters = params.delete(:phrase_filters)
       params[:filters] ||= {}
       phrase_filters.each do |filter,values|
+        values = [values] unless values.is_a?(Array)
         params[:filters][filter] ||= []
+        params[:filters][filter] = [params[:filters][filter]] unless params[:filters][filter].is_a?(Array)
         values.each do |v|
-          params[:filters][filter] << "\"#{v}\""
+          params[:filters][filter] << %(\"#{v}\")
         end
       end
     end
     
-    params[:fq] = build_filters(params.delete(:filters)) if params[:filters]
+    if params[:filters]
+      filter_params = params.delete(:filters)
+      params[:fq] = build_filters(filter_params)
+    end 
     facets = params.delete(:facets) if params[:facets]
     
     if facets

data/lib/rsolr/response/index_info.rb

@@ -20,4 +20,14 @@ class RSolr::Response::IndexInfo < RSolr::Response::Base
     @version = @index[:version]
   end
   
+  # Returns an array of fields from the index
+  # An optional rule can be used for "grepping" field names:
+  # field_list(/_facet$/)
+  def field_list(rule=nil)
+    @data[:fields].select do |k,v|
+      rule ? k =~ rule : true
+    end.collect{|k,v|k}
+  end
+  
+  
 end

data/lib/rsolr.rb

@@ -7,7 +7,7 @@ proc {|base, files|
 
 module RSolr
   
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
   
   autoload :Message, 'rsolr/message'
   autoload :Response, 'rsolr/response'

data/test/response/base_test.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+
+class ResponseBaseTest < RSolrBaseTest
+  
+  def test_accessors
+    
+    adapter_response = {:body=>mock_query_response}
+    
+    r = RSolr::Response::Base.new(adapter_response)
+    
+    assert_class Mash, r.data
+    assert_class Mash, r.params
+    assert_class Mash, r.header
+    
+    # make sure the incoming adapter response is the same as the response.input
+    assert_equal adapter_response, r.input
+    
+    assert_equal r.query_time, r.header[:QTime]
+    assert_equal r.query_time, r.header['QTime']
+    
+    assert_equal r.params, r.header[:params]
+    assert_equal r.params, r.header['params']
+    
+    assert_equal '*:*', r.params[:q]
+    assert_equal '*:*', r.params['q']
+    
+    assert_equal 0, r.status
+    assert_equal r.status, r.header[:status]
+    assert_equal r.status, r.header['status']
+    
+    assert_equal r.header, r.data[:responseHeader]
+    assert_equal r.header, r.data['responseHeader']
+    
+    assert r.ok?
+    
+  end
+  
+end

data/test/response/pagination_test.rb

@@ -0,0 +1,58 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+
+class ResponsePaginationTest < RSolrBaseTest
+  
+  def create_response(params={})
+    response = RSolr::Response::Query::Base.new(mock_query_response)
+    response.params.merge! params
+    response
+  end
+  
+  # test the Solr::Connection pagination methods
+  def test_connection_calculate_start
+    dummy_connection = RSolr::Connection::Base.new(nil)
+    assert_equal 15, dummy_connection.send(:calculate_start, 2, 15)
+    assert_equal 450, dummy_connection.send(:calculate_start, 10, 50)
+    assert_equal 0, dummy_connection.send(:calculate_start, 0, 50)
+  end
+  
+  def test_connection_modify_params_for_pagination
+    dummy_connection = RSolr::Connection::Base.new(nil)
+    p = dummy_connection.send(:modify_params_for_pagination, {:page=>1})
+    assert_equal 0, p[:start]
+    assert_equal 10, p[:rows]
+    #
+    p = dummy_connection.send(:modify_params_for_pagination, {:page=>10, :per_page=>100})
+    assert_equal 900, p[:start]
+    assert_equal 100, p[:rows]
+  end
+  
+  def test_math
+    response = create_response({'rows'=>5})
+    assert_equal response.params['rows'], response.per_page
+    assert_equal 26, response.total
+    assert_equal 1, response.current_page
+    assert_equal 6, response.total_pages
+    
+    # now switch the rows (per_page)
+    # total and current page should remain the same value
+    # page_count should change
+    
+    response = create_response({'rows'=>2})
+    assert_equal response.params['rows'], response.per_page
+    assert_equal 26, response.total
+    assert_equal 1, response.current_page
+    assert_equal 13, response.total_pages
+    
+    # now switch the start
+    
+    response = create_response({'rows'=>3})
+    response.instance_variable_set '@start', 4
+    assert_equal response.params['rows'], response.per_page
+    assert_equal 26, response.total
+    # 2 per page, currently on the 10th item
+    assert_equal 2, response.current_page
+    assert_equal 9, response.total_pages
+  end
+  
+end

data/test/response/query_test.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+
+class ResponseQueryTest < RSolrBaseTest
+  
+  def query_response
+    RSolr::Response::Query::Base.new(mock_query_response)
+  end
+  
+  def test_accessors
+    r = query_response
+    assert r.response
+    assert_class Array, r.docs
+    
+    # total and num_found are the same
+    assert_equal 26, r.num_found
+    assert_equal r.total, r.num_found
+    
+    # start and offset are the same
+    assert_equal 0, r.start
+    assert_equal r.offset, r.start
+  end
+  
+  # make sure the docs respond to key and symbol access (using the Mash class)
+  def test_doc_string_and_symbol_key_access
+    response = query_response
+    response.docs.each do |doc|
+      assert doc.is_a?(Mash)
+      assert_equal doc['id'], doc[:id]
+      assert doc.key?(:id)
+      assert doc.key?('id')
+      if doc[:cat]
+        # if this doc has a cat (multiValues) of memory and electronics
+        # test the has? method
+        if doc[:cat].include?('memory') and doc[:cat].include?('electronics')
+          assert doc.has?(:cat, 'memory')
+          assert doc.has?(:cat, /elec/)
+          assert doc.has?('cat', 'memory')
+          assert doc.has?('cat', /elec/)
+        end
+      end
+    end
+  end
+  
+end

data/test/response/search_ext_test.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helpers')
+
+class ResponseSearchExtTest < RSolrBaseTest
+  
+  def test_facet_response_methods
+=begin
+    @response.facets
+    @response.facet_fields
+    @response.facet_queries
+    @response.facet_fields_by_hash
+    @response.facet_field(:feed_language_facet)
+    @response.facet_field_values(:feed_language_facet)
+    @response.facet_field_by_hash(:feed_language_facet)
+    @response.facet_field_by_hash(:feed_language_facet)
+    @response.facet_field_count(:feed_title_facet, 'ScienceDaily: Latest Science News')
+=end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -08:00
+date: 2009-01-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,6 @@ test_files:
 - test/connection/direct_test.rb
 - test/connection/http_test.rb
 - test/connection/test_methods.rb
-- test/connection/search_ext_test_methods.rb
 - test/core_ext_test
 - test/http_client/curb_test.rb
 - test/http_client/net_http_test.rb
@@ -102,7 +101,10 @@ test_files:
 - test/indexer.rb
 - test/mapper_test.rb
 - test/message_test.rb
-- test/pagination_test.rb
-- test/ruby-lang.org.rss.xml
+- test/response/base_test.rb
+- test/response/pagination_test.rb
+- test/response/query_test.rb
+- test/response/search_ext_test.rb
 - test/rsolr_test
+- test/ruby-lang.org.rss.xml
 - test/test_helpers.rb