rsolr 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d605bb65e2fdbd7e99f9bd1890549408f304016e
-  data.tar.gz: 02b7f7e889860627575f10e55b6fe73c9c73663c
+  metadata.gz: a71555285360893206f2b56d3d2b929633d80644
+  data.tar.gz: b4eb6f363d662aa82a6390ecb860a41c84401925
 SHA512:
-  metadata.gz: 656df9328215c9dba8d747baa7faff8b47a7b6a0fb5a8a46cb0246a7967ea7ecee78f5f59076396ddd463fd4413f8d54a7efc914df59c64c614a13fe396f1763
-  data.tar.gz: 8efa618685448b35cc7da82c6ec0576b17838bddc4924fb70ac07529afc2075754f9231697b221c42f0fe418010332ddce050236a4d16d1bf0b994d7855975cb
+  metadata.gz: 58bfa89eaf1764f2d6964457aa5be9a56366e31a60ab36af5e84f85080e9574cfc5fe76f2348bf55c980e47806535bea36d317ddaa010b788a1d41c8f30bbb9c
+  data.tar.gz: 683e472b2e88c3afc76b56f1e3f7085343a810ba911a78b4eaaa4570df8b4d05076d859d09af9732f1dfcca00cc66c0a9c54571d8290fb2d15d922c3a157a207

data/CHANGES.txt

@@ -1,3 +1,6 @@
+1.0.12
+   - Fix bug where specifying the wt property as a string, would add the supplied value to the default ('ruby') rather than overriding it.
+
 1.0.11
    - add RSolr.solr_escape method and add deprecation messages to RSolr.escape (ndushay)
    - use stdlib URI.escape methods instead of homegrown in RSolr::URI (ndushay)

data/lib/rsolr/client.rb

@@ -240,7 +240,7 @@ class RSolr::Client
     opts[:proxy] = proxy unless proxy.nil?
     opts[:method] ||= :get
     raise "The :data option can only be used if :method => :post" if opts[:method] != :post and opts[:data]
-    opts[:params] = opts[:params].nil? ? {:wt => default_wt} : {:wt => default_wt}.merge(opts[:params])
+    opts[:params] = params_with_wt(opts[:params])
     query = RSolr::Uri.params_to_solr(opts[:params]) unless opts[:params].empty?
     opts[:query] = query
     if opts[:data].is_a? Hash
@@ -252,7 +252,13 @@ class RSolr::Client
     opts[:uri] = base_uri.merge(path.to_s + (query ? "?#{query}" : "")) if base_uri
     opts
   end
-  
+
+  def params_with_wt(params)
+    return { wt: default_wt } if params.nil?
+    return params if params.key?(:wt) || params.key?('wt')
+    { wt: default_wt }.merge(params)
+  end
+
   def build_paginated_request page, per_page, path, opts
     per_page = per_page.to_s.to_i
     page = page.to_s.to_i-1

data/lib/rsolr/version.rb

@@ -1,5 +1,5 @@
 module RSolr
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 
   def self.version
     VERSION

data/spec/api/client_spec.rb

@@ -258,34 +258,42 @@ describe "RSolr::Client" do
 
   context "build_request" do
     include ClientHelper
-    it 'should return a request context array' do
-      result = client.build_request('select',
-        :method => :post,
-        :params => {:q=>'test', :fq=>[0,1]},
-        :data => "data",
-        :headers => {}
-      )
-      [/fq=0/, /fq=1/, /q=test/, /wt=ruby/].each do |pattern|
-        expect(result[:query]).to match pattern
+    let(:data) { 'data' }
+    let(:params) { { q: 'test', fq: [0,1] } }
+    let(:options) { { method: :post, params: params, data: data, headers: {} } }
+    subject { client.build_request('select', options) }
+
+    context "when params are symbols" do
+      it 'should return a request context array' do
+        [/fq=0/, /fq=1/, /q=test/, /wt=ruby/].each do |pattern|
+          expect(subject[:query]).to match pattern
+        end
+        expect(subject[:data]).to eq("data")
+        expect(subject[:headers]).to eq({})
       end
-      expect(result[:data]).to eq("data")
-      expect(result[:headers]).to eq({})
     end
-    
-    it "should set the Content-Type header to application/x-www-form-urlencoded; charset=UTF-8 if a hash is passed in to the data arg" do
-      result = client.build_request('select',
-        :method => :post,
-        :data => {:q=>'test', :fq=>[0,1]},
-        :headers => {}
-      )
-      expect(result[:query]).to eq("wt=ruby")
-      [/fq=0/, /fq=1/, /q=test/].each do |pattern|
-        expect(result[:data]).to match pattern
+
+    context "when params are strings" do
+      let(:params) { { 'q' => 'test', 'wt' => 'json' } }
+      it 'should return a request context array' do
+        expect(subject[:query]).to eq 'q=test&wt=json'
+        expect(subject[:data]).to eq("data")
+        expect(subject[:headers]).to eq({})
+      end
+    end
+
+    context "when a Hash is passed in as data" do
+      let(:data) { { q: 'test', fq: [0,1] } }
+      let(:options) { { method: :post, data: data, headers: {} } }
+
+      it "sets the Content-Type header to application/x-www-form-urlencoded; charset=UTF-8" do
+        expect(subject[:query]).to eq("wt=ruby")
+        [/fq=0/, /fq=1/, /q=test/].each do |pattern|
+          expect(subject[:data]).to match pattern
+        end
+        expect(subject[:data]).not_to match /wt=ruby/
+        expect(subject[:headers]).to eq({"Content-Type" => "application/x-www-form-urlencoded; charset=UTF-8"})
       end
-      expect(result[:data]).not_to match /wt=ruby/
-      expect(result[:headers]).to eq({"Content-Type" => "application/x-www-form-urlencoded; charset=UTF-8"})
     end
-    
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Antoine Latter
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rsolr
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr