ajax_pagination 0.5.0 → 0.5.1

data/.gitignore

@@ -1,6 +1,6 @@
 *.gem
 .bundle
-Gemfile.lock
+/Gemfile.lock
 pkg/*
 *~
 *.swp

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.5.1
+* Added generator for assets (so asset pipeline is no longer required).
+* Added tests for a Rails 3.0.x application.
+
 ## v0.5.0
 This release has no new features, however, it is backwards incompatible because several methods have been renamed for clarity.
 

data/README.md

@@ -7,12 +7,12 @@ Handles AJAX pagination for you, by hooking up the links you want to load conten
 
 Basically, there is a helper function to use to create a section in your webpage, where content can be changed. Links can reference the section, and thus load new content into it.
 
-This gem currently assumes you are using Rails 3.1+, and the assets pipeline for the javascript and css files.
-
 For more, see [Introduction and Background](https://github.com/ronalchn/ajax_pagination/wiki/Introduction-and-Background).
 
+This gem requires Rails 3.0+. When using the asset pipeline in Rails 3.1+, follow the general installation instructions. Otherwise, use the ajax_pagination:assets generator, which puts the assets into the public/ directory.
+
 ## Installation
-Add to your Gemfile:
+Assuming, you are using the asset pipeline, add to your Gemfile:
 
     gem 'ajax_pagination'
 
@@ -34,6 +34,33 @@ Then add to your asset manifests,
  */
 ```
 
+To use this on Rails 3.0, or without using the asset pipeline, read [Installation without the Asset Pipeline](https://github.com/ronalchn/ajax_pagination/wiki/Installing-without-the-Asset-Pipeline) guide.
+
+## Basic Usage
+In the ActionView, use ajax_section to declare a section, and ajax_link_to to create a link loading content into the section:
+
+```erb
+<%= ajax_link_to "Link", link_url, :pagination => "section_name" %>
+<%= ajax_section :pagination => "section_name", :render => "mypartial" %>
+```
+
+Then, in the ActionController, use ajax_respond to render only the partial when an AJAX request is made:
+
+```ruby
+Class ObjectsController < ApplicationController
+  def index
+    ...
+    respond_to do |format|
+      format.html # index.html.erb
+      ajax_respond format, :pagination => "section_name", :render => "_mypartial"
+    end
+  end
+  ...
+end
+```
+
+Much more information can be found in the wiki.
+
 ## Getting Started
 To learn how to use this gem, read one of the usage guides below (found in the wiki):
 

data/Rakefile

@@ -6,6 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 task :travis do
   serverport = IO.read(File.expand_path("../spec/PORT",__FILE__)).strip # port number that we are using
   serverslowport = IO.read(File.expand_path("../spec/SLOWPORT",__FILE__)).strip # port number that we are using
+  r30serverport = IO.read(File.expand_path("../spec/R30PORT",__FILE__)).strip # port number that we are using
 
   system("cp spec/rails_app/db/development.sqlite3 spec/rails_app/db/test.sqlite3") # take a copy of the development database
   system("mkdir -p spec/rails_app/vendor/assets/javascripts") # directory to plonk javascripts from dependent gems
@@ -14,15 +15,24 @@ task :travis do
   system("cp `bundle show jquery-rails`/vendor/assets/javascripts/* spec/rails_app/vendor/assets/javascripts/")
   system("cp `bundle show jquery-historyjs`/vendor/assets/javascripts/* spec/rails_app/vendor/assets/javascripts/")
 
+  # recreate assets for rails 3.0 app - delete them first
+  system("mkdir -p spec/rails30_app/public/javascripts")
+  system("cp `bundle show jquery-rails`/vendor/assets/javascripts/* spec/rails30_app/public/javascripts/")
+  system("cp `bundle show jquery-historyjs`/vendor/assets/javascripts/* spec/rails30_app/public/javascripts/")
+  system("(cd spec/rails30_app/ && bundle exec rails generate ajax_pagination:assets --force)")
+
   # startup test servers
   system("(cd spec/rails_app/ && RAILS_ENV=test bundle exec rails server -d --port=#{serverport})") # daemonized rails server
   system("(cd spec/rails_app/ && RAILS_ENV=test AJAX_DELAY=1.5 bundle exec rails server -d --port=#{serverslowport})") # daemonized rails server
+  system("(cd spec/rails30_app/ && RAILS_ENV=test AJAX_DELAY=1.5 bundle exec rails server -d --port=#{r30serverport})") # daemonized rails server
   system("bundle exec rake spec")
   unless $?.exitstatus == 0
     system("kill -9 `lsof -i :#{serverport} -t`") # kills rails server
     system("kill -9 `lsof -i :#{serverslowport} -t`") # kills rails server
