Author: ehatcher
Date: Wed Aug 15 11:33:11 2007
New Revision: 566295
URL: http://svn.apache.org/viewvc?view=rev&rev=566295
Log:
Rubyism tidying
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/importer/mapper.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/dismax.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/add_document.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/index_info.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ping.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ruby.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/standard.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/xml.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/util.rb
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/importer/mapper.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/importer/mapper.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/importer/mapper.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/importer/mapper.rb Wed Aug
15 11:33:11 2007
@@ -25,7 +25,7 @@
when String
field_mapping
when Proc
- field_mapping.call(orig_data)
+ 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
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/dismax.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/dismax.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/dismax.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/dismax.rb Wed Aug
15 11:33:11 2007
@@ -19,7 +19,7 @@
@alternate_query = params.delete(:alternate_query)
@sort_values = params.delete(:sort)
- super(params)
+ super
@query_type = "dismax"
end
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/add_document.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/add_document.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/add_document.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/add_document.rb
Wed Aug 15 11:33:11 2007
@@ -12,6 +12,6 @@
class Solr::Response::AddDocument < Solr::Response::Xml
def initialize(xml)
- super(xml)
+ super
end
end
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/index_info.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/index_info.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/index_info.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/index_info.rb Wed
Aug 15 11:33:11 2007
@@ -12,7 +12,7 @@
class Solr::Response::IndexInfo < Solr::Response::Ruby
def initialize(ruby_code)
- super(ruby_code)
+ super
end
def num_docs
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ping.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ping.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ping.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ping.rb Wed Aug
15 11:33:11 2007
@@ -15,7 +15,7 @@
class Solr::Response::Ping < Solr::Response::Xml
def initialize(xml)
- super(xml)
+ super
@ok = REXML::XPath.first(@doc, './solr/ping') ? true : false
end
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ruby.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ruby.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ruby.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/ruby.rb Wed Aug
15 11:33:11 2007
@@ -14,7 +14,7 @@
attr_reader :data
def initialize(ruby_code)
- super(ruby_code)
+ super
begin
#TODO: what about pulling up data/header/response to ResponseBase,
# or maybe a new middle class like SelectResponseBase since
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/standard.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/standard.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/standard.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/standard.rb Wed
Aug 15 11:33:11 2007
@@ -15,7 +15,7 @@
include Enumerable
def initialize(ruby_code)
- super(ruby_code)
+ super
@response = @data['response']
raise "response section missing" unless @response.kind_of? Hash
end
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/xml.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/xml.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/xml.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/response/xml.rb Wed Aug 15
11:33:11 2007
@@ -17,7 +17,7 @@
attr_reader :doc, :status_code, :status_message
def initialize(xml)
- super(xml)
+ super
# parse the xml
@doc = REXML::Document.new(xml)
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/util.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/util.rb?view=diff&rev=566295&r1=566294&r2=566295
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/util.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/util.rb Wed Aug 15
11:33:11 2007
@@ -22,13 +22,7 @@
# paired_array_to_hash([key1,value1,key2,value2]) => {key1 => value1, key2,
value2}
def self.paired_array_to_hash(a)
- h = {}
-
- paired_array_each(a) do |key,value|
- h[key] = value
- end
-
- h
+ Hash[*a]
end
end
