genki-dm-pagination 0.0.2 → 0.0.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "dm-pagination"
-GEM_VERSION = "0.0.2"
+GEM_VERSION = "0.0.3"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"

data/lib/dm-pagination/pagination_builder.rb

@@ -5,7 +5,7 @@ module DmPagination
       @pagination = pagination
       @block = block
       @options = args.last.kind_of?(Hash) ? args.pop : {}
-      @args = args.blank? ? [:prev, :pages, :next] : []
+      @args = args.blank? ? [:prev, :pages, :next] : args
     end
 
     def to_s(*args)
@@ -65,15 +65,15 @@ module DmPagination
     end
 
     def truncate
-      @options[:truncate] || '...'
+      @options[:truncate] || Merb::Plugins.config[:dm_pagination][:truncate]
     end
 
     def prev_label
-      @options[:prev] || '« Prev'
+      @options[:prev] || Merb::Plugins.config[:dm_pagination][:prev_label]
     end
 
     def next_label
-      @options[:next] || 'Next »'
+      @options[:next] || Merb::Plugins.config[:dm_pagination][:next_label]
     end
 
     def url(params)

data/lib/dm-pagination.rb

@@ -3,7 +3,9 @@ if defined?(Merb::Plugins)
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
   Merb::Plugins.config[:dm_pagination] = {
-    :chickens => false
+    :prev_label => '« Prev',
+    :next_label => 'Next »',
+    :truncate => '...'
   }
   
   Merb::BootLoader.before_app_loads do

data/spec/dm-pagination_spec.rb

@@ -73,6 +73,13 @@ describe "dm-pagination" do
       response = request "/pagination_builder/simple", :params => {:page => 2}
       response.should be_successful
       response.should have_selector("a[rel=prev]")
+      response.body.scan(/Prev|Next/).should == %w(Prev Next)
+    end
+
+    it "should be able to control links" do
+      response = request "/pagination_builder/variant"
+      response.should be_successful
+      response.body.scan(/Prev|Next/).should == %w(Next Prev)
     end
   end
 end

data/spec/fixture/app/controllers/pagination_builder.rb

@@ -3,4 +3,9 @@ class PaginationBuilder < Merb::Controller
     @posts = Post.paginate(params)
     render
   end
+
+  def variant
+    @posts = Post.paginate(params)
+    render
+  end
 end

data/spec/fixture/app/views/pagination_builder/variant.html.erb

@@ -0,0 +1 @@
+<%= paginate @posts, :pages, :next, :prev %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-dm-pagination
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -54,6 +54,7 @@ files:
 - spec/fixture/app/views/layout/application.html.erb
 - spec/fixture/app/views/pagination_builder
 - spec/fixture/app/views/pagination_builder/simple.html.erb
+- spec/fixture/app/views/pagination_builder/variant.html.erb
 - spec/fixture/config
 - spec/fixture/config/router.rb
 - spec/merb_test.log