erichummel-sunspot 1.2.1g → 1.2.1

data/.gitignore

@@ -0,0 +1,12 @@
+sunspot-solr.pid
+*.swp
+coverage
+pkg
+/doc
+.DS_Store
+
+.yardoc
+sunspot.gemspec
+README.rdoc
+.bundle
+Gemfile.lock

data/Gemfile

@@ -1,10 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
-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
+# Specify your gem's dependencies in carrierwave_backgrounder.gemspec
+gemspec

data/Rakefile

@@ -1,11 +1,17 @@
 ENV['RUBYOPT'] = '-W1'
 
-task :environment do
-  require File.dirname(__FILE__) + '/lib/sunspot'
-end
+# encoding: UTF-8
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-require File.join(File.dirname(__FILE__), 'lib', 'sunspot', 'version')
+require 'spec/rake/spectask'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-task :default => 'spec:api'
+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'

data/lib/sunspot/dsl/field_query.rb

@@ -84,6 +84,19 @@ 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,6 +14,9 @@ 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,5 +1,8 @@
+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.
@@ -32,7 +35,7 @@ module Sunspot
       def execute
         reset
         params = @query.to_params
-        @solr_result = @connection.request("/#{request_handler}", params)
+        @solr_result = @connection.request("/#{request_handler}", params, {:header => {'Content-Type' => 'application/x-www-form-urlencoded'}})
         self
       end
 
@@ -53,7 +56,7 @@ module Sunspot
       # WillPaginate::Collection or Array:: Instantiated result objects
       #
       def results
-        @results ||= maybe_will_paginate(verified_hits.map { |hit| hit.instance })
+        @results ||= paginate_collection(verified_hits.map { |hit| hit.instance })
       end
   
       # 
@@ -84,7 +87,7 @@ module Sunspot
                   Hit.new(doc, highlights_for(doc), self)
                 end
               end
-              maybe_will_paginate(hits || [])
+              paginate_collection(hits || [])
             end
         end
       end
@@ -269,17 +272,11 @@ module Sunspot
       end
   
       def verified_hits
-        @verified_hits ||= maybe_will_paginate(hits.select { |hit| hit.instance })
+        @verified_hits ||= paginate_collection(hits.select { |hit| hit.instance })
       end
   
-      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
+      def paginate_collection(collection)
+        PaginatedCollection.new(collection, @query.page, @query.per_page, total)
       end
   
       def add_facet(name, facet)

data/lib/sunspot/search/paginated_collection.rb

@@ -0,0 +1,55 @@
+module Sunspot
+  module Search
+
+    class PaginatedCollection
+      instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval|object_id/ }
+
+      attr_reader :total_count, :current_page, :per_page
+      alias :total_entries :total_count
+      alias :limit_value :per_page
+
+      def initialize(collection, page, per_page, total)
+        @collection   = collection
+        @current_page = page
+        @per_page     = per_page
+        @total_count  = total
+      end
+
+      def total_pages
+        (total_count.to_f / per_page).ceil
+      end
+      alias :num_pages :total_pages
+
+      def first_page?
+        current_page == 1
+      end
+
+      def last_page?
+        current_page >= total_pages
+      end
+
+      def previous_page
+        current_page > 1 ? (current_page - 1) : nil
+      end
+
+      def next_page
+        current_page < total_pages ? (current_page + 1) : nil
+      end  
+
+      def out_of_bounds?
+        current_page > total_pages
+      end
+      
+      def offset
+        (current_page - 1) * per_page
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        @collection.send(method, *args, &block)
+      end
+
+    end
+  end
+end

data/lib/sunspot/server.rb

@@ -16,7 +16,7 @@ module Sunspot
 
     LOG_LEVELS = Set['SEVERE', 'WARNING', 'INFO', 'CONFIG', 'FINE', 'FINER', 'FINEST']
 
-    attr_accessor :min_memory, :max_memory, :port, :solr_data_dir, :solr_home, :log_file, :multicore
+    attr_accessor :min_memory, :max_memory, :port, :solr_data_dir, :solr_home, :log_file
     attr_writer :pid_dir, :pid_file, :log_level, :solr_data_dir, :solr_home, :solr_jar
 
     #
@@ -66,7 +66,7 @@ module Sunspot
       command << "-Xms#{min_memory}" if min_memory
       command << "-Xmx#{max_memory}" if max_memory
       command << "-Djetty.port=#{port}" if port
-      command << "-Dsolr.data.dir=#{solr_data_dir}" if solr_data_dir && !multicore
+      command << "-Dsolr.data.dir=#{solr_data_dir}" if solr_data_dir
       command << "-Dsolr.solr.home=#{solr_home}" if solr_home
       command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
       command << '-jar' << File.basename(solr_jar)
@@ -131,11 +131,7 @@ module Sunspot
     def solr_jar
       @solr_jar || SOLR_START_JAR
     end
-    
-    def multicore
-      @multicore || false
-    end
-    
+
     private
 
     def logging_config_path

data/lib/sunspot/version.rb

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

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'irb'
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
+require 'sunspot'
+def test_env!
+  require File.join(File.dirname(__FILE__), '..', 'spec', 'integration', 'spec_helper')
+end
+IRB.start

data/solr-1.3/etc/jetty.xml

