rsolr 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a439e2ad6e60a3ca89ef3423cd44d860222beec9
-  data.tar.gz: d713c30d050a5e71e7e14a0707fa348ca6509325
+SHA256:
+  metadata.gz: 3b30bc226e290ec41e124233b38c4ff9e3e2a262d7d25fb940c10952c04cdbbe
+  data.tar.gz: 2b0a15cdee7a2c61f9732381f7e38cd0b1345bd2d9f25efc48e57a9609af32ec
 SHA512:
-  metadata.gz: 6730fd4ba6f8f1ed97c4bfa95b6ba0984a46da482a3aeebd4ce6a683e01cc669038319d8aba520bcd88d2c347fc4fe09d2209479b4499e94ba9aafa2d9700808
-  data.tar.gz: 21cf5078ab027b7acd3852b7e118d532829910e844f882660e2860ed241032c75d239153d1bfcb511d0b275ca96b761d0f34eaaf5579027de47f48a93baeb81b
+  metadata.gz: 168b8ba13fa7eedfdba1de36af07e1a65d59545506368573423470a075740d47b5e025dc6ba9f78b74fc6b945d24f3a9bca8b3fdf97469644e7480459db1c115
+  data.tar.gz: 2f4b142ff6b729451bfbac58c49775c8bc221dbaee074e9417ce1edd28ebaf5f8c07687286b001ef5411d35e6a9915fa48d4d3db585a6b6b90ac2b1c25b16129

data/lib/rsolr/client.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'faraday'
 require 'uri'
 
 class RSolr::Client
+  DEFAULT_URL = 'http://127.0.0.1:8983/solr/'
 
   class << self
     def default_wt
@@ -20,9 +23,7 @@ class RSolr::Client
     @proxy = @uri = nil
     @connection = connection
     unless false === options[:url]
-      url = options[:url] ? options[:url].dup : 'http://127.0.0.1:8983/solr/'
-      url << "/" unless url[-1] == ?/
-      @uri = ::URI.parse(url)
+      @uri = extract_url_from_options(options)
       if options[:proxy]
         proxy_url = options[:proxy].dup
         proxy_url << "/" unless proxy_url.nil? or proxy_url[-1] == ?/
@@ -36,6 +37,15 @@ class RSolr::Client
     @options = options
   end
 
+  def extract_url_from_options(options)
+    url = options[:url] ? options[:url].dup : DEFAULT_URL
+    url << "/" unless url[-1] == ?/
+    uri = ::URI.parse(url)
+    # URI::HTTPS is a subclass of URI::HTTP, so this check accepts HTTP(S)
+    raise ArgumentError, "You must provide an HTTP(S) url." unless uri.kind_of?(URI::HTTP)
+    uri
+  end
+
   # returns the request uri object.
   def base_request_uri
     base_uri.request_uri if base_uri

data/lib/rsolr/document.rb

@@ -48,6 +48,9 @@ module RSolr
     def as_json
       @fields.group_by(&:name).each_with_object({}) do |(field, values), result|
         v = values.map(&:as_json)
+        if v.length > 1 && v.first.is_a?(Hash) && v.first[:value]
+          v = v.first.merge(value: v.map { |single| single[:value] })
+        end
         v = v.first if v.length == 1 && field.to_s != CHILD_DOCUMENT_KEY
         result[field] = v
       end

data/lib/rsolr/version.rb

@@ -1,5 +1,5 @@
 module RSolr
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 
   def self.version
     VERSION

data/spec/api/client_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 RSpec.describe RSolr::Client do
   let(:connection) { nil }
-  let(:connection_options) { { url: "http://localhost:9999/solr", read_timeout: 42, open_timeout: 43, update_format: :xml } }
+  let(:url) { "http://localhost:9999/solr" }
+  let(:connection_options) { { url: url, read_timeout: 42, open_timeout: 43, update_format: :xml } }
 
   let(:client) do
     RSolr::Client.new connection, connection_options
@@ -41,6 +42,23 @@ RSpec.describe RSolr::Client do
       client = RSolr::Client.new(:whatevs, { proxy: false })
       expect(client.proxy).to eq(false)
     end
+
+    context "with an non-HTTP url" do
+      let(:url) { "fake://localhost:9999/solr" }
+
+      it "raises an argument error" do
+        expect { client }.to raise_error ArgumentError, "You must provide an HTTP(S) url."
+      end
+    end
+
+    context "with an HTTPS url" do
+      let(:url) { "https://localhost:9999/solr" }
+
+      it "creates a connection" do
+        expect(client.uri).to be_kind_of URI::HTTPS
+      end
+    end
+
   end
 
   context "send_and_receive" do

data/spec/api/json_spec.rb

@@ -149,6 +149,14 @@ RSpec.describe RSolr::JSON do
     expect(message.first).to eq data
   end
 
+  it 'should create multiple fields from array values with options' do
+    message = JSON.parse(
+      generator.add(id: '1') { |doc| doc.add_field(:name, %w[matt1 matt2], boost: 3) },
+      symbolize_names: true
+    )
+    expect(message).to eq [{ id: '1', name: { boost: 3, value: %w[matt1 matt2] } }]
+  end
+
   describe '#commit' do
     it 'generates a commit command' do
       expect(JSON.parse(generator.commit, symbolize_names: true)).to eq(commit: {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Antoine Latter
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Apache Solr
 rubyforge_project: rsolr
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr