just_paginate 0.1 → 0.1.1

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 /.keeptesting
+coverage
+test/reports

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in keeptesting.gemspec
 gemspec
+
+gem "ci_reporter"

data/Rakefile

@@ -1,7 +1,35 @@
+# encoding: utf-8
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2013 Gitorious AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+require "rake/testtask"
+require "ci/reporter/rake/minitest"
 require "bundler/gem_tasks"
-require 'rake/testtask'
 
-Rake::TestTask.new do |i|
-  i.test_files = FileList['test/test_*.rb']
-  #i.verbose = true
+Rake::TestTask.new("test") do |test|
+  test.libs << "test"
+  test.pattern = "test/*_test.rb"
+  test.verbose = true
 end
+
+task :default => :test

data/just_paginate.gemspec

@@ -18,11 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "shoulda"
-  s.add_development_dependency "shoulda-context"
+  s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "rake"
 end

data/lib/just_paginate.rb

@@ -1,7 +1,30 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2013 Gitorious AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
 module JustPaginate
 
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 
   # TODO make sure negative numbers, non-integers etc are just converted to page 1.
   def self.page_value(page)
@@ -62,6 +85,7 @@ module JustPaginate
     end
   end
 
+  # Depends on Bootstrap styling/widgets
   def self.page_links(curr_page, total_page_count, &page_link_constructor)
     page_labels(curr_page, total_page_count).map do |label|
       page_element = ""
@@ -86,6 +110,41 @@ module JustPaginate
     end.join(" ")
   end
 
+   # Not dependent on bootstrap styling/widgets
+  def self.page_navigation_non_bootstrap(curr_page, total_page_count, &page_link_constructor)
+    if total_page_count > 1
+      links = page_links_non_bootstrap(curr_page.to_i, total_page_count, &page_link_constructor)
+      return "<div class='pagination'>#{links}</div>"
+    else
+      ""
+    end
+  end
+
+  # Not dependent on bootstrap styling/widgets
+  def self.page_links_non_bootstrap(curr_page, total_page_count, &page_link_constructor)
+    page_labels(curr_page, total_page_count).map do |label|
+      page_element = ""
+
+      if label == "..."
+        page_element = "<span class='gap'>#{label}</span>"
+      elsif label == "<"
+        page_url = yield(curr_page-1)
+        page_element = "<a rel='prev' href='#{page_url}'>#{label}</a>"
+      elsif label == ">"
+        page_url = yield(curr_page+1)
+        page_element = "<a rel='next' href='#{page_url}'>#{label}</a>"
+      else
+        page_url = yield(label)
+        if label.to_i == curr_page
+          page_element = "<span class='current'>#{label}</span>"
+        else
+          page_element = "<a href='#{page_url}'>#{label}</a>"
+        end
+      end
+
+    end.join(" ")
+  end
+
   def self.page_labels(current, total)
     max_visible = 10
     labels = []

data/test/{test_just_paginate.rb → just_paginate_test.rb}

@@ -1,9 +1,33 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class JustPaginateTest < Test::Unit::TestCase
-
-  context "The backend pagination function" do
-    should "basically work like this" do
+# encoding: utf-8
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2013 Gitorious AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+require "test_helper"
+require "just_paginate"
+
+describe JustPaginate do
+  describe "The backend pagination function" do
+    it "basically works like this" do
       paged_collection = [1,2,3,4,5,6,7,8,9,10]
 
       entries, page_count = JustPaginate.paginate(1, 5, 100) do |index_range|
@@ -15,29 +39,29 @@ class JustPaginateTest < Test::Unit::TestCase
       assert_equal [1,2,3,4,5], entries
     end
 
-    should "blow up if no selection strategy block is present" do
+    it "blows up if no selection strategy block is present" do
       assert_raises RuntimeError do
         JustPaginate.paginate(1, 20, 100)
       end
     end
 
-    should "provide predicate to check if pagination would exceed total pagecount" do
+    it "provides predicate to check if pagination would exceed total pagecount" do
       assert JustPaginate.page_out_of_bounds?(7,2,4)
       assert !JustPaginate.page_out_of_bounds?(1,20,100)
     end
 
-    should "state that pages below page 1 are out of bounds" do
+    it "states that pages below page 1 are out of bounds" do
       assert JustPaginate.page_out_of_bounds?(-2,2,4)
       assert JustPaginate.page_out_of_bounds?(-1,2,4)
       assert JustPaginate.page_out_of_bounds?(0,2,4)
     end
 
-    should "calculate correct total page count" do
+    it "calculates correct total page count" do
       assert_equal 25, JustPaginate.total_page_number(500, 20)
       assert_equal 25, JustPaginate.total_page_number(498, 20)
     end
 
-    should "correctly apply the supplied selection strategy" do
+    it "correctly applies the supplied selection strategy" do
       ran = false
       sliced_entries, page_count = JustPaginate.paginate(1, 5, 10) do |index_range|
         assert index_range.class == Range
@@ -47,7 +71,7 @@ class JustPaginateTest < Test::Unit::TestCase
       assert ran, "selection block didn't run"
     end
 
-    should "calculate correct index ranges" do
+    it "calculates correct index ranges" do
       assert_equal 0..1, JustPaginate.index_range(1,2,4)
       assert_equal 2..3, JustPaginate.index_range(2,2,4)
 
@@ -70,23 +94,23 @@ class JustPaginateTest < Test::Unit::TestCase
     end
   end
 
-  should "just fall back to largest possible page if given page extends past collection bounds" do
+  it "just falls back to largest possible page if given page extends past collection bounds" do
     assert_equal 2..3, JustPaginate.index_range(2,2,4)
     assert_equal 2..3, JustPaginate.index_range(3,2,4)
     assert_equal 2..3, JustPaginate.index_range(4,2,4)
   end
 
-  should "return 0-0 range for empty collection" do
+  it "returns 0-0 range for empty collection" do
      assert_equal 0..0, JustPaginate.index_range(2,2,0)
   end
 
-  context "The frontend pagination html helper" do
-    should "basically work like this" do
+  describe "The frontend pagination html helper" do
+    it "basically works like this" do
       generated = JustPaginate.page_navigation(1, 10) { |page_no| "/projects/index?page=#{page_no}" }
       # TODO write this and following tests after I've manually browser-reload-iterated something stable'
     end
 
-    should "do page nav labels, truncation and quicklinks correctly" do
+    it "does page nav labels, truncation and quicklinks correctly" do
       assert_correct_paging_labels "", 0, 0
       assert_correct_paging_labels "", 1, 0
       assert_correct_paging_labels "", 2, 0

data/test/test_helper.rb

@@ -1,5 +1,26 @@
-require 'test/unit'
-require 'shoulda'
-require 'shoulda-context'
-
-require File.dirname(__FILE__) + '/../lib/just_paginate'
+# encoding: utf-8
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2013 Gitorious AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+require "bundler/setup"
+require "minitest/autorun"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: just_paginate
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gitorious AS
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-25 00:00:00 Z
+date: 2013-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -22,16 +23,17 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,34 +46,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda-context
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
 description: Framework-agnostic support for paginating collections of things, and linking to paginated things in your webpage
 email: 
 - support@gitorious.org
@@ -88,8 +62,8 @@ files:
 - Rakefile
 - just_paginate.gemspec
 - lib/just_paginate.rb
+- test/just_paginate_test.rb
 - test/test_helper.rb
-- test/test_just_paginate.rb
 homepage: https://gitorious.org/gitorious/just_paginate
 licenses: []