lisausa-sunspot 1.2.1 → 1.2.1.1

data/Gemfile

@@ -1,4 +1,10 @@
-source "http://rubygems.org"
+source :rubygems
 
-# Specify your gem's dependencies in carrierwave_backgrounder.gemspec
-gemspec
+require File.expand_path('../lib/sunspot/version', __FILE__)
+
+gem 'sunspot', Sunspot::VERSION, :path => File.expand_path('..', __FILE__)
+
+group :test do
+  gem 'rspec', '~> 1.3'
+  gem 'ruby-debug'
+end

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    sunspot (1.2.0)
+      escape (= 0.0.4)
+      pr_geohash (~> 1.0)
+      rsolr (= 0.12.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    columnize (0.3.2)
+    escape (0.0.4)
+    linecache (0.43)
+    pr_geohash (1.0.0)
+    rsolr (0.12.1)
+      builder (>= 2.1.2)
+    rspec (1.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (~> 1.3)
+  ruby-debug
+  sunspot (= 1.2.0)!

data/Rakefile

@@ -1,17 +1,11 @@
 ENV['RUBYOPT'] = '-W1'
 
-# encoding: UTF-8
-require 'bundler'
-Bundler::GemHelper.install_tasks
+task :environment do
+  require File.dirname(__FILE__) + '/lib/sunspot'
+end
 
-require 'spec/rake/spectask'
+require File.join(File.dirname(__FILE__), 'lib', 'sunspot', 'version')
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-desc "Run all examples"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = Dir.glob('spec/**/*_spec.rb')
-  t.spec_opts << '--format specdoc'
-end
-
-task :default => 'spec'
+task :default => 'spec:api'

data/lib/sunspot/dsl/field_query.rb

@@ -84,19 +84,6 @@ module Sunspot
       # with a category_id of 2, the category_id facet will operate as if a
       # category had not been selected, allowing the user to select additional
       # categories (which will presumably be ORed together).
-      # 
-      # It possible to exclude multiple filters by passing an array:
-      #
-      #   Sunspot.search(Post) do
-      #     with(:blog_id, 1)
-      #     category_filter = with(:category_id, 2)
-      #     author_filter = with(:author_id, 3)
-      #     facet(:category_id,
-      #           :exclude => [category_filter, author_filter].compact)
-      #   end
-      #
-      # You should consider using +.compact+ to ensure that the array does not 
-      # contain any nil values.
       #
       # <strong>As far as I can tell, Solr only supports multi-select with
       # field facets; if +:exclude+ is passed to a query facet, this method will

data/lib/sunspot/dsl/functional.rb

@@ -14,9 +14,6 @@ module Sunspot
       #   function { :average_rating }
       #   function { sum(:average_rating, 10) }
       #
-      # See http://wiki.apache.org/solr/FunctionQuery for a list of all
-      # applicable functions
-      #
       def function(&block)
         expression = Sunspot::Util.instance_eval_or_call(
           Function.new(self),

data/lib/sunspot/search/abstract_search.rb

@@ -1,8 +1,5 @@
-require 'sunspot/search/paginated_collection'
-
 module Sunspot
   module Search #:nodoc:
-    
     # 
     # This class encapsulates the results of a Solr search. It provides access
     # to search results, total result count, facets, and pagination information.
@@ -35,7 +32,7 @@ module Sunspot
       def execute
         reset
         params = @query.to_params
-        @solr_result = @connection.request("/#{request_handler}", params, {:header => {'Content-Type' => 'application/x-www-form-urlencoded'}})
+        @solr_result = @connection.request("/#{request_handler}", params)
         self
       end
 
@@ -56,7 +53,7 @@ module Sunspot
       # WillPaginate::Collection or Array:: Instantiated result objects
       #
       def results
-        @results ||= paginate_collection(verified_hits.map { |hit| hit.instance })
+        @results ||= maybe_will_paginate(verified_hits.map { |hit| hit.instance })
       end
   
       # 
@@ -87,7 +84,7 @@ module Sunspot
                   Hit.new(doc, highlights_for(doc), self)
                 end
               end
-              paginate_collection(hits || [])
+              maybe_will_paginate(hits || [])
             end
         end
       end
@@ -272,11 +269,17 @@ module Sunspot
       end
   
       def verified_hits
-        @verified_hits ||= paginate_collection(hits.select { |hit| hit.instance })
+        @verified_hits ||= maybe_will_paginate(hits.select { |hit| hit.instance })
       end
   
-      def paginate_collection(collection)
-        PaginatedCollection.new(collection, @query.page, @query.per_page, total)
+      def maybe_will_paginate(collection)
+        if defined?(WillPaginate::Collection)
+          WillPaginate::Collection.create(@query.page, @query.per_page, total) do |pager|
+            pager.replace(collection)
+          end
+        else
+          collection
+        end
       end
   
       def add_facet(name, facet)

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.2.1'
+  VERSION = '1.2.1.1'
 end

data/solr/etc/jetty.xml

@@ -73,10 +73,6 @@
             <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
             <Set name="maxIdleTime">50000</Set>
             <Set name="lowResourceMaxIdleTime">1500</Set>
-            <!-- Increase header buffer size from default of 4KB to 64KB to 
-                 prevent Solr from reaching this limit during large queries
-            -->
-            <Set name="headerBufferSize">65536</Set>
           </New>
       </Arg>
     </Call>

data/spec/api/adapters_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Sunspot::Adapters::InstanceAdapter do
   it "finds adapter by superclass" do

data/spec/api/binding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "DSL bindings" do
   it 'should give access to calling context\'s methods in search DSL' do

data/spec/api/indexer/attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'bigdecimal'
 
 describe 'indexing attribute fields', :type => :indexer do

data/spec/api/indexer/batch_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'batch indexing', :type => :indexer do
   it 'should send all batched adds in a single request' do

data/spec/api/indexer/dynamic_fields_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'indexing dynamic fields' do
   it 'indexes string data' do

data/spec/api/indexer/fixed_fields_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'indexing fixed fields', :type => :indexer do
   it 'should index id' do

data/spec/api/indexer/fulltext_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'indexing fulltext fields' do
   it 'indexes text field' do

data/spec/api/indexer/removal_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'document removal', :type => :indexer do
   it 'removes an object from the index' do

data/spec/api/indexer/spec_helper.rb

@@ -1 +1 @@
-require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))

data/spec/api/indexer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'indexer', :type => :indexer do
   it 'should completely wipe setup if class redefined (reloaded)' do

data/spec/api/query/advanced_manipulation_examples.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 shared_examples_for "query with advanced manipulation" do
   describe 'adjust_solr_params' do

data/spec/api/query/dsl_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'query DSL', :type => :query do
   it 'should allow building search using block argument rather than instance_eval' do

data/spec/api/query/faceting_examples.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
 shared_examples_for "facetable query" do
   describe 'on fields' do
     it 'does not turn faceting on if no facet requested' do

data/spec/api/query/fulltext_examples.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
 shared_examples_for 'fulltext query' do
   it 'searches by keywords' do
     search do

data/spec/api/query/function_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'function query' do
   it "should send query to solr with boost function" do

data/spec/api/query/geo_examples.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'bigdecimal'
 
 shared_examples_for 'geohash query' do

data/spec/api/query/highlighting_examples.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
 shared_examples_for "query with highlighting support" do
   it 'should not send highlight parameter when highlight not requested' do
     search do

data/spec/api/query/more_like_this_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'more_like_this' do
   before :each do

data/spec/api/query/ordering_pagination_examples.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
 shared_examples_for 'sortable query' do
   it 'paginates using default per_page when page not provided' do
     search

data/spec/api/query/spec_helper.rb

@@ -1 +1 @@
-require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))

