presenting 1.0.0 → 2.0.0

data/test/r3/public/javascripts/presenting/search.js

@@ -0,0 +1,13 @@
+$('.presentation-search .compact fieldset label').livequery(function() {
+  var label = $(this);
+  var field = label.siblings('input');
+  if (!field[0] || field.attr('type') == 'checkbox') return;
+  
+  label.addClass('overlabel');
+  
+  var hide_label = function() { label.css('text-indent', '-1000px') };
+  var show_label = function() { this.value || label.css('text-indent', '0px') };
+  
+  $(field).focus(hide_label).blur(show_label).each(hide_label).each(show_label);
+  $(label).click(function() {field.focus()});
+});

data/test/r3/public/stylesheets/presenting/details-color.css

@@ -0,0 +1,7 @@
+.presentation-details dt {
+  color: #444;
+}
+
+.presentation-details dd {
+  border-color: #888;
+}

data/test/r3/public/stylesheets/presenting/details.css

@@ -0,0 +1,10 @@
+.presentation-details dt {
+  font-weight: bold;
+}
+
+.presentation-details dd {
+  margin-left: 0;
+  padding-bottom: 0.5em;
+  border-bottom: 1px dotted;
+  margin-bottom: 0.5em;
+}

data/test/r3/public/stylesheets/presenting/form.css

@@ -0,0 +1 @@
+.presentation-form {}

data/test/r3/public/stylesheets/presenting/grid-color.css

@@ -0,0 +1,71 @@
+.presentation-grid a {
+  color: #06c;
+}
+
+.presentation-grid {
+  font-family: sans-serif;
+  background-color: #fff;
+}
+
+.presentation-grid caption {  
+  background-color: transparent;
+}
+
+.presentation-grid thead {
+  background-color: transparent;
+}
+
+.presentation-grid thead th {
+  border-bottom: 2px solid #aaa;
+  font-weight: normal;
+  color: #666;
+  background-color: transparent;
+}
+
+.presentation-grid tbody tr.even {
+  background-color: #e6f2ff;
+  border-bottom: 1px solid #c5dbf7;
+  border-top: 1px solid #c5dbf7;
+}
+
+.presentation-grid tbody td.sorted {
+  background-color: #f5f5f5;
+}
+
+.presentation-grid tbody tr.even td.sorted {
+  background-color: #c5dbf7;
+}
+
+.presentation-grid tfoot .pagination {
+  margin-top: 0.5em;
+}
+
+.presentation-grid tfoot .pagination a {
+  text-decoration: none;
+}
+
+.presentation-grid tfoot .pagination .prev_page,
+.presentation-grid tfoot .pagination .next_page {
+  padding: 0.1em 0.5em;
+  background-color: #eee;
+  border: 1px solid #e5e5e5;
+}
+
+.presentation-grid tfoot .pagination a.prev_page:hover,
+.presentation-grid tfoot .pagination a.next_page:hover {
+  background-color: #e6f2ff;
+  border-color: #c5dbf7;
+}
+
+.presentation-grid tfoot .pagination .prev_page {
+  margin-right: 0.7em;
+}
+
+.presentation-grid tfoot .pagination .next_page {
+  margin-left: 0.7em;
+}
+
+.presentation-grid tfoot .pagination .current {
+  padding: 0.1em 0.5em;
+  border: 1px solid #e5e5e5;
+}

data/test/r3/public/stylesheets/presenting/grid.css

