rails_paginate 0.0.3 → 0.0.4

data/README.rdoc

@@ -8,10 +8,12 @@ a new rails 3 paginate plugin as will_paginate replacement
 * -> Array - 100%
 * -> ActiveRecord - 100%
 * -> Rspec - 100%
-* ViewHelper - 10%
-* -> HtmlDefault
-* -> HtmlList
-* -> Rspec
+* ViewHelper - 70%
+* -> HtmlDefault 80%
+* -> Rspec 5%
+* Pager - 100%
+* -> Slider - 100%
+* -> Rspec - 100%
 
 == Installation
 Add the following line to your Gemfile

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/rails_paginate/helpers/action_view.rb

@@ -8,7 +8,7 @@ module RailsPaginate::Helpers
     def paginate(*args)
       options = args.extract_options!
 
-      raise ArgumentError, "first argument muss be a RailsPaginate::Collection" unless args.first.is_a? RailsPaginate::Collection
+      raise ArgumentError, "first argument must be a RailsPaginate::Collection" unless args.first.is_a? RailsPaginate::Collection
 
       collection = args.first
 #      p @controller

data/lib/rails_paginate/pagers/base.rb

@@ -1,9 +1,10 @@
 module RailsPaginate::Pagers
   # base method
   class Base
-    attr_reader :collection
-    def initialize(collection)
+    attr_reader :collection, :options
+    def initialize(collection, options = {})
       @collection = collection
+      @options = options
     end
 
     def current_page

data/lib/rails_paginate/pagers/slider.rb

@@ -1,9 +1,9 @@
 module RailsPaginate::Pagers
   # slider method
   class Slider < Base
-    cattr_reader :inner, :outer
-    @@inner = 2
-    @@outer = 2
+    cattr_accessor :inner, :outer
+    @@inner = 3
+    @@outer = 1
 
     def visible_pages
       visible = []
@@ -47,5 +47,13 @@ module RailsPaginate::Pagers
       false
     end
 
+    def inner
+      options[:inner] || self.class.inner
+    end
+
+    def outer
+      options[:outer] || self.class.outer
+    end
+
   end
 end

data/lib/rails_paginate/renderers/base.rb

@@ -4,9 +4,9 @@ module RailsPaginate::Renderers
     attr_reader :view, :collection, :options, :pager
 
     def initialize(view, collection, pager, options = {})
-      raise ArgumentError, "first argument muss be a RailsPaginate::Collection" unless collection.is_a? RailsPaginate::Collection
-      raise ArgumentError, "second argument muss be a Hash" unless options.is_a? Hash
-      raise ArgumentError, "third argument muss be an instance of RailsPaginate::Pagers::Base" unless pager.is_a? RailsPaginate::Pagers::Base
+      raise ArgumentError, "first argument must be a RailsPaginate::Collection" unless collection.is_a? RailsPaginate::Collection
+      raise ArgumentError, "second argument must be a Hash" unless options.is_a? Hash
+      raise ArgumentError, "third argument must be an instance of RailsPaginate::Pagers::Base" unless pager.is_a? RailsPaginate::Pagers::Base
       @options = options
       @collection = collection
       @view = view
@@ -56,13 +56,5 @@ module RailsPaginate::Renderers
       view.t(*args)
     end
 
-    def inner_window
-      self.class.inner_window
-    end
-
-    def outer_window
-      self.class.outer_window
-    end
-
   end
 end

data/lib/rails_paginate/renderers/html_default.rb

@@ -1,46 +1,93 @@
 module RailsPaginate::Renderers
   # normale renderer
   class HtmlDefault < Base
+    # show first page item
+    cattr_accessor :show_first_page
+    @@show_first_page = true
 
+    # show last page item
+    cattr_accessor :show_last_page
+    @@show_last_page = true
+
+    # show next page item
+    cattr_accessor :show_next_page
+    @@show_next_page = true
+
+    # show previous page item
+    cattr_accessor :show_previous_page
+    @@show_previous_page = true
 
     def render
-      view.content_tag(:ul) do
+      content_tag(:ul) do
         html = "\n"
-        html += content_tag(:li, :class => "first_page") do
-          link_to_page collection.first_page, 'paginate.first_page_label'
+
+        if show_first_page?
+          html += content_tag(:li, :class => "first_page") do
+            link_to_page collection.first_page, 'paginate.first_page_label'
+          end
+          html += "\n"
         end
-        html += "\n"
-        html += content_tag(:li, :class => "previous_page") do
-          link_to_page collection.previous_page, 'paginate.previous_page_label'
+
+        if show_previous_page?
+          html += content_tag(:li, :class => "previous_page") do
+            link_to_page collection.previous_page, 'paginate.previous_page_label'
+          end
+          html += "\n"
         end
 
-        html += render_pages
+        html += render_pager
 
-        html += "\n"
-        html += content_tag(:li, :class => "next_page") do
-          link_to_page collection.next_page, 'paginate.next_page_label'
+        if show_next_page?
+          html += content_tag(:li, :class => "next_page") do
+            link_to_page collection.next_page, 'paginate.next_page_label'
+          end
+          html += "\n"
         end
