rsolr 1.0.13 → 1.1.1.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e3ceb8a3a7f0e613a2ec1ea63e74f65c6a7f4f8
-  data.tar.gz: 0043fbd129fb4ea74585184df9efb71543689eb7
+  metadata.gz: 93c229e0cee96690d0cf15464b218bab708d4140
+  data.tar.gz: c910de4e9d7c29222713d671f37997eadbf51e4a
 SHA512:
-  metadata.gz: 91eed5ff5587efe17f84b90c1c5cc962a2a4fddda1824002d91a3d8a08ce0eca0123352a736f7f6ab0b119afc54c1705038f886f5e7fbaadbfc02c02f18bfddc
-  data.tar.gz: 403a89708dc1ef43fdd2e7b9b776695f766986aae39c6b9a0ca16a6e4c0f3ce65eb2c60f5f815a0d748439d1cf0d107cc5ab81828cf3992b7153e73761afecb5
+  metadata.gz: 4f97b243fd8ce50b4b9ddcb401f511c3a7a10a59691774c39be08bdca527eab75741378b01410001bf403a6007030deb07161bfaa41f709c52d3d39dc422caf9
+  data.tar.gz: ecd3144115f9f3e2891d7a1c7e7b0c96cd789950d6e13cc3fa99e7d9cf15e464ffacc8abd0b1e7ce122779bc2e5667f2b9655b8817cb9ed6c472c9ab7916a9ec

data/.travis.yml

@@ -1,10 +1,14 @@
+addons:
+  apt:
+    packages:
+    - libgmp-dev
+language: ruby
+sudo: false
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - 1.8.7
-  - jruby-19mode
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+  - jruby-9.0.5.0
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -15,7 +19,3 @@ env:
   global:
     - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-matrix:
-  allow_failures:
-    - rvm: 1.8.7

data/lib/rsolr/client.rb

@@ -15,7 +15,7 @@ class RSolr::Client
     end
   end
   
-  attr_reader :connection, :uri, :proxy, :options
+  attr_reader :connection, :uri, :proxy, :options, :update_path
   
   def initialize connection, options = {}
     @proxy = @uri = nil
@@ -30,6 +30,7 @@ class RSolr::Client
         @proxy = RSolr::Uri.create proxy_url if proxy_url
       end
     end
+    @update_path = options.fetch(:update_path, 'update')
     @options = options
   end
   
@@ -79,7 +80,7 @@ class RSolr::Client
   def update opts = {}
     opts[:headers] ||= {}
     opts[:headers]['Content-Type'] ||= 'text/xml'
-    post 'update', opts
+    post opts.fetch(:path, update_path), opts
   end
   
   # 

data/lib/rsolr/connection.rb

@@ -16,12 +16,12 @@ class RSolr::Connection
       charset = response.type_params["charset"]
       {:status => response.code.to_i, :headers => response.to_hash, :body => force_charset(response.body, charset)}
     rescue Errno::ECONNREFUSED => e
-      raise(Errno::ECONNREFUSED.new(request_context.inspect))
+      raise RSolr::Error::ConnectionRefused, request_context.inspect
     # catch the undefined closed? exception -- this is a confirmed ruby bug
-    rescue NoMethodError
-      $!.message == "undefined method `closed?' for nil:NilClass" ?
-        raise(Errno::ECONNREFUSED.new) :
-        raise($!)
+    rescue NoMethodError => e
+      e.message == "undefined method `closed?' for nil:NilClass" ?
+        raise(RSolr::Error::ConnectionRefused, request_context.inspect) :
+        raise(e)
     end
   end
 
@@ -33,6 +33,10 @@ class RSolr::Connection
       http = if proxy
         proxy_user, proxy_pass = proxy.userinfo.split(/:/) if proxy.userinfo
         Net::HTTP.Proxy(proxy.host, proxy.port, proxy_user, proxy_pass).new uri.host, uri.port
+      elsif proxy == false
+        # If explicitly passing in false, make sure we set proxy_addr to nil
+        # to tell Net::HTTP to *not* use the environment proxy variables.
+        Net::HTTP.new uri.host, uri.port, nil
       else
         Net::HTTP.new uri.host, uri.port
       end
