ajax_pagination 0.5.1 → 0.6.0

data/spec/ajax_pagination/controller_additions_spec.rb

@@ -1,8 +1,15 @@
 require "spec_helper"
 
+module SetAjaxSection
+  def ajax_section= (name)
+    @_ajax_section = name
+  end
+end
+
 describe AjaxPagination::ControllerAdditions do
   def stub_pagination(name)
     @controller.stub!(:params).and_return({:pagination => name, :controller => "dummycontroller"})
+    @controller.ajax_section = name
   end
   def stub_request_format_html(bool)
     @controller.stub!(:request).and_return(stub({:format => stub(:html? => bool), :GET => {} }))
@@ -12,10 +19,14 @@ describe AjaxPagination::ControllerAdditions do
   end
   before :each do
     @controller_class = Class.new
+    @controller_class.stub!(:around_filter)
+    @controller_class.stub!(:before_filter)
+    @controller_class.stub!(:after_filter)
     @controller = @controller_class.new
     @controller.stub!(:params).and_return({})
     stub_request_format_html(false)
     @controller_class.send(:include, AjaxPagination::ControllerAdditions)
+    @controller_class.send(:include, SetAjaxSection)
     @formatter = Class.new
     @formatter.stub!(:html).and_return(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) # to detect how many times the function was called
     stub_lookup_context([]) # no partial matching
@@ -30,9 +41,10 @@ describe AjaxPagination::ControllerAdditions do
       @formatter.html.should == 0
     end
     it 'should render when pagination parameter matches' do
-      stub_pagination('page')
+      stub_pagination('global')
       @controller.ajax_respond(@formatter).should be_true
       @formatter.html.should == 1 # detects html function was called once (but checking also calls the function) ...
+      stub_pagination('page')
       @controller.ajax_respond(@formatter, :pagination => :page).should be_true
       @formatter.html.should == 3 # ... which is why the next check should be 2 more html function calls
       @controller.ajax_respond(@formatter, :pagination => 'page').should be_true
@@ -43,7 +55,7 @@ describe AjaxPagination::ControllerAdditions do
       stub_lookup_context(['matching_partial_found'])
       @controller.ajax_respond(@formatter, :pagination => 'pageX').should be_true
       @formatter.html.should == 9
-      stub_pagination('page')
+      stub_pagination('global')
       @controller.ajax_respond(@formatter).should be_true
       @formatter.html.should == 11
 
@@ -69,7 +81,7 @@ describe AjaxPagination::ControllerAdditions do
     end
     it 'should display partial when .html?pagination=pagename' do
       stub_request_format_html(true)
-      stub_pagination('page')
+      stub_pagination('global')
       @controller.ajax_section_displayed?.should be_true
       stub_pagination('page2')
       @controller.ajax_section_displayed?('page2').should be_true

data/spec/ajax_pagination/helper_additions_spec.rb

@@ -15,7 +15,7 @@ describe AjaxPagination::HelperAdditions do
   end
   describe 'ajax_section' do
     it 'should render partial requested, default of page with no arguments' do
-      @view.should_receive(:render).with('page')
+      @view.should_receive(:render).with('global')
       @view.ajax_section
       @view.should_receive(:render).with('page2')
       @view.ajax_section :pagination => 'page2' # renders the partial named :pagination if :partial not defined

data/spec/ajax_pagination/integration/ajaxpaginate_spec.rb

@@ -33,7 +33,7 @@ describe 'paginating with javascript on', :js => true do
       visit("http://localhost:#{SERVERSLOWPORT}/changelog")
       sleep(2)
       page.should have_selector('#changelogpagetitle')
