godfat-pagify 0.5.0 → 0.6.1

data/lib/pagify/helper/rails.rb

@@ -0,0 +1,23 @@
+
+require 'pagify/helper/html'
+
+module Pagify::Helper::Rails
+  def default_attributes
+    super.merge(:query_name => :page, :wrapper_class => 'pagination')
+  end
+end
+
+class Pagify::Helper::HTML
+  extend Pagify::Helper::Rails
+end
+
+module ApplicationHelper
+  def would_paginate objs, &path
+    path = lambda{ request.path } unless block_given?
+    html = objs.pager.html
+    name = html.setting[:query_name]
+    "<div class=\"#{html.setting[:wrapper_class]}\">" +
+    html.links_full(params[name]){ |p| path.call + "?#{name}=#{p}" } +
+    '</div>'
+  end
+end

data/lib/pagify/{pages → page}/basic.rb

@@ -1,6 +1,4 @@
 
-require 'rubygems'
-
 module Pagify
   # which was produced by Paginator#page / Paginator#[],
   # representing page that contained target data.
@@ -54,5 +52,5 @@ module Pagify
       end
     end
 
-  end
-end
+  end # of BasicPage
+end # of Pagify

data/lib/pagify/{pages → page}/null.rb

@@ -1,11 +1,10 @@
 
 module Pagify
-
   # a null page that stubs anything to 0 or [], etc.
   class NullPage < BasicPage
     def initialize pager = NullPager.instance, page = 0
       super(pager, page)
+      @data = []
     end
   end
-
-end # of Pagify
+end

data/lib/pagify/{pagers → pager}/active_record.rb

@@ -26,7 +26,5 @@ module Pagify
           model.count(query_opts)
         }))
     end
-
-  end
-
-end
+  end # of ActiveRecordPager
+end # of Pagify

data/lib/pagify/{pagers → pager}/array.rb

@@ -17,6 +17,5 @@ module Pagify
           data.size
         }))
     end
-
-  end
-end
+  end # of ArrayPager
+end # of Pagify

data/lib/pagify/{pagers → pager}/basic.rb

@@ -110,5 +110,5 @@ module Pagify
       @null_page_instance ||= NullPage.new(self)
     end
 
-  end
-end
+  end # of BasicPager
+end # of Pagify

data/lib/pagify/{pagers → pager}/data_mapper.rb

@@ -25,6 +25,5 @@ module Pagify
         }))
     end
 
-  end
-
-end
+  end # of DataMapperPager
+end # of Pagify

data/lib/pagify/{pagers/details → pager/detail}/page_accept_string_or_blank.rb

@@ -9,6 +9,5 @@ module Pagify
         n = n.to_i
       end
     end
-  end
-
-end
+  end # of PageAcceptStringOrBlank
+end # of Pagify

data/lib/pagify/{pagers → pager}/null.rb

@@ -1,6 +1,5 @@
 
 module Pagify
-
   # a null paginator that stubs any page into a null page.
   class NullPager < BasicPager
     include Singleton
@@ -12,6 +11,5 @@ module Pagify
     def normalize_page n
       0
     end
-  end
-
+  end # of NullPager
 end # of Pagify

data/lib/pagify/pagifier/abstract.rb

@@ -0,0 +1,10 @@
+
+module Pagify
+  module Pagifier
+    def pagify opts = {}
+      opts = {:per_page => 20, :null_page => false, :page => 1}.merge(opts)
+      page = opts.delete(:page)
+      pagify_pager_create(self, opts).page(page)
+    end
+  end # of Pagifier
+end # of Pagify

data/lib/pagify/{pagifiers → pagifier}/active_record.rb

@@ -1,5 +1,5 @@
 
