solr4r 0.0.5 → 0.0.6

data/lib/solr4r/uri_extension.rb

@@ -7,7 +7,7 @@
 #                                                                             #
 # Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
-# Mir is free software: you can redistribute it and/or modify it under the    #
+# solr4r is free software: you can redistribute it and/or modify it under the #
 # terms of the GNU Affero General Public License as published by the Free     #
 # Software Foundation, either version 3 of the License, or (at your option)   #
 # any later version.                                                          #
@@ -55,12 +55,13 @@ module Solr4R
 
     def query_pairs(key, value, pairs = [])
       if value.is_a?(Hash)
-        pairs << [key, true]
+        kv = value.fetch(vk = :_, true)
+        pairs << [key, kv] unless kv.nil?
 
         value.each { |sub, val|
-          query_pairs("#{key}.#{sub}", val, pairs) }
+          query_pairs("#{key}.#{sub}", val, pairs) unless sub == vk }
       else
-        Array(value).each { |val| pairs << [key, val] }
+        Array(value).each { |val| pairs << [key, val] unless val.nil? }
       end
 
       pairs

data/lib/solr4r/version.rb

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

data/lib/solr4r.rb

@@ -5,9 +5,9 @@
 #                                                                             #
 # solr4r -- A Ruby client for Apache Solr                                     #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
-# Mir is free software: you can redistribute it and/or modify it under the    #
+# solr4r is free software: you can redistribute it and/or modify it under the #
 # terms of the GNU Affero General Public License as published by the Free     #
 # Software Foundation, either version 3 of the License, or (at your option)   #
 # any later version.                                                          #
@@ -40,4 +40,5 @@ require_relative 'solr4r/logging'
 require_relative 'solr4r/builder'
 require_relative 'solr4r/request'
 require_relative 'solr4r/response'
+require_relative 'solr4r/endpoints'
 require_relative 'solr4r/client'

data/spec/solr4r/builder_spec.rb

@@ -1,13 +1,9 @@
 describe Solr4R::Builder do
 
-  before :all do
-    @builder = Solr4R::Builder.new
-  end
-
   describe '#add' do
 
     example do
