nuatt_sunspot 1.1.0.3

data/lib/sunspot/installer/solrconfig_updater.rb

@@ -0,0 +1,106 @@
+require 'rubygems'
+require 'fileutils'
+require 'nokogiri'
+
+module Sunspot
+  class Installer
+    class SolrconfigUpdater
+      include TaskHelper
+
+      CONFIG_FILES = %w(solrconfig.xml elevate.xml spellings.txt stopwords.txt synonyms.txt stopwords.es.txt) 
+
+      class <<self
+        def execute(solrconfig_path, options = {})
+          new(solrconfig_path, options).execute
+        end
+      end
+
+      def initialize(solrconfig_path, options)
+        @force = !!options[:force]
+        unless @force || File.exist?(solrconfig_path)
+          abort("#{File.expand_path(@solrconfig_path)} doesn't exist." +
+                " Are you sure you're pointing to a SOLR_HOME?")
+        end
+        @solrconfig_path = solrconfig_path
+        @verbose = !!options[:verbose]
+      end
+
+      def execute
+        if @force
+          config_dir = File.dirname(@solrconfig_path)
+          FileUtils.mkdir_p(config_dir)
+          CONFIG_FILES.each do |file|
+            source_path =
+              File.join(File.dirname(__FILE__), '..', '..', '..', 'solr', 'solr', 'conf', file)
+            FileUtils.cp(source_path, config_dir)
+            say("Copied default #{file} to #{config_dir}")
+          end
+        else
+          @document = File.open(@solrconfig_path) do |f|
+            Nokogiri::XML(
+              f, nil, nil, 
+              Nokogiri::XML::ParseOptions::DEFAULT_XML |
+              Nokogiri::XML::ParseOptions::NOBLANKS
+            )
+          end
+          @root = @document.root
+          maybe_create_spatial_component
+          maybe_add_spatial_component_to_standard_handler
+          maybe_add_more_like_this_handler
+          original_path = "#{@solrconfig_path}.orig"
+          FileUtils.cp(@solrconfig_path, original_path)
+          say("Saved backup of original to #{original_path}")
+          File.open(@solrconfig_path, 'w') do |file|
+            @document.write_to(
+              file,
+              :indent => 2
+            )
+          end
+          say("Wrote solrconfig to #{@solrconfig_path}")
+        end
+      end
+
+      private
+
+      def maybe_create_spatial_component
+        if @root.xpath('searchComponent[@name="spatial"]').any?
+          say('Spatial search component already defined')
+        else
+          say('Defining spatial search component')
+          search_component_node =
+            Nokogiri::XML::Node.new('searchComponent', @document)
+          search_component_node['name'] = 'spatial'
+          search_component_node['class'] =
+            'me.outofti.solrspatiallight.SpatialQueryComponent'
+          @root << search_component_node
+        end
+      end
+
+      def maybe_add_spatial_component_to_standard_handler
+        standard_handler_node =
+          @root.xpath('requestHandler[@name="standard"]').first
+        last_components_node =
+          standard_handler_node.xpath('arr[@name="last-components"]').first ||
+          add_element(standard_handler_node, 'arr', 'name' => 'last-components')
+        if last_components_node.xpath('str[normalize-space()="spatial"]').any?
+          say('Spatial search component already in standard search handler')
+        else
+          say('Adding spatial search component into standard search handler')
+          add_element(last_components_node, 'str').content = 'spatial'
+        end
+      end
+
+      def maybe_add_more_like_this_handler
+        unless @root.xpath('requestHandler[@name="/mlt"]').first
+          mlt_node = add_element(
+            @root, 'requestHandler',
+            :name => '/mlt', :class => 'solr.MoreLikeThisHandler'
+          )
+          defaults_node = add_element(mlt_node, 'lst', :name => 'defaults')
+          add_element(defaults_node, 'str', :name => 'mlt.mintf').content = '1'
+          add_element(defaults_node, 'str', :name => 'mlt.mindf').content = '2'
+        end
+      end
+    end
+  end
+end

data/lib/sunspot/installer/task_helper.rb

@@ -0,0 +1,18 @@
+module Sunspot
+  class Installer
+    module TaskHelper
+      def say(message)
+        if @verbose
+          STDOUT.puts(message)
+        end
+      end
+
+      def add_element(node, name, attributes = {})
+        new_node = Nokogiri::XML::Node.new(name, @document)
+        attributes.each_pair { |name, value| new_node[name.to_s] = value }
+        node << new_node 
+        new_node
+      end
+    end
+  end
+end

data/lib/sunspot/query.rb

@@ -0,0 +1,10 @@
+%w(filter abstract_field_facet connective boost_query date_field_facet dismax
+   field_facet highlighting local pagination restriction common_query
+   standard_query more_like_this more_like_this_query query_facet scope sort
+   sort_composite text_field_boost function_query composite_fulltext).each do |file|
+  require(File.join(File.dirname(__FILE__), 'query', file))
+end
+module Sunspot
+  module Query #:nodoc:all
+  end
+end

