supernova 0.1.1 → 0.2.0

data/.autotest

@@ -6,4 +6,5 @@ Autotest.add_hook :initialize do |at|
   at.add_exception(%r{log\/})
   at.add_exception(%r{db\/})
   at.add_exception(%r{config\/})
+  at.add_exception(%r{solr\/})
 end

data/Gemfile

@@ -7,6 +7,8 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 
 gem "thinking-sphinx", "2.0.3"
+gem "rsolr"
+gem "will_paginate"
 
 group :development do
   gem "ruby-debug"

data/Gemfile.lock

@@ -31,6 +31,8 @@ GEM
     rake (0.9.2)
     rcov (0.9.9)
     riddle (1.3.3)
+    rsolr (1.0.2)
+      builder (>= 2.1.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -48,6 +50,7 @@ GEM
       activerecord (>= 3.0.3)
       riddle (>= 1.2.2)
     tzinfo (0.3.27)
+    will_paginate (2.3.15)
 
 PLATFORMS
   ruby
@@ -60,6 +63,8 @@ DEPENDENCIES
   jeweler (~> 1.6.0)
   mysql2 (~> 0.2.7)
   rcov
+  rsolr
   rspec (~> 2.3.0)
   ruby-debug
   thinking-sphinx (= 2.0.3)
+  will_paginate

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "supernova"
-  # gem.homepage = "http://github.com/dynport/supernova"
+  gem.homepage = "http://github.com/dynport/supernova"
   gem.license = "MIT"
   gem.summary = %Q{Unified search scopes}
   gem.description = %Q{Unified search scopes}

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/supernova.rb

@@ -1,4 +1,11 @@
+require "rsolr"
+
 module Supernova
+  KM_TO_METER = 1000.0
+  MILE_TO_METER = 1609.3472
+  DEG_TO_RADIAN = Math::PI / 180.0
+  RADIAN_TO_REG = 1 / DEG_TO_RADIAN
+  
   module ClassMethods
     attr_accessor :criteria_class, :defined_named_search_scopes
     
@@ -17,5 +24,7 @@ module Supernova
 end
 
 require "supernova/numeric_extensions"
+require "supernova/collection"
 require "supernova/criteria"
-require "supernova/thinking_sphinx"
+require "supernova/thinking_sphinx"
+require "supernova/solr"

data/lib/supernova/collection.rb

@@ -0,0 +1,4 @@
+require "will_paginate"
+
+class Supernova::Collection < WillPaginate::Collection
+end

data/lib/supernova/criteria.rb

@@ -1,4 +1,7 @@
 class Supernova::Criteria
+  DEFAULT_PER_PAGE = 25
+  FIRST_PAGE = 1
+  
   attr_accessor :filters, :search_options, :clazz
 
   class << self
@@ -111,6 +114,18 @@ class Supernova::Criteria
   def to_a
     implement_in_subclass
   end
+  
+  def current_page
+    pagination_attribute_when_greater_zero(:page) || 1
+  end
+  
+  def per_page
+    pagination_attribute_when_greater_zero(:per_page) || DEFAULT_PER_PAGE
+  end
+  
+  def pagination_attribute_when_greater_zero(attribute)
+    self.search_options[:pagination][attribute] if self.search_options[:pagination] && self.search_options[:pagination][attribute].to_i > 0
+  end
 
   def implement_in_subclass
     raise "implement in subclass"

data/lib/supernova/numeric_extensions.rb

@@ -1,11 +1,6 @@
 Numeric.class_eval do
-  KM_TO_METER = 1000.0
-  MILE_TO_METER = 1609.3472
-  DEG_TO_RADIAN = Math::PI / 180.0
-  RADIAN_TO_REG = 1 / DEG_TO_RADIAN
-  
   def km
-    self * KM_TO_METER
+    self * Supernova::KM_TO_METER
   end
   
   def meter
@@ -13,15 +8,15 @@ Numeric.class_eval do
   end
   
   def mile
-    self * MILE_TO_METER
+    self * Supernova::MILE_TO_METER
   end
   
   def to_radians
-    self * DEG_TO_RADIAN
+    self * Supernova::DEG_TO_RADIAN
   end
   
   def to_deg
-    self * RADIAN_TO_REG
+    self * Supernova::RADIAN_TO_REG
   end
   
   alias_method :miles, :mile

data/lib/supernova/solr.rb

@@ -0,0 +1,20 @@
+require "supernova/solr_criteria"
+
+module Supernova::Solr
+  class << self
+    attr_accessor :url
+    
+    def connection
+      @connection ||= RSolr.connect(:url => self.url)
+    end
+    
+    def truncate!
+      connection.delete_by_query("*:*")
+    end
+  end
+  
+  def self.included(base)
+    base.extend(Supernova::ClassMethods)
+    base.criteria_class = Supernova::SolrCriteria
+  end
+end

data/lib/supernova/solr_criteria.rb

@@ -0,0 +1,51 @@
+require "rsolr"
+
+class Supernova::SolrCriteria < Supernova::Criteria
+  def to_params
+    solr_options = { :fq => [], :q => "*:*" }
+    solr_options[:fq] += self.filters[:with].map { |key, value| "#{key}:#{value}" } if self.filters[:with]
+    solr_options[:sort] = self.search_options[:order] if self.search_options[:order]
+    solr_options[:q] = self.filters[:search] if self.filters[:search]
+    
+    if self.search_options[:geo_center] && self.search_options[:geo_distance]
+      solr_options[:pt] = "#{self.search_options[:geo_center][:lat]},#{self.search_options[:geo_center][:lng]}"
+      solr_options[:d] = self.search_options[:geo_distance].to_f / Supernova::KM_TO_METER
+      solr_options[:sfield] = :location
+      solr_options[:fq] << "{!geofilt}"
+    end
+    solr_options[:fq] << "type:#{self.clazz}" if self.clazz
+    
+    if self.search_options[:pagination]
+      solr_options[:rows] = per_page
+      solr_options[:start] = (current_page - 1) * solr_options[:rows]
+    end
+    solr_options
+  end
+  
+  def build_docs(docs)
+    docs.map do |hash|
+      build_doc(hash)
+    end
+  end
+  
+  def build_doc(hash)
+    doc = hash["type"].constantize.new
+    hash.each do |key, value|
+      if key == "id"
+        doc.id = value.to_s.split("/").last if doc.respond_to?(:id=)
+      else
+        doc.send(:"#{key}=", value) if doc.respond_to?(:"#{key}=")
+      end
+    end
+    doc.instance_variable_set("@readonly", true)
+    doc.instance_variable_set("@new_record", false)
+    doc
+  end
+  
+  def to_a
+    response = Supernova::Solr.connection.get("select", :params => to_params)
+    collection = Supernova::Collection.new(current_page, per_page, response["response"]["numFound"])
+    collection.replace(build_docs(response["response"]["docs"]))
+    collection
+  end
+end

data/spec/integration/solr_spec.rb

@@ -0,0 +1,92 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Solr" do
+  before(:each) do
+    Supernova::Solr.instance_variable_set("@connection", nil)
+    Supernova::Solr.url = "http://localhost:8983/solr/"
+    Supernova::Solr.truncate!
+    Offer.criteria_class = Supernova::SolrCriteria
+    root = Geokit::LatLng.new(47, 11)
+    endpoint = root.endpoint(90, 50, :units => :kms)
+    Supernova::Solr.connection.add(:id => "offers/1", :type => "Offer", :user_id => 1, :enabled => false, :text => "Hans Meyer", :popularity => 10, 
+      :location => "#{root.lat},#{root.lng}", :type => "Offer"
+    )
+    Supernova::Solr.connection.add(:id => "offers/2", :user_id => 2, :enabled => true, :text => "Marek Mintal", :popularity => 1, 
+      :location => "#{endpoint.lat},#{endpoint.lng}", :type => "Offer"
+    )
+    Supernova::Solr.connection.commit
+  end
+  
+  after(:each) do
+    Supernova::Solr.url = nil
+    Supernova::Solr.instance_variable_set("@connection", nil)
+    Offer.criteria_class = Supernova::ThinkingSphinxCriteria
+  end
+  
+  def new_criteria
+    Offer.search_scope
+  end
+  
+  describe "searching" do
+    it "returns the correct current_page when nil" do
+      new_criteria.to_a.current_page.should == 1
+    end
+    
+    it "returns the correct page when set" do
+      new_criteria.paginate(:page => 10).to_a.current_page.should == 10
+    end
+    
+    it "the correct per_page when set" do
+      new_criteria.paginate(:per_page => 10).to_a.per_page.should == 10
+    end
+    
+    it "the correct per_page when not set" do
+      new_criteria.to_a.per_page.should == 25
+    end
+    
+    describe "nearby search" do
+      { 49.kms => 1, 51.kms => 2 }.each do |distance, total_entries|
+        it "returns #{total_entries} for distance #{distance}" do
+          new_criteria.near(47, 11).within(distance).to_a.total_entries.should == total_entries
+        end
+      end
+    end
+    
+    it "returns the correct objects" do
+      new_criteria.with(:user_id => 1).to_a.first.should be_an_instance_of(Offer)
+    end
+    
+    { :id => 1, :user_id => 1, :enabled => false, :text => "Hans Meyer", :popularity => 10 }.each do |key, value|
+      it "sets #{key} to #{value}" do
+        doc = new_criteria.with(:id => "offers/1").to_a.first
+        doc.send(key).should == value
+      end
+    end
+    
+    it "combines filters" do
+      new_criteria.with(:user_id => 1, :enabled => false).to_a.total_entries.should == 1
+      new_criteria.with(:user_id => 1, :enabled => true).to_a.total_entries.should == 0
+    end
+    
+    it "uses the correct orders" do
+      new_criteria.order("id desc").to_a.map(&:id).should == [2, 1]
+      new_criteria.order("id asc").to_a.map(&:id).should == [1, 2]
+    end
+    
+    it "uses the correct pagination attributes" do
+      new_criteria.with(:user_id => 1, :enabled => false).to_a.total_entries.should == 1
+      new_criteria.with(:user_id => 1, :enabled => false).length.should == 1
+      new_criteria.with(:user_id => 1, :enabled => false).paginate(:page => 10).to_a.total_entries.should == 1
+      new_criteria.with(:user_id => 1, :enabled => false).paginate(:page => 10).length.should == 0
+      
+      new_criteria.paginate(:per_page => 1, :page => 1).to_a.map(&:id).should == [1]
+      new_criteria.paginate(:per_page => 1, :page => 2).to_a.map(&:id).should == [2]
+    end
+    
+    it "handels empty results correctly" do
+      results = new_criteria.with(:user_id => 1, :enabled => true).to_a
+      results.total_entries.should == 0
+      results.current_page.should == 1
+    end
+  end
+end

data/spec/integration/{search_spec.rb → thinking_sphinx_spec.rb}

@@ -3,9 +3,8 @@ require "active_record"
 require "thinking_sphinx"
 require "mysql2"
 require "fileutils"
-require "geokit"
 
-describe "Search" do
+describe "ThinkingSphinx" do
   let(:ts) { ThinkingSphinx::Configuration.instance }
   
   before(:each) do

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require "mysql2"
 require "logger"
 require "fileutils"
 require "ruby-debug"
+require "geokit"
 
 if defined?(Debugger) && Debugger.respond_to?(:settings)
   Debugger.settings[:autolist] = 1
@@ -62,4 +63,5 @@ class Offer < ActiveRecord::Base
 end
 
 class Host
+  attr_accessor :id
 end

data/spec/supernova/solr_criteria_spec.rb

@@ -0,0 +1,245 @@
+require 'spec_helper'
+
+describe Supernova::SolrCriteria do
+  let(:criteria) { Supernova::SolrCriteria.new }
+  let(:rsolr) { double("rsolr").as_null_object }
+  let(:docs) do
+    [
+      {"popularity"=>10, "location"=>"47,11", "text"=>"Hans Meyer", "id"=>"offers/1", "enabled"=>false, "user_id"=>1, "type"=>"Offer"}, 
+      {"popularity"=>1, "location"=>"46.9981112912042,11.6587158814378", "text"=>"Marek Mintal", "id"=>"offers/2", "enabled"=>true, "user_id"=>2, "type"=>"Offer"}
+    ]
+  end
+  let(:solr_response) do
+    {
+      "response"=>{"start"=>0, "docs"=>docs, "numFound"=>2}, "responseHeader"=>{"QTime"=>4, "params"=>{"fq"=>"type:Offer", "q"=>"*:*", "wt"=>"ruby"}, "status"=>0}
+    }
+  end
+  
+  before(:each) do
+    Supernova::Solr.stub!(:connection).and_return rsolr
+  end
+  
+  describe "#to_params" do
+    it "returns a Hash" do
+      criteria.to_params.should be_an_instance_of(Hash)
+    end
+    
+    it "sets the correct filters" do
+      criteria.with(:title => "Hans Maulwurf", :playings => 10).to_params[:fq].sort.should == ["playings:10", "title:Hans Maulwurf"]
+    end
+    
+    it "allways includes some query" do
+      criteria.with(:a => 1).to_params[:q].should == "*:*"
+    end
+    
+    it "sets the order field" do
+      criteria.order("title").to_params[:sort].should == "title"
+    end
+    
+    it "sets search correct search query" do
+      criteria.search("some query").to_params[:q].should == "some query"
+    end
+    
+    it "adds a filter on type when clazz set" do
+      Supernova::SolrCriteria.new(Offer).to_params[:fq].should == ["type:#{Offer}"]
+    end
+    
+    it "does not add a filter on type when clazz is nil" do
+      criteria.to_params[:fq].should == []
+    end
+    
+    describe "with a nearby search" do
+      let(:nearby_criteria) { Supernova::SolrCriteria.new.near(47, 11).within(10.kms) }
+      
+      it "sets the correct center" do
+        nearby_criteria.to_params[:pt].should == "47.0,11.0"
+      end
+      
+      it "sets the correct distance" do
+        nearby_criteria.to_params[:d].should == 10.0
+      end
+      
+      it "sets the sfield to location" do
+        nearby_criteria.to_params[:sfield].should == :location
+      end
+      
+      it "sets the fq field to {!geofilt}" do
+        nearby_criteria.to_params[:fq].should == ["{!geofilt}"]
+      end
+    end
+    
+    describe "pagination" do
+      it "sets the correct rows" do
+        criteria.paginate(:page => 1, :per_page => 10).to_params[:rows].should == 10
+      end
+      
+      it "sets the correct start when page is nil" do
+        criteria.paginate(:per_page => 10).to_params[:start].should == 0
+      end
+      
+      it "sets the correct start when page is 1" do
+        criteria.paginate(:per_page => 10, :page => 1).to_params[:start].should == 0
+      end
+      
+      it "sets the correct start when page is 1" do
+        criteria.paginate(:per_page => 10, :page => 2).to_params[:start].should == 10
+      end
+    end
+  end
+
+  describe "#to_a" do
+    let(:params) { double("params") }
+    
+    before(:each) do
+      criteria.stub(:to_params).and_return params
+      rsolr.stub!(:get).and_return solr_response
+    end
+    
+    it "calls to_params" do
+      criteria.should_receive(:to_params).and_return params
+      criteria.to_a
+    end
+    
+    it "calls get with select and params" do
+      rsolr.should_receive(:get).with("select", :params => params).and_return solr_response
+      criteria.to_a
+    end
+    
+    it "returns a Supernova::Collection" do
+      criteria.to_a.should be_an_instance_of(Supernova::Collection)
+    end
+    
+    it "sets the correct page when page is nil" do
+      criteria.to_a.current_page.should == 1
+    end
+    
+    it "sets the correct page when page is 1" do
+      criteria.paginate(:page => 1).to_a.current_page.should == 1
+    end
+    
+    it "sets the correct page when page is 2" do
+      criteria.paginate(:page => 2).to_a.current_page.should == 2
+    end
+    
+    it "sets the correct per_page when zero" do
+      criteria.paginate(:page => 2, :per_page => nil).to_a.per_page.should == 25
+    end
+    
+    it "sets the custom per_page when given" do
+      criteria.paginate(:page => 2, :per_page => 10).to_a.per_page.should == 10
+    end
+    
+    it "sets the correct total_entries" do
+      criteria.paginate(:page => 2, :per_page => 10).to_a.total_entries.should == 2
+    end
+    
+    it "calls build_docs with returned docs" do
+      criteria.should_receive(:build_docs).with(docs).and_return []
+      criteria.to_a
+    end
+    
+    it "calls replace on collection wit returned docs" do
+      col = double("collection")
+      Supernova::Collection.stub!(:new).and_return col
+      built_docs = double("built docs")
+      criteria.stub!(:build_docs).and_return built_docs
+      col.should_receive(:replace).with(built_docs)
+      criteria.to_a
+    end
+  end
+  
+  describe "#build_docs" do
+    it "returns an array" do
+      criteria.build_docs([]).should == []
+    end
+    
+    it "returns the correct amount of docs" do
+      criteria.build_docs(docs).length.should == 2
+    end
+    
+    it "returns the correct classes" do
+      docs = [ { "id" => "hosts/7", "type" => "Host" }, { "id" => "offers/1", "type" => "Offer" }]
+      criteria.build_docs(docs).map(&:class).should == [Host, Offer]
+    end
+    
+    it "calls build_doc on all returnd docs" do
+      doc1 = double("doc1")
+      doc2 = double("doc2")
+      docs = [doc1, doc2]
+      criteria.should_receive(:build_doc).with(doc1)
+      criteria.should_receive(:build_doc).with(doc2)
+      criteria.build_docs(docs)
+    end
+  end
+  
+  describe "#build_doc" do
+    { "Offer" => Offer, "Host" => Host }.each do |type, clazz|
+      it "returns the #{clazz} for #{type.inspect}" do
+        criteria.build_doc("type" => type).should be_an_instance_of(clazz)
+      end
+    end
+    
+    { :popularity => 10, :enabled => false, :id => 1 }.each do |key, value|
+      it "sets #{key} to #{value}" do
+        doc = criteria.build_doc("type" => "Offer", "some_other" => "Test", "id" => "offers/1", "enabled" => false, "popularity" => 10)
+        doc.send(key).should == value
+      end
+    end
+    
+    it "should be readonly" do
+      criteria.build_doc(docs.first).should be_readonly
+    end
+    
+    it "should not be a new record" do
+      criteria.build_doc(docs.first).should_not be_a_new_record
+    end
+    
+    class MongoOffer
+      attr_accessor :id
+    end
+    
+    it "would also work with mongoid ids" do
+      criteria.build_doc("type" => "MongoOffer", "id" => "offers/4df08c30f3b0a72e7c227a55").id.should == "4df08c30f3b0a72e7c227a55"
+    end
+  end
+  
+  describe "#current_page" do
+    it "returns 1 when pagiantion is not set" do
+      criteria.current_page.should == 1
+    end
+    
+    it "returns 1 when page is set to nil" do
+      criteria.paginate(:page => nil).current_page.should == 1
+    end
+    
+    it "returns 1 when page is set to nil" do
+      criteria.paginate(:page => 1).current_page.should == 1
+    end
+    
+    it "returns 1 when page is set to nil" do
+      criteria.paginate(:page => 0).current_page.should == 1
+    end
+    
+    it "returns 2 when page is set to 2" do
+      criteria.paginate(:page => 2).current_page.should == 2
+    end
+  end
+  
+  describe "#per_page" do
+    it "returns 25 when nothing set" do
+      criteria.per_page.should == 25
+    end
+    
+    it "returns 25 when set to nil" do
+      criteria.paginate(:page => 3, :per_page => nil).per_page.should == 25
+    end
+    
+    it "returns 25 when set to 0" do
+      criteria.paginate(:page => 3, :per_page => 0).per_page.should == 25
+    end
+    
+    it "returns the custom value when set" do
+      criteria.paginate(:page => 3, :per_page => 10).per_page.should == 10
+    end
+  end
+end

data/spec/supernova/solr_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Supernova::Solr do
+  let(:rsolr) { double("rsolr") }
+  
+  before(:each) do
+    RSolr.stub!(:connect).and_return rsolr
+  end
+  
+  describe "#url=" do
+    it "allows setting a solr url" do
+      Supernova::Solr.url = "some url"
+      Supernova::Solr.url.should == "some url"
+    end
+  end
+  
+  describe "#solr_connection" do
+    after(:each) do
+      Supernova::Solr.url = nil
+    end
+    
+    before(:each) do
+      Supernova::Solr.url = "/some/url"
+    end
+    
+    it "connects creates and stores a new RSolr connection" do
+      RSolr.should_receive(:connect).with(:url => "/some/url").and_return rsolr
+      Supernova::Solr.connection.should == rsolr
+      Supernova::Solr.instance_variable_get("@connection").should == rsolr
+    end
+    
+    it "returns a stored connection" do
+      con = double("con")
+      Supernova::Solr.instance_variable_set("@connection", con)
+      Supernova::Solr.connection.should == con
+    end
+  end
+  
+  describe "truncate!" do
+    it "calls delete_by_query on connection" do
+      Supernova::Solr.connection.should_receive(:delete_by_query).with("*:*")
+      Supernova::Solr.truncate!
+    end
+  end
+end

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-06-09}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [
@@ -28,19 +28,26 @@ Gem::Specification.new do |s|
     "VERSION",
     "autotest/discover.rb",
     "lib/supernova.rb",
+    "lib/supernova/collection.rb",
     "lib/supernova/criteria.rb",
     "lib/supernova/numeric_extensions.rb",
+    "lib/supernova/solr.rb",
+    "lib/supernova/solr_criteria.rb",
     "lib/supernova/thinking_sphinx.rb",
     "lib/supernova/thinking_sphinx_criteria.rb",
     "spec/database.sql",
-    "spec/integration/search_spec.rb",
+    "spec/integration/solr_spec.rb",
+    "spec/integration/thinking_sphinx_spec.rb",
     "spec/spec_helper.rb",
     "spec/supernova/criteria_spec.rb",
     "spec/supernova/numeric_extensions_spec.rb",
+    "spec/supernova/solr_criteria_spec.rb",
+    "spec/supernova/solr_spec.rb",
     "spec/supernova/thinking_sphinx_criteria_spec.rb",
     "spec/supernova_spec.rb",
     "supernova.gemspec"
   ]
