solr_collection 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/solr_collection.rb

@@ -3,41 +3,44 @@ require 'will_paginate/collection'
 #Proxy that delegates all calls to contained subject
 # except solr related methods in MAPPED_FIELDS
 class SolrCollection
-  MAPPED_FIELDS = [:facets, :spellcheck, :total_entries]
+  SOLR_FIELDS = [:facets, :spellcheck]
 
-  def initialize(solr_result, options={})
+  def initialize(collection, options={})
     options = options.dup
 
-    #solr result has results in an array called results
-    results = if solr_result.respond_to?(:results)
-      solr_result.results
-    else
-      solr_result
-    end
-
-    #get fields from solr_result or set them to nil
+    # get fields from solr result-set or set them to nil
     @solr_data = {}
-    MAPPED_FIELDS.each do |field|
+    SOLR_FIELDS.each do |field|
       @solr_data[field] = if options[field]
         options[field]
-      elsif solr_result.respond_to?(field)
-        solr_result.send(field)
+      elsif collection.respond_to?(field)
+        collection.send(field)
       else
         nil
       end
     end
 
-    # always set a total
-    @solr_data[:total_entries] ||= (results.respond_to?(:total) ? results.total : results.size)
-
-    #build will_paginate collection from given options
+    # copy or generate pagination information
+    options[:page] ||= (collection.respond_to?(:current_page) ? collection.current_page : nil)
+    options[:per_page] ||= (collection.respond_to?(:per_page) ? collection.per_page : nil)
+    options[:total_entries] ||= if collection.respond_to?(:total)
+      collection.total
+    elsif collection.respond_to?(:total_entries)
+      collection.total_entries
+    else
+      collection.size
+    end
     options = fill_page_and_per_page(options)
 
+    # build paginate-able object
     @subject = WillPaginate::Collection.new(
       options[:page],
       options[:per_page],
-      @solr_data[:total_entries]
+      options[:total_entries]
     )
+
+    # solr result-set has results in an array called results
+    results = (collection.respond_to?(:results) ? collection.results : collection)
     @subject.replace(results.to_ary)
   end
 
@@ -52,6 +55,10 @@ class SolrCollection
     end
   end
 
+  def respond_to?(method)
+    @solr_data.key?(method) or @subject.respond_to?(method) or super
+  end
+
   private
 
   def fill_page_and_per_page(options)
@@ -69,7 +76,7 @@ class SolrCollection
   def method_missing(method, *args, &block)
     method = method.to_sym
     if @solr_data.key? method
-      @solr_data[method]
+      @solr_data[method] or (@subject.send(method, *args, &block) rescue nil)
     else
       @subject.send(method, *args, &block)
     end

data/solr_collection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solr_collection}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2010-12-24}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/solr_collection}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Wrapper for solr results sets then behaves/feels like will_paginate collection}
   s.test_files = [
     "spec/solr_collection_spec.rb",
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
     else
       s.add_dependency(%q<will_paginate>, [">= 0"])

data/spec/solr_collection_spec.rb

@@ -36,13 +36,26 @@ describe SolrCollection do
       SolrCollection.new([1,2,3]).current_page.should == 1
     end
 
-    it "knows default per_page" do
+    it "has a default for per_page" do
       SolrCollection.new([1,2,3]).per_page.should == 10
     end
 
     it "can set per_page" do
       SolrCollection.new([1,2,3], :per_page=>3).per_page.should == 3
     end
+
+    it "copies pagination information" do
+      page = 2
+      per_page = 3
+      total_entries = 7
+      collection = WillPaginate::Collection.new(page, per_page, total_entries)
+      collection = collection.replace([1,2,3,4])
+      solr = SolrCollection.new(collection)
+      solr.per_page.should == per_page
+      solr.current_page.should.should == page
+      solr.total_pages.should.should == 3
+      solr.total_entries.should.should == total_entries
+    end
   end
 
   describe "limit and offset" do
@@ -148,4 +161,22 @@ describe SolrCollection do
       SolrCollection.new([]).facet_field('x').should == nil
     end
   end
+
+  describe :respond_to do
+    it "responds to own methods" do
+      SolrCollection.new([]).respond_to?(:has_facet_fields?).should == true
+    end
+
+    it "responds to subjects methods" do
+      SolrCollection.new([]).respond_to?(:total_pages).should == true
+    end
+
+    it "responds to missing methods" do
+      SolrCollection.new([]).respond_to?(:spellcheck).should == true
+    end
+
+    it "does not respond to unknown methods" do
+      SolrCollection.new([]).respond_to?(:foo).should == false
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # ---- requirements
 require 'rubygems'
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
-require File.expand_path("../init", File.dirname(__FILE__))
+require File.expand_path("../init", File.dirname(__FILE__))

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solr_collection
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  name: will_paginate
+  prerelease: false
   type: :runtime
   version_requirements: *id001
-  prerelease: false
-  name: will_paginate
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -58,23 +61,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Wrapper for solr results sets then behaves/feels like will_paginate collection