+    system("kill -9 `lsof -i :#{r30serverport} -t`") # kills rails server
     raise "spec failed!" 
   end
   system("kill -9 `lsof -i :#{serverport} -t`") # kills rails server
   system("kill -9 `lsof -i :#{serverslowport} -t`") # kills rails server
+  system("kill -9 `lsof -i :#{r30serverport} -t`") # kills rails server
 end

data/ajax_pagination.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "will_paginate"
   s.add_development_dependency "capybara"
 
-  s.add_runtime_dependency "rails", '>= 3.1'
+  s.add_runtime_dependency "rails", '>= 3.0'
   s.add_runtime_dependency "jquery-rails", '>= 1.0.17' # require jQuery 1.7+
   s.add_runtime_dependency "jquery-historyjs"
 

data/lib/ajax_pagination/version.rb

@@ -1,3 +1,3 @@
 module AjaxPagination
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/generators/ajax_pagination/assets_generator.rb

@@ -0,0 +1,37 @@
+require 'rails'
+require 'erb'
+
+# Supply generator for Rails 3.0.x or if asset pipeline is not enabled
+if true #::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
+  module AjaxPagination
+    module Generators
+      class AssetsGenerator < Rails::Generators::Base
+        source_root File.expand_path("../../../../",__FILE__)
+
+        desc "Fetches the ajax_pagination assets - javascript asset is processed based on current environment"
+
+        def js
+          jstemplate = ERB.new IO.read(File.expand_path("../../../assets/javascripts/ajax_pagination.js.erb",__FILE__))
+          
+          Dir.mkdir("public/javascripts") unless File.exists?("public/javascripts")
+
+          create_file "public/javascripts/ajax_pagination.js", jstemplate.result(binding)
+          copy_file "vendor/assets/javascripts/jquery.ba-bbq.js", "public/javascripts/jquery.ba-bbq.js"
+          copy_file "vendor/assets/javascripts/jquery.url.js", "public/javascripts/jquery.url.js"
+        end
+        def css
+          copy_file "lib/assets/stylesheets/ajax_pagination.css", "public/stylesheets/ajax_pagination.css"
+        end
+        def img
+          copy_file "lib/assets/images/ajax-loader.gif", "public/images/ajax-loader.gif"
+        end
+        private
+
+        def asset_path(filename)
+          "/images/" + filename
+        end
+      end
+    end
+  end
+end
+

data/spec/R30PORT

@@ -0,0 +1 @@
+3003

data/spec/ajax_pagination/integration/ajaxpaginate_spec.rb

@@ -1,68 +1,76 @@
 require 'spec_helper'
 
 describe 'paginating with javascript on', :js => true do
+  include Retryable
+
   def ajaxCount
     page.evaluate_script("document.getElementById('countajaxloading').innerHTML").to_i # using javascript to get content because selenium cannot get content of non-visible elements
   end
 
   it 'displays a loading image' do
-    # following 3 lines to warm up loading image
-    visit("http://localhost:#{SERVERSLOWPORT}") # goes to welcome page
-    sleep(3)
-    click_link 'Changelog'
-    sleep(3)
+    retry_exceptions do
+      # following 3 lines to warm up loading image
+      visit("http://localhost:#{SERVERSLOWPORT}") # goes to welcome page
+      sleep(3)
+      click_link 'Changelog'
+      sleep(3)
 