@@ -69,4 +73,4 @@ class RSolr::Connection
     body.force_encoding(charset)
   end
 
-end
+end

data/lib/rsolr/error.rb

@@ -1,9 +1,9 @@
 module RSolr::Error
-  
+
   module SolrContext
-    
+
     attr_accessor :request, :response
-    
+
     def to_s
       m = "#{super.to_s}"
       if response
@@ -19,15 +19,18 @@ module RSolr::Error
       m << p
       m
     end
-    
+
     protected
-    
+
     def parse_solr_error_response body
       begin
-        info = body.scan(/<pre>(.*)<\/pre>/mi)[0]
+        if body =~ /<pre>/
+          info = body.scan(/<pre>(.*)<\/pre>/mi)[0]
+        elsif body =~ /'msg'=>/
+          info = body.scan(/'msg'=>(.*)/)[0]
+        end
         info = info.join if info.respond_to? :join
-
-        info ||= body  # body may not contain <pre> elements
+        info ||= body  # body might not contain <pre> or msg elements
 
         partial = info.to_s.split("\n")[0..10]
         partial.join("\n").gsub("&gt;", ">").gsub("&lt;", "<")
@@ -35,13 +38,17 @@ module RSolr::Error
         nil
       end
     end
-    
+
+
+  end
+
+  class ConnectionRefused < ::Errno::ECONNREFUSED
   end
-  
+
   class Http < RuntimeError
-    
+
     include SolrContext
-    
+
     # ripped right from ActionPack
     # Defines the standard HTTP status codes, by integer, with their
     # corresponding default message texts.
@@ -101,13 +108,13 @@ module RSolr::Error
       507 => "Insufficient Storage",
       510 => "Not Extended"
     }
-    
+
     def initialize request, response
       @request, @response = request, response
     end
-    
+
   end
-  
+
   # Thrown if the :wt is :ruby
   # but the body wasn't succesfully parsed/evaluated
   class InvalidResponse < Http
@@ -123,7 +130,7 @@ module RSolr::Error
   # Thrown if the :wt is :ruby
   # but the body wasn't succesfully parsed/evaluated
   class InvalidRubyResponse < InvalidResponse
-    
+
   end
-  
+
 end

data/lib/rsolr/version.rb

@@ -1,5 +1,5 @@
 module RSolr
-  VERSION = "1.0.13"
+  VERSION = "1.1.1.pre1"
 
   def self.version
     VERSION

data/lib/rsolr/xml.rb

@@ -1,4 +1,5 @@
 begin; require 'nokogiri'; rescue LoadError; end
+require 'time'
 
 module RSolr::Xml
   
@@ -15,11 +16,10 @@ module RSolr::Xml
       @fields = []
       doc_hash.each_pair do |field,values|
         # create a new field for each value (multi-valued)
-        # put non-array values into an array
-        values = [values] unless values.is_a?(Array)
-        values.each do |v|
-          next if v.to_s.empty?
-          @fields << RSolr::Xml::Field.new({:name=>field}, v.to_s)
+        wrap(values).each do |v|
+          v = format_value(v)
+          next if v.empty?
+          @fields << RSolr::Xml::Field.new({:name=>field}, v)
         end
       end
       @attrs={}
@@ -47,9 +47,30 @@ module RSolr::Xml
     def add_field(name, value, options = {})
       @fields << RSolr::Xml::Field.new(options.merge({:name=>name}), value)
     end