-      @builder.add(employeeId: '05991', office: 'Bridgewater', skills: %w[Perl Java]).should == <<-EOT
+      expect(subject.add(employeeId: '05991', office: 'Bridgewater', skills: %w[Perl Java])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add>
   <doc>
@@ -21,7 +17,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.add([{ employeeId: '05992', office: 'Blackwater' }, { employeeId: '05993', skills: 'Ruby' }]).should == <<-EOT
+      expect(subject.add([{ employeeId: '05992', office: 'Blackwater' }, { employeeId: '05993', skills: 'Ruby' }])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add>
   <doc>
@@ -37,7 +33,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.add([id: 42, text: 'blah'], commitWithin: 23).should == <<-EOT
+      expect(subject.add([id: 42, text: 'blah'], commitWithin: 23)).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add commitWithin="23">
   <doc>
@@ -49,7 +45,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.add([[{ id: 42, text: 'blah' }, { boost: 10.0 }]]).should == <<-EOT
+      expect(subject.add([[{ id: 42, text: 'blah' }, boost: 10.0]])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add>
   <doc boost="10.0">
@@ -61,7 +57,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.add(id: 42, text: ['blah', boost: 2.0]).should == <<-EOT
+      expect(subject.add(id: 42, text: ['blah', boost: 2.0])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add>
   <doc>
@@ -73,7 +69,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.add([[{ id: 42, text: ['blah', boost: 2.0] }, { boost: 10.0 }]], commitWithin: 23).should == <<-EOT
+      expect(subject.add([[{ id: 42, text: ['blah', boost: 2.0] }, boost: 10.0]], commitWithin: 23)).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add commitWithin="23">
   <doc boost="10.0">
@@ -85,7 +81,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.add(employeeId: '05991', office: "\fBridgew\ate\r", skills: %w[Perl Java]).should == <<-EOT
+      expect(subject.add(employeeId: '05991', office: "\fBridgew\ate\r", skills: %w[Perl Java])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <add>
   <doc>
@@ -103,14 +99,14 @@ describe Solr4R::Builder do
   describe '#commit' do
 
     example do
-      @builder.commit.should == <<-EOT
+      expect(subject.commit).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <commit/>
       EOT
     end
 
     example do
-      @builder.commit(softCommit: true).should == <<-EOT
+      expect(subject.commit(softCommit: true)).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <commit softCommit="true"/>
       EOT
@@ -121,14 +117,14 @@ describe Solr4R::Builder do
   describe '#optimize' do
 
     example do
-      @builder.optimize.should == <<-EOT
+      expect(subject.optimize).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <optimize/>
       EOT
     end
 
     example do
-      @builder.optimize(maxSegments: 42).should == <<-EOT
+      expect(subject.optimize(maxSegments: 42)).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <optimize maxSegments="42"/>
       EOT
@@ -139,7 +135,7 @@ describe Solr4R::Builder do
   describe '#rollback' do
 
     example do
-      @builder.rollback.should == <<-EOT
+      expect(subject.rollback).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <rollback/>
       EOT
@@ -150,7 +146,7 @@ describe Solr4R::Builder do
   describe '#delete' do
 
     example do
-      @builder.delete(id: '05991').should == <<-EOT
+      expect(subject.delete(id: '05991')).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
   <id>05991</id>
@@ -159,7 +155,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.delete(id: %w[05991 06000]).should == <<-EOT
+      expect(subject.delete(id: %w[05991 06000])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
   <id>05991</id>
@@ -169,7 +165,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.delete(query: 'office:Bridgewater').should == <<-EOT
+      expect(subject.delete(query: 'office:Bridgewater')).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
   <query>office:Bridgewater</query>
@@ -178,7 +174,7 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.delete(query: %w[office:Bridgewater office:Osaka]).should == <<-EOT
+      expect(subject.delete(query: %w[office:Bridgewater office:Osaka])).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
   <query>office:Bridgewater</query>
@@ -188,39 +184,45 @@ describe Solr4R::Builder do
     end
 
     example do
-      @builder.delete(query: { office: 'Bridgewater', skills: 'Perl' }).should == <<-EOT
+      expect(subject.delete(query: { office: 'Bridgewater', skills: 'Perl' })).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
-  <query>office:Bridgewater</query>
-  <query>skills:Perl</query>
+  <query>office:Bridgewater skills:Perl</query>
 </delete>
       EOT
     end
 
     example do
-      @builder.delete(query: { office: %w[Bridgewater Osaka] }).should == <<-EOT
+      expect(subject.delete(query: { office: %w[Bridgewater Osaka] })).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
-  <query>office:Bridgewater</query>
-  <query>office:Osaka</query>
+  <query>office:Bridgewater office:Osaka</query>
+</delete>
+      EOT
+    end
+
+    example do
+      expect(subject.delete(query: { office: 'Bridgewater', _: { type: :edismax } })).to eq(<<-EOT)
+<?xml version="1.0" encoding="UTF-8"?>
+<delete>
+  <query>{!type=edismax}office:Bridgewater</query>
 </delete>
       EOT
     end
 
     example do
-      @builder.delete(id: %w[05991 06000], query: { office: %w[Bridgewater Osaka] }).should == <<-EOT
+      expect(subject.delete(id: %w[05991 06000], query: { office: %w[Bridgewater Osaka] })).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
   <id>05991</id>
   <id>06000</id>
-  <query>office:Bridgewater</query>
-  <query>office:Osaka</query>
+  <query>office:Bridgewater office:Osaka</query>
 </delete>
       EOT
     end
 
     example do
-      @builder.delete(query: "office:\fBridgew\ate\r").should == <<-EOT
+      expect(subject.delete(query: "office:\fBridgew\ate\r")).to eq(<<-EOT)
 <?xml version="1.0" encoding="UTF-8"?>
 <delete>
   <query>office:Bridgewte&#13;</query>
@@ -228,6 +230,24 @@ describe Solr4R::Builder do
       EOT
     end
 
+    example do
+      expect(subject.delete(query: 'office:Bridge&water')).to eq(<<-EOT)
+<?xml version="1.0" encoding="UTF-8"?>
+<delete>
+  <query>office:Bridge&amp;water</query>
+</delete>
+      EOT
+    end
+
+    example do
+      expect(subject.delete(query: { office: 'Bridge&water' })).to eq(<<-EOT)
+<?xml version="1.0" encoding="UTF-8"?>
+<delete>
+  <query>office:Bridge&amp;water</query>
+</delete>
+      EOT
+    end
+
   end
 
 end

data/spec/solr4r/client_spec.rb

@@ -0,0 +1,93 @@
+describe Solr4R::Client do
+
+  describe '::query_string' do
+
+    [
+      [nil, nil],
+      [nil, ''],
+      [nil, []],
+      [nil, {}],
+
+      ['title:foo', 'title:foo'],
+      ['title:foo%26bar', 'title:foo&bar'],
+      ['title:foo&bar', 'title:foo&bar', false],
+
+      ['title:foo author:bar', 'title:foo author:bar'],
+      ['title:foo author:(bar baz)', 'title:foo author:(bar baz)'],
+      ['title:foo -author:(bar baz)', 'title:foo -author:(bar baz)'],
+
+      ['title:foo', %w[title:foo]],
+      ['title:foo%26bar', %w[title:foo&bar]],
+      ['title:foo&bar', %w[title:foo&bar], false],
+
+      ['title:foo author:bar', %w[title:foo author:bar]],
+      ['title:foo author:bar', ['title:foo', author: 'bar']],
+      ['title:foo author:(bar baz)', %w[title:foo author:(bar\ baz)]],
+      ['title:foo -author:(bar baz)', %w[title:foo -author:(bar\ baz)]],
+      ['title:foo -author%26:(bar baz)', %w[title:foo -author&:(bar\ baz)]],
+      ['title:foo -author&:(bar baz)', %w[title:foo -author&:(bar\ baz)], false],
+
+      ['title:foo', title: 'foo'],
+      ['title:foo%26bar', title: 'foo&bar'],
+      ['title:foo&bar', { title: 'foo&bar' }, false],
+      ['title:foo%26bar%26baz', title: 'foo&bar&baz'],
+      ['title:foo&bar&baz', { title: 'foo&bar&baz' }, false],
+
+      ['title:foo author:bar', title: 'foo', author: 'bar'],
+      ['title:foo author:(bar baz)', title: 'foo', author: '(bar baz)'],
+      ['title:foo -author:(bar baz)', title: 'foo', '-author' => '(bar baz)'],
+      ['title:foo -author%26:(bar baz)', title: 'foo', '-author&' => '(bar baz)'],
+      ['title:foo -author&:(bar baz)', { title: 'foo', '-author&' => '(bar baz)' }, false],
+
+      ['title:foo author:bar author:baz', title: 'foo', author: %w[bar baz]],
+      ['title:foo author:bar%26baz', title: 'foo', author: %w[bar&baz]],
+      ['title:foo author:bar&baz', { title: 'foo', author: %w[bar&baz] }, false],
+      ['title:foo -author:bar -author:baz', title: 'foo', '-author' => %w[bar baz]],
+      ['title:foo -author%26:bar -author%26:baz', title: 'foo', '-author&' => %w[bar baz]],
+      ['title:foo -author&:bar -author&:baz', { title: 'foo', '-author&' => %w[bar baz] }, false],
+
+      ['{!q.op=AND}title:foo', title: 'foo', _: 'q.op=AND'],
+      ['{!q.op=AND}title:foo author:bar', ['title:foo', author: 'bar', _: 'q.op=AND']],
+      ['{!q.op=AND df=title}foo', ['foo', _: 'q.op=AND df=title']],
+      ['{!q.op=AND df=title}foo', ['foo', _: %w[q.op=AND df=title]]],
+      ['{!q.op=AND df=title}foo', ['foo', _: { 'q.op' => 'AND', df: :title }]]
+    ].each_with_index { |(expected, *args), index|
+      example(index) { expect(described_class.query_string(*args)).to eq(expected) }
+    }
+
+  end
+
+  describe '::local_params_string' do
+
+    [
+      [nil, nil],
+      [nil, ''],
+      [nil, []],
+      [nil, {}],
+
+      ['{!q.op=AND df=title}', 'q.op=AND df=title'],
+      ['{!q.op=AND df=title}', %w[q.op=AND df=title]],
+      ['{!q.op=AND df=title}', 'q.op' => 'AND', df: :title],
+
+      ['{!type=dismax qf="myfield yourfield"}', 'type=dismax qf="myfield yourfield"'],
+      ['{!type=dismax qf="myfield yourfield"}', ['type=dismax', 'qf="myfield yourfield"']],
+      ['{!type=dismax qf="myfield yourfield"}', type: :dismax, qf: 'myfield yourfield'],
+
+      ['{!type=dismax qf="myfield%26yourfield"}', 'type=dismax qf="myfield&yourfield"'],
+      ['{!type=dismax qf="myfield&yourfield"}', 'type=dismax qf="myfield&yourfield"', {}, false],
+      ['{!type=dismax qf="myfield%26yourfield"}', ['type=dismax', 'qf="myfield&yourfield"']],
+      ['{!type=dismax qf=myfield%26yourfield}', type: :dismax, qf: 'myfield&yourfield'],
+
+      ['{!type=mlt qf=$mlt.fl mintf=$mlt.mintf mindf=$mlt.mindf minwl=$mlt.minwl maxwl=$mlt.maxwl}',
+       'type=mlt qf=$mlt.fl mintf=$mlt.mintf mindf=$mlt.mindf minwl=$mlt.minwl maxwl=$mlt.maxwl'],
+      ['{!type=mlt qf=$mlt.fl mintf=$mlt.mintf mindf=$mlt.mindf minwl=$mlt.minwl maxwl=$mlt.maxwl}',
+       %w[type=mlt qf=$mlt.fl mintf=$mlt.mintf mindf=$mlt.mindf minwl=$mlt.minwl maxwl=$mlt.maxwl]],
+      ['{!type=mlt qf=$mlt.fl mintf=$mlt.mintf mindf=$mlt.mindf minwl=$mlt.minwl maxwl=$mlt.maxwl}',
+       %w[mintf mindf minwl maxwl], type: :mlt, qf: '$mlt.fl']
+    ].each_with_index { |(expected, *args), index|
+      example(index) { expect(described_class.local_params_string(*args)).to eq(expected) }
+    }
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,7 +1,3 @@
 $:.unshift('lib') unless $:.first == 'lib'
 
 require 'solr4r'
-
-RSpec.configure { |config|
-  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
-}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr4r
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -109,15 +109,19 @@ files:
 - lib/solr4r.rb
 - lib/solr4r/builder.rb
 - lib/solr4r/client.rb
+- lib/solr4r/client/admin.rb
+- lib/solr4r/client/query.rb
+- lib/solr4r/client/update.rb
 - lib/solr4r/document.rb
+- lib/solr4r/endpoints.rb
 - lib/solr4r/logging.rb
 - lib/solr4r/request.rb
-- lib/solr4r/request_extension.rb
 - lib/solr4r/response.rb
 - lib/solr4r/result.rb
 - lib/solr4r/uri_extension.rb
 - lib/solr4r/version.rb
 - spec/solr4r/builder_spec.rb
+- spec/solr4r/client_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/blackwinter/solr4r
 licenses:
@@ -125,18 +129,39 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  solr4r-0.0.5 [2015-02-11]:
+  solr4r-0.0.6 [2015-03-18]:
 
-  * Fixed Solr4R::Result for unsupported types.
-  * Extended Solr4R::Result for
-    {facet counts}[https://wiki.apache.org/solr/SolrFacetingOverview].
-  * Extended Solr4R::Client and Solr4R::Document for
-    MoreLikeThis[https://wiki.apache.org/solr/MoreLikeThis] queries.
-  * Extended Solr4R::RequestUriExtension for nested params (via hashes).
+  * 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
+    query hashes.
+  * Refactored Solr4R::Request preparation; dropped
+    Solr4R::HTTPRequestExtension.
+  * Refactored Solr4R::Response initialization.
 
 rdoc_options:
 - "--title"
-- solr4r Application documentation (v0.0.5)
+- solr4r Application documentation (v0.0.6)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -157,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr.

data/lib/solr4r/request_extension.rb

@@ -1,44 +0,0 @@
-# encoding: utf-8
-
-#--
-###############################################################################
-#                                                                             #
-# solr4r -- A Ruby client for Apache Solr                                     #
-#                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
-#                                                                             #
-# Mir is free software: you can redistribute it and/or modify it under the    #
-# terms of the GNU Affero General Public License as published by the Free     #
-# Software Foundation, either version 3 of the License, or (at your option)   #
-# any later version.                                                          #
-#                                                                             #
-# solr4r is distributed in the hope that it will be useful, but WITHOUT ANY   #
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU Affero General Public License    #
-# along with solr4r. If not, see <http://www.gnu.org/licenses/>.              #
-#                                                                             #
-###############################################################################
-#++
-
-require 'cgi'
-
-module Solr4R
-
-  module HTTPRequestExtension
-
-    def self.extended(base)
-      base.send(:attr_accessor, :params)
-    end
-
-    def from_uri(uri)
-      req = new(uri)
-      req.params = uri.params
-      req
-    end
-
-  end
-
-end