-        html += "\n"
-        html += content_tag(:li, :class => "last_page") do
-          link_to_page collection.last_page, 'paginate.last_page_label'
+
+        if show_last_page?
+          html += content_tag(:li, :class => "last_page") do
+            link_to_page collection.last_page, 'paginate.last_page_label'
+          end
+          html += "\n"
         end
-        html += "\n"
         html.html_safe
       end
     end
 
-    def render_pages
-      html = ""
+    # render pager
+    def render_pager
+      view.reset_cycle(:paginate)
 
-      pager.visible_pages.each do |page|
-        html += "\n"
-        html += content_tag(:li, :class => "pager") do
+      html = ""
+      visible_pages = pager.visible_pages
+      visible_pages.each do |page|
+        html += content_tag(:li, :class => "pager #{visible_pages.first == page ? 'first_pager' : ''} #{visible_pages.last == page ? 'last_pager' : ''} #{view.cycle("pager_even", "pager_odd", :name => :paginate)}") do
           link_to_page page, page.nil? ? nil : 'paginate.pager'
         end
+        html += "\n"
       end
-      html += "\n"
       html.html_safe
     end
 
+    # show first page item?
+    def show_first_page?
+      options[:show_first_page] || self.class.show_first_page
+    end
+
+    # show last page item?
+    def show_last_page?
+      options[:show_last_page] || self.class.show_last_page
+    end
+
+    # show next page item?
+    def show_next_page?
+      options[:show_next_page] || self.class.show_next_page
+    end
+
+    # show previous page item?
+    def show_previous_page?
+      options[:show_previous_page] || self.class.show_previous_page
+    end
+
   end
 end

data/rails_paginate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_paginate}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
     "spec/helpers/action_view_spec.rb",
     "spec/helpers/active_record_spec.rb",
     "spec/helpers/array_spec.rb",
+    "spec/pagers/base_spec.rb",
+    "spec/pagers/slider_spec.rb",
     "spec/rails_paginate_spec.rb",
     "spec/renderers/base_spec.rb",
     "spec/renderers/html_default_spec.rb",
@@ -59,6 +61,8 @@ Gem::Specification.new do |s|
     "spec/helpers/action_view_spec.rb",
     "spec/helpers/active_record_spec.rb",
     "spec/helpers/array_spec.rb",
+    "spec/pagers/base_spec.rb",
+    "spec/pagers/slider_spec.rb",
     "spec/rails_paginate_spec.rb",
     "spec/renderers/base_spec.rb",
     "spec/renderers/html_default_spec.rb",

data/spec/helpers/action_view_spec.rb

@@ -30,8 +30,7 @@ describe RailsPaginate::Helpers::ActionView do
     context "#paginate with class => dummy" do
       before { @pagination = action_view.paginate collection, :class => "dummy" }
       subject { @pagination }
-
-      it { subject.should match(/^<div class="pagination dummy">(.*)<\/div>$/) }
+      it { subject.should match(/<div class="pagination dummy">/) }
     end
 
   end

data/spec/pagers/base_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe RailsPaginate::Pagers::Base do
+  let(:collection) { (1..12).to_a.paginate :page => 5 }
+  let(:options) { { :test => 1, :sowas => 2 } }
+  subject { RailsPaginate::Pagers::Base.new collection, options }
+  specify { should respond_to :visible_pages }
+
+  it "#visible_pages should raise StandardError" do
+    lambda { subject.visible_pages }.should raise_error(StandardError)
+  end
+
+  it "#options should same as given options" do
+    subject.options.should eq options
+  end
+
+  it "#collection should same as given collection" do
+    subject.collection.should eq collection
+  end
+
+end

data/spec/pagers/slider_spec.rb

