muck-solr 0.4.1 → 0.4.2

data/Rakefile

@@ -67,33 +67,9 @@ begin
     s.files =  FileList["[A-Z]*", "{bin,generators,config,lib,solr}/**/*"] +
       FileList["test/**/*"].reject {|f| f.include?("test/log")}.reject {|f| f.include?("test/tmp")}
   end
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
-
-# rubyforge tasks
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/muck-solr/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 4
-:patch: 1
+:patch: 2
 :major: 0

data/lib/acts_as_solr/class_methods.rb

@@ -187,6 +187,11 @@ module ActsAsSolr #:nodoc:
       data.total_hits
     end
             
+    def more_like_this(uri, options={})
+      data = parse_mlt(uri, options)
+      return parse_results(data, options)
+    end
+    
     # It's used to rebuild the Solr index for a specific model. 
     #  Book.rebuild_solr_index
     # 

data/lib/acts_as_solr/common_methods.rb

@@ -52,17 +52,17 @@ module ActsAsSolr #:nodoc:
     
     # Sends an add command to Solr
     def solr_add(add_xml)
-      ActsAsSolr::Post.execute(Solr::Request::AddDocument.new(add_xml))
+      ActsAsSolr::Post.execute(Solr::Request::AddDocument.new(add_xml), specified_core)
     end
     
     # Sends the delete command to Solr
     def solr_delete(solr_ids)
-      ActsAsSolr::Post.execute(Solr::Request::Delete.new(:id => solr_ids))
+      ActsAsSolr::Post.execute(Solr::Request::Delete.new(:id => solr_ids), specified_core)
     end
     
     # Sends the commit command to Solr
     def solr_commit
-      ActsAsSolr::Post.execute(Solr::Request::Commit.new)
+      ActsAsSolr::Post.execute(Solr::Request::Commit.new, specified_core)
     end
     
     # Optimizes the Solr index. Solr says:
@@ -84,6 +84,19 @@ module ActsAsSolr #:nodoc:
       eval "object.#{object.class.primary_key}"
     end
     
+    private
+    
+    def specified_core
+      if solr_configuration[:multi_core]
+        begin
+          return self.locale.to_s 
+        rescue NoMethodError 
+          return solr_configuration[:default_core]
+        end
+      end
+      nil
+    end
+    
   end
   
 end

data/lib/acts_as_solr/parser_methods.rb

@@ -85,6 +85,32 @@ module ActsAsSolr #:nodoc:
       end            
     end
     
+    def parse_mlt(uri, options={}, models=nil)
+      valid_options = [:offset, :limit, :facets, :models, :results_format, :order, :scores, :operator, :include, :lazy, :joins, :select, :core]
+      query_options = {}
+
+      return nil if (uri.nil? || uri.strip == '')
+
+      raise "Invalid parameters: #{(options.keys - valid_options).join(',')}" unless (options.keys - valid_options).empty?
+      begin
+        
+        if models.nil?
+          # TODO: use a filter query for type, allowing Solr to cache it individually
+          models = "AND #{solr_type_condition}"
+          field_list = solr_configuration[:primary_key_field]
+        else
+          field_list = "id"
+        end
+        
+        query_options['stream.url'] = uri
+        query_options[:rows] = options[:limit]
+        
+        ActsAsSolr::Post.execute(Solr::Request::Mlt.new(query_options), options[:core])
+      rescue
+        raise "There was a problem executing your search\n#{query_options.inspect}\n: #{$!} in #{$!.backtrace.first}"
+      end            
+    end
+    
     def solr_type_condition
       subclasses.inject("(#{solr_configuration[:type_field]}:#{self.name}") do |condition, subclass|
         condition << " OR #{solr_configuration[:type_field]}:#{subclass.name}"

data/lib/acts_as_solr/tasks/solr.rake

@@ -27,7 +27,7 @@ namespace :solr do
           end
         end
         sleep(5)
