rsolr 1.0.10.pre1 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f864085d45dbff290a9820ec8f12bb8388ac445a
-  data.tar.gz: 7a117de8e81fb1c59368d4c33bc342ea379f2239
+  metadata.gz: 2c51404db922cb38d87d897879b80c175e6999fe
+  data.tar.gz: 3c6ac7bf24da6216b288442fc10fc9e207941c00
 SHA512:
-  metadata.gz: 00410c0dd950cf7ff57a56dc55ae2d771a7de08f4b139558cd39029f763071709970400c6e99d3a5985135b54e205c576c10d8ac765010cb77e5acf71caeb87d
-  data.tar.gz: 3d274051c0b81c3267bdf9330ff7888c9ad65b7d6d8edb034e840d06f41c5bc49e55f7c8b72a0531518be03350e66b775b26bed9ffb65799b837753cfddcab49
+  metadata.gz: 3ad642cbdd3f948e7f372dbcc75f0e63ae4b011678f2d2b7730f40f378b4298814dbea5fe5a32044317c6537f4eed07064cc1b0e68e429b21bf720bc4ff15e2f
+  data.tar.gz: a3c3283fb33be2db71b9195d5f177075673b819ea5f20e163d0ae69af8b2b7fcfb66f4411edb245f381f3832c8cd4ab8e692e0c01480cb284b10d411d82eafb6

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
+  - 1.8.7
   - jruby-19mode
 
 notifications:
@@ -13,3 +14,7 @@ env:
   global:
     - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+matrix:
+  allow_failures:
+    - rvm: 1.8.7

data/Gemfile

@@ -1,15 +1,19 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
 gem "builder", ">= 2.1.2"
 
 group :development do
-  gem "rake", "~> 0.9.2"
-  gem "rdoc", "~> 3.9.4"
+  gem "rake", ">= 0.9.2"
+  gem "rdoc", ">= 3.9"
 end
 
 group :test do
-  gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.6.0"
-end
+  gem "rake", ">= 0.9.2"
+  gem "rspec", "~> 2.6"
+end
+
+if defined? RUBY_VERSION and RUBY_VERSION < "1.9"
+  gem 'nokogiri', "< 1.6"
+end

data/lib/rsolr/client.rb

@@ -1,4 +1,19 @@
+begin
+  require 'json'
+rescue LoadError
+end
+
 class RSolr::Client
+
+  class << self
+    def default_wt
+      @default_wt || :ruby
+    end
+
+    def default_wt= value
+      @default_wt = value
+    end
+  end
   
   attr_reader :connection, :uri, :proxy, :options
   
@@ -225,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 => :ruby} : {:wt => :ruby}.merge(opts[:params])
+    opts[:params] = opts[:params].nil? ? {:wt => default_wt} : {:wt => default_wt}.merge(opts[:params])
     query = RSolr::Uri.params_to_solr(opts[:params]) unless opts[:params].empty?
     opts[:query] = query
     if opts[:data].is_a? Hash
@@ -266,7 +281,13 @@ class RSolr::Client
     raise "The response does not have the correct keys => :body, :headers, :status" unless
       %W(body headers status) == response.keys.map{|k|k.to_s}.sort
     raise RSolr::Error::Http.new request, response unless [200,302].include? response[:status]
-    result = request[:params][:wt] == :ruby ? evaluate_ruby_response(request, response) : response[:body]
+
+    result = if respond_to? "evaluate_#{request[:params][:wt]}_response", true
+      send "evaluate_#{request[:params][:wt]}_response", request, response
+    else
+      response[:body]
+    end
+
     result.extend Context
     result.request, result.response = request, response
     result.is_a?(Hash) ? result.extend(RSolr::Response) : result
@@ -297,5 +318,18 @@ class RSolr::Client
       raise RSolr::Error::InvalidRubyResponse.new request, response
     end
   end
-  
+
+  def evaluate_json_response request, response
+    return response[:body] unless defined? JSON
+
+    begin
+      JSON.parse response[:body].to_s, :symbolize_names => true
+    rescue JSON::ParserError
+      raise RSolr::Error::InvalidJsonResponse.new request, response
+    end
+  end
+
+  def default_wt
+    self.class.default_wt
+  end
 end

data/lib/rsolr/error.rb

@@ -110,7 +110,19 @@ module RSolr::Error
   
   # Thrown if the :wt is :ruby
   # but the body wasn't succesfully parsed/evaluated
-  class InvalidRubyResponse < Http
+  class InvalidResponse < Http
+
+  end
+
+  # Thrown if the :wt is :ruby
+  # but the body wasn't succesfully parsed/evaluated
+  class InvalidJsonResponse < InvalidResponse
+
+  end
+
+  # Thrown if the :wt is :ruby
+  # but the body wasn't succesfully parsed/evaluated
+  class InvalidRubyResponse < InvalidResponse
     
   end
   

data/lib/rsolr/response.rb

@@ -11,6 +11,14 @@ module RSolr::Response
     end
   end
   
