pagify 0.6.2 → 0.7.0

data/CHANGES

@@ -1,6 +1,8 @@
 = pagify changes history
 
-== pagify 1.0 / ?
+== pagify 0.7.0 / 2009-11-16
+ * added innate helper.
+ * some internal refactoring
 
 == pagify 0.6.2 / 2009-08-08
  * no joke now, use pagify_links instead of would_paginate.

data/README

@@ -120,7 +120,7 @@ by Lin Jen-Shin (aka godfat-真常[http://godfat.org])
 
 Apache License 2.0
 
-Copyright (c) 2008, Lin Jen-Shin (aka godfat 真常)
+Copyright (c) 2008-2009, Lin Jen-Shin (aka godfat 真常)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+SUDO = '' # this prevent `rake gem:install` to use sudo
+
 require 'bones'
 Bones.setup
 

data/lib/pagify/helper/detail/web.rb

@@ -0,0 +1,18 @@
+
+require 'pagify/helper/html'
+
+module Pagify
+  module Helper
+    module Web
+      def pagify_links objs, opts
+        html = objs.pager.html
+        name = html.setting[:query_name]
+        type = html.setting[:links_type]
+        base = opts[:path].call
+        "<div class=\"#{html.setting[:wrapper_class]}\">" +
+          html.send(type, opts[:page][name]){ |p| base + "?#{name}=#{p}" } +
+        '</div>'
+      end
+    end
+  end
+end

data/lib/pagify/helper/html.rb

@@ -17,7 +17,10 @@ module Pagify
           :outer_links => 2,
         #        :step => 3,
           :separator   => ' ',
-          :ellipsis    => '...' })
+          :ellipsis    => '...',
+          :query_name  => :page,
+          :links_type  => :links_full,
+          :wrapper_class => 'pagination' })
       end
 
       def links_full page, &block

data/lib/pagify/helper/innate.rb

@@ -0,0 +1,16 @@
+
+require 'pagify/helper/detail/web'
+
+module Pagify::Helper::Innate
+  include Pagify::Helper::Web
+  def pagify_links objs, &path
+    super(objs, :path => lambda{ block_given? ? path.call : request.path  },
+                :page => lambda{ |name| request[name] })
+  end
+end
+
+module Innate
+  module Helper
+    Pagify = Pagify::Helper::Innate
+  end
+end

data/lib/pagify/helper/rails.rb

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

data/lib/pagify/pager/data_mapper.rb

@@ -9,18 +9,27 @@ module Pagify
 
     def initialize model_class, opts = {}, query = {}
       @model = model_class
-      query ||= {}
       query_opts = reject_pager_opts(opts)
 
       super(opts.merge(
         :fetcher => lambda{ |offset, per_page|
-          model.send :with_scope, query do
+          # TODO: i am not sure why do we need this check?
+          if query == model.query
             model.all(query_opts.merge(:offset => offset, :limit => per_page))
+          else
+            model.send(:with_scope, query) do
+              model.all(query_opts.merge(:offset => offset, :limit => per_page))
+            end
           end
         },
         :counter => lambda{
-          model.send :with_scope, query do
+          # TODO: i am not sure why do we need this check?
+          if query == model.query
             model.count(query_opts)
+          else
+            model.send(:with_scope, query) do
+              model.count(query_opts)
+            end
           end
         }))
     end

data/lib/pagify/version.rb

@@ -1,4 +1,4 @@
 
 module Pagify
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/pagify.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pagify}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lin Jen-Shin (aka godfat \347\234\237\345\270\270)"]
-  s.date = %q{2009-08-08}
+  s.authors = ["Lin Jen-Shin (aka godfat 真常)"]
+  s.date = %q{2009-11-16}
   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/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.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/detail/web.rb", "lib/pagify/helper/html.rb", "lib/pagify/helper/innate.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/helper_web.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_innate.rb", "test/test_null.rb", "test/test_rails.rb"]
   s.homepage = %q{http://github.com/godfat/pagify}
   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.5}
   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"]
+  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_innate.rb", "test/test_null.rb", "test/test_rails.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/tasks/gem.rake

@@ -79,7 +79,7 @@ class GemPackageTask < Rake::PackageTask
       end
     end
   end
-  
+
   def gem_file
     if @gem_spec.platform == Gem::Platform::RUBY
       "#{package_name}.gem"

data/tasks/setup.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'ostruct'
 require 'find'
 
-class OpenStruct; undef :gem if defined? :gem; end 
+class OpenStruct; undef :gem if defined? :gem; end
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -251,7 +251,7 @@ def manifest
   files = []
   exclude = PROJ.exclude.dup
   comment = %r/^\s*#/
- 
+
   # process the ignore file and add the items there to the exclude list
   if test(?f, PROJ.ignore_file)
     ary = []

data/tasks/spec.rake

@@ -32,7 +32,7 @@ namespace :spec do
       t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
     end
 
-    RCov::VerifyTask.new(:verify) do |t| 
+    RCov::VerifyTask.new(:verify) do |t|
       t.threshold = PROJ.rcov.threshold
       t.index_html = File.join(PROJ.rcov.dir, 'index.html')
       t.require_exact_threshold = PROJ.rcov.threshold_exact

data/tasks/svn.rake

@@ -34,7 +34,7 @@ namespace :svn do
 
     puts "Creating SVN tag '#{tag}'"
     unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
-      abort "Tag creation failed" 
+      abort "Tag creation failed"
     end
   end
 

data/test/helper.rb

@@ -11,8 +11,6 @@ TestCase = begin
            end
 
 require 'pagify'
-#gem 'dm-core', '<0.10'
-#gem 'dm-aggregates', '<0.10'
 require 'dm-core'
 require 'dm-aggregates'
 require 'active_record'

data/test/helper_model.rb

@@ -22,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, :limit => 1), users.next.first
+    assert_equal send(:User).first(:offset => 2), users.next.first
     assert_equal 1, users.next.size
     assert_equal Pagify::NullPage.new(users.pager), users.next.next
   end
@@ -65,19 +65,4 @@ module SuiteForModel
     end
   end
 
-  # include Extlib::Hook
-  #
-  # private
-  # def i_give_up
-  #   if self.class == TestActiveRecord
-  #     skip "it's toooooo hard to implement this for active record!! patch wanted!"
-  #   end
-  # end
-  #
-  # [:test_same_pager_with_same_opts,
-  #  :test_page_correctness,
-  #  :test_condition_chain].each{ |test|
-  #   before test.to_sym, :i_give_up
-  # }
-
 end

data/test/helper_pagify.rb

@@ -1,5 +1,5 @@
 
-class TestPagify < TestCase
+module PagifyCase
   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/helper_web.rb

@@ -0,0 +1,23 @@
+
+module WebCase
+  def setup
+    @data = (0..9).to_a.pagify(:per_page => 2, :page => 3)
+  end
+
+  def test_query_name
+    assert_equal(:page, Pagify::Helper::HTML.setting[:query_name])
+    assert_equal(:page, Pagify::ArrayPager.new([]).html.setting[:query_name])
+  end
+
+  def test_pagify_links
+    assert_equal('<div class="pagination"><a href="/a/b?page=2">&lt; Previous</a> <a href="/a/b?page=4">Next &gt;</a><br /><a href="/a/b?page=1">&laquo; First</a> <a href="/a/b?page=2">2</a> 3 <a href="/a/b?page=4">4</a> <a href="/a/b?page=5">Last &raquo;</a></div>', pagify_links(@data))
+
+    @data.pager.html.setting[:links_type] = :links
+
+    assert_equal('<div class="pagination"><a href="/a/b?page=1">&laquo; First</a> <a href="/a/b?page=2">2</a> 3 <a href="/a/b?page=4">4</a> <a href="/a/b?page=5">Last &raquo;</a></div>', pagify_links(@data))
+  end
+
+  def test_custom_path
+    assert_equal('<div class="pagination"><a href="XD?page=2">&lt; Previous</a> <a href="XD?page=4">Next &gt;</a><br /><a href="XD?page=1">&laquo; First</a> <a href="XD?page=2">2</a> 3 <a href="XD?page=4">4</a> <a href="XD?page=5">Last &raquo;</a></div>', pagify_links(@data){'XD'})
+  end
+end

data/test/test_active_record.rb

@@ -5,7 +5,8 @@ require 'test/helper_model'
 
 require 'pagify/active_record'
 
-class TestActiveRecord < TestPagify
+class TestActiveRecord < TestCase
+  include PagifyCase
   def test_for_active_record
     for_pager Pagify::ActiveRecordPager.new(Topic)
   end
@@ -16,7 +17,7 @@ class TestActiveRecord < TestPagify
         101
       end
       def find all, opts = {}
-        TestPagify.data[opts[:offset], opts[:limit]]
+        PagifyCase.data[opts[:offset], opts[:limit]]
       end
     end
   end

data/test/test_array.rb

@@ -2,7 +2,8 @@
 require 'test/helper'
 require 'test/helper_pagify'
 
-class TestArray < TestPagify
+class TestArray < TestCase
+  include PagifyCase
   def test_offset_bug
     a = (0..9).to_a
     pager = Pagify::ArrayPager.new a
@@ -13,7 +14,7 @@ class TestArray < TestPagify
   end
 
   def test_for_array
-    for_pager Pagify::ArrayPager.new(TestPagify.data)
+    for_pager Pagify::ArrayPager.new(PagifyCase.data)
   end
 
 end

