presenting 1.0.0 → 2.0.0

data/test/grid_test.rb

@@ -58,7 +58,7 @@ class GridTest < Presenting::Test
     end
   end
   
-  def test_arrays_do_not_paginate
+  def test_arrays_will_not_paginate
     @g.presentable = []
     assert !@g.paginate?
   end
@@ -67,6 +67,21 @@ class GridTest < Presenting::Test
     @g.presentable = WillPaginate::Collection.new(1, 1)
     assert @g.paginate?
   end
+
+  def test_unpaged_relations_will_not_paginate
+    klass = Class.new(ActiveRecord::Base)
+    table = Arel::Table.new('users')
+    @g.presentable = ActiveRecord::Relation.new(klass, table)
+    assert !@g.paginate?
+  end
+
+  def test_paginated_relations_will_paginate
+    klass = Class.new(ActiveRecord::Base)
+    table = Arel::Table.new('users')
+    @g.presentable = ActiveRecord::Relation.new(klass, table).page(1)
+    assert @g.paginate?
+  end
+
 end
 
 class GridFieldTest < Presenting::Test
@@ -102,22 +117,27 @@ end
 
 class GridRenderTest < Presentation::RenderTest
   def setup
+    Rails.application.routes.draw do resources :users end
     @presentation = Presentation::Grid.new(:id => "users", :fields => [:name, :email])
     @records = [
       stub('user', :name => 'foo', :email => 'foo@example.com'),
       stub('user', :name => 'bar', :email => 'bar@example.com')
     ]
     @presentation.presentable = @records
-    @presentation.controller = TestController.new
+    @presentation.controller = ActionView::TestCase::TestController.new
     @presentation.controller.params = {:controller => 'users', :action => 'index'} # WillPaginate reuses existing params
   end
+  
+  def teardown
+    Rails.application.reload_routes!
+  end
 
   def test_rendering_the_title
     assert_select "#users table caption", 'Users'
   end
   
   def test_rendering_links
-    @presentation.links = ['<a href="/foo" class="foo">bar</a>']
+    @presentation.links = ['<a href="/foo" class="foo">bar</a>'.html_safe]
 
     assert_select '#users caption ul.actions' do
       assert_select 'li a.foo', 'bar'
@@ -125,8 +145,8 @@ class GridRenderTest < Presentation::RenderTest
   end
   
   def test_rendering_record_links
-    @presentation.record_links = [proc{|r| "<a href='/foo' class='record-link'>#{r.name}</a>"}]
-    
+    @presentation.record_links = [proc{|r| "<a href='/foo' class='record-link'>#{r.name}</a>".html_safe}]
+
     assert_select '#users tbody tr td ul.actions' do
       assert_select 'li a.record-link', 'foo'
       assert_select 'li a.record-link', 'bar'
@@ -209,10 +229,10 @@ class GridRenderTest < Presentation::RenderTest
   
   def test_rendering_a_sorted_column
     @presentation.fields.each{|f| f.sortable = true}
-    @presentation.controller.request.query_parameters = {"sort" => {'name' => 'desc'}}
-    
+    @presentation.controller.request.env['QUERY_STRING'] = 'sort[name]=desc'
+
     assert_select "#users thead" do
-      assert_select "th a.sortable[href='/?sort%5Bname%5D=asc']", "Name"
+      assert_select "th a.sortable[href='?sort[name]=asc']", "Name"
     end
   end
 end

data/test/helpers_test.rb

@@ -33,7 +33,7 @@ class Presenting::HelpersTest < ActionView::TestCase
   end
   
   def test_presenting_a_time
-    assert_equal 'Fri, 13 Feb 2009 02:31:00 -0800', present(Time.parse('02/13/2009 02:31 AM').to_time)
+    assert_equal 'Fri, 13 Feb 2009 02:31:00 +0000', present(Time.parse('02/13/2009 02:31 AM UTC').to_time)
   end
   
   def test_presenting_a_date
@@ -53,7 +53,7 @@ class Presenting::HelpersTest < ActionView::TestCase
   end
 
   def test_presenting_a_named_presentation
-    self.expects(:controller).returns(TestController.new)
+    self.expects(:controller).returns(ActionView::TestCase::TestController.new)
     Presentation::Grid.any_instance.expects(:render)
     present('hello', :grid)
   end

data/test/presenting_test.rb

@@ -6,7 +6,7 @@ class PresentationTest < Test::Unit::TestCase
     # TODO: create a "hello world" test-only setup so i can test rendering
     @p = Presentation::Grid.new(:id => "hello_world")
     @p.presentable = []
-    @p.controller = TestController.new
+    @p.controller = ActionView::TestCase::TestController.new
     assert_nothing_raised do
       assert @p.render
     end

data/test/r3/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.7'
+gem 'sqlite3'
+
+gem 'presenting', :path => File.dirname(__FILE__) + '/../../'
+gem 'will_paginate', '~>3.0.0'

data/test/r3/Gemfile.lock

@@ -0,0 +1,82 @@
+PATH
+  remote: /home/cainlevy/development/presenting
+  specs:
+    presenting (2.0.0rc3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.2)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+    will_paginate (3.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  presenting!
+  rails (= 3.0.7)
+  sqlite3
+  will_paginate (~> 3.0.0)

data/test/r3/config/application.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module R3
+  class Application < Rails::Application
+    config.encoding = "utf-8"
+    config.filter_parameters += [:password]
+  end
+end

data/test/r3/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/{rails → r3}/config/database.yml

@@ -1,5 +1,5 @@
 # SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+#   gem install sqlite3
 development:
   adapter: sqlite3
   database: db/development.sqlite3
@@ -15,3 +15,8 @@ test:
   pool: 5
   timeout: 5000
 
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/test/r3/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+R3::Application.initialize!

data/test/r3/config/environments/test.rb

@@ -0,0 +1,35 @@
+R3::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/r3/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run R3::Application