+  def with_indifferent_access
+    if {}.respond_to?(:with_indifferent_access)
+      super.extend RSolr::Response
+    else
+      raise NoMethodError, "undefined method `with_indifferent_access' for #{self.inspect}:#{self.class.name}"
+    end
+  end
+
   # A response module which gets mixed into the solr ["response"]["docs"] array.
   module PaginatedDocSet
 

data/lib/rsolr/version.rb

@@ -0,0 +1,7 @@
+module RSolr
+  VERSION = "1.0.10"
+
+  def self.version
+    VERSION
+  end
+end

data/lib/rsolr.rb

@@ -1,15 +1,12 @@
 $: << "#{File.dirname(__FILE__)}" unless $:.include? File.dirname(__FILE__)
 
 require 'rubygems'
+require 'rsolr/version'
 
 module RSolr
   
   %W(Response Char Client Error Connection Uri Xml).each{|n|autoload n.to_sym, "rsolr/#{n.downcase}"}
   
-  def self.version; "1.0.10.pre1" end
-  
-  VERSION = self.version
-  
   def self.connect *args
     driver = Class === args[0] ? args[0] : RSolr::Connection
     opts = Hash === args[-1] ? args[-1] : {}

data/rsolr.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
-require "rsolr"
+require "rsolr/version"
 
 Gem::Specification.new do |s|
   s.name        = "rsolr"
   s.summary     = "A Ruby client for Apache Solr"
   s.description = %q{RSolr aims to provide a simple and extensible library for working with Solr}
-  s.version     = RSolr.version
+  s.version     = RSolr::VERSION
   s.authors     = ["Antoine Latter", "Dmitry Lihachev",
                   "Lucas Souza", "Peter Kieltyka",
                   "Rob Di Marco", "Magnus Bergmark",
@@ -28,8 +28,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   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', '~> 0.9.2'
   s.add_development_dependency 'rdoc', '~> 3.9.4'
   s.add_development_dependency 'rspec', '~> 2.6.0'
-end
+end

data/spec/api/client_spec.rb

@@ -212,6 +212,17 @@ describe "RSolr::Client" do
       result.should == {:time=>"NOW"}
     end
     
+    it 'should evaluate json responses when the :wt is :json' do
+      body = '{"time": "NOW"}'
+      result = client.adapt_response({:params=>{:wt=>:json}}, {:status => 200, :body => body, :headers => {}})
+      if defined? JSON
+        result.should == {:time=>"NOW"}
+      else
+        # ruby 1.8 without the JSON gem
+        result.should == '{"time": "NOW"}'
+      end
+    end
+
     it "ought raise a RSolr::Error::InvalidRubyResponse when the ruby is indeed frugged, or even fruggified" do
       lambda {
         client.adapt_response({:params=>{:wt => :ruby}}, {:status => 200, :body => "<woops/>", :headers => {}})
@@ -220,6 +231,32 @@ describe "RSolr::Client" do
   
   end
   
+  context "indifferent access" do
+    include ClientHelper
+    it "should raise a NoMethodError if the #with_indifferent_access extension isn't loaded" do
+      # TODO: Find a less implmentation-tied way to test this
+      Hash.any_instance.should_receive(:respond_to?).with(:with_indifferent_access).and_return(false)
+      body = "{'foo'=>'bar'}"
+      result = client.adapt_response({:params=>{:wt=>:ruby}}, {:status => 200, :body => body, :headers => {}})
+      lambda { result.with_indifferent_access }.should raise_error NoMethodError
+    end
+
+    it "should provide indifferent access" do
+      require 'active_support/core_ext/hash/indifferent_access'
+      body = "{'foo'=>'bar'}"
+      result = client.adapt_response({:params=>{:wt=>:ruby}}, {:status => 200, :body => body, :headers => {}})
+      indifferent_result = result.with_indifferent_access
+
+      result.should be_a(RSolr::Response)
+      result['foo'].should == 'bar'
+      result[:foo].should be_nil
+
+      indifferent_result.should be_a(RSolr::Response)
+      indifferent_result['foo'].should == 'bar'
+      indifferent_result[:foo].should == 'bar'
+    end
+  end
+
   context "build_request" do
     include ClientHelper
     it 'should return a request context array' do

data/spec/api/connection_spec.rb

@@ -72,6 +72,7 @@ describe "RSolr::Connection" do
     end
 
     it "should configure Net:HTTP open_timeout" do
+      pending "doesn't work with ruby 1.8" if RUBY_VERSION < "1.9"
       http.should_receive(:request).and_raise(Errno::ECONNREFUSED)
       lambda {
         subject.execute client, request_context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 1.0.10.pre1
+  version: 1.0.10
 platform: ruby
 authors:
 - Antoine Latter
@@ -28,76 +28,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 description: RSolr aims to provide a simple and extensible library for working with
@@ -108,8 +122,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.txt
 - Gemfile
 - LICENSE
@@ -122,6 +136,7 @@ files:
 - lib/rsolr/error.rb
 - lib/rsolr/response.rb
 - lib/rsolr/uri.rb
+- lib/rsolr/version.rb
 - lib/rsolr/xml.rb
 - rsolr.gemspec
 - spec/api/char_spec.rb
@@ -146,17 +161,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: rsolr
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Apache Solr