-    visit("http://localhost:#{SERVERSLOWPORT}") # goes to welcome page
-    page.should have_no_selector('.ajaxpagination-loader')
-    sleep(1.5)
-    click_link 'About'
-    page.should have_selector('.ajaxpagination-loader')
-    sleep(1.5)
-    page.should have_no_selector('.ajaxpagination-loader')
-    click_link 'Readme'
-    page.should have_selector('.ajaxpagination-loader')
-    sleep(1.5)
-    page.should have_no_selector('.ajaxpagination-loader')
+      visit("http://localhost:#{SERVERSLOWPORT}") # goes to welcome page
+      page.should have_no_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      click_link 'About'
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+      click_link 'Readme'
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+    end
   end
   it 'displays a loading image with nested and multiple paginated sections' do
-    visit("http://localhost:#{SERVERSLOWPORT}/changelog")
-    sleep(2)
-    page.should have_selector('#changelogpagetitle')
-    find('#_paginated_section').find('.next_page').click
-    page.should have_selector('.ajaxpagination-loader')
-    sleep(1.5)
-    page.should have_no_selector('.ajaxpagination-loader')
-    find('#signin').click
-    sleep(2)
-    visit("http://localhost:#{SERVERSLOWPORT}/posts")
-    sleep(2)
-    page.should have_selector('#postspagetitle')
-    find('#page_paginated_section').find('.next_page').click
-    page.should have_selector('.ajaxpagination-loader')
-    sleep(1.5)
-    page.should have_no_selector('.ajaxpagination-loader')
-    find('#upcomingpage_paginated_section').find('.next_page').click
-    page.should have_selector('.ajaxpagination-loader')
-    sleep(1.5)
-    page.should have_no_selector('.ajaxpagination-loader')
+    retry_exceptions do
+      visit("http://localhost:#{SERVERSLOWPORT}/changelog")
+      sleep(2)
+      page.should have_selector('#changelogpagetitle')
+      find('#_paginated_section').find('.next_page').click
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+      find('#signin').click
+      sleep(2)
+      visit("http://localhost:#{SERVERSLOWPORT}/posts")
+      sleep(2)
+      page.should have_selector('#postspagetitle')
+      find('#page_paginated_section').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
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+    end
   end
   it 'shows the configured loading image' do
-    # warmup images
-    visit("http://localhost:#{SERVERSLOWPORT}/changelog")
-    find('#page_paginated_section').find('.next_page').click
-    sleep(3)
-    visit("http://localhost:#{SERVERSLOWPORT}/posts")
-    find('#page_paginated_section').find('.next_page').click
-    sleep(3)
-
+    retry_exceptions do
+      # warmup images
+      visit("http://localhost:#{SERVERSLOWPORT}/changelog")
+      find('#page_paginated_section').find('.next_page').click
+      sleep(3)
+      visit("http://localhost:#{SERVERSLOWPORT}/posts")
+      find('#page_paginated_section').find('.next_page').click
+      sleep(3)
 
-    visit("http://localhost:#{SERVERSLOWPORT}/changelog")
-    find('#page_paginated_section').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
-    page.should have_xpath("//img[@class='ajaxpagination-loader' and @src = '/assets/ajax-loader.gif']")
+      visit("http://localhost:#{SERVERSLOWPORT}/changelog")
+      find('#page_paginated_section').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
+      page.should have_xpath("//img[@class='ajaxpagination-loader' and @src = '/assets/ajax-loader.gif']")
+    end
   end
   it 'works with browser back and forward buttons' do
     visit("http://localhost:#{SERVERPORT}/pages/about") # warmup serverport
@@ -156,31 +164,33 @@ describe 'paginating with javascript on', :js => true do
     page.current_url.should == myurl # url remains the same (so history has not changed)
   end
   it 'submits ajax_form_for form via POST and DELETE link' do
