mwmitchell-rsolr-ext 0.7.5 → 0.7.6

data/README.rdoc

@@ -59,4 +59,20 @@ The #find method provides a convenient way to search solr. Here are some example
   books_about_jefferson = solr.find 'jefferson', :phrase_filters=>{:type=>'book'}
   
   # q=something -- the entire response
-  solr_response = solr.find {:q=>'something'}, :include_response=>true
+  solr_response = solr.find {:q=>'something'}, :include_response=>true
+
+===The Doc Module
+You can create your own "models" using RSolr::Ext::Doc
+  class Book
+    include RSolr::Ext::Doc
+    @default_params = {:fq=>'object_type:"book"', :rows=>10}
+    
+    def self.find_by_author(author)
+        find(:phrase_filters=>{:author=>author})
+    end
+  end
+  
+  all_books = Book.find('*:*')
+  hawk_books = Book.find_by_author('hawk')
+
+If you wanna paginate, just throw the collection into the WillPaginate view helper.

data/lib/rsolr-ext/doc.rb

@@ -52,19 +52,12 @@ module RSolr::Ext::Doc
     end
     
     def find(*args)
-      call_finder_method(:find, *args)
+      mode, solr_params, opts = connection.send(:extract_find_opts!, *args)
+      connection.find(*[mode, default_params.merge(solr_params), opts]) { |doc| self.new(doc) }
     end
     
-    def find_by_id(*args)
-      call_finder_method(:find_by_id, *args)
-    end
-    
-    protected
-    
-    def call_finder_method(method_name, *args)
-      mode, params, opts = connection.send(:extract_find_opts!, *args)
-      params.merge!(default_params)
-      connection.send(method_name, *[mode, params, opts]) { |doc| self.new(doc) }
+    def find_by_id(id, solr_params={}, opts={})
+      connection.find_by_id(id, default_params.merge(solr_params), opts) { |doc| self.new(doc) }
     end
     
   end

data/lib/rsolr-ext/findable.rb

@@ -34,6 +34,10 @@ module RSolr::Ext::Findable
   def find(*args, &blk)
     mode, solr_params, opts = extract_find_opts!(*args)
     
+    unless solr_params.respond_to?(:each_pair)
+      solr_params = {:q=>solr_params}
+    end
+    
     opts[:include_response] = false unless opts.key?(:include_response)
     
     solr_params[:rows] = 1 if mode == :first
@@ -64,9 +68,14 @@ module RSolr::Ext::Findable
   end
   
   # find_by_id(10, :handler=>'catalog')
+  # find_by_id(:id=>10)
   def find_by_id(id, solr_params={}, opts={}, &blk)
-    solr_params[:phrases] ||= {}
-    solr_params[:phrases][:id] = id
+    if id.respond_to?(:each_pair)
+      solr_params = id
+    else
+      solr_params[:phrases] ||= {}
+      solr_params[:phrases][:id] = id
+    end
     self.find(:first, solr_params, opts, &blk)
   end
   
@@ -81,10 +90,6 @@ module RSolr::Ext::Findable
     end
     # extract solr params
     solr_params = args.shift || {}
-    # create a hash if a string was passed in...
-    unless solr_params.respond_to?(:each_pair)
-      solr_params = {:q=>solr_params}
-    end
     # extract options
     opts = args.shift || {}
     [mode, solr_params, opts]

data/lib/rsolr-ext.rb

@@ -23,7 +23,7 @@ module RSolr
   
   module Ext
     
-    VERSION = '0.7.5'
+    VERSION = '0.7.6'
     
     autoload :Request, 'rsolr-ext/request.rb'
     autoload :Response, 'rsolr-ext/response.rb'

data/rsolr-ext.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rsolr-ext"
-	s.version = "0.7.5"
+	s.version = "0.7.6"
 	s.date = "2009-05-04"
 	s.summary = "An extension lib for RSolr"
 	s.email = "goodieboy@gmail.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwmitchell-rsolr-ext
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Matt Mitchell