@@ -0,0 +1,147 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe RailsPaginate::Pagers::Slider do
+
+  it "#new without collection should raise StandardError" do
+    lambda { RailsPaginate::Pagers::Slider.new }.should raise_error(ArgumentError)
+  end
+
+  context :configure do
+    subject { RailsPaginate::Pagers::Slider }
+    context "#inner= 10" do
+      before { subject.inner = 10 }
+      its(:inner) { should eq 10 }
+    end
+    context "#outer= 10" do
+      before { subject.outer = 20 }
+      its(:outer) { should eq 20 }
+    end
+  end
+
+  context "collection without items" do
+    before { @array = [] }
+    context "paginate page 1 with 10 per page" do
+      before { @collection = @array.paginate :page => 1, :per_page => 10 }
+      describe "pager with collection and inner 3 and outer 1" do
+        before { @pager = RailsPaginate::Pagers::Slider.new(@collection, {:inner => 3, :outer => 1}) }
+        describe "#visible_pages" do
+          subject { @pager.visible_pages }
+          it { should include 1 }
+          it { should_not include 2 }
+          it("#count should equal 1") { subject.count.should eq 1 }
+        end
+      end
+    end
+  end
+
+  context "collection with 500 items" do
+    before { @array = (1...500).to_a }
+    context "paginate page 8 with 10 per page" do
+      before { @collection = @array.paginate :page => 8, :per_page => 10 }
+      describe "pager with collection and inner 3 and outer 1" do
+        before { @pager = RailsPaginate::Pagers::Slider.new(@collection, {:inner => 3, :outer => 1}) }
+        describe "#visible_pages" do
+          subject { @pager.visible_pages }
+          it { should include 1 }
+          it { should_not include 2 }
+          it { should include 5 }
+          it { should include 6 }
+          it { should include 7 }
+          it { should include 8 }
+          it { should include 9 }
+          it { should include 10 }
+          it { should include 11 }
+          it { should_not include 12 }
+          it { should_not include 49 }
+          it { should include 50 }
+          it("#count should equal 8") { subject.count.should eq 11 }
+          it("#at(1) should be nil") { subject.at(1).should be_nil }
+          it("#at(49) should be nil") { subject.at(49).should be_nil }
+        end
+      end
+    end
+
+    context "paginate page 2 with 50 per page" do
+      before { @collection = @array.paginate :page => 2, :per_page => 50 }
+      describe "pager with collection and inner 3 and outer 2" do
+        before { @pager = RailsPaginate::Pagers::Slider.new(@collection, {:inner => 3, :outer => 2}) }
+        describe "#visible_pages" do
+          subject { @pager.visible_pages }
+          it { should include 1 }
+          it { should include 2 }
+          it { should include 3 }
+          it { should include 4 }
+          it { should include 5 }
+          it { should_not include 6 }
+          it { should_not include 7 }
+          it { should_not include 8 }
+          it { should include 9 }
+          it { should include 10 }
+          it("#count should equal 8") { subject.count.should eq 8 }
+          it("#at(5) should be nil") { subject.at(5).should be_nil }
+        end
+      end
+    end
+
+    context "paginate page 6 with 13 per page" do
+      before { @collection = @array.paginate :page => 6, :per_page => 13 }
+      describe "pager with collection and inner 4 and outer 0" do
+        before { @pager = RailsPaginate::Pagers::Slider.new(@collection, {:inner => 4, :outer => 0}) }
+        describe "#visible_pages" do
+          subject { @pager.visible_pages }
+          it { should_not include 1 }
+          it { should include 2 }
+          it { should include 3 }
+          it { should include 4 }
+          it { should include 5 }
+          it { should include 6 }
+          it { should include 7 }
+          it { should include 8 }
+          it { should include 9 }
+          it { should include 10 }
+          it { should_not include 11 }
+          it("#count should equal 9") { subject.count.should eq 9 }
+        end
+      end
+    end
+
+    context "paginate page 6 with 12 per page" do
+      before { @collection = @array.paginate :page => 6, :per_page => 12 }
+      describe "pager with collection and inner 0 and outer 2" do
+        before { @pager = RailsPaginate::Pagers::Slider.new(@collection, {:inner => 0, :outer => 2}) }
+        describe "#visible_pages" do
+          subject { @pager.visible_pages }
+          it { should include 1 }
+          it { should include 2 }
+          it { should_not include 3 }
+          it { should_not include 7 }
+          it { should include 6 }
+          it { should_not include 8 }
+          it { should_not include 40 }
+          it { should include 41 }
+          it { should include 42 }
+          it { should_not include 43 }
+          it("#count should equal 7") { subject.count.should eq 7 }
+          it("#at(2) should be nil") { subject.at(2).should be_nil }
+          it("#at(40) should be nil") { subject.at(40).should be_nil }
+        end
+      end
+    end
+
+    context "paginate page 3 with 100 per page" do
+      before { @collection = @array.paginate :page => 3, :per_page => 100 }
+      describe "pager with collection and inner 0 and outer 0" do
+        before { @pager = RailsPaginate::Pagers::Slider.new(@collection, {:inner => 0, :outer => 0}) }
+        describe "#visible_pages" do
+          subject { @pager.visible_pages }
+          it { should_not include 1 }
+          it { should_not include 2 }
+          it { should include 3 }
+          it { should_not include 4 }
+          it { should_not include 5 }
+          it("#count should equal 1") { subject.count.should eq 1 }
+        end
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: rails_paginate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marco Scholl
@@ -137,6 +137,8 @@ files:
 - spec/helpers/action_view_spec.rb
 - spec/helpers/active_record_spec.rb
 - spec/helpers/array_spec.rb
+- spec/pagers/base_spec.rb
+- spec/pagers/slider_spec.rb
 - spec/rails_paginate_spec.rb
 - spec/renderers/base_spec.rb
 - spec/renderers/html_default_spec.rb
@@ -157,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -622289539687505724
+      hash: -185373245493970734
       segments: 
       - 0
       version: "0"
@@ -178,6 +180,8 @@ test_files:
 - spec/helpers/action_view_spec.rb
 - spec/helpers/active_record_spec.rb
 - spec/helpers/array_spec.rb
+- spec/pagers/base_spec.rb
+- spec/pagers/slider_spec.rb
 - spec/rails_paginate_spec.rb
 - spec/renderers/base_spec.rb
 - spec/renderers/html_default_spec.rb