solr-ruby 0.0.7 → 0.0.8

data/lib/solr/request/standard.rb

@@ -46,11 +46,11 @@ class Solr::Request::Standard < Solr::Request::Select
     hash = {}
     
     # standard request param processing
-    sort = @params[:sort].collect do |sort|
+    hash[:sort] = @params[:sort].collect do |sort|
       key = sort.keys[0]
       "#{key.to_s} #{sort[key] == :descending ? 'desc' : 'asc'}"
     end.join(',') if @params[:sort]
-    hash[:q] = sort ? "#{@params[:query]};#{sort}" : @params[:query]
+    hash[:q] = @params[:query]
     hash["q.op"] = @params[:operator]
     hash[:df] = @params[:default_field]
 

data/lib/solr/response/dismax.rb

@@ -1,3 +1,15 @@
+# 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::Response::Dismax < Solr::Response::Standard
   # no need for special processing
   

data/test/unit/hpricot_test_file.xml

@@ -1,3 +1,22 @@
+<!--
+ /**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
+ -->
 <root>
   <parent>
     <child attribute="attribute1">text1</child>

data/test/unit/standard_request_test.rb

@@ -95,8 +95,9 @@ class StandardRequestTest < Test::Unit::TestCase
   end
 
   def test_basic_sort
-    request = Solr::Request::Standard.new(:query => 'query', :sort => [{:title => :descending}])
-    assert_equal 'query;title desc', request.to_hash[:q]
+    request = Solr::Request::Standard.new(:query => 'query', :sort => [{:title => :descending}, {:date => :ascending}])
+    assert_equal 'query', request.to_hash[:q]
+    assert_equal 'title desc,date asc', request.to_hash[:sort]
   end
   
   def test_highlighting

data/test/unit/xpath_test_file.xml

@@ -1,3 +1,22 @@
+<!--
+ /**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
+ -->
 <root>
   <parent>
     <child attribute="attribute1">text1</child>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solr-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Apache Solr
@@ -9,7 +9,7 @@ autorequire: solr
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -05:00
+date: 2009-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -40,7 +40,6 @@ files:
 - lib/solr/request/add_document.rb
 - lib/solr/request/base.rb
 - lib/solr/request/commit.rb
-- lib/solr/request/custom.rb
 - lib/solr/request/delete.rb
 - lib/solr/request/dismax.rb
 - lib/solr/request/index_info.rb

data/lib/solr/request/custom.rb

@@ -1,50 +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 'erb'
-
-# "Abstract" base class, only useful with subclasses that add parameters
-class Solr::Request::Custom < Solr::Request::Select
-      
-  def initialize(qt=nil, params={}, content_type='application/x-www-form-urlencoded; charset=utf-8')
-    super(qt,params)
-    @content_type = content_type
-  end
-  
-  def handler
-    @query_type.starts_with('/') ? qt.remove_first('/') : 'select'
-  end
-  
-  def content_type
-    @content_type
-  end
-
-  def to_hash
-    return {:qt => query_type, :wt => 'ruby'}.merge(@select_params)
-  end
-  
-  def to_s
-    raw_params = self.to_hash
-
-    http_params = []
-    raw_params.each do |key,value|
-      if value.respond_to? :each
-        value.each { |v| http_params << "#{key}=#{ERB::Util::url_encode(v)}" unless v.nil?}
-      else
-        http_params << "#{key}=#{ERB::Util::url_encode(value)}" unless value.nil?
-      end
-    end
-
-    http_params.join("&")
-  end
-  
-end