data/lib/sunspot/query/abstract_field_facet.rb

@@ -0,0 +1,52 @@
+module Sunspot
+  module Query
+    class AbstractFieldFacet
+      include RSolr::Char
+
+      def initialize(field, options)
+        @field, @options = field, options
+      end
+
+      def to_params
+        params = {
+          :facet => 'true',
+        }
+        case @options[:sort]
+        when :count
+          params[qualified_param('sort')] = 'true'
+        when :index
+          params[qualified_param('sort')] = 'false'
+        when nil
+        else
+          raise(
+            ArgumentError,
+            "#{@options[:sort].inspect} is not an allowed value for :sort. Allowed options are :count and :index"
+          )
+        end
+        if @options[:limit]
+          params[qualified_param('limit')] = @options[:limit].to_i
+        end
+        if @options[:prefix]
+          params[qualified_param('prefix')] = escape(@options[:prefix].to_s)
+        end
+        params[qualified_param('mincount')] = 
+          case
+          when @options[:minimum_count] then @options[:minimum_count].to_i
+          when @options[:zeros] then 0
+          else 1
+          end
+        params
+      end
+
+      private
+
+      def qualified_param(param)
+        :"f.#{key}.facet.#{param}"
+      end
+      
+      def key
+        @key ||= @options[:name] || @field.indexed_name
+      end
+    end
+  end
+end

data/lib/sunspot/query/boost_query.rb

@@ -0,0 +1,24 @@
+module Sunspot
+  module Query
+    # 
+    # Representation of a BoostQuery, which allows the searcher to specify a
+    # scope for which matching documents should have an extra boost. This is
+    # essentially a conjunction, with an extra instance variable containing
+    # the boost that should be applied.
+    #
+    class BoostQuery < Connective::Conjunction #:nodoc:
+      def initialize(boost)
+        super(false)
+        @boost = boost
+      end
+
+      def to_boolean_phrase
+        if @boost.is_a?(FunctionQuery)
+          "#{@boost}"
+        else
+          "#{super}^#{@boost}"
+        end
+      end
+    end
+  end
+end

data/lib/sunspot/query/common_query.rb

@@ -0,0 +1,85 @@
+module Sunspot
+  module Query #:nodoc:
+    class CommonQuery
+      def initialize(types)
+        @scope = Scope.new
+        @sort = SortComposite.new
+        @components = [@scope, @sort]
+        if types.length == 1
+          @scope.add_restriction(TypeField.instance, Restriction::EqualTo, types.first)
+        else
+          @scope.add_restriction(TypeField.instance, Restriction::AnyOf, types)
+        end
+      end
+
+      def solr_parameter_adjustment=(block)
+        @parameter_adjustment = block
+      end
+
+      def add_sort(sort)
+        @sort << sort
+      end
+
+      def add_field_facet(facet)
+        @components << facet
+        facet
+      end
+
+      def add_query_facet(facet)
+        @components << facet
+        facet
+      end
+
+      def add_function(function)
+        @components << function
+        function
+      end
+
+      def paginate(page, per_page)
+        if @pagination
+          @pagination.page = page
+          @pagination.per_page = per_page
+        else
+          @components << @pagination = Pagination.new(page, per_page)
+        end
+      end
+
+      def to_params
+        params = {}
+        @components.each do |component|
+          Sunspot::Util.deep_merge!(params, component.to_params)
+        end
+        @parameter_adjustment.call(params) if @parameter_adjustment
+        params[:q] ||= '*:*'
+        params
+      end
+
+      def [](key)
+        to_params[key.to_sym]
+      end
+
+      def page
+        @pagination.page if @pagination
+      end
+
+      def per_page
+        @pagination.per_page if @pagination
+      end
+
+
+      private
+
+      #
+      # If we have a single fulltext query, merge is normally. If there are
+      # multiple nested queries, serialize them as `_query_` subqueries.
+      #
+      def merge_fulltext(params)
+        return nil if @fulltexts.empty?
+        return Sunspot::Util.deep_merge!(params, @fulltexts.first.to_params) if @fulltexts.length == 1
+        subqueries = @fulltexts.map {|fulltext| fulltext.to_subquery }.join(' ')
+        Sunspot::Util.deep_merge!(params, {:q => subqueries})
+      end
+
+    end
+  end
+end

data/lib/sunspot/query/composite_fulltext.rb

