rails_paginate 0.0.1 → 0.0.2

data/Gemfile

@@ -2,11 +2,16 @@ source "http://rubygems.org"
 gem "rails", "~> 3.0.0"
 
 group :development do
-  gem "sqlite3"
   gem "autotest"
   gem "bundler"
   gem "jeweler"
-  gem 'simplecov', :require => false
   gem "rspec"
   gem "yard"
+  if defined? JRUBY_VERSION
+    gem "activerecord-jdbc-adapter"
+    gem "activerecord-jdbcsqlite3-adapter"
+  else
+    gem 'simplecov', :require => false
+    gem "sqlite3"
+  end
 end

data/Gemfile.lock

@@ -87,6 +87,7 @@ GEM
     yard (0.6.4)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.rdoc

@@ -1,7 +1,6 @@
 = rails_paginate
 
 a new rails 3 paginate plugin as will_paginate replacement
-better as will_paginate
 
 == Development status
 
@@ -31,6 +30,12 @@ If you want to use it as plugin
 
   (1..555).to_a.paginate :page => 1, :per_page => 10
 
+== Test environments
+
+* ruby-1.9.2
+* ruby-1.8.7
+* ree-1.8.7
+* jruby-1.5.6
 
 == Maintainers
 

data/Rakefile

@@ -19,10 +19,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{a new rails 3 paginate plugin as will_paginate replacement}
   gem.email = "develop@marco-scholl.de"
   gem.authors = ["Marco Scholl"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/rails_paginate.rb

@@ -17,7 +17,6 @@ module RailsPaginate
   mattr_accessor :method
   @@method = :sliding
 
-
   class << self
     # to configure rails_paginate
     # for a sample look the readme.rdoc file
@@ -43,6 +42,7 @@ module RailsPaginate
       end
     end
 
+    # init rails paginate
     def init
       require 'rails_paginate/core_ext/active_record'
       require 'rails_paginate/core_ext/array'

data/lib/rails_paginate/collection.rb

@@ -37,10 +37,12 @@ module RailsPaginate
     # load result from input array_or_relation to internal array
     def load_result
       if array_or_relation.is_a? Array
-        self.replace array_or_relation[offset..(offset + per_page - 1)]
+        result = array_or_relation[offset..(offset + per_page - 1)]
       else
-        self.replace array_or_relation.limit(@per_page).offset(offset).all
+        result = array_or_relation.limit(per_page).offset(offset).all
       end
+
+      self.replace result.nil? ? [] : result
     end
 
     def total
@@ -48,7 +50,7 @@ module RailsPaginate
     end
 
     def pages
-      @pages ||= (total / per_page.to_f).ceil
+      @pages ||= total == 0 ? 1 : (total / per_page.to_f).ceil
     end
 
     # get offset

data/lib/rails_paginate/method/base.rb

@@ -1,6 +1,5 @@
 module RailsPaginate::Method
   # base method
   class Base
-
   end
 end

data/lib/rails_paginate/renderer/base.rb

@@ -1,6 +1,5 @@
 module RailsPaginate::Renderer
   # base method
   class Base
-
   end
 end

data/rails_paginate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_paginate}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-02-16}
   s.description = %q{a new rails 3 paginate plugin as will_paginate replacement}
   s.email = %q{develop@marco-scholl.de}
   s.extra_rdoc_files = [
@@ -64,32 +64,32 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

data/spec/rails_paginate_spec.rb

@@ -55,10 +55,26 @@ describe RailsPaginate::Collection do
       it { should be_a RailsPaginate::Collection }
     end
 
+    context "without any result" do
+      before(:all) { @collection = Item.where(:dummy => "dasfindeterbestimmtnicht").paginate :page => 1 }
+      subject { @collection }
+      its(:count) { should eq 0 }
+      its(:current_page) { should eq 1 }
+      its(:pages) { should eq 1 }
+      its(:total) { should eq 0 }
+      its(:offset) { should eq 0 }
+      its(:next_page) { should be_nil }
+      its(:previous_page) { should be_nil }
+      its(:need_paginate?) { should be_false }
+      its(:first_page?) { should be_true }
+      its(:last_page?) { should be_true }
+    end
+
     context "without per_page on first page" do
       before(:all) { @collection = Item.paginate :page => 1 }
       subject { @collection }
       its(:count) { should eq 10 }
+      its(:current_page) { should eq 1 }
       its(:pages) { should eq 57 }
       its(:total) { should eq 561 }
       its(:offset) { should eq 0 }
@@ -73,6 +89,7 @@ describe RailsPaginate::Collection do
       before(:all) { @collection = Item.paginate :page => 10 }
       subject { @collection }
       its(:count) { should eq 10 }
+      its(:current_page) { should eq 10 }
       its(:pages) { should eq 57 }
       its(:total) { should eq 561 }
       its(:offset) { should eq 90 }
@@ -87,6 +104,7 @@ describe RailsPaginate::Collection do
       before(:all) { @collection = Item.paginate :page => 57 }
       subject { @collection }
       its(:count) { should eq 1 }
+      its(:current_page) { should eq 57 }
       its(:pages) { should eq 57 }
       its(:total) { should eq 561 }
       its(:offset) { should eq 560 }
@@ -97,10 +115,11 @@ describe RailsPaginate::Collection do
       its(:last_page?) { should be_true }
     end
 
-    context "with per_page 60 on page 4" do
+    context "with per_page 60 on page 3" do
       before(:all) { @collection = Item.paginate :page => 3, :per_page => 60 }
       subject { @collection }
       its(:count) { should eq 60 }
+      its(:current_page) { should eq 3 }
       its(:pages) { should eq 10 }
       its(:total) { should eq 561 }
       its(:offset) { should eq 120 }
@@ -113,6 +132,32 @@ describe RailsPaginate::Collection do
 
   end
 
+  describe Array, "with 0 items" do
+    before(:all) { @array = [] }
+    subject { @array }
+    specify { should respond_to :paginate }
+
+    describe "return of #paginate" do
+      subject { @array.paginate }
+      it { should be_a RailsPaginate::Collection }
+    end
+
+    context "without per_page on first page" do
+      before(:all) { @collection = @array.paginate :page => 1 }
+      subject { @collection }
+      its(:count) { should eq 0 }
+      its(:current_page) { should eq 1 }
+      its(:pages) { should eq 1 }
+      its(:total) { should eq 0 }
+      its(:offset) { should eq 0 }
+      its(:next_page) { should be_nil }
+      its(:previous_page) { should be_nil }
+      its(:need_paginate?) { should be_false }
+      its(:first_page?) { should be_true }
+      its(:last_page?) { should be_true }
+    end
+  end
+
   describe Array, "with 199 items" do
     before(:all) { @array = (1..199).to_a }
     subject { @array }
@@ -127,6 +172,7 @@ describe RailsPaginate::Collection do
       before(:all) { @collection = @array.paginate :page => 1 }
       subject { @collection }
       its(:count) { should eq 10 }
+      its(:current_page) { should eq 1 }
       its(:pages) { should eq 20 }
       its(:total) { should eq 199 }
       its(:offset) { should eq 0 }
@@ -141,6 +187,7 @@ describe RailsPaginate::Collection do
       before(:all) { @collection = @array.paginate :page => 10 }
       subject { @collection }
       its(:count) { should eq 10 }
+      its(:current_page) { should eq 10 }
       its(:pages) { should eq 20 }
       its(:total) { should eq 199 }
       its(:offset) { should eq 90 }
@@ -155,6 +202,7 @@ describe RailsPaginate::Collection do
       before(:all) { @collection = @array.paginate :page => 20 }
       subject { @collection }
       its(:count) { should eq 9 }
+      its(:current_page) { should eq 20 }
       its(:pages) { should eq 20 }
       its(:total) { should eq 199 }
       its(:offset) { should eq 190 }
@@ -165,10 +213,11 @@ describe RailsPaginate::Collection do
       its(:last_page?) { should be_true }
     end
 
-    context "with per_page 60 on page 4" do
+    context "with per_page 60 on page 3" do
       before(:all) { @collection = @array.paginate :page => 3, :per_page => 60 }
       subject { @collection }
       its(:count) { should eq 60 }
+      its(:current_page) { should eq 3 }
       its(:pages) { should eq 4 }
       its(:total) { should eq 199 }
       its(:offset) { should eq 120 }
@@ -187,6 +236,7 @@ describe RailsPaginate::Collection do
       before(:all) { @collection = @array.paginate :page => 1 }
       subject { @collection }
       its(:count) { should eq 6 }
+      its(:current_page) { should eq 1 }
       its(:pages) { should eq 1 }
       its(:total) { should eq 6 }
       its(:offset) { should eq 0 }

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'simplecov'
-SimpleCov.start 'rails'
+unless defined? JRUBY_VERSION
+  require 'simplecov'
+  SimpleCov.start 'rails'
+end
+
 require 'rspec'
 require 'rails_paginate'
 

data/spec/support/10_activerecord.rb

@@ -1,5 +1,5 @@
 ActiveRecord::Base.establish_connection({
-  :adapter => 'sqlite3',
+  :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'),
   :database => ":memory:"
 })
 ActiveRecord::Migrator.up(File.join(File.dirname(__FILE__), '..', 'db', 'migrate'))

metadata

@@ -2,7 +2,7 @@
 name: rails_paginate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Marco Scholl
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +01:00
+date: 2011-02-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: autotest
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,7 +36,7 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: autotest
+  name: bundler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,7 +47,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: jeweler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,7 +58,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,7 +69,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: yard
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,7 +80,7 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: simplecov
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,7 +91,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: sqlite3
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2756331228915534243
+      hash: -3849386219473513286
       segments: 
       - 0
       version: "0"