websolr-rails 1.4.4 → 2.0.0

data/lib/solr/document.rb

@@ -1,78 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'solr/xml'
-require 'solr/field'
-
-class Solr::Document
-  include Enumerable
-  attr_accessor :boost
-  attr_reader :fields
-
-  # Create a new Solr::Document, optionally passing in a hash of 
-  # key/value pairs for the fields
-  #
-  #   doc = Solr::Document.new(:creator => 'Jorge Luis Borges')
-  def initialize(hash={})
-    @fields = []
-    self << hash
-  end
-
-  # Append a Solr::Field
-  #
-  #   doc << Solr::Field.new(:creator => 'Jorge Luis Borges')
-  #
-  # If you are truly lazy you can simply pass in a hash:
-  #
-  #   doc << {:creator => 'Jorge Luis Borges'}
-  def <<(fields)
-    case fields
-    when Hash
-      fields.each_pair do |name,value|
-        if value.respond_to?(:each) && !value.is_a?(String)
-          value.each {|v| @fields << Solr::Field.new(name => v)}
-        else
-          @fields << Solr::Field.new(name => value)
-        end
-      end
-    when Solr::Field
-      @fields << fields
-    else
-      raise "must pass in Solr::Field or Hash"
-    end
-  end
-
-  # shorthand to allow hash lookups
-  #   doc['name']
-  def [](name)
-    field = @fields.find {|f| f.name == name.to_s}
-    return field.value if field
-    return nil
-  end
-
-  # shorthand to assign as a hash
-  def []=(name,value)
-    @fields << Solr::Field.new(name => value)
-  end
-
-  # convert the Document to a REXML::Element 
-  def to_xml
-    e = Solr::XML::Element.new 'doc'
-    e.attributes['boost'] = @boost.to_s if @boost
-    @fields.each {|f| e.add_element(f.to_xml)}
-    return e
-  end
-
-  def each(*args, &blk)
-    fields.each(&blk)
-  end
-end

data/lib/solr/exception.rb

@@ -1,13 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class Solr::Exception < Exception; end

data/lib/solr/field.rb

@@ -1,39 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'solr/xml'
-require 'time'
-
-class Solr::Field
-  VALID_PARAMS = [:boost]
-  attr_accessor :name
-  attr_accessor :value
-  attr_accessor :boost
-
-  # Accepts an optional <tt>:boost</tt> parameter, used to boost the relevance of a particular field.
-  def initialize(params)
-    @boost = params[:boost]
-    name_key = (params.keys - VALID_PARAMS).first
-    @name, @value = name_key.to_s, params[name_key]
-    # Convert any Time values into UTC/XML schema format (which Solr requires).
-    @value = @value.respond_to?(:utc) ? @value.utc.xmlschema : @value.to_s
-  end
-
-  def to_xml
-    e = Solr::XML::Element.new 'field'
-    e.attributes['name'] = @name
-    e.attributes['boost'] = @boost.to_s if @boost
-    e.text = @value
-    return e
-  end
-
-end

data/lib/solr/importer.rb

@@ -1,19 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Solr; module Importer; end; end
-require 'solr/importer/mapper'
-require 'solr/importer/array_mapper'
-require 'solr/importer/delimited_file_source'
-require 'solr/importer/hpricot_mapper'
-require 'solr/importer/xpath_mapper'
-require 'solr/importer/solr_source'

data/lib/solr/importer/array_mapper.rb

@@ -1,26 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-
-class Solr::Importer::ArrayMapper < Solr::Importer::Mapper
-  # TODO document that initializer takes an array of Mappers [mapper1, mapper2, ... mapperN]
-  
-  # TODO: make merge conflict handling configurable.  as is, the last map fields win.
-  def map(orig_data_array)
-    mapped_data = {}
-    orig_data_array.each_with_index do |data,i|
-      mapped_data.merge!(@mapping[i].map(data))
-    end
-    mapped_data
-  end
-end

data/lib/solr/importer/delimited_file_source.rb

@@ -1,38 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# For files with the first line containing field names
-# Currently not designed for enormous files, as all lines are
-# read into an array
-class Solr::Importer::DelimitedFileSource
-  include Enumerable
-  
-  def initialize(filename, splitter=/\t/)
-    @filename = filename
-    @splitter = splitter
-  end
-
-  def each
-    lines = IO.readlines(@filename)
-    headers = lines[0].split(@splitter).collect{|h| h.chomp}
-    
-    lines[1..-1].each do |line|
-      data = headers.zip(line.split(@splitter).collect{|s| s.chomp})
-      def data.[](key)
-        self.assoc(key.to_s)[1]
-      end
-      
-      yield(data)
-    end
-  end
-  
-end

data/lib/solr/importer/hpricot_mapper.rb

@@ -1,27 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-begin
-  require 'hpricot'
-
-  class Solr::Importer::HpricotMapper < Solr::Importer::Mapper
-    def field_data(doc, path)
-      doc.search(path.to_s).collect { |e| e.inner_html }
-    end
-  end
-rescue LoadError => e # If we can't load hpricot
-  class Solr::Importer::HpricotMapper
-    def initialize(mapping, options={})
-      raise "Hpricot not installed."
-    end
-  end
-end

