supernova 0.7.0 → 0.7.1

data/Gemfile

@@ -20,6 +20,7 @@ group :development do
   gem "geokit"
   gem "guard"
   gem "rb-fsevent"
+  gem "growl"
   gem "growl_notify"
   gem "autotest"
   gem "autotest-growl"

data/Gemfile.lock

@@ -22,6 +22,7 @@ GEM
     diff-lcs (1.1.3)
     geokit (1.6.0)
     git (1.2.5)
+    growl (1.0.3)
     growl_notify (0.0.3)
       rb-appscript
     guard (0.8.4)
@@ -75,6 +76,7 @@ DEPENDENCIES
   autotest-growl
   bundler (~> 1.0.0)
   geokit
+  growl
   growl_notify
   guard
   i18n

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/supernova/criteria.rb

@@ -104,8 +104,12 @@ class Supernova::Criteria
     merge_search_options :pagination, pagination_options
   end
   
-  def rows(number)
-    merge_search_options :pagination, :per_page => number
+  def rows(rows)
+    merge_search_options :rows, rows
+  end
+  
+  def start(start)
+    merge_search_options :start, start
   end
   
   def near(*coordinates)

data/lib/supernova/solr_criteria.rb

@@ -33,9 +33,9 @@ class Supernova::SolrCriteria < Supernova::Criteria
       solr_options["facet.field"] = self.search_options[:facets].compact.map { |field| solr_field_from_field(field) }
     end
     
-    if self.search_options[:pagination]
-      solr_options[:rows] = per_page
-      solr_options[:start] = (current_page - 1) * solr_options[:rows]
+    if self.search_options[:pagination] || search_options[:rows] || search_options[:start]
+      solr_options[:rows] = self.search_options[:rows] || per_page
+      solr_options[:start] = search_options[:start] || ((current_page - 1) * solr_options[:rows])
     end
     solr_options
   end

data/spec/supernova/criteria_spec.rb

@@ -112,16 +112,12 @@ 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
+    it "sets the per_page to the default when setting to nil" do
       scope.paginate(:per_page => nil).per_page.should == 25
     end
   end
@@ -433,6 +429,14 @@ describe "Supernova::Criteria" do
     end
   end
   
+  it "allows setting the rows attributes" do
+    scope.rows(11).search_options[:rows].should == 11
+  end
+  
+  it "allows setting the start attributes" do
+    scope.start(99).search_options[:start].should == 99
+  end
+  
   describe "#merge" do
     let(:criteria) { Supernova::Criteria.new.order("popularity asc").with(:a => 1).conditions(:b => 2).search("New Search") }
     let(:new_crit) { Supernova::Criteria.new.order("popularity desc").with(:c => 8).conditions(:e => 9).search("Search") }

data/spec/supernova/solr_criteria_spec.rb

@@ -203,8 +203,23 @@ describe "Supernova::SolrCriteria" do
       end
     end
     
-    it "allows setting of rows" do
-      criteria.rows(11).to_params[:rows].should == 11
+    describe "setting rows and start" do
+      it "allows setting of rows" do
+        criteria.rows(11).to_params[:rows].should == 11
+      end
+      
+      it "allows setting of start" do
+        criteria.start(16).to_params[:start].should == 16
+      end
+      
+      it "overwrites pagination with rows" do
+        criteria.paginate(:per_page => 9, :page => 1).rows(11).to_params[:rows].should == 11
+      end
+      
+      it "overwrites pagination with start" do
+        criteria.paginate(:per_page => 9, :page => 1).start(100).rows(11).to_params[:start].should == 100
+      end
+      
     end
     
     describe "pagination" do

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "supernova"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = "2012-02-09"
+  s.date = "2012-02-14"
   s.description = "Unified search scopes"
   s.email = "tobias.schwab@dynport.de"
   s.executables = ["start_solr"]
@@ -113,6 +113,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<geokit>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<growl>, [">= 0"])
       s.add_development_dependency(%q<growl_notify>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
@@ -133,6 +134,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<geokit>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_dependency(%q<growl>, [">= 0"])
       s.add_dependency(%q<growl_notify>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
@@ -154,6 +156,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<geokit>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])
+    s.add_dependency(%q<growl>, [">= 0"])
     s.add_dependency(%q<growl_notify>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supernova
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70227376852280 !ruby/object:Gem::Requirement
+  requirement: &70247180583600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227376852280
+  version_requirements: *70247180583600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70227376851780 !ruby/object:Gem::Requirement
+  requirement: &70247180583100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227376851780
+  version_requirements: *70247180583100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70227376851260 !ruby/object:Gem::Requirement
+  requirement: &70247180582600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227376851260
+  version_requirements: *70247180582600
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70227376850700 !ruby/object:Gem::Requirement
+  requirement: &70247180582120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70227376850700
+  version_requirements: *70247180582120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70227376850180 !ruby/object:Gem::Requirement
+  requirement: &70247180581640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376850180
+  version_requirements: *70247180581640
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70227376849640 !ruby/object:Gem::Requirement
+  requirement: &70247180581080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70227376849640
+  version_requirements: *70247180581080
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70227376849080 !ruby/object:Gem::Requirement
+  requirement: &70247180580560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376849080
+  version_requirements: *70247180580560
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70227376848580 !ruby/object:Gem::Requirement
+  requirement: &70247180580080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.18
   type: :development
   prerelease: false
-  version_requirements: *70227376848580
+  version_requirements: *70247180580080
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70227376848060 !ruby/object:Gem::Requirement
+  requirement: &70247180579600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70227376848060
+  version_requirements: *70247180579600
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70227376847540 !ruby/object:Gem::Requirement
+  requirement: &70247180579080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376847540
+  version_requirements: *70247180579080
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70227376846980 !ruby/object:Gem::Requirement
+  requirement: &70247180578600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376846980
+  version_requirements: *70247180578600
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70227376846460 !ruby/object:Gem::Requirement
+  requirement: &70247180578120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376846460
+  version_requirements: *70247180578120
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: &70247180577640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70247180577640
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70227376845940 !ruby/object:Gem::Requirement
+  requirement: &70247180577140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376845940
+  version_requirements: *70247180577140
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70227376845420 !ruby/object:Gem::Requirement
+  requirement: &70247180576640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376845420
+  version_requirements: *70247180576640
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70227376844880 !ruby/object:Gem::Requirement
+  requirement: &70247180533280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376844880
+  version_requirements: *70247180533280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227376844340 !ruby/object:Gem::Requirement
+  requirement: &70247180532680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +197,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70227376844340
+  version_requirements: *70247180532680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70227376843820 !ruby/object:Gem::Requirement
+  requirement: &70247180532080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +208,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70227376843820
+  version_requirements: *70247180532080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70227376843300 !ruby/object:Gem::Requirement
+  requirement: &70247180531500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +219,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70227376843300
+  version_requirements: *70247180531500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70227376842780 !ruby/object:Gem::Requirement
+  requirement: &70247180530900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227376842780
+  version_requirements: *70247180530900
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables:
@@ -316,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3047902273407419465
+      hash: 2690249885197212135
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: