mwmitchell-rsolr 0.6.9 → 0.7.0

data/CHANGES.txt

@@ -1,3 +1,11 @@
+0.7.0 - February 20, 2009
+  Removed all param mapping behavior, code and tests
+   - this stuff just gunks up rsolr and should be in an extension of some sort
+  Can now specify the request handler in all RSolr::Connection::Base methods as the first argument:
+    - solr.query 'select', :q=>'ipod'
+    - solr.query 'catalog', :q=>'humphry'
+    - solr.query :q=>'big' # defaults to the /select handler
+
 0.6.9 - January 29, 2009
 	Simplified facet response methods
 	Main facet method is called #facets

data/README.rdoc

@@ -10,8 +10,9 @@ Simple usage:
   require 'rubygems'
   require 'rsolr'
   rsolr = RSolr.connect
-  response = rsolr.query(:q=>'*:*')
-
+  response = rsolr.query(:q=>'*:*') # becomes /solr/select?q=*:*
+  # can also set the request handler path like:
+  response = rsolr.query('catalog', :q=>'*:*') # becomes /solr/catalog?q=*:*
 
 To run tests:
   
@@ -28,41 +29,35 @@ To get a direct connection (no http) in jRuby using DirectSolrConnection:
   
   solr = RSolr.connect(:adapter=>:direct, :home_dir=>'/path/to/solr/home', :dist_dir=>'/path/to/solr/distribution')
 
-You can set RSolr params that will be sent on every request:
+You can set the request handler paths for every request:
   
-  solr = RSolr.connect(:global_params=>{:wt=>:ruby, :echoParams=>'EXPLICIT'})
+  solr = RSolr.connect(:select_path=>'select', :update_path=>'update', :luke_path=>'admin/luke')
 
 
 == Requests
 Once you have a connection, you can execute queries, updates etc..
 
+You can optionally specify the request handler path by sending it in as the first argument:
+  solr.query 'catalog', :q=>'object_type:"book"'
+  solr.update 'my/update', '<xml/>'
+
+The default request handler path value for each of the different methods are as follows:
+  find_by_id, query == 'select'
+  add, update, commit, optimize, rollback, delete_by_id, delete_by_query == 'update'
+  index_info == 'admin/luke'
+
+Please note that the path you specify should be relative.
+
 
 === Querying
-Use the #query method to send requests to Solr as-is (no param mapping)
-Use the #search method to take advantage of some of the param mapping (currently only :page and :per_page)
-  response = solr.query(:q=>'washington', :facet=>true, 'facet.limit'=>-1, 'facet.field'=>'cat', 'facet.field'=>'inStock')
+Use the #query method to send requests to the /select handler:
+  response = solr.query(:q=>'washington', :facet=>true, 'facet.limit'=>-1, 'facet.field'=>'cat', 'facet.field'=>'inStock', :start=>0, :rows=>10)
   response = solr.find_by_id(1)
 
-==== Search Params
-The #search method can accept the following params:
-===== When :qt is :standard
-  :page
-  :per_page
-  :queries
-  :filters
-  :phrase_queries
-  :phrase_filters
-  :facets
-===== When :qt is :dismax (also includes the :standard params)
-  :alternate_query
-  :query_fields
-  :phrase_fields
-  :boost_query
-
 ==== Pagination
-Pagination is simplified by using the :page and :per_page params when using the #search method:
-
-  response = solr.search(:page=>1, :per_page=>10, :q=>'*:*')
+Pagination is simplified from having a few helpful response methods:
+  
+  response = solr.query(:start=>0, :rows=>10, :q=>'*:*')
   response.per_page
   response.total_pages
   response.current_page
@@ -73,7 +68,6 @@ If you use WillPaginate, just pass-in the response to the #will_paginate view he
 
   <%= will_paginate(@response) %>
 
-The #search method automatically figures out the :start and :rows values, based on the values of :page and :per_page. The will_paginate view helper uses the methods: #current_page, #previous_page, #next_page and #total_pages to create the pagination view widget.
 
 === Updating Solr
 Updating is done using native Ruby structures. Hashes are used for single documents and arrays are used for a collection of documents (hashes). These structures get turned into simple XML "messages".

data/examples/direct.rb

@@ -9,7 +9,8 @@ solr = RSolr.connect(:adapter=>:direct, :home_dir=>home, :dist_dir=>dist)
 
 `cd ../apache-solr/example/exampledocs && ./post.sh ./*.xml`
 
-response = solr.search :q=>'ipod', :fq=>'price:[0 TO 50]', :per_page=>2, :page=>1
+# the 'select' here is optional
+response = solr.query 'select', :q=>'ipod', :fq=>'price:[0 TO 50]', :rows=>2, :start=>0
 
 solr.delete_by_query('*:*')
 

data/examples/http.rb

@@ -5,7 +5,7 @@ solr = RSolr.connect
 
 `cd ../apache-solr/example/exampledocs && ./post.sh ./*.xml`
 
-response = solr.search :q=>'ipod', :fq=>'price:[0 TO 50]', :per_page=>2, :page=>1
+response = solr.query :q=>'ipod', :fq=>'price:[0 TO 50]', :rows=>2, :start=>0
 
 solr.delete_by_query('*:*')
 

data/lib/core_ext.rb

@@ -14,4 +14,12 @@ class Hash
     self.is_a?(Mash) ? self : Mash.new(self)
   end
   
+end
+
+unless Array.respond_to?(:extract_options!)
+  class Array
+    def extract_options!
+      last.is_a?(::Hash) ? pop : {}
+    end
+  end
 end

data/lib/rsolr/connection/adapter/common_methods.rb

@@ -4,42 +4,47 @@
 # The classes that include this module only need to provide a request method like:
 #   send_request(request_path, params, data)
 # where:
-#   request_path is a string to a handler (/select)
+#   request_path is a string to a handler (/select etc.)
 #   params is a hash for query string params
 #   data is optional string of xml
 module RSolr::Connection::Adapter::CommonMethods
   
   # send a request to the "select" handler
-  def query(params)
-    send_request @opts[:select_path], params
-  end
-  
-  # sends data to the update handler
-  # data can be:
-  #   string (valid solr update xml)
-  #   object with respond_to?(:to_xml)
-  # params is a hash with valid solr update params
-  def update(data, params={})
-    send_request @opts[:update_path], params, data
+  # the first argument is the select handler path
+  # the last argument is a hash of params
+  def query(*args)
+    params = args.extract_options!
+    path = args.first || @opts[:select_path]
+    self.send_request "/#{path}", params
   end
   
   # sends a request to the admin luke handler to get info on the index
-  def index_info(params={})
+  # the first argument is the admin/luke request handler path
+  # the last argument is a hash of params
+  def index_info(*args)
+    params = args.extract_options!
+    path = args.first || @opts[:luke_path]
     params[:numTerms]||=0
-    send_request @opts[:luke_path], params
+    self.send_request "/#{path}", params
   end
   
-  def default_options
-    {
-      :select_path => '/select',
-      :update_path => '/update',
-      :luke_path => '/admin/luke'
-    }
-  end
-  
-  # send a request to the adapter (allows requests like /admin/luke etc.)
-  def send_request(handler_path, params={}, data=nil)
-    @adapter.send_request(handler_path, params, data)
+  # sends data to the update handler
+  # If 2 arguments are passed in:
+  #   - the first should be the POST data string
+  #   - the second can be an optional url params hash
+  #   - the path is defaulted to '/update'
+  # If 3 arguments are passed in:
+  #   - the first argument should be the url path ('/my-update-handler' etc.)
+  #   - the second should be the POST data string
+  #   - the last/third should be an optional url params hash
+  # data can be:
+  #   string (valid solr update xml)
+  #   object with respond_to?(:to_xml)
+  def update(*args)
+    params = args.extract_options!
+    data = args.last
+    path = args.size == 2 ? args.first : @opts[:update_path]
+    self.send_request "/#{path}", params, data
   end
   
 end