data/spec/api/query/standard_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'standard query', :type => :query do
   it_should_behave_like "scoped query"

data/spec/api/search/dynamic_fields_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'search with dynamic fields' do
   it 'returns dynamic string facet' do

data/spec/api/search/faceting_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'faceting', :type => :search do
   it 'returns field name for facet' do

data/spec/api/search/highlighting_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'search with highlighting results', :type => :search do
   before :each do

data/spec/api/search/hits_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'hits', :type => :search do
   it 'should return hits without loading instances' do
@@ -12,18 +12,38 @@ describe 'hits', :type => :search do
     end.should == [['Post', post_1.id.to_s], ['Post', post_2.id.to_s]]
   end
 
-  it 'returns search total as attribute of hits' do
-    stub_results(Post.new, 4)
-    session.search(Post) do
-      paginate(:page => 1)
-    end.hits.total_entries.should == 4
-  end
+  if ENV['USE_WILL_PAGINATE']
+
+    it 'returns search total as attribute of hits' do
+      stub_results(Post.new, 4)
+      session.search(Post) do
+        paginate(:page => 1)
+      end.hits.total_entries.should == 4
+    end
+
+    it 'returns search total as attribute of verified hits' do
+      stub_results(Post.new, 4)
+      session.search(Post) do
+        paginate(:page => 1)
+      end.hits(:verify => true).total_entries.should == 4
+    end
+
+  else
+
+    it 'returns vanilla array of hits if WillPaginate is not available' do
+      stub_results(Post.new)
+      session.search(Post) do
+        paginate(:page => 1)
+      end.hits.should_not respond_to(:total_entries)
+    end
+
+    it 'returns vanilla array of verified hits if WillPaginate is not available' do
+      stub_results(Post.new)
+      session.search(Post) do
+        paginate(:page => 1)
+      end.hits(:verified => true).should_not respond_to(:total_entries)
+    end
 
-  it 'returns search total as attribute of verified hits' do
-    stub_results(Post.new, 4)
-    session.search(Post) do
-      paginate(:page => 1)
-    end.hits(:verify => true).total_entries.should == 4
   end
 
   it 'should return instance from hit' do

data/spec/api/search/results_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'search results', :type => :search do
   it 'loads single result' do
@@ -30,11 +30,24 @@ describe 'search results', :type => :search do
     session.search(Post).results.should == []
   end
 
-  it 'returns search total as attribute of results' do
-    stub_results(Post.new, 4)
-    session.search(Post) do
-      paginate(:page => 1)
-    end.results.total_entries.should == 4
+  if ENV['USE_WILL_PAGINATE']
+
+    it 'returns search total as attribute of results' do
+      stub_results(Post.new, 4)
+      session.search(Post) do
+        paginate(:page => 1)
+      end.results.total_entries.should == 4
+    end
+
+  else
+
+    it 'returns vanilla array if WillPaginate is not available' do
+      stub_results(Post.new)
+      session.search(Post) do
+        paginate(:page => 1)
+      end.results.should_not respond_to(:total_entries)
+    end
+
   end
 
   it 'returns total' do

data/spec/api/search/search_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Sunspot::Search do
   it 'should allow access to the data accessor' do

data/spec/api/search/spec_helper.rb

@@ -1 +1 @@
-require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))

data/spec/api/server_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'tempfile'
 
 describe Sunspot::Server do