@@ -0,0 +1,212 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
+<!-- =============================================================== -->
+
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+    <!-- Increase the maximum POST size to 1 MB to be able to handle large shard requests -->
+    <Call class="java.lang.System" name="setProperty">
+      <Arg>org.mortbay.jetty.Request.maxFormContentSize</Arg>
+      <Arg>1000000</Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Server Thread Pool                                          -->
+    <!-- =========================================================== -->
+    <Set name="ThreadPool">
+      <!-- Default bounded blocking threadpool 
+      -->
+      <New class="org.mortbay.thread.BoundedThreadPool">
+        <Set name="minThreads">10</Set>
+        <Set name="lowThreads">50</Set>
+        <Set name="maxThreads">10000</Set>
+      </New>
+
+      <!-- Optional Java 5 bounded threadpool with job queue 
+      <New class="org.mortbay.thread.concurrent.ThreadPool">
+        <Arg type="int">0</Arg>
+        <Set name="corePoolSize">10</Set>
+        <Set name="maximumPoolSize">250</Set>
+      </New>
+      -->
+    </Set>
+
+
+
+    <!-- =========================================================== -->
+    <!-- Set connectors                                              -->
+    <!-- =========================================================== -->
+    <!-- One of each type!                                           -->
+    <!-- =========================================================== -->
+
+    <!-- Use this connector for many frequently idle connections
+         and for threadless continuations.
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+            <Set name="maxIdleTime">30000</Set>
+            <Set name="Acceptors">2</Set>
+            <Set name="confidentialPort">8443</Set>
+          </New>
+      </Arg>
+    </Call>
+   -->     
+
+    <!-- Use this connector if NIO is not available. -->
+    <!-- This connector is currently being used for Solr because the
+         nio.SelectChannelConnector showed poor performance under WindowsXP
+         from a single client with non-persistent connections (35s vs ~3min)
+         to complete 10,000 requests)
+    -->
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.mortbay.jetty.bio.SocketConnector">
+            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+            <Set name="maxIdleTime">50000</Set>
+            <Set name="lowResourceMaxIdleTime">1500</Set>
+          </New>
+      </Arg>
+    </Call>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- To add a HTTPS SSL listener                                     -->
+    <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
+    <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml             -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    
+    <!-- =========================================================== -->
+    <!-- Set up global session ID manager                            -->
+    <!-- =========================================================== -->
+    <!--
+    <Set name="sessionIdManager">
+      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+        <Set name="workerName">node1</Set>
+      </New>
+    </Set>
+    -->
+
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            --> 
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.mortbay.jetty.Handler">
+           <Item>
+             <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+           </Item>
+           <Item>
+             <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+    
+    <!-- =========================================================== -->
+    <!-- Configure the context deployer                              -->
+    <!-- A context deployer will deploy contexts described in        -->
+    <!-- configuration files discovered in a directory.              -->
+    <!-- The configuration directory can be scanned for hot          -->
+    <!-- deployments at the configured scanInterval.                 -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy contexts configured   -->
+    <!-- in the $JETTY_HOME/contexts directory                       -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.ContextDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
+          <Set name="scanInterval">1</Set>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure the webapp deployer.                              -->
+    <!-- A webapp  deployer will deploy standard webapps discovered  -->
+    <!-- in a directory at startup, without the need for additional  -->
+    <!-- configuration files.    It does not support hot deploy or   -->
+    <!-- non standard contexts (see ContextDeployer above).          -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy webapps from the      -->
+    <!-- $JETTY_HOME/webapps directory                               -->
+    <!--                                                             -->
+    <!-- Normally only one type of deployer need be used.            -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
+				  <Set name="parentLoaderPriority">false</Set>
+				  <Set name="extract">true</Set>
+				  <Set name="allowDuplicates">false</Set>
+          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure Authentication Realms                             -->
+    <!-- Realms may be configured for the entire server here, or     -->
+    <!-- they can be configured for a specific web app in a context  -->
+    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+    <!-- example).                                                   -->
+    <!-- =========================================================== -->
+    <Set name="UserRealms">
+      <Array type="org.mortbay.jetty.security.UserRealm">
+        <!--
+        <Item>
+          <New class="org.mortbay.jetty.security.HashUserRealm">
+            <Set name="name">Test Realm</Set>
+            <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+          </New>
+        </Item>
+	-->
+      </Array>
+    </Set>
+
+    <!-- =========================================================== -->
+    <!-- Configure Request Log                                       -->
+    <!-- Request logs  may be configured for the entire server here, -->
+    <!-- or they can be configured for a specific web app in a       -->
+    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+    <!-- for an example).                                            -->
+    <!-- =========================================================== -->
+    <Ref id="RequestLog">
+      <Set name="requestLog">
+        <!-- New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+          <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg>
+          <Set name="retainDays">90</Set>
+          <Set name="append">true</Set>
+          <Set name="extended">false</Set>
+          <Set name="LogTimeZone">GMT</Set>
+        </New -->
+      </Set>
+    </Ref>
+
+    <!-- =========================================================== -->
+    <!-- extra options                                               -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown">true</Set>
+    <!-- ensure/prevent Server: header being sent to browsers        -->
+    <Set name="sendServerVersion">true</Set>
+
+</Configure>
+