data/lib/rsolr/connection/adapter/direct.rb

@@ -27,7 +27,7 @@ class RSolr::Connection::Adapter::Direct
       # add the standard lib and dist directories to the :jar_paths
       opts[:jar_paths] = [File.join(opts[:dist_dir], 'lib'), File.join(opts[:dist_dir], 'dist')]
     end
-    @opts = default_options.merge(opts)
+    @opts = opts
   end
   
   # loads/imports the java dependencies

data/lib/rsolr/connection/adapter/http.rb

@@ -21,7 +21,7 @@ class RSolr::Connection::Adapter::HTTP
   #
   def initialize(opts={}, &block)
     opts[:url]||='http://127.0.0.1:8983/solr'
-    @opts = default_options.merge(opts).to_mash # default_options are coming from RSolr::Connection::Adapter::CommonMethods
+    @opts = opts
   end
   
   def connection

data/lib/rsolr/connection/base.rb

@@ -5,33 +5,14 @@ class RSolr::Connection::Base
   
   attr_reader :adapter, :opts
   
-  attr_accessor :param_mappers
-  
   # "adapter" is instance of:
   #   RSolr::Adapter::HTTP
   #   RSolr::Adapter::Direct (jRuby only)
   def initialize(adapter, opts={})
     @adapter = adapter
-    @param_mappers = {
-      :standard=>RSolr::Connection::ParamMapping::Standard,
-      :dismax=>RSolr::Connection::ParamMapping::Dismax
-    }
-    opts[:global_params]||={}
-    default_global_params = {
-      :wt=>:ruby,
-      :echoParams=>'EXPLICIT',
-      :debugQuery=>true
-    }
-    opts[:global_params] = default_global_params.merge(opts[:global_params])
     @opts = opts
   end
   
-  # sets default params etc.. - could be used as a mapping hook
-  # type of request should be passed in here? -> map_params(:query, {})
-  def map_params(params)
-    {}.merge(@opts[:global_params]).merge(params)
-  end
-  
   # send request (no param mapping) to the select handler
   # params is hash with valid solr request params (:q, :fl, :qf etc..)
   #   if params[:wt] is not set, the default is :ruby (see opts[:global_params])
@@ -39,106 +20,68 @@ class RSolr::Connection::Base
   #   otherwise, an instance of RSolr::Response::Query is returned
   #   NOTE: to get raw ruby, use :wt=>'ruby'
   # There is NO param mapping here, what you put it is what gets sent to Solr
-  def query(params)
-    p = map_params(params)
-    response = @adapter.query(p)
-    p[:wt]==:ruby ? RSolr::Response::Query::Base.new(response) : response
-  end
-  
-  # The #search method uses a param mapper to prepare the request for solr.
-  # For example, instead of doing your fq params by hand,
-  # you can use the simplified :filters param instead.
-  # The 2 built in mappers are for dismax and standard: RSolr::Connection::ParamMapping::*
-  # The default is :dismax
-  # If you create your own request handler in solrconfig.xml,
-  # you can use it by setting the :qt=>:my_handler
-  # You'll need to set the correct param mapper class (when using the search method)
-  # To take advantage of the param mapping
-  # If your request handler uses the solr dismax class, then do nothing
-  # if it uses the standard, you'll need to set it like:
-  # solr.param_mappers[:my_search_handler] = :standard
-  # The value can also be a custom class constant that must have a #map method
-  # The initialize method must accept a hash of input params
-  # The #map method must handle a block being passed in and return a new hash of raw solr params
-  def search(params,&blk)
-    qt = params[:qt] ? params[:qt].to_sym : :dismax
-    mapper_class = @param_mappers[qt]
-    mapper_class = RSolr::Connection::ParamMapping::Dismax if mapper_class==:dismax
-    mapper_class = RSolr::Connection::ParamMapping::Standard if mapper_class==:standard
-    mapper = mapper_class.new(params)
-    query(mapper.map(&blk))
-  end
-  
-  # "facet_field" -- the name of a facet field: language_facet
-  # "params" -- the standard #search method params
-  # Returns an instance of RSolr::Response::Query::Base
-  def search_facet_by_name(facet_field, params, &blk)
-    params[:per_page] = 0
-    params[:rows] = 0
-    params[:facets] ||= {}
-    params[:facets][:fields] = [facet_field]
-    params[:facets][:mincount] ||= 1
-    params[:facets][:prefix] ||= nil
-    params[:facets][:missing] ||= false
-    params[:facets][:sort] ||= :count
-    params[:facets][:offset] ||= 0
-    self.search(params, &blk)
+  def query(*args)
+    params = map_params(args.extract_options!)
+    args << params
+    response = @adapter.query(*args)
+    params[:wt] == :ruby ? RSolr::Response::Query::Base.new(response) : response
   end
   
   # Finds a document by its id
-  def find_by_id(id, params={})
-    params = map_params(params)
+  def find_by_id(*args)
+    params = map_params(args.extract_options!)
     params[:q] = 'id:"#{id}"'
-    query params
+    args << params
+    self.query(*args)
   end
   
-  def index_info(params={})
-    params = map_params(params)
-    response = @adapter.index_info(params)
-    params[:wt] == :ruby ? RSolr::Response::IndexInfo.new(response) : response
+  # 
+  def update(*args)
+    params = map_params(args.extract_options!)
+    args << params
+    response = @adapter.update(*args)
+    params[:wt] == :ruby ? RSolr::Response::Update.new(response) : response
   end
   
-  # if :ruby is the :wt, then Solr::Response::Base is returned
-  # -- there's not really a way to figure out what kind of handler request this is.
-  
-  def update(data, params={})
-    params = map_params(params)
-    response = @adapter.update(data, params)
-    params[:wt]==:ruby ? RSolr::Response::Update.new(response) : response
+  def index_info(*args)
+    params = map_params(args.extract_options!)
+    args << params
+    response = @adapter.index_info(*args)
+    params[:wt] == :ruby ? RSolr::Response::IndexInfo.new(response) : response
   end
   
-  def add(hash_or_array, opts={}, &block)
-    update message.add(hash_or_array, opts, &block)
+  def add(*args, &block)
+    update message.add(*args, &block)
   end
   
   # send </commit>
-  def commit(opts={})
-    update message.commit, opts
+  def commit(*args)
+    update message.commit, *args
   end
   
   # send </optimize>
-  def optimize(opts={})
-    update message.optimize, opts
+  def optimize(*args)
+    update message.optimize, *args
   end
   
   # send </rollback>
   # NOTE: solr 1.4 only
-  def rollback(opts={})
-    update message.rollback, opts
+  def rollback(*args)
+    update message.rollback, *args
   end
   
   # Delete one or many documents by id
   #   solr.delete_by_id 10
   #   solr.delete_by_id([12, 41, 199])
-  def delete_by_id(ids, opts={})
-    update message.delete_by_id(ids), opts
+  def delete_by_id(*args)
+    update message.delete_by_id(args.shift), *args
   end
   
   # delete one or many documents by query
   #   solr.delete_by_query 'available:0'
   #   solr.delete_by_query ['quantity:0', 'manu:"FQ"']
-  def delete_by_query(queries, opts={})
-    update message.delete_by_query(queries), opts
+  def delete_by_query(*args)
+    update message.delete_by_query(args.shift), *args
   end
   
   protected
@@ -148,4 +91,11 @@ class RSolr::Connection::Base
     RSolr::Message
   end
   
+  # sets default params etc.. - could be used as a mapping hook
+  # type of request should be passed in here? -> map_params(:query, {})
+  def map_params(params)
+    params||={}
+    {:wt=>:ruby}.merge(params)
+  end
+  
 end

data/lib/rsolr/connection.rb

@@ -2,6 +2,5 @@ module RSolr::Connection
   
   autoload :Base, 'rsolr/connection/base'
   autoload :Adapter, 'rsolr/connection/adapter'
-  autoload :ParamMapping, 'rsolr/connection/param_mapping'
   
 end

data/lib/rsolr.rb

@@ -7,7 +7,7 @@ proc {|base, files|
 
 module RSolr
   
-  VERSION = '0.6.9'
+  VERSION = '0.7.0'
   
   autoload :Message, 'rsolr/message'
   autoload :Response, 'rsolr/response'
@@ -25,6 +25,9 @@ module RSolr
       :http=>'HTTP',
       :direct=>'Direct'
     }
+    opts[:select_path] ||= 'select'
+    opts[:update_path] ||= 'update'
+    opts[:luke_path] ||= 'admin/luke'
     adapter_class = RSolr::Connection::Adapter.const_get(types[adapter_name])
     RSolr::Connection::Base.new(adapter_class.new(opts), opts)
   end

data/test/connection/test_methods.rb

@@ -12,18 +12,6 @@ module ConnectionTestMethods
   #  assert_equal 0, @solr.query(:q=>'*:*').docs.size
   #end
   
-  def test_default_options
-    assert_equal '/select', @solr.adapter.default_options[:select_path]
-    assert_equal '/update', @solr.adapter.default_options[:update_path]
-    assert_equal '/admin/luke', @solr.adapter.default_options[:luke_path]
-  end
-  
-  # setting adapter options in Solr.connect method should set them in the adapter
-  def test_set_adapter_options
-    solr = RSolr.connect(:select_path=>'/select2')
-    assert_equal '/select2', solr.adapter.opts[:select_path]
-  end
-  
   # setting connection options in Solr.connect method should set them in the connection
   def test_set_connection_options
     solr = RSolr.connect(:default_wt=>:json)
@@ -116,23 +104,4 @@ module ConnectionTestMethods
     assert [true, false].include?(response.has_deletions?)
   end
   
-  def test_search_facet_by_name
-    @solr.add([{:id=>1, :cat=>'eletronics'}, {:id=>2, :cat=>'software'}]) and @solr.commit
-    response = @solr.search_facet_by_name('cat', {:q=>'*:*'})
-    
-    response.facets.each do |facet|
-      puts facet.field
-      puts facet.values.inspect
-      facet.values.each do |value|
-        puts value.value
-        puts value.hits
-      end
-    end
-    
-    assert_equal 2, response.facet_by_field_name(:cat).values.size
-    #
-    response = @solr.search_facet_by_name('cat', {:q=>'*:*'})
-    assert_equal 0, response.docs.size
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,9 +44,6 @@ files:
 - lib/rsolr/connection/adapter/http.rb
 - lib/rsolr/connection/adapter.rb
 - lib/rsolr/connection/base.rb
-- lib/rsolr/connection/param_mapping.rb
-- lib/rsolr/connection/param_mapping/dismax.rb
-- lib/rsolr/connection/param_mapping/standard.rb
 - lib/rsolr/connection.rb
 - lib/rsolr/http_client/adapter/curb.rb
 - lib/rsolr/http_client/adapter/net_http.rb
@@ -92,7 +90,6 @@ summary: A Ruby client for Apache Solr
 test_files: 
 - test/connection/direct_test.rb
 - test/connection/http_test.rb
-- test/connection/param_mapping_test.rb
 - test/connection/test_methods.rb
 - test/http_client/curb_test.rb
 - test/http_client/net_http_test.rb

data/lib/rsolr/connection/param_mapping/dismax.rb

@@ -1,41 +0,0 @@
-class RSolr::Connection::ParamMapping::Dismax < RSolr::Connection::ParamMapping::Standard
-  
-  def setup_mappings
-    super
-    
-    mapping_for :alternate_query, 'q.alt' do |val|
-      format_query(val).join(' ')
-    end
-    
-    mapping_for :query_fields, :qf do |val|
-      create_boost_query(val)
-    end
-    
-    mapping_for :phrase_fields, :pf do |val|
-      create_boost_query(val)
-    end
-    
-    mapping_for :boost_query, :bq do |val|
-      format_query(val).join(' ')
-    end
-    
-  end
-  
-  protected
-  
-  def create_boost_query(input)
-    case input
-    when Hash
-      qf = []
-      input.each_pair do |k,v|
-        qf << (v.to_s.empty? ? k : "#{k}^#{v}")
-      end
-      qf.join(' ')
-    when Array
-      input.join(' ')
-    when String
-      input
-    end
-  end
-  
-end

data/lib/rsolr/connection/param_mapping/standard.rb

