customized-mongomapper-search 0.1.3 → 0.1.4

data/CHANGE_LOG

@@ -0,0 +1,13 @@
+0.1.4
+------
+- Added a way to specify the Solr document id (uniqueKey) field that the MongoMapper document _id key maps to.
+- Added handling for Solr document id/uniqueKey field that's set as multiValued so that the first value is chosen.  There can only be one value for the id/uniqueKey field but it's still possible to set the field as multiValued.  RSolr returns an array containing only one value for the id/uniqueKey field when the field is multiValued.
+
+0.1.3
+------
+- Added an option named "solr_field_name" for MongoMapper document keys.  The value of "solr_field_name" overrides the name of the key when indexing the document in Solr.
+
+
+0.1.2
+______
+- Added the ability to define the value of the "qt" request parameter as an option in the options hash of the search method.  The value of the "qt" request parameter defaults to "standard" if one is not specified in the options hash.

data/Manifest

@@ -1,3 +1,4 @@
+CHANGE_LOG
 README.rdoc
 Rakefile
 lib/customized-mongomapper-search.rb

data/README.rdoc

@@ -1,6 +1,6 @@
 = tsxn-mongomapper-search
 
-Easily integreate mongo mapper with enterprise search like solr.  MODIFIED/CUSTOMIZED by tsxn26 to use a specified Solr URL in the model.  
+Easily integrate mongo mapper with enterprise search like solr.  MODIFIED/CUSTOMIZED to use a specified Solr URL in the model.  
 
 == Credits
 
@@ -10,17 +10,28 @@ The original gem was written by Fernando Meyer and can be found at http://github
 
 Within the model that includes MongoMapper::Document add the following:
 
-class << self; attr_accessor :SOLR_URL end
-@SOLR_URL = "{SOLR URL}"
+  class << self; attr_accessor :SOLR_URL end
+  @SOLR_URL = "{SOLR URL}"   # {SOLR URL} should be replaced with the actual solr url if that wasn't apparent
 
 Example:
 
-class Foo
-  include MongoMapper::Document
-  include Search::SolrDocument
+  class Foo
+    include MongoMapper::Document
+    include Search::SolrDocument
   
-  class << self; attr_accessor :SOLR_URL end
-  @SOLR_URL = "http://localhost:8080/solr/foo.core"
+    class << self; attr_accessor :SOLR_URL end
+    @SOLR_URL = "http://localhost:8080/solr/foo.core"
   
-  key :name, String, :fulltext => true
-end
+    key :name, String, :fulltext => true
+  end
+
+The name of the index document fields can be also be specified if the name of the keys aren't desired.
+
+Example:
+
+  key :name, String, :fulltext => true, :solr_field_name => "object_name"
+
+The name of the Solr document id/uniqueKey name can be specified that the MongoMapper document _id maps to.  Within the model that includes MongoMapper::Document add the folowing:
+
+  class << self; attr_accessor :SOLR_DOC_ID_FIELD end
+  @SOLR_DOC_ID_FIELD = "preexisting_index_id"

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('customized-mongomapper-search', '0.1.3') do |p|
+Echoe.new('customized-mongomapper-search', '0.1.4') do |p|
   p.description    = "Easily integreate mongo mapper with enterprise search like solr.  CUSTOMIZED to use a specified Solr URL in the model.  Original mongomapper-search gem (version 0.1.0) was written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search."
   p.url            = "http://github.com/tsxn26/customized-mongomapper-search"
   p.author         = ["Fernando Meyer", "Thomas Nguyen"]

data/customized-mongomapper-search.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{customized-mongomapper-search}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fernando Meyer, Thomas Nguyen"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-29}
   s.description = %q{Easily integreate mongo mapper with enterprise search like solr.  CUSTOMIZED to use a specified Solr URL in the model.  Original mongomapper-search gem (version 0.1.0) was written by Fernando Meyer and can be found at http://github.com/fmeyer/mongomapper-search.}
   s.email = %q{tsxn26@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/customized-mongomapper-search.rb", "lib/search.rb"]
-  s.files = ["README.rdoc", "Rakefile", "lib/customized-mongomapper-search.rb", "lib/search.rb", "Manifest", "customized-mongomapper-search.gemspec"]
+  s.files = ["CHANGE_LOG", "README.rdoc", "Rakefile", "lib/customized-mongomapper-search.rb", "lib/search.rb", "Manifest", "customized-mongomapper-search.gemspec"]
   s.homepage = %q{http://github.com/tsxn26/customized-mongomapper-search}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Customized-mongomapper-search", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/search.rb

@@ -13,9 +13,12 @@ module Search::SolrDocument
     def search(query, page = 1, opts = {})
       init_connection()
       WillPaginate::Collection.create(page, 20) do |pager|
-        result,count = search_engine_query(query, opts)
+        result = search_engine_query(query, opts)
+        if(result.class == Array)
+          result.compact!
+        end
         pager.replace(result)
-        pager.total_entries = count
+        pager.total_entries = result.length
       end
     end
     
@@ -23,13 +26,31 @@ module Search::SolrDocument
     def search_engine_query(query, opts = {})
       opts.reverse_merge!(:limit => 20, :offset => 0)      
       resp = @Solr.select(:q => query, :rows  => opts[:limit], :start => opts[:offset], :qt => !opts[:qt].blank? ? opts[:qt] : "standard", :fl => '*,score')['response']
-      return resp['docs'].map{|doc| find(doc['id'])}, resp['numFound']      
+      
+      if(instance_variable_defined?(:@SOLR_DOC_ID_FIELD) && !instance_variable_get(:@SOLR_DOC_ID_FIELD).blank?)
+        id_name = instance_variable_get(:@SOLR_DOC_ID_FIELD)
+      else  
+        id_name = 'id'
+      end
+      
+      return resp['docs'].map do |doc| 
+        id = doc[id_name]
+        if id.class == Array
+          id = id[0]
+        end
+        find(id)
+      end
     end    
   end
 
   module InstanceMethods
     def to_index
-      attrs = {'id' => self._id}
+      if(self.class.instance_variable_defined?(:@SOLR_DOC_ID_FIELD) && !self.class.SOLR_DOC_ID_FIELD.blank?)
+        attrs = {self.class.SOLR_DOC_ID_FIELD => self._id}
+      else  
+        attrs = {'id' => self._id}
+      end
+      
       self.keys.each_pair do |name, key|
         field_name = key.options[:solr_field_name]
         field_name ||= name

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Fernando Meyer, Thomas Nguyen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -07:00
+date: 2010-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ extra_rdoc_files:
 - lib/customized-mongomapper-search.rb
 - lib/search.rb
 files: 
+- CHANGE_LOG
 - README.rdoc
 - Rakefile
 - lib/customized-mongomapper-search.rb