@@ -0,0 +1,64 @@
+/** cellspacing **/
+.presentation-grid table,
+.presentation-grid td,
+.presentation-grid th {
+  border: 0;
+  border-collapse: collapse;
+}
+
+.presentation-grid table {
+  width: 100%;
+}
+
+.presentation-grid caption {
+  text-align: left;
+  font-weight: bold;
+  padding-left: 0.2em;
+}
+
+.presentation-grid th {
+  padding: 0.2em 0.5em 0em 0.2em;
+  text-align: left;
+  vertical-align: bottom;
+}
+
+.presentation-grid th a {
+  text-decoration: none;
+}
+
+.presentation-grid td {
+  padding: 0.4em 0.5em 0.4em 0.2em;
+  vertical-align: top;
+}
+
+.presentation-grid ul.actions {
+  overflow: auto;
+  zoom: 1;
+  float: right;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.presentation-grid ul.actions li {
+  float: left;
+}
+
+.presentation-grid ul.actions li a {
+  font-weight: normal;
+  display: block;
+  padding: 0em 0.3em;
+  text-decoration: none;
+}
+
+.presentation-grid ul.actions li a:hover {
+  text-decoration: underline;
+}
+
+.presentation-grid ul.actions li a {
+  outline: none;
+}
+
+.presentation-grid caption ul.actions {
+  margin-right: 0.5em;
+}

data/test/r3/public/stylesheets/presenting/search-color.css

@@ -0,0 +1,16 @@
+.presentation-search label {
+  color: #666;
+}
+
+.presentation-search fieldset {
+  border: 1px solid #c5dbf7;
+  background-color: #e6f2ff;
+  padding: 2px;
+}
+
+.presentation-search fieldset.submit {
+  border: 0px;
+  padding: 0px;
+  background-color: transparent;
+}
+

data/test/r3/public/stylesheets/presenting/search.css

@@ -0,0 +1,45 @@
+.presentation-search {
+  overflow: hidden;
+  zoom: 1;
+}
+
+.presentation-search fieldset {
+  border: 0;
+  margin: 0 0.5em 1em 0;
+  padding: 0;
+  float: left;
+  width: 145px;
+}
+
+.presentation-search fieldset label {
+  font-weight: normal;
+  margin: 0;
+  padding: 0;
+  text-transform: none;
+}
+
+.presentation-search fieldset input,
+.presentation-search fieldset select {
+  padding: 0px;
+  margin: 0px;
+}
+
+/* for overlabels (requires javascript) */
+
+.presentation-search .compact label {
+  display: inline;
+}
+
+.presentation-search .compact fieldset {
+  position: relative;
+  width: auto;
+}
+
+.presentation-search .compact fieldset label.overlabel {
+  display: block;
+  position: absolute;
+  top: 0.2em;
+  left: 0.5em;
+  z-index: 1;
+  cursor: text;
+}

data/test/search_conditions_test.rb

@@ -127,11 +127,11 @@ class SearchConditionsFieldTest < Presenting::Test
 
   def test_bind_with_typecast_to_date
     @f.type = :date
-    assert_equal Time.parse('Apr 20, 2009').to_date, @f.bind('Apr 20, 2009')
+    assert_equal Time.zone.parse('Apr 20, 2009').to_date, @f.bind('Apr 20, 2009')
   end
 
   def test_bind_with_typecast_to_time
     @f.type = :time
-    assert_equal Time.parse('Apr 20, 2009 11:00am'), @f.bind('Apr 20, 2009 11:00am')
+    assert_equal Time.zone.parse('Apr 20, 2009 11:00am'), @f.bind('Apr 20, 2009 11:00am')
   end
 end

data/test/search_test.rb

@@ -11,7 +11,7 @@ end
 class SearchRenderTest < Presentation::RenderTest
   def setup
     @presentation = Presentation::Search.new
-    @presentation.controller = TestController.new
+    @presentation.controller = ActionView::TestCase::TestController.new
     @presentation.controller.request.path = '/users'
   end
   

data/test/test_helper.rb

@@ -1,44 +1,13 @@
-ENV["RAILS_ENV"] = "test"
-
-# load the support libraries
-require 'test/unit'
+# bootstrap
 require 'rubygems'
-gem 'rails', '2.3.11'
-require 'active_support'
-require 'action_pack'
-require 'action_controller'
-require 'action_view'
+require 'test/unit'
 require 'mocha'
-require 'will_paginate'
-WillPaginate.enable_actionpack
-
-PLUGIN_ROOT = File.join(File.dirname(__FILE__), '..')
-
-# prepare for autoloading
-ActiveSupport::Dependencies.autoload_paths << File.join(PLUGIN_ROOT, 'lib')
-$LOAD_PATH.unshift File.join(PLUGIN_ROOT, 'lib')
-ActionController::Base.view_paths << File.join(PLUGIN_ROOT, 'app', 'views')
-ActiveSupport::Dependencies.autoload_paths << File.join(PLUGIN_ROOT, 'app', 'controllers')
-$LOAD_PATH.unshift File.join(PLUGIN_ROOT, 'app', 'controllers')
 
-# set up the asset routes, and an extra resource for tests that generate normal routes
-require File.join(PLUGIN_ROOT, 'config', 'routes')
-ActionController::Routing::Routes.draw do |map| map.resources :users end
-
-# load the code
-require 'rails/init'
-
-class TestController < ActionController::Base
-  attr_accessor :request, :response, :params
-
-  def initialize
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-    
-    @params = {}
-    send(:initialize_current_url)
-  end
-end
+# load the test app, which will load gems
+ENV['RAILS_ENV'] = 'test'
+require File.join(File.dirname(__FILE__), 'r3', 'config', 'environment.rb')
+require 'rails/test_help'
+Rails.backtrace_cleaner.remove_silencers!
 
 # a way to customize syntax for our tests
 class Presenting::Test < Test::Unit::TestCase
@@ -48,7 +17,7 @@ end
 
 # inheriting tests should target rendering behavior given certain configurations
 class Presentation::RenderTest < Presenting::Test
-  include ActionController::Assertions::SelectorAssertions
+  include ActionDispatch::Assertions::SelectorAssertions
 
   protected
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: presenting
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
   - 0
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Lance Ivy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 -07:00
+date: 2011-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/presenting/sanitize.rb
 - lib/presenting/configurable.rb
 - lib/presenting/defaults.rb
+- lib/presenting/engine.rb
 - lib/presenting/attribute.rb
 - lib/presentation/form.rb
 - lib/presentation/base.rb
@@ -63,8 +64,8 @@ files:
 - app/views/presentations/_form.erb
 - app/views/presentations/_search.erb
 - app/views/presentations/_field_search.erb
-- app/assets/javascript/search.js
-- app/assets/javascript/grid.js
+- app/assets/javascripts/search.js
+- app/assets/javascripts/grid.js
 - app/assets/stylesheets/search-color.css
 - app/assets/stylesheets/grid.css
 - app/assets/stylesheets/grid-color.css
@@ -76,7 +77,6 @@ files:
 - LICENSE
 - README
 - Rakefile
-- rails/init.rb
 - config/routes.rb
 - test/test_helper.rb
 - test/field_set_test.rb
@@ -88,46 +88,29 @@ files:
 - test/attribute_test.rb
 - test/sanitize_test.rb
 - test/search_conditions_test.rb
-- test/rails/script/generate
-- test/rails/script/console
-- test/rails/script/destroy
-- test/rails/script/dbconsole
-- test/rails/script/plugin
-- test/rails/script/server
-- test/rails/script/runner
-- test/rails/app/views/layouts/application.html.erb
-- test/rails/app/views/users/new.html.erb
-- test/rails/app/views/users/index.html.erb
-- test/rails/app/views/users/show.html.erb
-- test/rails/app/helpers/users_helper.rb
-- test/rails/app/helpers/application_helper.rb
-- test/rails/app/controllers/users_controller.rb
-- test/rails/app/controllers/application_controller.rb
-- test/rails/app/models/user.rb
-- test/rails/log/development.log
-- test/rails/db/schema.rb
-- test/rails/db/development.sqlite3
-- test/rails/db/migrate/20090213085444_create_users.rb
-- test/rails/db/migrate/20090213085607_populate_users.rb
-- test/rails/db/test.sqlite3
-- test/rails/config/environment.rb
-- test/rails/config/locales/en.yml
-- test/rails/config/database.yml
-- test/rails/config/boot.rb
-- test/rails/config/environments/production.rb
-- test/rails/config/environments/development.rb
-- test/rails/config/environments/test.rb
-- test/rails/config/routes.rb
-- test/rails/public/javascripts/application.js
-- test/rails/public/javascripts/jquery.livequery.min.js
-- test/rails/public/javascripts/prototype.js
-- test/rails/public/422.html
-- test/rails/public/404.html
-- test/rails/public/500.html
 - test/form_test.rb
 - test/configurable_test.rb
 - test/presenting_test.rb
 - test/helpers_test.rb
+- test/r3/Gemfile.lock
+- test/r3/log/test.log
+- test/r3/Gemfile
+- test/r3/config.ru
+- test/r3/db/test.sqlite3
+- test/r3/config/environment.rb
+- test/r3/config/application.rb
+- test/r3/config/database.yml
+- test/r3/config/boot.rb
+- test/r3/config/environments/test.rb
+- test/r3/public/javascripts/presenting/search.js
+- test/r3/public/javascripts/presenting/grid.js
+- test/r3/public/stylesheets/presenting/search-color.css
+- test/r3/public/stylesheets/presenting/grid.css
+- test/r3/public/stylesheets/presenting/grid-color.css
+- test/r3/public/stylesheets/presenting/search.css
+- test/r3/public/stylesheets/presenting/details.css
+- test/r3/public/stylesheets/presenting/details-color.css
+- test/r3/public/stylesheets/presenting/form.css
 - test/search_test.rb
 has_rdoc: true
 homepage: http://github.com/cainlevy/presenting
@@ -174,44 +157,27 @@ test_files:
 - test/attribute_test.rb
 - test/sanitize_test.rb
 - test/search_conditions_test.rb
-- test/rails/script/generate
-- test/rails/script/console
-- test/rails/script/destroy
-- test/rails/script/dbconsole
-- test/rails/script/plugin
-- test/rails/script/server
-- test/rails/script/runner
-- test/rails/app/views/layouts/application.html.erb
-- test/rails/app/views/users/new.html.erb
-- test/rails/app/views/users/index.html.erb
-- test/rails/app/views/users/show.html.erb
-- test/rails/app/helpers/users_helper.rb
-- test/rails/app/helpers/application_helper.rb
-- test/rails/app/controllers/users_controller.rb
-- test/rails/app/controllers/application_controller.rb
-- test/rails/app/models/user.rb
-- test/rails/log/development.log
-- test/rails/db/schema.rb
-- test/rails/db/development.sqlite3
-- test/rails/db/migrate/20090213085444_create_users.rb
-- test/rails/db/migrate/20090213085607_populate_users.rb
-- test/rails/db/test.sqlite3
-- test/rails/config/environment.rb
-- test/rails/config/locales/en.yml
-- test/rails/config/database.yml
-- test/rails/config/boot.rb
-- test/rails/config/environments/production.rb
-- test/rails/config/environments/development.rb
-- test/rails/config/environments/test.rb
-- test/rails/config/routes.rb
-- test/rails/public/javascripts/application.js
-- test/rails/public/javascripts/jquery.livequery.min.js
-- test/rails/public/javascripts/prototype.js
-- test/rails/public/422.html
-- test/rails/public/404.html
-- test/rails/public/500.html
 - test/form_test.rb
 - test/configurable_test.rb
 - test/presenting_test.rb
 - test/helpers_test.rb
+- test/r3/Gemfile.lock
+- test/r3/log/test.log
+- test/r3/Gemfile
+- test/r3/config.ru
+- test/r3/db/test.sqlite3
+- test/r3/config/environment.rb
+- test/r3/config/application.rb
+- test/r3/config/database.yml
+- test/r3/config/boot.rb
+- test/r3/config/environments/test.rb
+- test/r3/public/javascripts/presenting/search.js
+- test/r3/public/javascripts/presenting/grid.js
+- test/r3/public/stylesheets/presenting/search-color.css
+- test/r3/public/stylesheets/presenting/grid.css
+- test/r3/public/stylesheets/presenting/grid-color.css
+- test/r3/public/stylesheets/presenting/search.css
+- test/r3/public/stylesheets/presenting/details.css
+- test/r3/public/stylesheets/presenting/details-color.css
+- test/r3/public/stylesheets/presenting/form.css
 - test/search_test.rb

data/rails/init.rb

@@ -1,12 +0,0 @@
-ActionView::Base.class_eval { include Presenting::Helpers }
-ActionController::Base.const_set(:Search, Presenting::Search)
-ActionController::Base.const_set(:Sorting, Presenting::Sorting)
-ActionView::Helpers::FormBuilder.class_eval { include Presenting::FormHelpers }
-
-if defined? Rails # because tests don't define the Rails module
-  if Rails.version.match(/^2\.2/)
-    ActionController::Base.view_paths << File.join(File.dirname(__FILE__), 'app', 'views')
-    ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__) + '/app/controllers'
-    $LOAD_PATH.unshift File.dirname(__FILE__) + '/app/controllers/'
-  end
-end

data/test/rails/app/controllers/application_controller.rb

@@ -1,15 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-
-  # See ActionController::RequestForgeryProtection for details
-  # Uncomment the :secret if you're not using the cookie session store
-  protect_from_forgery # :secret => '0ede37e7d2f6d8445f151b0a38ee0539'
-  
-  # See ActionController::Base for details 
-  # Uncomment this to filter the contents of submitted sensitive data parameters
-  # from your application log (in this case, all fields with names like "password"). 
-  # filter_parameter_logging :password
-end

data/test/rails/app/controllers/users_controller.rb

@@ -1,36 +0,0 @@
-class UsersController < ApplicationController
-  def index
-    @users = User.paginate(
-      :page => params[:page],
-      :per_page => 2,
-      :conditions => Presenting::Search.new(:fields => {
-        'first_name' => :equals,
-        'last_name' => :begins_with,
-        'email' => :not_null
-      }).to_sql(params[:search], :field),
-      :order => Presenting::Sorting.new(:fields => [
-        :prefix,
-        :first_name,
-        :last_name,
-        :email
-      ]).to_sql(params[:sort])
-    )
-  end
-  
-  def new
-    @user = User.new
-  end
-  
-  def create
-    @user = User.new(params[:user])
-    @user.save!
-    
-    redirect_to users_path
-  rescue ActiveRecord::RecordInvalid
-    render :action => :new
-  end
-  
-  def show
-    @user = User.find(params[:id])
-  end
-end

data/test/rails/app/helpers/application_helper.rb

@@ -1,3 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-module ApplicationHelper
-end

data/test/rails/app/helpers/users_helper.rb

@@ -1,2 +0,0 @@
-module UsersHelper
-end

data/test/rails/app/models/user.rb

@@ -1,2 +0,0 @@
-class User < ActiveRecord::Base
-end

data/test/rails/app/views/layouts/application.html.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Demo Application</title>
-    <%= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js" %>
-    <%= javascript_include_tag 'jquery.livequery.min' %>
-    <%= presentation_stylesheets('grid', 'search', 'details', 'grid-color', 'search-color', 'details-color') %>
-    <%= presentation_javascript('search') %>
-  <head>
-  <body>
-    <%= yield %>
-  </body>
-</html>
-

data/test/rails/app/views/users/index.html.erb

@@ -1,10 +0,0 @@
-<%= present :field_search, :fields => [:first_name, :last_name, {:email => :checkbox}] %>
-<%= present @users, :grid, :id => "users",
-  :fields => [:prefix, :first_name, :last_name, :email],
-  :links => [link_to('add', new_user_path)],
-  :record_links => [
-    proc{|r| link_to 'edit', edit_user_path(r)},
-    proc{|r| link_to 'delete', user_path(r), :method => :destroy},
-    proc{|r| link_to 'show', user_path(r)}
-  ]
-%>

data/test/rails/app/views/users/new.html.erb

@@ -1,2 +0,0 @@
-<h2>New User</h2>
-<%= present @user, :form, :groups => [{"Name" => [:prefix, :first_name, :last_name]}, [:email]] %>

data/test/rails/app/views/users/show.html.erb

@@ -1 +0,0 @@
-<%= present @user, :details, :title => "User ##{@user.id}", :fields => [:prefix, :first_name, :last_name, :email] %>