kaminari 0.7.0 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.8.0
+
+* using HTML5 <nav> tag rather than <div> for the container tag
+
 == 0.7.0
 
 * Ajaxified paginator templates

data/Gemfile

@@ -8,6 +8,8 @@ source 'http://rubygems.org'
 group :development do
   gem 'rspec', '>= 2.5.0'
   gem 'rr', '>= 1.0.2'
+  gem 'steak', '>= 1.1.0'
+  gem 'capybara', '>= 0.4.1.1'
   gem 'bundler', '>= 1.0.0'
   gem 'jeweler', '>= 1.5.2'
   gem 'rcov', '>= 0'

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 1fd9d978a737d36cf7cca698f0fcbfc6fcdbed98
+  revision: 7a774259010acec2a3b4c85e1a4b3289e4010ba8
   specs:
     actionmailer (3.1.0.beta)
       actionpack (= 3.1.0.beta)
@@ -62,10 +62,25 @@ GEM
     abstract (1.0.0)
     bcrypt-ruby (2.1.4)
     builder (3.0.0)
+    capybara (0.4.1.1)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+    celerity (0.8.7)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
     columnize (0.3.2)
+    culerity (0.2.15)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.2)
@@ -73,6 +88,7 @@ GEM
       git (>= 1.2.5)
       rake
       ruby-debug
+    json_pure (1.5.1)
     linecache (0.43)
     mail (2.2.15)
       activesupport (>= 2.3.6)
@@ -80,6 +96,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack-cache (1.0)
       rack (>= 0.4)
@@ -108,11 +125,21 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
     sqlite3 (1.3.3)
+    steak (1.1.0)
+      rspec (>= 1.3)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.24)
+    xpath (0.1.3)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -120,6 +147,7 @@ PLATFORMS
 DEPENDENCIES
   arel!
   bundler (>= 1.0.0)
+  capybara (>= 0.4.1.1)
   jeweler (>= 1.5.2)
   rack!
   rails!
@@ -129,3 +157,4 @@ DEPENDENCIES
   rspec-rails (>= 2.5.0)
   ruby-debug
   sqlite3 (>= 1.3.3)
+  steak (>= 1.1.0)

data/README.rdoc

@@ -18,6 +18,9 @@ No special collection class or something for the paginated values but uses a gen
 * Engine based customizable helper
 As the whole pagination helper is basically just a collection of links and non-links, Kaminari renders each of them through its own partial template inside the Engine. So, you can easily modify their behaviour or style or whatever by overriding partial templates.
 
+* Modern
+The pagination helper outputs the HTML5 <nav> tag by default. Plus, the helper supports the Rails 3 unobtrusive Ajax.
+
 
 == Rails versions
 
@@ -56,18 +59,19 @@ Then bundle:
 * Just call the "paginate" helper
 
   <%= paginate @users %>
+This will render several "?page=N" pagination links surrounded by an HTML5 <nav> tag.
 
-* Specifing the "window" size
+=== Helper Options
 
-  # "inner window" (4 by default)
+* Specifing the "inner window" size (4 by default)
 
   <%= paginate @users, :window => 3 %>
 
-  # "outer window" (1 by default)
+* Specifing the "outer window" size (1 by default)
 
   <%= paginate @users, :outer_window => 3 %>
 
-  # outer window can be separetely specified by "left", "right" (1 by default)
+* outer window can be separetely specified by "left", "right" (1 by default)
 
   <%= paginate @users, :left => 0, :right => 2 %>
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/app/views/kaminari/_paginator.html.erb

@@ -1,3 +1,3 @@
-<div class='pagination'>
+<nav class='pagination'>
   <%= content_for :kaminari_paginator_tags %>
-</div>
+</nav>

data/app/views/kaminari/_paginator.html.haml

@@ -1,2 +1,2 @@
-.pagination
+%nav.pagination
   = content_for :kaminari_paginator_tags

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-08}
   s.description = %q{Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [
@@ -54,11 +54,15 @@ Gem::Specification.new do |s|
     "lib/kaminari/engine.rb",
     "lib/kaminari/helpers.rb",
     "lib/kaminari/railtie.rb",
-    "spec/controllers/application_helper_spec.rb",
+    "spec/acceptance/acceptance_helper.rb",
+    "spec/acceptance/support/helpers.rb",
+    "spec/acceptance/support/paths.rb",
+    "spec/acceptance/users_spec.rb",
     "spec/helpers/helpers_spec.rb",
     "spec/models/scopes_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/20110128122508_create_users.rb",
+    "spec/support/fake_app.rb",
     "spec/support/matchers.rb",
     "spec/support/user.rb"
   ]
@@ -68,11 +72,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{A pagnation engine plugin for Rails 3}
   s.test_files = [
-    "spec/controllers/application_helper_spec.rb",
+    "spec/acceptance/acceptance_helper.rb",
+    "spec/acceptance/support/helpers.rb",
+    "spec/acceptance/support/paths.rb",
+    "spec/acceptance/users_spec.rb",
     "spec/helpers/helpers_spec.rb",
     "spec/models/scopes_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/20110128122508_create_users.rb",
+    "spec/support/fake_app.rb",
     "spec/support/matchers.rb",
     "spec/support/user.rb"
   ]
@@ -83,6 +91,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_development_dependency(%q<rr>, [">= 1.0.2"])
+      s.add_development_dependency(%q<steak>, [">= 1.1.0"])
+      s.add_development_dependency(%q<capybara>, [">= 0.4.1.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -96,6 +106,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<rr>, [">= 1.0.2"])
+      s.add_dependency(%q<steak>, [">= 1.1.0"])
+      s.add_dependency(%q<capybara>, [">= 0.4.1.1"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -110,6 +122,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rspec>, [">= 2.5.0"])
     s.add_dependency(%q<rr>, [">= 1.0.2"])
+    s.add_dependency(%q<steak>, [">= 1.1.0"])
+    s.add_dependency(%q<capybara>, [">= 0.4.1.1"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/spec/acceptance/acceptance_helper.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require "steak"
+
+# Put your acceptance spec helpers inside /spec/acceptance/support
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/acceptance/support/helpers.rb

@@ -0,0 +1,5 @@
+module HelperMethods
+  # Put helper methods you need to be available in all tests here.
+end
+
+RSpec.configuration.include HelperMethods, :type => :acceptance

data/spec/acceptance/support/paths.rb

@@ -0,0 +1,9 @@
+module NavigationHelpers
+  # Put helper methods related to the paths in your application here.
+
+  def homepage
+    "/"
+  end
+end
+
+RSpec.configuration.include NavigationHelpers, :type => :acceptance

data/spec/acceptance/users_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+feature 'Users' do
+  background do
+    1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}" }
+  end
+  scenario 'navigating by pagination links' do
+    visit users_path
+
+    within 'nav.pagination' do
+      within 'span.page.current' do
+        page.should have_content '1'
+      end
+      within 'span.next' do
+        click_link 'Next »'
+      end
+    end
+
+    within 'nav.pagination' do
+      within 'span.page.current' do
+        page.should have_content '2'
+      end
+      within 'span.page.last' do
+        click_link '4'
+      end
+    end
+
+    within 'nav.pagination' do
+      within 'span.page.current' do
+        page.should have_content '4'
+      end
+      within 'span.prev' do
+        click_link '« Prev'
+      end
+    end
+
+    within 'nav.pagination' do
+      within 'span.page.current' do
+        page.should have_content '3'
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,29 +1,11 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'active_support/all'
-require 'active_record'
 require 'rails'
-require 'action_controller/railtie'
-require 'action_view/railtie'
-require 'rspec/rails'
-
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection('test')
-
 require 'kaminari'
 
-app = Class.new(Rails::Application)
-app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
-app.config.session_store :cookie_store, :key => "_myapp_session"
-app.config.active_support.deprecation = :log
-app.initialize!
-
-app.routes.draw do
-  resources :users
-end
-
-Object.const_set(:ApplicationHelper, Module.new)
+require File.join(File.dirname(__FILE__), 'support/fake_app')
 
+require 'rspec/rails'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/support/fake_app.rb

@@ -0,0 +1,29 @@
+require 'active_record'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection('test')
+
+app = Class.new(Rails::Application)
+app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
+app.config.session_store :cookie_store, :key => "_myapp_session"
+app.config.active_support.deprecation = :log
+app.initialize!
+
+app.routes.draw do
+  resources :users
+end
+
+class ApplicationController < ActionController::Base; end
+class UsersController < ApplicationController
+  def index
+    @users = User.page params[:page]
+    render :inline => <<-ERB
+<%= @users.map(&:name).join("\n") %>
+<%= paginate @users %>
+ERB
+  end
+end
+
+Object.const_set(:ApplicationHelper, Module.new)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +09:00
+date: 2011-02-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,39 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  requirement: *id003
+  prerelease: false
+  name: steak
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 105
+        segments: 
+        - 0
+        - 4
+        - 1
+        - 1
+        version: 0.4.1.1
+  requirement: *id004
+  prerelease: false
+  name: capybara
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +96,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
+  requirement: *id005
   prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +112,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
+  requirement: *id006
   prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,12 +126,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id007
   prerelease: false
   name: rcov
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +140,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id008
   prerelease: false
   name: rails
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  requirement: *id009
   prerelease: false
   name: rack
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +168,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id010
   prerelease: false
   name: arel
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +184,12 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  requirement: *id009
+  requirement: *id011
   prerelease: false
   name: rspec-rails
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,12 +200,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id010
+  requirement: *id012
   prerelease: false
   name: sqlite3
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -181,12 +214,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  requirement: *id013
   prerelease: false
   name: ruby-debug
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -197,7 +230,7 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id012
+  requirement: *id014
   prerelease: false
   name: rails
 description: Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3
@@ -247,11 +280,15 @@ files:
 - lib/kaminari/engine.rb
 - lib/kaminari/helpers.rb
 - lib/kaminari/railtie.rb
-- spec/controllers/application_helper_spec.rb
+- spec/acceptance/acceptance_helper.rb
+- spec/acceptance/support/helpers.rb
+- spec/acceptance/support/paths.rb
+- spec/acceptance/users_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/models/scopes_spec.rb
 - spec/spec_helper.rb
 - spec/support/20110128122508_create_users.rb
+- spec/support/fake_app.rb
 - spec/support/matchers.rb
 - spec/support/user.rb
 has_rdoc: true
@@ -289,10 +326,14 @@ signing_key:
 specification_version: 3
 summary: A pagnation engine plugin for Rails 3
 test_files: 
-- spec/controllers/application_helper_spec.rb
+- spec/acceptance/acceptance_helper.rb
+- spec/acceptance/support/helpers.rb
+- spec/acceptance/support/paths.rb
+- spec/acceptance/users_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/models/scopes_spec.rb
 - spec/spec_helper.rb
 - spec/support/20110128122508_create_users.rb
+- spec/support/fake_app.rb
 - spec/support/matchers.rb
 - spec/support/user.rb

data/spec/controllers/application_helper_spec.rb

@@ -1,21 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-class ApplicationController < ActionController::Base; end
-class UsersController < ApplicationController
-  def index
-    @users = User.page params[:page]
-    render :inline => '<%= paginate @users %>'
-  end
-end
-
-describe UsersController, 'pagination' do
-  render_views
-  before do
-    1.upto(30) {|i| User.create! :name => "user#{'%02d' % i}" }
-  end
-
-  it 'renders' do
-    get :index
-    response.body.should =~ /pagination/
-  end
-end