-    visit("http://localhost:#{SERVERPORT}")
-    find('#signin').click
-    click_link("Posts")
-    sleep(1)
-    page.should have_content("New Post")
-    myurl = page.current_url # to get the canonical url
-    visit("http://localhost:#{SERVERPORT}/posts/new")
-    sleep(1)
-    within("#new_post") do
-      fill_in 'Title', :with => 'very unique title for test'
-      fill_in 'Content', :with => 'my supercontent'
-    end
-    count = ajaxCount
-    click_button("Create Post");
-    sleep(2)
-    page.should have_content("Post was successfully created.")
-    ajaxCount.should == count + 1
-    page.current_url.should_not == myurl # means we have gotten redirected
+    retry_exceptions do
+      visit("http://localhost:#{SERVERPORT}")
+      find('#signin').click
+      click_link("Posts")
+      sleep(1)
+      page.should have_content("New Post")
+      myurl = page.current_url # to get the canonical url
+      visit("http://localhost:#{SERVERPORT}/posts/new")
+      sleep(1)
+      within("#new_post") do
+        fill_in 'Title', :with => 'very unique title for test'
+        fill_in 'Content', :with => 'my supercontent'
+      end
+      count = ajaxCount
+      click_button("Create Post");
+      sleep(2)
+      page.should have_content("Post was successfully created.")
+      ajaxCount.should == count + 1
+      page.current_url.should_not == myurl # means we have gotten redirected
 
-    count = ajaxCount
-    click_link("Destroy");
-    page.driver.browser.switch_to.alert.accept
-    sleep(2)
-    page.should have_content("Post destroyed.")
-    ajaxCount.should == count + 1
+      count = ajaxCount
+      click_link("Destroy");
+      page.driver.browser.switch_to.alert.accept
+      sleep(2)
+      page.should have_content("Post destroyed.")
+      ajaxCount.should == count + 1
+    end
   end
   ## This spec does not work in rbx on travis.
   ## Tested to work in rbx-1.2.4 on local machine. Also works using MRI ruby on travis.

data/spec/ajax_pagination/integration/rails30_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'rails3.0 support', :type => :request, :driver => :selenium do
+  include Retryable
+  it 'displays a loading image' do
+    retry_exceptions do
+      visit("http://localhost:#{R30SERVERPORT}") # goes to welcome page
+      page.should have_no_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      click_link 'About'
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+      click_link 'Readme'
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+      click_link 'Changelog'
+      sleep(2)
+      page.should have_selector('#changelogpagetitle')
+      find('#_paginated_section').find('.next_page').click
+      page.should have_selector('.ajaxpagination-loader')
+      sleep(1.5)
+      page.should have_no_selector('.ajaxpagination-loader')
+    end
+  end
+  it 'submits ajax_form_tag form via post' do
+    visit("http://localhost:#{R30SERVERPORT}/pages/about")
+    count = page.find("#submits").html.to_i
+    click_button("Submit")
+    sleep(1.5)
+    page.should have_content("#{count+1} submit")
+    page.should have_selector('#aboutpagetitle') # ensures loading was via AJAX Pagination
+  end
+end

data/spec/rails30_app/.gitignore

@@ -0,0 +1,8 @@
+.bundle
+db/schema.rb
+db/*.sqlite3
+!db/development.sqlite3
+tmp/
+log/*.log
+vendor
+

data/spec/rails30_app/Gemfile

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 3.0.0'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'json'
+
+gem 'jquery-rails'
+gem 'jquery-historyjs'
+gem 'will_paginate'
+gem 'ajax_pagination', :path => "../.."
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug' # requires MRI Ruby

data/spec/rails30_app/Gemfile.lock

@@ -0,0 +1,96 @@
+PATH
+  remote: ../..
+  specs:
+    ajax_pagination (0.5.1)
+      jquery-historyjs
+      jquery-rails (>= 1.0.17)
+      rails (>= 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.12)
+      actionpack (= 3.0.12)
+      mail (~> 2.2.19)
+    actionpack (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+    activesupport (3.0.12)
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    jquery-historyjs (0.2.3)
+      railties (>= 3.0)
+      thor (>= 0.14)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.5)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.12)
+      actionmailer (= 3.0.12)
+      actionpack (= 3.0.12)
+      activerecord (= 3.0.12)
+      activeresource (= 3.0.12)
+      activesupport (= 3.0.12)
+      bundler (~> 1.0)
+      railties (= 3.0.12)
+    railties (3.0.12)
+      actionpack (= 3.0.12)
+      activesupport (= 3.0.12)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.32)
+    will_paginate (3.0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ajax_pagination!
+  jquery-historyjs
+  jquery-rails
+  json
+  rails (~> 3.0.0)
+  will_paginate