-    
+
+    private
+
+    def format_value(v)
+      if v.is_a?(Date) && !v.is_a?(DateTime)
+        Time.utc(v.year, v.mon, v.mday).iso8601
+      elsif v.respond_to?(:to_time) && v.to_time
+        v.to_time.getutc.iso8601
+      else
+        v.to_s
+      end
+    end
+
+    def wrap(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
   end
-  
+
   class Field
     
     # "attrs" is a hash for setting the "doc" xml attributes
@@ -189,7 +210,5 @@ module RSolr::Xml
         end
       end
     end
-    
   end
-  
 end

data/rsolr.gemspec

@@ -29,10 +29,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
+  s.required_ruby_version      = '>= 1.9.3'
+
   s.add_dependency 'builder', '>= 2.1.2'
   s.add_development_dependency 'activesupport'
   s.add_development_dependency 'nokogiri', '>= 1.4.0'
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'rdoc', '~> 4.0'
   s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'solr_wrapper'
 end

data/spec/api/client_spec.rb

@@ -14,6 +14,16 @@ describe "RSolr::Client" do
     it "should accept whatevs and set it as the @connection" do
       expect(RSolr::Client.new(:whatevs).connection).to eq(:whatevs)
     end
+    
+    it "should use :update_path from options" do
+      client = RSolr::Client.new(:whatevs, { update_path: 'update_test' })
+      expect(client.update_path).to eql('update_test')
+    end
+    
+    it "should use 'update' for update_path by default" do
+      client = RSolr::Client.new(:whatevs)
+      expect(client.update_path).to eql('update')
+    end
   end
   
   context "send_and_receive" do
@@ -131,6 +141,18 @@ describe "RSolr::Client" do
           )
       client.update(:data => "<optimize/>")
     end
+
+    it "should use #update_path" do
+      expect(client).to receive(:post).with('update_test', any_args)
+      expect(client).to receive(:update_path).and_return('update_test')
+      client.update({})
+    end
+    
+    it "should use path from opts" do
+      expect(client).to receive(:post).with('update_opts', any_args)
+      allow(client).to receive(:update_path).and_return('update_test')
+      client.update({path: 'update_opts'})
+    end
   end
   
   context "post based helper methods:" do

data/spec/api/connection_spec.rb

@@ -16,6 +16,20 @@ describe "RSolr::Connection" do
     end
   end
 
+  context "when the connection is refused" do
+    subject { RSolr::Connection.new }
+
+    it "raises a custom exception" do
+      http_stub = double("Net:HTTP")
+      http_stub.stub(:request){ raise(Errno::ECONNREFUSED.new) }
+
+      subject.stub(:setup_raw_request){ http_stub }
+      subject.stub(:http){ Net::HTTP.new("localhost", 80) }
+
+      lambda{ subject.execute(nil,{}) }.should raise_error(RSolr::Error::ConnectionRefused)
+    end
+  end
+
   context "read timeout configuration" do
     let(:client) { double.as_null_object }
 

data/spec/api/error_spec.rb

@@ -5,52 +5,42 @@ describe "RSolr::Error" do
   rescue RSolr::Error::Http => exception
     exception
   end
+  let (:response_lines) { (1..15).to_a.map { |i| "line #{i}" } }
+  let(:request)  { double :[] => "mocked" }
+  let(:response_body) { response_lines.join("\n") }
+  let(:response) {{
+    :body   => response_body,
+    :status => 400
+  }}
+  subject { generate_error_with_backtrace(request, response).to_s }
 
   context "when the response body is wrapped in a <pre> element" do
-    before do
-      response_lines = (1..15).to_a.map { |i| "line #{i}" }
-
-      @request  = double :[] => "mocked"
-      @response = {
-        :body   => "<pre>" + response_lines.join("\n") + "</pre>",
-        :status => 400
-      }
-    end
+    let(:response_body) { "<pre>" + response_lines.join("\n") + "</pre>" }
 
     it "only shows the first eleven lines of the response" do
-      error = generate_error_with_backtrace @request, @response
-      expect(error.to_s).to match(/line 1\n.+line 11\n\n/m)
+      expect(subject).to match(/line 1\n.+line 11\n\n/m)
     end
 
-    it "shows only one line when the response is one line long" do
-      @response[:body] = "<pre>failed</pre>"
-
-      error = generate_error_with_backtrace @request, @response
-      expect(error.to_s).to match(/Error: failed/)
+    context "when the response is one line long" do
+      let(:response_body) { "<pre>failed</pre>" }
+      it { should match(/Error: failed/) }
     end
   end
 
   context "when the response body is not wrapped in a <pre> element" do
