sunspot 0.9.7 → 0.9.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 9
-:patch: 7
+:patch: 8
 :major: 0

data/lib/sunspot/query/field_facet.rb

@@ -88,8 +88,7 @@ module Sunspot
           :"facet.date" => [@field.indexed_name],
           param_key('date.start') => start_time.utc.xmlschema,
           param_key('date.end') => end_time.utc.xmlschema,
-          param_key('date.gap') => "+#{interval}SECONDS",
-          param_key('date.other') => others
+          param_key('date.gap') => "+#{interval}SECONDS"
         )
       end
 

data/lib/sunspot/session.rb

@@ -15,7 +15,7 @@ module Sunspot
       # For testing purposes
       #
       def connection_class #:nodoc:
-        @connection_class ||= RSolr::Connection
+        @connection_class ||= RSolr
       end
     end
 
@@ -186,11 +186,12 @@ module Sunspot
     def connection
       @connection ||=
         begin
-          connection = self.class.connection_class.new(
-            RSolr::Adapter::HTTP.new(:url => config.solr.url)
-          )
-          connection.adapter.connector.adapter_name = config.http_client
-          connection
+          self.class.connection_class.connect(:url => config.solr.url, :adapter => config.http_client)
+          # connection = self.class.connection_class.new(
+          #   RSolr::Adapter::HTTP.new(:url => config.solr.url)
+          # )
+          # connection.adapter.connector.adapter_name = config.http_client
+          # connection
         end
     end
 

data/spec/api/build_search_spec.rb

@@ -708,28 +708,6 @@ describe 'Search' do
       connection.should have_last_search_with(:"f.published_at_d.facet.date.gap" => "+3600SECONDS")
     end
 
-    it 'should allow computation of one other time' do
-      session.search Post do |query|
-        query.facet :published_at, :time_range => @time_range, :time_other => :before
-      end
-      connection.should have_last_search_with(:"f.published_at_d.facet.date.other" => %w(before))
-    end
-
-    it 'should allow computation of two other times' do
-      session.search Post do |query|
-        query.facet :published_at, :time_range => @time_range, :time_other => [:before, :after]
-      end
-      connection.should have_last_search_with(:"f.published_at_d.facet.date.other" => %w(before after))
-    end
-
-    it 'should not allow computation of bogus other time' do
-      lambda do
-        session.search Post do |query|
-          query.facet :published_at, :time_range => @time_range, :time_other => :bogus
-        end
-      end.should raise_error(ArgumentError)
-    end
-
     it 'should not allow date faceting on a non-date field' do
       lambda do
         session.search Post do |query|

data/spec/api/session_spec.rb

@@ -67,24 +67,24 @@ describe 'Session' do
 
     it 'should open connection with defaults if nothing specified' do
       Sunspot.commit
-      connection.adapter.opts[:url].should == 'http://127.0.0.1:8983/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8983/solr'
     end
 
     it 'should open a connection with custom host' do
       Sunspot.config.solr.url = 'http://127.0.0.1:8981/solr'
       Sunspot.commit
-      connection.adapter.opts[:url].should == 'http://127.0.0.1:8981/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8981/solr'
     end
 
     it 'should use Net::HTTP adapter by default' do
       Sunspot.commit
-      connection.adapter.connector.adapter_name.should == :net_http
+      connection.adapter.should == :net_http
     end
 
     it 'should use Net::HTTP adapter when specified' do
       Sunspot.config.http_client = :curb
       Sunspot.commit
-      connection.adapter.connector.adapter_name.should == :curb
+      connection.adapter.should == :curb
     end
   end
 
@@ -100,7 +100,7 @@ describe 'Session' do
         config.solr.url = 'http://127.0.0.1:8982/solr'
       end
       session.commit
-      connection.adapter.opts[:url].should == 'http://127.0.0.1:8982/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8982/solr'
     end
   end
 

data/spec/integration/spec_helper.rb

@@ -1 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+Spec::Runner.configure do |config|
+  config.before(:all) do
+    Sunspot.config.solr.url = 'http://localhost:8983/solr'
+  end
+end

data/spec/mocks/connection.rb

@@ -1,5 +1,13 @@
 module Mock
   class ConnectionFactory
+    def connect(opts)
+      if @instance
+        raise('Factory can only create an instance once!')
+      else
+        @instance = Connection.new(opts.delete(:adapter), opts)
+      end
+    end
+
     def new(adapter = nil, opts = nil)
       if @instance
         raise('Factory can only create an instance once!')

data/tasks/gemspec.rake

@@ -8,9 +8,9 @@ begin
     s.homepage = 'http://github.com/outoftime/sunspot'
     s.description = 'Library for expressive, powerful interaction with the Solr search engine'
     s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause']
-    s.rubyforge_project = 'sunspot'
     s.files = FileList['[A-Z]*', '{bin,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/conf/*', 'solr/start.jar']
-    s.add_dependency 'mwmitchell-rsolr', '>= 0.8.9'
+    s.rubyforge_project = 'sunspot'
+    s.add_dependency 'mwmitchell-rsolr', '= 0.9.6'
     s.add_dependency 'daemons', '~> 1.0'
     s.add_dependency 'optiflag', '~> 0.6.5'
     s.add_dependency 'haml', '~> 2.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -04:00
+date: 2009-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.9
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -187,8 +187,6 @@ files:
 - templates/schema.xml.haml
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -214,33 +212,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.3.2
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files: 
-- spec/spec_helper.rb
-- spec/integration/spec_helper.rb
+- spec/api/adapters_spec.rb
+- spec/api/build_search_spec.rb
+- spec/api/indexer_spec.rb
+- spec/api/query_spec.rb
+- spec/api/search_retrieval_spec.rb
+- spec/api/session_spec.rb
+- spec/api/spec_helper.rb
+- spec/api/sunspot_spec.rb
+- spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
-- spec/integration/scoped_search_spec.rb
 - spec/integration/keyword_search_spec.rb
-- spec/integration/dynamic_fields_spec.rb
+- spec/integration/scoped_search_spec.rb
+- spec/integration/spec_helper.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb
-- spec/mocks/mock_record.rb
-- spec/mocks/blog.rb
 - spec/mocks/adapters.rb
+- spec/mocks/blog.rb
+- spec/mocks/comment.rb
+- spec/mocks/connection.rb
 - spec/mocks/mock_adapter.rb
-- spec/mocks/user.rb
+- spec/mocks/mock_record.rb
 - spec/mocks/photo.rb
 - spec/mocks/post.rb
-- spec/mocks/comment.rb
-- spec/mocks/connection.rb
-- spec/api/search_retrieval_spec.rb
-- spec/api/spec_helper.rb
-- spec/api/session_spec.rb
-- spec/api/adapters_spec.rb
-- spec/api/build_search_spec.rb
-- spec/api/sunspot_spec.rb
-- spec/api/indexer_spec.rb
-- spec/api/query_spec.rb
+- spec/mocks/user.rb
+- spec/spec_helper.rb