sunspot 2.0.0.pre.120720 → 2.0.0.pre.120924

data/sunspot/lib/sunspot/version.rb

@@ -0,0 +1,3 @@
+module Sunspot
+  VERSION = '2.0.0.pre.120924'
+end

data/sunspot/spec/api/adapters_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe Sunspot::Adapters::InstanceAdapter do
+  it "finds adapter by superclass" do
+    Sunspot::Adapters::InstanceAdapter::for(Model).should be(AbstractModelInstanceAdapter)
+  end
+
+  it "finds adapter by mixin" do
+    Sunspot::Adapters::InstanceAdapter::for(MixModel).should be(MixInModelInstanceAdapter)
+  end
+
+  it 'throws NoAdapterError if anonymous module passed in' do
+    lambda do
+      Sunspot::Adapters::InstanceAdapter::for(Module.new)
+    end.should raise_error(Sunspot::NoAdapterError)
+  end
+end
+
+describe Sunspot::Adapters::DataAccessor do
+  it "finds adapter by superclass" do
+    Sunspot::Adapters::DataAccessor::for(Model).should be(AbstractModelDataAccessor)
+  end
+
+  it "finds adapter by mixin" do
+    Sunspot::Adapters::DataAccessor::for(MixModel).should be(MixInModelDataAccessor)
+  end
+
+  it 'throws NoAdapterError if anonymous module passed in' do
+    lambda do
+      Sunspot::Adapters::DataAccessor::for(Module.new)
+    end.should raise_error(Sunspot::NoAdapterError)
+  end
+end
+
+describe Sunspot::Adapters::Registry do
+  let(:registry){ Sunspot::Adapters::Registry.new }
+  let(:abstractclass_accessor){ Sunspot::Adapters::DataAccessor::for(AbstractModel) }
+  let(:superclass_accessor){ Sunspot::Adapters::DataAccessor::for(Model) }
+  let(:mixin_accessor){ Sunspot::Adapters::DataAccessor::for(MixModel) }
+
+  it "registers and retrieves a data accessor for abstractclass" do
+      registry.retrieve(AbstractModel).should be_a(abstractclass_accessor)
+  end
+
+  it "registers and retrieves a data accessor for superclass" do
+      registry.retrieve(Model).should be_a(superclass_accessor)
+  end
+
+  it "registers and retrieves a data accessor for mixin" do
+      registry.retrieve(MixModel).should be_a(mixin_accessor)
+  end
+
+  it "injects inherited attributes" do
+    AbstractModelDataAccessor.any_instance.stub(:inherited_attributes).and_return([:to_be_injected])
+    in_registry_data_accessor = registry.retrieve(AbstractModel)
+    in_registry_data_accessor.to_be_injected = "value"
+    registry.retrieve(Model).to_be_injected.should == "value"
+  end
+
+  it "not overrides inherited attributes" do
+    AbstractModelDataAccessor.any_instance.stub(:inherited_attributes).and_return([:to_be_injected])
+    parent_data_accessor = registry.retrieve(AbstractModel)
+    current_data_accessor = registry.retrieve(Model)
+    parent_data_accessor.to_be_injected = "value"
+    current_data_accessor.to_be_injected = "safe-value"
+    registry.retrieve(Model).to_be_injected.should == "safe-value"
+  end
+end

data/{spec → sunspot/spec}/api/query/connectives_examples.rb

@@ -186,4 +186,16 @@ shared_examples_for "query with connective scope" do
     end
     connection.should_not have_last_search_including(:fq, '')
   end
+
+  it 'creates a conjunction of in_radius queries' do
+    search do
+      any_of do
+        with(:coordinates_new).in_radius(23, -46, 100)
+        with(:coordinates_new).in_radius(42, 56, 50)
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '(_query_:"{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}" OR _query_:"{!geofilt sfield=coordinates_new_ll pt=42,56 d=50}")'
+    )
+  end
 end

data/{spec → sunspot/spec}/api/query/faceting_examples.rb

@@ -89,14 +89,7 @@ shared_examples_for "facetable query" do
       end
       connection.should have_last_search_with(:"f.title_ss.facet.prefix" => 'Test')
     end
-
-    it 'escapes the facet prefix' do
-      search do
-        facet :title, :prefix => 'Test Title'
-      end
-      connection.should have_last_search_with(:"f.title_ss.facet.prefix" => 'Test\ Title')
-    end
-
+    
     it 'sends a query facet for :any extra' do
       search do
         facet :category_ids, :extra => :any