+  s.homepage = %q{http://github.com/dynport/supernova}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
@@ -51,6 +58,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
+      s.add_runtime_dependency(%q<rsolr>, [">= 0"])
+      s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, ["~> 0.2.7"])
       s.add_development_dependency(%q<geokit>, [">= 0"])
@@ -62,6 +71,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
+      s.add_dependency(%q<rsolr>, [">= 0"])
+      s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
       s.add_dependency(%q<geokit>, [">= 0"])
@@ -74,6 +85,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
+    s.add_dependency(%q<rsolr>, [">= 0"])
+    s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
     s.add_dependency(%q<geokit>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 Z
+date: 2011-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -44,11 +44,39 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id002
+  name: rsolr
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: will_paginate
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
   name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +87,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  version_requirements: *id003
+  version_requirements: *id005
   name: mysql2
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
+  version_requirements: *id006
   name: geokit
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +115,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
+  version_requirements: *id007
   name: autotest
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +129,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
+  version_requirements: *id008
   name: autotest-growl
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,12 +145,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id007
+  version_requirements: *id009
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,12 +161,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
+  version_requirements: *id010
   name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -149,12 +177,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  version_requirements: *id009
+  version_requirements: *id011
   name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,7 +191,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
+  version_requirements: *id012
   name: rcov
   prerelease: false
   type: :development
@@ -188,19 +216,25 @@ files:
 - VERSION
 - autotest/discover.rb
 - lib/supernova.rb
+- lib/supernova/collection.rb
 - lib/supernova/criteria.rb
 - lib/supernova/numeric_extensions.rb
+- lib/supernova/solr.rb
+- lib/supernova/solr_criteria.rb
 - lib/supernova/thinking_sphinx.rb
 - lib/supernova/thinking_sphinx_criteria.rb
 - spec/database.sql
-- spec/integration/search_spec.rb
+- spec/integration/solr_spec.rb
+- spec/integration/thinking_sphinx_spec.rb
 - spec/spec_helper.rb
 - spec/supernova/criteria_spec.rb
 - spec/supernova/numeric_extensions_spec.rb
+- spec/supernova/solr_criteria_spec.rb
+- spec/supernova/solr_spec.rb
 - spec/supernova/thinking_sphinx_criteria_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
-homepage: 
+homepage: http://github.com/dynport/supernova
 licenses: 
 - MIT
 post_install_message: