supernova 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/supernova/criteria.rb

@@ -82,6 +82,10 @@ class Supernova::Criteria
     merge_search_options :pagination, pagination_options
   end
   
+  def rows(number)
+    merge_search_options :pagination, :per_page => number
+  end
+  
   def near(*coordinates)
     merge_search_options :geo_center, normalize_coordinates(*coordinates)
   end
@@ -166,11 +170,15 @@ class Supernova::Criteria
   end
   
   def per_page
-    pagination_attribute_when_greater_zero(:per_page) || DEFAULT_PER_PAGE
+    ret = self.search_options[:pagination][:per_page] if self.search_options[:pagination]
+    ret = DEFAULT_PER_PAGE if ret.nil?
+    ret
   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
+    if self.search_options[:pagination] && self.search_options[:pagination][attribute].to_i > 0
+      self.search_options[:pagination][attribute] 
+    end
   end
 
   def implement_in_subclass

data/lib/supernova/solr_criteria.rb

@@ -168,10 +168,15 @@ class Supernova::SolrCriteria < Supernova::Criteria
   
   def execute
     response = Supernova::Solr.connection.post("select", :data => to_params)
-    collection = Supernova::Collection.new(current_page, per_page, response["response"]["numFound"])
+    collection = Supernova::Collection.new(current_page, per_page == 0 ? 1 : per_page, response["response"]["numFound"])
     collection.original_response = response
     collection.facets = hashify_facets_from_response(response)
     collection.replace(build_docs(response["response"]["docs"]))
     collection
   end
+  
+  def ids
+    select("id")
+    execute.map! { |h| h["id"].split("/").last.to_i }
+  end
 end

data/spec/integration/solr_spec.rb

@@ -252,6 +252,25 @@ describe "Solr" do
     end
   end
   
+  describe "#ids" do
+    it "only returns the ids in a collection" do
+      result = new_criteria.ids
+      result.should be_kind_of(Supernova::Collection)
+      result.should == [1, 2]
+      result.total_entries.should == 2
+    end
+    
+    it "does include facets" do
+      new_criteria.facet_fields(:enabled_b).ids.facets.should == { "enabled_b" => { "true" => 1, "false" => 1 } }
+    end
+    
+    it "returns 0 rows" do
+      response = new_criteria.rows(0).facet_fields(:enabled_b).ids
+      response.should be_empty
+      response.facets.should == { "enabled_b" => { "true" => 1, "false" => 1 } }
+    end
+  end
+  
   describe "with mapping" do
     before(:each) do
       @clazz = Class.new(Supernova::SolrIndexer)

data/spec/supernova/criteria_spec.rb

@@ -102,6 +102,20 @@ describe "Supernova::Criteria" do
     scope.paginate(:page => 9, :per_page => 2).search_options[:pagination].should == { :page => 9, :per_page => 2 }
   end
   
+  it "sets per_page to number of rows when rows specified" do
+    scope.rows(0).search_options[:pagination].should == { :per_page => 0 }
+  end
+  
+  describe "#per_page" do
+    it "allows setting of pagination to 0" do
+      scope.paginate(:per_page => 0).per_page.should == 0
+    end
+    
+    it "" do
+      scope.paginate(:per_page => nil).per_page.should == 25
+    end
+  end
+  
   describe "#without" do
     it "sets the correct without filter" do
       scope.without(:user_id => 1).filters[:without].should == { :user_id => [1] }

data/spec/supernova/solr_criteria_spec.rb

@@ -208,6 +208,24 @@ describe Supernova::SolrCriteria do
       criteria.attribute_mapping(:artist_name => { :type => :string }).solr_field_from_field(:artist_name).should == "artist_name_s"
     end
   end
+  
+  describe "#ids" do
+    it "sets the select fields to id only" do
+      criteria.should_receive(:select).with("id")
+      criteria.stub!(:execute).and_return([])
+      criteria.ids
+    end
+    
+    it "calls execute" do
+      criteria.should_receive(:execute).and_return([])
+      criteria.ids
+    end
+    
+    it "maps the id hashes to ids" do
+      criteria.stub(:execute).and_return([ { "id" => "offer/1" }, { "id" => "offer/3" } ])
+      criteria.ids
+    end
+  end
 
   describe "#execute" do
     let(:params) { double("params") }
@@ -504,8 +522,8 @@ describe Supernova::SolrCriteria 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
+    it "returns 0 when set to 0" do
+      criteria.paginate(:page => 3, :per_page => 0).per_page.should == 0
     end
     
     it "returns the custom value when set" do

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-09-01}
   s.default_executable = %q{start_solr}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +02:00
+date: 2011-09-01 00:00:00 +02:00
 default_executable: start_solr
 dependencies: 
 - !ruby/object:Gem::Dependency