-require 'pagify/pagifiers/abstract'
+require 'pagify/pagifier/abstract'
 
 [ActiveRecord::Base, ActiveRecord::Associations::AssociationCollection].each{ |klass|
   klass.module_eval do

data/lib/pagify/{pagifiers → pagifier}/array.rb

@@ -1,5 +1,5 @@
 
-require 'pagify/pagifiers/abstract'
+require 'pagify/pagifier/abstract'
 
 class Array
   include Pagify::Pagifier

data/lib/pagify/{pagifiers → pagifier}/data_mapper.rb

@@ -1,11 +1,11 @@
 
-require 'pagify/pagifiers/abstract'
+require 'pagify/pagifier/abstract'
 
 module DataMapper
   module Model
     include Pagify::Pagifier
     def pagify_pager_create model, opts
-      Pagify::DataMapperPager.new model, opts, model.query
+      Pagify::DataMapperPager.new(model, opts, model.query)
     end
   end
 end

data/lib/pagify/version.rb

@@ -1,4 +1,4 @@
 
 module Pagify
-  VERSION = '0.5.0'
+  VERSION = '0.6.1'
 end

data/pagify.gemspec

@@ -1,51 +1,43 @@
-
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pagify}
-  s.version = "0.5.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lin Jen-Shin (a.k.a. godfat \347\234\237\345\270\270)"]
-  s.date = %q{2008-12-11}
-  s.description = %q{pagination tools for plain Ruby, DataMapper, ActiveRecord, and other ORM.}
+  s.authors = ["Lin Jen-Shin (aka godfat \347\234\237\345\270\270)"]
+  s.date = %q{2009-07-30}
+  s.description = %q{ Pagination tools for Array(or custom class), DataMapper and ActiveRecord}
   s.email = %q{godfat (XD) godfat.org}
   s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "TODO", "pagify.gemspec"]