-    before do
-      response_lines = (1..15).to_a.map { |i| "line #{i}" }
-
-      @request  = double :[] => "mocked"
-      @response = {
-        :body   => response_lines.join("\n"),
-        :status => 400
-      }
-    end
 
     it "only shows the first eleven lines of the response" do
-      error = generate_error_with_backtrace @request, @response
-      expect(error.to_s).to match(/line 1\n.+line 11\n\n/m)
+      expect(subject).to match(/line 1\n.+line 11\n\n/m)
     end
 
-    it "shows only one line when the response is one line long" do
-      @response[:body] = "failed"
-
-      error = generate_error_with_backtrace @request, @response
-      expect(error.to_s).to match(/Error: failed/)
+    context "when the response is one line long" do
+      let(:response_body) { 'failed' }
+      it { should match(/Error: failed/) }
+    end
+    context "when the response body contains a msg key" do
+      let(:msg) { "'org.apache.solr.search.SyntaxError: Cannot parse \\':false\\': Encountered \" \":\" \": \"\" at line 1, column 0.'" }
+      let(:response_body) { (response_lines << "'error'=>{'msg'=> #{msg}").join("\n") }
+      it { should include msg }
     end
   end
 end

data/spec/api/xml_spec.rb

@@ -102,6 +102,17 @@ describe "RSolr::Xml" do
           expect(result).to match(/<field name="name">matt2<\/field>/)
         end
 
+        it 'should allow for objects which can be casted to an array' do
+          name = double("name", to_ary: ['matt1', 'matt2'])
+          data = {
+            :id => 1,
+            :name => name
+          }
+          result = generator.add(data)
+          expect(result).to match(/<field name="name">matt1<\/field>/)
+          expect(result).to match(/<field name="name">matt2<\/field>/)
+        end
+
         it 'should create an add from a single Message::Document' do
           document = RSolr::Xml::Document.new
           document.add_field('id', 1)
@@ -152,5 +163,51 @@ describe "RSolr::Xml" do
 
     end
   end
-    
+
+  context :formatting do
+    it 'should format date objects into ISO 8601' do
+      data = {
+        dt: Date.new(1992, 03, 15)
+      }
+      result = generator.add(data)
+      expect(result).to match(/<field name="dt">1992-03-15T00:00:00Z<\/field>/)
+    end
+
+    it 'should format time objects into ISO 8601' do
+      data = {
+        dt: Time.new(1992, 03, 15, 16, 23, 55, 3600)
+      }
+      result = generator.add(data)
+      expect(result).to match(/<field name="dt">1992-03-15T15:23:55Z<\/field>/)
+    end
+
+    it 'should format datetime objects into ISO 8601' do
+      data = {
+        dt: DateTime.new(1992, 03, 15, 16, 23, 55, '+1')
+      }
+      result = generator.add(data)
+      expect(result).to match(/<field name="dt">1992-03-15T15:23:55Z<\/field>/)
+    end
+
+    it 'passes through other values' do
+      data = {
+        whatever: 'some string'
+      }
+
+      result = generator.add(data)
+      expect(result).to match(/<field name="whatever">some string<\/field>/)
+    end
+
+    # rails monkey-patches String to add a #to_time casting..
+    context 'with rails monkey patching' do
+      it 'passes through string values' do
+        data = {
+          whatever: double(to_s: 'some string', to_time: nil)
+        }
+
+        result = generator.add(data)
+        expect(result).to match(/<field name="whatever">some string<\/field>/)
+      end
+    end
+  end
 end

data/spec/fixtures/basic_configs/_rest_managed.json

@@ -0,0 +1 @@
+{"initArgs":{},"managedList":[]}