@@ -294,6 +287,13 @@ shared_examples_for "facetable query" do
       connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
     end
 
+    it 'sets the include if one is specified' do
+      search do |query|
+        query.facet :average_rating, :range => @range, :include => :edge
+      end
+      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.include" => "edge")
+    end
+
     it 'does not allow date faceting on a non-continuous field' do
       lambda do
         search do |query|

data/{spec → sunspot/spec}/api/search/hits_spec.rb

@@ -43,10 +43,26 @@ describe 'hits', :type => :search do
     stub_results(*posts)
     search = session.search(Post)
     hits, results = [], []
+
     search.each_hit_with_result do |hit, result|
       hits << hit
       results << result
     end
+
+    hits.should have(2).hits
+    results.should have(2).results
+  end
+
+  it 'should provide an Enumerator over hits with instances' do
+    posts = Array.new(2) { Post.new }
+    stub_results(*posts)
+    search = session.search(Post)
+    hits, results = [], []
+    search.each_hit_with_result.with_index do |(hit, result), index|
+      hit.should be_kind_of(Sunspot::Search::Hit)
+      result.should be_kind_of(Post)
+      index.should be_kind_of(Integer)
+    end
   end
 
   it 'should hydrate all hits when an instance is requested from a hit' do

data/{spec → sunspot/spec}/api/session_proxy/retry_5xx_session_proxy_spec.rb

@@ -9,6 +9,11 @@ describe Sunspot::SessionProxy::Retry5xxSessionProxy do
     Sunspot.session = @proxy
   end
 
+  after :each do
+    Sunspot::Session.connection_class = nil
+    Sunspot.reset!(true)
+  end
+
   class FakeRSolrErrorHttp < RSolr::Error::Http
     def backtrace
       []

data/{spec → sunspot/spec}/api/sunspot_spec.rb

@@ -4,11 +4,11 @@ describe Sunspot do
 
   describe "setup" do
     it "should register the class in Sunspot.searchable" do
-      Sunspot.setup(Blog) do
+      Sunspot.setup(User) do
         text :name
       end
       Sunspot.searchable.should_not be_empty
-      Sunspot.searchable.should include(Blog)
+      Sunspot.searchable.should include(User)
     end
   end
 

data/{spec → sunspot/spec}/integration/faceting_spec.rb

@@ -156,6 +156,32 @@ describe 'search faceting' do
     end
   end
 
+  context 'prefix escaping' do
+    before do
+      Sunspot.remove_all
+      ["title1", "title2", "title with spaces 1", "title with spaces 2", "title/with/slashes/1", "title/with/slashes/2"].each do |value|
+        Sunspot.index(Post.new(:title => value, :blog_id => 1))
+      end
+      Sunspot.commit
+    end
+
+    it 'should limit facet values by a prefix with spaces' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :prefix => 'title '
+      end
+      search.facet(:title).rows.map { |row| row.value }.sort.should == ["title with spaces 1", "title with spaces 2"]
+    end
+
+    it 'should limit facet values by a prefix with slashes' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :prefix => 'title/'
+      end
+      search.facet(:title).rows.map { |row| row.value }.sort.should == ["title/with/slashes/1", "title/with/slashes/2"]
+    end
+  end
+
   context 'multiselect faceting' do
     before do
       Sunspot.remove_all

data/{spec → sunspot/spec}/integration/geospatial_spec.rb

@@ -25,6 +25,17 @@ describe "geospatial search" do
 
       results.should_not include(@post)
     end
+
+    it "allows conjunction queries" do
+      results = Sunspot.search(Post) {
+        any_of do
+          with(:coordinates_new).in_radius(32, -68, 1)
+          with(:coordinates_new).in_radius(35, 68, 1)
+        end
+      }.results
+
+      results.should include(@post)
+    end
   end
 
   describe "filtering by bounding box" do

data/{spec → sunspot/spec}/mocks/adapters.rb

@@ -8,6 +8,7 @@ class AbstractModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
 end
 
 class AbstractModelDataAccessor < Sunspot::Adapters::DataAccessor
+  attr_accessor :to_be_injected
 end
 
 Sunspot::Adapters::InstanceAdapter.register(AbstractModelInstanceAdapter, AbstractModel)

data/sunspot_rails/.gitignore

@@ -0,0 +1,7 @@
+sunspot-solr.pid
+doc
+pkg/*
+log
+.bundle
+tmp/*
+gemfiles/*.lock

data/sunspot_rails/.rspec

@@ -0,0 +1 @@
+--color

data/sunspot_rails/History.txt

@@ -0,0 +1,74 @@
+== 2.0.0
+* Finds orphaned objects in batches to avoid excessive memory use (Peer Allan)
+* Default batch size can be specified by setting `Sunspot.config.indexing.default_batch_size`
+  (Peer Allan)
+* Explanation of `progress_bar` is written to stdout instead of stderr (Matt Gornick)
+* Fixes deprecated behavior of using InstanceMethods module with
+  ActiveSupport::Concern (Everton J. Carpes)
+
+== 1.3.0 2011-11-26
+* `Model.index` correctly uses `:first_id` option (Hamza Khan-Cheema)
+* Solr request performance is instrumented in Rails (Paco Guzmán)
+* Reindexing tasks display a progress bar if `progress_bar` gem is available (Paul Carey)
+* Deprecated Rails syntax is removed from `Sunspot::Rails::Searchable` (Steve Schwartz)
+* Deprecated syntax is removed from rake tasks (Huned Botee)
+* `sunspot:reindex` rake task correctly handles namespaced models (João Gradim)
+* `bind_address` parameter can be specified in `sunspot.yml` to bind Solr to a
+  specific interface (Sylvain Utard)
+* `disabled` parameter can be specified in `sunspot.yml` to stub out the
+  connection to Solr (David B)
+
+== 1.2.1 2010-12-28
+* Decreased default reindexing batch size from 500 to 50
+
+== 1.2.0 2010-12-28
+* Compatible with both Rails 2 and Rails 3
+* Configure Sunspot with a SOLR_URL or WEBSOLR_URL environment variable, also
+  provide a default port based on Rails.env.
+* Fix the 'Anonymous modules' ArgumentError for Ruby 1.9.2 and Rails 2.3
+* Fix SQL's ambiguous ID issue when tables are joined
+
+== 1.1.0 2010-04-01
+* Added include option to searchable options to allow definition of eager
+  loading associations when indexing
+
+== 1.0.4 2010-03-19
+* Fix StubSessionProxy to match new internal API
+
+== 1.0.2 2010-03-11
+* Allow use of ActiveRecord object for coordinates extraction
+* Works with non-standard primary keys
+* Add :include, :select options to Searchable::search()
+* Allow specification of min_memory and max_memory in config/sunspot.yml
+* Searchable now more considerate of model namespaces
+
+== 1.0.1 2010-03-05
+* Fix Solr logging compatibility with RSolr 0.12.1
+
+== 1.0.0 2010-03-03
+* Sunspot::Rails::Server subclasses Sunspot::Server; no longer needs to shell out
+* Use Sunspot built-in session proxies in Sunspot::Rails
+* Sunspot::Rails adapter compatible with assumed inconsistency
+* Use session proxy for disconnecting Sunspot in specs
+* Allow specification of first ID for reindex batches.
+* Log Solr requests in Rails logger
+* Use class_inheritable_hash for sunspot_options
+* Add `index` class method, which is like `reindex` but doesn't clear first
+* Rename sunspot:solr:reindex to sunspot:reindex
+* Use Sunspot::Installer to bootstrap Rails Solr home
+
+== 0.10.7
+* Added Sunspot::Rails::Server class to  start/stop/run/bootstrap the solr server
+* Added log_level key to sunspot.yml, see java docs for valid values (http://java.sun.com/j2se/1.5.0/docs/api/java/util/logging/Level.html)
+* Added log_file key to sunspot.yml. This defaults to RAILS_ROOT/log/solr_<environment>.log.
+* Added support for localsolr in sunspot_rails. You can add custom extension.jar files to your Rails.root/solr/lib directory
+* Added an option to not reindex an object when certain columns have changed.
+
+== 0.10.6
+* Added script/generate sunspot support to generate the required sunspot.yml
+  file [Brandon Keepers]
+  
+== 0.10.5
+* Added a auto_commit_after_request option to sunspot.yml. Sunspot will not
+  automatically commit any changes in solr if you set this value to false.
+  Strongly encouraged for production environment.

data/sunspot_rails/LICENSE

@@ -0,0 +1,18 @@
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/sunspot_rails/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Mat Brown
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.