data/lib/solr/importer/mapper.rb

@@ -1,51 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class Solr::Importer::Mapper
-  def initialize(mapping, options={})
-    @mapping = mapping
-    @options = options
-  end
-  
-  def field_data(orig_data, field_name)
-    orig_data[field_name]
-  end
-  
-  def mapped_field_value(orig_data, field_mapping)
-    case field_mapping
-      when String
-        field_mapping
-      when Proc
-        field_mapping.call(orig_data)  # TODO pass in more context, like self or a function for field_data, etc
-      when Symbol
-        field_data(orig_data, @options[:stringify_symbols] ? field_mapping.to_s : field_mapping)
-      when Enumerable
-        field_mapping.collect {|orig_field_name| mapped_field_value(orig_data, orig_field_name)}.flatten
-      else
-        raise "Unknown mapping for #{field_mapping}"
-    end
-  end
-  
-  def map(orig_data)
-    mapped_data = {}
-    @mapping.each do |solr_name, field_mapping|
-      value = mapped_field_value(orig_data, field_mapping)
-      mapped_data[solr_name] = value if value
-    end
-    
-    mapped_data
-  end
-  
-  
-  
-  
-end

data/lib/solr/importer/solr_source.rb

@@ -1,43 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'solr'
-
-class Solr::Importer::SolrSource
-  def initialize(solr_url, query, filter_queries=nil, options={})
-    @connection = Solr::Connection.new(solr_url)
-    @query = query
-    @filter_queries = filter_queries
-
-    @page_size = options[:page_size] || 1000
-    @field_list = options[:field_list] || ["*"]
-  end
-  
-  def each
-    done = false
-    start = 0
-    until done do
-      # request N documents from a starting point
-      request = Solr::Request::Standard.new(:query => @query,
-                                            :rows => @page_size,
-                                            :start => start,
-                                            :field_list => @field_list,
-                                            :filter_queries => @filter_queries)
-      response = @connection.send(request)
-      response.each do |doc|
-        yield doc  # TODO: perhaps convert to HashWithIndifferentAccess.new(doc), so stringify_keys isn't necessary
-      end
-      done = start + @page_size >= response.total_hits
-      start = start + @page_size
-    end
-  end
-end

data/lib/solr/importer/xpath_mapper.rb

@@ -1,35 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-begin
-  require 'xml/libxml'
-
-  # For files with the first line containing field names
-  class Solr::Importer::XPathMapper < Solr::Importer::Mapper
-    def field_data(doc, xpath)
-      doc.find(xpath.to_s).collect do |node|
-        case node
-          when XML::Attr
-            node.value
-          when XML::Node
-            node.content
-        end
-      end
-    end
-  end
-rescue LoadError => e # If we can't load libxml
-  class Solr::Importer::XPathMapper
-    def initialize(mapping, options={})
-      raise "libxml not installed"
-    end
-  end
-end

data/lib/solr/indexer.rb

@@ -1,52 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class Solr::Indexer
-  attr_reader :solr
-  
-  # TODO: document options!
-  def initialize(data_source, mapper_or_mapping, options={})
-    solr_url = options[:solr_url] || ENV["SOLR_URL"] || "http://localhost:8983/solr"
-    @solr = Solr::Connection.new(solr_url, options) #TODO - these options contain the solr_url and debug keys also, so tidy up what gets passed
-
-    @data_source = data_source
-    @mapper = mapper_or_mapping.is_a?(Hash) ? Solr::Importer::Mapper.new(mapper_or_mapping) : mapper_or_mapping
-
-    @buffer_docs = options[:buffer_docs]
-    @debug = options[:debug]
-  end
-
-  def index
-    buffer = []
-    @data_source.each do |record|
-      document = @mapper.map(record)
-      
-      # TODO: check arrity of block, if 3, pass counter as 3rd argument
-      yield(record, document) if block_given? # TODO check return of block, if not true then don't index, or perhaps if document.empty?
-      
-      buffer << document
-      
-      if !@buffer_docs || buffer.size == @buffer_docs
-        add_docs(buffer)
-        buffer.clear
-      end
-    end
-    add_docs(buffer) if !buffer.empty?
-    
-    @solr.commit unless @debug
-  end
-  
-  def add_docs(documents)
-    @solr.add(documents) unless @debug
-    puts documents.inspect if @debug
-  end
-end

data/lib/solr/request.rb

@@ -1,26 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Solr; module Request; end; end
-require 'solr/request/add_document'
-require 'solr/request/modify_document'
-require 'solr/request/base'
-require 'solr/request/commit'
-require 'solr/request/delete'
-require 'solr/request/ping'
-require 'solr/request/select'
-require 'solr/request/standard'
-require 'solr/request/spellcheck'
-require 'solr/request/dismax'
-require 'solr/request/update'
-require 'solr/request/index_info'
-require 'solr/request/optimize'