data/spec/fixtures/basic_configs/currency.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Example exchange rates file for CurrencyField type named "currency" in example schema -->
+
+<currencyConfig version="1.0">
+  <rates>
+    <!-- Updated from http://www.exchangerate.com/ at 2011-09-27 -->
+    <rate from="USD" to="ARS" rate="4.333871" comment="ARGENTINA Peso" />
+    <rate from="USD" to="AUD" rate="1.025768" comment="AUSTRALIA Dollar" />
+    <rate from="USD" to="EUR" rate="0.743676" comment="European Euro" />
+    <rate from="USD" to="BRL" rate="1.881093" comment="BRAZIL Real" />
+    <rate from="USD" to="CAD" rate="1.030815" comment="CANADA Dollar" />
+    <rate from="USD" to="CLP" rate="519.0996" comment="CHILE Peso" />
+    <rate from="USD" to="CNY" rate="6.387310" comment="CHINA Yuan" />
+    <rate from="USD" to="CZK" rate="18.47134" comment="CZECH REP. Koruna" />
+    <rate from="USD" to="DKK" rate="5.515436" comment="DENMARK Krone" />
+    <rate from="USD" to="HKD" rate="7.801922" comment="HONG KONG Dollar" />
+    <rate from="USD" to="HUF" rate="215.6169" comment="HUNGARY Forint" />
+    <rate from="USD" to="ISK" rate="118.1280" comment="ICELAND Krona" />
+    <rate from="USD" to="INR" rate="49.49088" comment="INDIA Rupee" />
+    <rate from="USD" to="XDR" rate="0.641358" comment="INTNL MON. FUND SDR" />
+    <rate from="USD" to="ILS" rate="3.709739" comment="ISRAEL Sheqel" />
+    <rate from="USD" to="JPY" rate="76.32419" comment="JAPAN Yen" />
+    <rate from="USD" to="KRW" rate="1169.173" comment="KOREA (SOUTH) Won" />
+    <rate from="USD" to="KWD" rate="0.275142" comment="KUWAIT Dinar" />
+    <rate from="USD" to="MXN" rate="13.85895" comment="MEXICO Peso" />
+    <rate from="USD" to="NZD" rate="1.285159" comment="NEW ZEALAND Dollar" />
+    <rate from="USD" to="NOK" rate="5.859035" comment="NORWAY Krone" />
+    <rate from="USD" to="PKR" rate="87.57007" comment="PAKISTAN Rupee" />
+    <rate from="USD" to="PEN" rate="2.730683" comment="PERU Sol" />
+    <rate from="USD" to="PHP" rate="43.62039" comment="PHILIPPINES Peso" />
+    <rate from="USD" to="PLN" rate="3.310139" comment="POLAND Zloty" />
+    <rate from="USD" to="RON" rate="3.100932" comment="ROMANIA Leu" />
+    <rate from="USD" to="RUB" rate="32.14663" comment="RUSSIA Ruble" />
+    <rate from="USD" to="SAR" rate="3.750465" comment="SAUDI ARABIA Riyal" />
+    <rate from="USD" to="SGD" rate="1.299352" comment="SINGAPORE Dollar" />
+    <rate from="USD" to="ZAR" rate="8.329761" comment="SOUTH AFRICA Rand" />
+    <rate from="USD" to="SEK" rate="6.883442" comment="SWEDEN Krona" />
+    <rate from="USD" to="CHF" rate="0.906035" comment="SWITZERLAND Franc" />
+    <rate from="USD" to="TWD" rate="30.40283" comment="TAIWAN Dollar" />
+    <rate from="USD" to="THB" rate="30.89487" comment="THAILAND Baht" />
+    <rate from="USD" to="AED" rate="3.672955" comment="U.A.E. Dirham" />
+    <rate from="USD" to="UAH" rate="7.988582" comment="UKRAINE Hryvnia" />
+    <rate from="USD" to="GBP" rate="0.647910" comment="UNITED KINGDOM Pound" />
+    
+    <!-- Cross-rates for some common currencies -->
+    <rate from="EUR" to="GBP" rate="0.869914" />  
+    <rate from="EUR" to="NOK" rate="7.800095" />  
+    <rate from="GBP" to="NOK" rate="8.966508" />  
+  </rates>
+</currencyConfig>

data/spec/fixtures/basic_configs/lang/stopwords_en.txt

@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+# Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+such
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with

data/spec/fixtures/basic_configs/protwords.txt

@@ -0,0 +1,21 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
+