mwmitchell-rsolr 0.6.3 → 0.6.4

data/CHANGES.txt

@@ -1,3 +1,8 @@
+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
+	Updated mapping tests
+
 0.6.3 - January 21, 2009
 	Added a new param mapping module: RSolr::Connection::ParamMapping
 	Mapping only for fields that need conversion/escaping or nested (facet.*) etc.

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

@@ -21,7 +21,7 @@ class RSolr::Connection::Adapter::HTTP
   #
   def initialize(opts={}, &block)
     opts[:url]||='http://127.0.0.1:8983/solr'
-    @opts = default_options.merge(opts) # default_options are coming from RSolr::Connection::Adapter::CommonMethods
+    @opts = default_options.merge(opts).to_mash # default_options are coming from RSolr::Connection::Adapter::CommonMethods
   end
   
   def connection

data/lib/rsolr/connection/base.rb

@@ -11,7 +11,7 @@ class RSolr::Connection::Base
   #   RSolr::Adapter::HTTP
   #   RSolr::Adapter::Direct (jRuby only)
   def initialize(adapter, opts={})
-    @adapter=adapter
+    @adapter = adapter
     @param_mappers = {
       :standard=>RSolr::Connection::ParamMapping::Standard,
       :dismax=>RSolr::Connection::ParamMapping::Dismax
@@ -45,7 +45,7 @@ class RSolr::Connection::Base
     p[:wt]==:ruby ? RSolr::Response::Query::Base.new(response) : response
   end
   
-  # register your own mapper?
+  # register your own mapper if you want?
   def search(params,&blk)
     qt = params[:qt] ? params[:qt].to_sym : :dismax
     mapper_class = @param_mappers[qt]

data/lib/rsolr/connection/param_mapping/dismax.rb

@@ -4,7 +4,7 @@ class RSolr::Connection::ParamMapping::Dismax < RSolr::Connection::ParamMapping:
     super
     
     mapping_for :alternate_query, :q.alt do |val|
-      format_query(val)
+      format_query(val).join(' ')
     end
     
     mapping_for :query_fields, :qf do |val|
@@ -16,7 +16,7 @@ class RSolr::Connection::ParamMapping::Dismax < RSolr::Connection::ParamMapping:
     end
     
     mapping_for :boost_query, :bq do |val|
-      format_query(val)
+      format_query(val).join(' ')
     end
     
   end

data/lib/rsolr/connection/param_mapping/standard.rb

@@ -28,7 +28,11 @@ class RSolr::Connection::ParamMapping::Standard
     end
     
     mapping_for :phrase_queries, :q do |val|
-      [@output[:q], format_query(val, true)].reject{|v|v.to_s.empty?}.join(' ')
+      values = [@output[:q], format_query(val, true)]
+      # remove blank items
+      values.reject!{|v|v.to_s.empty?}
+      # join all items on a space
+      values.join(' ')
     end
     
     mapping_for :filters, :fq do |val|
@@ -37,7 +41,14 @@ class RSolr::Connection::ParamMapping::Standard
     
     # this must come after the :filter/:fq mapper
     mapping_for :phrase_filters, :fq do |val|
-      [@output[:fq], format_query(val, true)].reject{|v|v.to_s.empty?}.join(' ')
+      # use the previously set fq queries and generate the new phrased based ones
+      values = [@output[:fq], format_query(val, true)]
+      # flatten (need to do this because the previous fq could have been an array)
+      values = values.flatten
+      # remove blank items
+      values.reject!{|v|v.to_s.empty?} # don't join -- instead create multiple fq params
+      # don't join... fq needs to be an array so multiple fq params are sent to solr
+      values
     end
     
     mapping_for :facets do |input|
@@ -72,6 +83,7 @@ class RSolr::Connection::ParamMapping::Standard
     end
   end
   
+  # takes an input and returns a formatted value
   def format_query(input, quote=false)
     case input
     when Array
@@ -86,7 +98,7 @@ class RSolr::Connection::ParamMapping::Standard
   def format_array_query(input, quote)
     input.collect do |v|
       v.is_a?(Hash) ? format_hash_query(v, quote) : prep_value(v, quote)
-    end.join(' ')
+    end
   end
   
   # groups values to a single field: title:(value1 value2) instead of title:value1 title:value2
@@ -101,11 +113,11 @@ class RSolr::Connection::ParamMapping::Standard
         vv.is_a?(Range) ? "[#{vv.min} TO #{vv.max}]" : prep_value(vv, quote)
       end
       field = field.to_s.empty? ? '' : "#{field}:"
-      if fielded_queries.size > 0
-        q << (fielded_queries.size > 1 ? "#{field}(#{fielded_queries.join(' ')})" : "#{field}#{fielded_queries.to_s}")
+      fielded_queries.each do |fq|
+        q << "#{field}(#{fq})"
       end
     end
-    q.join(' ')
+    q
   end
   
   def prep_value(val, quote=false)

data/lib/rsolr/http_client.rb

@@ -33,7 +33,11 @@ module RSolr::HTTPClient
     else
       raise UnkownAdapterError.new("Name: #{adapter_name}")
     end
-    Base.new RSolr::HTTPClient::Adapter.const_get(klass).new(url)
+    begin
+      Base.new RSolr::HTTPClient::Adapter.const_get(klass).new(url)
+    rescue URI::InvalidURIError
+      raise "#{$!} == #{url}"
+    end
   end
   
   class Base

data/lib/rsolr.rb

@@ -7,7 +7,7 @@ proc {|base, files|
 
 module RSolr
   
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
   
   autoload :Message, 'rsolr/message'
   autoload :Response, 'rsolr/response'
@@ -20,6 +20,7 @@ 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/param_mapping_test.rb

@@ -20,7 +20,7 @@ class ParamMappingTest < RSolrBaseTest
     output = mapper.map
     
     assert_equal "a query \"a phrase query\"", output[:q]
-    assert_equal "a filter \"a phrase filter\"", output[:fq]
+    assert_equal ["a filter", "\"a phrase filter\""], output[:fq]
     assert_equal 0, output[:start]
     assert_equal 10, output[:rows]
     # facet.field can be specified multiple times, so we need an array
@@ -38,8 +38,8 @@ class ParamMappingTest < RSolrBaseTest
     mapper = Standard.new(input)
     output = mapper.map
     
-    assert_equal "a query field:value blah \"a phrase\" phrase_field:\"phrase value\"", output[:q]
-    assert_equal "a filter filter:field blah can_also_be_a:\"hash\"", output[:fq]
+    assert_equal "a query field:(value) blah \"a phrase\" phrase_field:(\"phrase value\")", output[:q]
+    assert_equal ["a filter", "filter:(field)", "blah", "can_also_be_a:(\"hash\")"], output[:fq]
   end
   
   def test_dismax
@@ -51,11 +51,11 @@ class ParamMappingTest < RSolrBaseTest
     }
     mapper = Dismax.new(input)
     output = mapper.map
-    assert_equal 'can_be_a_string_hash_or_array:OK', output[:q.alt]
+    assert_equal 'can_be_a_string_hash_or_array:(OK)', output[:q.alt]
     assert output[:qf]=~/another_field_to_boost\^200/
     assert output[:qf]=~/a_field_to_boost\^20/
     assert_equal 'phrase_field^20', output[:pf]
-    assert_equal 'field_to_use_for_boost_query:a test', output[:bq]
+    assert_equal 'field_to_use_for_boost_query:(a) test', output[:bq]
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-21 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency