solr4r 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8418aa9f1a84f5ff0c9196c7f1a805b8b4e84d
-  data.tar.gz: 4b557a50a64366aa9501f436dc0c2f1d66a5412e
+  metadata.gz: 1eb013ec51b5992887da6af277a1759141707b52
+  data.tar.gz: 3b73d27e55827c539e7a562521bab48d319e5c6b
 SHA512:
-  metadata.gz: b1f608e0dac485d86383efca1f68b099d08e803d57b3371d61cdbfa7de93166207d745ff7068af226086f8ce8d35bbcc8eeb1ae946c31c32f7c0d22707029a3d
-  data.tar.gz: e75af57456ae37f54c70ebd448010b07b9055ea853dcd530521315267c958bad360e52db7bc55e9cee777099712849f3033bee15922a3a257650e4a1e47de187
+  metadata.gz: 2ba2a373cbbe0de467babbc4efcada292cc26d7a0c1ff944fb174399d9c325c74075f596974b239a54f4b2c2c3a8d18226a5d071ef76f6436527fafd6da8d62f
+  data.tar.gz: 13b4e84b371c320b29856e576d9c5a9bcf61ac45eb372d5012b0f686c7ea7d5c5767a5c32201afcd8e90c38a38b0654ed2f8c3af3dcf5a65dbfeef7981ea5123

data/ChangeLog

@@ -2,6 +2,30 @@
 
 = Revision history for solr4r
 
+== 0.0.7 [2015-08-14]
+
+* Fixed Solr4R::Client::Query#json_query for multiple +fq+ parameters.
+* Renamed Solr4R::Response#extend_hash to Solr4R::Response#result_object.
+* Renamed Solr4R::Client::Update#delete_by_id to
+  Solr4R::Client::Update#delete_id.
+* Renamed Solr4R::Client::Update#delete_by_query to
+  Solr4R::Client::Update#delete_query.
+* Renamed Solr4R::Client::Update#delete_all! to
+  Solr4R::Client::Update#delete_all.
+* Added alias Solr4R::Client::Update#clear for
+  Solr4R::Client::Update#delete_all.
+* Added Solr4R::Client#escape.
+* Added Solr4R::Client#query_string.
+* Added Solr4R::Client#local_params_string.
+* Updated Solr4R::Client::Query#more_like_this_q for Solr 5.3.0.
+  * Fixes handling of multiple field names
+    (SOLR-7143[https://issues.apache.org/jira/browse/SOLR-7143]).
+  * Adds support for other MoreLikeThisHandler options
+    (SOLR-7639[https://issues.apache.org/jira/browse/SOLR-7639]).
+* Refactored Solr4R::Endpoints#initialize to accept options hash.
+* Refactored Solr4R::Builder#delete to use Solr4R::Client#query_string for
+  query hashes.
+
 == 0.0.6 [2015-03-18]
 
 * Extracted Solr4R::Endpoints from Solr4R::Client.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to solr4r version 0.0.6
+This documentation refers to solr4r version 0.0.7
 
 
 == DESCRIPTION

data/Rakefile

@@ -13,7 +13,10 @@ begin
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: { nokogiri: '~> 1.6', 'nuggets' => ['~> 1.0', '>= 1.0.1'] },
+
+      dependencies: { nokogiri: '~> 1.6', 'nuggets' => '~> 1.3' },
+
+      development_dependencies: { vcr: '~> 2.9', webmock: '~> 1.21' },
 
       required_ruby_version: '>= 1.9.3'
     }

data/lib/solr4r/builder.rb

@@ -41,16 +41,22 @@ module Solr4R
 
     DEFAULT_OPTIONS = { encoding: 'UTF-8' }
 
-    def initialize(options = {})
+    ILLEGAL_CHAR_RE = /[\x00-\x08\x0B\x0C\x0E-\x1F]/
+
+    def initialize(client, options = client.options)
       raise ArgumentError,
         'block argument not supported, use options hash instead' if block_given?
 
+      @client = client
+
       super(
-        @_solr_opt = DEFAULT_OPTIONS.merge(options),
-        @_solr_doc = Document.new
+        @solr4r_opt = DEFAULT_OPTIONS.merge(options),
+        @solr4r_doc = Document.new
       )
     end
 
+    attr_reader :client
+
     # See Schema[http://wiki.apache.org/solr/UpdateXmlMessages#add.2Freplace_documents].
     #
     # Examples:
@@ -112,7 +118,7 @@ module Solr4R
     #     <add>
     #       <doc>
     #         <field name="id">42</field>
-    #         <field boost="2.0" name="text">blah</field>
+    #         <field name="text" boost="2.0">blah</field>
     #       </doc>
     #     </add>
     #
@@ -123,14 +129,17 @@ module Solr4R
     #     <add commitWithin="23">
     #       <doc boost="10.0">
     #         <field name="id">42</field>
-    #         <field boost="2.0" name="text">blah</field>
+    #         <field name="text" boost="2.0">blah</field>
     #       </doc>
     #     </add>
     def add(doc, attributes = {})
       to_xml(:add, attributes) { |add_node| _each(doc) { |hash, doc_attributes|
         add_node.doc_(doc_attributes) { |doc_node| hash.each { |key, values|
-          field_attributes = (values.is_a?(Array) && values.last.is_a?(Hash) ?
-            (values = values.dup).pop : {}).merge(name: key)
+          field_attributes = { name: key }
+
+          if values.is_a?(Array) && values.last.is_a?(Hash)
+            field_attributes.update((values = values.dup).pop)
+          end
 
           _each(values) { |value| doc_node.field_(value, field_attributes) }
         } }
@@ -261,31 +270,28 @@ module Solr4R
     def delete(hash)
       to_xml(:delete) { |delete_node| hash.each { |key, values|
         case key.to_s
-          when 'id'
-            _each(values) { |id| delete_node.id_(id) }
-          when 'query'
-            _each(values) { |query|
-              delete_node.query_(Client.query_string(query, false)) }
-          else
-            raise ArgumentError, "`id' or `query' expected, got %p" % key
+          when 'id'    then _each(values) { |value| delete_node.id_(value) }
+          when 'query' then _each(values) { |value| delete_node.query_(
+            client.query_string(value, false)) }
+          else raise ArgumentError, "`id' or `query' expected, got %p" % key
         end
       } }
     end
 
     def inspect
-      '#<%s:0x%x %p>' % [self.class, object_id, @_solr_opt]
+      '#<%s:0x%x %p>' % [self.class, object_id, @solr4r_opt]
     end
 
     private
 
     def to_xml(name, attributes = {}, &block)
-      self.parent = self.doc = @_solr_doc.dup
+      self.parent = self.doc = @solr4r_doc.dup
       method_missing(name, attributes, &block)
       replace_illegal_characters(super(&nil))
     end
 
     def replace_illegal_characters(string)
-      string.gsub(/[\x00-\x08\x0B\x0C\x0E-\x1F]/, '')
+      string.gsub(ILLEGAL_CHAR_RE, '')
     end
 
     def _each(values, &block)

data/lib/solr4r/client.rb

@@ -23,12 +23,18 @@
 ###############################################################################
 #++
 
+require 'forwardable'
+
 module Solr4R
 
   class Client
 
     include Logging
 
+    extend Forwardable
+
+    DEFAULT_URI = 'http://%s:%d/%s/%s'
+
     DEFAULT_HOST = 'localhost'
     DEFAULT_PORT = 8983
     DEFAULT_PATH = 'solr'
@@ -39,7 +45,7 @@ module Solr4R
     class << self
 
       def default_uri(options = {})
-        'http://%s:%d/%s/%s' % [
+        DEFAULT_URI % [
           options.fetch(:host, DEFAULT_HOST),
           options.fetch(:port, DEFAULT_PORT),
           options.fetch(:path, DEFAULT_PATH),
@@ -68,7 +74,7 @@ module Solr4R
       end
 
       def local_params_string(local_params, hash = {}, escape = true)
-        case local_params = expand_local_params(local_params, hash)
+        case local_params = expand_local_params(local_params, hash.dup)
           when nil
             # ignore
           when String
@@ -106,7 +112,7 @@ module Solr4R
           when nil
             local_params
           when String, Symbol
-            type_error(local_params, :Array) unless local_params.is_a?(Array)
+            type_error(local_params, Array) unless local_params.is_a?(Array)
 
             local_params.each { |param| hash[param] = "$#{type}.#{param}" }
             hash
@@ -130,18 +136,22 @@ module Solr4R
 
       self.logger  = options.fetch(:logger)  { default_logger }
 
-      self.builder = options.fetch(:builder) { forward_logger(Builder.new) }
+      self.builder = options.fetch(:builder) { forward_logger(
+        Builder.new(self)) }
 
-      self.request = options.fetch(:request) { forward_logger(Request.new(
-        self, uri || options.fetch(:uri) { default_uri })) }
+      self.request = options.fetch(:request) { forward_logger(
+        Request.new(self, uri || options.fetch(:uri) { default_uri })) }
 
-      self.endpoints = forward_logger(Endpoints.new(self))
+      self.endpoints = forward_logger(
+        Endpoints.new(self))
     end
 
     attr_accessor :options, :builder, :request, :default_params, :endpoints
 
     alias_method :ep, :endpoints
 
+    def_delegators 'self.class', :query_string, :local_params_string, :escape
+
     def json(path,
         params = {}, options = {}, &block)
 
@@ -186,7 +196,7 @@ module Solr4R
     end
 
     def amend_options_array(options, key, *value)
-      options.merge(key => Array(options[key]).dup.concat(value))
+      options.merge(key => Array(options[key]) + value)
     end
 
     def send_request(path, options, &block)

data/lib/solr4r/client/admin.rb

@@ -64,6 +64,7 @@ module Solr4R
           params = {}, options = {}, path = DEFAULT_ANALYZE_DOCUMENT_PATH, &block)
 
         doc = builder.doc(doc) unless doc.is_a?(String)
+
         update(doc, amend_options_hash(
           options, :params, wt: :json), path, &block).result % 'analysis'
       end

data/lib/solr4r/client/query.rb

@@ -34,8 +34,15 @@ module Solr4R
 
     MLT_DEFAULT_FL   = '*,score'
     MLT_DEFAULT_ROWS = 5
-    MLT_LOCAL_PARAMS = local_params_string(
-      %w[mintf mindf minwl maxwl], type: :mlt, qf: '$mlt.fl')
+    MLT_LOCAL_PARAMS = local_params_string(%w[
+      maxdf
+      maxntp
+      maxqt
+      maxwl
+      mindf
+      mintf
+      minwl
+    ], type: :mlt, qf: '$mlt.fl')
 
     module Query
 
@@ -44,14 +51,15 @@ module Solr4R
 
         params = params.merge(rows: 0)
         params[:q] ||= MATCH_ALL_QUERY
+
         get(path, params, options, &block)
       end
 
       def json_query(
           params = {}, options = {}, path = DEFAULT_SELECT_PATH, &block)
 
-        json(path, params.merge(Hash[[:q, :fq].map { |key|
-          [key, self.class.query_string(params[key])] }]), options, &block)
+        json(path, params.merge(q: query_string(params[:q]), fq: Array(
+          params[:fq]).map(&method(:query_string))), options, &block)
       end
 
       def json_document(id,
@@ -63,14 +71,20 @@ module Solr4R
       def more_like_this_h(id, fields,
           params = {}, options = {}, path = DEFAULT_MLT_PATH, &block)
 
-        _more_like_this_query({ id: id }, fields, params, options, path, &block)
+        _more_like_this_query({ id: id },
+          fields, params, options, path, &block)
       end
 
       def more_like_this_q(id, fields,
           params = {}, options = {}, path = DEFAULT_SELECT_PATH, &block)
 
-        _more_like_this_query(MLT_LOCAL_PARAMS + id, fields, amend_options_array(
-          params, :fq, '-id' => id, _: { cache: false }), options, path, &block)
+        # Drop after Solr 5.4.0 has been released?
+        # https://issues.apache.org/jira/browse/SOLR-7912
+        params = amend_options_array(
+          params, :fq, '-id' => id, _: { cache: false })
+
+        _more_like_this_query(MLT_LOCAL_PARAMS + id,
+          fields, params, options, path, &block)
       end
 
       alias_method :more_like_this, :more_like_this_q

data/lib/solr4r/client/update.rb

@@ -94,26 +94,28 @@ module Solr4R
       end
 
       # See #delete.
-      def delete_by_id(id,
+      def delete_id(id,
           params = {}, options = {}, &block)
 
         delete({ id: id }, params, options, &block)
       end
 
       # See #delete.
-      def delete_by_query(query,
+      def delete_query(query,
           params = {}, options = {}, &block)
 
         delete({ query: query }, params, options, &block)
       end
 
-      # See #delete_by_query.
-      def delete_all!(
+      # See #delete_query.
+      def delete_all(
           params = {}, options = {}, &block)
 
-        delete_by_query(MATCH_ALL_QUERY, params, options, &block)
+        delete_query(MATCH_ALL_QUERY, params, options, &block)
       end
 
+      alias_method :clear, :delete_all
+
     end
 
     include Update

data/lib/solr4r/endpoints.rb

@@ -31,9 +31,9 @@ module Solr4R
 
     DEFAULT_ENDPOINTS = %w[select query export spell suggest terms debug/dump]
 
-    def initialize(client)
+    def initialize(client, options = client.options)
       @client, @endpoints = client, []
-      register(client.options.fetch(:endpoints, DEFAULT_ENDPOINTS))
+      register(options.fetch(:endpoints, DEFAULT_ENDPOINTS))
     end
 
     attr_reader :client
@@ -59,18 +59,18 @@ module Solr4R
         when Array
           path.each { |args| register(*args) }
         when Hash
-          path.each { |name, opts| register(name,
-            opts.is_a?(Hash) ? opts : { path: opts }) }
+          path.each { |_path, _options| register(_path,
+            _options.is_a?(Hash) ? _options : { path: _options }) }
         else
-          Client.send(:type_error, path, %w[String Symbol Array Hash])
+          client.class.send(:type_error, path, %w[String Symbol Array Hash])
       end
 
       self
     end
 
     def inspect
-      '#<%s:0x%x [%s]>' % [self.class, object_id, @endpoints.map { |name, path|
-        name == path ? name : "#{name}=#{path}" }.join(', ')]
+      '#<%s:0x%x [%s]>' % [self.class, object_id,
+        @endpoints.map { |ep| ep.uniq.join('=') }.join(', ')]
     end
 
     private

data/lib/solr4r/response.rb

@@ -35,7 +35,7 @@ module Solr4R
     DEFAULT_CHARSET = 'UTF-8'
 
     def initialize(request, req = nil, res = nil)
-      @request, @evaluate = request, req.response_body_permitted?
+      @request, @evaluate = request, req && req.response_body_permitted?
 
       if req
         self.request_body    = req.body
@@ -93,8 +93,8 @@ module Solr4R
     def evaluate_result
       case wt = request_params[:wt]
         when String then to_s
-        when :ruby  then extend_hash(eval(to_s))
-        when :json  then extend_hash(JSON.parse(to_s))
+        when :ruby  then result_object(eval(to_s))
+        when :json  then result_object(JSON.parse(to_s))
         else raise 'The response cannot be evaluated: wt=%p not supported.' % wt
       end
     end
@@ -113,7 +113,7 @@ module Solr4R
       Integer(result[Regexp.new(pattern % [name, '(\d+)']), 1])
     end
 
-    def extend_hash(object)
+    def result_object(object)
       object.is_a?(Hash) ? Result.new(self, object) : object
     end
 

data/lib/solr4r/uri_extension.rb

@@ -55,8 +55,7 @@ module Solr4R
 
     def query_pairs(key, value, pairs = [])
       if value.is_a?(Hash)
-        kv = value.fetch(vk = :_, true)
-        pairs << [key, kv] unless kv.nil?
+        kv = value.fetch(vk = :_, true) and pairs << [key, kv]
 
         value.each { |sub, val|
           query_pairs("#{key}.#{sub}", val, pairs) unless sub == vk }

data/lib/solr4r/version.rb

@@ -4,7 +4,7 @@ module Solr4R
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
 
     class << self
 

data/spec/solr4r/builder_spec.rb

@@ -1,5 +1,7 @@
 describe Solr4R::Builder do
 
+  subject { described_class.new(Solr4R::Client.new) }
+
   describe '#add' do
 
     example do
@@ -62,7 +64,7 @@ describe Solr4R::Builder do
 <add>
   <doc>
     <field name="id">42</field>
-    <field boost="2.0" name="text">blah</field>
+    <field name="text" boost="2.0">blah</field>
   </doc>
 </add>
       EOT
@@ -74,7 +76,7 @@ describe Solr4R::Builder do
 <add commitWithin="23">
   <doc boost="10.0">
     <field name="id">42</field>
-    <field boost="2.0" name="text">blah</field>
+    <field name="text" boost="2.0">blah</field>
   </doc>
 </add>
       EOT

data/spec/solr4r/client_spec.rb

@@ -90,4 +90,102 @@ describe Solr4R::Client do
 
   end
 
+  describe 'requests', vcr: true do
+
+    describe '#get' do
+
+      def get(*args)
+        res = subject.get(*args)
+
+        expect(res).to be_success
+        expect(res.response_code).to eq(200)
+
+        res
+      end
+
+      it "should get /select" do
+        res = get('select')
+
+        expect(res.to_i).to eq(0)
+        expect(res.to_s).to be_a(String)
+        expect(res.result).to be_a(Solr4R::Result)
+      end
+
+      it "should get /select JSON result" do
+        res = get('select', wt: :json)
+
+        expect(res.to_i).to eq(0)
+        expect(res.to_s).to be_a(String)
+        expect(res.result).to be_a(Solr4R::Result)
+      end
+
+      it "should get /select JSON string" do
+        res = get('select', wt: 'json')
+
+        expect(res.to_i).to eq(0)
+        expect(res.to_s).to be_a(String)
+        expect(res.result).to be_a(String)
+      end
+
+      it "should get /select XML" do
+        res = get('select', wt: 'xml')
+
+        expect(res.to_i).to eq(0)
+        expect(res.to_s).to be_a(String)
+        expect(res.result).to be_a(String)
+      end
+
+      it "should get /select CSV" do
+        res, err = get('select', wt: :csv), /:csv not supported/
+
+        expect { res.to_i }.to raise_error(err)
+        expect(res.to_s).to be_a(String)
+        expect { res.result }.to raise_error(err)
+      end
+
+      it "should get /select FOO" do
+        res, err = get('select', wt: 'foo'), /"foo" not supported/
+
+        expect { res.to_i }.to raise_error(err)
+        expect(res.to_s).to be_a(String)
+        expect(res.result).to be_a(String)
+      end
+
+      it "should not get /foo" do
+        res = subject.get('foo')
+
+        expect(res).not_to be_success
+        expect(res.response_code).to eq(404)
+      end
+
+    end
+
+    describe '#json' do
+
+      def expect_json(*args)
+        res = subject.json('select', *args)
+
+        expect(res).to be_a(Solr4R::Result)
+        expect(res).to be_a(Solr4R::Result::Response)
+        expect(res.to_i).to eq(0)
+        expect(res).to be_empty
+        expect(res).not_to be_error
+      end
+
+      it "should get /select JSON" do
+        expect_json
+      end
+
+      it "should get /select JSON with wt symbol override" do
+        expect_json(wt: 'foo')
+      end
+
+      it "should get /select JSON with wt string override" do
+        expect_json('wt' => 'foo')
+      end
+
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,12 @@
 $:.unshift('lib') unless $:.first == 'lib'
 
 require 'solr4r'
+require 'vcr'
+
+VCR.configure { |config|
+  config.hook_into :webmock
+  config.configure_rspec_metadata!
+  config.cassette_library_dir = 'spec/vcr_cassettes'
+}
+
+WebMock::Config.instance.query_values_notation = :flat_array

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":1,"params":{"wt":"json"}},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_CSV.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=csv
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: 'address_s,cat,weight,_version_,store,manufacturedate_dt,price_c,includes,incubationdate_dt,id,price,manu,name,features,payloads,manu_id_s,compName_s,inStock,popularity
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_FOO.yml

@@ -0,0 +1,36 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=foo
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/xml; charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="UTF-8"?>
+        <response>
+        <lst name="responseHeader"><int name="status">0</int><int name="QTime">0</int><lst name="params"><str name="wt">foo</str></lst></lst><result name="response" numFound="0" start="0"></result>
+        </response>
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_JSON_result.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":0,"params":{"wt":"json"}},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_JSON_string.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":0,"params":{"wt":"json"}},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_XML.yml

@@ -0,0 +1,36 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=xml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/xml; charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="UTF-8"?>
+        <response>
+        <lst name="responseHeader"><int name="status">0</int><int name="QTime">0</int><lst name="params"><str name="wt">xml</str></lst></lst><result name="response" numFound="0" start="0"></result>
+        </response>
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_get/should_not_get_/foo.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/foo?wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - text/html;charset=ISO-8859-1
+      Cache-Control:
+      - must-revalidate,no-cache,no-store
+      Content-Length:
+      - '1385'
+    body:
+      encoding: UTF-8
+      string: "<html>\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html;
+        charset=ISO-8859-1\"/>\n<title>Error 404 Not Found</title>\n</head>\n<body><h2>HTTP
+        ERROR 404</h2>\n<p>Problem accessing /solr/collection1/foo. Reason:\n<pre>
+        \   Not Found</pre></p><hr /><i><small>Powered by Jetty://</small></i><br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n<br/>
+        \                                               \n<br/>                                                \n\n</body>\n</html>\n"
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_json/should_get_/select_JSON.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":0,"params":{"wt":"json"}},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_json/should_get_/select_JSON_with_wt_string_override.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=foo&wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":0,"params":{"wt":["json","foo"]}},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr_cassettes/Solr4R_Client/requests/_json/should_get_/select_JSON_with_wt_symbol_override.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8983/solr/collection1/select?wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Solr4R/0.0.6
+      Host:
+      - localhost:8983
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":1,"params":{"wt":"json"}},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 13:51:32 GMT
+recorded_with: VCR 2.9.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr4r
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,20 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +75,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +85,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,45 +145,49 @@ files:
 - spec/solr4r/builder_spec.rb
 - spec/solr4r/client_spec.rb
 - spec/spec_helper.rb
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_CSV.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_FOO.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_JSON_result.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_JSON_string.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_get_/select_XML.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_get/should_not_get_/foo.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_json/should_get_/select_JSON.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_json/should_get_/select_JSON_with_wt_string_override.yml
+- spec/vcr_cassettes/Solr4R_Client/requests/_json/should_get_/select_JSON_with_wt_symbol_override.yml
 homepage: http://github.com/blackwinter/solr4r
 licenses:
 - AGPL-3.0
 metadata: {}
 post_install_message: |2+
 
-  solr4r-0.0.6 [2015-03-18]:
+  solr4r-0.0.7 [2015-08-14]:
 
-  * Extracted Solr4R::Endpoints from Solr4R::Client.
-  * Extracted Solr4R::Client::Admin, Solr4R::Client::Query and
-    Solr4R::Client::Update from Solr4R::Client.
-  * Added core to Solr4R::Client.default_uri and adjusted
-    Solr4R::Client::DEFAULT_SYSTEM_PATH.
-  * Added Solr4R::Client::Admin#cores.
-  * Added Solr4R::Client::Admin#fields.
-  * Added Solr4R::Client::Admin#analyze_document.
-  * Added Solr4R::Client::Admin#analyze_field.
-  * Added Solr4R::Client::Query#json_document.
-  * Added Solr4R::Client::Query#more_like_this_h (using the {request
-    handler}[https://cwiki.apache.org/confluence/display/solr/MoreLikeThis]).
-  * Added Solr4R::Client::Query#more_like_this_q (using the {query
-    parser}[https://cwiki.apache.org/confluence/display/solr/Other+Parsers#OtherParsers-MoreLikeThisQueryParser]).
-  * Added support for {local
-    params}[https://cwiki.apache.org/confluence/display/solr/Local+Parameters+in+Queries]
-    to Solr4R::Client.query_string.
-  * Extended Solr4R::RequestUriExtension#query_pairs to skip +nil+ values.
-  * Extended Solr4R::RequestUriExtension#query_pairs to allow control over
-    nested key's value (via +:_+).
-  * Refactored Solr4R::Document#more_like_this to use
-    Solr4R::Client#more_like_this.
-  * Refactored Solr4R::Builder#delete to use Solr4R::Client.query_string for
+  * Fixed Solr4R::Client::Query#json_query for multiple +fq+ parameters.
+  * Renamed Solr4R::Response#extend_hash to Solr4R::Response#result_object.
+  * Renamed Solr4R::Client::Update#delete_by_id to
+    Solr4R::Client::Update#delete_id.
+  * Renamed Solr4R::Client::Update#delete_by_query to
+    Solr4R::Client::Update#delete_query.
+  * Renamed Solr4R::Client::Update#delete_all! to
+    Solr4R::Client::Update#delete_all.
+  * Added alias Solr4R::Client::Update#clear for
+    Solr4R::Client::Update#delete_all.
+  * Added Solr4R::Client#escape.
+  * Added Solr4R::Client#query_string.
+  * Added Solr4R::Client#local_params_string.
+  * Updated Solr4R::Client::Query#more_like_this_q for Solr 5.3.0.
+    * Fixes handling of multiple field names
+      (SOLR-7143[https://issues.apache.org/jira/browse/SOLR-7143]).
+    * Adds support for other MoreLikeThisHandler options
+      (SOLR-7639[https://issues.apache.org/jira/browse/SOLR-7639]).
+  * Refactored Solr4R::Endpoints#initialize to accept options hash.
+  * Refactored Solr4R::Builder#delete to use Solr4R::Client#query_string for
     query hashes.
-  * Refactored Solr4R::Request preparation; dropped
-    Solr4R::HTTPRequestExtension.
-  * Refactored Solr4R::Response initialization.
 
 rdoc_options:
 - "--title"
-- solr4r Application documentation (v0.0.6)
+- solr4r Application documentation (v0.0.7)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -182,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr.