genki-dm-pagination 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -5,7 +5,7 @@ require 'merb-core'
5
5
  require 'merb-core/tasks/merb'
6
6
 
7
7
  GEM_NAME = "dm-pagination"
8
- GEM_VERSION = "0.0.2"
8
+ GEM_VERSION = "0.0.3"
9
9
  AUTHOR = "Genki Takiuchi"
10
10
  EMAIL = "genki@s21g.com"
11
11
  HOMEPAGE = "http://blog.s21g.com/genki"
@@ -5,7 +5,7 @@ module DmPagination
5
5
  @pagination = pagination
6
6
  @block = block
7
7
  @options = args.last.kind_of?(Hash) ? args.pop : {}
8
- @args = args.blank? ? [:prev, :pages, :next] : []
8
+ @args = args.blank? ? [:prev, :pages, :next] : args
9
9
  end
10
10
 
11
11
  def to_s(*args)
@@ -65,15 +65,15 @@ module DmPagination
65
65
  end
66
66
 
67
67
  def truncate
68
- @options[:truncate] || '...'
68
+ @options[:truncate] || Merb::Plugins.config[:dm_pagination][:truncate]
69
69
  end
70
70
 
71
71
  def prev_label
72
- @options[:prev] || '« Prev'
72
+ @options[:prev] || Merb::Plugins.config[:dm_pagination][:prev_label]
73
73
  end
74
74
 
75
75
  def next_label
76
- @options[:next] || 'Next »'
76
+ @options[:next] || Merb::Plugins.config[:dm_pagination][:next_label]
77
77
  end
78
78
 
79
79
  def url(params)
data/lib/dm-pagination.rb CHANGED
@@ -3,7 +3,9 @@ if defined?(Merb::Plugins)
3
3
 
4
4
  # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
5
5
  Merb::Plugins.config[:dm_pagination] = {
6
- :chickens => false
6
+ :prev_label => '« Prev',
7
+ :next_label => 'Next »',
8
+ :truncate => '...'
7
9
  }
8
10
 
9
11
  Merb::BootLoader.before_app_loads do
@@ -73,6 +73,13 @@ describe "dm-pagination" do
73
73
  response = request "/pagination_builder/simple", :params => {:page => 2}
74
74
  response.should be_successful
75
75
  response.should have_selector("a[rel=prev]")
76
+ response.body.scan(/Prev|Next/).should == %w(Prev Next)
77
+ end
78
+
79
+ it "should be able to control links" do
80
+ response = request "/pagination_builder/variant"
81
+ response.should be_successful
82
+ response.body.scan(/Prev|Next/).should == %w(Next Prev)
76
83
  end
77
84
  end
78
85
  end
@@ -3,4 +3,9 @@ class PaginationBuilder < Merb::Controller
3
3
  @posts = Post.paginate(params)
4
4
  render
5
5
  end
6
+
7
+ def variant
8
+ @posts = Post.paginate(params)
9
+ render
10
+ end
6
11
  end
@@ -0,0 +1 @@
1
+ <%= paginate @posts, :pages, :next, :prev %>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: genki-dm-pagination
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Genki Takiuchi
@@ -54,6 +54,7 @@ files:
54
54
  - spec/fixture/app/views/layout/application.html.erb
55
55
  - spec/fixture/app/views/pagination_builder
56
56
  - spec/fixture/app/views/pagination_builder/simple.html.erb
57
+ - spec/fixture/app/views/pagination_builder/variant.html.erb
57
58
  - spec/fixture/config
58
59
  - spec/fixture/config/router.rb
59
60
  - spec/merb_test.log