-  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "lib/pagify.rb", "lib/pagify/active_record.rb", "lib/pagify/array.rb", "lib/pagify/basic.rb", "lib/pagify/data_mapper.rb", "lib/pagify/helpers/abstract.rb", "lib/pagify/helpers/details/setting.rb", "lib/pagify/helpers/details/setup.rb", "lib/pagify/helpers/html.rb", "lib/pagify/null.rb", "lib/pagify/pagers/active_record.rb", "lib/pagify/pagers/array.rb", "lib/pagify/pagers/basic.rb", "lib/pagify/pagers/data_mapper.rb", "lib/pagify/pagers/details/page_accept_string_or_blank.rb", "lib/pagify/pagers/null.rb", "lib/pagify/pages/basic.rb", "lib/pagify/pages/null.rb", "lib/pagify/pagifiers/abstract.rb", "lib/pagify/pagifiers/active_record.rb", "lib/pagify/pagifiers/array.rb", "lib/pagify/pagifiers/data_mapper.rb", "lib/pagify/version.rb", "pagify.gemspec", "spec/pagify_spec.rb", "spec/spec_helper.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/helper.rb", "test/suite_for_model.rb", "test/test_active_record.rb", "test/test_array.rb", "test/test_basic.rb", "test/test_data_mapper.rb", "test/test_html.rb", "test/test_null.rb", "test/test_pagify.rb"]
-  s.has_rdoc = true
+  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "lib/pagify.rb", "lib/pagify/active_record.rb", "lib/pagify/array.rb", "lib/pagify/data_mapper.rb", "lib/pagify/helper/abstract.rb", "lib/pagify/helper/detail/setting.rb", "lib/pagify/helper/detail/setup.rb", "lib/pagify/helper/html.rb", "lib/pagify/helper/rails.rb", "lib/pagify/page/basic.rb", "lib/pagify/page/null.rb", "lib/pagify/pager/active_record.rb", "lib/pagify/pager/array.rb", "lib/pagify/pager/basic.rb", "lib/pagify/pager/data_mapper.rb", "lib/pagify/pager/detail/page_accept_string_or_blank.rb", "lib/pagify/pager/null.rb", "lib/pagify/pagifier/abstract.rb", "lib/pagify/pagifier/active_record.rb", "lib/pagify/pagifier/array.rb", "lib/pagify/pagifier/data_mapper.rb", "lib/pagify/version.rb", "pagify.gemspec", "spec/pagify_spec.rb", "spec/spec_helper.rb", "test/helper.rb", "test/helper_model.rb", "test/helper_pagify.rb", "test/test_active_record.rb", "test/test_array.rb", "test/test_basic.rb", "test/test_data_mapper.rb", "test/test_html.rb", "test/test_null.rb", "test/test_rails.rb"]
   s.homepage = %q{http://github.com/godfat/pagify}
-  s.rdoc_options = ["--diagram", "--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
+  s.rdoc_options = ["--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ludy}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{pagination tools for plain Ruby, DataMapper, ActiveRecord, and other ORM.}
-  s.test_files = ["test/test_active_record.rb", "test/test_array.rb", "test/test_basic.rb", "test/test_data_mapper.rb", "test/test_html.rb", "test/test_null.rb", "test/test_pagify.rb"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Pagination tools for Array(or custom class), DataMapper and ActiveRecord}
+  s.test_files = ["test/test_active_record.rb", "test/test_array.rb", "test/test_basic.rb", "test/test_data_mapper.rb", "test/test_html.rb", "test/test_null.rb", "test/test_rails.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.1.0"])
-      s.add_development_dependency(%q<extlib>, ["<= 0.9.8"])
-      s.add_development_dependency(%q<dm-core>, ["<= 0.9.7"])
-      s.add_development_dependency(%q<dm-aggregates>, ["<= 0.9.7"])
+      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_development_dependency(%q<dm-core>, [">= 0.9.9"])
+      s.add_development_dependency(%q<dm-aggregates>, [">= 0.9.9"])
       s.add_development_dependency(%q<activerecord>, [">= 2.0.0"])
-      s.add_development_dependency(%q<minitest>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<bones>, [">= 2.1.0"])
-      s.add_dependency(%q<extlib>, ["<= 0.9.8"])
-      s.add_dependency(%q<dm-core>, ["<= 0.9.7"])
-      s.add_dependency(%q<dm-aggregates>, ["<= 0.9.7"])
+      s.add_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_dependency(%q<dm-core>, [">= 0.9.9"])
+      s.add_dependency(%q<dm-aggregates>, [">= 0.9.9"])
       s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-      s.add_dependency(%q<minitest>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.1.0"])
-    s.add_dependency(%q<extlib>, ["<= 0.9.8"])
-    s.add_dependency(%q<dm-core>, ["<= 0.9.7"])
-    s.add_dependency(%q<dm-aggregates>, ["<= 0.9.7"])
+    s.add_dependency(%q<bones>, [">= 2.5.1"])
+    s.add_dependency(%q<dm-core>, [">= 0.9.9"])
+    s.add_dependency(%q<dm-aggregates>, [">= 0.9.9"])
     s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-    s.add_dependency(%q<minitest>, [">= 1.3.0"])
   end
 end

data/test/helper.rb

@@ -1,9 +1,21 @@
 
 require 'rubygems'
-require 'minitest/unit'
-MiniTest::Unit.autorun
+
+TestCase = begin
+             require 'minitest/unit'
+             MiniTest::Unit.autorun
+             MiniTest::Unit::TestCase
+           rescue LoadError
+             require 'test/unit'
+             Test::Unit::TestCase
+           end
 
 require 'pagify'
+#gem 'dm-core', '<0.10'
+#gem 'dm-aggregates', '<0.10'
+require 'dm-core'
+require 'dm-aggregates'
+require 'active_record'
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.8.7')
   class Symbol

data/test/{suite_for_model.rb → helper_model.rb}

@@ -1,48 +1,6 @@
 
-# require 'extlib'
-require 'test/test_pagify'
-
 module SuiteForModel
 
-  def test_cache_for_pager
-    send(:User).pagify_cache = true
-
-    users1 = send(:User).pagify :page => 1, :per_page => 2
-    pager = send(:User).pagify_pager
-
-    users2 = send(:User).pagify :page => 2, :per_page => 2
-
-    # same pager
-    assert_equal users1.pager.object_id, send(:User).pagify_pager.object_id
-    assert_equal users2.pager.object_id, send(:User).pagify_pager.object_id
-    assert_equal send(:User).pagify(:per_page => 1).pager.object_id, users1.pager.object_id
-
-    # there's cache
-    assert send(:User).pagify_pager != nil
-
-    # cleanup cache
-    send(:User).pagify_cache = false
-    assert_nil send(:User).pagify_pager
-  ensure
-    # ensure we cleanup the cache.
-    send(:User).pagify_cache = false
-  end
-
-  def test_no_cache_for_pager
-    assert_nil send(:User).pagify_pager
-
-    users1 = send(:User).pagify :page => 1, :per_page => 2
-    pager = send(:User).pagify_pager
-
-    users2 = send(:User).pagify :page => 2, :per_page => 2
-
-    assert_nil send(:User).pagify_pager
-
-    # not same pager for same opts
-    assert users1.pager.object_id != send(:User).pagify_pager.object_id
-    assert users2.pager.object_id != send(:User).pagify_pager.object_id
-  end
-
   def test_page_correctness_fixnum
     page_correctness 1
   end
@@ -64,7 +22,7 @@ module SuiteForModel
     assert_equal 1, users.page
     assert_equal send(:User).first, users.first
     assert_equal 2, users.size
-    assert_equal send(:User).first(:offset => 2), users.next.first
+    assert_equal send(:User).first(:offset => 2, :limit => 1), users.next.first
     assert_equal 1, users.next.size
     assert_equal Pagify::NullPage.new(users.pager), users.next.next
   end

data/test/{test_pagify.rb → helper_pagify.rb}

@@ -1,7 +1,5 @@
 
-require 'test/helper'
-
-class TestPagify < MiniTest::Unit::TestCase
+class TestPagify < TestCase
   def self.data; @data ||= (0..100).to_a; end
   def for_pager pager
     # assume data.size is 101, data is [0,1,2,3...]

data/test/test_active_record.rb

@@ -1,12 +1,10 @@
 
 require 'test/helper'
-require 'test/suite_for_model'
+require 'test/helper_pagify'
+require 'test/helper_model'
 
 require 'pagify/active_record'
 
-gem 'dm-core', '<=0.9.7'
-require 'dm-core' # to help with active record to create database
-
 class TestActiveRecord < TestPagify
   def test_for_active_record
     for_pager Pagify::ActiveRecordPager.new(Topic)
@@ -23,30 +21,27 @@ class TestActiveRecord < TestPagify
     end
   end
 
-  # i am tired with active record!!
-  DataMapper.setup :active_record, 'sqlite3:tmp/active_record.sqlite3'
+  DataMapper.setup(:active_record, 'sqlite3:tmp/active_record.sqlite3')
+
   class UserForActiveRecord
     include DataMapper::Resource
-    property :id, Serial
-    property :name, String
     def self.default_repository_name
       :active_record
     end
-    # why can't i use:
-    storage_name = 'users'
-    # end why
+    property :id, Serial
+    property :name, String
     storage_names[default_repository_name] = 'users'
     auto_migrate!
   end
 
   class PetForActiveRecord
     include DataMapper::Resource
-    property :id, Serial
-    property :name, String
-    property :user_id, Integer
     def self.default_repository_name
       :active_record
     end
+    property :id, Serial
+    property :name, String
+    property :user_id, Integer, :nullable => true
     storage_names[default_repository_name] = 'pets'
     auto_migrate!
   end

data/test/test_array.rb

@@ -1,6 +1,6 @@
 
 require 'test/helper'
-require 'test/test_pagify'
+require 'test/helper_pagify'
 
 class TestArray < TestPagify
   def test_offset_bug

data/test/test_basic.rb

@@ -1,6 +1,6 @@
 
 require 'test/helper'
-require 'test/test_pagify'
+require 'test/helper_pagify'
 
 class TestBasic < TestPagify
   def test_basic

data/test/test_data_mapper.rb

@@ -1,6 +1,7 @@
 
 require 'test/helper'
-require 'test/suite_for_model'
+require 'test/helper_pagify'
+require 'test/helper_model'
 
 require 'pagify/data_mapper'
 
@@ -40,7 +41,7 @@ class TestDataMapper < TestPagify
     include DataMapper::Resource
     property :id, Serial
     property :name, String
-    belongs_to :user
+    belongs_to :user, :nullable => true
   end
 
   User.auto_migrate!

data/test/test_html.rb

@@ -1,9 +1,9 @@
 
 require 'test/helper'
 
-require 'pagify/helpers/html'
+require 'pagify/helper/html'
 
-class TestHTML < MiniTest::Unit::TestCase
+class TestHTML < TestCase
   # def test_page_and_pager_has_same_html
   #   pager = Pagify::ArrayPager.new [1]
   #   assert_equal pager.html.object_id, pager[1].html.object_id
@@ -12,7 +12,7 @@ class TestHTML < MiniTest::Unit::TestCase
   def test_html
     pager1 = Pagify::ArrayPager.new []
     assert_equal ' ', pager1.html.setting[:separator]
-    assert_equal Pagify::Helpers::HTML.object_id, pager1.html.class.object_id
+    assert_equal Pagify::Helper::HTML.object_id, pager1.html.class.object_id
 
     pager1.html.setting[:separator] = 'XD'
     assert_equal 'XD', pager1.html.setting[:separator]
@@ -148,13 +148,39 @@ class TestHTML < MiniTest::Unit::TestCase
 
   def test_3_pages
     pager = Pagify::ArrayPager.new([1,2,3,4,5], :per_page => 2)
-    assert_equal '&laquo; First <a href="2">2</a> <a href="3">Last &raquo;</a>', pager.html.links(1, &:to_s)
-    assert_equal '<a href="1">&laquo; First</a> 2 <a href="3">Last &raquo;</a>', pager.html.links(2, &:to_s)
-    assert_equal '<a href="1">&laquo; First</a> <a href="2">2</a> Last &raquo;', pager.html.links(3, &:to_s)
+
+    assert_equal '&laquo; First <a href="2">2</a> <a href="3">Last &raquo;</a>',
+      pager.html.links(1, &:to_s)
+
+    assert_equal '<a href="1">&laquo; First</a> 2 <a href="3">Last &raquo;</a>',
+      pager.html.links(2, &:to_s)
+
+    assert_equal '<a href="1">&laquo; First</a> <a href="2">2</a> Last &raquo;',
+      pager.html.links(3, &:to_s)
 
     assert_equal '<a href="2">Next &gt;</a>', pager.html.links_navigate(1, &:to_s)
-    assert_equal '<a href="1">&lt; Previous</a> <a href="3">Next &gt;</a>', pager.html.links_navigate(2, &:to_s)
+
+    assert_equal '<a href="1">&lt; Previous</a> <a href="3">Next &gt;</a>',
+      pager.html.links_navigate(2, &:to_s)
+
     assert_equal '<a href="2">&lt; Previous</a>', pager.html.links_navigate(3, &:to_s)
   end
 
+  def test_more_pages_to_left_or_right
+    pager = Pagify::ArrayPager.new((1..33).to_a, :per_page => 3)
+
+    first = ['&laquo; First', '<a href="1">&laquo; First</a>']
+    last  = ['Last &raquo;',  '<a href="11">Last &raquo;</a>']
+
+    (1..11).each{ |page|
+      expected = (2..10).map{ |i| i == page ? i.to_s : "<a href=\"#{i}\">#{i}</a>" }
+
+      expected.unshift( page == 1  ? first.first : first.last )
+      expected.push(    page == 11 ?  last.first :  last.last )
+
+      assert_equal expected.join(' '), pager.html.links(page, &:to_s)
+    }
+
+  end
+
 end