@@ -0,0 +1,31 @@
+module Sunspot
+  module Query
+    class CompositeFulltext
+      def initialize
+        @components = []
+      end
+
+      def add(keywords)
+        @components << dismax = Dismax.new(keywords)
+        dismax
+      end
+
+      def to_params
+        case @components.length
+        when 0
+          {}
+        when 1
+          @components.first.to_params
+        else
+          to_subqueries
+        end
+      end
+
+      private
+
+      def to_subqueries
+        { :q => @components.map { |dismax| dismax.to_subquery }.join(' ') }
+      end
+    end
+  end
+end

data/lib/sunspot/query/connective.rb

@@ -0,0 +1,191 @@
+module Sunspot
+  module Query
+    module Connective #:nodoc:all
+      # 
+      # Base class for connectives (conjunctions and disjunctions).
+      #
+      class Abstract
+        include Filter
+
+        def initialize(negated = false) #:nodoc:
+          @negated = negated
+          @components = []
+        end
+
+        # 
+        # Add a restriction to the connective.
+        #
+        def add_restriction(field, restriction_type, value, negated = false)
+          add_component(restriction_type.new(field, value, negated))
+        end
+
+        # 
+        # Add a shorthand restriction; the restriction type is determined by
+        # the value.
+        #
+        def add_shorthand_restriction(field, value, negated = false)
+          restriction_type =
+            case value
+            when Array then Restriction::AnyOf
+            when Range then Restriction::Between
+            else Restriction::EqualTo
+            end
+          add_restriction(field, restriction_type, value, negated)
+        end
+
+        # 
+        # Add a negated restriction. The added restriction will match all
+        # documents who do not match the terms of the restriction.
+        #
+        def add_negated_restriction(field, restriction_type, value)
+          add_restriction(field, restriction_type, value, true)
+        end
+
+        # 
+        # Add a negated shorthand restriction (see add_shorthand_restriction)
+        #
+        def add_negated_shorthand_restriction(field, value)
+          add_shorthand_restriction(field, value, true)
+        end
+
+        # 
+        # Add a new conjunction and return it.
+        #
+        def add_conjunction
+          add_component(Conjunction.new)
+        end
+
+        # 
+        # Add a new disjunction and return it.
+        #
+        def add_disjunction
+          add_component(Disjunction.new)
+        end
+
+        # 
+        # Add an arbitrary component to the conjunction, and return it.
+        # The component must respond to #to_boolean_phrase
+        #
+        def add_component(component)
+          @components << component
+          component
+        end
+
+        # 
+        # Express the connective as a Lucene boolean phrase.
+        #
+        def to_boolean_phrase #:nodoc:
+          unless @components.empty?
+            phrase =
+              if @components.length == 1
+                @components.first.to_boolean_phrase
+              else
+                component_phrases = @components.map do |component|
+                  component.to_boolean_phrase
+                end
+                "(#{component_phrases.join(" #{connector} ")})"
+              end
+            if negated?
+              "-#{phrase}"
+            else
+              phrase
+            end
+          end
+        end
+
+        # 
+        # Connectives can be negated during the process of denormalization that
+        # is performed when a disjunction contains a negated component. This
+        # method conforms to the duck type for all boolean query components.
+        #
+        def negated?
+          @negated
+        end
+
+        # 
+        # Returns a new connective that's a negated version of this one.
+        #
+        def negate
+          negated = self.class.new(!negated?)
+          @components.each do |component|
+            negated.add_component(component)
+          end
+          negated
+        end
+      end
+
+      # 
+      # Disjunctions combine their components with an OR operator.
+      #
+      class Disjunction < Abstract
+        class <<self
+          def inverse
+            Conjunction
+          end
+        end
+
+        # 
+        # Express this disjunction as a Lucene boolean phrase
+        #
+        def to_boolean_phrase
+          if @components.any? { |component| component.negated? }
+            denormalize.to_boolean_phrase
+          else
+            super
+          end
+        end
+
+        # 
+        # No-op - this is already a disjunction
+        #
+        def add_disjunction
+          self
+        end
+
+        private
+
+        def connector
+          'OR'
+        end
+
+        # 
+        # If a disjunction contains negated components, it must be
+        # "denormalized", because the Lucene parser interprets any negated
+        # boolean phrase using AND semantics (this isn't a bug, it's just a
+        # subtlety of how Lucene parses queries). So, per DeMorgan's law we
+        # create a negated conjunction and add to it all of our components,
+        # negated themselves, which creates a query whose Lucene semantics are
+        # in line with our intentions.
+        #
+        def denormalize
+          denormalized = self.class.inverse.new(!negated?)
+          @components.each do |component|
+            denormalized.add_component(component.negate)
+          end
+          denormalized
+        end
+      end
+
+      # 
+      # Conjunctions combine their components with an AND operator.
+      #
+      class Conjunction < Abstract
+        class <<self
+          def inverse
+            Disjunction
+          end
+        end
+
+        def add_conjunction
+          self
+        end
+
+        private
+
+        def connector
+          'AND'
+        end
+      end
+    end
+  end
+end