data/test/test_basic.rb

@@ -2,18 +2,19 @@
 require 'test/helper'
 require 'test/helper_pagify'
 
-class TestBasic < TestPagify
+class TestBasic < TestCase
+  include PagifyCase
   def test_basic
     pager = Pagify::BasicPager.new(
       :fetcher => lambda{ |offset, per_page|
         # if for rails,
         # Data.find :all, :offset => offset, :limit => per_page
-        TestPagify.data[offset, per_page]
+        PagifyCase.data[offset, per_page]
       },
       :counter => lambda{
         # if for rails,
         # Data.count
-        TestPagify.data.size
+        PagifyCase.data.size
       })
 
     for_pager pager

data/test/test_data_mapper.rb

@@ -5,7 +5,8 @@ require 'test/helper_model'
 
 require 'pagify/data_mapper'
 
-class TestDataMapper < TestPagify
+class TestDataMapper < TestCase
+  include PagifyCase
   def test_for_data_mapper
     for_pager Pagify::DataMapperPager.new(Topic)
   end
@@ -16,10 +17,10 @@ class TestDataMapper < TestPagify
         101
       end
       def all opts = {}
-        TestPagify.data[opts[:offset], opts[:limit]]
+        PagifyCase.data[opts[:offset], opts[:limit]]
       end
       def query
-        nil
+        {}
       end
       private
       def with_scope query

data/test/test_innate.rb

@@ -0,0 +1,13 @@
+
+require 'test/helper'
+require 'test/helper_web'
+require 'pagify/helper/innate'
+
+class TestInnate < TestCase
+  include WebCase
+  include Innate::Helper::Pagify
+  # fake
+  def request
+    Struct.new(:path, :page).new('/a/b', 3)
+  end
+end

data/test/test_rails.rb

@@ -1,9 +1,10 @@
 
 require 'test/helper'
-require 'pagify/array'
+require 'test/helper_web'
 require 'pagify/helper/rails'
 
 class TestRails < TestCase
+  include WebCase
   include ApplicationHelper
   # fake
   def request
@@ -12,25 +13,4 @@ class TestRails < TestCase
   def params
     {:page => 3}
   end
-
-  def setup
-    @data = (0..9).to_a.pagify(:per_page => 2, :page => 3)
-  end
-
-  def test_query_name
-    assert_equal(:page, Pagify::Helper::HTML.setting[:query_name])
-    assert_equal(:page, Pagify::ArrayPager.new([]).html.setting[:query_name])
-  end
-
-  def test_would_paginate
-    assert_equal('<div class="pagination"><a href="/a/b?page=2">&lt; Previous</a> <a href="/a/b?page=4">Next &gt;</a><br /><a href="/a/b?page=1">&laquo; First</a> <a href="/a/b?page=2">2</a> 3 <a href="/a/b?page=4">4</a> <a href="/a/b?page=5">Last &raquo;</a></div>', pagify_links(@data))
-
-    @data.pager.html.setting[:links_type] = :links
-
-    assert_equal('<div class="pagination"><a href="/a/b?page=1">&laquo; First</a> <a href="/a/b?page=2">2</a> 3 <a href="/a/b?page=4">4</a> <a href="/a/b?page=5">Last &raquo;</a></div>', pagify_links(@data))
-  end
-
-  def test_custom_path
-    assert_equal('<div class="pagination"><a href="XD?page=2">&lt; Previous</a> <a href="XD?page=4">Next &gt;</a><br /><a href="XD?page=1">&laquo; First</a> <a href="XD?page=2">2</a> 3 <a href="XD?page=4">4</a> <a href="XD?page=5">Last &raquo;</a></div>', pagify_links(@data){'XD'})
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pagify
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-08 00:00:00 +08:00
+date: 2009-11-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,9 @@ files:
 - lib/pagify/helper/abstract.rb
 - lib/pagify/helper/detail/setting.rb
 - lib/pagify/helper/detail/setup.rb
+- lib/pagify/helper/detail/web.rb
 - lib/pagify/helper/html.rb
+- lib/pagify/helper/innate.rb
 - lib/pagify/helper/rails.rb
 - lib/pagify/page/basic.rb
 - lib/pagify/page/null.rb
@@ -113,11 +115,13 @@ files:
 - test/helper.rb
 - test/helper_model.rb
 - test/helper_pagify.rb
+- test/helper_web.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_innate.rb
 - test/test_null.rb
 - test/test_rails.rb
 has_rdoc: true
@@ -159,5 +163,6 @@ test_files:
 - test/test_basic.rb
 - test/test_data_mapper.rb
 - test/test_html.rb
+- test/test_innate.rb
 - test/test_null.rb
 - test/test_rails.rb