delsolr 0.0.4 → 0.0.5

data/lib/delsolr.rb

@@ -35,7 +35,10 @@ module DelSolr
     #   (optional) a cache instance (any object the supports get and set)
     # 
     # [<b><tt>:shortcuts</tt></b>]
-    #   (options) a list of values in the doc fields to generate short cuts for (ie: [:scores, :id], you will be able to call <tt>rsp.scores</tt> and have it return an array of scores, likewise for <tt>ids</tt>.) Defaults to [:id, :unique_id, :score]
+    #   (optional) a list of values in the doc fields to generate short cuts for (ie: [:scores, :id], you will be able to call <tt>rsp.scores</tt> and have it return an array of scores, likewise for <tt>ids</tt>.) Defaults to [:id, :unique_id, :score]
+    #
+    # [<b><tt>:path</tt></b>]
+    #   (optional) the path of the solr install (defaults to "/solr")
     def initialize(options = {})
       @configuration = DelSolr::Client::Configuration.new(options[:server], options[:port], options[:timeout], options[:path])
       @cache = options[:cache]
@@ -159,6 +162,12 @@ module DelSolr
       if body.blank? # cache miss (or wasn't enabled)
         header, body = connection.get(configuration.path + query_builder.request_string)
 
+        # We get UTF-8 from Solr back, make sure the string knows about it
+        # when running on Ruby >= 1.9
+        if body.respond_to?(:force_encoding)
+          body.force_encoding("UTF-8")
+        end
+
         # add to the cache if caching
         if enable_caching
           begin

data/test/test_client.rb

@@ -221,6 +221,30 @@ class ClientTest < Test::Unit::TestCase
     assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort)
     assert(r.from_cache?, 'this one should be from the cache')
   end
+
+  if RUBY_VERSION.to_f >= 1.9
+    def test_query_encoding_ruby19_ut8
+      c = setup_client
+
+      mock_query_builder = DelSolr::Client::QueryBuilder
+      mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
+      DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
+      c.connection.expects(:get).with("/solr" + mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection
+      r = c.query('standard', :query => '123')
+      assert(r)
+
+      ensure_encoding = lambda { |v|
+        case v
+          when String; assert_equal 'UTF-8', v.encoding.name
+          when Array; v.each(&ensure_encoding)
+          when Hash; (v.keys + v.values).each(&ensure_encoding)
+        end
+      }
+
+      ensure_encoding.call(r.raw_response)
+    end
+  end
+  
   
 private
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delsolr
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: DelSolr is a light weight ruby wrapper for solr.  It's intention is to expose the full power of solr queries while keeping the interface as ruby-esque as possible.