-        File.open("#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} if windows
+        File.open("#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
         puts "#{ENV['RAILS_ENV']} Solr started successfully on #{SOLR_PORT}, pid: #{pid}."
       end
     end

data/lib/solr/request/mlt.rb

@@ -0,0 +1,71 @@
+# 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::Request::Mlt < Solr::Request::Select
+
+  VALID_PARAMS = [:query, :sort, :default_field, :operator, :start, :rows, :shards, :date_facets,
+    :filter_queries, :field_list, :debug_query, :explain_other, :facets, :highlighting, :mlt, 'stream.url']
+  
+  def initialize(params)
+    super('mlt', params)
+    
+    raise "Invalid parameters: #{(params.keys - VALID_PARAMS).join(',')}" unless 
+      (params.keys - VALID_PARAMS).empty?
+    
+    raise "'stream.url' parameter required" unless params['stream.url']
+    
+    @params = params.dup
+    
+    @params[:field_list] ||= ["pk_i","score"]
+  end
+  
+  def to_hash
+    hash = {}
+    
+    # standard request param processing
+    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.op"] = @params[:operator]
+    hash[:df] = @params[:default_field]
+
+    # common parameter processing
+    hash[:start] = @params[:start] || '0'
+    hash[:rows] = @params[:rows] || '10'
+    hash[:fq] = @params[:filter_queries]
+    hash[:fl] = @params[:field_list].join(',') 
+    hash[:debugQuery] = @params[:debug_query]
+    hash[:explainOther] = @params[:explain_other]
+    
+    hash[:qt] = 'mlt'
+    hash[:wt] = 'ruby'
+    hash['stream.url'] = @params[:query]
+    
+#    hash[:mlt] = true
+    if @params[:mlt]
+      hash["mlt.count"] = @params[:mlt][:count]
+      hash["mlt.fl"] = @params[:mlt][:field_list].join(',')
+      hash["mlt.mintf"] = @params[:mlt][:min_term_freq]
+      hash["mlt.mindf"] = @params[:mlt][:min_doc_freq]
+      hash["mlt.minwl"] = @params[:mlt][:min_word_length]
+      hash["mlt.maxwl"] = @params[:mlt][:max_word_length]
+      hash["mlt.maxqt"] = @params[:mlt][:max_query_terms]
+      hash["mlt.maxntp"] = @params[:mlt][:max_tokens_parsed]
+      hash["mlt.boost"] = @params[:mlt][:boost]
+    end
+    
+    hash.merge(super.to_hash)
+  end
+
+end

data/lib/solr/request.rb

@@ -19,6 +19,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/request/commit")
 require File.expand_path("#{File.dirname(__FILE__)}/request/delete")
 require File.expand_path("#{File.dirname(__FILE__)}/request/ping")
 require File.expand_path("#{File.dirname(__FILE__)}/request/select")
+require File.expand_path("#{File.dirname(__FILE__)}/request/mlt")
 require File.expand_path("#{File.dirname(__FILE__)}/request/standard")
 require File.expand_path("#{File.dirname(__FILE__)}/request/spellcheck")
 require File.expand_path("#{File.dirname(__FILE__)}/request/dismax")

data/lib/solr/response/mlt.rb

@@ -0,0 +1,17 @@
+# 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::Mlt < Solr::Response::Standard
+  def initialize(ruby_code)
+    super
+  end
+end

data/lib/solr/response.rb

@@ -24,4 +24,5 @@ require File.expand_path("#{File.dirname(__FILE__)}/response/commit")
 require File.expand_path("#{File.dirname(__FILE__)}/response/delete")
 require File.expand_path("#{File.dirname(__FILE__)}/response/index_info")
 require File.expand_path("#{File.dirname(__FILE__)}/response/optimize")
-require File.expand_path("#{File.dirname(__FILE__)}/response/select")
+require File.expand_path("#{File.dirname(__FILE__)}/response/select")
+require File.expand_path("#{File.dirname(__FILE__)}/response/mlt")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-solr
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Mathias Meyer, Joel Duffin, Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -06:00
+date: 2009-08-12 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -67,6 +67,7 @@ files:
 - lib/solr/request/delete.rb
 - lib/solr/request/dismax.rb
 - lib/solr/request/index_info.rb
+- lib/solr/request/mlt.rb
 - lib/solr/request/modify_document.rb
 - lib/solr/request/optimize.rb
 - lib/solr/request/ping.rb
@@ -81,6 +82,7 @@ files:
 - lib/solr/response/delete.rb
 - lib/solr/response/dismax.rb
 - lib/solr/response/index_info.rb
+- lib/solr/response/mlt.rb
 - lib/solr/response/modify_document.rb
 - lib/solr/response/optimize.rb
 - lib/solr/response/ping.rb