@@ -1,127 +0,0 @@
-class RSolr::Connection::ParamMapping::Standard
-  
-  include RSolr::Connection::ParamMapping::MappingMethods
-  
-  attr_reader :input, :output
-  
-  def initialize(input)
-    @output = {}
-    @input = input
-    setup_mappings
-  end
-  
-  def setup_mappings
-    
-    mapping_for :per_page, :rows do |val|
-      val = val.to_s.to_i
-      val < 0 ? 0 : val
-    end
-    
-    mapping_for :page, :start do |val|
-      val = val.to_s.to_i
-      page = val > 0 ? val : 1
-      ((page - 1) * (@output[:rows] || 0))
-    end
-    
-    mapping_for :queries, :q do |val|
-      format_query(val)
-    end
-    
-    mapping_for :phrase_queries, :q do |val|
-      values = [@output[:q], format_query(val, true)]
-      # remove blank items
-      values.reject!{|v|v.to_s.empty?}
-      # join all items on a space
-      values.join(' ')
-    end
-    
-    mapping_for :filters, :fq do |val|
-      format_query(val)
-    end
-    
-    # this must come after the :filter/:fq mapper
-    mapping_for :phrase_filters, :fq do |val|
-      # use the previously set fq queries and generate the new phrased based ones
-      values = [@output[:fq], format_query(val, true)]
-      # flatten (need to do this because the previous fq could have been an array)
-      values = values.flatten
-      # remove blank items
-      values.reject!{|v|v.to_s.empty?} # don't join -- instead create multiple fq params
-      # don't join... fq needs to be an array so multiple fq params are sent to solr
-      values
-    end
-    
-    mapping_for :facets do |input|
-      next if input.to_s.empty?
-      @output[:facet] = true
-      @output['facet.field'] = []
-      if input[:queries]
-        # convert to an array if needed
-        input[:queries] = [input[:queries]] unless input[:queries].is_a?(Array)
-        @output[:facet.query] = input[:queries].map{|q|format_query(q)}
-      end
-      common_sub_fields = [:sort, :limit, :missing, :mincount, :prefix, :offset, :method, 'enum.cache.minDf']
-      (common_sub_fields).each do |subfield|
-        next unless input[subfield]
-        @output["facet.#{subfield}"] = input[subfield]
-      end
-      if input[:fields]
-        input[:fields].each do |f|
-          if f.kind_of? Hash
-            key = f.keys[0]
-            value = f[key]
-            @output[:facet.field] << key
-            common_sub_fields.each do |subfield|
-              next unless value[subfield]
-              @output["f.#{key}.facet.#{subfield}"] = input[subfield]
-            end
-          else
-            @output['facet.field'] << f
-          end
-        end
-      end
-    end
-  end
-  
-  # takes an input and returns a formatted value
-  def format_query(input, quote=false)
-    case input
-    when Array
-      format_array_query(input, quote)
-    when Hash
-      format_hash_query(input, quote)
-    else
-      prep_value(input, quote)
-    end
-  end
-  
-  def format_array_query(input, quote)
-    input.collect do |v|
-      v.is_a?(Hash) ? format_hash_query(v, quote) : prep_value(v, quote)
-    end
-  end
-  
-  # groups values to a single field: title:(value1 value2) instead of title:value1 title:value2
-  # a value can be a range or a string
-  def format_hash_query(input, quote=false)
-    q = []
-    input.each_pair do |field,value|
-      next if value.to_s.empty? # skip blank values!
-      # create the field plus the delimiter if the field is not blank
-      value = [value] unless value.is_a?(Array)
-      fielded_queries = value.collect do |vv|
-        vv.is_a?(Range) ? "[#{vv.min} TO #{vv.max}]" : prep_value(vv, quote)
-      end
-      field = field.to_s.empty? ? '' : "#{field}:"
-      fielded_queries.each do |fq|
-        q << "#{field}(#{fq})"
-      end
-    end
-    q
-  end
-  
-  def prep_value(val, quote=false)
-    quote ? %(\"#{val}\") : val.to_s
-  end
-  
-end

data/lib/rsolr/connection/param_mapping.rb

@@ -1,39 +0,0 @@
-module RSolr::Connection::ParamMapping
-  
-  autoload :Standard, 'rsolr/connection/param_mapping/standard'
-  autoload :Dismax, 'rsolr/connection/param_mapping/dismax'
-  
-  module MappingMethods
-    
-    def mappers
-      @mappers ||= []
-    end
-    
-    def mapping_for(user_param_name, solr_param_name=nil, &block)
-      return unless @input[user_param_name]
-      if (m = self.mappers.detect{|m|m[:input_name] == user_param_name})
-        self.mappers.delete m
-      end
-      self.mappers << {:input_name=>user_param_name, :output_name=>solr_param_name, :block=>block}
-    end
-    
-    def map(&blk)
-      input = @input.dup
-      mappers.each do |m|
-      input_value = input[m[:input_name]]
-        input.delete m[:input_name]
-        if m[:block]
-          value = m[:block].call(input_value)
-        else
-          value = input_value
-        end
-        if m[:output_name]
-          @output[m[:output_name]] = value
-        end
-      end
-      @output.merge(input)
-    end
-    
-  end
-  
-end

data/test/connection/param_mapping_test.rb

@@ -1,61 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helpers')
-
-class ParamMappingTest < RSolrBaseTest
-  
-  include RSolr::Connection::ParamMapping
-  
-  def test_standard_simple
-    input = {
-      :queries=>'a query',
-      :filters=>'a filter',
-      :page=>1,
-      :per_page=>10,
-      :phrase_queries=>'a phrase query',
-      :phrase_filters=>'a phrase filter',
-      :facets=>{
-        :fields=>[:one,:two]
-      }
-    }
-    mapper = Standard.new(input)
-    output = mapper.map
-    
-    assert_equal "a query \"a phrase query\"", output[:q]
-    assert_equal ["a filter", "\"a phrase filter\""], output[:fq]
-    assert_equal 0, output[:start]
-    assert_equal 10, output[:rows]
-    # facet.field can be specified multiple times, so we need an array
-    # the url builder automatically adds multiple params for arrays
-    assert_equal [:one, :two], output['facet.field']
-  end
-  
-  def test_standard_complex
-    input = {
-      :queries=>['a query', {:field=>'value'}, 'blah'],
-      :filters=>['a filter', {:filter=>'field'}, 'blah'],
-      :phrase_queries=>['a phrase', {:phrase_field=>'phrase value'}],
-      :phrase_filters=>{:can_also_be_a=>'hash'}
-    }
-    mapper = Standard.new(input)
-    output = mapper.map
-    
-    assert_equal "a query field:(value) blah \"a phrase\" phrase_field:(\"phrase value\")", output[:q]
-    assert_equal ["a filter", "filter:(field)", "blah", "can_also_be_a:(\"hash\")"], output[:fq]
-  end
-  
-  def test_dismax
-    input = {
-      :alternate_query=>{:can_be_a_string_hash_or_array=>'OK'},
-      :query_fields=>{:a_field_to_boost=>20, :another_field_to_boost=>200},
-      :phrase_fields=>{:phrase_field=>20},
-      :boost_query=>[{:field_to_use_for_boost_query=>'a'}, 'test']
-    }
-    mapper = Dismax.new(input)
-    output = mapper.map
-    assert_equal 'can_be_a_string_hash_or_array:(OK)', output['q.alt']
-    assert output[:qf]=~/another_field_to_boost\^200/
-    assert output[:qf]=~/a_field_to_boost\^20/
-    assert_equal 'phrase_field^20', output[:pf]
-    assert_equal 'field_to_use_for_boost_query:(a) test', output[:bq]
-  end
-  
-end

data/test/ruby-lang.org.rss.xml

@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <channel>
-    <title>Ruby News</title>
-    <link>http://www.ruby-lang.org/en/feeds/news.rss/</link>
-    <language>en-us</language>
-    <ttl>40</ttl>
-    <description>The latest news from Ruby-Lang.org.</description>
-
-
-        <item>
-          <title>Scotland on Rails 2009</title>
-          <description>&lt;p&gt;&lt;a href=&quot;http://scotlandonrails.com&quot;&gt;Scotland on Rails&lt;/a&gt; is pleased to announce that Conference2009 will be held March 26-28 in Edinburgh, Scotland.&lt;/p&gt;
-
-
-	&lt;p&gt;We are now accepting submissions. The closing date for submissions is December 1st 2008, so there&amp;#8217;s still time!  Please mail your plaintext proposals for 45 minute sessions to &lt;a href=&quot;mailto:submissions@scotlandonrails.com&quot;&gt;submissions@scotlandonrails.com&lt;/a&gt;.&lt;/p&gt;
-
-
-	&lt;p&gt;Alternatively, if you are interested in sponsoring the conference, please mail &lt;a href=&quot;mailto:sponsorship@scotlandonrails.com&quot;&gt;sponsorship@scotlandonrails.com&lt;/a&gt; for a prospectus.&lt;/p&gt;
-
-
-	&lt;p&gt;Lastly, if you wish to be notified when we open for registration, you can sign up on the site.&lt;/p&gt;
-
-
-	&lt;p&gt;Come and enjoy all that Edinburgh has to offer (whisky! castle! volcano! ruby! whisky!) in March.  We hope to see you there.&lt;/p&gt; </description>
-          <pubDate>Mon, 10 Nov 2008 14:55:53 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/11/10/scotland-on-rails-2009/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/11/10/scotland-on-rails-2009/</link>
-        </item>
-
-        <item>
-          <title>MountainWest RubyConf 2009 dates and CFP</title>
-          <description>&lt;p&gt;&lt;a href=&quot;http://mtnwestrubyconf.org&quot;&gt;MountainWest RubyConf 2009&lt;/a&gt;  will be held March 13-14, 2009, in Salt Lake City, Utah, &lt;span class=&quot;caps&quot;&gt;USA&lt;/span&gt;.&lt;/p&gt;
-
-
-	&lt;p&gt;Proposals to speak at this regional conference are now being accepted.  Please send your proposal to proposals@mtnwestrubyconf.org.&lt;/p&gt;
-
-
-	&lt;p&gt;The submission deadline is  midnight (MST) on December 31st, 2008.&lt;/p&gt;
-
-
-	&lt;p&gt;There are sponsorship opportunities available as well. Please contact sponsorship@mtnwestruby.org if you are interested.&lt;/p&gt;
-
-
-	&lt;p&gt;Please see &lt;a href=&quot;http://mtnwestrubyconf.org&quot;&gt;mtnwestrubyconf.org/&lt;/a&gt; for more details as they become available.&lt;/p&gt; </description>
-          <pubDate>Sat, 08 Nov 2008 15:03:32 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/11/08/mountainwest-rubyconf-2009-dates-and-cfp/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/11/08/mountainwest-rubyconf-2009-dates-and-cfp/</link>
-        </item>
-
-        <item>
-          <title> Ruby 1.9.1-preview 1 released</title>
-          <description>&lt;p&gt;Yugui (Yuki Sonoda) announced the release of  Ruby 1.9.1-preview 1:&lt;/p&gt;
-
-
-&lt;blockquote&gt;
-This is a preview release of Ruby 1.9.1, which will be the first stable version of the Ruby 1.9 series. Try it out now and get an early taste of a modern, faster, multilingualized, and much improved Ruby with clearer syntax.&lt;br&gt;&lt;br&gt;
-
-	&lt;p&gt;If you encounter any bugs or problems, please let us know via the official issue tracking system:&lt;/p&gt;
-
-
-	&lt;p&gt;&lt;a href=&quot;http://redmine.ruby-lang.org&quot;&gt;http://redmine.ruby-lang.org&lt;/a&gt;&lt;/p&gt;
-
-
-&lt;/blockquote&gt;
-
-	&lt;p&gt;You can download the release from;&lt;/p&gt;
-
-
-	&lt;ul&gt;
-	&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-preview1.tar.bz2&quot;&gt;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-preview1.tar.bz2&lt;/a&gt;
-
-	&lt;p&gt;&lt;span class=&quot;caps&quot;&gt;SIZE&lt;/span&gt;: 6169022 bytes
-&lt;span class=&quot;caps&quot;&gt;MD5&lt;/span&gt;: 0d51dc949bb6b438ad4ebfabbb5f6754
-&lt;span class=&quot;caps&quot;&gt;SHA256&lt;/span&gt;: dc39000537d7c7528ef26af8e1c3a6215b30b6c579c615eaec7013513410456a&lt;/p&gt;&lt;/li&gt;
-	&lt;/ul&gt;
-
-
-	&lt;ul&gt;
-	&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-preview1.tar.gz&quot;&gt;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-preview1.tar.gz&lt;/a&gt;
-
-	&lt;p&gt;&lt;span class=&quot;caps&quot;&gt;SIZE&lt;/span&gt;: 7409682 bytes
-&lt;span class=&quot;caps&quot;&gt;MD5&lt;/span&gt;: 738f701532452fd5d36f5c155f3ba692
-&lt;span class=&quot;caps&quot;&gt;SHA256&lt;/span&gt;: 99443bdae9f94ba7b08de187881f8cbee172379edf9c5fa85fc04c869150ff6d&lt;/p&gt;&lt;/li&gt;
-	&lt;/ul&gt;
-
-
-	&lt;ul&gt;
-	&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-preview1.zip&quot;&gt;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-preview1.zip&lt;/a&gt;
-
-	&lt;p&gt;&lt;span class=&quot;caps&quot;&gt;SIZE&lt;/span&gt;: 8569116 bytes
-&lt;span class=&quot;caps&quot;&gt;MD5&lt;/span&gt;: 5f68246246c4cd29d8a3b6b34b29b6ac
-&lt;span class=&quot;caps&quot;&gt;SHA256&lt;/span&gt;: a6c3a7bf7ea83b595024764926353e08596a78e40c57ac58c568662e5e88df95&lt;/p&gt;&lt;/li&gt;
-	&lt;/ul&gt; </description>
-          <pubDate>Tue, 28 Oct 2008 19:45:27 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/10/28/ruby-1-9-1-preview-1-released/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/10/28/ruby-1-9-1-preview-1-released/</link>
-        </item>
-
-        <item>
-          <title>RubyConf 2008 is Sold-out</title>
-          <description>&lt;p&gt;&lt;a href=&quot;http://rubyconf.org/&quot;&gt;RubyConf 2008&lt;/a&gt;  is sold out&lt;/p&gt;
-
-
-	&lt;p&gt;However, there is a &lt;a href=&quot;http://www.regonline.com/builder/site/Default.aspx?eventid=636797&quot;&gt;waiting list&lt;/a&gt; you can join in case of cancellations.&lt;/p&gt; </description>
-          <pubDate>Thu, 02 Oct 2008 23:21:06 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/10/02/rubyconf-2008-is-sold-out/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/10/02/rubyconf-2008-is-sold-out/</link>
-        </item>
-
-        <item>
-          <title>Voices That Matter 2008</title>
-          <description>&lt;p&gt;Pearson Education is running a &lt;a href=&quot;http://www.voicesthatmatter.com/ruby2008/&quot;&gt;Voices That Matter&lt;/a&gt; Ruby conference this fall in Boston.  The conference, from the same people who Addison-Wesley's Professional Ruby Series, will give you a chance to meet and learn from those very same authors.  Don't miss a chance to interact with so many Ruby professionals.&lt;/p&gt; </description>
-          <pubDate>Tue, 09 Sep 2008 02:49:37 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/09/09/voices-that-matter-2008/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/09/09/voices-that-matter-2008/</link>
-        </item>
-
-        <item>
-          <title>DoS vulnerability in REXML</title>
-          <description>&lt;p&gt;There is a DoS vulnerability in the REXML library included in the Ruby
-Standard Library. A so-called &quot;XML entity explosion&quot; attack technique
-can be used for remotely bringing down (disabling) any application
-which parses user-provided XML using REXML.&lt;/p&gt;&lt;p&gt;Most Rails applications will be vulnerable because Rails parses
-user-provided XML using REXML by default. &lt;/p&gt; &lt;h2&gt;&lt;a name=&quot;label-0&quot; id=&quot;label-0&quot;&gt;Impact&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Impact&quot; --&gt;&lt;p&gt;An attacker can cause a denial of service by causing REXML to parse a
-document containing recursively nested entities such as:&lt;/p&gt;&lt;pre&gt;&amp;lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&amp;gt;
-&amp;lt;!DOCTYPE member [
-  &amp;lt;!ENTITY a &quot;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&amp;amp;b;&quot;&amp;gt;
-  &amp;lt;!ENTITY b &quot;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&amp;amp;c;&quot;&amp;gt;
-  &amp;lt;!ENTITY c &quot;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&amp;amp;d;&quot;&amp;gt;
-  &amp;lt;!ENTITY d &quot;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&amp;amp;e;&quot;&amp;gt;
-  &amp;lt;!ENTITY e &quot;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&amp;amp;f;&quot;&amp;gt;
-  &amp;lt;!ENTITY f &quot;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&amp;amp;g;&quot;&amp;gt;
-  &amp;lt;!ENTITY g &quot;xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&quot;&amp;gt;
-]&amp;gt;
-&amp;lt;member&amp;gt;
-&amp;amp;a;
-&amp;lt;/member&amp;gt;&lt;/pre&gt;&lt;h2&gt;&lt;a name=&quot;label-1&quot; id=&quot;label-1&quot;&gt;Vulnerable versions&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Vulnerable versions&quot; --&gt;&lt;h3&gt;&lt;a name=&quot;label-2&quot; id=&quot;label-2&quot;&gt;1.8 series&lt;/a&gt;&lt;/h3&gt;&lt;!-- RDLabel: &quot;1.8 series&quot; --&gt;&lt;ul&gt;
-&lt;li&gt;1.8.6-p287 and all prior versions&lt;/li&gt;
-&lt;li&gt;1.8.7-p72 and all prior versions&lt;/li&gt;
-&lt;/ul&gt;&lt;h3&gt;&lt;a name=&quot;label-3&quot; id=&quot;label-3&quot;&gt;1.9 series&lt;/a&gt;&lt;/h3&gt;&lt;!-- RDLabel: &quot;1.9 series&quot; --&gt;&lt;ul&gt;
-&lt;li&gt;all versions&lt;/li&gt;
-&lt;/ul&gt;&lt;h2&gt;&lt;a name=&quot;label-4&quot; id=&quot;label-4&quot;&gt;Solution&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Solution&quot; --&gt;&lt;p&gt;Please download the following monkey patch to fix this problem.&lt;/p&gt;&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;http://www.ruby-lang.org/security/20080823rexml/rexml-expansion-fix2.rb&quot;&gt;&amp;lt;URL:http://www.ruby-lang.org/security/20080823rexml/rexml-expansion-fix2.rb&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;Then fix your application to load rexml-expansion-fix2.rb before using
-REXML.&lt;/p&gt;&lt;pre&gt;require &quot;rexml-expansion-fix2&quot;
-...
-doc = REXML::Document.new(str)
-...&lt;/pre&gt;&lt;p&gt;If you have a Rails application, copy rexml-expansion-fix2.rb into a
-directory on the load path (such as RAILS_ROOT/lib/), and put the
-following line into config/environment.rb.&lt;/p&gt;&lt;pre&gt;require &quot;rexml-expansion-fix2&quot;&lt;/pre&gt;&lt;p&gt;If your application is Rails 2.1 or later, you can simply copy 
-rexml-expansion-fix2.rb to RAILS_ROOT/config/initializers and it will 
-be required automatically.&lt;/p&gt;&lt;p&gt;By default, XML entity expansion limit is 10000.  You can change it by
-changing REXML::Document.entity_expansion_limit.  e.g.&lt;/p&gt;&lt;pre&gt;REXML::Document.entity_expansion_limit = 1000&lt;/pre&gt;&lt;p&gt;This fix will be made available as a gem and used by future versions of
-rails, but users should take corrective action immediately.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-5&quot; id=&quot;label-5&quot;&gt;Credit&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Credit&quot; --&gt;&lt;p&gt;Credit to Luka Treiber and Mitja Kolsek of ACROS Security for
-disclosing the problem to Ruby and Rails Security Teams.&lt;/p&gt;&lt;p&gt;Credit to Michael Koziarski of Rails Core Team for creating the monkey
-patch to fix the vulnerability.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-6&quot; id=&quot;label-6&quot;&gt;Changes&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Changes&quot; --&gt;&lt;ul&gt;
-&lt;li&gt;2008-08-29 18:46 +09:00  fixed the summary not to mislead that this vulnerability is Rails specific.&lt;/li&gt;
-&lt;li&gt;2008-11-09 12:40 +09:00  fixed &lt;a href=&quot;http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502535&quot;&gt;a bug of the monkey patch&lt;/a&gt;.&lt;/li&gt;
-&lt;/ul&gt;</description>
-          <pubDate>Sat, 23 Aug 2008 07:56:11 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/</link>
-        </item>
-
-        <item>
-          <title>Ruby 1.8.7-p72 and 1.8.6-p287 released</title>
-          <description>&lt;p&gt;Ruby 1.8.7-p72 and 1.8.6-p287 have been released.
-The last releases were incomplete, and the new releases include fixes of &lt;a href=&quot;http://www.ruby-lang.org/en/news/2008/08/08/multiple-vulnerabilities-in-ruby/#label-3&quot;&gt;the previously announced vulnerability of dl&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;The released source archives are available at:&lt;/p&gt;&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.bz2&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.bz2&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.zip&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.zip&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.bz2&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.bz2&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.zip&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.zip&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt; &lt;p&gt;Checksums:&lt;/p&gt;&lt;pre&gt;MD5(ruby-1.8.6-p287.tar.gz)= f6cd51001534ced5375339707a757556
-SHA256(ruby-1.8.6-p287.tar.gz)= 6463d1932c34ff72b79174ac7d2c28940d29d147928250928a00a0dbee43db57
-SIZE(ruby-1.8.6-p287.tar.gz)= 4590393
-
-MD5(ruby-1.8.6-p287.tar.bz2)= 80b5f3db12531d36e6c81fac6d05dda9
-SHA256(ruby-1.8.6-p287.tar.bz2)= ac15a1cb78c50ec9cc7e831616a143586bdd566bc865c6b769a0c47b3b3936ce
-SIZE(ruby-1.8.6-p287.tar.bz2)= 3956902
-
-MD5(ruby-1.8.6-p287.zip)= e555d51f5b387fdd52ae53d9bafa13f5
-SHA256(ruby-1.8.6-p287.zip)= 844c66c015565839531a34b83e0526cd4fa2a71cc0f5cc8ddb0d4c158403543a
-SIZE(ruby-1.8.6-p287.zip)= 5606238
-
-MD5(ruby-1.8.7-p72.tar.gz)= 5e5b7189674b3a7f69401284f6a7a36d
-SHA256(ruby-1.8.7-p72.tar.gz)= e15ca005076f5d6f91fc856fdfbd071698a4cadac3c6e25855899dba1f6fc5ef
-SIZE(ruby-1.8.7-p72.tar.gz)= 4805594
-
-MD5(ruby-1.8.7-p72.tar.bz2)= 0b215c46b89b28d7ab8d56d96e72d5b9
-SHA256(ruby-1.8.7-p72.tar.bz2)= a8f8a28e286dd76747d8e97ea5cfe7a315eb896906ab8c8606d687d9f6f6146e
-SIZE(ruby-1.8.7-p72.tar.bz2)= 4127450
-
-MD5(ruby-1.8.7-p72.zip)= b44fe5a12d4bf138ba0d3660e13a8216
-SHA256(ruby-1.8.7-p72.zip)= 77e67be4aa8c3e041e1d20d24e5fcf2e33ad9bccb3da3332b6c0a5b648334903
-SIZE(ruby-1.8.7-p72.zip)= 5855902&lt;/pre&gt;&lt;p&gt;For a full list of all changes, see the bundled files named ChangeLog, which are also available at the following locations:&lt;/p&gt;&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;http://svn.ruby-lang.org/repos/ruby/tags/v1_8_6_287/ChangeLog&quot;&gt;&amp;lt;URL:http://svn.ruby-lang.org/repos/ruby/tags/v1_8_6_287/ChangeLog&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://svn.ruby-lang.org/repos/ruby/tags/v1_8_7_72/ChangeLog&quot;&gt;&amp;lt;URL:http://svn.ruby-lang.org/repos/ruby/tags/v1_8_7_72/ChangeLog&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;</description>
-          <pubDate>Mon, 11 Aug 2008 02:01:00 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/08/11/ruby-1-8-7-p72-and-1-8-6-p287-released/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/08/11/ruby-1-8-7-p72-and-1-8-6-p287-released/</link>
-        </item>
-
-        <item>
-          <title>Multiple vulnerabilities in Ruby</title>
-          <description>&lt;p&gt;Multiple vulnerabilities have been discovered in Ruby.  It's
-recommended that you upgrade to the latest versions.&lt;/p&gt; &lt;h2&gt;&lt;a name=&quot;label-0&quot; id=&quot;label-0&quot;&gt;Details&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Details&quot; --&gt;&lt;p&gt;The following vulnerabilities have been discovered.&lt;/p&gt;&lt;h3&gt;&lt;a name=&quot;label-1&quot; id=&quot;label-1&quot;&gt;Several vulnerabilities in safe level&lt;/a&gt;&lt;/h3&gt;&lt;!-- RDLabel: &quot;Several vulnerabilities in safe level&quot; --&gt;&lt;p&gt;Several vulnerabilities in safe level have been discovered.&lt;/p&gt;&lt;ul&gt;
-&lt;li&gt;&lt;p&gt;untrace_var is permitted at safe level 4.&lt;/p&gt;
-&lt;pre&gt;trace_var(:$VAR) {|val| puts &quot;$VAR = #{val}&quot; }
-
-Thread.new do
- $SAFE = 4
- eval %q{
-   proc = untrace_var :$VAR
-   proc.first.call(&quot;aaa&quot;)
- }
-end.join&lt;/pre&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;$PROGRAM_NAME may be modified at safe level 4.&lt;/p&gt;
-&lt;pre&gt;Thread.new do
- $SAFE = 4
- eval %q{$PROGRAM_NAME.replace &quot;Hello, World!&quot;}
-end.join
-
-$PROGRAM_NAME #=&amp;gt; &quot;Hello, World!&quot;&lt;/pre&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;Insecure methods may be called at safe level 1-3.&lt;/p&gt;
-&lt;pre&gt;class Hello
- def world
-   Thread.new do
-     $SAFE = 4
-     msg = &quot;Hello, World!&quot;
-     def msg.size
-       self.replace self*10 # replace string
-       1 # return wrong size
-     end
-     msg
-   end.value
- end
-end
-
-$SAFE = 1 # or 2, or 3
-s = Hello.new.world
-if s.kind_of?(String)
- puts s if s.size &amp;lt; 20 # print string which size is less than 20
-end&lt;/pre&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;Syslog operations are permitted at safe level 4.&lt;/p&gt;
-&lt;pre&gt;require &quot;syslog&quot;
-
-Syslog.open
-
-Thread.new do
- $SAFE = 4
- eval %q{
-   Syslog.log(Syslog::LOG_WARNING, &quot;Hello, World!&quot;)
-   Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_EMERG)
-   Syslog.info(&quot;masked&quot;)
-   Syslog.close
- }
-end.join&lt;/pre&gt;&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;These vulnerabilities were reported by Keita Yamaguchi.&lt;/p&gt;&lt;h3&gt;&lt;a name=&quot;label-2&quot; id=&quot;label-2&quot;&gt;DoS vulnerability in WEBrick&lt;/a&gt;&lt;/h3&gt;&lt;!-- RDLabel: &quot;DoS vulnerability in WEBrick&quot; --&gt;&lt;p&gt;WEBrick::HTTP::DefaultFileHandler is faulty of exponential time taking
-requests due to a backtracking regular expression in
-WEBrick::HTTPUtils.split_header_value.&lt;/p&gt;&lt;p&gt;Exploitable server:&lt;/p&gt;&lt;pre&gt;require 'webrick'
-WEBrick::HTTPServer.new(:Port =&amp;gt; 2000, :DocumentRoot =&amp;gt; &quot;/etc&quot;).start&lt;/pre&gt;&lt;p&gt;Attack:&lt;/p&gt;&lt;pre&gt;require 'net/http'
-res = Net::HTTP.start(&quot;localhost&quot;, 2000) { |http|
-  req = Net::HTTP::Get.new(&quot;/passwd&quot;)
-  req['If-None-Match'] = %q{meh=&quot;&quot;} + %q{foo=&quot;bar&quot; } * 100
-  http.request(req)
-}
-p res&lt;/pre&gt;&lt;p&gt;The request likely won't finish in this universe.&lt;/p&gt;&lt;p&gt;This vulnerability was reported by Christian Neukirchen.&lt;/p&gt;&lt;h3&gt;&lt;a name=&quot;label-3&quot; id=&quot;label-3&quot;&gt;Lack of taintness check in dl&lt;/a&gt;&lt;/h3&gt;&lt;!-- RDLabel: &quot;Lack of taintness check in dl&quot; --&gt;&lt;p&gt;dl doesn't check taintness, so it could allow attackers to call
-dangerous functions.&lt;/p&gt;&lt;pre&gt;require 'dl'
-$SAFE = 1
-h = DL.dlopen(nil)
-sys = h.sym('system', 'IP')
-uname = 'uname -rs'.taint
-sys[uname]&lt;/pre&gt;&lt;p&gt;This vulnerability was reported by sheepman.&lt;/p&gt;&lt;h3&gt;&lt;a name=&quot;label-4&quot; id=&quot;label-4&quot;&gt;DNS spoofing vulnerability in resolv.rb&lt;/a&gt;&lt;/h3&gt;&lt;!-- RDLabel: &quot;DNS spoofing vulnerability in resolv.rb&quot; --&gt;&lt;p&gt;resolv.rb allow remote attackers to spoof DNS answers.  This risk can be
-reduced by randomness of DNS transaction IDs and source ports, so resolv.rb
-is fixed to randomize them.&lt;/p&gt;&lt;ul&gt;
-&lt;li&gt;see also: &lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1447&quot;&gt;CVE-2008-1447&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;This vulnerability was reported by Tanaka Akira.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-5&quot; id=&quot;label-5&quot;&gt;Vulnerable versions&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Vulnerable versions&quot; --&gt;&lt;dl&gt;
-&lt;dt&gt;&lt;a name=&quot;label-6&quot; id=&quot;label-6&quot;&gt;1.8 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.8 series&quot; --&gt;
-&lt;dd&gt;
-&lt;ul&gt;
-&lt;li&gt;1.8.5 and all prior versions&lt;/li&gt;
-&lt;li&gt;1.8.6-p286 and all prior versions&lt;/li&gt;
-&lt;li&gt;1.8.7-p71 and all prior versions&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;dt&gt;&lt;a name=&quot;label-7&quot; id=&quot;label-7&quot;&gt;1.9 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.9 series&quot; --&gt;
-&lt;dd&gt;
-&lt;ul&gt;
-&lt;li&gt;r18423 and all prior revisions&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;/dl&gt;&lt;h2&gt;&lt;a name=&quot;label-8&quot; id=&quot;label-8&quot;&gt;Solution&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Solution&quot; --&gt;&lt;dl&gt;
-&lt;dt&gt;&lt;a name=&quot;label-9&quot; id=&quot;label-9&quot;&gt;1.8 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.8 series&quot; --&gt;
-&lt;dd&gt;
-Please upgrade to 1.8.6-p287, or 1.8.7-p72. 
-&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz&amp;gt;&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;dt&gt;&lt;a name=&quot;label-10&quot; id=&quot;label-10&quot;&gt;1.9 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.9 series&quot; --&gt;
-&lt;dd&gt;
-&lt;p&gt;Please check out the latest version using Subversion.&lt;/p&gt;
-&lt;pre&gt;$ svn co http://svn.ruby-lang.org/repos/ruby/trunk ruby&lt;/pre&gt;
-&lt;/dd&gt;
-&lt;/dl&gt;&lt;p&gt;Please note that a package that corrects this weakness may already be
-available through your package management software.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-11&quot; id=&quot;label-11&quot;&gt;Credit&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Credit&quot; --&gt;&lt;p&gt;Credit to Keita Yamaguchi, Christian Neukirchen, sheepman, and Tanaka
-Akira for disclosing these problems to Ruby Security Team.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-12&quot; id=&quot;label-12&quot;&gt;Changes&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Changes&quot; --&gt;&lt;ul&gt;
-&lt;li&gt;2008-08-08 12:21 +09:00  fixed the revision number of ruby 1.9.&lt;/li&gt;
-&lt;li&gt;2008-08-11 11:23 +09:00  fixed the patchlevel of ruby 1.8. see &lt;a href=&quot;http://www.ruby-lang.org/en/news/2008/08/11/ruby-1-8-7-p72-and-1-8-6-p287-released/&quot;&gt;the release announcement of Ruby 1.8.7-p72 and 1.8.6-p287&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;</description>
-          <pubDate>Fri, 08 Aug 2008 02:59:49 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/08/08/multiple-vulnerabilities-in-ruby/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/08/08/multiple-vulnerabilities-in-ruby/</link>
-        </item>
-
-        <item>
-          <title>RubyConf 2008 Proposals Now Being Accepted</title>
-          <description>&lt;p&gt;&lt;a href=&quot;http://www.rubyconf.org&quot;&gt;RubyConf 2008&lt;/a&gt;  will be held in Orlando, Florida, &lt;span class=&quot;caps&quot;&gt;USA&lt;/span&gt;, from November 6 to November 8.&lt;/p&gt;
-
-
-	&lt;p&gt;&lt;a href=&quot;http://www.rubyconf.org/proposals/new&quot;&gt;Proposals for presentations&lt;/a&gt; are now begin accepted.  All proposals must be received by August 21.&lt;/p&gt; </description>
-          <pubDate>Mon, 04 Aug 2008 20:26:29 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/08/04/rubyconf-2008-proposals-now-being-accepted/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/08/04/rubyconf-2008-proposals-now-being-accepted/</link>
-        </item>
-
-        <item>
-          <title>Arbitrary code execution vulnerabilities</title>
-          <description>&lt;p&gt;Multiple vulnerabilities in Ruby may lead to a denial of service (DoS)
-condition or allow execution of arbitrary code.&lt;/p&gt; &lt;h2&gt;&lt;a name=&quot;label-0&quot; id=&quot;label-0&quot;&gt;Impact&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Impact&quot; --&gt;&lt;p&gt;With the following vulnerabilities, an attacker can lead to denial of
-service condition or execute arbitrary code.&lt;/p&gt;&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2662&quot;&gt;CVE-2008-2662&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2663&quot;&gt;CVE-2008-2663&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2725&quot;&gt;CVE-2008-2725&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2726&quot;&gt;CVE-2008-2726&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2664&quot;&gt;CVE-2008-2664&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;&lt;h2&gt;&lt;a name=&quot;label-1&quot; id=&quot;label-1&quot;&gt;Vulnerable versions&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Vulnerable versions&quot; --&gt;&lt;dl&gt;
-&lt;dt&gt;&lt;a name=&quot;label-2&quot; id=&quot;label-2&quot;&gt;1.8 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.8 series&quot; --&gt;
-&lt;dd&gt;
-&lt;ul&gt;
-&lt;li&gt;1.8.4 and all prior versions&lt;/li&gt;
-&lt;li&gt;1.8.5-p230 and all prior versions&lt;/li&gt;
-&lt;li&gt;1.8.6-p229 and all prior versions&lt;/li&gt;
-&lt;li&gt;1.8.7-p21 and all prior versions&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;dt&gt;&lt;a name=&quot;label-3&quot; id=&quot;label-3&quot;&gt;1.9 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.9 series&quot; --&gt;
-&lt;dd&gt;
-&lt;ul&gt;
-&lt;li&gt;1.9.0-1 and all prior versions&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;/dl&gt;&lt;h2&gt;&lt;a name=&quot;label-4&quot; id=&quot;label-4&quot;&gt;Solution&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Solution&quot; --&gt;&lt;dl&gt;
-&lt;dt&gt;&lt;a name=&quot;label-5&quot; id=&quot;label-5&quot;&gt;1.8 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.8 series&quot; --&gt;
-&lt;dd&gt;
-Please upgrade to 1.8.5-p231, or 1.8.6-p230, or 1.8.7-p22. 
-&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5-p231.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5-p231.tar.gz&amp;gt;&lt;/a&gt;
-      (md5sum: e900cf225d55414bffe878f00a85807c)&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p230.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p230.tar.gz&amp;gt;&lt;/a&gt;
-      (md5sum: 5e8247e39be2dc3c1a755579c340857f)&lt;/li&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p22.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p22.tar.gz&amp;gt;&lt;/a&gt;
-      (md5sum: fc3ede83a98f48d8cb6de2145f680ef2)&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;dt&gt;&lt;a name=&quot;label-6&quot; id=&quot;label-6&quot;&gt;1.9 series&lt;/a&gt;&lt;/dt&gt;&lt;!-- RDLabel: &quot;1.9 series&quot; --&gt;
-&lt;dd&gt;
-Please upgrade to 1.9.0-2.
-&lt;ul&gt;
-&lt;li&gt;&lt;a href=&quot;ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.0-2.tar.gz&quot;&gt;&amp;lt;URL:ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.0-2.tar.gz&amp;gt;&lt;/a&gt;
-      (md5sum: 2a848b81ed1d6393b88eec8aa6173b75)&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/dd&gt;
-&lt;/dl&gt;&lt;p&gt;These versions also fix the vulnerability of WEBrick (&lt;a href=&quot;http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1891&quot;&gt;CVE-2008-1891&lt;/a&gt;).&lt;/p&gt;&lt;p&gt;Please note that a package that corrects this weakness may already be
-available through your package management software.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-7&quot; id=&quot;label-7&quot;&gt;Credit&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Credit&quot; --&gt;&lt;p&gt;Credit to Drew Yao of Apple Product Security for disclosing the problem to Ruby
-Security Team.&lt;/p&gt;&lt;h2&gt;&lt;a name=&quot;label-8&quot; id=&quot;label-8&quot;&gt;Changes&lt;/a&gt;&lt;/h2&gt;&lt;!-- RDLabel: &quot;Changes&quot; --&gt;&lt;ul&gt;
-&lt;li&gt;2008-06-21 00:29 +09:00  removed wrong CVE IDs (CVE-2008-2727, CVE-2008-2728).&lt;/li&gt;
-&lt;/ul&gt;</description>
-          <pubDate>Fri, 20 Jun 2008 12:54:43 GMT</pubDate>
-          <guid>http://www.ruby-lang.org/en/news/2008/06/20/arbitrary-code-execution-vulnerabilities/</guid>
-          <link>http://www.ruby-lang.org/en/news/2008/06/20/arbitrary-code-execution-vulnerabilities/</link>
-        </item>
-
-
-  </channel>
-</rss>