-      find('#_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       page.should have_selector('.ajaxpagination-loader')
       sleep(1.5)
       page.should have_no_selector('.ajaxpagination-loader')
@@ -42,12 +42,12 @@ describe 'paginating with javascript on', :js => true do
       visit("http://localhost:#{SERVERSLOWPORT}/posts")
       sleep(2)
       page.should have_selector('#postspagetitle')
-      find('#page_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       sleep(0.5) # failed once on travis rbx without sleep
       page.should have_selector('.ajaxpagination-loader')
       sleep(1.5)
       page.should have_no_selector('.ajaxpagination-loader')
-      find('#upcomingpage_paginated_section').find('.next_page').click
+      find('#upcomingpage').find('.next_page').click
       page.should have_selector('.ajaxpagination-loader')
       sleep(1.5)
       page.should have_no_selector('.ajaxpagination-loader')
@@ -57,18 +57,18 @@ describe 'paginating with javascript on', :js => true do
     retry_exceptions do
       # warmup images
       visit("http://localhost:#{SERVERSLOWPORT}/changelog")
-      find('#page_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       sleep(3)
       visit("http://localhost:#{SERVERSLOWPORT}/posts")
-      find('#page_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       sleep(3)
 
       visit("http://localhost:#{SERVERSLOWPORT}/changelog")
-      find('#page_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       page.should have_xpath("//img[@class='ajaxpagination-loader' and @src = '/assets/myajax-loader.gif']")
       sleep(1.5)
       visit("http://localhost:#{SERVERSLOWPORT}/posts")
-      find('#page_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       page.should have_xpath("//img[@class='ajaxpagination-loader' and @src = '/assets/ajax-loader.gif']")
     end
   end
@@ -165,8 +165,8 @@ describe 'paginating with javascript on', :js => true do
   end
   it 'submits ajax_form_for form via POST and DELETE link' do
     retry_exceptions do
-      visit("http://localhost:#{SERVERPORT}")
-      find('#signin').click
+      visit("http://localhost:#{SERVERPORT}/")
+      find('#signin').click if !page.has_selector?('#signout')
       click_link("Posts")
       sleep(1)
       page.should have_content("New Post")
@@ -186,6 +186,7 @@ describe 'paginating with javascript on', :js => true do
 
       count = ajaxCount
       click_link("Destroy");
+      sleep(2)
       page.driver.browser.switch_to.alert.accept
       sleep(2)
       page.should have_content("Post destroyed.")

data/spec/ajax_pagination/integration/nojavascript_spec.rb

@@ -15,15 +15,15 @@ describe 'paginating without javascript', :type => :request, :driver => :rack_te
   it 'still paginates nested and multiple paginated sections' do
     visit(changelog_url)
     page.should have_selector('.previous_page.disabled')
-    find('#_paginated_section').find('.next_page').click
+    find('#page').find('.next_page').click
     page.should have_no_selector('.previous_page.disabled')
     find('#signin').click
     visit(posts_url)
-    page.should have_selector('#upcomingpage_paginated_section .previous_page.disabled')
-    find('#upcomingpage_paginated_section').find('.next_page').click
-    page.should have_no_selector('#upcomingpage_paginated_section .previous_page.disabled')
-    page.should have_selector('#page_paginated_section .previous_page.disabled')
-    find('#page_paginated_section').find('.next_page').click
-    page.should have_no_selector('#page_paginated_section .previous_page.disabled')
+    page.should have_selector('#upcomingpage .previous_page.disabled')
+    find('#upcomingpage').find('.next_page').click
+    page.should have_no_selector('#upcomingpage .previous_page.disabled')
+    page.should have_selector('#page .previous_page.disabled')
+    find('#page').find('.next_page').click
+    page.should have_no_selector('#page .previous_page.disabled')
   end
 end

data/spec/ajax_pagination/integration/paginate_spec.rb

@@ -14,18 +14,18 @@ describe 'paginating with javascript on', :type => :request, :driver => :seleniu
   it 'works with nested and multiple paginated sections' do
     visit("http://localhost:#{SERVERPORT}/changelog")
     page.should have_selector('.previous_page.disabled')
-    find('#page_paginated_section').find('.next_page').click
+    find('#page').find('.next_page').click
     page.should have_no_selector('.previous_page.disabled')
     find('#signin').click
     visit("http://localhost:#{SERVERPORT}/posts")
-    page.should have_selector('#page_paginated_section .previous_page.disabled')
-    find('#page_paginated_section').find('.next_page').click
+    page.should have_selector('#page .previous_page.disabled')
+    find('#page').find('.next_page').click
     sleep(1)
-    page.should have_no_selector('#page_paginated_section .previous_page.disabled')
-    page.should have_selector('#upcomingpage_paginated_section .previous_page.disabled')
-    find('#upcomingpage_paginated_section').find('.next_page').click
+    page.should have_no_selector('#page .previous_page.disabled')
+    page.should have_selector('#upcomingpage .previous_page.disabled')
+    find('#upcomingpage').find('.next_page').click
     sleep(1)
-    page.should have_no_selector('#upcomingpage_paginated_section .previous_page.disabled')
-    page.should have_no_selector('#page_paginated_section .previous_page.disabled')
+    page.should have_no_selector('#upcomingpage .previous_page.disabled')
+    page.should have_no_selector('#page .previous_page.disabled')
   end
 end

data/spec/ajax_pagination/integration/rails30_spec.rb

@@ -18,7 +18,7 @@ describe 'rails3.0 support', :type => :request, :driver => :selenium do
       click_link 'Changelog'
       sleep(2)
       page.should have_selector('#changelogpagetitle')
-      find('#_paginated_section').find('.next_page').click
+      find('#page').find('.next_page').click
       page.should have_selector('.ajaxpagination-loader')
       sleep(1.5)
       page.should have_no_selector('.ajaxpagination-loader')

data/spec/rails30_app/app/controllers/application_controller.rb

@@ -1,9 +1,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :slowajaxload
-  ajax_respond :pagination => "", :render => { :layout => "ajax" }
+  ajax_respond :render => { :layout => "ajax" }
   def slowajaxload
-    if (request.GET[:pagination] || params[:pagination]) && Rails.env == "test"
+    if (!ajax_section.nil?) && Rails.env == "test"
       delay = 0
       delay = ENV['AJAX_DELAY'] if ENV['AJAX_DELAY']
       sleep(delay.to_f)

data/spec/rails30_app/app/controllers/changelog_controller.rb

@@ -6,7 +6,7 @@ class ChangelogController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      ajax_respond(format)
+      ajax_respond format, :section_id => "page"
     end
   end
 end

data/spec/rails30_app/app/controllers/pages_controller.rb

@@ -5,7 +5,7 @@ class PagesController < ApplicationController
     @readme = IO.read(File.expand_path("../../../../../README.md",__FILE__))
     respond_to do |format|
       format.html
-      ajax_respond format, :pagination => "", :render => {:file => "pages/readme", :layout => "ajax"}
+      ajax_respond format, :section_id => "global", :render => {:file => "pages/readme", :layout => "ajax"}
     end
   end
 
@@ -15,14 +15,7 @@ class PagesController < ApplicationController
   def welcome
     respond_to do |format|
       format.html
-      ajax_respond format, :pagination => "", :render => { :layout => "ajax" }
-    end
-  end
-
-  def warnings
-    respond_to do |format|
-      format.html
-      ajax_respond format, :pagination => "disable", :render => { :layout => "ajax" }
+      ajax_respond format, :section_id => "global", :render => { :layout => "ajax" }
     end
   end
 end

data/spec/rails30_app/app/views/changelog/_page.html.erb

@@ -1,4 +1,6 @@
-<%= will_paginate @changelogs, :params => { :pagination => nil } %>
+<%= ajax_links :section_id => "page" do %>
+  <%= will_paginate @changelogs %>
+<% end %>
 <%= ajax_loadzone do %>
   <% @changelogs.each do |changelog| %>
     <%= content_tag :div, :style => "border-bottom: 1px solid black;" do %>
@@ -7,4 +9,6 @@
     <% end %>
   <% end %>
 <% end %>
-<%= will_paginate @changelogs, :params => { :pagination => nil } %>
+<%= ajax_links :section_id => "page" do %>
+  <%= will_paginate @changelogs %>
+<% end %>

data/spec/rails30_app/app/views/changelog/index.html.erb

@@ -1,3 +1,3 @@
 <h2 id="changelogpagetitle">Changelog</h2>
 
-<%= ajax_section %>
+<%= ajax_section :id => "page" %>

data/spec/rails30_app/app/views/layouts/application.html.erb

@@ -29,20 +29,20 @@ $(document).ready(function () {
 </script>
 
 <div style="float: right; min-width: 150px;">
-<%= ajax_section :pagination => "count", :history => false do %>
+<%= ajax_section :id => "count", :history => false do %>
   <%= render :template => "sessions/count" %>
 <% end %>
 </div>
-<h1><%= ajax_link_to "AJAX Pagination Example Application", "broken link", :pagination => "" %><!-- note the broken link is intentional, for testing purposes --></h1>
-<div class="ajaxpagination menu" data-pagination="">
+<h1><%= ajax_link_to "AJAX Pagination Example Application", "broken link" %><!-- note the broken link is intentional, for testing purposes --></h1>
+<%= ajax_links :section_id => "global", :class => "menu" do %>
   <ul>
     <li><%= link_to "Home", root_url %></li>
     <li><%= link_to "Changelog", changelog_url %></li>
     <li><%= link_to "Readme", pages_readme_url %></li>
     <li><%= link_to "About", pages_about_url %></li>
   </ul>
-</div>
-<%= ajax_section :pagination => "", :reload => {:urlpart => "path", :urlregex => "^.*$"}, :loadzone => true do %>
+<% end %>
+<%= ajax_section :reload => {:urlpart => "path", :urlregex => "^.*$"}, :loadzone => true do %>
   <%= render :template => "layouts/flash" %>
 <% end %>
 </body>

data/spec/rails30_app/app/views/sessions/count.html.erb

@@ -1,6 +1,6 @@
 <span id="submits"><%= session[:count].to_i %></span> 
 submit<%= 's' unless session[:count]==1 %> so far.
-<%= ajax_form_tag sessions_count_url, :method => "post", :pagination => "count" do %>
+<%= ajax_form_tag sessions_count_url, :method => "post", :section_id => "count" do %>
   <span class="actions">
     <%= submit_tag "Submit" %>
   </span>

data/spec/rails30_app/public/javascripts/ajax_pagination.js

@@ -2,7 +2,7 @@
 //= require jquery.url
 
 /* 
- * AJAX Pagination: Ajaxifying your pagination links
+ * AJAX Pagination: Ajaxifying your navigation
  * https://github.com/ronalchn/ajax_pagination
  * 
  * Copyright (c) 2012 Ronald Ping Man Chan
@@ -47,7 +47,7 @@ jQuery(document).ready(function () {
       $.ajax_pagination = function (pagination_name) {
         return new pagination_object(pagination_name);
       };
-      $.ajax_pagination.version = '0.5.1';
+      $.ajax_pagination.version = '0.6.0';
       $.ajax_pagination.enabled = true;
       function pagination_object(pagination_name) {
         this.get = function(url,options) {
@@ -56,7 +56,7 @@ jQuery(document).ready(function () {
           swapPage(pagination_name,url,options.history);
         }
         this.exists = function() {
-          return $('#' + pagination_name + '_paginated_section').length == 1;
+          return $('#' + pagination_name).length == 1;
         }
       }
       /////////////////////////////
@@ -95,15 +95,13 @@ jQuery(document).ready(function () {
         }
       }
       function getSection(pagination_name) {
-        var id = "#" + pagination_name + "_paginated_section"; // element id we are looking for
+        var id = "#" + pagination_name; // element id we are looking for
         return $(id);
       }
       function getSectionName(section) {
           var id = section.attr("id");
           if (id === undefined) return undefined; // no name
-          var pagination_name = /^(.*)_paginated_section$/.exec(id)[1];
-          if (pagination_name == null || pagination_name === undefined) return undefined; // pagination not set up properly
-          return pagination_name;
+          return id; // id = pagination_name
       }
       function getSectionNames(sections) {
         var names = new Array();
@@ -158,9 +156,9 @@ jQuery(document).ready(function () {
       // this event handler has the same arguments as for jquery and jquery-ujs, except it also takes the name of the section to put the content into as first argument
       // adapter functions will be used to reconcile the differences in arguments, this is required because jquery and jquery-ujs has different ways to get the pagination_name argument
       function beforeSendHandler(pagination_name,jqXHR,settings) {
-        var id = "#" + pagination_name + "_paginated_section"; // element id we are looking for
+        var id = "#" + pagination_name; // element id we are looking for
         var requesturl = settings.url;
-        var countid = $('[id="' + pagination_name + '_paginated_section"]').length;
+        var countid = $('[id="' + pagination_name + '"]').length;
         if (countid != 1) { // something wrong, cannot find unique section to load page into
           
             alert("AJAX Pagination UNIQUE_SECTION_NOT_FOUND:\nExpected one pagination section called " + pagination_name + ", found " + countid);
@@ -234,7 +232,7 @@ jQuery(document).ready(function () {
         });
       }
       function pushHistory(pagination_name,url) {
-        var data = $("#" + pagination_name + "_paginated_section").data("pagination");
+        var data = $("#" + pagination_name).data("pagination");
         if (data === undefined || data.history === undefined || data.history) { // check that history is not disabled
           // construct visible url
           var data = $.deparam.querystring($.url(url).attr('query'));
@@ -252,21 +250,20 @@ jQuery(document).ready(function () {
         }
       }
       // these special containers are for convenience only, to apply the required data-remote, data-pagination attributes to all links inside
-      $(document).on("click", ".pagination a, .ajaxpagination a, a.ajaxpagination", function(e) {
+      $(document).on("click", ".ajaxpagination a", function(e) {
         // ignore if already selected by jquery-ujs
         if ($(this).filter($.rails.linkClickSelector).length>0) return true; // continue with jquery-ujs - this behaviour is necessary because we do not know if the jquery-ujs handler executes before or after this handler
         // find out what data-pagination should be set to
-        var pagination_container = $(this).closest(".pagination, .ajaxpagination"); // container of links (use to check for data-pagination first)
+        var pagination_container = $(this).closest(".ajaxpagination"); // container of links (use to check for data-pagination first)
         var pagination_name = pagination_container.data('pagination');
         if (pagination_name === undefined) {
-          pagination_name = /^(.*)_paginated_section$/.exec($(this).closest(".paginated_section").attr("id")); // if data-pagination not present, search up the tree for a suitable section
+          pagination_name = $(this).closest(".paginated_section").attr("id"); // if data-pagination not present, search up the tree for a suitable section
           if (pagination_name == null) {
             
-              alert("AJAX Pagination MISSING_REFERENCE:\nNo pagination section name given for link, and none could be implicitly assigned, AJAX cancelled for this request");
+              alert("AJAX Pagination MISSING_REFERENCE:\nNo pagination section id given for link, and none could be implicitly assigned, AJAX cancelled for this request");
             
             return true; // pagination not set up properly
           }
-          pagination_name = pagination_name[1];
         }
         
         // set data-remote, data-pagination

data/spec/rails_app/app/controllers/application_controller.rb

@@ -1,9 +1,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :slowajaxload
-  ajax_respond :pagination => "", :render => { :layout => "ajax" }
+  ajax_respond :section_id => "global", :render => { :layout => "ajax" }
   def slowajaxload
-    if (request.GET[:pagination] || params[:pagination]) && Rails.env == "test"
+    if (!ajax_section.nil?) && Rails.env == "test"
       delay = 0
       delay = ENV['AJAX_DELAY'] if ENV['AJAX_DELAY']
       sleep(delay.to_f)

data/spec/rails_app/app/controllers/changelog_controller.rb

@@ -6,7 +6,7 @@ class ChangelogController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      ajax_respond(format)
+      ajax_respond format, :section_id => "page"
     end
   end
 end

data/spec/rails_app/app/controllers/pages_controller.rb

@@ -5,7 +5,7 @@ class PagesController < ApplicationController
     @readme = IO.read(File.expand_path("../../../../../README.md",__FILE__))
     respond_to do |format|
       format.html
-      ajax_respond format, :pagination => "", :render => {:file => "pages/readme", :layout => "ajax"}
+      ajax_respond format, :section_id => "global", :render => {:file => "pages/readme", :layout => "ajax"}
     end
   end
 
@@ -15,14 +15,14 @@ class PagesController < ApplicationController
   def welcome
     respond_to do |format|
       format.html
-      ajax_respond format, :pagination => "", :render => { :layout => "ajax" }
+      ajax_respond format, :section_id => "global", :render => { :layout => "ajax" }
     end
   end
 
   def warnings
     respond_to do |format|
       format.html
-      ajax_respond format, :pagination => "disable", :render => { :layout => "ajax" }
+      ajax_respond format, :section_id => "disable", :render => { :layout => "ajax" }
     end
   end
 end

data/spec/rails_app/app/controllers/posts_controller.rb

@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  ajax_respond :pagination => 'page'
+  ajax_respond :section_id => 'page'
   # GET /posts
   # GET /posts.json
   def index
@@ -8,8 +8,8 @@ class PostsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render :json => @posts }
-      ajax_respond format, :pagination => :upcomingpage
-      ajax_respond format, :pagination => "", :render => { :layout => "ajax" }
+      ajax_respond format, :section_id => :upcomingpage
+      ajax_respond format, :section_id => "", :render => { :layout => "ajax" }
     end
   end