From b0ea3a941db3aabd77136b40cf89a598686d0c6d Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 13:12:35 -0400 Subject: [PATCH 01/54] rails gem dependency --- Rakefile | 19 ------------------- VERSION | 1 - clearance.gemspec | 2 ++ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 VERSION diff --git a/Rakefile b/Rakefile index ef197c64d..ca3967169 100644 --- a/Rakefile +++ b/Rakefile @@ -81,22 +81,3 @@ end desc "Run the test suite" task :default => ['test:basic', 'test:features', 'test:views', 'test:features_for_views'] - -require 'jeweler' - -Jeweler::Tasks.new do |gem| - gem.name = "clearance" - gem.summary = "Rails authentication with email & password." - gem.description = "Rails authentication with email & password." - gem.email = "support@thoughtbot.com" - gem.homepage = "http://github.com/thoughtbot/clearance" - gem.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", - "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", - "Josh Nichols", "Mike Breen", "Marcel Görner", - "Bence Nagy", "Ben Mabey", "Eloy Duran", - "Tim Pope", "Mihai Anca", "Mark Cornick", - "Shay Arnett", "Jon Yurek", "Chad Pytel"] - gem.files = FileList["[A-Z]*", "{app,config,lib,shoulda_macros,rails}/**/*"] -end - -Jeweler::GemcutterTasks.new diff --git a/VERSION b/VERSION deleted file mode 100644 index ac39a106c..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.9.0 diff --git a/clearance.gemspec b/clearance.gemspec index 6bd37a0b6..8a04dbf8f 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -110,6 +110,8 @@ Gem::Specification.new do |s| "test/test_helper.rb" ] + s.add_dependency('rails', '~>3.0.0.beta4') + if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 3 From 01f0f39079a048624af050441ada8b5adf9318f2 Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 13:13:15 -0400 Subject: [PATCH 02/54] remove reference to VERSION --- clearance.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/clearance.gemspec b/clearance.gemspec index 8a04dbf8f..94b68bfff 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -21,7 +21,6 @@ Gem::Specification.new do |s| "LICENSE", "README.md", "Rakefile", - "VERSION", "app/controllers/clearance/confirmations_controller.rb", "app/controllers/clearance/passwords_controller.rb", "app/controllers/clearance/sessions_controller.rb", From 3cc39c319b8d45c7fe025e7251d79ddb69c6f269 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:11:12 -0400 Subject: [PATCH 03/54] Remove clearance symlink and update gitignore --- .gitignore | 1 + test/rails_root/vendor/plugins/clearance | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 test/rails_root/vendor/plugins/clearance diff --git a/.gitignore b/.gitignore index 63da136f2..8d9c9f660 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ test/rails_root/db/* test/rails_root/app/views/passwords test/rails_root/app/views/sessions test/rails_root/app/views/users +test/rails_root/vendor/plugins/clearance diff --git a/test/rails_root/vendor/plugins/clearance b/test/rails_root/vendor/plugins/clearance deleted file mode 120000 index ce5c7face..000000000 --- a/test/rails_root/vendor/plugins/clearance +++ /dev/null @@ -1 +0,0 @@ -/Users/cpytel/projects/clearance \ No newline at end of file From fb846a4eb87fdce8ae405f100bff8b0e3801581c Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:19:01 -0400 Subject: [PATCH 04/54] Ignore generated features in test Rails app --- .gitignore | 6 + .../features/password_reset.feature | 33 ----- test/rails_root/features/sign_in.feature | 35 ----- test/rails_root/features/sign_out.feature | 15 -- test/rails_root/features/sign_up.feature | 45 ------ .../step_definitions/clearance_steps.rb | 130 ------------------ 6 files changed, 6 insertions(+), 258 deletions(-) delete mode 100644 test/rails_root/features/password_reset.feature delete mode 100644 test/rails_root/features/sign_in.feature delete mode 100644 test/rails_root/features/sign_out.feature delete mode 100644 test/rails_root/features/sign_up.feature delete mode 100644 test/rails_root/features/step_definitions/clearance_steps.rb diff --git a/.gitignore b/.gitignore index 8d9c9f660..d20f7d23a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,9 @@ test/rails_root/app/views/passwords test/rails_root/app/views/sessions test/rails_root/app/views/users test/rails_root/vendor/plugins/clearance +test/rails_root/features/*.feature +test/rails_root/features/password_reset.feature +test/rails_root/features/sign_in.feature +test/rails_root/features/sign_out.feature +test/rails_root/features/sign_up.feature +test/rails_root/features/step_definitions/clearance_steps.rb diff --git a/test/rails_root/features/password_reset.feature b/test/rails_root/features/password_reset.feature deleted file mode 100644 index 4dceaa6ed..000000000 --- a/test/rails_root/features/password_reset.feature +++ /dev/null @@ -1,33 +0,0 @@ -Feature: Password reset - In order to sign in even if user forgot their password - A user - Should be able to reset it - - Scenario: User is not signed up - Given no user exists with an email of "email@person.com" - When I request password reset link to be sent to "email@person.com" - Then I should see "Unknown email" - - Scenario: User is signed up and requests password reset - Given I signed up with "email@person.com/password" - When I request password reset link to be sent to "email@person.com" - Then I should see "instructions for changing your password" - And a password reset message should be sent to "email@person.com" - - Scenario: User is signed up updated his password and types wrong confirmation - Given I signed up with "email@person.com/password" - When I follow the password reset link sent to "email@person.com" - And I update my password with "newpassword/wrongconfirmation" - Then I should see an error message - And I should be signed out - - Scenario: User is signed up and updates his password - Given I signed up with "email@person.com/password" - When I follow the password reset link sent to "email@person.com" - And I update my password with "newpassword/newpassword" - Then I should be signed in - When I sign out - Then I should be signed out - And I sign in as "email@person.com/newpassword" - Then I should be signed in - diff --git a/test/rails_root/features/sign_in.feature b/test/rails_root/features/sign_in.feature deleted file mode 100644 index ab8dbf6fa..000000000 --- a/test/rails_root/features/sign_in.feature +++ /dev/null @@ -1,35 +0,0 @@ -Feature: Sign in - In order to get access to protected sections of the site - A user - Should be able to sign in - - Scenario: User is not signed up - Given no user exists with an email of "email@person.com" - When I go to the sign in page - And I sign in as "email@person.com/password" - Then I should see "Bad email or password" - And I should be signed out - - Scenario: User is not confirmed - Given I signed up with "email@person.com/password" - When I go to the sign in page - And I sign in as "email@person.com/password" - Then I should see "User has not confirmed email" - And I should be signed out - - Scenario: User enters wrong password - Given I am signed up and confirmed as "email@person.com/password" - When I go to the sign in page - And I sign in as "email@person.com/wrongpassword" - Then I should see "Bad email or password" - And I should be signed out - - Scenario: User signs in successfully - Given I am signed up and confirmed as "email@person.com/password" - When I go to the sign in page - And I sign in as "email@person.com/password" - Then I should see "Signed in" - And I should be signed in - When I return next time - Then I should be signed in - diff --git a/test/rails_root/features/sign_out.feature b/test/rails_root/features/sign_out.feature deleted file mode 100644 index 8789d97a1..000000000 --- a/test/rails_root/features/sign_out.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: Sign out - To protect my account from unauthorized access - A signed in user - Should be able to sign out - - Scenario: User signs out - Given I am signed up and confirmed as "email@person.com/password" - When I sign in as "email@person.com/password" - Then I should be signed in - And I sign out - Then I should see "Signed out" - And I should be signed out - When I return next time - Then I should be signed out - diff --git a/test/rails_root/features/sign_up.feature b/test/rails_root/features/sign_up.feature deleted file mode 100644 index 4368d5df5..000000000 --- a/test/rails_root/features/sign_up.feature +++ /dev/null @@ -1,45 +0,0 @@ -Feature: Sign up - In order to get access to protected sections of the site - A user - Should be able to sign up - - Scenario: User signs up with invalid data - When I go to the sign up page - And I fill in "Email" with "invalidemail" - And I fill in "Password" with "password" - And I fill in "Confirm password" with "" - And I press "Sign up" - Then I should see error messages - - Scenario: User signs up with valid data - When I go to the sign up page - And I fill in "Email" with "email@person.com" - And I fill in "Password" with "password" - And I fill in "Confirm password" with "password" - And I press "Sign up" - Then I should see "instructions for confirming" - And a confirmation message should be sent to "email@person.com" - - Scenario: User confirms his account - Given I signed up with "email@person.com/password" - When I follow the confirmation link sent to "email@person.com" - Then I should see "Confirmed email and signed in" - And I should be signed in - - Scenario: Signed in user clicks confirmation link again - Given I signed up with "email@person.com/password" - When I follow the confirmation link sent to "email@person.com" - Then I should be signed in - When I follow the confirmation link sent to "email@person.com" - Then I should see "Confirmed email and signed in" - And I should be signed in - - Scenario: Signed out user clicks confirmation link again - Given I signed up with "email@person.com/password" - When I follow the confirmation link sent to "email@person.com" - Then I should be signed in - When I sign out - And I follow the confirmation link sent to "email@person.com" - Then I should see "Already confirmed email. Please sign in." - And I should be signed out - diff --git a/test/rails_root/features/step_definitions/clearance_steps.rb b/test/rails_root/features/step_definitions/clearance_steps.rb deleted file mode 100644 index fe025cd9b..000000000 --- a/test/rails_root/features/step_definitions/clearance_steps.rb +++ /dev/null @@ -1,130 +0,0 @@ -# General - -Then /^I should see error messages$/ do - Then %{I should see "errors prohibited"} -end - -Then /^I should see an error message$/ do - Then %{I should see "error prohibited"} -end - -# Database - -Given /^no user exists with an email of "(.*)"$/ do |email| - assert_nil User.find_by_email(email) -end - -Given /^I signed up with "(.*)\/(.*)"$/ do |email, password| - user = Factory :user, - :email => email, - :password => password, - :password_confirmation => password -end - -Given /^I am signed up and confirmed as "(.*)\/(.*)"$/ do |email, password| - user = Factory :email_confirmed_user, - :email => email, - :password => password, - :password_confirmation => password -end - -# Session - -Then /^I should be signed in$/ do - Given %{I am on the homepage} - Then %{I should see "Sign out"} -end - -Then /^I should be signed out$/ do - Given %{I am on the homepage} - Then %{I should see "Sign in"} -end - -When /^session is cleared$/ do - # TODO: This doesn't work with Capybara - # TODO: I tried Capybara.reset_sessions! but that didn't work - #request.reset_session - #controller.instance_variable_set(:@_current_user, nil) -end - -Given /^I have signed in with "(.*)\/(.*)"$/ do |email, password| - Given %{I am signed up and confirmed as "#{email}/#{password}"} - And %{I sign in as "#{email}/#{password}"} -end - -# Emails - -Then /^a confirmation message should be sent to "(.*)"$/ do |email| - user = User.find_by_email(email) - assert !user.confirmation_token.blank? - assert !ActionMailer::Base.deliveries.empty? - result = ActionMailer::Base.deliveries.any? do |email| - email.to == [user.email] && - email.subject =~ /confirm/i && - email.body =~ /#{user.confirmation_token}/ - end - assert result -end - -When /^I follow the confirmation link sent to "(.*)"$/ do |email| - user = User.find_by_email(email) - visit new_user_confirmation_path(:user_id => user, - :token => user.confirmation_token) -end - -Then /^a password reset message should be sent to "(.*)"$/ do |email| - user = User.find_by_email(email) - assert !user.confirmation_token.blank? - assert !ActionMailer::Base.deliveries.empty? - result = ActionMailer::Base.deliveries.any? do |email| - email.to == [user.email] && - email.subject =~ /password/i && - email.body =~ /#{user.confirmation_token}/ - end - assert result -end - -When /^I follow the password reset link sent to "(.*)"$/ do |email| - user = User.find_by_email(email) - visit edit_user_password_path(:user_id => user, - :token => user.confirmation_token) -end - -When /^I try to change the password of "(.*)" without token$/ do |email| - user = User.find_by_email(email) - visit edit_user_password_path(:user_id => user) -end - -Then /^I should be forbidden$/ do - assert_response :forbidden -end - -# Actions - -When /^I sign in as "(.*)\/(.*)"$/ do |email, password| - When %{I go to the sign in page} - And %{I fill in "Email" with "#{email}"} - And %{I fill in "Password" with "#{password}"} - And %{I press "Sign in"} -end - -When /^I sign out$/ do - visit '/sign_out' -end - -When /^I request password reset link to be sent to "(.*)"$/ do |email| - When %{I go to the password reset request page} - And %{I fill in "Email address" with "#{email}"} - And %{I press "Reset password"} -end - -When /^I update my password with "(.*)\/(.*)"$/ do |password, confirmation| - And %{I fill in "Choose password" with "#{password}"} - And %{I fill in "Confirm password" with "#{confirmation}"} - And %{I press "Save this password"} -end - -When /^I return next time$/ do - When %{session is cleared} - And %{I go to the homepage} -end From 61329bda896cd1b11fd239363324596a73cc21ef Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 13:21:25 -0400 Subject: [PATCH 05/54] bundle install --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index ca3967169..893e635a3 100644 --- a/Rakefile +++ b/Rakefile @@ -64,7 +64,7 @@ namespace :generator do desc "Run the clearance generator" task :clearance do - system "cd test/rails_root && ./script/rails generate clearance && rake db:migrate db:test:prepare" + system "cd test/rails_root && bundle install && ./script/rails generate clearance && rake db:migrate db:test:prepare" end desc "Run the clearance features generator" From 0b038f689ce249a4b15cefd63cd090e0c88e11b5 Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 13:22:33 -0400 Subject: [PATCH 06/54] remove unused generators variable --- Rakefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rakefile b/Rakefile index 893e635a3..2bc21d040 100644 --- a/Rakefile +++ b/Rakefile @@ -41,8 +41,6 @@ namespace :test do end end -generators = %w(clearance clearance_features clearance_views) - namespace :generator do desc "Cleans up the test app before running the generator" task :cleanup do From 22d73ed16099fb96b9d4773da41b9542cedb7891 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:25:19 -0400 Subject: [PATCH 07/54] Use allow_value matcher --- test/models/user_test.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 0dd3cba20..e9ed0b565 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -11,9 +11,9 @@ class UserTest < ActiveSupport::TestCase context "When signing up" do should_validate_presence_of :email, :password - should_allow_values_for :email, "foo@example.com" - should_not_allow_values_for :email, "foo" - should_not_allow_values_for :email, "example.com" + should allow_value("foo@example.com").for(:email) + should_not allow_value("foo").for(:email) + should_not allow_value("example.com").for(:email) should "require password confirmation on create" do user = Factory.build(:user, :password => 'blah', @@ -239,7 +239,8 @@ def email_optional? subject { @user } - should_allow_values_for :email, nil, "" + should allow_value(nil).for(:email) + should allow_value("").for(:email) end context "a user with an optional password" do @@ -254,7 +255,8 @@ def password_optional? subject { @user } - should_allow_values_for :password, nil, "" + should allow_value(nil).for(:password) + should allow_value("").for(:password) end end From 869c12095debe33572be78097f0355110f04158b Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:27:16 -0400 Subject: [PATCH 08/54] Use have_db_index matcher --- test/models/user_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index e9ed0b565..30c9dc401 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -4,8 +4,8 @@ class UserTest < ActiveSupport::TestCase # db - should_have_db_index(:email) - should_have_db_index(:remember_token) + should have_db_index(:email) + should have_db_index(:remember_token) # signing up From 60a8bcae8ea5ab5f4dd801a04e93b046fcc7b918 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:37:23 -0400 Subject: [PATCH 09/54] Use respond_to matcher --- shoulda_macros/clearance.rb | 18 +++++------------- test/controllers/sessions_controller_test.rb | 6 +++--- test/controllers/users_controller_test.rb | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/shoulda_macros/clearance.rb b/shoulda_macros/clearance.rb index 99de34410..d4309d6fe 100644 --- a/shoulda_macros/clearance.rb +++ b/shoulda_macros/clearance.rb @@ -54,7 +54,7 @@ def should_deny_access(opts = {}) should_not_set_the_flash end - should_redirect_to('sign in page') { sign_in_url } + should redirect_to('sign in page') { sign_in_url } end # HTTP FLUENCY @@ -117,27 +117,19 @@ def should_render_nothing # REDIRECTS def should_redirect_to_url_after_create - should_redirect_to("the post-create url") do - @controller.send(:url_after_create) - end + should redirect_to("the post-create url") { @controller.send(:url_after_create) } end def should_redirect_to_url_after_update - should_redirect_to("the post-update url") do - @controller.send(:url_after_update) - end + should redirect_to("the post-update url") { @controller.send(:url_after_update) } end def should_redirect_to_url_after_destroy - should_redirect_to("the post-destroy url") do - @controller.send(:url_after_destroy) - end + should redirect_to("the post-destroy url") { @controller.send(:url_after_destroy) } end def should_redirect_to_url_already_confirmed - should_redirect_to("the already confirmed url") do - @controller.send(:url_already_confirmed) - end + should redirect_to("the already confirmed url") { @controller.send(:url_already_confirmed) } end # VALIDATIONS diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index 040eb7ef1..74adb9f5c 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -104,7 +104,7 @@ class SessionsControllerTest < ActionController::TestCase :password => @user.password } end - should_redirect_to("the return URL") { @return_url } + should redirect_to("the return URL") { @return_url } end context "on POST to #create with good credentials and a request return url" do @@ -117,7 +117,7 @@ class SessionsControllerTest < ActionController::TestCase :return_to => @return_url end - should_redirect_to("the return URL") { @return_url } + should redirect_to("the return URL") { @return_url } end context "on POST to #create with good credentials and a session return url and request return url" do @@ -131,7 +131,7 @@ class SessionsControllerTest < ActionController::TestCase :return_to => '/url_in_the_request' end - should_redirect_to("the return URL") { @return_url } + should redirect_to("the return URL") { @return_url } end context "on POST to #create with bad credentials" do diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 1ac740227..3748e7824 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -57,12 +57,12 @@ class UsersControllerTest < ActionController::TestCase signed_in_user_context do context "GET to new" do setup { get :new } - should_redirect_to("the home page") { root_url } + should redirect_to("the home page") { root_url } end context "POST to create" do setup { post :create, :user => {} } - should_redirect_to("the home page") { root_url } + should redirect_to("the home page") { root_url } end end From f8d5d7306ddf1c124fc59fc02ab282007051dca0 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:42:45 -0400 Subject: [PATCH 10/54] Use render_template matcher --- test/controllers/passwords_controller_test.rb | 8 ++++---- test/controllers/sessions_controller_test.rb | 4 ++-- test/controllers/users_controller_test.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index 17c7f20ec..a07938241 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -16,7 +16,7 @@ class PasswordsControllerTest < ActionController::TestCase setup { get :new, :user_id => @user.to_param } should_respond_with :success - should_render_template "new" + should render_template(:new) end context "on POST to #create" do @@ -64,7 +64,7 @@ class PasswordsControllerTest < ActionController::TestCase assert_match /unknown email/i, flash.now[:failure] end - should_render_template :new + should render_template(:new) end end end @@ -86,7 +86,7 @@ class PasswordsControllerTest < ActionController::TestCase end should_respond_with :success - should_render_template "edit" + should render_template(:edit) should_display_a_password_update_form end @@ -158,7 +158,7 @@ class PasswordsControllerTest < ActionController::TestCase should_not_be_signed_in should_not_set_the_flash should_respond_with :success - should_render_template :edit + should render_template(:edit) should_display_a_password_update_form end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index 74adb9f5c..592adb825 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -9,7 +9,7 @@ class SessionsControllerTest < ActionController::TestCase setup { get :new } should_respond_with :success - should_render_template :new + should render_template(:new) should_not_set_the_flash should_display_a_sign_in_form end @@ -143,7 +143,7 @@ class SessionsControllerTest < ActionController::TestCase should_set_the_flash_to /bad/i should_respond_with :unauthorized - should_render_template :new + should render_template(:new) should_not_be_signed_in should 'not create the cookie' do diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 3748e7824..53db922f9 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -13,7 +13,7 @@ class UsersControllerTest < ActionController::TestCase setup { get :new } should_respond_with :success - should_render_template :new + should render_template(:new) should_not_set_the_flash should_display_a_sign_up_form From 5c118ed13dbc8a9de618e543ef0d84efe93616a0 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:49:18 -0400 Subject: [PATCH 11/54] Use set_the_flash matcher --- shoulda_macros/clearance.rb | 6 +++--- test/controllers/confirmations_controller_test.rb | 10 +++++----- test/controllers/passwords_controller_test.rb | 6 +++--- test/controllers/sessions_controller_test.rb | 10 +++++----- test/controllers/users_controller_test.rb | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/shoulda_macros/clearance.rb b/shoulda_macros/clearance.rb index d4309d6fe..a54430ec6 100644 --- a/shoulda_macros/clearance.rb +++ b/shoulda_macros/clearance.rb @@ -49,9 +49,9 @@ def should_deny_access_on(http_method, action, opts = {}) def should_deny_access(opts = {}) if opts[:flash] - should_set_the_flash_to opts[:flash] + should set_the_flash.to(opts[:flash]) else - should_not_set_the_flash + should_not set_the_flash end should redirect_to('sign in page') { sign_in_url } @@ -102,7 +102,7 @@ def should_create_user_successfully end end - should_set_the_flash_to /confirm/i + should set_the_flash.to(/confirm/i) should_redirect_to_url_after_create end diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index 3f793d994..61b8cf3a8 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -20,8 +20,8 @@ class ConfirmationsControllerTest < ActionController::TestCase :token => @user.confirmation_token end - should_set_the_flash_to /confirmed email/i - should_set_the_flash_to /signed in/i + should set_the_flash.to(/confirmed email/i) + should set_the_flash.to(/signed in/i) should_redirect_to_url_after_create should "set the current user" do @@ -60,7 +60,7 @@ class ConfirmationsControllerTest < ActionController::TestCase get :new, :user_id => @user.to_param, :token => @token end - should_set_the_flash_to /confirmed email/i + should set_the_flash.to(/confirmed email/i) should_redirect_to_url_after_create end @@ -87,8 +87,8 @@ class ConfirmationsControllerTest < ActionController::TestCase get :new, :user_id => @user.to_param, :token => @token end - should_set_the_flash_to /already confirmed/i - should_set_the_flash_to /sign in/i + should set_the_flash.to(/already confirmed/i) + should set_the_flash.to(/sign in/i) should_not_be_signed_in should_redirect_to_url_already_confirmed end diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index a07938241..c3af25f77 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -36,7 +36,7 @@ class PasswordsControllerTest < ActionController::TestCase end end - should_set_the_flash_to /password/i + should set_the_flash.to(/password/i) should_redirect_to_url_after_create end @@ -127,7 +127,7 @@ class PasswordsControllerTest < ActionController::TestCase assert_not_nil @user.remember_token end - should_set_the_flash_to(/signed in/i) + should set_the_flash.to(/signed in/i) should_redirect_to_url_after_update end @@ -156,7 +156,7 @@ class PasswordsControllerTest < ActionController::TestCase end should_not_be_signed_in - should_not_set_the_flash + should_not set_the_flash should_respond_with :success should render_template(:edit) diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index 592adb825..cd93feb8e 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -10,7 +10,7 @@ class SessionsControllerTest < ActionController::TestCase should_respond_with :success should render_template(:new) - should_not_set_the_flash + should_not set_the_flash should_display_a_sign_in_form end @@ -40,7 +40,7 @@ class SessionsControllerTest < ActionController::TestCase :password => @user.password } end - should_set_the_flash_to /signed in/i + should set_the_flash.to(/signed in/i) should_redirect_to_url_after_create should_set_cookie("remember_token", "old-token", Clearance.configuration.cookie_expiration.call) @@ -141,7 +141,7 @@ class SessionsControllerTest < ActionController::TestCase :password => "bad value" } end - should_set_the_flash_to /bad/i + should set_the_flash.to(/bad/i) should_respond_with :unauthorized should render_template(:new) should_not_be_signed_in @@ -156,7 +156,7 @@ class SessionsControllerTest < ActionController::TestCase sign_out delete :destroy end - should_set_the_flash_to(/signed out/i) + should set_the_flash.to(/signed out/i) should_redirect_to_url_after_destroy end @@ -168,7 +168,7 @@ class SessionsControllerTest < ActionController::TestCase delete :destroy end - should_set_the_flash_to(/signed out/i) + should set_the_flash.to(/signed out/i) should_redirect_to_url_after_destroy should "delete the cookie token" do diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 53db922f9..2666afa1b 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -14,7 +14,7 @@ class UsersControllerTest < ActionController::TestCase should_respond_with :success should render_template(:new) - should_not_set_the_flash + should_not set_the_flash should_display_a_sign_up_form end @@ -49,7 +49,7 @@ class UsersControllerTest < ActionController::TestCase end end - should_set_the_flash_to /confirm/i + should set_the_flash.to(/confirm/i) should_redirect_to_url_after_create end end From 62b944b2d8a72735f1bf9879038148b70c7d51ff Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:51:56 -0400 Subject: [PATCH 12/54] Use filter_param matcher --- test/controllers/confirmations_controller_test.rb | 2 +- test/controllers/sessions_controller_test.rb | 2 +- test/controllers/users_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index 61b8cf3a8..910d058cb 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -4,7 +4,7 @@ class ConfirmationsControllerTest < ActionController::TestCase tests Clearance::ConfirmationsController - should_filter_params :token + should filter_param(:token) context "a user whose email has not been confirmed" do setup { @user = Factory(:user) } diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index cd93feb8e..ced8d29d0 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -3,7 +3,7 @@ class SessionsControllerTest < ActionController::TestCase tests Clearance::SessionsController - should_filter_params :password + should filter_param(:password) context "on GET to /sessions/new" do setup { get :new } diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 2666afa1b..2b1fc7c82 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -4,7 +4,7 @@ class UsersControllerTest < ActionController::TestCase tests Clearance::UsersController - should_filter_params :password + should filter_param(:password) context "when signed out" do setup { sign_out } From b376ecee34234838f95a3a30089d494ddf2b07f5 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 13:54:59 -0400 Subject: [PATCH 13/54] Use respond_with matcher --- test/controllers/passwords_controller_test.rb | 6 +++--- test/controllers/sessions_controller_test.rb | 4 ++-- test/controllers/users_controller_test.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index c3af25f77..50a8341e9 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -15,7 +15,7 @@ class PasswordsControllerTest < ActionController::TestCase context "on GET to #new" do setup { get :new, :user_id => @user.to_param } - should_respond_with :success + should respond_with(:success) should render_template(:new) end @@ -85,7 +85,7 @@ class PasswordsControllerTest < ActionController::TestCase assert_equal @user, assigns(:user) end - should_respond_with :success + should respond_with(:success) should render_template(:edit) should_display_a_password_update_form end @@ -157,7 +157,7 @@ class PasswordsControllerTest < ActionController::TestCase should_not_be_signed_in should_not set_the_flash - should_respond_with :success + should respond_with(:success) should render_template(:edit) should_display_a_password_update_form diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index ced8d29d0..a18bea5b5 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -8,7 +8,7 @@ class SessionsControllerTest < ActionController::TestCase context "on GET to /sessions/new" do setup { get :new } - should_respond_with :success + should respond_with(:success) should render_template(:new) should_not set_the_flash should_display_a_sign_in_form @@ -142,7 +142,7 @@ class SessionsControllerTest < ActionController::TestCase end should set_the_flash.to(/bad/i) - should_respond_with :unauthorized + should respond_with(:unauthorized) should render_template(:new) should_not_be_signed_in diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 2b1fc7c82..94e6b1ffc 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -12,7 +12,7 @@ class UsersControllerTest < ActionController::TestCase context "on GET to #new" do setup { get :new } - should_respond_with :success + should respond_with(:success) should render_template(:new) should_not set_the_flash From a22ce931c55c8f570a03240721f100cc9ee3d784 Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 14:06:22 -0400 Subject: [PATCH 14/54] make this a release candidate --- clearance.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearance.gemspec b/clearance.gemspec index 94b68bfff..2d978e9d6 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = %q{clearance} - s.version = "0.9.0" + s.version = "0.9.0.rc1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"] From becaa560cf5cd120444a5f4cb939a6f073ebfa22 Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 14:55:13 -0400 Subject: [PATCH 15/54] remove to unused files from gemspec --- clearance.gemspec | 2 -- 1 file changed, 2 deletions(-) diff --git a/clearance.gemspec b/clearance.gemspec index 2d978e9d6..e7abbd382 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -92,8 +92,6 @@ Gem::Specification.new do |s| "test/rails_root/config/initializers/secret_token.rb", "test/rails_root/config/initializers/session_store.rb", "test/rails_root/config/routes.rb", - "test/rails_root/db/migrate/20100611162109_clearance_create_users.rb", - "test/rails_root/features/step_definitions/clearance_steps.rb", "test/rails_root/features/step_definitions/web_steps.rb", "test/rails_root/features/support/env.rb", "test/rails_root/features/support/paths.rb", From 62c4d8e65ed5e39882a097337ab3800c107cda85 Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Fri, 11 Jun 2010 15:18:59 -0400 Subject: [PATCH 16/54] latest version of shoulda --- test/rails_root/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rails_root/Gemfile b/test/rails_root/Gemfile index e32ac6780..0effe5d75 100644 --- a/test/rails_root/Gemfile +++ b/test/rails_root/Gemfile @@ -11,7 +11,7 @@ gem 'mocha' gem 'formtastic', "1.0.0.beta", :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3" -gem 'shoulda', '>= 2.10.3', :git => "git://github.com/thoughtbot/shoulda.git", :branch => "master" +gem 'shoulda', '>= 2.11', :git => "git://github.com/thoughtbot/shoulda.git" gem 'factory_girl_rails' gem 'nokogiri', '1.4.1' From 476350791632eaec1feb443e2b8d47529f67d507 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 18:06:53 -0400 Subject: [PATCH 17/54] Use have_sent_email matcher --- shoulda_macros/clearance.rb | 6 +----- test/controllers/passwords_controller_test.rb | 6 +----- test/controllers/users_controller_test.rb | 6 +----- test/models/user_test.rb | 10 ++-------- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/shoulda_macros/clearance.rb b/shoulda_macros/clearance.rb index a54430ec6..17360a30e 100644 --- a/shoulda_macros/clearance.rb +++ b/shoulda_macros/clearance.rb @@ -96,11 +96,7 @@ def should_create_user_successfully should_assign_to :user should_change 'User.count', :by => 1 - should "send the confirmation email" do - assert_sent_email do |email| - email.subject =~ /account confirmation/i - end - end + should have_sent_email.with_subject(/account confirmation/i) should set_the_flash.to(/confirm/i) should_redirect_to_url_after_create diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index 50a8341e9..a6dcbf3a8 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -30,11 +30,7 @@ class PasswordsControllerTest < ActionController::TestCase assert_not_nil @user.reload.confirmation_token end - should "send the change your password email" do - assert_sent_email do |email| - email.subject =~ /change your password/i - end - end + should have_sent_email.with_subject(/change your password/i) should set_the_flash.to(/password/i) should_redirect_to_url_after_create diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 94e6b1ffc..b79af2f86 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -43,11 +43,7 @@ class UsersControllerTest < ActionController::TestCase assert_equal @old_user_count + 1, User.count end - should "send the confirmation email" do - assert_sent_email do |email| - email.subject =~ /account confirmation/i - end - end + should have_sent_email.with_subject(/account confirmation/i) should set_the_flash.to(/confirm/i) should_redirect_to_url_after_create diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 30c9dc401..439c41ccc 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -59,11 +59,7 @@ def @user.initialize_salt; end assert_equal "John.Doe@example.com", user.email end - should "send the confirmation email" do - assert_sent_email do |email| - email.subject =~ /account confirmation/i - end - end + should have_sent_email.with_subject(/account confirmation/i) end context "When signing up with email already confirmed" do @@ -72,9 +68,7 @@ def @user.initialize_salt; end Factory(:user, :email_confirmed => true) end - should "not send the confirmation email" do - assert_did_not_send_email - end + should_not have_sent_email end context "When multiple users have signed up" do From 6c32047a87d119b4b7de2f93a761ab6de4502902 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 18:16:00 -0400 Subject: [PATCH 18/54] Use validation matchers --- test/models/user_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 439c41ccc..3a83b4b32 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -10,7 +10,8 @@ class UserTest < ActiveSupport::TestCase # signing up context "When signing up" do - should_validate_presence_of :email, :password + should validate_presence_of(:email) + should validate_presence_of(:password) should allow_value("foo@example.com").for(:email) should_not allow_value("foo").for(:email) should_not allow_value("example.com").for(:email) @@ -73,7 +74,7 @@ def @user.initialize_salt; end context "When multiple users have signed up" do setup { Factory(:user) } - should_validate_uniqueness_of :email + should validate_uniqueness_of(:email) end # confirming email From 0651913bc90ea4ec5667783297f98ee1ffc69cf3 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 18:19:48 -0400 Subject: [PATCH 19/54] Use route matcher --- test/controllers/passwords_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index a6dcbf3a8..a1dc7d178 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -4,8 +4,8 @@ class PasswordsControllerTest < ActionController::TestCase tests Clearance::PasswordsController - should_route :get, '/users/1/password/edit', - :controller => 'clearance/passwords', :action => 'edit', :user_id => '1' + should route(:get, '/users/1/password/edit'). + to(:controller => 'clearance/passwords', :action => 'edit', :user_id => '1') context "a signed up user" do setup do From 5d0eae0edf2c12047f7bfec520cbb09dfcea5c07 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 18:24:38 -0400 Subject: [PATCH 20/54] Use assign_to matcher --- shoulda_macros/clearance.rb | 2 +- test/controllers/users_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shoulda_macros/clearance.rb b/shoulda_macros/clearance.rb index 17360a30e..155e93c2a 100644 --- a/shoulda_macros/clearance.rb +++ b/shoulda_macros/clearance.rb @@ -93,7 +93,7 @@ def public_context(&blk) def should_create_user_successfully warn "[DEPRECATION] should_create_user_successfully: not meant to be public, no longer used internally" - should_assign_to :user + should assign_to(:user) should_change 'User.count', :by => 1 should have_sent_email.with_subject(/account confirmation/i) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index b79af2f86..5df582363 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -37,7 +37,7 @@ class UsersControllerTest < ActionController::TestCase post :create, :user => user_attributes end - should_assign_to :user + should assign_to(:user) should "create a new user" do assert_equal @old_user_count + 1, User.count From 7eb98af7b322a1d8db80c6b0964f7fc6ae1ec846 Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 11 Jun 2010 18:48:13 -0400 Subject: [PATCH 21/54] Remove view assertions from controller tests and other unnecessary macros --- test/controllers/confirmations_controller_test.rb | 5 ++++- test/controllers/passwords_controller_test.rb | 8 ++++---- test/controllers/sessions_controller_test.rb | 6 ++---- test/controllers/users_controller_test.rb | 9 ++++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index 910d058cb..ab89e1d8e 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -89,8 +89,11 @@ class ConfirmationsControllerTest < ActionController::TestCase should set_the_flash.to(/already confirmed/i) should set_the_flash.to(/sign in/i) - should_not_be_signed_in should_redirect_to_url_already_confirmed + + should "not be signed in" do + assert_nil cookies[:remember_token] + end end context "no users" do diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index a1dc7d178..4fc903c70 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -83,7 +83,6 @@ class PasswordsControllerTest < ActionController::TestCase should respond_with(:success) should render_template(:edit) - should_display_a_password_update_form end should_forbid "on GET to #edit with correct id but blank token" do @@ -151,12 +150,13 @@ class PasswordsControllerTest < ActionController::TestCase assert_not_nil @user.confirmation_token end - should_not_be_signed_in + should "not be signed in" do + assert_nil cookies[:remember_token] + end + should_not set_the_flash should respond_with(:success) should render_template(:edit) - - should_display_a_password_update_form end should_forbid "on PUT to #update with id but no token" do diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index a18bea5b5..2471b0f31 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -11,7 +11,6 @@ class SessionsControllerTest < ActionController::TestCase should respond_with(:success) should render_template(:new) should_not set_the_flash - should_display_a_sign_in_form end context "on POST to #create with unconfirmed credentials" do @@ -144,10 +143,9 @@ class SessionsControllerTest < ActionController::TestCase should set_the_flash.to(/bad/i) should respond_with(:unauthorized) should render_template(:new) - should_not_be_signed_in - should 'not create the cookie' do - assert_nil cookies['remember_token'] + should "not be signed in" do + assert_nil cookies[:remember_token] end end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 5df582363..5c6550f0c 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -15,8 +15,6 @@ class UsersControllerTest < ActionController::TestCase should respond_with(:success) should render_template(:new) should_not set_the_flash - - should_display_a_sign_up_form end context "on GET to #new with email" do @@ -50,7 +48,12 @@ class UsersControllerTest < ActionController::TestCase end end - signed_in_user_context do + context "A signed-in user" do + setup do + @user = Factory(:email_confirmed_user) + sign_in_as @user + end + context "GET to new" do setup { get :new } should redirect_to("the home page") { root_url } From 1b0ef0dd1203853cf0cebff923a7199cb36c3fea Mon Sep 17 00:00:00 2001 From: Chad Pytel Date: Mon, 21 Jun 2010 10:38:09 -0400 Subject: [PATCH 22/54] correct readme for Rails 3 supportrelease candidate --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 16db75968..8d48b8911 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Fork away and create a [Github Issue](http://github.com/thoughtbot/clearance/iss Installation ------------ -Clearance is a Rails engine. The latest stable version works with versions of Rails greater than 3. If you need to run on Rails 2.x, install Clearance Version 0.8.8. +Clearance is a Rails engine. The latest stable version (0.8.8) works with versions of Rails 2.x. Install it as a gem however you like to install gems. Also, uninstall old versions: @@ -38,6 +38,10 @@ This: * inserts Clearance::Authentication into your ApplicationController * created a migration that either creates a users table or adds only missing columns +There is a release candidate which features Rails 3 support. To install this version: + + gem install clearance --prerelease + Usage ----- From 51d0dfb3b51aedaa96106297fa25b31f211ede0c Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Tue, 22 Jun 2010 16:31:13 -0400 Subject: [PATCH 23/54] engine_name/railtie_name is deprecated, taking it out --- lib/clearance/engine.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/clearance/engine.rb b/lib/clearance/engine.rb index dc8d53275..caa8cf9a3 100644 --- a/lib/clearance/engine.rb +++ b/lib/clearance/engine.rb @@ -3,6 +3,5 @@ module Clearance class Engine < Rails::Engine - engine_name :clearance end end From 4adefb084aef0c9aba1063c4eadab807ff714d1e Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Tue, 22 Jun 2010 16:33:25 -0400 Subject: [PATCH 24/54] Bumping to 0.9.0.rc2 --- clearance.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearance.gemspec b/clearance.gemspec index e7abbd382..171af0907 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = %q{clearance} - s.version = "0.9.0.rc1" + s.version = "0.9.0.rc2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"] From 71c8897cc0b2b2c3a3574ce684ad8a2651a29c67 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Wed, 23 Jun 2010 08:33:01 -0400 Subject: [PATCH 25/54] Add the VERSION file back --- VERSION | 1 + clearance.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..a7396a564 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.9.0.rc2 diff --git a/clearance.gemspec b/clearance.gemspec index 171af0907..a457451df 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = %q{clearance} - s.version = "0.9.0.rc2" + s.version = IO.read(File.join(File.dirname(__FILE__), 'VERSION')) s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"] From 7bf124570dcb3cdc217322ea0bf52586ca16c7d5 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 29 Jun 2010 11:36:46 -0400 Subject: [PATCH 26/54] Use the spec/factories dir if the spec/ dir exists --- Rakefile | 56 +- cucumber.yml | 2 + lib/rails/generators/clearance_generator.rb | 6 +- spec/rails_root/.gitignore | 4 + spec/rails_root/Gemfile | 40 + spec/rails_root/README | 244 + spec/rails_root/Rakefile | 10 + .../app/controllers/accounts_controller.rb | 10 + .../app/controllers/application_controller.rb | 6 + .../app/helpers/application_helper.rb | 2 + spec/rails_root/app/models/user.rb | 3 + .../app/views/accounts/edit.html.erb | 0 .../app/views/layouts/application.html.erb | 24 + spec/rails_root/config.ru | 4 + spec/rails_root/config/application.rb | 46 + spec/rails_root/config/boot.rb | 6 + spec/rails_root/config/cucumber.yml | 8 + spec/rails_root/config/database.yml | 25 + spec/rails_root/config/environment.rb | 7 + .../config/environments/development.rb | 19 + .../config/environments/production.rb | 42 + spec/rails_root/config/environments/test.rb | 32 + .../initializers/backtrace_silencers.rb | 7 + .../config/initializers/clearance.rb | 3 + .../config/initializers/inflections.rb | 10 + .../config/initializers/mime_types.rb | 5 + .../config/initializers/secret_token.rb | 7 + .../config/initializers/session_store.rb | 8 + spec/rails_root/config/locales/en.yml | 5 + spec/rails_root/config/routes.rb | 61 + spec/rails_root/db/.keep | 0 .../20100629153603_clearance_create_users.rb | 20 + spec/rails_root/db/schema.rb | 28 + spec/rails_root/doc/README_FOR_APP | 2 + .../features/password_reset.feature | 33 + spec/rails_root/features/sign_in.feature | 35 + spec/rails_root/features/sign_out.feature | 15 + spec/rails_root/features/sign_up.feature | 45 + .../step_definitions/clearance_steps.rb | 130 + .../features/step_definitions/web_steps.rb | 219 + spec/rails_root/features/support/env.rb | 57 + spec/rails_root/features/support/paths.rb | 45 + spec/rails_root/lib/tasks/.gitkeep | 0 spec/rails_root/lib/tasks/cucumber.rake | 53 + spec/rails_root/public/404.html | 26 + spec/rails_root/public/422.html | 26 + spec/rails_root/public/500.html | 26 + spec/rails_root/public/favicon.ico | 0 spec/rails_root/public/images/rails.png | Bin 0 -> 6646 bytes .../public/javascripts/application.js | 2 + .../rails_root/public/javascripts/controls.js | 965 ++++ .../rails_root/public/javascripts/dragdrop.js | 974 ++++ spec/rails_root/public/javascripts/effects.js | 1123 ++++ .../public/javascripts/prototype.js | 4874 +++++++++++++++++ spec/rails_root/public/javascripts/rails.js | 118 + spec/rails_root/public/robots.txt | 5 + spec/rails_root/public/stylesheets/.gitkeep | 0 spec/rails_root/script/cucumber | 10 + spec/rails_root/script/rails | 9 + spec/rails_root/spec/factories/clearance.rb | 13 + spec/rails_root/vendor/plugins/.gitkeep | 0 spec/rails_root/vendor/plugins/clearance | 1 + .../vendor/plugins/dynamic_form/MIT-LICENSE | 20 + .../vendor/plugins/dynamic_form/README | 13 + .../vendor/plugins/dynamic_form/Rakefile | 10 + .../vendor/plugins/dynamic_form/init.rb | 5 + .../lib/action_view/helpers/dynamic_form.rb | 300 + .../lib/action_view/locale/en.yml | 8 + .../test/dynamic_form_i18n_test.rb | 42 + .../dynamic_form/test/dynamic_form_test.rb | 370 ++ .../plugins/dynamic_form/test/test_helper.rb | 9 + 71 files changed, 10331 insertions(+), 2 deletions(-) create mode 100644 spec/rails_root/.gitignore create mode 100644 spec/rails_root/Gemfile create mode 100644 spec/rails_root/README create mode 100644 spec/rails_root/Rakefile create mode 100644 spec/rails_root/app/controllers/accounts_controller.rb create mode 100644 spec/rails_root/app/controllers/application_controller.rb create mode 100644 spec/rails_root/app/helpers/application_helper.rb create mode 100644 spec/rails_root/app/models/user.rb create mode 100644 spec/rails_root/app/views/accounts/edit.html.erb create mode 100644 spec/rails_root/app/views/layouts/application.html.erb create mode 100644 spec/rails_root/config.ru create mode 100644 spec/rails_root/config/application.rb create mode 100644 spec/rails_root/config/boot.rb create mode 100644 spec/rails_root/config/cucumber.yml create mode 100644 spec/rails_root/config/database.yml create mode 100644 spec/rails_root/config/environment.rb create mode 100644 spec/rails_root/config/environments/development.rb create mode 100644 spec/rails_root/config/environments/production.rb create mode 100644 spec/rails_root/config/environments/test.rb create mode 100644 spec/rails_root/config/initializers/backtrace_silencers.rb create mode 100644 spec/rails_root/config/initializers/clearance.rb create mode 100644 spec/rails_root/config/initializers/inflections.rb create mode 100644 spec/rails_root/config/initializers/mime_types.rb create mode 100644 spec/rails_root/config/initializers/secret_token.rb create mode 100644 spec/rails_root/config/initializers/session_store.rb create mode 100644 spec/rails_root/config/locales/en.yml create mode 100644 spec/rails_root/config/routes.rb create mode 100644 spec/rails_root/db/.keep create mode 100644 spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb create mode 100644 spec/rails_root/db/schema.rb create mode 100644 spec/rails_root/doc/README_FOR_APP create mode 100644 spec/rails_root/features/password_reset.feature create mode 100644 spec/rails_root/features/sign_in.feature create mode 100644 spec/rails_root/features/sign_out.feature create mode 100644 spec/rails_root/features/sign_up.feature create mode 100644 spec/rails_root/features/step_definitions/clearance_steps.rb create mode 100644 spec/rails_root/features/step_definitions/web_steps.rb create mode 100644 spec/rails_root/features/support/env.rb create mode 100644 spec/rails_root/features/support/paths.rb create mode 100644 spec/rails_root/lib/tasks/.gitkeep create mode 100644 spec/rails_root/lib/tasks/cucumber.rake create mode 100644 spec/rails_root/public/404.html create mode 100644 spec/rails_root/public/422.html create mode 100644 spec/rails_root/public/500.html create mode 100644 spec/rails_root/public/favicon.ico create mode 100644 spec/rails_root/public/images/rails.png create mode 100644 spec/rails_root/public/javascripts/application.js create mode 100644 spec/rails_root/public/javascripts/controls.js create mode 100644 spec/rails_root/public/javascripts/dragdrop.js create mode 100644 spec/rails_root/public/javascripts/effects.js create mode 100644 spec/rails_root/public/javascripts/prototype.js create mode 100644 spec/rails_root/public/javascripts/rails.js create mode 100644 spec/rails_root/public/robots.txt create mode 100644 spec/rails_root/public/stylesheets/.gitkeep create mode 100755 spec/rails_root/script/cucumber create mode 100755 spec/rails_root/script/rails create mode 100644 spec/rails_root/spec/factories/clearance.rb create mode 100644 spec/rails_root/vendor/plugins/.gitkeep create mode 120000 spec/rails_root/vendor/plugins/clearance create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/README create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/Rakefile create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/init.rb create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb create mode 100644 spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb diff --git a/Rakefile b/Rakefile index 2bc21d040..9da189cd3 100644 --- a/Rakefile +++ b/Rakefile @@ -5,6 +5,7 @@ ENV['BUNDLE_GEMFILE'] = File.dirname(__FILE__) + '/test/rails_root/Gemfile' require 'rake' require 'rake/testtask' require 'cucumber/rake/task' +require 'spec/rake/spectask' namespace :test do Rake::TestTask.new(:basic => ["generator:cleanup", @@ -41,6 +42,57 @@ namespace :test do end end +namespace :spec do + Spec::Rake::SpecTask.new(:basic => %w(spec:generator:cleanup spec:generator:clearance)) do |task| + task.spec_files = FileList['spec/*/*_spec.rb'] + end + + Spec::Rake::SpecTask.new(:views => %w(spec:generator:cleanup spec:generator:clearance spec:generator:clearance_views)) do |task| + task.spec_files = FileList['spec/*/*_spec.rb'] + end + + Cucumber::Rake::Task.new(:features => %w(spec:generator:cleanup spec:generator:clearance spec:generator:clearance_features)) do |task| + task.cucumber_opts = '--format progress' + task.profile = 'features_with_rspec' + end + + Cucumber::Rake::Task.new(:features_for_views => %w(spec:generator:cleanup spec:generator:clearance spec:generator:clearance_features spec:generator:clearance_views)) do |task| + task.cucumber_opts = '--format progress' + task.profile = 'features_for_views_with_rspec' + end + + namespace :generator do + task :cleanup do + FileList["spec/rails_root/db/**/*"].each do |each| + FileUtils.rm_rf(each) + end + + FileUtils.rm_rf("spec/rails_root/vendor/plugins/clearance") + FileUtils.rm_rf("spec/rails_root/app/views/passwords") + FileUtils.rm_rf("spec/rails_root/app/views/sessions") + FileUtils.rm_rf("spec/rails_root/app/views/users") + FileUtils.mkdir_p("spec/rails_root/vendor/plugins") + clearance_root = File.expand_path(File.dirname(__FILE__)) + system("ln -s #{clearance_root} spec/rails_root/vendor/plugins/clearance") + FileList["spec/rails_root/features/*.feature"].each do |each| + FileUtils.rm_rf(each) + end + end + + task :clearance do + system "cd spec/rails_root && bundle install && ./script/rails generate clearance && rake db:migrate db:test:prepare" + end + + task :clearance_features do + system "cd spec/rails_root && ./script/rails generate clearance_features" + end + + task :clearance_views do + system "cd spec/rails_root && ./script/rails generate clearance_views" + end + end +end + namespace :generator do desc "Cleans up the test app before running the generator" task :cleanup do @@ -78,4 +130,6 @@ end desc "Run the test suite" task :default => ['test:basic', 'test:features', - 'test:views', 'test:features_for_views'] + 'test:views', 'test:features_for_views', + 'spec:basic', 'spec:features', + 'spec:views', 'spec:features_for_views'] diff --git a/cucumber.yml b/cucumber.yml index 0c271a988..c9d42c0b6 100644 --- a/cucumber.yml +++ b/cucumber.yml @@ -1,2 +1,4 @@ features: test/rails_root/features +features_with_rspec: spec/rails_root/features features_for_views: test/rails_root/features +features_for_views_with_rspec: spec/rails_root/features diff --git a/lib/rails/generators/clearance_generator.rb b/lib/rails/generators/clearance_generator.rb index 43b5a41c8..ea19886e8 100644 --- a/lib/rails/generators/clearance_generator.rb +++ b/lib/rails/generators/clearance_generator.rb @@ -25,7 +25,11 @@ def install template "user.rb", user_model end - template "factories.rb", "test/factories/clearance.rb" + if File.exists?("spec") + template "factories.rb", "spec/factories/clearance.rb" + else + template "factories.rb", "test/factories/clearance.rb" + end migration_template "migrations/#{migration_source_name}.rb", "db/migrate/clearance_#{migration_target_name}" diff --git a/spec/rails_root/.gitignore b/spec/rails_root/.gitignore new file mode 100644 index 000000000..af64fae5e --- /dev/null +++ b/spec/rails_root/.gitignore @@ -0,0 +1,4 @@ +.bundle +db/*.sqlite3 +log/*.log +tmp/**/* diff --git a/spec/rails_root/Gemfile b/spec/rails_root/Gemfile new file mode 100644 index 000000000..0effe5d75 --- /dev/null +++ b/spec/rails_root/Gemfile @@ -0,0 +1,40 @@ +source 'http://rubygems.org' + +gem 'rails', '3.0.0.beta4' + +# Bundle edge Rails instead: +# gem 'rails', :git => 'git://github.com/rails/rails.git' + +gem 'sqlite3-ruby', :require => 'sqlite3' + +gem 'mocha' + +gem 'formtastic', "1.0.0.beta", :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3" + +gem 'shoulda', '>= 2.11', :git => "git://github.com/thoughtbot/shoulda.git" +gem 'factory_girl_rails' +gem 'nokogiri', '1.4.1' + +gem 'capybara' +gem 'database_cleaner' +gem 'cucumber-rails', '0.3.2' +gem 'cucumber', '0.8.0' +gem 'launchy' + +# Use unicorn as the web server +# gem 'unicorn' + +# Deploy with Capistrano +# gem 'capistrano' + +# Bundle the extra gems: +# gem 'bj' +# gem 'nokogiri', '1.4.1' +# gem 'sqlite3-ruby', :require => 'sqlite3' +# gem 'aws-s3', :require => 'aws/s3' + +# Bundle gems for certain environments: +# gem 'rspec', :group => :test +# group :test do +# gem 'webrat' +# end diff --git a/spec/rails_root/README b/spec/rails_root/README new file mode 100644 index 000000000..ded8570c4 --- /dev/null +++ b/spec/rails_root/README @@ -0,0 +1,244 @@ +== Welcome to Rails + +Rails is a web-application framework that includes everything needed to create +database-backed web applications according to the Model-View-Control pattern. + +This pattern splits the view (also called the presentation) into "dumb" templates +that are primarily responsible for inserting pre-built data in between HTML tags. +The model contains the "smart" domain objects (such as Account, Product, Person, +Post) that holds all the business logic and knows how to persist themselves to +a database. The controller handles the incoming requests (such as Save New Account, +Update Product, Show Post) by manipulating the model and directing data to the view. + +In Rails, the model is handled by what's called an object-relational mapping +layer entitled Active Record. This layer allows you to present the data from +database rows as objects and embellish these data objects with business logic +methods. You can read more about Active Record in +link:files/vendor/rails/activerecord/README.html. + +The controller and view are handled by the Action Pack, which handles both +layers by its two parts: Action View and Action Controller. These two layers +are bundled in a single package due to their heavy interdependence. This is +unlike the relationship between the Active Record and Action Pack that is much +more separate. Each of these packages can be used independently outside of +Rails. You can read more about Action Pack in +link:files/vendor/rails/actionpack/README.html. + + +== Getting Started + +1. At the command prompt, start a new Rails application using the rails command + and your application name. Ex: rails myapp +2. Change directory into myapp and start the web server: rails server (run with --help for options) +3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!" +4. Follow the guidelines to start developing your application + + +== Web Servers + +By default, Rails will try to use Mongrel if it's installed when started with rails server, otherwise +Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails +with a variety of other web servers. + +Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is +suitable for development and deployment of Rails applications. If you have Ruby Gems installed, +getting up and running with mongrel is as easy as: gem install mongrel. +More info at: http://mongrel.rubyforge.org + +Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or +Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use +FCGI or proxy to a pack of Mongrels/Thin/Ebb servers. + +== Apache .htaccess example for FCGI/CGI + +# General Apache options +AddHandler fastcgi-script .fcgi +AddHandler cgi-script .cgi +Options +FollowSymLinks +ExecCGI + +# If you don't want Rails to look in certain directories, +# use the following rewrite rules so that Apache won't rewrite certain requests +# +# Example: +# RewriteCond %{REQUEST_URI} ^/notrails.* +# RewriteRule .* - [L] + +# Redirect all requests not available on the filesystem to Rails +# By default the cgi dispatcher is used which is very slow +# +# For better performance replace the dispatcher with the fastcgi one +# +# Example: +# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] +RewriteEngine On + +# If your Rails application is accessed via an Alias directive, +# then you MUST also set the RewriteBase in this htaccess file. +# +# Example: +# Alias /myrailsapp /path/to/myrailsapp/public +# RewriteBase /myrailsapp + +RewriteRule ^$ index.html [QSA] +RewriteRule ^([^.]+)$ $1.html [QSA] +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ dispatch.cgi [QSA,L] + +# In case Rails experiences terminal errors +# Instead of displaying this message you can supply a file here which will be rendered instead +# +# Example: +# ErrorDocument 500 /500.html + +ErrorDocument 500 "

Application error

Rails application failed to start properly" + + +== Debugging Rails + +Sometimes your application goes wrong. Fortunately there are a lot of tools that +will help you debug it and get it back on the rails. + +First area to check is the application log files. Have "tail -f" commands running +on the server.log and development.log. Rails will automatically display debugging +and runtime information to these files. Debugging info will also be shown in the +browser on requests from 127.0.0.1. + +You can also log your own messages directly into the log file from your code using +the Ruby logger class from inside your controllers. Example: + + class WeblogController < ActionController::Base + def destroy + @weblog = Weblog.find(params[:id]) + @weblog.destroy + logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!") + end + end + +The result will be a message in your log file along the lines of: + + Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1 + +More information on how to use the logger is at http://www.ruby-doc.org/core/ + +Also, Ruby documentation can be found at http://www.ruby-lang.org/ including: + +* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/ +* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide) + +These two online (and free) books will bring you up to speed on the Ruby language +and also on programming in general. + + +== Debugger + +Debugger support is available through the debugger command when you start your Mongrel or +Webrick server with --debugger. This means that you can break out of execution at any point +in the code, investigate and change the model, AND then resume execution! +You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug' +Example: + + class WeblogController < ActionController::Base + def index + @posts = Post.find(:all) + debugger + end + end + +So the controller will accept the action, run the first line, then present you +with a IRB prompt in the server window. Here you can do things like: + + >> @posts.inspect + => "[#nil, \"body\"=>nil, \"id\"=>\"1\"}>, + #\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]" + >> @posts.first.title = "hello from a debugger" + => "hello from a debugger" + +...and even better is that you can examine how your runtime objects actually work: + + >> f = @posts.first + => #nil, "body"=>nil, "id"=>"1"}> + >> f. + Display all 152 possibilities? (y or n) + +Finally, when you're ready to resume execution, you enter "cont" + + +== Console + +You can interact with the domain model by starting the console through rails console. +Here you'll have all parts of the application configured, just like it is when the +application is running. You can inspect domain models, change values, and save to the +database. Starting the script without arguments will launch it in the development environment. +Passing an argument will specify a different environment, like rails console production. + +To reload your controllers and models after launching the console run reload! + +== dbconsole + +You can go to the command line of your database directly through rails dbconsole. +You would be connected to the database with the credentials defined in database.yml. +Starting the script without arguments will connect you to the development database. Passing an +argument will connect you to a different database, like rails dbconsole production. +Currently works for mysql, postgresql and sqlite. + +== Description of Contents + +app + Holds all the code that's specific to this particular application. + +app/controllers + Holds controllers that should be named like weblogs_controller.rb for + automated URL mapping. All controllers should descend from ApplicationController + which itself descends from ActionController::Base. + +app/models + Holds models that should be named like post.rb. + Most models will descend from ActiveRecord::Base. + +app/views + Holds the template files for the view that should be named like + weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby + syntax. + +app/views/layouts + Holds the template files for layouts to be used with views. This models the common + header/footer method of wrapping views. In your views, define a layout using the + layout :default and create a file named default.html.erb. Inside default.html.erb, + call <% yield %> to render the view using this layout. + +app/helpers + Holds view helpers that should be named like weblogs_helper.rb. These are generated + for you automatically when using rails generate for controllers. Helpers can be used to + wrap functionality for your views into methods. + +config + Configuration files for the Rails environment, the routing map, the database, and other dependencies. + +db + Contains the database schema in schema.rb. db/migrate contains all + the sequence of Migrations for your schema. + +doc + This directory is where your application documentation will be stored when generated + using rake doc:app + +lib + Application specific libraries. Basically, any kind of custom code that doesn't + belong under controllers, models, or helpers. This directory is in the load path. + +public + The directory available for the web server. Contains subdirectories for images, stylesheets, + and javascripts. Also contains the dispatchers and the default HTML files. This should be + set as the DOCUMENT_ROOT of your web server. + +script + Helper scripts for automation and generation. + +test + Unit and functional tests along with fixtures. When using the rails generate command, template + test files will be generated for you and placed in this directory. + +vendor + External libraries that the application depends on. Also includes the plugins subdirectory. + If the app has frozen rails, those gems also go here, under vendor/rails/. + This directory is in the load path. diff --git a/spec/rails_root/Rakefile b/spec/rails_root/Rakefile new file mode 100644 index 000000000..9cb204643 --- /dev/null +++ b/spec/rails_root/Rakefile @@ -0,0 +1,10 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require File.expand_path('../config/application', __FILE__) + +require 'rake' +require 'rake/testtask' +require 'rake/rdoctask' + +Rails::Application.load_tasks diff --git a/spec/rails_root/app/controllers/accounts_controller.rb b/spec/rails_root/app/controllers/accounts_controller.rb new file mode 100644 index 000000000..a54e1adf3 --- /dev/null +++ b/spec/rails_root/app/controllers/accounts_controller.rb @@ -0,0 +1,10 @@ +class AccountsController < ApplicationController + before_filter :authenticate + + def edit + end + + def create + redirect_to edit_account_path + end +end diff --git a/spec/rails_root/app/controllers/application_controller.rb b/spec/rails_root/app/controllers/application_controller.rb new file mode 100644 index 000000000..032a69854 --- /dev/null +++ b/spec/rails_root/app/controllers/application_controller.rb @@ -0,0 +1,6 @@ +class ApplicationController < ActionController::Base + helper :all + protect_from_forgery + include Clearance::Authentication + before_filter :authenticate +end diff --git a/spec/rails_root/app/helpers/application_helper.rb b/spec/rails_root/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/spec/rails_root/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/spec/rails_root/app/models/user.rb b/spec/rails_root/app/models/user.rb new file mode 100644 index 000000000..6d077a175 --- /dev/null +++ b/spec/rails_root/app/models/user.rb @@ -0,0 +1,3 @@ +class User < ActiveRecord::Base + include Clearance::User +end diff --git a/spec/rails_root/app/views/accounts/edit.html.erb b/spec/rails_root/app/views/accounts/edit.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/spec/rails_root/app/views/layouts/application.html.erb b/spec/rails_root/app/views/layouts/application.html.erb new file mode 100644 index 000000000..491a49fa3 --- /dev/null +++ b/spec/rails_root/app/views/layouts/application.html.erb @@ -0,0 +1,24 @@ + + + + Rails3Root + <%= stylesheet_link_tag :all %> + <%= javascript_include_tag :defaults %> + <%= csrf_meta_tag %> + + + +
+ <% flash.each do |key, value| -%> +
<%=h value %>
+ <% end %> +
+ <%= yield %> + + diff --git a/spec/rails_root/config.ru b/spec/rails_root/config.ru new file mode 100644 index 000000000..332ca1381 --- /dev/null +++ b/spec/rails_root/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 Rails3Root::Application diff --git a/spec/rails_root/config/application.rb b/spec/rails_root/config/application.rb new file mode 100644 index 000000000..f64105b6f --- /dev/null +++ b/spec/rails_root/config/application.rb @@ -0,0 +1,46 @@ +require File.expand_path('../boot', __FILE__) + +require 'rails/all' + +# If you have a Gemfile, require the gems listed there, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(:default, Rails.env) if defined?(Bundler) + +module Rails3Root + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Add additional load paths for your own custom dirs + # config.load_paths += %W( #{config.root}/extras ) + + # Only load the plugins named here, in the order given (default is alphabetical). + # :all can be used as a placeholder for all plugins not explicitly named + # config.plugins = [ :exception_notification, :ssl_requirement, :all ] + + # Activate observers that should always be running + # config.active_record.observers = :cacher, :garbage_collector, :forum_observer + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Configure generators values. Many other options are available, be sure to check the documentation. + # config.generators do |g| + # g.orm :active_record + # g.template_engine :erb + # g.test_framework :test_unit, :fixture => true + # end + + # Configure the default encoding used in templates for Ruby 1.9. + config.encoding = "utf-8" + + # Configure sensitive parameters which will be filtered from the log file. + config.filter_parameters += [:password] + end +end diff --git a/spec/rails_root/config/boot.rb b/spec/rails_root/config/boot.rb new file mode 100644 index 000000000..712b0981e --- /dev/null +++ b/spec/rails_root/config/boot.rb @@ -0,0 +1,6 @@ +require 'rubygems' +# Set up gems listed in the Gemfile. +if File.exist?(File.expand_path('../../Gemfile', __FILE__)) + require 'bundler' + Bundler.setup +end diff --git a/spec/rails_root/config/cucumber.yml b/spec/rails_root/config/cucumber.yml new file mode 100644 index 000000000..621a14cea --- /dev/null +++ b/spec/rails_root/config/cucumber.yml @@ -0,0 +1,8 @@ +<% +rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : "" +rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}" +std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip" +%> +default: <%= std_opts %> features +wip: --tags @wip:3 --wip features +rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip diff --git a/spec/rails_root/config/database.yml b/spec/rails_root/config/database.yml new file mode 100644 index 000000000..7551340c2 --- /dev/null +++ b/spec/rails_root/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3-ruby (not necessary on OS X Leopard) +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: &test + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 + +cucumber: + <<: *test \ No newline at end of file diff --git a/spec/rails_root/config/environment.rb b/spec/rails_root/config/environment.rb new file mode 100644 index 000000000..0cb696254 --- /dev/null +++ b/spec/rails_root/config/environment.rb @@ -0,0 +1,7 @@ +# Load the rails application +require File.expand_path('../application', __FILE__) + +# Initialize the rails application +Rails3Root::Application.initialize! + +ActionMailer::Base.default_url_options = { :host => 'localhost:3000' } diff --git a/spec/rails_root/config/environments/development.rb b/spec/rails_root/config/environments/development.rb new file mode 100644 index 000000000..38d8867b3 --- /dev/null +++ b/spec/rails_root/config/environments/development.rb @@ -0,0 +1,19 @@ +Rails3Root::Application.configure do + # Settings specified here will take precedence over those in config/environment.rb + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the webserver when you make code changes. + config.cache_classes = false + + # 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_view.debug_rjs = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send + config.action_mailer.raise_delivery_errors = false +end diff --git a/spec/rails_root/config/environments/production.rb b/spec/rails_root/config/environments/production.rb new file mode 100644 index 000000000..1a3c43ad6 --- /dev/null +++ b/spec/rails_root/config/environments/production.rb @@ -0,0 +1,42 @@ +Rails3Root::Application.configure do + # Settings specified here will take precedence over those in config/environment.rb + + # The production environment is meant for finished, "live" apps. + # Code is not reloaded between requests + config.cache_classes = true + + # Full error reports are disabled and caching is turned on + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Specifies the header that your server uses for sending files + config.action_dispatch.x_sendfile_header = "X-Sendfile" + + # For nginx: + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' + + # If you have no front-end server that supports something like X-Sendfile, + # just comment this out and Rails will serve the files + + # See everything in the log (default is :info) + # config.log_level = :debug + + # Use a different logger for distributed setups + # config.logger = SyslogLogger.new + + # Use a different cache store in production + # config.cache_store = :mem_cache_store + + # Disable Rails's static asset server + # In production, Apache or nginx will already do this + config.serve_static_assets = false + + # Enable serving of images, stylesheets, and javascripts from an asset server + # config.action_controller.asset_host = "http://assets.example.com" + + # Disable delivery errors, bad email addresses will be ignored + # config.action_mailer.raise_delivery_errors = false + + # Enable threaded mode + # config.threadsafe! +end diff --git a/spec/rails_root/config/environments/test.rb b/spec/rails_root/config/environments/test.rb new file mode 100644 index 000000000..70e718792 --- /dev/null +++ b/spec/rails_root/config/environments/test.rb @@ -0,0 +1,32 @@ +Rails3Root::Application.configure do + # Settings specified here will take precedence over those in config/environment.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 +end diff --git a/spec/rails_root/config/initializers/backtrace_silencers.rb b/spec/rails_root/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/spec/rails_root/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/spec/rails_root/config/initializers/clearance.rb b/spec/rails_root/config/initializers/clearance.rb new file mode 100644 index 000000000..80f480bad --- /dev/null +++ b/spec/rails_root/config/initializers/clearance.rb @@ -0,0 +1,3 @@ +Clearance.configure do |config| + config.mailer_sender = 'donotreply@example.com' +end diff --git a/spec/rails_root/config/initializers/inflections.rb b/spec/rails_root/config/initializers/inflections.rb new file mode 100644 index 000000000..d531b8bb8 --- /dev/null +++ b/spec/rails_root/config/initializers/inflections.rb @@ -0,0 +1,10 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format +# (all these examples are active by default): +# ActiveSupport::Inflector.inflections do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end diff --git a/spec/rails_root/config/initializers/mime_types.rb b/spec/rails_root/config/initializers/mime_types.rb new file mode 100644 index 000000000..72aca7e44 --- /dev/null +++ b/spec/rails_root/config/initializers/mime_types.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf +# Mime::Type.register_alias "text/html", :iphone diff --git a/spec/rails_root/config/initializers/secret_token.rb b/spec/rails_root/config/initializers/secret_token.rb new file mode 100644 index 000000000..caee57742 --- /dev/null +++ b/spec/rails_root/config/initializers/secret_token.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +Rails.application.config.secret_token = 'b0a71f62c3707fe6874a435909a597203110c418dc3022773b5131e2a26a99b304010089bd3ebb92e206b3b94a883aeefa571a8a52a45160f8663d163786610c' diff --git a/spec/rails_root/config/initializers/session_store.rb b/spec/rails_root/config/initializers/session_store.rb new file mode 100644 index 000000000..89fac712c --- /dev/null +++ b/spec/rails_root/config/initializers/session_store.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, :key => '_rails3_root_session' + +# Use the database for sessions instead of the cookie-based default, +# which shouldn't be used to store highly confidential information +# (create the session table with "rake db:sessions:create") +# Rails.application.config.session_store :active_record_store diff --git a/spec/rails_root/config/locales/en.yml b/spec/rails_root/config/locales/en.yml new file mode 100644 index 000000000..a747bfa69 --- /dev/null +++ b/spec/rails_root/config/locales/en.yml @@ -0,0 +1,5 @@ +# Sample localization file for English. Add more files in this directory for other locales. +# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. + +en: + hello: "Hello world" diff --git a/spec/rails_root/config/routes.rb b/spec/rails_root/config/routes.rb new file mode 100644 index 000000000..7f3047ef2 --- /dev/null +++ b/spec/rails_root/config/routes.rb @@ -0,0 +1,61 @@ +Rails3Root::Application.routes.draw do |map| + map.resource :account + map.root :controller => 'accounts', :action => 'edit' + + # The priority is based upon order of creation: + # first created -> highest priority. + + # Sample of regular route: + # match 'products/:id' => 'catalog#view' + # Keep in mind you can assign values other than :controller and :action + + # Sample of named route: + # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase + # This route can be invoked with purchase_url(:id => product.id) + + # Sample resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Sample resource route with options: + # resources :products do + # member do + # get :short + # post :toggle + # end + # + # collection do + # get :sold + # end + # end + + # Sample resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Sample resource route with more complex sub-resources + # resources :products do + # resources :comments + # resources :sales do + # get :recent, :on => :collection + # end + # end + + # Sample resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end + + # You can have the root of your site routed with "root" + # just remember to delete public/index.html. + # root :to => "welcome#index" + + # See how all your routes lay out with "rake routes" + + # This is a legacy wild controller route that's not recommended for RESTful applications. + # Note: This route will make all actions in every controller accessible via GET requests. + # match ':controller(/:action(/:id(.:format)))' +end diff --git a/spec/rails_root/db/.keep b/spec/rails_root/db/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb b/spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb new file mode 100644 index 000000000..5c5663b7f --- /dev/null +++ b/spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb @@ -0,0 +1,20 @@ +class ClearanceCreateUsers < ActiveRecord::Migration + def self.up + create_table(:users) do |t| + t.string :email + t.string :encrypted_password, :limit => 128 + t.string :salt, :limit => 128 + t.string :confirmation_token, :limit => 128 + t.string :remember_token, :limit => 128 + t.boolean :email_confirmed, :default => false, :null => false + t.timestamps + end + + add_index :users, :email + add_index :users, :remember_token + end + + def self.down + drop_table :users + end +end diff --git a/spec/rails_root/db/schema.rb b/spec/rails_root/db/schema.rb new file mode 100644 index 000000000..162315349 --- /dev/null +++ b/spec/rails_root/db/schema.rb @@ -0,0 +1,28 @@ +# This file is auto-generated from the current state of the database. Instead of editing this file, +# please use the migrations feature of Active Record to incrementally modify your database, and +# then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your database schema. If you need +# to create the application database on another system, you should be using db:schema:load, not running +# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20100629153603) do + + create_table "users", :force => true do |t| + t.string "email" + t.string "encrypted_password", :limit => 128 + t.string "salt", :limit => 128 + t.string "confirmation_token", :limit => 128 + t.string "remember_token", :limit => 128 + t.boolean "email_confirmed", :default => false, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "users", ["email"], :name => "index_users_on_email" + add_index "users", ["remember_token"], :name => "index_users_on_remember_token" + +end diff --git a/spec/rails_root/doc/README_FOR_APP b/spec/rails_root/doc/README_FOR_APP new file mode 100644 index 000000000..fe41f5cc2 --- /dev/null +++ b/spec/rails_root/doc/README_FOR_APP @@ -0,0 +1,2 @@ +Use this README file to introduce your application and point to useful places in the API for learning more. +Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries. diff --git a/spec/rails_root/features/password_reset.feature b/spec/rails_root/features/password_reset.feature new file mode 100644 index 000000000..4dceaa6ed --- /dev/null +++ b/spec/rails_root/features/password_reset.feature @@ -0,0 +1,33 @@ +Feature: Password reset + In order to sign in even if user forgot their password + A user + Should be able to reset it + + Scenario: User is not signed up + Given no user exists with an email of "email@person.com" + When I request password reset link to be sent to "email@person.com" + Then I should see "Unknown email" + + Scenario: User is signed up and requests password reset + Given I signed up with "email@person.com/password" + When I request password reset link to be sent to "email@person.com" + Then I should see "instructions for changing your password" + And a password reset message should be sent to "email@person.com" + + Scenario: User is signed up updated his password and types wrong confirmation + Given I signed up with "email@person.com/password" + When I follow the password reset link sent to "email@person.com" + And I update my password with "newpassword/wrongconfirmation" + Then I should see an error message + And I should be signed out + + Scenario: User is signed up and updates his password + Given I signed up with "email@person.com/password" + When I follow the password reset link sent to "email@person.com" + And I update my password with "newpassword/newpassword" + Then I should be signed in + When I sign out + Then I should be signed out + And I sign in as "email@person.com/newpassword" + Then I should be signed in + diff --git a/spec/rails_root/features/sign_in.feature b/spec/rails_root/features/sign_in.feature new file mode 100644 index 000000000..ab8dbf6fa --- /dev/null +++ b/spec/rails_root/features/sign_in.feature @@ -0,0 +1,35 @@ +Feature: Sign in + In order to get access to protected sections of the site + A user + Should be able to sign in + + Scenario: User is not signed up + Given no user exists with an email of "email@person.com" + When I go to the sign in page + And I sign in as "email@person.com/password" + Then I should see "Bad email or password" + And I should be signed out + + Scenario: User is not confirmed + Given I signed up with "email@person.com/password" + When I go to the sign in page + And I sign in as "email@person.com/password" + Then I should see "User has not confirmed email" + And I should be signed out + + Scenario: User enters wrong password + Given I am signed up and confirmed as "email@person.com/password" + When I go to the sign in page + And I sign in as "email@person.com/wrongpassword" + Then I should see "Bad email or password" + And I should be signed out + + Scenario: User signs in successfully + Given I am signed up and confirmed as "email@person.com/password" + When I go to the sign in page + And I sign in as "email@person.com/password" + Then I should see "Signed in" + And I should be signed in + When I return next time + Then I should be signed in + diff --git a/spec/rails_root/features/sign_out.feature b/spec/rails_root/features/sign_out.feature new file mode 100644 index 000000000..8789d97a1 --- /dev/null +++ b/spec/rails_root/features/sign_out.feature @@ -0,0 +1,15 @@ +Feature: Sign out + To protect my account from unauthorized access + A signed in user + Should be able to sign out + + Scenario: User signs out + Given I am signed up and confirmed as "email@person.com/password" + When I sign in as "email@person.com/password" + Then I should be signed in + And I sign out + Then I should see "Signed out" + And I should be signed out + When I return next time + Then I should be signed out + diff --git a/spec/rails_root/features/sign_up.feature b/spec/rails_root/features/sign_up.feature new file mode 100644 index 000000000..4368d5df5 --- /dev/null +++ b/spec/rails_root/features/sign_up.feature @@ -0,0 +1,45 @@ +Feature: Sign up + In order to get access to protected sections of the site + A user + Should be able to sign up + + Scenario: User signs up with invalid data + When I go to the sign up page + And I fill in "Email" with "invalidemail" + And I fill in "Password" with "password" + And I fill in "Confirm password" with "" + And I press "Sign up" + Then I should see error messages + + Scenario: User signs up with valid data + When I go to the sign up page + And I fill in "Email" with "email@person.com" + And I fill in "Password" with "password" + And I fill in "Confirm password" with "password" + And I press "Sign up" + Then I should see "instructions for confirming" + And a confirmation message should be sent to "email@person.com" + + Scenario: User confirms his account + Given I signed up with "email@person.com/password" + When I follow the confirmation link sent to "email@person.com" + Then I should see "Confirmed email and signed in" + And I should be signed in + + Scenario: Signed in user clicks confirmation link again + Given I signed up with "email@person.com/password" + When I follow the confirmation link sent to "email@person.com" + Then I should be signed in + When I follow the confirmation link sent to "email@person.com" + Then I should see "Confirmed email and signed in" + And I should be signed in + + Scenario: Signed out user clicks confirmation link again + Given I signed up with "email@person.com/password" + When I follow the confirmation link sent to "email@person.com" + Then I should be signed in + When I sign out + And I follow the confirmation link sent to "email@person.com" + Then I should see "Already confirmed email. Please sign in." + And I should be signed out + diff --git a/spec/rails_root/features/step_definitions/clearance_steps.rb b/spec/rails_root/features/step_definitions/clearance_steps.rb new file mode 100644 index 000000000..fe025cd9b --- /dev/null +++ b/spec/rails_root/features/step_definitions/clearance_steps.rb @@ -0,0 +1,130 @@ +# General + +Then /^I should see error messages$/ do + Then %{I should see "errors prohibited"} +end + +Then /^I should see an error message$/ do + Then %{I should see "error prohibited"} +end + +# Database + +Given /^no user exists with an email of "(.*)"$/ do |email| + assert_nil User.find_by_email(email) +end + +Given /^I signed up with "(.*)\/(.*)"$/ do |email, password| + user = Factory :user, + :email => email, + :password => password, + :password_confirmation => password +end + +Given /^I am signed up and confirmed as "(.*)\/(.*)"$/ do |email, password| + user = Factory :email_confirmed_user, + :email => email, + :password => password, + :password_confirmation => password +end + +# Session + +Then /^I should be signed in$/ do + Given %{I am on the homepage} + Then %{I should see "Sign out"} +end + +Then /^I should be signed out$/ do + Given %{I am on the homepage} + Then %{I should see "Sign in"} +end + +When /^session is cleared$/ do + # TODO: This doesn't work with Capybara + # TODO: I tried Capybara.reset_sessions! but that didn't work + #request.reset_session + #controller.instance_variable_set(:@_current_user, nil) +end + +Given /^I have signed in with "(.*)\/(.*)"$/ do |email, password| + Given %{I am signed up and confirmed as "#{email}/#{password}"} + And %{I sign in as "#{email}/#{password}"} +end + +# Emails + +Then /^a confirmation message should be sent to "(.*)"$/ do |email| + user = User.find_by_email(email) + assert !user.confirmation_token.blank? + assert !ActionMailer::Base.deliveries.empty? + result = ActionMailer::Base.deliveries.any? do |email| + email.to == [user.email] && + email.subject =~ /confirm/i && + email.body =~ /#{user.confirmation_token}/ + end + assert result +end + +When /^I follow the confirmation link sent to "(.*)"$/ do |email| + user = User.find_by_email(email) + visit new_user_confirmation_path(:user_id => user, + :token => user.confirmation_token) +end + +Then /^a password reset message should be sent to "(.*)"$/ do |email| + user = User.find_by_email(email) + assert !user.confirmation_token.blank? + assert !ActionMailer::Base.deliveries.empty? + result = ActionMailer::Base.deliveries.any? do |email| + email.to == [user.email] && + email.subject =~ /password/i && + email.body =~ /#{user.confirmation_token}/ + end + assert result +end + +When /^I follow the password reset link sent to "(.*)"$/ do |email| + user = User.find_by_email(email) + visit edit_user_password_path(:user_id => user, + :token => user.confirmation_token) +end + +When /^I try to change the password of "(.*)" without token$/ do |email| + user = User.find_by_email(email) + visit edit_user_password_path(:user_id => user) +end + +Then /^I should be forbidden$/ do + assert_response :forbidden +end + +# Actions + +When /^I sign in as "(.*)\/(.*)"$/ do |email, password| + When %{I go to the sign in page} + And %{I fill in "Email" with "#{email}"} + And %{I fill in "Password" with "#{password}"} + And %{I press "Sign in"} +end + +When /^I sign out$/ do + visit '/sign_out' +end + +When /^I request password reset link to be sent to "(.*)"$/ do |email| + When %{I go to the password reset request page} + And %{I fill in "Email address" with "#{email}"} + And %{I press "Reset password"} +end + +When /^I update my password with "(.*)\/(.*)"$/ do |password, confirmation| + And %{I fill in "Choose password" with "#{password}"} + And %{I fill in "Confirm password" with "#{confirmation}"} + And %{I press "Save this password"} +end + +When /^I return next time$/ do + When %{session is cleared} + And %{I go to the homepage} +end diff --git a/spec/rails_root/features/step_definitions/web_steps.rb b/spec/rails_root/features/step_definitions/web_steps.rb new file mode 100644 index 000000000..0f0af8aa2 --- /dev/null +++ b/spec/rails_root/features/step_definitions/web_steps.rb @@ -0,0 +1,219 @@ +# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril. +# It is recommended to regenerate this file in the future when you upgrade to a +# newer version of cucumber-rails. Consider adding your own code to a new file +# instead of editing this one. Cucumber will automatically load all features/**/*.rb +# files. + + +require 'uri' +require 'cgi' +require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths")) + +module WithinHelpers + def with_scope(locator) + locator ? within(locator) { yield } : yield + end +end +World(WithinHelpers) + +Given /^(?:|I )am on (.+)$/ do |page_name| + visit path_to(page_name) +end + +When /^(?:|I )go to (.+)$/ do |page_name| + visit path_to(page_name) +end + +When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector| + with_scope(selector) do + click_button(button) + end +end + +When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector| + with_scope(selector) do + click_link(link) + end +end + +When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector| + with_scope(selector) do + fill_in(field, :with => value) + end +end + +When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector| + with_scope(selector) do + fill_in(field, :with => value) + end +end + +# Use this to fill in an entire form with data from a table. Example: +# +# When I fill in the following: +# | Account Number | 5002 | +# | Expiry date | 2009-11-01 | +# | Note | Nice guy | +# | Wants Email? | | +# +# TODO: Add support for checkbox, select og option +# based on naming conventions. +# +When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields| + with_scope(selector) do + fields.rows_hash.each do |name, value| + When %{I fill in "#{name}" with "#{value}"} + end + end +end + +When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector| + with_scope(selector) do + select(value, :from => field) + end +end + +When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector| + with_scope(selector) do + check(field) + end +end + +When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector| + with_scope(selector) do + uncheck(field) + end +end + +When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector| + with_scope(selector) do + choose(field) + end +end + +When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector| + with_scope(selector) do + attach_file(field, path) + end +end + +Then /^(?:|I )should see JSON:$/ do |expected_json| + require 'json' + expected = JSON.pretty_generate(JSON.parse(expected_json)) + actual = JSON.pretty_generate(JSON.parse(response.body)) + expected.should == actual +end + +Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector| + with_scope(selector) do + if page.respond_to? :should + page.should have_content(text) + else + assert page.has_content?(text) + end + end +end + +Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector| + regexp = Regexp.new(regexp) + with_scope(selector) do + if page.respond_to? :should + page.should have_xpath('//*', :text => regexp) + else + assert page.has_xpath?('//*', :text => regexp) + end + end +end + +Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector| + with_scope(selector) do + if page.respond_to? :should + page.should have_no_content(text) + else + assert page.has_no_content?(text) + end + end +end + +Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector| + regexp = Regexp.new(regexp) + with_scope(selector) do + if page.respond_to? :should + page.should have_no_xpath('//*', :text => regexp) + else + assert page.has_no_xpath?('//*', :text => regexp) + end + end +end + +Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value| + with_scope(selector) do + field = find_field(field) + field_value = (field.tag_name == 'textarea') ? field.text : field.value + if field_value.respond_to? :should + field_value.should =~ /#{value}/ + else + assert_match(/#{value}/, field_value) + end + end +end + +Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value| + with_scope(selector) do + field = find_field(field) + field_value = (field.tag_name == 'textarea') ? field.text : field.value + if field_value.respond_to? :should_not + field_value.should_not =~ /#{value}/ + else + assert_no_match(/#{value}/, field_value) + end + end +end + +Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector| + with_scope(selector) do + field_checked = find_field(label)['checked'] + if field_checked.respond_to? :should + field_checked.should be_true + else + assert field_checked + end + end +end + +Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector| + with_scope(selector) do + field_checked = find_field(label)['checked'] + if field_checked.respond_to? :should + field_checked.should be_false + else + assert !field_checked + end + end +end + +Then /^(?:|I )should be on (.+)$/ do |page_name| + current_path = URI.parse(current_url).path + if current_path.respond_to? :should + current_path.should == path_to(page_name) + else + assert_equal path_to(page_name), current_path + end +end + +Then /^(?:|I )should have the following query string:$/ do |expected_pairs| + query = URI.parse(current_url).query + actual_params = query ? CGI.parse(query) : {} + expected_params = {} + expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} + + if actual_params.respond_to? :should + actual_params.should == expected_params + else + assert_equal expected_params, actual_params + end +end + +Then /^show me the page$/ do + save_and_open_page +end diff --git a/spec/rails_root/features/support/env.rb b/spec/rails_root/features/support/env.rb new file mode 100644 index 000000000..33331395d --- /dev/null +++ b/spec/rails_root/features/support/env.rb @@ -0,0 +1,57 @@ +# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril. +# It is recommended to regenerate this file in the future when you upgrade to a +# newer version of cucumber-rails. Consider adding your own code to a new file +# instead of editing this one. Cucumber will automatically load all features/**/*.rb +# files. + +ENV["RAILS_ENV"] ||= "test" +require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') + +require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support +require 'cucumber/rails/world' +require 'cucumber/rails/active_record' +require 'cucumber/web/tableish' + +require 'capybara/rails' +require 'capybara/cucumber' +require 'capybara/session' +require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript +# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In +# order to ease the transition to Capybara we set the default here. If you'd +# prefer to use XPath just remove this line and adjust any selectors in your +# steps to use the XPath syntax. +Capybara.default_selector = :css + +# If you set this to false, any error raised from within your app will bubble +# up to your step definition and out to cucumber unless you catch it somewhere +# on the way. You can make Rails rescue errors and render error pages on a +# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag. +# +# If you set this to true, Rails will rescue all errors and render error +# pages, more or less in the same way your application would behave in the +# default production environment. It's not recommended to do this for all +# of your scenarios, as this makes it hard to discover errors in your application. +ActionController::Base.allow_rescue = false + +# If you set this to true, each scenario will run in a database transaction. +# You can still turn off transactions on a per-scenario basis, simply tagging +# a feature or scenario with the @no-txn tag. If you are using Capybara, +# tagging with @culerity or @javascript will also turn transactions off. +# +# If you set this to false, transactions will be off for all scenarios, +# regardless of whether you use @no-txn or not. +# +# Beware that turning transactions off will leave data in your database +# after each scenario, which can lead to hard-to-debug failures in +# subsequent scenarios. If you do this, we recommend you create a Before +# block that will explicitly put your database in a known state. +Cucumber::Rails::World.use_transactional_fixtures = true +# How to clean your database when transactions are turned off. See +# http://github.com/bmabey/database_cleaner for more info. +if defined?(ActiveRecord::Base) + begin + require 'database_cleaner' + DatabaseCleaner.strategy = :truncation + rescue LoadError => ignore_if_database_cleaner_not_present + end +end diff --git a/spec/rails_root/features/support/paths.rb b/spec/rails_root/features/support/paths.rb new file mode 100644 index 000000000..e2665aa36 --- /dev/null +++ b/spec/rails_root/features/support/paths.rb @@ -0,0 +1,45 @@ +module NavigationHelpers + # Maps a name to a path. Used by the + # + # When /^I go to (.+)$/ do |page_name| + # + # step definition in web_steps.rb + # + def path_to(page_name) + case page_name + + when /the home\s?page/ + '/' + + # Add more mappings here. + when /the sign up page/i + sign_up_path + when /the sign in page/i + sign_in_path + when /the password reset request page/i + new_password_path + when /the sign up page/i + sign_up_path + when /the sign in page/i + sign_in_path + when /the password reset request page/i + new_password_path + # Here is an example that pulls values out of the Regexp: + # + # when /^(.*)'s profile page$/i + # user_profile_path(User.find_by_login($1)) + + else + begin + page_name =~ /the (.*) page/ + path_components = $1.split(/\s+/) + self.send(path_components.push('path').join('_').to_sym) + rescue Object => e + raise "Can't find mapping from \"#{page_name}\" to a path.\n" + + "Now, go and add a mapping in #{__FILE__}" + end + end + end +end + +World(NavigationHelpers) diff --git a/spec/rails_root/lib/tasks/.gitkeep b/spec/rails_root/lib/tasks/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/spec/rails_root/lib/tasks/cucumber.rake b/spec/rails_root/lib/tasks/cucumber.rake new file mode 100644 index 000000000..7db1a5570 --- /dev/null +++ b/spec/rails_root/lib/tasks/cucumber.rake @@ -0,0 +1,53 @@ +# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril. +# It is recommended to regenerate this file in the future when you upgrade to a +# newer version of cucumber-rails. Consider adding your own code to a new file +# instead of editing this one. Cucumber will automatically load all features/**/*.rb +# files. + + +unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks + +vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first +$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil? + +begin + require 'cucumber/rake/task' + + namespace :cucumber do + Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| + t.binary = vendored_cucumber_bin # If nil, the gem's binary is used. + t.fork = true # You may get faster startup if you set this to false + t.profile = 'default' + end + + Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t| + t.binary = vendored_cucumber_bin + t.fork = true # You may get faster startup if you set this to false + t.profile = 'wip' + end + + Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t| + t.binary = vendored_cucumber_bin + t.fork = true # You may get faster startup if you set this to false + t.profile = 'rerun' + end + + desc 'Run all features' + task :all => [:ok, :wip] + end + desc 'Alias for cucumber:ok' + task :cucumber => 'cucumber:ok' + + task :default => :cucumber + + task :features => :cucumber do + STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***" + end +rescue LoadError + desc 'cucumber rake task not available (cucumber not installed)' + task :cucumber do + abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin' + end +end + +end diff --git a/spec/rails_root/public/404.html b/spec/rails_root/public/404.html new file mode 100644 index 000000000..9a48320a5 --- /dev/null +++ b/spec/rails_root/public/404.html @@ -0,0 +1,26 @@ + + + + The page you were looking for doesn't exist (404) + + + + + +
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+ + diff --git a/spec/rails_root/public/422.html b/spec/rails_root/public/422.html new file mode 100644 index 000000000..83660ab18 --- /dev/null +++ b/spec/rails_root/public/422.html @@ -0,0 +1,26 @@ + + + + The change you wanted was rejected (422) + + + + + +
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+ + diff --git a/spec/rails_root/public/500.html b/spec/rails_root/public/500.html new file mode 100644 index 000000000..b80307fc1 --- /dev/null +++ b/spec/rails_root/public/500.html @@ -0,0 +1,26 @@ + + + + We're sorry, but something went wrong (500) + + + + + +
+

We're sorry, but something went wrong.

+

We've been notified about this issue and we'll take a look at it shortly.

+
+ + diff --git a/spec/rails_root/public/favicon.ico b/spec/rails_root/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/spec/rails_root/public/images/rails.png b/spec/rails_root/public/images/rails.png new file mode 100644 index 0000000000000000000000000000000000000000..d5edc04e65f555e3ba4dcdaad39dc352e75b575e GIT binary patch literal 6646 zcmVpVcQya!6@Dsmj@#jv7C*qh zIhOJ6_K0n?*d`*T7TDuW-}m`9Kz3~>+7`DUkbAraU%yi+R{N~~XA2B%zt-4=tLimUer9!2M~N{G5bftFij_O&)a zsHnOppFIzebQ`RA0$!yUM-lg#*o@_O2wf422iLnM6cU(ktYU8#;*G!QGhIy9+ZfzKjLuZo%@a z-i@9A`X%J{^;2q&ZHY3C(B%gqCPW!8{9C0PMcNZccefK){s|V5-xxtHQc@uf>XqhD z7#N^siWqetgq29aX>G^olMf=bbRF6@Y(}zYxw6o!9WBdG1unP}<(V;zKlcR2p86fq zYjaqB^;Ycq>Wy@5T1xOzG3tucG3e%nPvajaN{CrFbnzv^9&K3$NrDm*eQe4`BGQ2bI;dFEwyt>hK%X!L6)82aOZp zsrGcJ#7PoX7)s|~t6is?FfX*7vWdREi58tiY4S)t6u*|kv?J)d_$r+CH#eZ?Ef+I_ z(eVlX8dh~4QP?o*E`_MgaNFIKj*rtN(0Raj3ECjSXcWfd#27NYs&~?t`QZFT}!Zaf=ldZIhi}LhQlqLo+o5(Pvui&{7PD__^53f9j>HW`Q z_V8X5j~$|GP9qXu0C#!@RX2}lXD35@3N5{BkUi%jtaPQ*H6OX2zIz4QPuqmTv3`vG{zc>l3t0B9E75h< z8&twGh%dp7WPNI+tRl%#gf2}Epg8st+~O4GjtwJsXfN;EjAmyr6z5dnaFU(;IV~QK zW62fogF~zA``(Q>_SmD!izc6Y4zq*97|NAPHp1j5X7Op2%;GLYm>^HEMyObo6s7l) zE3n|aOHi5~B84!}b^b*-aL2E)>OEJX_tJ~t<#VJ?bT?lDwyDB&5SZ$_1aUhmAY}#* zs@V1I+c5md9%R-o#_DUfqVtRk>59{+Opd5Yu%dAU#VQW}^m}x-30ftBx#527{^pI4 z6l2C6C7QBG$~NLYb3rVdLD#Z{+SleOp`(Lg5J}`kxdTHe(nV5BdpLrD=l|)e$gEqA zwI6vuX-PFCtcDIH>bGY2dwq&^tf+&R?)nY-@7_j%4CMRAF}C9w%p86W<2!aSY$p+k zrkFtG=cGo38RnrG28;?PNk%7a@faaXq&MS*&?1Z`7Ojw7(#>}ZG4nMAs3VXxfdW>i zY4VX02c5;f7jDPY_7@Oa)CHH}cH<3y#}_!nng^W+h1e-RL*YFYOteC@h?BtJZ+?sE zy)P5^8Mregx{nQaw1NY-|3>{Z)|0`?zc?G2-acYiSU`tj#sSGfm7k86ZQ0SQgPevcklHxM9<~4yW zR796sisf1|!#{Z=e^)0;_8iUhL8g(;j$l=02FTPZ(dZV@s#aQ`DHkLM6=YsbE4iQ!b#*374l0Jw5;jD%J;vQayq=nD8-kHI~f9Ux|32SJUM`> zGp2UGK*4t?cRKi!2he`zI#j0f${I#f-jeT?u_C7S4WsA0)ryi-1L0(@%pa^&g5x=e z=KW9+Nn(=)1T&S8g_ug%dgk*~l2O-$r9#zEGBdQsweO%t*6F4c8JC36JtTizCyy+E4h%G(+ z5>y$%0txMuQ$e~wjFgN(xrAndHQo`Za+K*?gUVDTBV&Ap^}|{w#CIq{DRe}+l@(Ec zCCV6f_?dY_{+f{}6XGn!pL_up?}@>KijT^$w#Lb6iHW&^8RP~g6y=vZBXx~B9nI^i zGexaPjcd(%)zGw!DG_dDwh-7x6+ST#R^${iz_M$uM!da8SxgB_;Z0G%Y*HpvLjKw; zX=ir7i1O$-T|*TBoH$dlW+TLf5j5sep^DlDtkox;Kg{Q%EXWedJq@J@%VAcK)j3y1 zShM!CS#qax;D@RND%2t3W6kv+#Ky0F9<3YKDbV^XJ=^$s(Vtza8V72YY)577nnldI zHMA0PUo!F3j(ubV*CM@PiK<^|RM2(DuCbG7`W}Rg(xdYC>C~ z;1KJGLN&$cRxSZunjXcntykmpFJ7;dk>shY(DdK&3K_JDJ6R%D`e~6Qv67@Rwu+q9 z*|NG{r}4F8f{Dfzt0+cZMd$fvlX3Q`dzM46@r?ISxr;9gBTG2rmfiGOD*#c*3f)cc zF+PFZobY$-^}J8 z%n=h4;x2}cP!@SiVd!v;^Wwo0(N??-ygDr7gG^NKxDjSo{5T{?$|Qo5;8V!~D6O;F*I zuY!gd@+2j_8Rn=UWDa#*4E2auWoGYDddMW7t0=yuC(xLWky?vLimM~!$3fgu!dR>p z?L?!8z>6v$|MsLb&dU?ob)Zd!B)!a*Z2eTE7 zKCzP&e}XO>CT%=o(v+WUY`Az*`9inbTG& z_9_*oQKw;sc8{ipoBC`S4Tb7a%tUE)1fE+~ib$;|(`|4QbXc2>VzFi%1nX%ti;^s3~NIL0R}!!a{0A zyCRp0F7Y&vcP&3`&Dzv5!&#h}F2R-h&QhIfq*ts&qO13{_CP}1*sLz!hI9VoTSzTu zok5pV0+~jrGymE~{TgbS#nN5+*rF7ij)cnSLQw0Ltc70zmk|O!O(kM<3zw-sUvkx~ z2`y+{xAwKSa-0}n7{$I@Zop7CWy%_xIeN1e-7&OjQ6vZZPbZ^3_ z(~=;ZSP98S2oB#35b1~_x`2gWiPdIVddEf`AD9<@c_s)TM;3J$T_l?pr{<7PTgdiy zBc5IGx)g~n=s+Z$RzYCmv8PlJu%gkh^;%mTGMc)UwRINVD~K;`Rl!5@hhGg;y>5qj zq|u-Yf0q_~Y+Mbivkkfa0nAOzB1acnytogsj_m7FB(-FjihMek#GAU4M!iXCgdK8a zjoKm?*|iz7;dHm4$^hh(`Ufl>yb>$hjIA-;>{>C}G0Di%bGvUsJkfLAV|xq32c>RqJqTBJ3Dx zYC;*Dt|S$b6)aCJFnK(Eey$M1DpVV~_MIhwK> zygo(jWC|_IRw|456`roEyXtkNLWNAt-4N1qyN$I@DvBzt;e|?g<*HK1%~cq|^u*}C zmMrwh>{QAq?Ar~4l^DqT%SQ)w)FA(#7#u+N;>E975rYML>)LgE`2<7nN=C1pC{IkV zVw}_&v6j&S?QVh*)wF3#XmE@0($^BVl1969csLKUBNer{suVd!a~B!0MxWY?=(GD6 zy$G&ERFR#i6G4=2F?R4}Mz3B?3tnpoX3)qFF2sh9-Jn*e%9F>i{WG7$_~XyOO2!+@ z6k+38KyD@-0=uee54D0!Z1@B^ilj~StchdOn(*qvg~s5QJpWGc!6U^Aj!xt-HZn_V zS%|fyQ5YS@EP2lBIodXCLjG_+a)%En+7jzngk@J>6D~^xbxKkvf-R0-c%mX+o{?&j zZZ%RxFeav8Y0gkwtdtrwUb-i0Egd2C=ADu%w5VV-hNJvl)GZ?M;y$!?b=S+wKRK7Q zcOjPT!p<*#8m;TsBih=@Xc&c)?Vy`Ys>IvK@|1%N+M6J-^RCRaZcPP2eQh9DEGZr+ z?8B~wF14mk4Xkuen{wY^CWwS1PI<8gikY*)3?RSo5l8es4*J z43k_BIwc}of=6Pfs%xIxlMDGOJN zvl!a>G)52XMqA%fbgkZi%)%bN*ZzZw2!rn4@+J)2eK#kWuEW{)W~-`y1vhA5-7p%R z&f5N!a9f8cK1Xa=O}=9{wg%}Ur^+8Y(!UCeqw>%wj@|bYHD-bZO~mk3L$9_^MmF3G zvCiK^e@q6G?tHkM8%GqsBMZaB20W$UEt_5r~jc#WlR>Bv{6W>A=!#InoY zLOd04@Rz?*7PpW8u|+}bt`?+Z(GsX{Br4A2$ZZ(26Degmr9`O=t2KgHTL*==R3xcP z&Y(J7hC@6_x8zVz!CX3l4Xtss6i7r#E6kXMNN1~>9KTRzewfp))ij%)SBBl0fZdYP zd!zzQD5u8yk-u|41|Rqz7_tCFUMThZJVj)yQf6^Cwtn|Ew6cm5J|u1Bq>MWX-AfB&NE;C z62@=-0le`E6-CurMKjoIy)BuUmhMGJb}pPx!@GLWMT+wH2R?wA=MEy)o57~feFp8P zY@YXAyt4<1FD<|iw{FGQu~GEI<4C64)V*QiVk+VzOV^9GWf4ir#oYgHJz!wq>iZV#_6@_{)&lum)4x z_Of*CLVQ7wdT#XT-(h0qH%mcIF7yzMIvvTN3bPceK>PpJi(=3Nny zbSn}p$dGKQUlX&-t~RR)#F7I<8NCD^yke(vdf#4^aAh}M-{tS9-&^tC4`KU_pToXy z+|K8sx}a)Kh{h{;*V1#hs1xB%(?j>)g~`Wv(9F)f=Qn)(daVB7hZtcp^#LrEr1T1J zZSJ*lVyVVjhy)mkex9Whn=EinKDHe@KlfQI-Fl7M?-c~HnW0;C;+MbUY8?FToy;A+ zs&Nc7VZ=Of+e!G6s#+S5WBU)kgQq_I1@!uH74GJ-+O|%0HXm9Mqlvp|j%0`T>fr9^ zK;qo>XdwZW<>%tTA+<(1^6(>=-2N;hRgBnjvEjN;VbKMbFg--WrGy|XESoH1p|M4` z86(gC^vB4qScASZ&cdpT{~QDN-jC|GJ(RYoW1VW4!SSn- zhQds9&RBKn6M&GVK_Aayt(Hekbnw=tr>f z^o@v9_*iQO1*zeOrts9Q-$pc@!StS&kz$cF`s@pM`rmJXTP&h5G)A74!0e%ZJbl}( zssI|_!%~_hZFypv*S^JE5N&Kvmx7KiG<|fGMO=WrH+@Yhuj+KwiS#l4>@%2nl zS)mDikfmokO4q2A)hRVZBq2-5q&XC>%HOLkOYxZ66(s86?=0s4z5xbiOV)}L-&6b)h6(~CIaR#JNw~46+WBiU7IhB zq!NuR4!TsYnyBg>@G=Ib*cMq^k<}AMpCeYEf&dzfiGI-wOQ7hb+nA zkN7_){y&c3xC0 AQ~&?~ literal 0 HcmV?d00001 diff --git a/spec/rails_root/public/javascripts/application.js b/spec/rails_root/public/javascripts/application.js new file mode 100644 index 000000000..fe4577696 --- /dev/null +++ b/spec/rails_root/public/javascripts/application.js @@ -0,0 +1,2 @@ +// Place your application-specific JavaScript functions and classes here +// This file is automatically included by javascript_include_tag :defaults diff --git a/spec/rails_root/public/javascripts/controls.js b/spec/rails_root/public/javascripts/controls.js new file mode 100644 index 000000000..7392fb664 --- /dev/null +++ b/spec/rails_root/public/javascripts/controls.js @@ -0,0 +1,965 @@ +// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 + +// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan) +// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com) +// Contributors: +// Richard Livsey +// Rahul Bhargava +// Rob Wills +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +// Autocompleter.Base handles all the autocompletion functionality +// that's independent of the data source for autocompletion. This +// includes drawing the autocompletion menu, observing keyboard +// and mouse events, and similar. +// +// Specific autocompleters need to provide, at the very least, +// a getUpdatedChoices function that will be invoked every time +// the text inside the monitored textbox changes. This method +// should get the text for which to provide autocompletion by +// invoking this.getToken(), NOT by directly accessing +// this.element.value. This is to allow incremental tokenized +// autocompletion. Specific auto-completion logic (AJAX, etc) +// belongs in getUpdatedChoices. +// +// Tokenized incremental autocompletion is enabled automatically +// when an autocompleter is instantiated with the 'tokens' option +// in the options parameter, e.g.: +// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' }); +// will incrementally autocomplete with a comma as the token. +// Additionally, ',' in the above example can be replaced with +// a token array, e.g. { tokens: [',', '\n'] } which +// enables autocompletion on multiple tokens. This is most +// useful when one of the tokens is \n (a newline), as it +// allows smart autocompletion after linebreaks. + +if(typeof Effect == 'undefined') + throw("controls.js requires including script.aculo.us' effects.js library"); + +var Autocompleter = { }; +Autocompleter.Base = Class.create({ + baseInitialize: function(element, update, options) { + element = $(element); + this.element = element; + this.update = $(update); + this.hasFocus = false; + this.changed = false; + this.active = false; + this.index = 0; + this.entryCount = 0; + this.oldElementValue = this.element.value; + + if(this.setOptions) + this.setOptions(options); + else + this.options = options || { }; + + this.options.paramName = this.options.paramName || this.element.name; + this.options.tokens = this.options.tokens || []; + this.options.frequency = this.options.frequency || 0.4; + this.options.minChars = this.options.minChars || 1; + this.options.onShow = this.options.onShow || + function(element, update){ + if(!update.style.position || update.style.position=='absolute') { + update.style.position = 'absolute'; + Position.clone(element, update, { + setHeight: false, + offsetTop: element.offsetHeight + }); + } + Effect.Appear(update,{duration:0.15}); + }; + this.options.onHide = this.options.onHide || + function(element, update){ new Effect.Fade(update,{duration:0.15}) }; + + if(typeof(this.options.tokens) == 'string') + this.options.tokens = new Array(this.options.tokens); + // Force carriage returns as token delimiters anyway + if (!this.options.tokens.include('\n')) + this.options.tokens.push('\n'); + + this.observer = null; + + this.element.setAttribute('autocomplete','off'); + + Element.hide(this.update); + + Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this)); + Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this)); + }, + + show: function() { + if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); + if(!this.iefix && + (Prototype.Browser.IE) && + (Element.getStyle(this.update, 'position')=='absolute')) { + new Insertion.After(this.update, + ''); + this.iefix = $(this.update.id+'_iefix'); + } + if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); + }, + + fixIEOverlapping: function() { + Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); + this.iefix.style.zIndex = 1; + this.update.style.zIndex = 2; + Element.show(this.iefix); + }, + + hide: function() { + this.stopIndicator(); + if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update); + if(this.iefix) Element.hide(this.iefix); + }, + + startIndicator: function() { + if(this.options.indicator) Element.show(this.options.indicator); + }, + + stopIndicator: function() { + if(this.options.indicator) Element.hide(this.options.indicator); + }, + + onKeyPress: function(event) { + if(this.active) + switch(event.keyCode) { + case Event.KEY_TAB: + case Event.KEY_RETURN: + this.selectEntry(); + Event.stop(event); + case Event.KEY_ESC: + this.hide(); + this.active = false; + Event.stop(event); + return; + case Event.KEY_LEFT: + case Event.KEY_RIGHT: + return; + case Event.KEY_UP: + this.markPrevious(); + this.render(); + Event.stop(event); + return; + case Event.KEY_DOWN: + this.markNext(); + this.render(); + Event.stop(event); + return; + } + else + if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || + (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return; + + this.changed = true; + this.hasFocus = true; + + if(this.observer) clearTimeout(this.observer); + this.observer = + setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); + }, + + activate: function() { + this.changed = false; + this.hasFocus = true; + this.getUpdatedChoices(); + }, + + onHover: function(event) { + var element = Event.findElement(event, 'LI'); + if(this.index != element.autocompleteIndex) + { + this.index = element.autocompleteIndex; + this.render(); + } + Event.stop(event); + }, + + onClick: function(event) { + var element = Event.findElement(event, 'LI'); + this.index = element.autocompleteIndex; + this.selectEntry(); + this.hide(); + }, + + onBlur: function(event) { + // needed to make click events working + setTimeout(this.hide.bind(this), 250); + this.hasFocus = false; + this.active = false; + }, + + render: function() { + if(this.entryCount > 0) { + for (var i = 0; i < this.entryCount; i++) + this.index==i ? + Element.addClassName(this.getEntry(i),"selected") : + Element.removeClassName(this.getEntry(i),"selected"); + if(this.hasFocus) { + this.show(); + this.active = true; + } + } else { + this.active = false; + this.hide(); + } + }, + + markPrevious: function() { + if(this.index > 0) this.index--; + else this.index = this.entryCount-1; + this.getEntry(this.index).scrollIntoView(true); + }, + + markNext: function() { + if(this.index < this.entryCount-1) this.index++; + else this.index = 0; + this.getEntry(this.index).scrollIntoView(false); + }, + + getEntry: function(index) { + return this.update.firstChild.childNodes[index]; + }, + + getCurrentEntry: function() { + return this.getEntry(this.index); + }, + + selectEntry: function() { + this.active = false; + this.updateElement(this.getCurrentEntry()); + }, + + updateElement: function(selectedElement) { + if (this.options.updateElement) { + this.options.updateElement(selectedElement); + return; + } + var value = ''; + if (this.options.select) { + var nodes = $(selectedElement).select('.' + this.options.select) || []; + if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); + } else + value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); + + var bounds = this.getTokenBounds(); + if (bounds[0] != -1) { + var newValue = this.element.value.substr(0, bounds[0]); + var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/); + if (whitespace) + newValue += whitespace[0]; + this.element.value = newValue + value + this.element.value.substr(bounds[1]); + } else { + this.element.value = value; + } + this.oldElementValue = this.element.value; + this.element.focus(); + + if (this.options.afterUpdateElement) + this.options.afterUpdateElement(this.element, selectedElement); + }, + + updateChoices: function(choices) { + if(!this.changed && this.hasFocus) { + this.update.innerHTML = choices; + Element.cleanWhitespace(this.update); + Element.cleanWhitespace(this.update.down()); + + if(this.update.firstChild && this.update.down().childNodes) { + this.entryCount = + this.update.down().childNodes.length; + for (var i = 0; i < this.entryCount; i++) { + var entry = this.getEntry(i); + entry.autocompleteIndex = i; + this.addObservers(entry); + } + } else { + this.entryCount = 0; + } + + this.stopIndicator(); + this.index = 0; + + if(this.entryCount==1 && this.options.autoSelect) { + this.selectEntry(); + this.hide(); + } else { + this.render(); + } + } + }, + + addObservers: function(element) { + Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this)); + Event.observe(element, "click", this.onClick.bindAsEventListener(this)); + }, + + onObserverEvent: function() { + this.changed = false; + this.tokenBounds = null; + if(this.getToken().length>=this.options.minChars) { + this.getUpdatedChoices(); + } else { + this.active = false; + this.hide(); + } + this.oldElementValue = this.element.value; + }, + + getToken: function() { + var bounds = this.getTokenBounds(); + return this.element.value.substring(bounds[0], bounds[1]).strip(); + }, + + getTokenBounds: function() { + if (null != this.tokenBounds) return this.tokenBounds; + var value = this.element.value; + if (value.strip().empty()) return [-1, 0]; + var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue); + var offset = (diff == this.oldElementValue.length ? 1 : 0); + var prevTokenPos = -1, nextTokenPos = value.length; + var tp; + for (var index = 0, l = this.options.tokens.length; index < l; ++index) { + tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1); + if (tp > prevTokenPos) prevTokenPos = tp; + tp = value.indexOf(this.options.tokens[index], diff + offset); + if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp; + } + return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]); + } +}); + +Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) { + var boundary = Math.min(newS.length, oldS.length); + for (var index = 0; index < boundary; ++index) + if (newS[index] != oldS[index]) + return index; + return boundary; +}; + +Ajax.Autocompleter = Class.create(Autocompleter.Base, { + initialize: function(element, update, url, options) { + this.baseInitialize(element, update, options); + this.options.asynchronous = true; + this.options.onComplete = this.onComplete.bind(this); + this.options.defaultParams = this.options.parameters || null; + this.url = url; + }, + + getUpdatedChoices: function() { + this.startIndicator(); + + var entry = encodeURIComponent(this.options.paramName) + '=' + + encodeURIComponent(this.getToken()); + + this.options.parameters = this.options.callback ? + this.options.callback(this.element, entry) : entry; + + if(this.options.defaultParams) + this.options.parameters += '&' + this.options.defaultParams; + + new Ajax.Request(this.url, this.options); + }, + + onComplete: function(request) { + this.updateChoices(request.responseText); + } +}); + +// The local array autocompleter. Used when you'd prefer to +// inject an array of autocompletion options into the page, rather +// than sending out Ajax queries, which can be quite slow sometimes. +// +// The constructor takes four parameters. The first two are, as usual, +// the id of the monitored textbox, and id of the autocompletion menu. +// The third is the array you want to autocomplete from, and the fourth +// is the options block. +// +// Extra local autocompletion options: +// - choices - How many autocompletion choices to offer +// +// - partialSearch - If false, the autocompleter will match entered +// text only at the beginning of strings in the +// autocomplete array. Defaults to true, which will +// match text at the beginning of any *word* in the +// strings in the autocomplete array. If you want to +// search anywhere in the string, additionally set +// the option fullSearch to true (default: off). +// +// - fullSsearch - Search anywhere in autocomplete array strings. +// +// - partialChars - How many characters to enter before triggering +// a partial match (unlike minChars, which defines +// how many characters are required to do any match +// at all). Defaults to 2. +// +// - ignoreCase - Whether to ignore case when autocompleting. +// Defaults to true. +// +// It's possible to pass in a custom function as the 'selector' +// option, if you prefer to write your own autocompletion logic. +// In that case, the other options above will not apply unless +// you support them. + +Autocompleter.Local = Class.create(Autocompleter.Base, { + initialize: function(element, update, array, options) { + this.baseInitialize(element, update, options); + this.options.array = array; + }, + + getUpdatedChoices: function() { + this.updateChoices(this.options.selector(this)); + }, + + setOptions: function(options) { + this.options = Object.extend({ + choices: 10, + partialSearch: true, + partialChars: 2, + ignoreCase: true, + fullSearch: false, + selector: function(instance) { + var ret = []; // Beginning matches + var partial = []; // Inside matches + var entry = instance.getToken(); + var count = 0; + + for (var i = 0; i < instance.options.array.length && + ret.length < instance.options.choices ; i++) { + + var elem = instance.options.array[i]; + var foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase()) : + elem.indexOf(entry); + + while (foundPos != -1) { + if (foundPos == 0 && elem.length != entry.length) { + ret.push("
  • " + elem.substr(0, entry.length) + "" + + elem.substr(entry.length) + "
    • "); + break; + } else if (entry.length >= instance.options.partialChars && + instance.options.partialSearch && foundPos != -1) { + if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { + partial.push("
  • " + elem.substr(0, foundPos) + "" + + elem.substr(foundPos, entry.length) + "" + elem.substr( + foundPos + entry.length) + "
    • "); + break; + } + } + + foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : + elem.indexOf(entry, foundPos + 1); + + } + } + if (partial.length) + ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)); + return "
      " + ret.join('') + "
    "; + } + }, options || { }); + } +}); + +// AJAX in-place editor and collection editor +// Full rewrite by Christophe Porteneuve (April 2007). + +// Use this if you notice weird scrolling problems on some browsers, +// the DOM might be a bit confused when this gets called so do this +// waits 1 ms (with setTimeout) until it does the activation +Field.scrollFreeActivate = function(field) { + setTimeout(function() { + Field.activate(field); + }, 1); +}; + +Ajax.InPlaceEditor = Class.create({ + initialize: function(element, url, options) { + this.url = url; + this.element = element = $(element); + this.prepareOptions(); + this._controls = { }; + arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!! + Object.extend(this.options, options || { }); + if (!this.options.formId && this.element.id) { + this.options.formId = this.element.id + '-inplaceeditor'; + if ($(this.options.formId)) + this.options.formId = ''; + } + if (this.options.externalControl) + this.options.externalControl = $(this.options.externalControl); + if (!this.options.externalControl) + this.options.externalControlOnly = false; + this._originalBackground = this.element.getStyle('background-color') || 'transparent'; + this.element.title = this.options.clickToEditText; + this._boundCancelHandler = this.handleFormCancellation.bind(this); + this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this); + this._boundFailureHandler = this.handleAJAXFailure.bind(this); + this._boundSubmitHandler = this.handleFormSubmission.bind(this); + this._boundWrapperHandler = this.wrapUp.bind(this); + this.registerListeners(); + }, + checkForEscapeOrReturn: function(e) { + if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return; + if (Event.KEY_ESC == e.keyCode) + this.handleFormCancellation(e); + else if (Event.KEY_RETURN == e.keyCode) + this.handleFormSubmission(e); + }, + createControl: function(mode, handler, extraClasses) { + var control = this.options[mode + 'Control']; + var text = this.options[mode + 'Text']; + if ('button' == control) { + var btn = document.createElement('input'); + btn.type = 'submit'; + btn.value = text; + btn.className = 'editor_' + mode + '_button'; + if ('cancel' == mode) + btn.onclick = this._boundCancelHandler; + this._form.appendChild(btn); + this._controls[mode] = btn; + } else if ('link' == control) { + var link = document.createElement('a'); + link.href = '#'; + link.appendChild(document.createTextNode(text)); + link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler; + link.className = 'editor_' + mode + '_link'; + if (extraClasses) + link.className += ' ' + extraClasses; + this._form.appendChild(link); + this._controls[mode] = link; + } + }, + createEditField: function() { + var text = (this.options.loadTextURL ? this.options.loadingText : this.getText()); + var fld; + if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) { + fld = document.createElement('input'); + fld.type = 'text'; + var size = this.options.size || this.options.cols || 0; + if (0 < size) fld.size = size; + } else { + fld = document.createElement('textarea'); + fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows); + fld.cols = this.options.cols || 40; + } + fld.name = this.options.paramName; + fld.value = text; // No HTML breaks conversion anymore + fld.className = 'editor_field'; + if (this.options.submitOnBlur) + fld.onblur = this._boundSubmitHandler; + this._controls.editor = fld; + if (this.options.loadTextURL) + this.loadExternalText(); + this._form.appendChild(this._controls.editor); + }, + createForm: function() { + var ipe = this; + function addText(mode, condition) { + var text = ipe.options['text' + mode + 'Controls']; + if (!text || condition === false) return; + ipe._form.appendChild(document.createTextNode(text)); + }; + this._form = $(document.createElement('form')); + this._form.id = this.options.formId; + this._form.addClassName(this.options.formClassName); + this._form.onsubmit = this._boundSubmitHandler; + this.createEditField(); + if ('textarea' == this._controls.editor.tagName.toLowerCase()) + this._form.appendChild(document.createElement('br')); + if (this.options.onFormCustomization) + this.options.onFormCustomization(this, this._form); + addText('Before', this.options.okControl || this.options.cancelControl); + this.createControl('ok', this._boundSubmitHandler); + addText('Between', this.options.okControl && this.options.cancelControl); + this.createControl('cancel', this._boundCancelHandler, 'editor_cancel'); + addText('After', this.options.okControl || this.options.cancelControl); + }, + destroy: function() { + if (this._oldInnerHTML) + this.element.innerHTML = this._oldInnerHTML; + this.leaveEditMode(); + this.unregisterListeners(); + }, + enterEditMode: function(e) { + if (this._saving || this._editing) return; + this._editing = true; + this.triggerCallback('onEnterEditMode'); + if (this.options.externalControl) + this.options.externalControl.hide(); + this.element.hide(); + this.createForm(); + this.element.parentNode.insertBefore(this._form, this.element); + if (!this.options.loadTextURL) + this.postProcessEditField(); + if (e) Event.stop(e); + }, + enterHover: function(e) { + if (this.options.hoverClassName) + this.element.addClassName(this.options.hoverClassName); + if (this._saving) return; + this.triggerCallback('onEnterHover'); + }, + getText: function() { + return this.element.innerHTML.unescapeHTML(); + }, + handleAJAXFailure: function(transport) { + this.triggerCallback('onFailure', transport); + if (this._oldInnerHTML) { + this.element.innerHTML = this._oldInnerHTML; + this._oldInnerHTML = null; + } + }, + handleFormCancellation: function(e) { + this.wrapUp(); + if (e) Event.stop(e); + }, + handleFormSubmission: function(e) { + var form = this._form; + var value = $F(this._controls.editor); + this.prepareSubmission(); + var params = this.options.callback(form, value) || ''; + if (Object.isString(params)) + params = params.toQueryParams(); + params.editorId = this.element.id; + if (this.options.htmlResponse) { + var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions); + Object.extend(options, { + parameters: params, + onComplete: this._boundWrapperHandler, + onFailure: this._boundFailureHandler + }); + new Ajax.Updater({ success: this.element }, this.url, options); + } else { + var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); + Object.extend(options, { + parameters: params, + onComplete: this._boundWrapperHandler, + onFailure: this._boundFailureHandler + }); + new Ajax.Request(this.url, options); + } + if (e) Event.stop(e); + }, + leaveEditMode: function() { + this.element.removeClassName(this.options.savingClassName); + this.removeForm(); + this.leaveHover(); + this.element.style.backgroundColor = this._originalBackground; + this.element.show(); + if (this.options.externalControl) + this.options.externalControl.show(); + this._saving = false; + this._editing = false; + this._oldInnerHTML = null; + this.triggerCallback('onLeaveEditMode'); + }, + leaveHover: function(e) { + if (this.options.hoverClassName) + this.element.removeClassName(this.options.hoverClassName); + if (this._saving) return; + this.triggerCallback('onLeaveHover'); + }, + loadExternalText: function() { + this._form.addClassName(this.options.loadingClassName); + this._controls.editor.disabled = true; + var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); + Object.extend(options, { + parameters: 'editorId=' + encodeURIComponent(this.element.id), + onComplete: Prototype.emptyFunction, + onSuccess: function(transport) { + this._form.removeClassName(this.options.loadingClassName); + var text = transport.responseText; + if (this.options.stripLoadedTextTags) + text = text.stripTags(); + this._controls.editor.value = text; + this._controls.editor.disabled = false; + this.postProcessEditField(); + }.bind(this), + onFailure: this._boundFailureHandler + }); + new Ajax.Request(this.options.loadTextURL, options); + }, + postProcessEditField: function() { + var fpc = this.options.fieldPostCreation; + if (fpc) + $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate'](); + }, + prepareOptions: function() { + this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions); + Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks); + [this._extraDefaultOptions].flatten().compact().each(function(defs) { + Object.extend(this.options, defs); + }.bind(this)); + }, + prepareSubmission: function() { + this._saving = true; + this.removeForm(); + this.leaveHover(); + this.showSaving(); + }, + registerListeners: function() { + this._listeners = { }; + var listener; + $H(Ajax.InPlaceEditor.Listeners).each(function(pair) { + listener = this[pair.value].bind(this); + this._listeners[pair.key] = listener; + if (!this.options.externalControlOnly) + this.element.observe(pair.key, listener); + if (this.options.externalControl) + this.options.externalControl.observe(pair.key, listener); + }.bind(this)); + }, + removeForm: function() { + if (!this._form) return; + this._form.remove(); + this._form = null; + this._controls = { }; + }, + showSaving: function() { + this._oldInnerHTML = this.element.innerHTML; + this.element.innerHTML = this.options.savingText; + this.element.addClassName(this.options.savingClassName); + this.element.style.backgroundColor = this._originalBackground; + this.element.show(); + }, + triggerCallback: function(cbName, arg) { + if ('function' == typeof this.options[cbName]) { + this.options[cbName](this, arg); + } + }, + unregisterListeners: function() { + $H(this._listeners).each(function(pair) { + if (!this.options.externalControlOnly) + this.element.stopObserving(pair.key, pair.value); + if (this.options.externalControl) + this.options.externalControl.stopObserving(pair.key, pair.value); + }.bind(this)); + }, + wrapUp: function(transport) { + this.leaveEditMode(); + // Can't use triggerCallback due to backward compatibility: requires + // binding + direct element + this._boundComplete(transport, this.element); + } +}); + +Object.extend(Ajax.InPlaceEditor.prototype, { + dispose: Ajax.InPlaceEditor.prototype.destroy +}); + +Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, { + initialize: function($super, element, url, options) { + this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions; + $super(element, url, options); + }, + + createEditField: function() { + var list = document.createElement('select'); + list.name = this.options.paramName; + list.size = 1; + this._controls.editor = list; + this._collection = this.options.collection || []; + if (this.options.loadCollectionURL) + this.loadCollection(); + else + this.checkForExternalText(); + this._form.appendChild(this._controls.editor); + }, + + loadCollection: function() { + this._form.addClassName(this.options.loadingClassName); + this.showLoadingText(this.options.loadingCollectionText); + var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); + Object.extend(options, { + parameters: 'editorId=' + encodeURIComponent(this.element.id), + onComplete: Prototype.emptyFunction, + onSuccess: function(transport) { + var js = transport.responseText.strip(); + if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check + throw('Server returned an invalid collection representation.'); + this._collection = eval(js); + this.checkForExternalText(); + }.bind(this), + onFailure: this.onFailure + }); + new Ajax.Request(this.options.loadCollectionURL, options); + }, + + showLoadingText: function(text) { + this._controls.editor.disabled = true; + var tempOption = this._controls.editor.firstChild; + if (!tempOption) { + tempOption = document.createElement('option'); + tempOption.value = ''; + this._controls.editor.appendChild(tempOption); + tempOption.selected = true; + } + tempOption.update((text || '').stripScripts().stripTags()); + }, + + checkForExternalText: function() { + this._text = this.getText(); + if (this.options.loadTextURL) + this.loadExternalText(); + else + this.buildOptionList(); + }, + + loadExternalText: function() { + this.showLoadingText(this.options.loadingText); + var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); + Object.extend(options, { + parameters: 'editorId=' + encodeURIComponent(this.element.id), + onComplete: Prototype.emptyFunction, + onSuccess: function(transport) { + this._text = transport.responseText.strip(); + this.buildOptionList(); + }.bind(this), + onFailure: this.onFailure + }); + new Ajax.Request(this.options.loadTextURL, options); + }, + + buildOptionList: function() { + this._form.removeClassName(this.options.loadingClassName); + this._collection = this._collection.map(function(entry) { + return 2 === entry.length ? entry : [entry, entry].flatten(); + }); + var marker = ('value' in this.options) ? this.options.value : this._text; + var textFound = this._collection.any(function(entry) { + return entry[0] == marker; + }.bind(this)); + this._controls.editor.update(''); + var option; + this._collection.each(function(entry, index) { + option = document.createElement('option'); + option.value = entry[0]; + option.selected = textFound ? entry[0] == marker : 0 == index; + option.appendChild(document.createTextNode(entry[1])); + this._controls.editor.appendChild(option); + }.bind(this)); + this._controls.editor.disabled = false; + Field.scrollFreeActivate(this._controls.editor); + } +}); + +//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! **** +//**** This only exists for a while, in order to let **** +//**** users adapt to the new API. Read up on the new **** +//**** API and convert your code to it ASAP! **** + +Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) { + if (!options) return; + function fallback(name, expr) { + if (name in options || expr === undefined) return; + options[name] = expr; + }; + fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' : + options.cancelLink == options.cancelButton == false ? false : undefined))); + fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' : + options.okLink == options.okButton == false ? false : undefined))); + fallback('highlightColor', options.highlightcolor); + fallback('highlightEndColor', options.highlightendcolor); +}; + +Object.extend(Ajax.InPlaceEditor, { + DefaultOptions: { + ajaxOptions: { }, + autoRows: 3, // Use when multi-line w/ rows == 1 + cancelControl: 'link', // 'link'|'button'|false + cancelText: 'cancel', + clickToEditText: 'Click to edit', + externalControl: null, // id|elt + externalControlOnly: false, + fieldPostCreation: 'activate', // 'activate'|'focus'|false + formClassName: 'inplaceeditor-form', + formId: null, // id|elt + highlightColor: '#ffff99', + highlightEndColor: '#ffffff', + hoverClassName: '', + htmlResponse: true, + loadingClassName: 'inplaceeditor-loading', + loadingText: 'Loading...', + okControl: 'button', // 'link'|'button'|false + okText: 'ok', + paramName: 'value', + rows: 1, // If 1 and multi-line, uses autoRows + savingClassName: 'inplaceeditor-saving', + savingText: 'Saving...', + size: 0, + stripLoadedTextTags: false, + submitOnBlur: false, + textAfterControls: '', + textBeforeControls: '', + textBetweenControls: '' + }, + DefaultCallbacks: { + callback: function(form) { + return Form.serialize(form); + }, + onComplete: function(transport, element) { + // For backward compatibility, this one is bound to the IPE, and passes + // the element directly. It was too often customized, so we don't break it. + new Effect.Highlight(element, { + startcolor: this.options.highlightColor, keepBackgroundImage: true }); + }, + onEnterEditMode: null, + onEnterHover: function(ipe) { + ipe.element.style.backgroundColor = ipe.options.highlightColor; + if (ipe._effect) + ipe._effect.cancel(); + }, + onFailure: function(transport, ipe) { + alert('Error communication with the server: ' + transport.responseText.stripTags()); + }, + onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls. + onLeaveEditMode: null, + onLeaveHover: function(ipe) { + ipe._effect = new Effect.Highlight(ipe.element, { + startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor, + restorecolor: ipe._originalBackground, keepBackgroundImage: true + }); + } + }, + Listeners: { + click: 'enterEditMode', + keydown: 'checkForEscapeOrReturn', + mouseover: 'enterHover', + mouseout: 'leaveHover' + } +}); + +Ajax.InPlaceCollectionEditor.DefaultOptions = { + loadingCollectionText: 'Loading options...' +}; + +// Delayed observer, like Form.Element.Observer, +// but waits for delay after last key input +// Ideal for live-search fields + +Form.Element.DelayedObserver = Class.create({ + initialize: function(element, delay, callback) { + this.delay = delay || 0.5; + this.element = $(element); + this.callback = callback; + this.timer = null; + this.lastValue = $F(this.element); + Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); + }, + delayedListener: function(event) { + if(this.lastValue == $F(this.element)) return; + if(this.timer) clearTimeout(this.timer); + this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000); + this.lastValue = $F(this.element); + }, + onTimerEvent: function() { + this.timer = null; + this.callback(this.element, $F(this.element)); + } +}); \ No newline at end of file diff --git a/spec/rails_root/public/javascripts/dragdrop.js b/spec/rails_root/public/javascripts/dragdrop.js new file mode 100644 index 000000000..15c6dbca6 --- /dev/null +++ b/spec/rails_root/public/javascripts/dragdrop.js @@ -0,0 +1,974 @@ +// script.aculo.us dragdrop.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 + +// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +if(Object.isUndefined(Effect)) + throw("dragdrop.js requires including script.aculo.us' effects.js library"); + +var Droppables = { + drops: [], + + remove: function(element) { + this.drops = this.drops.reject(function(d) { return d.element==$(element) }); + }, + + add: function(element) { + element = $(element); + var options = Object.extend({ + greedy: true, + hoverclass: null, + tree: false + }, arguments[1] || { }); + + // cache containers + if(options.containment) { + options._containers = []; + var containment = options.containment; + if(Object.isArray(containment)) { + containment.each( function(c) { options._containers.push($(c)) }); + } else { + options._containers.push($(containment)); + } + } + + if(options.accept) options.accept = [options.accept].flatten(); + + Element.makePositioned(element); // fix IE + options.element = element; + + this.drops.push(options); + }, + + findDeepestChild: function(drops) { + deepest = drops[0]; + + for (i = 1; i < drops.length; ++i) + if (Element.isParent(drops[i].element, deepest.element)) + deepest = drops[i]; + + return deepest; + }, + + isContained: function(element, drop) { + var containmentNode; + if(drop.tree) { + containmentNode = element.treeNode; + } else { + containmentNode = element.parentNode; + } + return drop._containers.detect(function(c) { return containmentNode == c }); + }, + + isAffected: function(point, element, drop) { + return ( + (drop.element!=element) && + ((!drop._containers) || + this.isContained(element, drop)) && + ((!drop.accept) || + (Element.classNames(element).detect( + function(v) { return drop.accept.include(v) } ) )) && + Position.within(drop.element, point[0], point[1]) ); + }, + + deactivate: function(drop) { + if(drop.hoverclass) + Element.removeClassName(drop.element, drop.hoverclass); + this.last_active = null; + }, + + activate: function(drop) { + if(drop.hoverclass) + Element.addClassName(drop.element, drop.hoverclass); + this.last_active = drop; + }, + + show: function(point, element) { + if(!this.drops.length) return; + var drop, affected = []; + + this.drops.each( function(drop) { + if(Droppables.isAffected(point, element, drop)) + affected.push(drop); + }); + + if(affected.length>0) + drop = Droppables.findDeepestChild(affected); + + if(this.last_active && this.last_active != drop) this.deactivate(this.last_active); + if (drop) { + Position.within(drop.element, point[0], point[1]); + if(drop.onHover) + drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); + + if (drop != this.last_active) Droppables.activate(drop); + } + }, + + fire: function(event, element) { + if(!this.last_active) return; + Position.prepare(); + + if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) + if (this.last_active.onDrop) { + this.last_active.onDrop(element, this.last_active.element, event); + return true; + } + }, + + reset: function() { + if(this.last_active) + this.deactivate(this.last_active); + } +}; + +var Draggables = { + drags: [], + observers: [], + + register: function(draggable) { + if(this.drags.length == 0) { + this.eventMouseUp = this.endDrag.bindAsEventListener(this); + this.eventMouseMove = this.updateDrag.bindAsEventListener(this); + this.eventKeypress = this.keyPress.bindAsEventListener(this); + + Event.observe(document, "mouseup", this.eventMouseUp); + Event.observe(document, "mousemove", this.eventMouseMove); + Event.observe(document, "keypress", this.eventKeypress); + } + this.drags.push(draggable); + }, + + unregister: function(draggable) { + this.drags = this.drags.reject(function(d) { return d==draggable }); + if(this.drags.length == 0) { + Event.stopObserving(document, "mouseup", this.eventMouseUp); + Event.stopObserving(document, "mousemove", this.eventMouseMove); + Event.stopObserving(document, "keypress", this.eventKeypress); + } + }, + + activate: function(draggable) { + if(draggable.options.delay) { + this._timeout = setTimeout(function() { + Draggables._timeout = null; + window.focus(); + Draggables.activeDraggable = draggable; + }.bind(this), draggable.options.delay); + } else { + window.focus(); // allows keypress events if window isn't currently focused, fails for Safari + this.activeDraggable = draggable; + } + }, + + deactivate: function() { + this.activeDraggable = null; + }, + + updateDrag: function(event) { + if(!this.activeDraggable) return; + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + // Mozilla-based browsers fire successive mousemove events with + // the same coordinates, prevent needless redrawing (moz bug?) + if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; + this._lastPointer = pointer; + + this.activeDraggable.updateDrag(event, pointer); + }, + + endDrag: function(event) { + if(this._timeout) { + clearTimeout(this._timeout); + this._timeout = null; + } + if(!this.activeDraggable) return; + this._lastPointer = null; + this.activeDraggable.endDrag(event); + this.activeDraggable = null; + }, + + keyPress: function(event) { + if(this.activeDraggable) + this.activeDraggable.keyPress(event); + }, + + addObserver: function(observer) { + this.observers.push(observer); + this._cacheObserverCallbacks(); + }, + + removeObserver: function(element) { // element instead of observer fixes mem leaks + this.observers = this.observers.reject( function(o) { return o.element==element }); + this._cacheObserverCallbacks(); + }, + + notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' + if(this[eventName+'Count'] > 0) + this.observers.each( function(o) { + if(o[eventName]) o[eventName](eventName, draggable, event); + }); + if(draggable.options[eventName]) draggable.options[eventName](draggable, event); + }, + + _cacheObserverCallbacks: function() { + ['onStart','onEnd','onDrag'].each( function(eventName) { + Draggables[eventName+'Count'] = Draggables.observers.select( + function(o) { return o[eventName]; } + ).length; + }); + } +}; + +/*--------------------------------------------------------------------------*/ + +var Draggable = Class.create({ + initialize: function(element) { + var defaults = { + handle: false, + reverteffect: function(element, top_offset, left_offset) { + var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02; + new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur, + queue: {scope:'_draggable', position:'end'} + }); + }, + endeffect: function(element) { + var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0; + new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, + queue: {scope:'_draggable', position:'end'}, + afterFinish: function(){ + Draggable._dragging[element] = false + } + }); + }, + zindex: 1000, + revert: false, + quiet: false, + scroll: false, + scrollSensitivity: 20, + scrollSpeed: 15, + snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } + delay: 0 + }; + + if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) + Object.extend(defaults, { + starteffect: function(element) { + element._opacity = Element.getOpacity(element); + Draggable._dragging[element] = true; + new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); + } + }); + + var options = Object.extend(defaults, arguments[1] || { }); + + this.element = $(element); + + if(options.handle && Object.isString(options.handle)) + this.handle = this.element.down('.'+options.handle, 0); + + if(!this.handle) this.handle = $(options.handle); + if(!this.handle) this.handle = this.element; + + if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { + options.scroll = $(options.scroll); + this._isScrollChild = Element.childOf(this.element, options.scroll); + } + + Element.makePositioned(this.element); // fix IE + + this.options = options; + this.dragging = false; + + this.eventMouseDown = this.initDrag.bindAsEventListener(this); + Event.observe(this.handle, "mousedown", this.eventMouseDown); + + Draggables.register(this); + }, + + destroy: function() { + Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); + Draggables.unregister(this); + }, + + currentDelta: function() { + return([ + parseInt(Element.getStyle(this.element,'left') || '0'), + parseInt(Element.getStyle(this.element,'top') || '0')]); + }, + + initDrag: function(event) { + if(!Object.isUndefined(Draggable._dragging[this.element]) && + Draggable._dragging[this.element]) return; + if(Event.isLeftClick(event)) { + // abort on form elements, fixes a Firefox issue + var src = Event.element(event); + if((tag_name = src.tagName.toUpperCase()) && ( + tag_name=='INPUT' || + tag_name=='SELECT' || + tag_name=='OPTION' || + tag_name=='BUTTON' || + tag_name=='TEXTAREA')) return; + + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + var pos = this.element.cumulativeOffset(); + this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); + + Draggables.activate(this); + Event.stop(event); + } + }, + + startDrag: function(event) { + this.dragging = true; + if(!this.delta) + this.delta = this.currentDelta(); + + if(this.options.zindex) { + this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); + this.element.style.zIndex = this.options.zindex; + } + + if(this.options.ghosting) { + this._clone = this.element.cloneNode(true); + this._originallyAbsolute = (this.element.getStyle('position') == 'absolute'); + if (!this._originallyAbsolute) + Position.absolutize(this.element); + this.element.parentNode.insertBefore(this._clone, this.element); + } + + if(this.options.scroll) { + if (this.options.scroll == window) { + var where = this._getWindowScroll(this.options.scroll); + this.originalScrollLeft = where.left; + this.originalScrollTop = where.top; + } else { + this.originalScrollLeft = this.options.scroll.scrollLeft; + this.originalScrollTop = this.options.scroll.scrollTop; + } + } + + Draggables.notify('onStart', this, event); + + if(this.options.starteffect) this.options.starteffect(this.element); + }, + + updateDrag: function(event, pointer) { + if(!this.dragging) this.startDrag(event); + + if(!this.options.quiet){ + Position.prepare(); + Droppables.show(pointer, this.element); + } + + Draggables.notify('onDrag', this, event); + + this.draw(pointer); + if(this.options.change) this.options.change(this); + + if(this.options.scroll) { + this.stopScrolling(); + + var p; + if (this.options.scroll == window) { + with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } + } else { + p = Position.page(this.options.scroll); + p[0] += this.options.scroll.scrollLeft + Position.deltaX; + p[1] += this.options.scroll.scrollTop + Position.deltaY; + p.push(p[0]+this.options.scroll.offsetWidth); + p.push(p[1]+this.options.scroll.offsetHeight); + } + var speed = [0,0]; + if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity); + if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity); + if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity); + if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); + this.startScrolling(speed); + } + + // fix AppleWebKit rendering + if(Prototype.Browser.WebKit) window.scrollBy(0,0); + + Event.stop(event); + }, + + finishDrag: function(event, success) { + this.dragging = false; + + if(this.options.quiet){ + Position.prepare(); + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + Droppables.show(pointer, this.element); + } + + if(this.options.ghosting) { + if (!this._originallyAbsolute) + Position.relativize(this.element); + delete this._originallyAbsolute; + Element.remove(this._clone); + this._clone = null; + } + + var dropped = false; + if(success) { + dropped = Droppables.fire(event, this.element); + if (!dropped) dropped = false; + } + if(dropped && this.options.onDropped) this.options.onDropped(this.element); + Draggables.notify('onEnd', this, event); + + var revert = this.options.revert; + if(revert && Object.isFunction(revert)) revert = revert(this.element); + + var d = this.currentDelta(); + if(revert && this.options.reverteffect) { + if (dropped == 0 || revert != 'failure') + this.options.reverteffect(this.element, + d[1]-this.delta[1], d[0]-this.delta[0]); + } else { + this.delta = d; + } + + if(this.options.zindex) + this.element.style.zIndex = this.originalZ; + + if(this.options.endeffect) + this.options.endeffect(this.element); + + Draggables.deactivate(this); + Droppables.reset(); + }, + + keyPress: function(event) { + if(event.keyCode!=Event.KEY_ESC) return; + this.finishDrag(event, false); + Event.stop(event); + }, + + endDrag: function(event) { + if(!this.dragging) return; + this.stopScrolling(); + this.finishDrag(event, true); + Event.stop(event); + }, + + draw: function(point) { + var pos = this.element.cumulativeOffset(); + if(this.options.ghosting) { + var r = Position.realOffset(this.element); + pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; + } + + var d = this.currentDelta(); + pos[0] -= d[0]; pos[1] -= d[1]; + + if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { + pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; + pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; + } + + var p = [0,1].map(function(i){ + return (point[i]-pos[i]-this.offset[i]) + }.bind(this)); + + if(this.options.snap) { + if(Object.isFunction(this.options.snap)) { + p = this.options.snap(p[0],p[1],this); + } else { + if(Object.isArray(this.options.snap)) { + p = p.map( function(v, i) { + return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this)); + } else { + p = p.map( function(v) { + return (v/this.options.snap).round()*this.options.snap }.bind(this)); + } + }} + + var style = this.element.style; + if((!this.options.constraint) || (this.options.constraint=='horizontal')) + style.left = p[0] + "px"; + if((!this.options.constraint) || (this.options.constraint=='vertical')) + style.top = p[1] + "px"; + + if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering + }, + + stopScrolling: function() { + if(this.scrollInterval) { + clearInterval(this.scrollInterval); + this.scrollInterval = null; + Draggables._lastScrollPointer = null; + } + }, + + startScrolling: function(speed) { + if(!(speed[0] || speed[1])) return; + this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; + this.lastScrolled = new Date(); + this.scrollInterval = setInterval(this.scroll.bind(this), 10); + }, + + scroll: function() { + var current = new Date(); + var delta = current - this.lastScrolled; + this.lastScrolled = current; + if(this.options.scroll == window) { + with (this._getWindowScroll(this.options.scroll)) { + if (this.scrollSpeed[0] || this.scrollSpeed[1]) { + var d = delta / 1000; + this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] ); + } + } + } else { + this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; + this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; + } + + Position.prepare(); + Droppables.show(Draggables._lastPointer, this.element); + Draggables.notify('onDrag', this); + if (this._isScrollChild) { + Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer); + Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000; + Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000; + if (Draggables._lastScrollPointer[0] < 0) + Draggables._lastScrollPointer[0] = 0; + if (Draggables._lastScrollPointer[1] < 0) + Draggables._lastScrollPointer[1] = 0; + this.draw(Draggables._lastScrollPointer); + } + + if(this.options.change) this.options.change(this); + }, + + _getWindowScroll: function(w) { + var T, L, W, H; + with (w.document) { + if (w.document.documentElement && documentElement.scrollTop) { + T = documentElement.scrollTop; + L = documentElement.scrollLeft; + } else if (w.document.body) { + T = body.scrollTop; + L = body.scrollLeft; + } + if (w.innerWidth) { + W = w.innerWidth; + H = w.innerHeight; + } else if (w.document.documentElement && documentElement.clientWidth) { + W = documentElement.clientWidth; + H = documentElement.clientHeight; + } else { + W = body.offsetWidth; + H = body.offsetHeight; + } + } + return { top: T, left: L, width: W, height: H }; + } +}); + +Draggable._dragging = { }; + +/*--------------------------------------------------------------------------*/ + +var SortableObserver = Class.create({ + initialize: function(element, observer) { + this.element = $(element); + this.observer = observer; + this.lastValue = Sortable.serialize(this.element); + }, + + onStart: function() { + this.lastValue = Sortable.serialize(this.element); + }, + + onEnd: function() { + Sortable.unmark(); + if(this.lastValue != Sortable.serialize(this.element)) + this.observer(this.element) + } +}); + +var Sortable = { + SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, + + sortables: { }, + + _findRootElement: function(element) { + while (element.tagName.toUpperCase() != "BODY") { + if(element.id && Sortable.sortables[element.id]) return element; + element = element.parentNode; + } + }, + + options: function(element) { + element = Sortable._findRootElement($(element)); + if(!element) return; + return Sortable.sortables[element.id]; + }, + + destroy: function(element){ + element = $(element); + var s = Sortable.sortables[element.id]; + + if(s) { + Draggables.removeObserver(s.element); + s.droppables.each(function(d){ Droppables.remove(d) }); + s.draggables.invoke('destroy'); + + delete Sortable.sortables[s.element.id]; + } + }, + + create: function(element) { + element = $(element); + var options = Object.extend({ + element: element, + tag: 'li', // assumes li children, override with tag: 'tagname' + dropOnEmpty: false, + tree: false, + treeTag: 'ul', + overlap: 'vertical', // one of 'vertical', 'horizontal' + constraint: 'vertical', // one of 'vertical', 'horizontal', false + containment: element, // also takes array of elements (or id's); or false + handle: false, // or a CSS class + only: false, + delay: 0, + hoverclass: null, + ghosting: false, + quiet: false, + scroll: false, + scrollSensitivity: 20, + scrollSpeed: 15, + format: this.SERIALIZE_RULE, + + // these take arrays of elements or ids and can be + // used for better initialization performance + elements: false, + handles: false, + + onChange: Prototype.emptyFunction, + onUpdate: Prototype.emptyFunction + }, arguments[1] || { }); + + // clear any old sortable with same element + this.destroy(element); + + // build options for the draggables + var options_for_draggable = { + revert: true, + quiet: options.quiet, + scroll: options.scroll, + scrollSpeed: options.scrollSpeed, + scrollSensitivity: options.scrollSensitivity, + delay: options.delay, + ghosting: options.ghosting, + constraint: options.constraint, + handle: options.handle }; + + if(options.starteffect) + options_for_draggable.starteffect = options.starteffect; + + if(options.reverteffect) + options_for_draggable.reverteffect = options.reverteffect; + else + if(options.ghosting) options_for_draggable.reverteffect = function(element) { + element.style.top = 0; + element.style.left = 0; + }; + + if(options.endeffect) + options_for_draggable.endeffect = options.endeffect; + + if(options.zindex) + options_for_draggable.zindex = options.zindex; + + // build options for the droppables + var options_for_droppable = { + overlap: options.overlap, + containment: options.containment, + tree: options.tree, + hoverclass: options.hoverclass, + onHover: Sortable.onHover + }; + + var options_for_tree = { + onHover: Sortable.onEmptyHover, + overlap: options.overlap, + containment: options.containment, + hoverclass: options.hoverclass + }; + + // fix for gecko engine + Element.cleanWhitespace(element); + + options.draggables = []; + options.droppables = []; + + // drop on empty handling + if(options.dropOnEmpty || options.tree) { + Droppables.add(element, options_for_tree); + options.droppables.push(element); + } + + (options.elements || this.findElements(element, options) || []).each( function(e,i) { + var handle = options.handles ? $(options.handles[i]) : + (options.handle ? $(e).select('.' + options.handle)[0] : e); + options.draggables.push( + new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); + Droppables.add(e, options_for_droppable); + if(options.tree) e.treeNode = element; + options.droppables.push(e); + }); + + if(options.tree) { + (Sortable.findTreeElements(element, options) || []).each( function(e) { + Droppables.add(e, options_for_tree); + e.treeNode = element; + options.droppables.push(e); + }); + } + + // keep reference + this.sortables[element.identify()] = options; + + // for onupdate + Draggables.addObserver(new SortableObserver(element, options.onUpdate)); + + }, + + // return all suitable-for-sortable elements in a guaranteed order + findElements: function(element, options) { + return Element.findChildren( + element, options.only, options.tree ? true : false, options.tag); + }, + + findTreeElements: function(element, options) { + return Element.findChildren( + element, options.only, options.tree ? true : false, options.treeTag); + }, + + onHover: function(element, dropon, overlap) { + if(Element.isParent(dropon, element)) return; + + if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) { + return; + } else if(overlap>0.5) { + Sortable.mark(dropon, 'before'); + if(dropon.previousSibling != element) { + var oldParentNode = element.parentNode; + element.style.visibility = "hidden"; // fix gecko rendering + dropon.parentNode.insertBefore(element, dropon); + if(dropon.parentNode!=oldParentNode) + Sortable.options(oldParentNode).onChange(element); + Sortable.options(dropon.parentNode).onChange(element); + } + } else { + Sortable.mark(dropon, 'after'); + var nextElement = dropon.nextSibling || null; + if(nextElement != element) { + var oldParentNode = element.parentNode; + element.style.visibility = "hidden"; // fix gecko rendering + dropon.parentNode.insertBefore(element, nextElement); + if(dropon.parentNode!=oldParentNode) + Sortable.options(oldParentNode).onChange(element); + Sortable.options(dropon.parentNode).onChange(element); + } + } + }, + + onEmptyHover: function(element, dropon, overlap) { + var oldParentNode = element.parentNode; + var droponOptions = Sortable.options(dropon); + + if(!Element.isParent(dropon, element)) { + var index; + + var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); + var child = null; + + if(children) { + var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); + + for (index = 0; index < children.length; index += 1) { + if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { + offset -= Element.offsetSize (children[index], droponOptions.overlap); + } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) { + child = index + 1 < children.length ? children[index + 1] : null; + break; + } else { + child = children[index]; + break; + } + } + } + + dropon.insertBefore(element, child); + + Sortable.options(oldParentNode).onChange(element); + droponOptions.onChange(element); + } + }, + + unmark: function() { + if(Sortable._marker) Sortable._marker.hide(); + }, + + mark: function(dropon, position) { + // mark on ghosting only + var sortable = Sortable.options(dropon.parentNode); + if(sortable && !sortable.ghosting) return; + + if(!Sortable._marker) { + Sortable._marker = + ($('dropmarker') || Element.extend(document.createElement('DIV'))). + hide().addClassName('dropmarker').setStyle({position:'absolute'}); + document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); + } + var offsets = dropon.cumulativeOffset(); + Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); + + if(position=='after') + if(sortable.overlap == 'horizontal') + Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); + else + Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); + + Sortable._marker.show(); + }, + + _tree: function(element, options, parent) { + var children = Sortable.findElements(element, options) || []; + + for (var i = 0; i < children.length; ++i) { + var match = children[i].id.match(options.format); + + if (!match) continue; + + var child = { + id: encodeURIComponent(match ? match[1] : null), + element: element, + parent: parent, + children: [], + position: parent.children.length, + container: $(children[i]).down(options.treeTag) + }; + + /* Get the element containing the children and recurse over it */ + if (child.container) + this._tree(child.container, options, child); + + parent.children.push (child); + } + + return parent; + }, + + tree: function(element) { + element = $(element); + var sortableOptions = this.options(element); + var options = Object.extend({ + tag: sortableOptions.tag, + treeTag: sortableOptions.treeTag, + only: sortableOptions.only, + name: element.id, + format: sortableOptions.format + }, arguments[1] || { }); + + var root = { + id: null, + parent: null, + children: [], + container: element, + position: 0 + }; + + return Sortable._tree(element, options, root); + }, + + /* Construct a [i] index for a particular node */ + _constructIndex: function(node) { + var index = ''; + do { + if (node.id) index = '[' + node.position + ']' + index; + } while ((node = node.parent) != null); + return index; + }, + + sequence: function(element) { + element = $(element); + var options = Object.extend(this.options(element), arguments[1] || { }); + + return $(this.findElements(element, options) || []).map( function(item) { + return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; + }); + }, + + setSequence: function(element, new_sequence) { + element = $(element); + var options = Object.extend(this.options(element), arguments[2] || { }); + + var nodeMap = { }; + this.findElements(element, options).each( function(n) { + if (n.id.match(options.format)) + nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; + n.parentNode.removeChild(n); + }); + + new_sequence.each(function(ident) { + var n = nodeMap[ident]; + if (n) { + n[1].appendChild(n[0]); + delete nodeMap[ident]; + } + }); + }, + + serialize: function(element) { + element = $(element); + var options = Object.extend(Sortable.options(element), arguments[1] || { }); + var name = encodeURIComponent( + (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); + + if (options.tree) { + return Sortable.tree(element, arguments[1]).children.map( function (item) { + return [name + Sortable._constructIndex(item) + "[id]=" + + encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); + }).flatten().join('&'); + } else { + return Sortable.sequence(element, arguments[1]).map( function(item) { + return name + "[]=" + encodeURIComponent(item); + }).join('&'); + } + } +}; + +// Returns true if child is contained within element +Element.isParent = function(child, element) { + if (!child.parentNode || child == element) return false; + if (child.parentNode == element) return true; + return Element.isParent(child.parentNode, element); +}; + +Element.findChildren = function(element, only, recursive, tagName) { + if(!element.hasChildNodes()) return null; + tagName = tagName.toUpperCase(); + if(only) only = [only].flatten(); + var elements = []; + $A(element.childNodes).each( function(e) { + if(e.tagName && e.tagName.toUpperCase()==tagName && + (!only || (Element.classNames(e).detect(function(v) { return only.include(v) })))) + elements.push(e); + if(recursive) { + var grandchildren = Element.findChildren(e, only, recursive, tagName); + if(grandchildren) elements.push(grandchildren); + } + }); + + return (elements.length>0 ? elements.flatten() : []); +}; + +Element.offsetSize = function (element, type) { + return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')]; +}; \ No newline at end of file diff --git a/spec/rails_root/public/javascripts/effects.js b/spec/rails_root/public/javascripts/effects.js new file mode 100644 index 000000000..066ee5909 --- /dev/null +++ b/spec/rails_root/public/javascripts/effects.js @@ -0,0 +1,1123 @@ +// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 + +// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Contributors: +// Justin Palmer (http://encytemedia.com/) +// Mark Pilgrim (http://diveintomark.org/) +// Martin Bialasinki +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +// converts rgb() and #xxx to #xxxxxx format, +// returns self (or first argument) if not convertable +String.prototype.parseColor = function() { + var color = '#'; + if (this.slice(0,4) == 'rgb(') { + var cols = this.slice(4,this.length-1).split(','); + var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); + } else { + if (this.slice(0,1) == '#') { + if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); + if (this.length==7) color = this.toLowerCase(); + } + } + return (color.length==7 ? color : (arguments[0] || this)); +}; + +/*--------------------------------------------------------------------------*/ + +Element.collectTextNodes = function(element) { + return $A($(element).childNodes).collect( function(node) { + return (node.nodeType==3 ? node.nodeValue : + (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); + }).flatten().join(''); +}; + +Element.collectTextNodesIgnoreClass = function(element, className) { + return $A($(element).childNodes).collect( function(node) { + return (node.nodeType==3 ? node.nodeValue : + ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? + Element.collectTextNodesIgnoreClass(node, className) : '')); + }).flatten().join(''); +}; + +Element.setContentZoom = function(element, percent) { + element = $(element); + element.setStyle({fontSize: (percent/100) + 'em'}); + if (Prototype.Browser.WebKit) window.scrollBy(0,0); + return element; +}; + +Element.getInlineOpacity = function(element){ + return $(element).style.opacity || ''; +}; + +Element.forceRerendering = function(element) { + try { + element = $(element); + var n = document.createTextNode(' '); + element.appendChild(n); + element.removeChild(n); + } catch(e) { } +}; + +/*--------------------------------------------------------------------------*/ + +var Effect = { + _elementDoesNotExistError: { + name: 'ElementDoesNotExistError', + message: 'The specified DOM element does not exist, but is required for this effect to operate' + }, + Transitions: { + linear: Prototype.K, + sinoidal: function(pos) { + return (-Math.cos(pos*Math.PI)/2) + .5; + }, + reverse: function(pos) { + return 1-pos; + }, + flicker: function(pos) { + var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4; + return pos > 1 ? 1 : pos; + }, + wobble: function(pos) { + return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5; + }, + pulse: function(pos, pulses) { + return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5; + }, + spring: function(pos) { + return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); + }, + none: function(pos) { + return 0; + }, + full: function(pos) { + return 1; + } + }, + DefaultOptions: { + duration: 1.0, // seconds + fps: 100, // 100= assume 66fps max. + sync: false, // true for combining + from: 0.0, + to: 1.0, + delay: 0.0, + queue: 'parallel' + }, + tagifyText: function(element) { + var tagifyStyle = 'position:relative'; + if (Prototype.Browser.IE) tagifyStyle += ';zoom:1'; + + element = $(element); + $A(element.childNodes).each( function(child) { + if (child.nodeType==3) { + child.nodeValue.toArray().each( function(character) { + element.insertBefore( + new Element('span', {style: tagifyStyle}).update( + character == ' ' ? String.fromCharCode(160) : character), + child); + }); + Element.remove(child); + } + }); + }, + multiple: function(element, effect) { + var elements; + if (((typeof element == 'object') || + Object.isFunction(element)) && + (element.length)) + elements = element; + else + elements = $(element).childNodes; + + var options = Object.extend({ + speed: 0.1, + delay: 0.0 + }, arguments[2] || { }); + var masterDelay = options.delay; + + $A(elements).each( function(element, index) { + new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay })); + }); + }, + PAIRS: { + 'slide': ['SlideDown','SlideUp'], + 'blind': ['BlindDown','BlindUp'], + 'appear': ['Appear','Fade'] + }, + toggle: function(element, effect, options) { + element = $(element); + effect = (effect || 'appear').toLowerCase(); + + return Effect[ Effect.PAIRS[ effect ][ element.visible() ? 1 : 0 ] ](element, Object.extend({ + queue: { position:'end', scope:(element.id || 'global'), limit: 1 } + }, options || {})); + } +}; + +Effect.DefaultOptions.transition = Effect.Transitions.sinoidal; + +/* ------------- core effects ------------- */ + +Effect.ScopedQueue = Class.create(Enumerable, { + initialize: function() { + this.effects = []; + this.interval = null; + }, + _each: function(iterator) { + this.effects._each(iterator); + }, + add: function(effect) { + var timestamp = new Date().getTime(); + + var position = Object.isString(effect.options.queue) ? + effect.options.queue : effect.options.queue.position; + + switch(position) { + case 'front': + // move unstarted effects after this effect + this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { + e.startOn += effect.finishOn; + e.finishOn += effect.finishOn; + }); + break; + case 'with-last': + timestamp = this.effects.pluck('startOn').max() || timestamp; + break; + case 'end': + // start effect after last queued effect has finished + timestamp = this.effects.pluck('finishOn').max() || timestamp; + break; + } + + effect.startOn += timestamp; + effect.finishOn += timestamp; + + if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) + this.effects.push(effect); + + if (!this.interval) + this.interval = setInterval(this.loop.bind(this), 15); + }, + remove: function(effect) { + this.effects = this.effects.reject(function(e) { return e==effect }); + if (this.effects.length == 0) { + clearInterval(this.interval); + this.interval = null; + } + }, + loop: function() { + var timePos = new Date().getTime(); + for(var i=0, len=this.effects.length;i= this.startOn) { + if (timePos >= this.finishOn) { + this.render(1.0); + this.cancel(); + this.event('beforeFinish'); + if (this.finish) this.finish(); + this.event('afterFinish'); + return; + } + var pos = (timePos - this.startOn) / this.totalTime, + frame = (pos * this.totalFrames).round(); + if (frame > this.currentFrame) { + this.render(pos); + this.currentFrame = frame; + } + } + }, + cancel: function() { + if (!this.options.sync) + Effect.Queues.get(Object.isString(this.options.queue) ? + 'global' : this.options.queue.scope).remove(this); + this.state = 'finished'; + }, + event: function(eventName) { + if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this); + if (this.options[eventName]) this.options[eventName](this); + }, + inspect: function() { + var data = $H(); + for(property in this) + if (!Object.isFunction(this[property])) data.set(property, this[property]); + return '#'; + } +}); + +Effect.Parallel = Class.create(Effect.Base, { + initialize: function(effects) { + this.effects = effects || []; + this.start(arguments[1]); + }, + update: function(position) { + this.effects.invoke('render', position); + }, + finish: function(position) { + this.effects.each( function(effect) { + effect.render(1.0); + effect.cancel(); + effect.event('beforeFinish'); + if (effect.finish) effect.finish(position); + effect.event('afterFinish'); + }); + } +}); + +Effect.Tween = Class.create(Effect.Base, { + initialize: function(object, from, to) { + object = Object.isString(object) ? $(object) : object; + var args = $A(arguments), method = args.last(), + options = args.length == 5 ? args[3] : null; + this.method = Object.isFunction(method) ? method.bind(object) : + Object.isFunction(object[method]) ? object[method].bind(object) : + function(value) { object[method] = value }; + this.start(Object.extend({ from: from, to: to }, options || { })); + }, + update: function(position) { + this.method(position); + } +}); + +Effect.Event = Class.create(Effect.Base, { + initialize: function() { + this.start(Object.extend({ duration: 0 }, arguments[0] || { })); + }, + update: Prototype.emptyFunction +}); + +Effect.Opacity = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + // make this work on IE on elements without 'layout' + if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout)) + this.element.setStyle({zoom: 1}); + var options = Object.extend({ + from: this.element.getOpacity() || 0.0, + to: 1.0 + }, arguments[1] || { }); + this.start(options); + }, + update: function(position) { + this.element.setOpacity(position); + } +}); + +Effect.Move = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + x: 0, + y: 0, + mode: 'relative' + }, arguments[1] || { }); + this.start(options); + }, + setup: function() { + this.element.makePositioned(); + this.originalLeft = parseFloat(this.element.getStyle('left') || '0'); + this.originalTop = parseFloat(this.element.getStyle('top') || '0'); + if (this.options.mode == 'absolute') { + this.options.x = this.options.x - this.originalLeft; + this.options.y = this.options.y - this.originalTop; + } + }, + update: function(position) { + this.element.setStyle({ + left: (this.options.x * position + this.originalLeft).round() + 'px', + top: (this.options.y * position + this.originalTop).round() + 'px' + }); + } +}); + +// for backwards compatibility +Effect.MoveBy = function(element, toTop, toLeft) { + return new Effect.Move(element, + Object.extend({ x: toLeft, y: toTop }, arguments[3] || { })); +}; + +Effect.Scale = Class.create(Effect.Base, { + initialize: function(element, percent) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + scaleX: true, + scaleY: true, + scaleContent: true, + scaleFromCenter: false, + scaleMode: 'box', // 'box' or 'contents' or { } with provided values + scaleFrom: 100.0, + scaleTo: percent + }, arguments[2] || { }); + this.start(options); + }, + setup: function() { + this.restoreAfterFinish = this.options.restoreAfterFinish || false; + this.elementPositioning = this.element.getStyle('position'); + + this.originalStyle = { }; + ['top','left','width','height','fontSize'].each( function(k) { + this.originalStyle[k] = this.element.style[k]; + }.bind(this)); + + this.originalTop = this.element.offsetTop; + this.originalLeft = this.element.offsetLeft; + + var fontSize = this.element.getStyle('font-size') || '100%'; + ['em','px','%','pt'].each( function(fontSizeType) { + if (fontSize.indexOf(fontSizeType)>0) { + this.fontSize = parseFloat(fontSize); + this.fontSizeType = fontSizeType; + } + }.bind(this)); + + this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; + + this.dims = null; + if (this.options.scaleMode=='box') + this.dims = [this.element.offsetHeight, this.element.offsetWidth]; + if (/^content/.test(this.options.scaleMode)) + this.dims = [this.element.scrollHeight, this.element.scrollWidth]; + if (!this.dims) + this.dims = [this.options.scaleMode.originalHeight, + this.options.scaleMode.originalWidth]; + }, + update: function(position) { + var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position); + if (this.options.scaleContent && this.fontSize) + this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType }); + this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale); + }, + finish: function(position) { + if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle); + }, + setDimensions: function(height, width) { + var d = { }; + if (this.options.scaleX) d.width = width.round() + 'px'; + if (this.options.scaleY) d.height = height.round() + 'px'; + if (this.options.scaleFromCenter) { + var topd = (height - this.dims[0])/2; + var leftd = (width - this.dims[1])/2; + if (this.elementPositioning == 'absolute') { + if (this.options.scaleY) d.top = this.originalTop-topd + 'px'; + if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px'; + } else { + if (this.options.scaleY) d.top = -topd + 'px'; + if (this.options.scaleX) d.left = -leftd + 'px'; + } + } + this.element.setStyle(d); + } +}); + +Effect.Highlight = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { }); + this.start(options); + }, + setup: function() { + // Prevent executing on elements not in the layout flow + if (this.element.getStyle('display')=='none') { this.cancel(); return; } + // Disable background image during the effect + this.oldStyle = { }; + if (!this.options.keepBackgroundImage) { + this.oldStyle.backgroundImage = this.element.getStyle('background-image'); + this.element.setStyle({backgroundImage: 'none'}); + } + if (!this.options.endcolor) + this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff'); + if (!this.options.restorecolor) + this.options.restorecolor = this.element.getStyle('background-color'); + // init color calculations + this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this)); + this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this)); + }, + update: function(position) { + this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){ + return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) }); + }, + finish: function() { + this.element.setStyle(Object.extend(this.oldStyle, { + backgroundColor: this.options.restorecolor + })); + } +}); + +Effect.ScrollTo = function(element) { + var options = arguments[1] || { }, + scrollOffsets = document.viewport.getScrollOffsets(), + elementOffsets = $(element).cumulativeOffset(); + + if (options.offset) elementOffsets[1] += options.offset; + + return new Effect.Tween(null, + scrollOffsets.top, + elementOffsets[1], + options, + function(p){ scrollTo(scrollOffsets.left, p.round()); } + ); +}; + +/* ------------- combination effects ------------- */ + +Effect.Fade = function(element) { + element = $(element); + var oldOpacity = element.getInlineOpacity(); + var options = Object.extend({ + from: element.getOpacity() || 1.0, + to: 0.0, + afterFinishInternal: function(effect) { + if (effect.options.to!=0) return; + effect.element.hide().setStyle({opacity: oldOpacity}); + } + }, arguments[1] || { }); + return new Effect.Opacity(element,options); +}; + +Effect.Appear = function(element) { + element = $(element); + var options = Object.extend({ + from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), + to: 1.0, + // force Safari to render floated elements properly + afterFinishInternal: function(effect) { + effect.element.forceRerendering(); + }, + beforeSetup: function(effect) { + effect.element.setOpacity(effect.options.from).show(); + }}, arguments[1] || { }); + return new Effect.Opacity(element,options); +}; + +Effect.Puff = function(element) { + element = $(element); + var oldStyle = { + opacity: element.getInlineOpacity(), + position: element.getStyle('position'), + top: element.style.top, + left: element.style.left, + width: element.style.width, + height: element.style.height + }; + return new Effect.Parallel( + [ new Effect.Scale(element, 200, + { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], + Object.extend({ duration: 1.0, + beforeSetupInternal: function(effect) { + Position.absolutize(effect.effects[0].element); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().setStyle(oldStyle); } + }, arguments[1] || { }) + ); +}; + +Effect.BlindUp = function(element) { + element = $(element); + element.makeClipping(); + return new Effect.Scale(element, 0, + Object.extend({ scaleContent: false, + scaleX: false, + restoreAfterFinish: true, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping(); + } + }, arguments[1] || { }) + ); +}; + +Effect.BlindDown = function(element) { + element = $(element); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, + scaleFrom: 0, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, + afterFinishInternal: function(effect) { + effect.element.undoClipping(); + } + }, arguments[1] || { })); +}; + +Effect.SwitchOff = function(element) { + element = $(element); + var oldOpacity = element.getInlineOpacity(); + return new Effect.Appear(element, Object.extend({ + duration: 0.4, + from: 0, + transition: Effect.Transitions.flicker, + afterFinishInternal: function(effect) { + new Effect.Scale(effect.element, 1, { + duration: 0.3, scaleFromCenter: true, + scaleX: false, scaleContent: false, restoreAfterFinish: true, + beforeSetup: function(effect) { + effect.element.makePositioned().makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity}); + } + }); + } + }, arguments[1] || { })); +}; + +Effect.DropOut = function(element) { + element = $(element); + var oldStyle = { + top: element.getStyle('top'), + left: element.getStyle('left'), + opacity: element.getInlineOpacity() }; + return new Effect.Parallel( + [ new Effect.Move(element, {x: 0, y: 100, sync: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 }) ], + Object.extend( + { duration: 0.5, + beforeSetup: function(effect) { + effect.effects[0].element.makePositioned(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); + } + }, arguments[1] || { })); +}; + +Effect.Shake = function(element) { + element = $(element); + var options = Object.extend({ + distance: 20, + duration: 0.5 + }, arguments[1] || {}); + var distance = parseFloat(options.distance); + var split = parseFloat(options.duration) / 10.0; + var oldStyle = { + top: element.getStyle('top'), + left: element.getStyle('left') }; + return new Effect.Move(element, + { x: distance, y: 0, duration: split, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) { + effect.element.undoPositioned().setStyle(oldStyle); + }}); }}); }}); }}); }}); }}); +}; + +Effect.SlideDown = function(element) { + element = $(element).cleanWhitespace(); + // SlideDown need to have the content of the element wrapped in a container element with fixed height! + var oldInnerBottom = element.down().getStyle('bottom'); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, + scaleFrom: window.opera ? 0 : 1, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makePositioned(); + effect.element.down().makePositioned(); + if (window.opera) effect.element.setStyle({top: ''}); + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, + afterUpdateInternal: function(effect) { + effect.element.down().setStyle({bottom: + (effect.dims[0] - effect.element.clientHeight) + 'px' }); + }, + afterFinishInternal: function(effect) { + effect.element.undoClipping().undoPositioned(); + effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); } + }, arguments[1] || { }) + ); +}; + +Effect.SlideUp = function(element) { + element = $(element).cleanWhitespace(); + var oldInnerBottom = element.down().getStyle('bottom'); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, window.opera ? 0 : 1, + Object.extend({ scaleContent: false, + scaleX: false, + scaleMode: 'box', + scaleFrom: 100, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makePositioned(); + effect.element.down().makePositioned(); + if (window.opera) effect.element.setStyle({top: ''}); + effect.element.makeClipping().show(); + }, + afterUpdateInternal: function(effect) { + effect.element.down().setStyle({bottom: + (effect.dims[0] - effect.element.clientHeight) + 'px' }); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().undoPositioned(); + effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); + } + }, arguments[1] || { }) + ); +}; + +// Bug in opera makes the TD containing this element expand for a instance after finish +Effect.Squish = function(element) { + return new Effect.Scale(element, window.opera ? 1 : 0, { + restoreAfterFinish: true, + beforeSetup: function(effect) { + effect.element.makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping(); + } + }); +}; + +Effect.Grow = function(element) { + element = $(element); + var options = Object.extend({ + direction: 'center', + moveTransition: Effect.Transitions.sinoidal, + scaleTransition: Effect.Transitions.sinoidal, + opacityTransition: Effect.Transitions.full + }, arguments[1] || { }); + var oldStyle = { + top: element.style.top, + left: element.style.left, + height: element.style.height, + width: element.style.width, + opacity: element.getInlineOpacity() }; + + var dims = element.getDimensions(); + var initialMoveX, initialMoveY; + var moveX, moveY; + + switch (options.direction) { + case 'top-left': + initialMoveX = initialMoveY = moveX = moveY = 0; + break; + case 'top-right': + initialMoveX = dims.width; + initialMoveY = moveY = 0; + moveX = -dims.width; + break; + case 'bottom-left': + initialMoveX = moveX = 0; + initialMoveY = dims.height; + moveY = -dims.height; + break; + case 'bottom-right': + initialMoveX = dims.width; + initialMoveY = dims.height; + moveX = -dims.width; + moveY = -dims.height; + break; + case 'center': + initialMoveX = dims.width / 2; + initialMoveY = dims.height / 2; + moveX = -dims.width / 2; + moveY = -dims.height / 2; + break; + } + + return new Effect.Move(element, { + x: initialMoveX, + y: initialMoveY, + duration: 0.01, + beforeSetup: function(effect) { + effect.element.hide().makeClipping().makePositioned(); + }, + afterFinishInternal: function(effect) { + new Effect.Parallel( + [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), + new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), + new Effect.Scale(effect.element, 100, { + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, + sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) + ], Object.extend({ + beforeSetup: function(effect) { + effect.effects[0].element.setStyle({height: '0px'}).show(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); + } + }, options) + ); + } + }); +}; + +Effect.Shrink = function(element) { + element = $(element); + var options = Object.extend({ + direction: 'center', + moveTransition: Effect.Transitions.sinoidal, + scaleTransition: Effect.Transitions.sinoidal, + opacityTransition: Effect.Transitions.none + }, arguments[1] || { }); + var oldStyle = { + top: element.style.top, + left: element.style.left, + height: element.style.height, + width: element.style.width, + opacity: element.getInlineOpacity() }; + + var dims = element.getDimensions(); + var moveX, moveY; + + switch (options.direction) { + case 'top-left': + moveX = moveY = 0; + break; + case 'top-right': + moveX = dims.width; + moveY = 0; + break; + case 'bottom-left': + moveX = 0; + moveY = dims.height; + break; + case 'bottom-right': + moveX = dims.width; + moveY = dims.height; + break; + case 'center': + moveX = dims.width / 2; + moveY = dims.height / 2; + break; + } + + return new Effect.Parallel( + [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), + new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), + new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) + ], Object.extend({ + beforeStartInternal: function(effect) { + effect.effects[0].element.makePositioned().makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } + }, options) + ); +}; + +Effect.Pulsate = function(element) { + element = $(element); + var options = arguments[1] || { }, + oldOpacity = element.getInlineOpacity(), + transition = options.transition || Effect.Transitions.linear, + reverser = function(pos){ + return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5); + }; + + return new Effect.Opacity(element, + Object.extend(Object.extend({ duration: 2.0, from: 0, + afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } + }, options), {transition: reverser})); +}; + +Effect.Fold = function(element) { + element = $(element); + var oldStyle = { + top: element.style.top, + left: element.style.left, + width: element.style.width, + height: element.style.height }; + element.makeClipping(); + return new Effect.Scale(element, 5, Object.extend({ + scaleContent: false, + scaleX: false, + afterFinishInternal: function(effect) { + new Effect.Scale(element, 1, { + scaleContent: false, + scaleY: false, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().setStyle(oldStyle); + } }); + }}, arguments[1] || { })); +}; + +Effect.Morph = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + style: { } + }, arguments[1] || { }); + + if (!Object.isString(options.style)) this.style = $H(options.style); + else { + if (options.style.include(':')) + this.style = options.style.parseStyle(); + else { + this.element.addClassName(options.style); + this.style = $H(this.element.getStyles()); + this.element.removeClassName(options.style); + var css = this.element.getStyles(); + this.style = this.style.reject(function(style) { + return style.value == css[style.key]; + }); + options.afterFinishInternal = function(effect) { + effect.element.addClassName(effect.options.style); + effect.transforms.each(function(transform) { + effect.element.style[transform.style] = ''; + }); + }; + } + } + this.start(options); + }, + + setup: function(){ + function parseColor(color){ + if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; + color = color.parseColor(); + return $R(0,2).map(function(i){ + return parseInt( color.slice(i*2+1,i*2+3), 16 ); + }); + } + this.transforms = this.style.map(function(pair){ + var property = pair[0], value = pair[1], unit = null; + + if (value.parseColor('#zzzzzz') != '#zzzzzz') { + value = value.parseColor(); + unit = 'color'; + } else if (property == 'opacity') { + value = parseFloat(value); + if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout)) + this.element.setStyle({zoom: 1}); + } else if (Element.CSS_LENGTH.test(value)) { + var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/); + value = parseFloat(components[1]); + unit = (components.length == 3) ? components[2] : null; + } + + var originalValue = this.element.getStyle(property); + return { + style: property.camelize(), + originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), + targetValue: unit=='color' ? parseColor(value) : value, + unit: unit + }; + }.bind(this)).reject(function(transform){ + return ( + (transform.originalValue == transform.targetValue) || + ( + transform.unit != 'color' && + (isNaN(transform.originalValue) || isNaN(transform.targetValue)) + ) + ); + }); + }, + update: function(position) { + var style = { }, transform, i = this.transforms.length; + while(i--) + style[(transform = this.transforms[i]).style] = + transform.unit=='color' ? '#'+ + (Math.round(transform.originalValue[0]+ + (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() + + (Math.round(transform.originalValue[1]+ + (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() + + (Math.round(transform.originalValue[2]+ + (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() : + (transform.originalValue + + (transform.targetValue - transform.originalValue) * position).toFixed(3) + + (transform.unit === null ? '' : transform.unit); + this.element.setStyle(style, true); + } +}); + +Effect.Transform = Class.create({ + initialize: function(tracks){ + this.tracks = []; + this.options = arguments[1] || { }; + this.addTracks(tracks); + }, + addTracks: function(tracks){ + tracks.each(function(track){ + track = $H(track); + var data = track.values().first(); + this.tracks.push($H({ + ids: track.keys().first(), + effect: Effect.Morph, + options: { style: data } + })); + }.bind(this)); + return this; + }, + play: function(){ + return new Effect.Parallel( + this.tracks.map(function(track){ + var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options'); + var elements = [$(ids) || $$(ids)].flatten(); + return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) }); + }).flatten(), + this.options + ); + } +}); + +Element.CSS_PROPERTIES = $w( + 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + + 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + + 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + + 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + + 'fontSize fontWeight height left letterSpacing lineHeight ' + + 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+ + 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + + 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + + 'right textIndent top width wordSpacing zIndex'); + +Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; + +String.__parseStyleElement = document.createElement('div'); +String.prototype.parseStyle = function(){ + var style, styleRules = $H(); + if (Prototype.Browser.WebKit) + style = new Element('div',{style:this}).style; + else { + String.__parseStyleElement.innerHTML = '
    '; + style = String.__parseStyleElement.childNodes[0].style; + } + + Element.CSS_PROPERTIES.each(function(property){ + if (style[property]) styleRules.set(property, style[property]); + }); + + if (Prototype.Browser.IE && this.include('opacity')) + styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]); + + return styleRules; +}; + +if (document.defaultView && document.defaultView.getComputedStyle) { + Element.getStyles = function(element) { + var css = document.defaultView.getComputedStyle($(element), null); + return Element.CSS_PROPERTIES.inject({ }, function(styles, property) { + styles[property] = css[property]; + return styles; + }); + }; +} else { + Element.getStyles = function(element) { + element = $(element); + var css = element.currentStyle, styles; + styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) { + results[property] = css[property]; + return results; + }); + if (!styles.opacity) styles.opacity = element.getOpacity(); + return styles; + }; +} + +Effect.Methods = { + morph: function(element, style) { + element = $(element); + new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { })); + return element; + }, + visualEffect: function(element, effect, options) { + element = $(element); + var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1); + new Effect[klass](element, options); + return element; + }, + highlight: function(element, options) { + element = $(element); + new Effect.Highlight(element, options); + return element; + } +}; + +$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ + 'pulsate shake puff squish switchOff dropOut').each( + function(effect) { + Effect.Methods[effect] = function(element, options){ + element = $(element); + Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options); + return element; + }; + } +); + +$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( + function(f) { Effect.Methods[f] = Element[f]; } +); + +Element.addMethods(Effect.Methods); \ No newline at end of file diff --git a/spec/rails_root/public/javascripts/prototype.js b/spec/rails_root/public/javascripts/prototype.js new file mode 100644 index 000000000..9fe6e1243 --- /dev/null +++ b/spec/rails_root/public/javascripts/prototype.js @@ -0,0 +1,4874 @@ +/* Prototype JavaScript framework, version 1.6.1 + * (c) 2005-2009 Sam Stephenson + * + * Prototype is freely distributable under the terms of an MIT-style license. + * For details, see the Prototype web site: http://www.prototypejs.org/ + * + *--------------------------------------------------------------------------*/ + +var Prototype = { + Version: '1.6.1', + + Browser: (function(){ + var ua = navigator.userAgent; + var isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]'; + return { + IE: !!window.attachEvent && !isOpera, + Opera: isOpera, + WebKit: ua.indexOf('AppleWebKit/') > -1, + Gecko: ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1, + MobileSafari: /Apple.*Mobile.*Safari/.test(ua) + } + })(), + + BrowserFeatures: { + XPath: !!document.evaluate, + SelectorsAPI: !!document.querySelector, + ElementExtensions: (function() { + var constructor = window.Element || window.HTMLElement; + return !!(constructor && constructor.prototype); + })(), + SpecificElementExtensions: (function() { + if (typeof window.HTMLDivElement !== 'undefined') + return true; + + var div = document.createElement('div'); + var form = document.createElement('form'); + var isSupported = false; + + if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) { + isSupported = true; + } + + div = form = null; + + return isSupported; + })() + }, + + ScriptFragment: ']*>([\\S\\s]*?)<\/script>', + JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/, + + emptyFunction: function() { }, + K: function(x) { return x } +}; + +if (Prototype.Browser.MobileSafari) + Prototype.BrowserFeatures.SpecificElementExtensions = false; + + +var Abstract = { }; + + +var Try = { + these: function() { + var returnValue; + + for (var i = 0, length = arguments.length; i < length; i++) { + var lambda = arguments[i]; + try { + returnValue = lambda(); + break; + } catch (e) { } + } + + return returnValue; + } +}; + +/* Based on Alex Arnell's inheritance implementation. */ + +var Class = (function() { + function subclass() {}; + function create() { + var parent = null, properties = $A(arguments); + if (Object.isFunction(properties[0])) + parent = properties.shift(); + + function klass() { + this.initialize.apply(this, arguments); + } + + Object.extend(klass, Class.Methods); + klass.superclass = parent; + klass.subclasses = []; + + if (parent) { + subclass.prototype = parent.prototype; + klass.prototype = new subclass; + parent.subclasses.push(klass); + } + + for (var i = 0; i < properties.length; i++) + klass.addMethods(properties[i]); + + if (!klass.prototype.initialize) + klass.prototype.initialize = Prototype.emptyFunction; + + klass.prototype.constructor = klass; + return klass; + } + + function addMethods(source) { + var ancestor = this.superclass && this.superclass.prototype; + var properties = Object.keys(source); + + if (!Object.keys({ toString: true }).length) { + if (source.toString != Object.prototype.toString) + properties.push("toString"); + if (source.valueOf != Object.prototype.valueOf) + properties.push("valueOf"); + } + + for (var i = 0, length = properties.length; i < length; i++) { + var property = properties[i], value = source[property]; + if (ancestor && Object.isFunction(value) && + value.argumentNames().first() == "$super") { + var method = value; + value = (function(m) { + return function() { return ancestor[m].apply(this, arguments); }; + })(property).wrap(method); + + value.valueOf = method.valueOf.bind(method); + value.toString = method.toString.bind(method); + } + this.prototype[property] = value; + } + + return this; + } + + return { + create: create, + Methods: { + addMethods: addMethods + } + }; +})(); +(function() { + + var _toString = Object.prototype.toString; + + function extend(destination, source) { + for (var property in source) + destination[property] = source[property]; + return destination; + } + + function inspect(object) { + try { + if (isUndefined(object)) return 'undefined'; + if (object === null) return 'null'; + return object.inspect ? object.inspect() : String(object); + } catch (e) { + if (e instanceof RangeError) return '...'; + throw e; + } + } + + function toJSON(object) { + var type = typeof object; + switch (type) { + case 'undefined': + case 'function': + case 'unknown': return; + case 'boolean': return object.toString(); + } + + if (object === null) return 'null'; + if (object.toJSON) return object.toJSON(); + if (isElement(object)) return; + + var results = []; + for (var property in object) { + var value = toJSON(object[property]); + if (!isUndefined(value)) + results.push(property.toJSON() + ': ' + value); + } + + return '{' + results.join(', ') + '}'; + } + + function toQueryString(object) { + return $H(object).toQueryString(); + } + + function toHTML(object) { + return object && object.toHTML ? object.toHTML() : String.interpret(object); + } + + function keys(object) { + var results = []; + for (var property in object) + results.push(property); + return results; + } + + function values(object) { + var results = []; + for (var property in object) + results.push(object[property]); + return results; + } + + function clone(object) { + return extend({ }, object); + } + + function isElement(object) { + return !!(object && object.nodeType == 1); + } + + function isArray(object) { + return _toString.call(object) == "[object Array]"; + } + + + function isHash(object) { + return object instanceof Hash; + } + + function isFunction(object) { + return typeof object === "function"; + } + + function isString(object) { + return _toString.call(object) == "[object String]"; + } + + function isNumber(object) { + return _toString.call(object) == "[object Number]"; + } + + function isUndefined(object) { + return typeof object === "undefined"; + } + + extend(Object, { + extend: extend, + inspect: inspect, + toJSON: toJSON, + toQueryString: toQueryString, + toHTML: toHTML, + keys: keys, + values: values, + clone: clone, + isElement: isElement, + isArray: isArray, + isHash: isHash, + isFunction: isFunction, + isString: isString, + isNumber: isNumber, + isUndefined: isUndefined + }); +})(); +Object.extend(Function.prototype, (function() { + var slice = Array.prototype.slice; + + function update(array, args) { + var arrayLength = array.length, length = args.length; + while (length--) array[arrayLength + length] = args[length]; + return array; + } + + function merge(array, args) { + array = slice.call(array, 0); + return update(array, args); + } + + function argumentNames() { + var names = this.toString().match(/^[\s\(]*function[^(]*\(([^)]*)\)/)[1] + .replace(/\/\/.*?[\r\n]|\/\*(?:.|[\r\n])*?\*\//g, '') + .replace(/\s+/g, '').split(','); + return names.length == 1 && !names[0] ? [] : names; + } + + function bind(context) { + if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this; + var __method = this, args = slice.call(arguments, 1); + return function() { + var a = merge(args, arguments); + return __method.apply(context, a); + } + } + + function bindAsEventListener(context) { + var __method = this, args = slice.call(arguments, 1); + return function(event) { + var a = update([event || window.event], args); + return __method.apply(context, a); + } + } + + function curry() { + if (!arguments.length) return this; + var __method = this, args = slice.call(arguments, 0); + return function() { + var a = merge(args, arguments); + return __method.apply(this, a); + } + } + + function delay(timeout) { + var __method = this, args = slice.call(arguments, 1); + timeout = timeout * 1000 + return window.setTimeout(function() { + return __method.apply(__method, args); + }, timeout); + } + + function defer() { + var args = update([0.01], arguments); + return this.delay.apply(this, args); + } + + function wrap(wrapper) { + var __method = this; + return function() { + var a = update([__method.bind(this)], arguments); + return wrapper.apply(this, a); + } + } + + function methodize() { + if (this._methodized) return this._methodized; + var __method = this; + return this._methodized = function() { + var a = update([this], arguments); + return __method.apply(null, a); + }; + } + + return { + argumentNames: argumentNames, + bind: bind, + bindAsEventListener: bindAsEventListener, + curry: curry, + delay: delay, + defer: defer, + wrap: wrap, + methodize: methodize + } +})()); + + +Date.prototype.toJSON = function() { + return '"' + this.getUTCFullYear() + '-' + + (this.getUTCMonth() + 1).toPaddedString(2) + '-' + + this.getUTCDate().toPaddedString(2) + 'T' + + this.getUTCHours().toPaddedString(2) + ':' + + this.getUTCMinutes().toPaddedString(2) + ':' + + this.getUTCSeconds().toPaddedString(2) + 'Z"'; +}; + + +RegExp.prototype.match = RegExp.prototype.test; + +RegExp.escape = function(str) { + return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1'); +}; +var PeriodicalExecuter = Class.create({ + initialize: function(callback, frequency) { + this.callback = callback; + this.frequency = frequency; + this.currentlyExecuting = false; + + this.registerCallback(); + }, + + registerCallback: function() { + this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); + }, + + execute: function() { + this.callback(this); + }, + + stop: function() { + if (!this.timer) return; + clearInterval(this.timer); + this.timer = null; + }, + + onTimerEvent: function() { + if (!this.currentlyExecuting) { + try { + this.currentlyExecuting = true; + this.execute(); + this.currentlyExecuting = false; + } catch(e) { + this.currentlyExecuting = false; + throw e; + } + } + } +}); +Object.extend(String, { + interpret: function(value) { + return value == null ? '' : String(value); + }, + specialChar: { + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '\\': '\\\\' + } +}); + +Object.extend(String.prototype, (function() { + + function prepareReplacement(replacement) { + if (Object.isFunction(replacement)) return replacement; + var template = new Template(replacement); + return function(match) { return template.evaluate(match) }; + } + + function gsub(pattern, replacement) { + var result = '', source = this, match; + replacement = prepareReplacement(replacement); + + if (Object.isString(pattern)) + pattern = RegExp.escape(pattern); + + if (!(pattern.length || pattern.source)) { + replacement = replacement(''); + return replacement + source.split('').join(replacement) + replacement; + } + + while (source.length > 0) { + if (match = source.match(pattern)) { + result += source.slice(0, match.index); + result += String.interpret(replacement(match)); + source = source.slice(match.index + match[0].length); + } else { + result += source, source = ''; + } + } + return result; + } + + function sub(pattern, replacement, count) { + replacement = prepareReplacement(replacement); + count = Object.isUndefined(count) ? 1 : count; + + return this.gsub(pattern, function(match) { + if (--count < 0) return match[0]; + return replacement(match); + }); + } + + function scan(pattern, iterator) { + this.gsub(pattern, iterator); + return String(this); + } + + function truncate(length, truncation) { + length = length || 30; + truncation = Object.isUndefined(truncation) ? '...' : truncation; + return this.length > length ? + this.slice(0, length - truncation.length) + truncation : String(this); + } + + function strip() { + return this.replace(/^\s+/, '').replace(/\s+$/, ''); + } + + function stripTags() { + return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?>|<\/\w+>/gi, ''); + } + + function stripScripts() { + return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); + } + + function extractScripts() { + var matchAll = new RegExp(Prototype.ScriptFragment, 'img'); + var matchOne = new RegExp(Prototype.ScriptFragment, 'im'); + return (this.match(matchAll) || []).map(function(scriptTag) { + return (scriptTag.match(matchOne) || ['', ''])[1]; + }); + } + + function evalScripts() { + return this.extractScripts().map(function(script) { return eval(script) }); + } + + function escapeHTML() { + return this.replace(/&/g,'&').replace(//g,'>'); + } + + function unescapeHTML() { + return this.stripTags().replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&'); + } + + + function toQueryParams(separator) { + var match = this.strip().match(/([^?#]*)(#.*)?$/); + if (!match) return { }; + + return match[1].split(separator || '&').inject({ }, function(hash, pair) { + if ((pair = pair.split('='))[0]) { + var key = decodeURIComponent(pair.shift()); + var value = pair.length > 1 ? pair.join('=') : pair[0]; + if (value != undefined) value = decodeURIComponent(value); + + if (key in hash) { + if (!Object.isArray(hash[key])) hash[key] = [hash[key]]; + hash[key].push(value); + } + else hash[key] = value; + } + return hash; + }); + } + + function toArray() { + return this.split(''); + } + + function succ() { + return this.slice(0, this.length - 1) + + String.fromCharCode(this.charCodeAt(this.length - 1) + 1); + } + + function times(count) { + return count < 1 ? '' : new Array(count + 1).join(this); + } + + function camelize() { + var parts = this.split('-'), len = parts.length; + if (len == 1) return parts[0]; + + var camelized = this.charAt(0) == '-' + ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1) + : parts[0]; + + for (var i = 1; i < len; i++) + camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1); + + return camelized; + } + + function capitalize() { + return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase(); + } + + function underscore() { + return this.replace(/::/g, '/') + .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2') + .replace(/([a-z\d])([A-Z])/g, '$1_$2') + .replace(/-/g, '_') + .toLowerCase(); + } + + function dasherize() { + return this.replace(/_/g, '-'); + } + + function inspect(useDoubleQuotes) { + var escapedString = this.replace(/[\x00-\x1f\\]/g, function(character) { + if (character in String.specialChar) { + return String.specialChar[character]; + } + return '\\u00' + character.charCodeAt().toPaddedString(2, 16); + }); + if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"'; + return "'" + escapedString.replace(/'/g, '\\\'') + "'"; + } + + function toJSON() { + return this.inspect(true); + } + + function unfilterJSON(filter) { + return this.replace(filter || Prototype.JSONFilter, '$1'); + } + + function isJSON() { + var str = this; + if (str.blank()) return false; + str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, ''); + return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str); + } + + function evalJSON(sanitize) { + var json = this.unfilterJSON(); + try { + if (!sanitize || json.isJSON()) return eval('(' + json + ')'); + } catch (e) { } + throw new SyntaxError('Badly formed JSON string: ' + this.inspect()); + } + + function include(pattern) { + return this.indexOf(pattern) > -1; + } + + function startsWith(pattern) { + return this.indexOf(pattern) === 0; + } + + function endsWith(pattern) { + var d = this.length - pattern.length; + return d >= 0 && this.lastIndexOf(pattern) === d; + } + + function empty() { + return this == ''; + } + + function blank() { + return /^\s*$/.test(this); + } + + function interpolate(object, pattern) { + return new Template(this, pattern).evaluate(object); + } + + return { + gsub: gsub, + sub: sub, + scan: scan, + truncate: truncate, + strip: String.prototype.trim ? String.prototype.trim : strip, + stripTags: stripTags, + stripScripts: stripScripts, + extractScripts: extractScripts, + evalScripts: evalScripts, + escapeHTML: escapeHTML, + unescapeHTML: unescapeHTML, + toQueryParams: toQueryParams, + parseQuery: toQueryParams, + toArray: toArray, + succ: succ, + times: times, + camelize: camelize, + capitalize: capitalize, + underscore: underscore, + dasherize: dasherize, + inspect: inspect, + toJSON: toJSON, + unfilterJSON: unfilterJSON, + isJSON: isJSON, + evalJSON: evalJSON, + include: include, + startsWith: startsWith, + endsWith: endsWith, + empty: empty, + blank: blank, + interpolate: interpolate + }; +})()); + +var Template = Class.create({ + initialize: function(template, pattern) { + this.template = template.toString(); + this.pattern = pattern || Template.Pattern; + }, + + evaluate: function(object) { + if (object && Object.isFunction(object.toTemplateReplacements)) + object = object.toTemplateReplacements(); + + return this.template.gsub(this.pattern, function(match) { + if (object == null) return (match[1] + ''); + + var before = match[1] || ''; + if (before == '\\') return match[2]; + + var ctx = object, expr = match[3]; + var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/; + match = pattern.exec(expr); + if (match == null) return before; + + while (match != null) { + var comp = match[1].startsWith('[') ? match[2].replace(/\\\\]/g, ']') : match[1]; + ctx = ctx[comp]; + if (null == ctx || '' == match[3]) break; + expr = expr.substring('[' == match[3] ? match[1].length : match[0].length); + match = pattern.exec(expr); + } + + return before + String.interpret(ctx); + }); + } +}); +Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; + +var $break = { }; + +var Enumerable = (function() { + function each(iterator, context) { + var index = 0; + try { + this._each(function(value) { + iterator.call(context, value, index++); + }); + } catch (e) { + if (e != $break) throw e; + } + return this; + } + + function eachSlice(number, iterator, context) { + var index = -number, slices = [], array = this.toArray(); + if (number < 1) return array; + while ((index += number) < array.length) + slices.push(array.slice(index, index+number)); + return slices.collect(iterator, context); + } + + function all(iterator, context) { + iterator = iterator || Prototype.K; + var result = true; + this.each(function(value, index) { + result = result && !!iterator.call(context, value, index); + if (!result) throw $break; + }); + return result; + } + + function any(iterator, context) { + iterator = iterator || Prototype.K; + var result = false; + this.each(function(value, index) { + if (result = !!iterator.call(context, value, index)) + throw $break; + }); + return result; + } + + function collect(iterator, context) { + iterator = iterator || Prototype.K; + var results = []; + this.each(function(value, index) { + results.push(iterator.call(context, value, index)); + }); + return results; + } + + function detect(iterator, context) { + var result; + this.each(function(value, index) { + if (iterator.call(context, value, index)) { + result = value; + throw $break; + } + }); + return result; + } + + function findAll(iterator, context) { + var results = []; + this.each(function(value, index) { + if (iterator.call(context, value, index)) + results.push(value); + }); + return results; + } + + function grep(filter, iterator, context) { + iterator = iterator || Prototype.K; + var results = []; + + if (Object.isString(filter)) + filter = new RegExp(RegExp.escape(filter)); + + this.each(function(value, index) { + if (filter.match(value)) + results.push(iterator.call(context, value, index)); + }); + return results; + } + + function include(object) { + if (Object.isFunction(this.indexOf)) + if (this.indexOf(object) != -1) return true; + + var found = false; + this.each(function(value) { + if (value == object) { + found = true; + throw $break; + } + }); + return found; + } + + function inGroupsOf(number, fillWith) { + fillWith = Object.isUndefined(fillWith) ? null : fillWith; + return this.eachSlice(number, function(slice) { + while(slice.length < number) slice.push(fillWith); + return slice; + }); + } + + function inject(memo, iterator, context) { + this.each(function(value, index) { + memo = iterator.call(context, memo, value, index); + }); + return memo; + } + + function invoke(method) { + var args = $A(arguments).slice(1); + return this.map(function(value) { + return value[method].apply(value, args); + }); + } + + function max(iterator, context) { + iterator = iterator || Prototype.K; + var result; + this.each(function(value, index) { + value = iterator.call(context, value, index); + if (result == null || value >= result) + result = value; + }); + return result; + } + + function min(iterator, context) { + iterator = iterator || Prototype.K; + var result; + this.each(function(value, index) { + value = iterator.call(context, value, index); + if (result == null || value < result) + result = value; + }); + return result; + } + + function partition(iterator, context) { + iterator = iterator || Prototype.K; + var trues = [], falses = []; + this.each(function(value, index) { + (iterator.call(context, value, index) ? + trues : falses).push(value); + }); + return [trues, falses]; + } + + function pluck(property) { + var results = []; + this.each(function(value) { + results.push(value[property]); + }); + return results; + } + + function reject(iterator, context) { + var results = []; + this.each(function(value, index) { + if (!iterator.call(context, value, index)) + results.push(value); + }); + return results; + } + + function sortBy(iterator, context) { + return this.map(function(value, index) { + return { + value: value, + criteria: iterator.call(context, value, index) + }; + }).sort(function(left, right) { + var a = left.criteria, b = right.criteria; + return a < b ? -1 : a > b ? 1 : 0; + }).pluck('value'); + } + + function toArray() { + return this.map(); + } + + function zip() { + var iterator = Prototype.K, args = $A(arguments); + if (Object.isFunction(args.last())) + iterator = args.pop(); + + var collections = [this].concat(args).map($A); + return this.map(function(value, index) { + return iterator(collections.pluck(index)); + }); + } + + function size() { + return this.toArray().length; + } + + function inspect() { + return '#'; + } + + + + + + + + + + return { + each: each, + eachSlice: eachSlice, + all: all, + every: all, + any: any, + some: any, + collect: collect, + map: collect, + detect: detect, + findAll: findAll, + select: findAll, + filter: findAll, + grep: grep, + include: include, + member: include, + inGroupsOf: inGroupsOf, + inject: inject, + invoke: invoke, + max: max, + min: min, + partition: partition, + pluck: pluck, + reject: reject, + sortBy: sortBy, + toArray: toArray, + entries: toArray, + zip: zip, + size: size, + inspect: inspect, + find: detect + }; +})(); +function $A(iterable) { + if (!iterable) return []; + if ('toArray' in Object(iterable)) return iterable.toArray(); + var length = iterable.length || 0, results = new Array(length); + while (length--) results[length] = iterable[length]; + return results; +} + +function $w(string) { + if (!Object.isString(string)) return []; + string = string.strip(); + return string ? string.split(/\s+/) : []; +} + +Array.from = $A; + + +(function() { + var arrayProto = Array.prototype, + slice = arrayProto.slice, + _each = arrayProto.forEach; // use native browser JS 1.6 implementation if available + + function each(iterator) { + for (var i = 0, length = this.length; i < length; i++) + iterator(this[i]); + } + if (!_each) _each = each; + + function clear() { + this.length = 0; + return this; + } + + function first() { + return this[0]; + } + + function last() { + return this[this.length - 1]; + } + + function compact() { + return this.select(function(value) { + return value != null; + }); + } + + function flatten() { + return this.inject([], function(array, value) { + if (Object.isArray(value)) + return array.concat(value.flatten()); + array.push(value); + return array; + }); + } + + function without() { + var values = slice.call(arguments, 0); + return this.select(function(value) { + return !values.include(value); + }); + } + + function reverse(inline) { + return (inline !== false ? this : this.toArray())._reverse(); + } + + function uniq(sorted) { + return this.inject([], function(array, value, index) { + if (0 == index || (sorted ? array.last() != value : !array.include(value))) + array.push(value); + return array; + }); + } + + function intersect(array) { + return this.uniq().findAll(function(item) { + return array.detect(function(value) { return item === value }); + }); + } + + + function clone() { + return slice.call(this, 0); + } + + function size() { + return this.length; + } + + function inspect() { + return '[' + this.map(Object.inspect).join(', ') + ']'; + } + + function toJSON() { + var results = []; + this.each(function(object) { + var value = Object.toJSON(object); + if (!Object.isUndefined(value)) results.push(value); + }); + return '[' + results.join(', ') + ']'; + } + + function indexOf(item, i) { + i || (i = 0); + var length = this.length; + if (i < 0) i = length + i; + for (; i < length; i++) + if (this[i] === item) return i; + return -1; + } + + function lastIndexOf(item, i) { + i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1; + var n = this.slice(0, i).reverse().indexOf(item); + return (n < 0) ? n : i - n - 1; + } + + function concat() { + var array = slice.call(this, 0), item; + for (var i = 0, length = arguments.length; i < length; i++) { + item = arguments[i]; + if (Object.isArray(item) && !('callee' in item)) { + for (var j = 0, arrayLength = item.length; j < arrayLength; j++) + array.push(item[j]); + } else { + array.push(item); + } + } + return array; + } + + Object.extend(arrayProto, Enumerable); + + if (!arrayProto._reverse) + arrayProto._reverse = arrayProto.reverse; + + Object.extend(arrayProto, { + _each: _each, + clear: clear, + first: first, + last: last, + compact: compact, + flatten: flatten, + without: without, + reverse: reverse, + uniq: uniq, + intersect: intersect, + clone: clone, + toArray: clone, + size: size, + inspect: inspect, + toJSON: toJSON + }); + + var CONCAT_ARGUMENTS_BUGGY = (function() { + return [].concat(arguments)[0][0] !== 1; + })(1,2) + + if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat; + + if (!arrayProto.indexOf) arrayProto.indexOf = indexOf; + if (!arrayProto.lastIndexOf) arrayProto.lastIndexOf = lastIndexOf; +})(); +function $H(object) { + return new Hash(object); +}; + +var Hash = Class.create(Enumerable, (function() { + function initialize(object) { + this._object = Object.isHash(object) ? object.toObject() : Object.clone(object); + } + + function _each(iterator) { + for (var key in this._object) { + var value = this._object[key], pair = [key, value]; + pair.key = key; + pair.value = value; + iterator(pair); + } + } + + function set(key, value) { + return this._object[key] = value; + } + + function get(key) { + if (this._object[key] !== Object.prototype[key]) + return this._object[key]; + } + + function unset(key) { + var value = this._object[key]; + delete this._object[key]; + return value; + } + + function toObject() { + return Object.clone(this._object); + } + + function keys() { + return this.pluck('key'); + } + + function values() { + return this.pluck('value'); + } + + function index(value) { + var match = this.detect(function(pair) { + return pair.value === value; + }); + return match && match.key; + } + + function merge(object) { + return this.clone().update(object); + } + + function update(object) { + return new Hash(object).inject(this, function(result, pair) { + result.set(pair.key, pair.value); + return result; + }); + } + + function toQueryPair(key, value) { + if (Object.isUndefined(value)) return key; + return key + '=' + encodeURIComponent(String.interpret(value)); + } + + function toQueryString() { + return this.inject([], function(results, pair) { + var key = encodeURIComponent(pair.key), values = pair.value; + + if (values && typeof values == 'object') { + if (Object.isArray(values)) + return results.concat(values.map(toQueryPair.curry(key))); + } else results.push(toQueryPair(key, values)); + return results; + }).join('&'); + } + + function inspect() { + return '#'; + } + + function toJSON() { + return Object.toJSON(this.toObject()); + } + + function clone() { + return new Hash(this); + } + + return { + initialize: initialize, + _each: _each, + set: set, + get: get, + unset: unset, + toObject: toObject, + toTemplateReplacements: toObject, + keys: keys, + values: values, + index: index, + merge: merge, + update: update, + toQueryString: toQueryString, + inspect: inspect, + toJSON: toJSON, + clone: clone + }; +})()); + +Hash.from = $H; +Object.extend(Number.prototype, (function() { + function toColorPart() { + return this.toPaddedString(2, 16); + } + + function succ() { + return this + 1; + } + + function times(iterator, context) { + $R(0, this, true).each(iterator, context); + return this; + } + + function toPaddedString(length, radix) { + var string = this.toString(radix || 10); + return '0'.times(length - string.length) + string; + } + + function toJSON() { + return isFinite(this) ? this.toString() : 'null'; + } + + function abs() { + return Math.abs(this); + } + + function round() { + return Math.round(this); + } + + function ceil() { + return Math.ceil(this); + } + + function floor() { + return Math.floor(this); + } + + return { + toColorPart: toColorPart, + succ: succ, + times: times, + toPaddedString: toPaddedString, + toJSON: toJSON, + abs: abs, + round: round, + ceil: ceil, + floor: floor + }; +})()); + +function $R(start, end, exclusive) { + return new ObjectRange(start, end, exclusive); +} + +var ObjectRange = Class.create(Enumerable, (function() { + function initialize(start, end, exclusive) { + this.start = start; + this.end = end; + this.exclusive = exclusive; + } + + function _each(iterator) { + var value = this.start; + while (this.include(value)) { + iterator(value); + value = value.succ(); + } + } + + function include(value) { + if (value < this.start) + return false; + if (this.exclusive) + return value < this.end; + return value <= this.end; + } + + return { + initialize: initialize, + _each: _each, + include: include + }; +})()); + + + +var Ajax = { + getTransport: function() { + return Try.these( + function() {return new XMLHttpRequest()}, + function() {return new ActiveXObject('Msxml2.XMLHTTP')}, + function() {return new ActiveXObject('Microsoft.XMLHTTP')} + ) || false; + }, + + activeRequestCount: 0 +}; + +Ajax.Responders = { + responders: [], + + _each: function(iterator) { + this.responders._each(iterator); + }, + + register: function(responder) { + if (!this.include(responder)) + this.responders.push(responder); + }, + + unregister: function(responder) { + this.responders = this.responders.without(responder); + }, + + dispatch: function(callback, request, transport, json) { + this.each(function(responder) { + if (Object.isFunction(responder[callback])) { + try { + responder[callback].apply(responder, [request, transport, json]); + } catch (e) { } + } + }); + } +}; + +Object.extend(Ajax.Responders, Enumerable); + +Ajax.Responders.register({ + onCreate: function() { Ajax.activeRequestCount++ }, + onComplete: function() { Ajax.activeRequestCount-- } +}); +Ajax.Base = Class.create({ + initialize: function(options) { + this.options = { + method: 'post', + asynchronous: true, + contentType: 'application/x-www-form-urlencoded', + encoding: 'UTF-8', + parameters: '', + evalJSON: true, + evalJS: true + }; + Object.extend(this.options, options || { }); + + this.options.method = this.options.method.toLowerCase(); + + if (Object.isString(this.options.parameters)) + this.options.parameters = this.options.parameters.toQueryParams(); + else if (Object.isHash(this.options.parameters)) + this.options.parameters = this.options.parameters.toObject(); + } +}); +Ajax.Request = Class.create(Ajax.Base, { + _complete: false, + + initialize: function($super, url, options) { + $super(options); + this.transport = Ajax.getTransport(); + this.request(url); + }, + + request: function(url) { + this.url = url; + this.method = this.options.method; + var params = Object.clone(this.options.parameters); + + if (!['get', 'post'].include(this.method)) { + params['_method'] = this.method; + this.method = 'post'; + } + + this.parameters = params; + + if (params = Object.toQueryString(params)) { + if (this.method == 'get') + this.url += (this.url.include('?') ? '&' : '?') + params; + else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) + params += '&_='; + } + + try { + var response = new Ajax.Response(this); + if (this.options.onCreate) this.options.onCreate(response); + Ajax.Responders.dispatch('onCreate', this, response); + + this.transport.open(this.method.toUpperCase(), this.url, + this.options.asynchronous); + + if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1); + + this.transport.onreadystatechange = this.onStateChange.bind(this); + this.setRequestHeaders(); + + this.body = this.method == 'post' ? (this.options.postBody || params) : null; + this.transport.send(this.body); + + /* Force Firefox to handle ready state 4 for synchronous requests */ + if (!this.options.asynchronous && this.transport.overrideMimeType) + this.onStateChange(); + + } + catch (e) { + this.dispatchException(e); + } + }, + + onStateChange: function() { + var readyState = this.transport.readyState; + if (readyState > 1 && !((readyState == 4) && this._complete)) + this.respondToReadyState(this.transport.readyState); + }, + + setRequestHeaders: function() { + var headers = { + 'X-Requested-With': 'XMLHttpRequest', + 'X-Prototype-Version': Prototype.Version, + 'Accept': 'text/javascript, text/html, application/xml, text/xml, */*' + }; + + if (this.method == 'post') { + headers['Content-type'] = this.options.contentType + + (this.options.encoding ? '; charset=' + this.options.encoding : ''); + + /* Force "Connection: close" for older Mozilla browsers to work + * around a bug where XMLHttpRequest sends an incorrect + * Content-length header. See Mozilla Bugzilla #246651. + */ + if (this.transport.overrideMimeType && + (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) + headers['Connection'] = 'close'; + } + + if (typeof this.options.requestHeaders == 'object') { + var extras = this.options.requestHeaders; + + if (Object.isFunction(extras.push)) + for (var i = 0, length = extras.length; i < length; i += 2) + headers[extras[i]] = extras[i+1]; + else + $H(extras).each(function(pair) { headers[pair.key] = pair.value }); + } + + for (var name in headers) + this.transport.setRequestHeader(name, headers[name]); + }, + + success: function() { + var status = this.getStatus(); + return !status || (status >= 200 && status < 300); + }, + + getStatus: function() { + try { + return this.transport.status || 0; + } catch (e) { return 0 } + }, + + respondToReadyState: function(readyState) { + var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this); + + if (state == 'Complete') { + try { + this._complete = true; + (this.options['on' + response.status] + || this.options['on' + (this.success() ? 'Success' : 'Failure')] + || Prototype.emptyFunction)(response, response.headerJSON); + } catch (e) { + this.dispatchException(e); + } + + var contentType = response.getHeader('Content-type'); + if (this.options.evalJS == 'force' + || (this.options.evalJS && this.isSameOrigin() && contentType + && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i))) + this.evalResponse(); + } + + try { + (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON); + Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON); + } catch (e) { + this.dispatchException(e); + } + + if (state == 'Complete') { + this.transport.onreadystatechange = Prototype.emptyFunction; + } + }, + + isSameOrigin: function() { + var m = this.url.match(/^\s*https?:\/\/[^\/]*/); + return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({ + protocol: location.protocol, + domain: document.domain, + port: location.port ? ':' + location.port : '' + })); + }, + + getHeader: function(name) { + try { + return this.transport.getResponseHeader(name) || null; + } catch (e) { return null; } + }, + + evalResponse: function() { + try { + return eval((this.transport.responseText || '').unfilterJSON()); + } catch (e) { + this.dispatchException(e); + } + }, + + dispatchException: function(exception) { + (this.options.onException || Prototype.emptyFunction)(this, exception); + Ajax.Responders.dispatch('onException', this, exception); + } +}); + +Ajax.Request.Events = + ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; + + + + + + + + +Ajax.Response = Class.create({ + initialize: function(request){ + this.request = request; + var transport = this.transport = request.transport, + readyState = this.readyState = transport.readyState; + + if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) { + this.status = this.getStatus(); + this.statusText = this.getStatusText(); + this.responseText = String.interpret(transport.responseText); + this.headerJSON = this._getHeaderJSON(); + } + + if(readyState == 4) { + var xml = transport.responseXML; + this.responseXML = Object.isUndefined(xml) ? null : xml; + this.responseJSON = this._getResponseJSON(); + } + }, + + status: 0, + + statusText: '', + + getStatus: Ajax.Request.prototype.getStatus, + + getStatusText: function() { + try { + return this.transport.statusText || ''; + } catch (e) { return '' } + }, + + getHeader: Ajax.Request.prototype.getHeader, + + getAllHeaders: function() { + try { + return this.getAllResponseHeaders(); + } catch (e) { return null } + }, + + getResponseHeader: function(name) { + return this.transport.getResponseHeader(name); + }, + + getAllResponseHeaders: function() { + return this.transport.getAllResponseHeaders(); + }, + + _getHeaderJSON: function() { + var json = this.getHeader('X-JSON'); + if (!json) return null; + json = decodeURIComponent(escape(json)); + try { + return json.evalJSON(this.request.options.sanitizeJSON || + !this.request.isSameOrigin()); + } catch (e) { + this.request.dispatchException(e); + } + }, + + _getResponseJSON: function() { + var options = this.request.options; + if (!options.evalJSON || (options.evalJSON != 'force' && + !(this.getHeader('Content-type') || '').include('application/json')) || + this.responseText.blank()) + return null; + try { + return this.responseText.evalJSON(options.sanitizeJSON || + !this.request.isSameOrigin()); + } catch (e) { + this.request.dispatchException(e); + } + } +}); + +Ajax.Updater = Class.create(Ajax.Request, { + initialize: function($super, container, url, options) { + this.container = { + success: (container.success || container), + failure: (container.failure || (container.success ? null : container)) + }; + + options = Object.clone(options); + var onComplete = options.onComplete; + options.onComplete = (function(response, json) { + this.updateContent(response.responseText); + if (Object.isFunction(onComplete)) onComplete(response, json); + }).bind(this); + + $super(url, options); + }, + + updateContent: function(responseText) { + var receiver = this.container[this.success() ? 'success' : 'failure'], + options = this.options; + + if (!options.evalScripts) responseText = responseText.stripScripts(); + + if (receiver = $(receiver)) { + if (options.insertion) { + if (Object.isString(options.insertion)) { + var insertion = { }; insertion[options.insertion] = responseText; + receiver.insert(insertion); + } + else options.insertion(receiver, responseText); + } + else receiver.update(responseText); + } + } +}); + +Ajax.PeriodicalUpdater = Class.create(Ajax.Base, { + initialize: function($super, container, url, options) { + $super(options); + this.onComplete = this.options.onComplete; + + this.frequency = (this.options.frequency || 2); + this.decay = (this.options.decay || 1); + + this.updater = { }; + this.container = container; + this.url = url; + + this.start(); + }, + + start: function() { + this.options.onComplete = this.updateComplete.bind(this); + this.onTimerEvent(); + }, + + stop: function() { + this.updater.options.onComplete = undefined; + clearTimeout(this.timer); + (this.onComplete || Prototype.emptyFunction).apply(this, arguments); + }, + + updateComplete: function(response) { + if (this.options.decay) { + this.decay = (response.responseText == this.lastText ? + this.decay * this.options.decay : 1); + + this.lastText = response.responseText; + } + this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency); + }, + + onTimerEvent: function() { + this.updater = new Ajax.Updater(this.container, this.url, this.options); + } +}); + + + +function $(element) { + if (arguments.length > 1) { + for (var i = 0, elements = [], length = arguments.length; i < length; i++) + elements.push($(arguments[i])); + return elements; + } + if (Object.isString(element)) + element = document.getElementById(element); + return Element.extend(element); +} + +if (Prototype.BrowserFeatures.XPath) { + document._getElementsByXPath = function(expression, parentElement) { + var results = []; + var query = document.evaluate(expression, $(parentElement) || document, + null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); + for (var i = 0, length = query.snapshotLength; i < length; i++) + results.push(Element.extend(query.snapshotItem(i))); + return results; + }; +} + +/*--------------------------------------------------------------------------*/ + +if (!window.Node) var Node = { }; + +if (!Node.ELEMENT_NODE) { + Object.extend(Node, { + ELEMENT_NODE: 1, + ATTRIBUTE_NODE: 2, + TEXT_NODE: 3, + CDATA_SECTION_NODE: 4, + ENTITY_REFERENCE_NODE: 5, + ENTITY_NODE: 6, + PROCESSING_INSTRUCTION_NODE: 7, + COMMENT_NODE: 8, + DOCUMENT_NODE: 9, + DOCUMENT_TYPE_NODE: 10, + DOCUMENT_FRAGMENT_NODE: 11, + NOTATION_NODE: 12 + }); +} + + +(function(global) { + + var SETATTRIBUTE_IGNORES_NAME = (function(){ + var elForm = document.createElement("form"); + var elInput = document.createElement("input"); + var root = document.documentElement; + elInput.setAttribute("name", "test"); + elForm.appendChild(elInput); + root.appendChild(elForm); + var isBuggy = elForm.elements + ? (typeof elForm.elements.test == "undefined") + : null; + root.removeChild(elForm); + elForm = elInput = null; + return isBuggy; + })(); + + var element = global.Element; + global.Element = function(tagName, attributes) { + attributes = attributes || { }; + tagName = tagName.toLowerCase(); + var cache = Element.cache; + if (SETATTRIBUTE_IGNORES_NAME && attributes.name) { + tagName = '<' + tagName + ' name="' + attributes.name + '">'; + delete attributes.name; + return Element.writeAttribute(document.createElement(tagName), attributes); + } + if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName)); + return Element.writeAttribute(cache[tagName].cloneNode(false), attributes); + }; + Object.extend(global.Element, element || { }); + if (element) global.Element.prototype = element.prototype; +})(this); + +Element.cache = { }; +Element.idCounter = 1; + +Element.Methods = { + visible: function(element) { + return $(element).style.display != 'none'; + }, + + toggle: function(element) { + element = $(element); + Element[Element.visible(element) ? 'hide' : 'show'](element); + return element; + }, + + + hide: function(element) { + element = $(element); + element.style.display = 'none'; + return element; + }, + + show: function(element) { + element = $(element); + element.style.display = ''; + return element; + }, + + remove: function(element) { + element = $(element); + element.parentNode.removeChild(element); + return element; + }, + + update: (function(){ + + var SELECT_ELEMENT_INNERHTML_BUGGY = (function(){ + var el = document.createElement("select"), + isBuggy = true; + el.innerHTML = ""; + if (el.options && el.options[0]) { + isBuggy = el.options[0].nodeName.toUpperCase() !== "OPTION"; + } + el = null; + return isBuggy; + })(); + + var TABLE_ELEMENT_INNERHTML_BUGGY = (function(){ + try { + var el = document.createElement("table"); + if (el && el.tBodies) { + el.innerHTML = "test"; + var isBuggy = typeof el.tBodies[0] == "undefined"; + el = null; + return isBuggy; + } + } catch (e) { + return true; + } + })(); + + var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING = (function () { + var s = document.createElement("script"), + isBuggy = false; + try { + s.appendChild(document.createTextNode("")); + isBuggy = !s.firstChild || + s.firstChild && s.firstChild.nodeType !== 3; + } catch (e) { + isBuggy = true; + } + s = null; + return isBuggy; + })(); + + function update(element, content) { + element = $(element); + + if (content && content.toElement) + content = content.toElement(); + + if (Object.isElement(content)) + return element.update().insert(content); + + content = Object.toHTML(content); + + var tagName = element.tagName.toUpperCase(); + + if (tagName === 'SCRIPT' && SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING) { + element.text = content; + return element; + } + + if (SELECT_ELEMENT_INNERHTML_BUGGY || TABLE_ELEMENT_INNERHTML_BUGGY) { + if (tagName in Element._insertionTranslations.tags) { + while (element.firstChild) { + element.removeChild(element.firstChild); + } + Element._getContentFromAnonymousElement(tagName, content.stripScripts()) + .each(function(node) { + element.appendChild(node) + }); + } + else { + element.innerHTML = content.stripScripts(); + } + } + else { + element.innerHTML = content.stripScripts(); + } + + content.evalScripts.bind(content).defer(); + return element; + } + + return update; + })(), + + replace: function(element, content) { + element = $(element); + if (content && content.toElement) content = content.toElement(); + else if (!Object.isElement(content)) { + content = Object.toHTML(content); + var range = element.ownerDocument.createRange(); + range.selectNode(element); + content.evalScripts.bind(content).defer(); + content = range.createContextualFragment(content.stripScripts()); + } + element.parentNode.replaceChild(content, element); + return element; + }, + + insert: function(element, insertions) { + element = $(element); + + if (Object.isString(insertions) || Object.isNumber(insertions) || + Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML))) + insertions = {bottom:insertions}; + + var content, insert, tagName, childNodes; + + for (var position in insertions) { + content = insertions[position]; + position = position.toLowerCase(); + insert = Element._insertionTranslations[position]; + + if (content && content.toElement) content = content.toElement(); + if (Object.isElement(content)) { + insert(element, content); + continue; + } + + content = Object.toHTML(content); + + tagName = ((position == 'before' || position == 'after') + ? element.parentNode : element).tagName.toUpperCase(); + + childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts()); + + if (position == 'top' || position == 'after') childNodes.reverse(); + childNodes.each(insert.curry(element)); + + content.evalScripts.bind(content).defer(); + } + + return element; + }, + + wrap: function(element, wrapper, attributes) { + element = $(element); + if (Object.isElement(wrapper)) + $(wrapper).writeAttribute(attributes || { }); + else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes); + else wrapper = new Element('div', wrapper); + if (element.parentNode) + element.parentNode.replaceChild(wrapper, element); + wrapper.appendChild(element); + return wrapper; + }, + + inspect: function(element) { + element = $(element); + var result = '<' + element.tagName.toLowerCase(); + $H({'id': 'id', 'className': 'class'}).each(function(pair) { + var property = pair.first(), attribute = pair.last(); + var value = (element[property] || '').toString(); + if (value) result += ' ' + attribute + '=' + value.inspect(true); + }); + return result + '>'; + }, + + recursivelyCollect: function(element, property) { + element = $(element); + var elements = []; + while (element = element[property]) + if (element.nodeType == 1) + elements.push(Element.extend(element)); + return elements; + }, + + ancestors: function(element) { + return Element.recursivelyCollect(element, 'parentNode'); + }, + + descendants: function(element) { + return Element.select(element, "*"); + }, + + firstDescendant: function(element) { + element = $(element).firstChild; + while (element && element.nodeType != 1) element = element.nextSibling; + return $(element); + }, + + immediateDescendants: function(element) { + if (!(element = $(element).firstChild)) return []; + while (element && element.nodeType != 1) element = element.nextSibling; + if (element) return [element].concat($(element).nextSiblings()); + return []; + }, + + previousSiblings: function(element) { + return Element.recursivelyCollect(element, 'previousSibling'); + }, + + nextSiblings: function(element) { + return Element.recursivelyCollect(element, 'nextSibling'); + }, + + siblings: function(element) { + element = $(element); + return Element.previousSiblings(element).reverse() + .concat(Element.nextSiblings(element)); + }, + + match: function(element, selector) { + if (Object.isString(selector)) + selector = new Selector(selector); + return selector.match($(element)); + }, + + up: function(element, expression, index) { + element = $(element); + if (arguments.length == 1) return $(element.parentNode); + var ancestors = Element.ancestors(element); + return Object.isNumber(expression) ? ancestors[expression] : + Selector.findElement(ancestors, expression, index); + }, + + down: function(element, expression, index) { + element = $(element); + if (arguments.length == 1) return Element.firstDescendant(element); + return Object.isNumber(expression) ? Element.descendants(element)[expression] : + Element.select(element, expression)[index || 0]; + }, + + previous: function(element, expression, index) { + element = $(element); + if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element)); + var previousSiblings = Element.previousSiblings(element); + return Object.isNumber(expression) ? previousSiblings[expression] : + Selector.findElement(previousSiblings, expression, index); + }, + + next: function(element, expression, index) { + element = $(element); + if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element)); + var nextSiblings = Element.nextSiblings(element); + return Object.isNumber(expression) ? nextSiblings[expression] : + Selector.findElement(nextSiblings, expression, index); + }, + + + select: function(element) { + var args = Array.prototype.slice.call(arguments, 1); + return Selector.findChildElements(element, args); + }, + + adjacent: function(element) { + var args = Array.prototype.slice.call(arguments, 1); + return Selector.findChildElements(element.parentNode, args).without(element); + }, + + identify: function(element) { + element = $(element); + var id = Element.readAttribute(element, 'id'); + if (id) return id; + do { id = 'anonymous_element_' + Element.idCounter++ } while ($(id)); + Element.writeAttribute(element, 'id', id); + return id; + }, + + readAttribute: function(element, name) { + element = $(element); + if (Prototype.Browser.IE) { + var t = Element._attributeTranslations.read; + if (t.values[name]) return t.values[name](element, name); + if (t.names[name]) name = t.names[name]; + if (name.include(':')) { + return (!element.attributes || !element.attributes[name]) ? null : + element.attributes[name].value; + } + } + return element.getAttribute(name); + }, + + writeAttribute: function(element, name, value) { + element = $(element); + var attributes = { }, t = Element._attributeTranslations.write; + + if (typeof name == 'object') attributes = name; + else attributes[name] = Object.isUndefined(value) ? true : value; + + for (var attr in attributes) { + name = t.names[attr] || attr; + value = attributes[attr]; + if (t.values[attr]) name = t.values[attr](element, value); + if (value === false || value === null) + element.removeAttribute(name); + else if (value === true) + element.setAttribute(name, name); + else element.setAttribute(name, value); + } + return element; + }, + + getHeight: function(element) { + return Element.getDimensions(element).height; + }, + + getWidth: function(element) { + return Element.getDimensions(element).width; + }, + + classNames: function(element) { + return new Element.ClassNames(element); + }, + + hasClassName: function(element, className) { + if (!(element = $(element))) return; + var elementClassName = element.className; + return (elementClassName.length > 0 && (elementClassName == className || + new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName))); + }, + + addClassName: function(element, className) { + if (!(element = $(element))) return; + if (!Element.hasClassName(element, className)) + element.className += (element.className ? ' ' : '') + className; + return element; + }, + + removeClassName: function(element, className) { + if (!(element = $(element))) return; + element.className = element.className.replace( + new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip(); + return element; + }, + + toggleClassName: function(element, className) { + if (!(element = $(element))) return; + return Element[Element.hasClassName(element, className) ? + 'removeClassName' : 'addClassName'](element, className); + }, + + cleanWhitespace: function(element) { + element = $(element); + var node = element.firstChild; + while (node) { + var nextNode = node.nextSibling; + if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) + element.removeChild(node); + node = nextNode; + } + return element; + }, + + empty: function(element) { + return $(element).innerHTML.blank(); + }, + + descendantOf: function(element, ancestor) { + element = $(element), ancestor = $(ancestor); + + if (element.compareDocumentPosition) + return (element.compareDocumentPosition(ancestor) & 8) === 8; + + if (ancestor.contains) + return ancestor.contains(element) && ancestor !== element; + + while (element = element.parentNode) + if (element == ancestor) return true; + + return false; + }, + + scrollTo: function(element) { + element = $(element); + var pos = Element.cumulativeOffset(element); + window.scrollTo(pos[0], pos[1]); + return element; + }, + + getStyle: function(element, style) { + element = $(element); + style = style == 'float' ? 'cssFloat' : style.camelize(); + var value = element.style[style]; + if (!value || value == 'auto') { + var css = document.defaultView.getComputedStyle(element, null); + value = css ? css[style] : null; + } + if (style == 'opacity') return value ? parseFloat(value) : 1.0; + return value == 'auto' ? null : value; + }, + + getOpacity: function(element) { + return $(element).getStyle('opacity'); + }, + + setStyle: function(element, styles) { + element = $(element); + var elementStyle = element.style, match; + if (Object.isString(styles)) { + element.style.cssText += ';' + styles; + return styles.include('opacity') ? + element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element; + } + for (var property in styles) + if (property == 'opacity') element.setOpacity(styles[property]); + else + elementStyle[(property == 'float' || property == 'cssFloat') ? + (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') : + property] = styles[property]; + + return element; + }, + + setOpacity: function(element, value) { + element = $(element); + element.style.opacity = (value == 1 || value === '') ? '' : + (value < 0.00001) ? 0 : value; + return element; + }, + + getDimensions: function(element) { + element = $(element); + var display = Element.getStyle(element, 'display'); + if (display != 'none' && display != null) // Safari bug + return {width: element.offsetWidth, height: element.offsetHeight}; + + var els = element.style; + var originalVisibility = els.visibility; + var originalPosition = els.position; + var originalDisplay = els.display; + els.visibility = 'hidden'; + if (originalPosition != 'fixed') // Switching fixed to absolute causes issues in Safari + els.position = 'absolute'; + els.display = 'block'; + var originalWidth = element.clientWidth; + var originalHeight = element.clientHeight; + els.display = originalDisplay; + els.position = originalPosition; + els.visibility = originalVisibility; + return {width: originalWidth, height: originalHeight}; + }, + + makePositioned: function(element) { + element = $(element); + var pos = Element.getStyle(element, 'position'); + if (pos == 'static' || !pos) { + element._madePositioned = true; + element.style.position = 'relative'; + if (Prototype.Browser.Opera) { + element.style.top = 0; + element.style.left = 0; + } + } + return element; + }, + + undoPositioned: function(element) { + element = $(element); + if (element._madePositioned) { + element._madePositioned = undefined; + element.style.position = + element.style.top = + element.style.left = + element.style.bottom = + element.style.right = ''; + } + return element; + }, + + makeClipping: function(element) { + element = $(element); + if (element._overflow) return element; + element._overflow = Element.getStyle(element, 'overflow') || 'auto'; + if (element._overflow !== 'hidden') + element.style.overflow = 'hidden'; + return element; + }, + + undoClipping: function(element) { + element = $(element); + if (!element._overflow) return element; + element.style.overflow = element._overflow == 'auto' ? '' : element._overflow; + element._overflow = null; + return element; + }, + + cumulativeOffset: function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + element = element.offsetParent; + } while (element); + return Element._returnOffset(valueL, valueT); + }, + + positionedOffset: function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + element = element.offsetParent; + if (element) { + if (element.tagName.toUpperCase() == 'BODY') break; + var p = Element.getStyle(element, 'position'); + if (p !== 'static') break; + } + } while (element); + return Element._returnOffset(valueL, valueT); + }, + + absolutize: function(element) { + element = $(element); + if (Element.getStyle(element, 'position') == 'absolute') return element; + + var offsets = Element.positionedOffset(element); + var top = offsets[1]; + var left = offsets[0]; + var width = element.clientWidth; + var height = element.clientHeight; + + element._originalLeft = left - parseFloat(element.style.left || 0); + element._originalTop = top - parseFloat(element.style.top || 0); + element._originalWidth = element.style.width; + element._originalHeight = element.style.height; + + element.style.position = 'absolute'; + element.style.top = top + 'px'; + element.style.left = left + 'px'; + element.style.width = width + 'px'; + element.style.height = height + 'px'; + return element; + }, + + relativize: function(element) { + element = $(element); + if (Element.getStyle(element, 'position') == 'relative') return element; + + element.style.position = 'relative'; + var top = parseFloat(element.style.top || 0) - (element._originalTop || 0); + var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0); + + element.style.top = top + 'px'; + element.style.left = left + 'px'; + element.style.height = element._originalHeight; + element.style.width = element._originalWidth; + return element; + }, + + cumulativeScrollOffset: function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.scrollTop || 0; + valueL += element.scrollLeft || 0; + element = element.parentNode; + } while (element); + return Element._returnOffset(valueL, valueT); + }, + + getOffsetParent: function(element) { + if (element.offsetParent) return $(element.offsetParent); + if (element == document.body) return $(element); + + while ((element = element.parentNode) && element != document.body) + if (Element.getStyle(element, 'position') != 'static') + return $(element); + + return $(document.body); + }, + + viewportOffset: function(forElement) { + var valueT = 0, valueL = 0; + + var element = forElement; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + + if (element.offsetParent == document.body && + Element.getStyle(element, 'position') == 'absolute') break; + + } while (element = element.offsetParent); + + element = forElement; + do { + if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) { + valueT -= element.scrollTop || 0; + valueL -= element.scrollLeft || 0; + } + } while (element = element.parentNode); + + return Element._returnOffset(valueL, valueT); + }, + + clonePosition: function(element, source) { + var options = Object.extend({ + setLeft: true, + setTop: true, + setWidth: true, + setHeight: true, + offsetTop: 0, + offsetLeft: 0 + }, arguments[2] || { }); + + source = $(source); + var p = Element.viewportOffset(source); + + element = $(element); + var delta = [0, 0]; + var parent = null; + if (Element.getStyle(element, 'position') == 'absolute') { + parent = Element.getOffsetParent(element); + delta = Element.viewportOffset(parent); + } + + if (parent == document.body) { + delta[0] -= document.body.offsetLeft; + delta[1] -= document.body.offsetTop; + } + + if (options.setLeft) element.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px'; + if (options.setTop) element.style.top = (p[1] - delta[1] + options.offsetTop) + 'px'; + if (options.setWidth) element.style.width = source.offsetWidth + 'px'; + if (options.setHeight) element.style.height = source.offsetHeight + 'px'; + return element; + } +}; + +Object.extend(Element.Methods, { + getElementsBySelector: Element.Methods.select, + + childElements: Element.Methods.immediateDescendants +}); + +Element._attributeTranslations = { + write: { + names: { + className: 'class', + htmlFor: 'for' + }, + values: { } + } +}; + +if (Prototype.Browser.Opera) { + Element.Methods.getStyle = Element.Methods.getStyle.wrap( + function(proceed, element, style) { + switch (style) { + case 'left': case 'top': case 'right': case 'bottom': + if (proceed(element, 'position') === 'static') return null; + case 'height': case 'width': + if (!Element.visible(element)) return null; + + var dim = parseInt(proceed(element, style), 10); + + if (dim !== element['offset' + style.capitalize()]) + return dim + 'px'; + + var properties; + if (style === 'height') { + properties = ['border-top-width', 'padding-top', + 'padding-bottom', 'border-bottom-width']; + } + else { + properties = ['border-left-width', 'padding-left', + 'padding-right', 'border-right-width']; + } + return properties.inject(dim, function(memo, property) { + var val = proceed(element, property); + return val === null ? memo : memo - parseInt(val, 10); + }) + 'px'; + default: return proceed(element, style); + } + } + ); + + Element.Methods.readAttribute = Element.Methods.readAttribute.wrap( + function(proceed, element, attribute) { + if (attribute === 'title') return element.title; + return proceed(element, attribute); + } + ); +} + +else if (Prototype.Browser.IE) { + Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap( + function(proceed, element) { + element = $(element); + try { element.offsetParent } + catch(e) { return $(document.body) } + var position = element.getStyle('position'); + if (position !== 'static') return proceed(element); + element.setStyle({ position: 'relative' }); + var value = proceed(element); + element.setStyle({ position: position }); + return value; + } + ); + + $w('positionedOffset viewportOffset').each(function(method) { + Element.Methods[method] = Element.Methods[method].wrap( + function(proceed, element) { + element = $(element); + try { element.offsetParent } + catch(e) { return Element._returnOffset(0,0) } + var position = element.getStyle('position'); + if (position !== 'static') return proceed(element); + var offsetParent = element.getOffsetParent(); + if (offsetParent && offsetParent.getStyle('position') === 'fixed') + offsetParent.setStyle({ zoom: 1 }); + element.setStyle({ position: 'relative' }); + var value = proceed(element); + element.setStyle({ position: position }); + return value; + } + ); + }); + + Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap( + function(proceed, element) { + try { element.offsetParent } + catch(e) { return Element._returnOffset(0,0) } + return proceed(element); + } + ); + + Element.Methods.getStyle = function(element, style) { + element = $(element); + style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize(); + var value = element.style[style]; + if (!value && element.currentStyle) value = element.currentStyle[style]; + + if (style == 'opacity') { + if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/)) + if (value[1]) return parseFloat(value[1]) / 100; + return 1.0; + } + + if (value == 'auto') { + if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none')) + return element['offset' + style.capitalize()] + 'px'; + return null; + } + return value; + }; + + Element.Methods.setOpacity = function(element, value) { + function stripAlpha(filter){ + return filter.replace(/alpha\([^\)]*\)/gi,''); + } + element = $(element); + var currentStyle = element.currentStyle; + if ((currentStyle && !currentStyle.hasLayout) || + (!currentStyle && element.style.zoom == 'normal')) + element.style.zoom = 1; + + var filter = element.getStyle('filter'), style = element.style; + if (value == 1 || value === '') { + (filter = stripAlpha(filter)) ? + style.filter = filter : style.removeAttribute('filter'); + return element; + } else if (value < 0.00001) value = 0; + style.filter = stripAlpha(filter) + + 'alpha(opacity=' + (value * 100) + ')'; + return element; + }; + + Element._attributeTranslations = (function(){ + + var classProp = 'className'; + var forProp = 'for'; + + var el = document.createElement('div'); + + el.setAttribute(classProp, 'x'); + + if (el.className !== 'x') { + el.setAttribute('class', 'x'); + if (el.className === 'x') { + classProp = 'class'; + } + } + el = null; + + el = document.createElement('label'); + el.setAttribute(forProp, 'x'); + if (el.htmlFor !== 'x') { + el.setAttribute('htmlFor', 'x'); + if (el.htmlFor === 'x') { + forProp = 'htmlFor'; + } + } + el = null; + + return { + read: { + names: { + 'class': classProp, + 'className': classProp, + 'for': forProp, + 'htmlFor': forProp + }, + values: { + _getAttr: function(element, attribute) { + return element.getAttribute(attribute); + }, + _getAttr2: function(element, attribute) { + return element.getAttribute(attribute, 2); + }, + _getAttrNode: function(element, attribute) { + var node = element.getAttributeNode(attribute); + return node ? node.value : ""; + }, + _getEv: (function(){ + + var el = document.createElement('div'); + el.onclick = Prototype.emptyFunction; + var value = el.getAttribute('onclick'); + var f; + + if (String(value).indexOf('{') > -1) { + f = function(element, attribute) { + attribute = element.getAttribute(attribute); + if (!attribute) return null; + attribute = attribute.toString(); + attribute = attribute.split('{')[1]; + attribute = attribute.split('}')[0]; + return attribute.strip(); + }; + } + else if (value === '') { + f = function(element, attribute) { + attribute = element.getAttribute(attribute); + if (!attribute) return null; + return attribute.strip(); + }; + } + el = null; + return f; + })(), + _flag: function(element, attribute) { + return $(element).hasAttribute(attribute) ? attribute : null; + }, + style: function(element) { + return element.style.cssText.toLowerCase(); + }, + title: function(element) { + return element.title; + } + } + } + } + })(); + + Element._attributeTranslations.write = { + names: Object.extend({ + cellpadding: 'cellPadding', + cellspacing: 'cellSpacing' + }, Element._attributeTranslations.read.names), + values: { + checked: function(element, value) { + element.checked = !!value; + }, + + style: function(element, value) { + element.style.cssText = value ? value : ''; + } + } + }; + + Element._attributeTranslations.has = {}; + + $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' + + 'encType maxLength readOnly longDesc frameBorder').each(function(attr) { + Element._attributeTranslations.write.names[attr.toLowerCase()] = attr; + Element._attributeTranslations.has[attr.toLowerCase()] = attr; + }); + + (function(v) { + Object.extend(v, { + href: v._getAttr2, + src: v._getAttr2, + type: v._getAttr, + action: v._getAttrNode, + disabled: v._flag, + checked: v._flag, + readonly: v._flag, + multiple: v._flag, + onload: v._getEv, + onunload: v._getEv, + onclick: v._getEv, + ondblclick: v._getEv, + onmousedown: v._getEv, + onmouseup: v._getEv, + onmouseover: v._getEv, + onmousemove: v._getEv, + onmouseout: v._getEv, + onfocus: v._getEv, + onblur: v._getEv, + onkeypress: v._getEv, + onkeydown: v._getEv, + onkeyup: v._getEv, + onsubmit: v._getEv, + onreset: v._getEv, + onselect: v._getEv, + onchange: v._getEv + }); + })(Element._attributeTranslations.read.values); + + if (Prototype.BrowserFeatures.ElementExtensions) { + (function() { + function _descendants(element) { + var nodes = element.getElementsByTagName('*'), results = []; + for (var i = 0, node; node = nodes[i]; i++) + if (node.tagName !== "!") // Filter out comment nodes. + results.push(node); + return results; + } + + Element.Methods.down = function(element, expression, index) { + element = $(element); + if (arguments.length == 1) return element.firstDescendant(); + return Object.isNumber(expression) ? _descendants(element)[expression] : + Element.select(element, expression)[index || 0]; + } + })(); + } + +} + +else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) { + Element.Methods.setOpacity = function(element, value) { + element = $(element); + element.style.opacity = (value == 1) ? 0.999999 : + (value === '') ? '' : (value < 0.00001) ? 0 : value; + return element; + }; +} + +else if (Prototype.Browser.WebKit) { + Element.Methods.setOpacity = function(element, value) { + element = $(element); + element.style.opacity = (value == 1 || value === '') ? '' : + (value < 0.00001) ? 0 : value; + + if (value == 1) + if(element.tagName.toUpperCase() == 'IMG' && element.width) { + element.width++; element.width--; + } else try { + var n = document.createTextNode(' '); + element.appendChild(n); + element.removeChild(n); + } catch (e) { } + + return element; + }; + + Element.Methods.cumulativeOffset = function(element) { + var valueT = 0, valueL = 0; + do { + valueT += element.offsetTop || 0; + valueL += element.offsetLeft || 0; + if (element.offsetParent == document.body) + if (Element.getStyle(element, 'position') == 'absolute') break; + + element = element.offsetParent; + } while (element); + + return Element._returnOffset(valueL, valueT); + }; +} + +if ('outerHTML' in document.documentElement) { + Element.Methods.replace = function(element, content) { + element = $(element); + + if (content && content.toElement) content = content.toElement(); + if (Object.isElement(content)) { + element.parentNode.replaceChild(content, element); + return element; + } + + content = Object.toHTML(content); + var parent = element.parentNode, tagName = parent.tagName.toUpperCase(); + + if (Element._insertionTranslations.tags[tagName]) { + var nextSibling = element.next(); + var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts()); + parent.removeChild(element); + if (nextSibling) + fragments.each(function(node) { parent.insertBefore(node, nextSibling) }); + else + fragments.each(function(node) { parent.appendChild(node) }); + } + else element.outerHTML = content.stripScripts(); + + content.evalScripts.bind(content).defer(); + return element; + }; +} + +Element._returnOffset = function(l, t) { + var result = [l, t]; + result.left = l; + result.top = t; + return result; +}; + +Element._getContentFromAnonymousElement = function(tagName, html) { + var div = new Element('div'), t = Element._insertionTranslations.tags[tagName]; + if (t) { + div.innerHTML = t[0] + html + t[1]; + t[2].times(function() { div = div.firstChild }); + } else div.innerHTML = html; + return $A(div.childNodes); +}; + +Element._insertionTranslations = { + before: function(element, node) { + element.parentNode.insertBefore(node, element); + }, + top: function(element, node) { + element.insertBefore(node, element.firstChild); + }, + bottom: function(element, node) { + element.appendChild(node); + }, + after: function(element, node) { + element.parentNode.insertBefore(node, element.nextSibling); + }, + tags: { + TABLE: ['', '
    ', 1], + TBODY: ['', '
    ', 2], + TR: ['', '
    ', 3], + TD: ['
    ', '
    ', 4], + SELECT: ['', 1] + } +}; + +(function() { + var tags = Element._insertionTranslations.tags; + Object.extend(tags, { + THEAD: tags.TBODY, + TFOOT: tags.TBODY, + TH: tags.TD + }); +})(); + +Element.Methods.Simulated = { + hasAttribute: function(element, attribute) { + attribute = Element._attributeTranslations.has[attribute] || attribute; + var node = $(element).getAttributeNode(attribute); + return !!(node && node.specified); + } +}; + +Element.Methods.ByTag = { }; + +Object.extend(Element, Element.Methods); + +(function(div) { + + if (!Prototype.BrowserFeatures.ElementExtensions && div['__proto__']) { + window.HTMLElement = { }; + window.HTMLElement.prototype = div['__proto__']; + Prototype.BrowserFeatures.ElementExtensions = true; + } + + div = null; + +})(document.createElement('div')) + +Element.extend = (function() { + + function checkDeficiency(tagName) { + if (typeof window.Element != 'undefined') { + var proto = window.Element.prototype; + if (proto) { + var id = '_' + (Math.random()+'').slice(2); + var el = document.createElement(tagName); + proto[id] = 'x'; + var isBuggy = (el[id] !== 'x'); + delete proto[id]; + el = null; + return isBuggy; + } + } + return false; + } + + function extendElementWith(element, methods) { + for (var property in methods) { + var value = methods[property]; + if (Object.isFunction(value) && !(property in element)) + element[property] = value.methodize(); + } + } + + var HTMLOBJECTELEMENT_PROTOTYPE_BUGGY = checkDeficiency('object'); + + if (Prototype.BrowserFeatures.SpecificElementExtensions) { + if (HTMLOBJECTELEMENT_PROTOTYPE_BUGGY) { + return function(element) { + if (element && typeof element._extendedByPrototype == 'undefined') { + var t = element.tagName; + if (t && (/^(?:object|applet|embed)$/i.test(t))) { + extendElementWith(element, Element.Methods); + extendElementWith(element, Element.Methods.Simulated); + extendElementWith(element, Element.Methods.ByTag[t.toUpperCase()]); + } + } + return element; + } + } + return Prototype.K; + } + + var Methods = { }, ByTag = Element.Methods.ByTag; + + var extend = Object.extend(function(element) { + if (!element || typeof element._extendedByPrototype != 'undefined' || + element.nodeType != 1 || element == window) return element; + + var methods = Object.clone(Methods), + tagName = element.tagName.toUpperCase(); + + if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]); + + extendElementWith(element, methods); + + element._extendedByPrototype = Prototype.emptyFunction; + return element; + + }, { + refresh: function() { + if (!Prototype.BrowserFeatures.ElementExtensions) { + Object.extend(Methods, Element.Methods); + Object.extend(Methods, Element.Methods.Simulated); + } + } + }); + + extend.refresh(); + return extend; +})(); + +Element.hasAttribute = function(element, attribute) { + if (element.hasAttribute) return element.hasAttribute(attribute); + return Element.Methods.Simulated.hasAttribute(element, attribute); +}; + +Element.addMethods = function(methods) { + var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag; + + if (!methods) { + Object.extend(Form, Form.Methods); + Object.extend(Form.Element, Form.Element.Methods); + Object.extend(Element.Methods.ByTag, { + "FORM": Object.clone(Form.Methods), + "INPUT": Object.clone(Form.Element.Methods), + "SELECT": Object.clone(Form.Element.Methods), + "TEXTAREA": Object.clone(Form.Element.Methods) + }); + } + + if (arguments.length == 2) { + var tagName = methods; + methods = arguments[1]; + } + + if (!tagName) Object.extend(Element.Methods, methods || { }); + else { + if (Object.isArray(tagName)) tagName.each(extend); + else extend(tagName); + } + + function extend(tagName) { + tagName = tagName.toUpperCase(); + if (!Element.Methods.ByTag[tagName]) + Element.Methods.ByTag[tagName] = { }; + Object.extend(Element.Methods.ByTag[tagName], methods); + } + + function copy(methods, destination, onlyIfAbsent) { + onlyIfAbsent = onlyIfAbsent || false; + for (var property in methods) { + var value = methods[property]; + if (!Object.isFunction(value)) continue; + if (!onlyIfAbsent || !(property in destination)) + destination[property] = value.methodize(); + } + } + + function findDOMClass(tagName) { + var klass; + var trans = { + "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph", + "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList", + "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading", + "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote", + "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION": + "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD": + "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR": + "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET": + "FrameSet", "IFRAME": "IFrame" + }; + if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element'; + if (window[klass]) return window[klass]; + klass = 'HTML' + tagName + 'Element'; + if (window[klass]) return window[klass]; + klass = 'HTML' + tagName.capitalize() + 'Element'; + if (window[klass]) return window[klass]; + + var element = document.createElement(tagName); + var proto = element['__proto__'] || element.constructor.prototype; + element = null; + return proto; + } + + var elementPrototype = window.HTMLElement ? HTMLElement.prototype : + Element.prototype; + + if (F.ElementExtensions) { + copy(Element.Methods, elementPrototype); + copy(Element.Methods.Simulated, elementPrototype, true); + } + + if (F.SpecificElementExtensions) { + for (var tag in Element.Methods.ByTag) { + var klass = findDOMClass(tag); + if (Object.isUndefined(klass)) continue; + copy(T[tag], klass.prototype); + } + } + + Object.extend(Element, Element.Methods); + delete Element.ByTag; + + if (Element.extend.refresh) Element.extend.refresh(); + Element.cache = { }; +}; + + +document.viewport = { + + getDimensions: function() { + return { width: this.getWidth(), height: this.getHeight() }; + }, + + getScrollOffsets: function() { + return Element._returnOffset( + window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft, + window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop); + } +}; + +(function(viewport) { + var B = Prototype.Browser, doc = document, element, property = {}; + + function getRootElement() { + if (B.WebKit && !doc.evaluate) + return document; + + if (B.Opera && window.parseFloat(window.opera.version()) < 9.5) + return document.body; + + return document.documentElement; + } + + function define(D) { + if (!element) element = getRootElement(); + + property[D] = 'client' + D; + + viewport['get' + D] = function() { return element[property[D]] }; + return viewport['get' + D](); + } + + viewport.getWidth = define.curry('Width'); + + viewport.getHeight = define.curry('Height'); +})(document.viewport); + + +Element.Storage = { + UID: 1 +}; + +Element.addMethods({ + getStorage: function(element) { + if (!(element = $(element))) return; + + var uid; + if (element === window) { + uid = 0; + } else { + if (typeof element._prototypeUID === "undefined") + element._prototypeUID = [Element.Storage.UID++]; + uid = element._prototypeUID[0]; + } + + if (!Element.Storage[uid]) + Element.Storage[uid] = $H(); + + return Element.Storage[uid]; + }, + + store: function(element, key, value) { + if (!(element = $(element))) return; + + if (arguments.length === 2) { + Element.getStorage(element).update(key); + } else { + Element.getStorage(element).set(key, value); + } + + return element; + }, + + retrieve: function(element, key, defaultValue) { + if (!(element = $(element))) return; + var hash = Element.getStorage(element), value = hash.get(key); + + if (Object.isUndefined(value)) { + hash.set(key, defaultValue); + value = defaultValue; + } + + return value; + }, + + clone: function(element, deep) { + if (!(element = $(element))) return; + var clone = element.cloneNode(deep); + clone._prototypeUID = void 0; + if (deep) { + var descendants = Element.select(clone, '*'), + i = descendants.length; + while (i--) { + descendants[i]._prototypeUID = void 0; + } + } + return Element.extend(clone); + } +}); +/* Portions of the Selector class are derived from Jack Slocum's DomQuery, + * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style + * license. Please see http://www.yui-ext.com/ for more information. */ + +var Selector = Class.create({ + initialize: function(expression) { + this.expression = expression.strip(); + + if (this.shouldUseSelectorsAPI()) { + this.mode = 'selectorsAPI'; + } else if (this.shouldUseXPath()) { + this.mode = 'xpath'; + this.compileXPathMatcher(); + } else { + this.mode = "normal"; + this.compileMatcher(); + } + + }, + + shouldUseXPath: (function() { + + var IS_DESCENDANT_SELECTOR_BUGGY = (function(){ + var isBuggy = false; + if (document.evaluate && window.XPathResult) { + var el = document.createElement('div'); + el.innerHTML = '
    '; + + var xpath = ".//*[local-name()='ul' or local-name()='UL']" + + "//*[local-name()='li' or local-name()='LI']"; + + var result = document.evaluate(xpath, el, null, + XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); + + isBuggy = (result.snapshotLength !== 2); + el = null; + } + return isBuggy; + })(); + + return function() { + if (!Prototype.BrowserFeatures.XPath) return false; + + var e = this.expression; + + if (Prototype.Browser.WebKit && + (e.include("-of-type") || e.include(":empty"))) + return false; + + if ((/(\[[\w-]*?:|:checked)/).test(e)) + return false; + + if (IS_DESCENDANT_SELECTOR_BUGGY) return false; + + return true; + } + + })(), + + shouldUseSelectorsAPI: function() { + if (!Prototype.BrowserFeatures.SelectorsAPI) return false; + + if (Selector.CASE_INSENSITIVE_CLASS_NAMES) return false; + + if (!Selector._div) Selector._div = new Element('div'); + + try { + Selector._div.querySelector(this.expression); + } catch(e) { + return false; + } + + return true; + }, + + compileMatcher: function() { + var e = this.expression, ps = Selector.patterns, h = Selector.handlers, + c = Selector.criteria, le, p, m, len = ps.length, name; + + if (Selector._cache[e]) { + this.matcher = Selector._cache[e]; + return; + } + + this.matcher = ["this.matcher = function(root) {", + "var r = root, h = Selector.handlers, c = false, n;"]; + + while (e && le != e && (/\S/).test(e)) { + le = e; + for (var i = 0; i"; + } +}); + +if (Prototype.BrowserFeatures.SelectorsAPI && + document.compatMode === 'BackCompat') { + Selector.CASE_INSENSITIVE_CLASS_NAMES = (function(){ + var div = document.createElement('div'), + span = document.createElement('span'); + + div.id = "prototype_test_id"; + span.className = 'Test'; + div.appendChild(span); + var isIgnored = (div.querySelector('#prototype_test_id .test') !== null); + div = span = null; + return isIgnored; + })(); +} + +Object.extend(Selector, { + _cache: { }, + + xpath: { + descendant: "//*", + child: "/*", + adjacent: "/following-sibling::*[1]", + laterSibling: '/following-sibling::*', + tagName: function(m) { + if (m[1] == '*') return ''; + return "[local-name()='" + m[1].toLowerCase() + + "' or local-name()='" + m[1].toUpperCase() + "']"; + }, + className: "[contains(concat(' ', @class, ' '), ' #{1} ')]", + id: "[@id='#{1}']", + attrPresence: function(m) { + m[1] = m[1].toLowerCase(); + return new Template("[@#{1}]").evaluate(m); + }, + attr: function(m) { + m[1] = m[1].toLowerCase(); + m[3] = m[5] || m[6]; + return new Template(Selector.xpath.operators[m[2]]).evaluate(m); + }, + pseudo: function(m) { + var h = Selector.xpath.pseudos[m[1]]; + if (!h) return ''; + if (Object.isFunction(h)) return h(m); + return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m); + }, + operators: { + '=': "[@#{1}='#{3}']", + '!=': "[@#{1}!='#{3}']", + '^=': "[starts-with(@#{1}, '#{3}')]", + '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']", + '*=': "[contains(@#{1}, '#{3}')]", + '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]", + '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]" + }, + pseudos: { + 'first-child': '[not(preceding-sibling::*)]', + 'last-child': '[not(following-sibling::*)]', + 'only-child': '[not(preceding-sibling::* or following-sibling::*)]', + 'empty': "[count(*) = 0 and (count(text()) = 0)]", + 'checked': "[@checked]", + 'disabled': "[(@disabled) and (@type!='hidden')]", + 'enabled': "[not(@disabled) and (@type!='hidden')]", + 'not': function(m) { + var e = m[6], p = Selector.patterns, + x = Selector.xpath, le, v, len = p.length, name; + + var exclusion = []; + while (e && le != e && (/\S/).test(e)) { + le = e; + for (var i = 0; i= 0)]"; + return new Template(predicate).evaluate({ + fragment: fragment, a: a, b: b }); + } + } + } + }, + + criteria: { + tagName: 'n = h.tagName(n, r, "#{1}", c); c = false;', + className: 'n = h.className(n, r, "#{1}", c); c = false;', + id: 'n = h.id(n, r, "#{1}", c); c = false;', + attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;', + attr: function(m) { + m[3] = (m[5] || m[6]); + return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m); + }, + pseudo: function(m) { + if (m[6]) m[6] = m[6].replace(/"/g, '\\"'); + return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m); + }, + descendant: 'c = "descendant";', + child: 'c = "child";', + adjacent: 'c = "adjacent";', + laterSibling: 'c = "laterSibling";' + }, + + patterns: [ + { name: 'laterSibling', re: /^\s*~\s*/ }, + { name: 'child', re: /^\s*>\s*/ }, + { name: 'adjacent', re: /^\s*\+\s*/ }, + { name: 'descendant', re: /^\s/ }, + + { name: 'tagName', re: /^\s*(\*|[\w\-]+)(\b|$)?/ }, + { name: 'id', re: /^#([\w\-\*]+)(\b|$)/ }, + { name: 'className', re: /^\.([\w\-\*]+)(\b|$)/ }, + { name: 'pseudo', re: /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/ }, + { name: 'attrPresence', re: /^\[((?:[\w-]+:)?[\w-]+)\]/ }, + { name: 'attr', re: /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/ } + ], + + assertions: { + tagName: function(element, matches) { + return matches[1].toUpperCase() == element.tagName.toUpperCase(); + }, + + className: function(element, matches) { + return Element.hasClassName(element, matches[1]); + }, + + id: function(element, matches) { + return element.id === matches[1]; + }, + + attrPresence: function(element, matches) { + return Element.hasAttribute(element, matches[1]); + }, + + attr: function(element, matches) { + var nodeValue = Element.readAttribute(element, matches[1]); + return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]); + } + }, + + handlers: { + concat: function(a, b) { + for (var i = 0, node; node = b[i]; i++) + a.push(node); + return a; + }, + + mark: function(nodes) { + var _true = Prototype.emptyFunction; + for (var i = 0, node; node = nodes[i]; i++) + node._countedByPrototype = _true; + return nodes; + }, + + unmark: (function(){ + + var PROPERTIES_ATTRIBUTES_MAP = (function(){ + var el = document.createElement('div'), + isBuggy = false, + propName = '_countedByPrototype', + value = 'x' + el[propName] = value; + isBuggy = (el.getAttribute(propName) === value); + el = null; + return isBuggy; + })(); + + return PROPERTIES_ATTRIBUTES_MAP ? + function(nodes) { + for (var i = 0, node; node = nodes[i]; i++) + node.removeAttribute('_countedByPrototype'); + return nodes; + } : + function(nodes) { + for (var i = 0, node; node = nodes[i]; i++) + node._countedByPrototype = void 0; + return nodes; + } + })(), + + index: function(parentNode, reverse, ofType) { + parentNode._countedByPrototype = Prototype.emptyFunction; + if (reverse) { + for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) { + var node = nodes[i]; + if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++; + } + } else { + for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++) + if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++; + } + }, + + unique: function(nodes) { + if (nodes.length == 0) return nodes; + var results = [], n; + for (var i = 0, l = nodes.length; i < l; i++) + if (typeof (n = nodes[i])._countedByPrototype == 'undefined') { + n._countedByPrototype = Prototype.emptyFunction; + results.push(Element.extend(n)); + } + return Selector.handlers.unmark(results); + }, + + descendant: function(nodes) { + var h = Selector.handlers; + for (var i = 0, results = [], node; node = nodes[i]; i++) + h.concat(results, node.getElementsByTagName('*')); + return results; + }, + + child: function(nodes) { + var h = Selector.handlers; + for (var i = 0, results = [], node; node = nodes[i]; i++) { + for (var j = 0, child; child = node.childNodes[j]; j++) + if (child.nodeType == 1 && child.tagName != '!') results.push(child); + } + return results; + }, + + adjacent: function(nodes) { + for (var i = 0, results = [], node; node = nodes[i]; i++) { + var next = this.nextElementSibling(node); + if (next) results.push(next); + } + return results; + }, + + laterSibling: function(nodes) { + var h = Selector.handlers; + for (var i = 0, results = [], node; node = nodes[i]; i++) + h.concat(results, Element.nextSiblings(node)); + return results; + }, + + nextElementSibling: function(node) { + while (node = node.nextSibling) + if (node.nodeType == 1) return node; + return null; + }, + + previousElementSibling: function(node) { + while (node = node.previousSibling) + if (node.nodeType == 1) return node; + return null; + }, + + tagName: function(nodes, root, tagName, combinator) { + var uTagName = tagName.toUpperCase(); + var results = [], h = Selector.handlers; + if (nodes) { + if (combinator) { + if (combinator == "descendant") { + for (var i = 0, node; node = nodes[i]; i++) + h.concat(results, node.getElementsByTagName(tagName)); + return results; + } else nodes = this[combinator](nodes); + if (tagName == "*") return nodes; + } + for (var i = 0, node; node = nodes[i]; i++) + if (node.tagName.toUpperCase() === uTagName) results.push(node); + return results; + } else return root.getElementsByTagName(tagName); + }, + + id: function(nodes, root, id, combinator) { + var targetNode = $(id), h = Selector.handlers; + + if (root == document) { + if (!targetNode) return []; + if (!nodes) return [targetNode]; + } else { + if (!root.sourceIndex || root.sourceIndex < 1) { + var nodes = root.getElementsByTagName('*'); + for (var j = 0, node; node = nodes[j]; j++) { + if (node.id === id) return [node]; + } + } + } + + if (nodes) { + if (combinator) { + if (combinator == 'child') { + for (var i = 0, node; node = nodes[i]; i++) + if (targetNode.parentNode == node) return [targetNode]; + } else if (combinator == 'descendant') { + for (var i = 0, node; node = nodes[i]; i++) + if (Element.descendantOf(targetNode, node)) return [targetNode]; + } else if (combinator == 'adjacent') { + for (var i = 0, node; node = nodes[i]; i++) + if (Selector.handlers.previousElementSibling(targetNode) == node) + return [targetNode]; + } else nodes = h[combinator](nodes); + } + for (var i = 0, node; node = nodes[i]; i++) + if (node == targetNode) return [targetNode]; + return []; + } + return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : []; + }, + + className: function(nodes, root, className, combinator) { + if (nodes && combinator) nodes = this[combinator](nodes); + return Selector.handlers.byClassName(nodes, root, className); + }, + + byClassName: function(nodes, root, className) { + if (!nodes) nodes = Selector.handlers.descendant([root]); + var needle = ' ' + className + ' '; + for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) { + nodeClassName = node.className; + if (nodeClassName.length == 0) continue; + if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle)) + results.push(node); + } + return results; + }, + + attrPresence: function(nodes, root, attr, combinator) { + if (!nodes) nodes = root.getElementsByTagName("*"); + if (nodes && combinator) nodes = this[combinator](nodes); + var results = []; + for (var i = 0, node; node = nodes[i]; i++) + if (Element.hasAttribute(node, attr)) results.push(node); + return results; + }, + + attr: function(nodes, root, attr, value, operator, combinator) { + if (!nodes) nodes = root.getElementsByTagName("*"); + if (nodes && combinator) nodes = this[combinator](nodes); + var handler = Selector.operators[operator], results = []; + for (var i = 0, node; node = nodes[i]; i++) { + var nodeValue = Element.readAttribute(node, attr); + if (nodeValue === null) continue; + if (handler(nodeValue, value)) results.push(node); + } + return results; + }, + + pseudo: function(nodes, name, value, root, combinator) { + if (nodes && combinator) nodes = this[combinator](nodes); + if (!nodes) nodes = root.getElementsByTagName("*"); + return Selector.pseudos[name](nodes, value, root); + } + }, + + pseudos: { + 'first-child': function(nodes, value, root) { + for (var i = 0, results = [], node; node = nodes[i]; i++) { + if (Selector.handlers.previousElementSibling(node)) continue; + results.push(node); + } + return results; + }, + 'last-child': function(nodes, value, root) { + for (var i = 0, results = [], node; node = nodes[i]; i++) { + if (Selector.handlers.nextElementSibling(node)) continue; + results.push(node); + } + return results; + }, + 'only-child': function(nodes, value, root) { + var h = Selector.handlers; + for (var i = 0, results = [], node; node = nodes[i]; i++) + if (!h.previousElementSibling(node) && !h.nextElementSibling(node)) + results.push(node); + return results; + }, + 'nth-child': function(nodes, formula, root) { + return Selector.pseudos.nth(nodes, formula, root); + }, + 'nth-last-child': function(nodes, formula, root) { + return Selector.pseudos.nth(nodes, formula, root, true); + }, + 'nth-of-type': function(nodes, formula, root) { + return Selector.pseudos.nth(nodes, formula, root, false, true); + }, + 'nth-last-of-type': function(nodes, formula, root) { + return Selector.pseudos.nth(nodes, formula, root, true, true); + }, + 'first-of-type': function(nodes, formula, root) { + return Selector.pseudos.nth(nodes, "1", root, false, true); + }, + 'last-of-type': function(nodes, formula, root) { + return Selector.pseudos.nth(nodes, "1", root, true, true); + }, + 'only-of-type': function(nodes, formula, root) { + var p = Selector.pseudos; + return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root); + }, + + getIndices: function(a, b, total) { + if (a == 0) return b > 0 ? [b] : []; + return $R(1, total).inject([], function(memo, i) { + if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i); + return memo; + }); + }, + + nth: function(nodes, formula, root, reverse, ofType) { + if (nodes.length == 0) return []; + if (formula == 'even') formula = '2n+0'; + if (formula == 'odd') formula = '2n+1'; + var h = Selector.handlers, results = [], indexed = [], m; + h.mark(nodes); + for (var i = 0, node; node = nodes[i]; i++) { + if (!node.parentNode._countedByPrototype) { + h.index(node.parentNode, reverse, ofType); + indexed.push(node.parentNode); + } + } + if (formula.match(/^\d+$/)) { // just a number + formula = Number(formula); + for (var i = 0, node; node = nodes[i]; i++) + if (node.nodeIndex == formula) results.push(node); + } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b + if (m[1] == "-") m[1] = -1; + var a = m[1] ? Number(m[1]) : 1; + var b = m[2] ? Number(m[2]) : 0; + var indices = Selector.pseudos.getIndices(a, b, nodes.length); + for (var i = 0, node, l = indices.length; node = nodes[i]; i++) { + for (var j = 0; j < l; j++) + if (node.nodeIndex == indices[j]) results.push(node); + } + } + h.unmark(nodes); + h.unmark(indexed); + return results; + }, + + 'empty': function(nodes, value, root) { + for (var i = 0, results = [], node; node = nodes[i]; i++) { + if (node.tagName == '!' || node.firstChild) continue; + results.push(node); + } + return results; + }, + + 'not': function(nodes, selector, root) { + var h = Selector.handlers, selectorType, m; + var exclusions = new Selector(selector).findElements(root); + h.mark(exclusions); + for (var i = 0, results = [], node; node = nodes[i]; i++) + if (!node._countedByPrototype) results.push(node); + h.unmark(exclusions); + return results; + }, + + 'enabled': function(nodes, value, root) { + for (var i = 0, results = [], node; node = nodes[i]; i++) + if (!node.disabled && (!node.type || node.type !== 'hidden')) + results.push(node); + return results; + }, + + 'disabled': function(nodes, value, root) { + for (var i = 0, results = [], node; node = nodes[i]; i++) + if (node.disabled) results.push(node); + return results; + }, + + 'checked': function(nodes, value, root) { + for (var i = 0, results = [], node; node = nodes[i]; i++) + if (node.checked) results.push(node); + return results; + } + }, + + operators: { + '=': function(nv, v) { return nv == v; }, + '!=': function(nv, v) { return nv != v; }, + '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); }, + '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); }, + '*=': function(nv, v) { return nv == v || nv && nv.include(v); }, + '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); }, + '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() + + '-').include('-' + (v || "").toUpperCase() + '-'); } + }, + + split: function(expression) { + var expressions = []; + expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) { + expressions.push(m[1].strip()); + }); + return expressions; + }, + + matchElements: function(elements, expression) { + var matches = $$(expression), h = Selector.handlers; + h.mark(matches); + for (var i = 0, results = [], element; element = elements[i]; i++) + if (element._countedByPrototype) results.push(element); + h.unmark(matches); + return results; + }, + + findElement: function(elements, expression, index) { + if (Object.isNumber(expression)) { + index = expression; expression = false; + } + return Selector.matchElements(elements, expression || '*')[index || 0]; + }, + + findChildElements: function(element, expressions) { + expressions = Selector.split(expressions.join(',')); + var results = [], h = Selector.handlers; + for (var i = 0, l = expressions.length, selector; i < l; i++) { + selector = new Selector(expressions[i].strip()); + h.concat(results, selector.findElements(element)); + } + return (l > 1) ? h.unique(results) : results; + } +}); + +if (Prototype.Browser.IE) { + Object.extend(Selector.handlers, { + concat: function(a, b) { + for (var i = 0, node; node = b[i]; i++) + if (node.tagName !== "!") a.push(node); + return a; + } + }); +} + +function $$() { + return Selector.findChildElements(document, $A(arguments)); +} + +var Form = { + reset: function(form) { + form = $(form); + form.reset(); + return form; + }, + + serializeElements: function(elements, options) { + if (typeof options != 'object') options = { hash: !!options }; + else if (Object.isUndefined(options.hash)) options.hash = true; + var key, value, submitted = false, submit = options.submit; + + var data = elements.inject({ }, function(result, element) { + if (!element.disabled && element.name) { + key = element.name; value = $(element).getValue(); + if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted && + submit !== false && (!submit || key == submit) && (submitted = true)))) { + if (key in result) { + if (!Object.isArray(result[key])) result[key] = [result[key]]; + result[key].push(value); + } + else result[key] = value; + } + } + return result; + }); + + return options.hash ? data : Object.toQueryString(data); + } +}; + +Form.Methods = { + serialize: function(form, options) { + return Form.serializeElements(Form.getElements(form), options); + }, + + getElements: function(form) { + var elements = $(form).getElementsByTagName('*'), + element, + arr = [ ], + serializers = Form.Element.Serializers; + for (var i = 0; element = elements[i]; i++) { + arr.push(element); + } + return arr.inject([], function(elements, child) { + if (serializers[child.tagName.toLowerCase()]) + elements.push(Element.extend(child)); + return elements; + }) + }, + + getInputs: function(form, typeName, name) { + form = $(form); + var inputs = form.getElementsByTagName('input'); + + if (!typeName && !name) return $A(inputs).map(Element.extend); + + for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) { + var input = inputs[i]; + if ((typeName && input.type != typeName) || (name && input.name != name)) + continue; + matchingInputs.push(Element.extend(input)); + } + + return matchingInputs; + }, + + disable: function(form) { + form = $(form); + Form.getElements(form).invoke('disable'); + return form; + }, + + enable: function(form) { + form = $(form); + Form.getElements(form).invoke('enable'); + return form; + }, + + findFirstElement: function(form) { + var elements = $(form).getElements().findAll(function(element) { + return 'hidden' != element.type && !element.disabled; + }); + var firstByIndex = elements.findAll(function(element) { + return element.hasAttribute('tabIndex') && element.tabIndex >= 0; + }).sortBy(function(element) { return element.tabIndex }).first(); + + return firstByIndex ? firstByIndex : elements.find(function(element) { + return /^(?:input|select|textarea)$/i.test(element.tagName); + }); + }, + + focusFirstElement: function(form) { + form = $(form); + form.findFirstElement().activate(); + return form; + }, + + request: function(form, options) { + form = $(form), options = Object.clone(options || { }); + + var params = options.parameters, action = form.readAttribute('action') || ''; + if (action.blank()) action = window.location.href; + options.parameters = form.serialize(true); + + if (params) { + if (Object.isString(params)) params = params.toQueryParams(); + Object.extend(options.parameters, params); + } + + if (form.hasAttribute('method') && !options.method) + options.method = form.method; + + return new Ajax.Request(action, options); + } +}; + +/*--------------------------------------------------------------------------*/ + + +Form.Element = { + focus: function(element) { + $(element).focus(); + return element; + }, + + select: function(element) { + $(element).select(); + return element; + } +}; + +Form.Element.Methods = { + + serialize: function(element) { + element = $(element); + if (!element.disabled && element.name) { + var value = element.getValue(); + if (value != undefined) { + var pair = { }; + pair[element.name] = value; + return Object.toQueryString(pair); + } + } + return ''; + }, + + getValue: function(element) { + element = $(element); + var method = element.tagName.toLowerCase(); + return Form.Element.Serializers[method](element); + }, + + setValue: function(element, value) { + element = $(element); + var method = element.tagName.toLowerCase(); + Form.Element.Serializers[method](element, value); + return element; + }, + + clear: function(element) { + $(element).value = ''; + return element; + }, + + present: function(element) { + return $(element).value != ''; + }, + + activate: function(element) { + element = $(element); + try { + element.focus(); + if (element.select && (element.tagName.toLowerCase() != 'input' || + !(/^(?:button|reset|submit)$/i.test(element.type)))) + element.select(); + } catch (e) { } + return element; + }, + + disable: function(element) { + element = $(element); + element.disabled = true; + return element; + }, + + enable: function(element) { + element = $(element); + element.disabled = false; + return element; + } +}; + +/*--------------------------------------------------------------------------*/ + +var Field = Form.Element; + +var $F = Form.Element.Methods.getValue; + +/*--------------------------------------------------------------------------*/ + +Form.Element.Serializers = { + input: function(element, value) { + switch (element.type.toLowerCase()) { + case 'checkbox': + case 'radio': + return Form.Element.Serializers.inputSelector(element, value); + default: + return Form.Element.Serializers.textarea(element, value); + } + }, + + inputSelector: function(element, value) { + if (Object.isUndefined(value)) return element.checked ? element.value : null; + else element.checked = !!value; + }, + + textarea: function(element, value) { + if (Object.isUndefined(value)) return element.value; + else element.value = value; + }, + + select: function(element, value) { + if (Object.isUndefined(value)) + return this[element.type == 'select-one' ? + 'selectOne' : 'selectMany'](element); + else { + var opt, currentValue, single = !Object.isArray(value); + for (var i = 0, length = element.length; i < length; i++) { + opt = element.options[i]; + currentValue = this.optionValue(opt); + if (single) { + if (currentValue == value) { + opt.selected = true; + return; + } + } + else opt.selected = value.include(currentValue); + } + } + }, + + selectOne: function(element) { + var index = element.selectedIndex; + return index >= 0 ? this.optionValue(element.options[index]) : null; + }, + + selectMany: function(element) { + var values, length = element.length; + if (!length) return null; + + for (var i = 0, values = []; i < length; i++) { + var opt = element.options[i]; + if (opt.selected) values.push(this.optionValue(opt)); + } + return values; + }, + + optionValue: function(opt) { + return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text; + } +}; + +/*--------------------------------------------------------------------------*/ + + +Abstract.TimedObserver = Class.create(PeriodicalExecuter, { + initialize: function($super, element, frequency, callback) { + $super(callback, frequency); + this.element = $(element); + this.lastValue = this.getValue(); + }, + + execute: function() { + var value = this.getValue(); + if (Object.isString(this.lastValue) && Object.isString(value) ? + this.lastValue != value : String(this.lastValue) != String(value)) { + this.callback(this.element, value); + this.lastValue = value; + } + } +}); + +Form.Element.Observer = Class.create(Abstract.TimedObserver, { + getValue: function() { + return Form.Element.getValue(this.element); + } +}); + +Form.Observer = Class.create(Abstract.TimedObserver, { + getValue: function() { + return Form.serialize(this.element); + } +}); + +/*--------------------------------------------------------------------------*/ + +Abstract.EventObserver = Class.create({ + initialize: function(element, callback) { + this.element = $(element); + this.callback = callback; + + this.lastValue = this.getValue(); + if (this.element.tagName.toLowerCase() == 'form') + this.registerFormCallbacks(); + else + this.registerCallback(this.element); + }, + + onElementEvent: function() { + var value = this.getValue(); + if (this.lastValue != value) { + this.callback(this.element, value); + this.lastValue = value; + } + }, + + registerFormCallbacks: function() { + Form.getElements(this.element).each(this.registerCallback, this); + }, + + registerCallback: function(element) { + if (element.type) { + switch (element.type.toLowerCase()) { + case 'checkbox': + case 'radio': + Event.observe(element, 'click', this.onElementEvent.bind(this)); + break; + default: + Event.observe(element, 'change', this.onElementEvent.bind(this)); + break; + } + } + } +}); + +Form.Element.EventObserver = Class.create(Abstract.EventObserver, { + getValue: function() { + return Form.Element.getValue(this.element); + } +}); + +Form.EventObserver = Class.create(Abstract.EventObserver, { + getValue: function() { + return Form.serialize(this.element); + } +}); +(function() { + + var Event = { + KEY_BACKSPACE: 8, + KEY_TAB: 9, + KEY_RETURN: 13, + KEY_ESC: 27, + KEY_LEFT: 37, + KEY_UP: 38, + KEY_RIGHT: 39, + KEY_DOWN: 40, + KEY_DELETE: 46, + KEY_HOME: 36, + KEY_END: 35, + KEY_PAGEUP: 33, + KEY_PAGEDOWN: 34, + KEY_INSERT: 45, + + cache: {} + }; + + var docEl = document.documentElement; + var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl + && 'onmouseleave' in docEl; + + var _isButton; + if (Prototype.Browser.IE) { + var buttonMap = { 0: 1, 1: 4, 2: 2 }; + _isButton = function(event, code) { + return event.button === buttonMap[code]; + }; + } else if (Prototype.Browser.WebKit) { + _isButton = function(event, code) { + switch (code) { + case 0: return event.which == 1 && !event.metaKey; + case 1: return event.which == 1 && event.metaKey; + default: return false; + } + }; + } else { + _isButton = function(event, code) { + return event.which ? (event.which === code + 1) : (event.button === code); + }; + } + + function isLeftClick(event) { return _isButton(event, 0) } + + function isMiddleClick(event) { return _isButton(event, 1) } + + function isRightClick(event) { return _isButton(event, 2) } + + function element(event) { + event = Event.extend(event); + + var node = event.target, type = event.type, + currentTarget = event.currentTarget; + + if (currentTarget && currentTarget.tagName) { + if (type === 'load' || type === 'error' || + (type === 'click' && currentTarget.tagName.toLowerCase() === 'input' + && currentTarget.type === 'radio')) + node = currentTarget; + } + + if (node.nodeType == Node.TEXT_NODE) + node = node.parentNode; + + return Element.extend(node); + } + + function findElement(event, expression) { + var element = Event.element(event); + if (!expression) return element; + var elements = [element].concat(element.ancestors()); + return Selector.findElement(elements, expression, 0); + } + + function pointer(event) { + return { x: pointerX(event), y: pointerY(event) }; + } + + function pointerX(event) { + var docElement = document.documentElement, + body = document.body || { scrollLeft: 0 }; + + return event.pageX || (event.clientX + + (docElement.scrollLeft || body.scrollLeft) - + (docElement.clientLeft || 0)); + } + + function pointerY(event) { + var docElement = document.documentElement, + body = document.body || { scrollTop: 0 }; + + return event.pageY || (event.clientY + + (docElement.scrollTop || body.scrollTop) - + (docElement.clientTop || 0)); + } + + + function stop(event) { + Event.extend(event); + event.preventDefault(); + event.stopPropagation(); + + event.stopped = true; + } + + Event.Methods = { + isLeftClick: isLeftClick, + isMiddleClick: isMiddleClick, + isRightClick: isRightClick, + + element: element, + findElement: findElement, + + pointer: pointer, + pointerX: pointerX, + pointerY: pointerY, + + stop: stop + }; + + + var methods = Object.keys(Event.Methods).inject({ }, function(m, name) { + m[name] = Event.Methods[name].methodize(); + return m; + }); + + if (Prototype.Browser.IE) { + function _relatedTarget(event) { + var element; + switch (event.type) { + case 'mouseover': element = event.fromElement; break; + case 'mouseout': element = event.toElement; break; + default: return null; + } + return Element.extend(element); + } + + Object.extend(methods, { + stopPropagation: function() { this.cancelBubble = true }, + preventDefault: function() { this.returnValue = false }, + inspect: function() { return '[object Event]' } + }); + + Event.extend = function(event, element) { + if (!event) return false; + if (event._extendedByPrototype) return event; + + event._extendedByPrototype = Prototype.emptyFunction; + var pointer = Event.pointer(event); + + Object.extend(event, { + target: event.srcElement || element, + relatedTarget: _relatedTarget(event), + pageX: pointer.x, + pageY: pointer.y + }); + + return Object.extend(event, methods); + }; + } else { + Event.prototype = window.Event.prototype || document.createEvent('HTMLEvents').__proto__; + Object.extend(Event.prototype, methods); + Event.extend = Prototype.K; + } + + function _createResponder(element, eventName, handler) { + var registry = Element.retrieve(element, 'prototype_event_registry'); + + if (Object.isUndefined(registry)) { + CACHE.push(element); + registry = Element.retrieve(element, 'prototype_event_registry', $H()); + } + + var respondersForEvent = registry.get(eventName); + if (Object.isUndefined(respondersForEvent)) { + respondersForEvent = []; + registry.set(eventName, respondersForEvent); + } + + if (respondersForEvent.pluck('handler').include(handler)) return false; + + var responder; + if (eventName.include(":")) { + responder = function(event) { + if (Object.isUndefined(event.eventName)) + return false; + + if (event.eventName !== eventName) + return false; + + Event.extend(event, element); + handler.call(element, event); + }; + } else { + if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED && + (eventName === "mouseenter" || eventName === "mouseleave")) { + if (eventName === "mouseenter" || eventName === "mouseleave") { + responder = function(event) { + Event.extend(event, element); + + var parent = event.relatedTarget; + while (parent && parent !== element) { + try { parent = parent.parentNode; } + catch(e) { parent = element; } + } + + if (parent === element) return; + + handler.call(element, event); + }; + } + } else { + responder = function(event) { + Event.extend(event, element); + handler.call(element, event); + }; + } + } + + responder.handler = handler; + respondersForEvent.push(responder); + return responder; + } + + function _destroyCache() { + for (var i = 0, length = CACHE.length; i < length; i++) { + Event.stopObserving(CACHE[i]); + CACHE[i] = null; + } + } + + var CACHE = []; + + if (Prototype.Browser.IE) + window.attachEvent('onunload', _destroyCache); + + if (Prototype.Browser.WebKit) + window.addEventListener('unload', Prototype.emptyFunction, false); + + + var _getDOMEventName = Prototype.K; + + if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED) { + _getDOMEventName = function(eventName) { + var translations = { mouseenter: "mouseover", mouseleave: "mouseout" }; + return eventName in translations ? translations[eventName] : eventName; + }; + } + + function observe(element, eventName, handler) { + element = $(element); + + var responder = _createResponder(element, eventName, handler); + + if (!responder) return element; + + if (eventName.include(':')) { + if (element.addEventListener) + element.addEventListener("dataavailable", responder, false); + else { + element.attachEvent("ondataavailable", responder); + element.attachEvent("onfilterchange", responder); + } + } else { + var actualEventName = _getDOMEventName(eventName); + + if (element.addEventListener) + element.addEventListener(actualEventName, responder, false); + else + element.attachEvent("on" + actualEventName, responder); + } + + return element; + } + + function stopObserving(element, eventName, handler) { + element = $(element); + + var registry = Element.retrieve(element, 'prototype_event_registry'); + + if (Object.isUndefined(registry)) return element; + + if (eventName && !handler) { + var responders = registry.get(eventName); + + if (Object.isUndefined(responders)) return element; + + responders.each( function(r) { + Element.stopObserving(element, eventName, r.handler); + }); + return element; + } else if (!eventName) { + registry.each( function(pair) { + var eventName = pair.key, responders = pair.value; + + responders.each( function(r) { + Element.stopObserving(element, eventName, r.handler); + }); + }); + return element; + } + + var responders = registry.get(eventName); + + if (!responders) return; + + var responder = responders.find( function(r) { return r.handler === handler; }); + if (!responder) return element; + + var actualEventName = _getDOMEventName(eventName); + + if (eventName.include(':')) { + if (element.removeEventListener) + element.removeEventListener("dataavailable", responder, false); + else { + element.detachEvent("ondataavailable", responder); + element.detachEvent("onfilterchange", responder); + } + } else { + if (element.removeEventListener) + element.removeEventListener(actualEventName, responder, false); + else + element.detachEvent('on' + actualEventName, responder); + } + + registry.set(eventName, responders.without(responder)); + + return element; + } + + function fire(element, eventName, memo, bubble) { + element = $(element); + + if (Object.isUndefined(bubble)) + bubble = true; + + if (element == document && document.createEvent && !element.dispatchEvent) + element = document.documentElement; + + var event; + if (document.createEvent) { + event = document.createEvent('HTMLEvents'); + event.initEvent('dataavailable', true, true); + } else { + event = document.createEventObject(); + event.eventType = bubble ? 'ondataavailable' : 'onfilterchange'; + } + + event.eventName = eventName; + event.memo = memo || { }; + + if (document.createEvent) + element.dispatchEvent(event); + else + element.fireEvent(event.eventType, event); + + return Event.extend(event); + } + + + Object.extend(Event, Event.Methods); + + Object.extend(Event, { + fire: fire, + observe: observe, + stopObserving: stopObserving + }); + + Element.addMethods({ + fire: fire, + + observe: observe, + + stopObserving: stopObserving + }); + + Object.extend(document, { + fire: fire.methodize(), + + observe: observe.methodize(), + + stopObserving: stopObserving.methodize(), + + loaded: false + }); + + if (window.Event) Object.extend(window.Event, Event); + else window.Event = Event; +})(); + +(function() { + /* Support for the DOMContentLoaded event is based on work by Dan Webb, + Matthias Miller, Dean Edwards, John Resig, and Diego Perini. */ + + var timer; + + function fireContentLoadedEvent() { + if (document.loaded) return; + if (timer) window.clearTimeout(timer); + document.loaded = true; + document.fire('dom:loaded'); + } + + function checkReadyState() { + if (document.readyState === 'complete') { + document.stopObserving('readystatechange', checkReadyState); + fireContentLoadedEvent(); + } + } + + function pollDoScroll() { + try { document.documentElement.doScroll('left'); } + catch(e) { + timer = pollDoScroll.defer(); + return; + } + fireContentLoadedEvent(); + } + + if (document.addEventListener) { + document.addEventListener('DOMContentLoaded', fireContentLoadedEvent, false); + } else { + document.observe('readystatechange', checkReadyState); + if (window == top) + timer = pollDoScroll.defer(); + } + + Event.observe(window, 'load', fireContentLoadedEvent); +})(); + +Element.addMethods(); + +/*------------------------------- DEPRECATED -------------------------------*/ + +Hash.toQueryString = Object.toQueryString; + +var Toggle = { display: Element.toggle }; + +Element.Methods.childOf = Element.Methods.descendantOf; + +var Insertion = { + Before: function(element, content) { + return Element.insert(element, {before:content}); + }, + + Top: function(element, content) { + return Element.insert(element, {top:content}); + }, + + Bottom: function(element, content) { + return Element.insert(element, {bottom:content}); + }, + + After: function(element, content) { + return Element.insert(element, {after:content}); + } +}; + +var $continue = new Error('"throw $continue" is deprecated, use "return" instead'); + +var Position = { + includeScrollOffsets: false, + + prepare: function() { + this.deltaX = window.pageXOffset + || document.documentElement.scrollLeft + || document.body.scrollLeft + || 0; + this.deltaY = window.pageYOffset + || document.documentElement.scrollTop + || document.body.scrollTop + || 0; + }, + + within: function(element, x, y) { + if (this.includeScrollOffsets) + return this.withinIncludingScrolloffsets(element, x, y); + this.xcomp = x; + this.ycomp = y; + this.offset = Element.cumulativeOffset(element); + + return (y >= this.offset[1] && + y < this.offset[1] + element.offsetHeight && + x >= this.offset[0] && + x < this.offset[0] + element.offsetWidth); + }, + + withinIncludingScrolloffsets: function(element, x, y) { + var offsetcache = Element.cumulativeScrollOffset(element); + + this.xcomp = x + offsetcache[0] - this.deltaX; + this.ycomp = y + offsetcache[1] - this.deltaY; + this.offset = Element.cumulativeOffset(element); + + return (this.ycomp >= this.offset[1] && + this.ycomp < this.offset[1] + element.offsetHeight && + this.xcomp >= this.offset[0] && + this.xcomp < this.offset[0] + element.offsetWidth); + }, + + overlap: function(mode, element) { + if (!mode) return 0; + if (mode == 'vertical') + return ((this.offset[1] + element.offsetHeight) - this.ycomp) / + element.offsetHeight; + if (mode == 'horizontal') + return ((this.offset[0] + element.offsetWidth) - this.xcomp) / + element.offsetWidth; + }, + + + cumulativeOffset: Element.Methods.cumulativeOffset, + + positionedOffset: Element.Methods.positionedOffset, + + absolutize: function(element) { + Position.prepare(); + return Element.absolutize(element); + }, + + relativize: function(element) { + Position.prepare(); + return Element.relativize(element); + }, + + realOffset: Element.Methods.cumulativeScrollOffset, + + offsetParent: Element.Methods.getOffsetParent, + + page: Element.Methods.viewportOffset, + + clone: function(source, target, options) { + options = options || { }; + return Element.clonePosition(target, source, options); + } +}; + +/*--------------------------------------------------------------------------*/ + +if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){ + function iter(name) { + return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]"; + } + + instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ? + function(element, className) { + className = className.toString().strip(); + var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className); + return cond ? document._getElementsByXPath('.//*' + cond, element) : []; + } : function(element, className) { + className = className.toString().strip(); + var elements = [], classNames = (/\s/.test(className) ? $w(className) : null); + if (!classNames && !className) return elements; + + var nodes = $(element).getElementsByTagName('*'); + className = ' ' + className + ' '; + + for (var i = 0, child, cn; child = nodes[i]; i++) { + if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) || + (classNames && classNames.all(function(name) { + return !name.toString().blank() && cn.include(' ' + name + ' '); + })))) + elements.push(Element.extend(child)); + } + return elements; + }; + + return function(className, parentElement) { + return $(parentElement || document.body).getElementsByClassName(className); + }; +}(Element.Methods); + +/*--------------------------------------------------------------------------*/ + +Element.ClassNames = Class.create(); +Element.ClassNames.prototype = { + initialize: function(element) { + this.element = $(element); + }, + + _each: function(iterator) { + this.element.className.split(/\s+/).select(function(name) { + return name.length > 0; + })._each(iterator); + }, + + set: function(className) { + this.element.className = className; + }, + + add: function(classNameToAdd) { + if (this.include(classNameToAdd)) return; + this.set($A(this).concat(classNameToAdd).join(' ')); + }, + + remove: function(classNameToRemove) { + if (!this.include(classNameToRemove)) return; + this.set($A(this).without(classNameToRemove).join(' ')); + }, + + toString: function() { + return $A(this).join(' '); + } +}; + +Object.extend(Element.ClassNames.prototype, Enumerable); + +/*--------------------------------------------------------------------------*/ diff --git a/spec/rails_root/public/javascripts/rails.js b/spec/rails_root/public/javascripts/rails.js new file mode 100644 index 000000000..c5fa02ae3 --- /dev/null +++ b/spec/rails_root/public/javascripts/rails.js @@ -0,0 +1,118 @@ +document.observe("dom:loaded", function() { + function handleRemote(element) { + var method, url, params; + + if (element.tagName.toLowerCase() === 'form') { + method = element.readAttribute('method') || 'post'; + url = element.readAttribute('action'); + params = element.serialize(true); + } else { + method = element.readAttribute('data-method') || 'get'; + url = element.readAttribute('href'); + params = {}; + } + + var event = element.fire("ajax:before"); + if (event.stopped) return false; + + new Ajax.Request(url, { + method: method, + parameters: params, + asynchronous: true, + evalScripts: true, + + onLoading: function(request) { element.fire("ajax:loading", {request: request}); }, + onLoaded: function(request) { element.fire("ajax:loaded", {request: request}); }, + onInteractive: function(request) { element.fire("ajax:interactive", {request: request}); }, + onComplete: function(request) { element.fire("ajax:complete", {request: request}); }, + onSuccess: function(request) { element.fire("ajax:success", {request: request}); }, + onFailure: function(request) { element.fire("ajax:failure", {request: request}); } + }); + + element.fire("ajax:after"); + } + + function handleMethod(element) { + var method, url, token_name, token; + + method = element.readAttribute('data-method'); + url = element.readAttribute('href'); + csrf_param = $$('meta[name=csrf-param]').first(); + csrf_token = $$('meta[name=csrf-token]').first(); + + var form = new Element('form', { method: "POST", action: url, style: "display: none;" }); + element.parentNode.appendChild(form); + + if (method != 'post') { + var field = new Element('input', { type: 'hidden', name: '_method', value: method }); + form.appendChild(field); + } + + if (csrf_param) { + var param = csrf_param.readAttribute('content'); + var token = csrf_token.readAttribute('content'); + var field = new Element('input', { type: 'hidden', name: param, value: token }); + form.appendChild(field); + } + + form.submit(); + } + + $(document.body).observe("click", function(event) { + var message = event.findElement().readAttribute('data-confirm'); + if (message && !confirm(message)) { + event.stop(); + return false; + } + + var element = event.findElement("a[data-remote]"); + if (element) { + handleRemote(element); + event.stop(); + return true; + } + + var element = event.findElement("a[data-method]"); + if (element) { + handleMethod(element); + event.stop(); + return true; + } + }); + + // TODO: I don't think submit bubbles in IE + $(document.body).observe("submit", function(event) { + var element = event.findElement(), + message = element.readAttribute('data-confirm'); + if (message && !confirm(message)) { + event.stop(); + return false; + } + + var inputs = element.select("input[type=submit][data-disable-with]"); + inputs.each(function(input) { + input.disabled = true; + input.writeAttribute('data-original-value', input.value); + input.value = input.readAttribute('data-disable-with'); + }); + + var element = event.findElement("form[data-remote]"); + if (element) { + handleRemote(element); + event.stop(); + } + }); + + $(document.body).observe("ajax:after", function(event) { + var element = event.findElement(); + + if (element.tagName.toLowerCase() === 'form') { + var inputs = element.select("input[type=submit][disabled=true][data-disable-with]"); + inputs.each(function(input) { + input.value = input.readAttribute('data-original-value'); + input.writeAttribute('data-original-value', null); + input.disabled = false; + }); + } + }); +}); \ No newline at end of file diff --git a/spec/rails_root/public/robots.txt b/spec/rails_root/public/robots.txt new file mode 100644 index 000000000..085187fa5 --- /dev/null +++ b/spec/rails_root/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-Agent: * +# Disallow: / diff --git a/spec/rails_root/public/stylesheets/.gitkeep b/spec/rails_root/public/stylesheets/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/spec/rails_root/script/cucumber b/spec/rails_root/script/cucumber new file mode 100755 index 000000000..7fa5c9208 --- /dev/null +++ b/spec/rails_root/script/cucumber @@ -0,0 +1,10 @@ +#!/usr/bin/env ruby + +vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first +if vendored_cucumber_bin + load File.expand_path(vendored_cucumber_bin) +else + require 'rubygems' unless ENV['NO_RUBYGEMS'] + require 'cucumber' + load Cucumber::BINARY +end diff --git a/spec/rails_root/script/rails b/spec/rails_root/script/rails new file mode 100755 index 000000000..febedced9 --- /dev/null +++ b/spec/rails_root/script/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. + +ENV_PATH = File.expand_path('../../config/environment', __FILE__) +BOOT_PATH = File.expand_path('../../config/boot', __FILE__) +APP_PATH = File.expand_path('../../config/application', __FILE__) + +require BOOT_PATH +require 'rails/commands' diff --git a/spec/rails_root/spec/factories/clearance.rb b/spec/rails_root/spec/factories/clearance.rb new file mode 100644 index 000000000..9bdd13a09 --- /dev/null +++ b/spec/rails_root/spec/factories/clearance.rb @@ -0,0 +1,13 @@ +Factory.sequence :email do |n| + "user#{n}@example.com" +end + +Factory.define :user do |user| + user.email { Factory.next :email } + user.password { "password" } + user.password_confirmation { "password" } +end + +Factory.define :email_confirmed_user, :parent => :user do |user| + user.email_confirmed { true } +end diff --git a/spec/rails_root/vendor/plugins/.gitkeep b/spec/rails_root/vendor/plugins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/spec/rails_root/vendor/plugins/clearance b/spec/rails_root/vendor/plugins/clearance new file mode 120000 index 000000000..75cf25522 --- /dev/null +++ b/spec/rails_root/vendor/plugins/clearance @@ -0,0 +1 @@ +/home/mike/clearance \ No newline at end of file diff --git a/spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE b/spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE new file mode 100644 index 000000000..700c59bf7 --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2010 David Heinemeier Hansson + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/spec/rails_root/vendor/plugins/dynamic_form/README b/spec/rails_root/vendor/plugins/dynamic_form/README new file mode 100644 index 000000000..216c30987 --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/README @@ -0,0 +1,13 @@ +DynamicForm +=========== + +DynamicForm holds a few helpers method to help you deal with your models, they are: + +* input(record, method, options = {}) +* form(record, options = {}) +* error_message_on(object, method, options={}) +* error_messages_for(record, options={}) + +It also adds f.error_messages and f.error_messages_on to your form builders. + +Copyright (c) 2010 David Heinemeier Hansson, released under the MIT license diff --git a/spec/rails_root/vendor/plugins/dynamic_form/Rakefile b/spec/rails_root/vendor/plugins/dynamic_form/Rakefile new file mode 100644 index 000000000..e1df65df8 --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/Rakefile @@ -0,0 +1,10 @@ +require 'rake/testtask' + +desc 'Default: run unit tests.' +task :default => :test + +desc 'Test the active_model_helper plugin.' +Rake::TestTask.new(:test) do |t| + t.libs << 'test' + t.pattern = 'test/**/*_test.rb' +end diff --git a/spec/rails_root/vendor/plugins/dynamic_form/init.rb b/spec/rails_root/vendor/plugins/dynamic_form/init.rb new file mode 100644 index 000000000..c1d1a3a43 --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/init.rb @@ -0,0 +1,5 @@ +require 'action_view/helpers/dynamic_form' + +class ActionView::Base + include DynamicForm +end diff --git a/spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb b/spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb new file mode 100644 index 000000000..b34d4bcbe --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb @@ -0,0 +1,300 @@ +require 'action_view/helpers' +require 'active_support/i18n' +require 'active_support/core_ext/enumerable' +require 'active_support/core_ext/object/blank' + +module ActionView + module Helpers + # The Active Record Helper makes it easier to create forms for records kept in instance variables. The most far-reaching is the +form+ + # method that creates a complete form for all the basic content types of the record (not associations or aggregations, though). This + # is a great way of making the record quickly available for editing, but likely to prove lackluster for a complicated real-world form. + # In that case, it's better to use the +input+ method and the specialized +form+ methods in link:classes/ActionView/Helpers/FormHelper.html + module DynamicForm + # Returns a default input tag for the type of object returned by the method. For example, if @post + # has an attribute +title+ mapped to a +VARCHAR+ column that holds "Hello World": + # + # input("post", "title") + # # => + def input(record_name, method, options = {}) + InstanceTag.new(record_name, method, self).to_tag(options) + end + + # Returns an entire form with all needed input tags for a specified Active Record object. For example, if @post + # has attributes named +title+ of type +VARCHAR+ and +body+ of type +TEXT+ then + # + # form("post") + # + # would yield a form like the following (modulus formatting): + # + #
    + #

    + #
    + # + #

    + #

    + #
    + # + #

    + # + #
    + # + # It's possible to specialize the form builder by using a different action name and by supplying another + # block renderer. For example, if @entry has an attribute +message+ of type +VARCHAR+ then + # + # form("entry", + # :action => "sign", + # :input_block => Proc.new { |record, column| + # "#{column.human_name}: #{input(record, column.name)}
    " + # }) + # + # would yield a form like the following (modulus formatting): + # + #
    + # Message: + #
    + # + #
    + # + # It's also possible to add additional content to the form by giving it a block, such as: + # + # form("entry", :action => "sign") do |form| + # form << content_tag("b", "Department") + # form << collection_select("department", "id", @departments, "id", "name") + # end + # + # The following options are available: + # + # * :action - The action used when submitting the form (default: +create+ if a new record, otherwise +update+). + # * :input_block - Specialize the output using a different block, see above. + # * :method - The method used when submitting the form (default: +post+). + # * :multipart - Whether to change the enctype of the form to "multipart/form-data", used when uploading a file (default: +false+). + # * :submit_value - The text of the submit button (default: "Create" if a new record, otherwise "Update"). + def form(record_name, options = {}) + record = instance_variable_get("@#{record_name}") + record = convert_to_model(record) + + options = options.symbolize_keys + options[:action] ||= record.persisted? ? "update" : "create" + action = url_for(:action => options[:action], :id => record) + + submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize + + contents = form_tag({:action => action}, :method =>(options[:method] || 'post'), :enctype => options[:multipart] ? 'multipart/form-data': nil) + contents.safe_concat hidden_field(record_name, :id) if record.persisted? + contents.safe_concat all_input_tags(record, record_name, options) + yield contents if block_given? + contents.safe_concat submit_tag(submit_value) + contents.safe_concat('') + end + + # Returns a string containing the error message attached to the +method+ on the +object+ if one exists. + # This error message is wrapped in a DIV tag by default or with :html_tag if specified, + # which can be extended to include a :prepend_text and/or :append_text (to properly explain + # the error), and a :css_class to style it accordingly. +object+ should either be the name of an + # instance variable or the actual object. The method can be passed in either as a string or a symbol. + # As an example, let's say you have a model @post that has an error message on the +title+ attribute: + # + # <%= error_message_on "post", "title" %> + # # =>
    can't be empty
    + # + # <%= error_message_on @post, :title %> + # # =>
    can't be empty
    + # + # <%= error_message_on "post", "title", + # :prepend_text => "Title simply ", + # :append_text => " (or it won't work).", + # :html_tag => "span", + # :css_class => "inputError" %> + # # => Title simply can't be empty (or it won't work). + def error_message_on(object, method, *args) + options = args.extract_options! + unless args.empty? + ActiveSupport::Deprecation.warn('error_message_on takes an option hash instead of separate ' + + 'prepend_text, append_text, html_tag, and css_class arguments', caller) + + options[:prepend_text] = args[0] || '' + options[:append_text] = args[1] || '' + options[:html_tag] = args[2] || 'div' + options[:css_class] = args[3] || 'formError' + end + options.reverse_merge!(:prepend_text => '', :append_text => '', :html_tag => 'div', :css_class => 'formError') + + object = convert_to_model(object) + + if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) && + (errors = obj.errors[method]).presence + content_tag(options[:html_tag], + (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]), + :class => options[:css_class] + ) + else + '' + end + end + + # Returns a string with a DIV containing all of the error messages for the objects located as instance variables by the names + # given. If more than one object is specified, the errors for the objects are displayed in the order that the object names are + # provided. + # + # This DIV can be tailored by the following options: + # + # * :header_tag - Used for the header of the error div (default: "h2"). + # * :id - The id of the error div (default: "errorExplanation"). + # * :class - The class of the error div (default: "errorExplanation"). + # * :object - The object (or array of objects) for which to display errors, + # if you need to escape the instance variable convention. + # * :object_name - The object name to use in the header, or any text that you prefer. + # If :object_name is not set, the name of the first object will be used. + # * :header_message - The message in the header of the error div. Pass +nil+ + # or an empty string to avoid the header message altogether. (Default: "X errors + # prohibited this object from being saved"). + # * :message - The explanation message after the header message and before + # the error list. Pass +nil+ or an empty string to avoid the explanation message + # altogether. (Default: "There were problems with the following fields:"). + # + # To specify the display for one object, you simply provide its name as a parameter. + # For example, for the @user model: + # + # error_messages_for 'user' + # + # You can also supply an object: + # + # error_messages_for @user + # + # This will use the last part of the model name in the presentation. For instance, if + # this is a MyKlass::User object, this will use "user" as the name in the String. This + # is taken from MyKlass::User.model_name.human, which can be overridden. + # + # To specify more than one object, you simply list them; optionally, you can add an extra :object_name parameter, which + # will be the name used in the header message: + # + # error_messages_for 'user_common', 'user', :object_name => 'user' + # + # You can also use a number of objects, which will have the same naming semantics + # as a single object. + # + # error_messages_for @user, @post + # + # If the objects cannot be located as instance variables, you can add an extra :object parameter which gives the actual + # object (or array of objects to use): + # + # error_messages_for 'user', :object => @question.user + # + # NOTE: This is a pre-packaged presentation of the errors with embedded strings and a certain HTML structure. If what + # you need is significantly different from the default presentation, it makes plenty of sense to access the object.errors + # instance yourself and set it up. View the source of this method to see how easy it is. + def error_messages_for(*params) + options = params.extract_options!.symbolize_keys + + objects = Array.wrap(options.delete(:object) || params).map do |object| + object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model) + object = convert_to_model(object) + + if object.class.respond_to?(:model_name) + options[:object_name] ||= object.class.model_name.human.downcase + end + + object + end + + objects.compact! + count = objects.inject(0) {|sum, object| sum + object.errors.count } + + unless count.zero? + html = {} + [:id, :class].each do |key| + if options.include?(key) + value = options[key] + html[key] = value unless value.blank? + else + html[key] = 'errorExplanation' + end + end + options[:object_name] ||= params.first + + I18n.with_options :locale => options[:locale], :scope => [:errors, :template] do |locale| + header_message = if options.include?(:header_message) + options[:header_message] + else + locale.t :header, :count => count, :model => options[:object_name].to_s.gsub('_', ' ') + end + + message = options.include?(:message) ? options[:message] : locale.t(:body) + + error_messages = objects.sum do |object| + object.errors.full_messages.map do |msg| + content_tag(:li, msg) + end + end.join.html_safe + + contents = '' + contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank? + contents << content_tag(:p, message) unless message.blank? + contents << content_tag(:ul, error_messages) + + content_tag(:div, contents.html_safe, html) + end + else + '' + end + end + + private + + def all_input_tags(record, record_name, options) + input_block = options[:input_block] || default_input_block + record.class.content_columns.collect{ |column| input_block.call(record_name, column) }.join("\n") + end + + def default_input_block + Proc.new { |record, column| %(


    #{input(record, column.name)}

    ) } + end + + module InstanceTagMethods + def to_tag(options = {}) + case column_type + when :string + field_type = @method_name.include?("password") ? "password" : "text" + to_input_field_tag(field_type, options) + when :text + to_text_area_tag(options) + when :integer, :float, :decimal + to_input_field_tag("text", options) + when :date + to_date_select_tag(options) + when :datetime, :timestamp + to_datetime_select_tag(options) + when :time + to_time_select_tag(options) + when :boolean + to_boolean_select_tag(options) + end + end + + def column_type + object.send(:column_for_attribute, @method_name).type + end + end + + module FormBuilderMethods + def error_message_on(method, *args) + @template.error_message_on(@object || @object_name, method, *args) + end + + def error_messages(options = {}) + @template.error_messages_for(@object_name, objectify_options(options)) + end + end + end + + class InstanceTag + include DynamicForm::InstanceTagMethods + end + + class FormBuilder + include DynamicForm::FormBuilderMethods + end + end +end + +I18n.load_path << File.expand_path("../../locale/en.yml", __FILE__) diff --git a/spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml b/spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml new file mode 100644 index 000000000..f1eb022fa --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml @@ -0,0 +1,8 @@ +en: + errors: + template: + header: + one: "1 error prohibited this {{model}} from being saved" + other: "{{count}} errors prohibited this {{model}} from being saved" + # The variable :count is also available + body: "There were problems with the following fields:" \ No newline at end of file diff --git a/spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb b/spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb new file mode 100644 index 000000000..82c52ca51 --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb @@ -0,0 +1,42 @@ +require 'test_helper' + +class DynamicFormI18nTest < Test::Unit::TestCase + include ActionView::Context + include ActionView::Helpers::DynamicForm + + attr_reader :request + + def setup + @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages']) + @object.stubs :to_model => @object + @object.stubs :class => stub(:model_name => stub(:human => "")) + + @object_name = 'book_seller' + @object_name_without_underscore = 'book seller' + + stubs(:content_tag).returns 'content_tag' + + I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns "1 error prohibited this from being saved" + I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:' + end + + def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message + I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').never + error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en') + end + + def test_error_messages_for_given_no_header_option_it_translates_header_message + I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns 'header message' + error_messages_for(:object => @object, :locale => 'en') + end + + def test_error_messages_for_given_a_message_option_it_does_not_translate_message + I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).never + error_messages_for(:object => @object, :message => 'message', :locale => 'en') + end + + def test_error_messages_for_given_no_message_option_it_translates_message + I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:' + error_messages_for(:object => @object, :locale => 'en') + end +end \ No newline at end of file diff --git a/spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb b/spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb new file mode 100644 index 000000000..e616cba4e --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb @@ -0,0 +1,370 @@ +require 'test_helper' +require 'action_view/template/handlers/erb' + +class DynamicFormTest < ActionView::TestCase + tests ActionView::Helpers::DynamicForm + + def form_for(*) + @output_buffer = super + end + + silence_warnings do + class Post < Struct.new(:title, :author_name, :body, :secret, :written_on) + extend ActiveModel::Naming + include ActiveModel::Conversion + end + + class User < Struct.new(:email) + extend ActiveModel::Naming + include ActiveModel::Conversion + end + + class Column < Struct.new(:type, :name, :human_name) + extend ActiveModel::Naming + include ActiveModel::Conversion + end + end + + class DirtyPost + class Errors + def empty? + false + end + + def count + 1 + end + + def full_messages + ["Author name can't be empty"] + end + + def [](field) + ["can't be empty"] + end + end + + def errors + Errors.new + end + end + + def setup_post + @post = Post.new + def @post.errors + Class.new { + def [](field) + case field.to_s + when "author_name" + ["can't be empty"] + when "body" + ['foo'] + else + [] + end + end + def empty?() false end + def count() 1 end + def full_messages() [ "Author name can't be empty" ] end + }.new + end + + def @post.persisted?() false end + def @post.to_param() nil end + + def @post.column_for_attribute(attr_name) + Post.content_columns.select { |column| column.name == attr_name }.first + end + + silence_warnings do + def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end + end + + @post.title = "Hello World" + @post.author_name = "" + @post.body = "Back to the hill and over it again!" + @post.secret = 1 + @post.written_on = Date.new(2004, 6, 15) + end + + def setup_user + @user = User.new + def @user.errors + Class.new { + def [](field) field == "email" ? ['nonempty'] : [] end + def empty?() false end + def count() 1 end + def full_messages() [ "User email can't be empty" ] end + }.new + end + + def @user.new_record?() true end + def @user.to_param() nil end + + def @user.column_for_attribute(attr_name) + User.content_columns.select { |column| column.name == attr_name }.first + end + + silence_warnings do + def User.content_columns() [ Column.new(:string, "email", "Email") ] end + end + + @user.email = "" + end + + def protect_against_forgery? + @protect_against_forgery ? true : false + end + attr_accessor :request_forgery_protection_token, :form_authenticity_token + + def setup + super + setup_post + setup_user + + @response = ActionController::TestResponse.new + end + + def url_for(options) + options = options.symbolize_keys + [options[:action], options[:id].to_param].compact.join('/') + end + + def test_generic_input_tag + assert_dom_equal( + %(), input("post", "title") + ) + end + + def test_text_area_with_errors + assert_dom_equal( + %(
    ), + text_area("post", "body") + ) + end + + def test_text_field_with_errors + assert_dom_equal( + %(
    ), + text_field("post", "author_name") + ) + end + + def test_field_error_proc + old_proc = ActionView::Base.field_error_proc + ActionView::Base.field_error_proc = Proc.new do |html_tag, instance| + %(
    #{html_tag} #{[instance.error_message].join(', ')}
    ).html_safe + end + + assert_dom_equal( + %(
    can't be empty
    ), + text_field("post", "author_name") + ) + ensure + ActionView::Base.field_error_proc = old_proc if old_proc + end + + def test_form_with_string + assert_dom_equal( + %(


    \n


    ), + form("post") + ) + + silence_warnings do + class << @post + def persisted?() true end + def to_param() id end + def id() 1 end + end + end + + assert_dom_equal( + %(


    \n


    ), + form("post") + ) + end + + def test_form_with_protect_against_forgery + @protect_against_forgery = true + @request_forgery_protection_token = 'authenticity_token' + @form_authenticity_token = '123' + assert_dom_equal( + %(


    \n


    ), + form("post") + ) + end + + def test_form_with_method_option + assert_dom_equal( + %(


    \n


    ), + form("post", :method=>'get') + ) + end + + def test_form_with_action_option + output_buffer << form("post", :action => "sign") + assert_select "form[action=sign]" do |form| + assert_select "input[type=submit][value=Sign]" + end + end + + def test_form_with_date + silence_warnings do + def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end + end + + assert_dom_equal( + %(


    \n\n\n

    ), + form("post") + ) + end + + def test_form_with_datetime + silence_warnings do + def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end + end + @post.written_on = Time.gm(2004, 6, 15, 16, 30) + + assert_dom_equal( + %(


    \n\n\n — \n : \n

    ), + form("post") + ) + end + + def test_error_for_block + assert_dom_equal %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ), error_messages_for("post") + assert_equal %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ), error_messages_for("post", :class => "errorDeathByClass", :id => "errorDeathById", :header_tag => "h1") + assert_equal %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ), error_messages_for("post", :class => nil, :id => "errorDeathById", :header_tag => "h1") + assert_equal %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ), error_messages_for("post", :class => "errorDeathByClass", :id => nil, :header_tag => "h1") + end + + def test_error_messages_for_escapes_html + @dirty_post = DirtyPost.new + assert_dom_equal %(

    1 error prohibited this dirty post from being saved

    There were problems with the following fields:

    • Author name can't be <em>empty</em>
    ), error_messages_for("dirty_post") + end + + def test_error_messages_for_handles_nil + assert_equal "", error_messages_for("notthere") + end + + def test_error_message_on_escapes_html + @dirty_post = DirtyPost.new + assert_dom_equal "
    can't be <em>empty</em>
    ", error_message_on(:dirty_post, :author_name) + end + + def test_error_message_on_handles_nil + assert_equal "", error_message_on("notthere", "notthere") + end + + def test_error_message_on + assert_dom_equal "
    can't be empty
    ", error_message_on(:post, :author_name) + end + + def test_error_message_on_no_instance_variable + other_post = @post + assert_dom_equal "
    can't be empty
    ", error_message_on(other_post, :author_name) + end + + def test_error_message_on_with_options_hash + assert_dom_equal "
    beforecan't be emptyafter
    ", error_message_on(:post, :author_name, :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after') + end + + def test_error_message_on_with_tag_option_in_options_hash + assert_dom_equal "beforecan't be emptyafter", error_message_on(:post, :author_name, :html_tag => "span", :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after') + end + + def test_error_message_on_handles_empty_errors + assert_equal "", error_message_on(@post, :tag) + end + + def test_error_messages_for_many_objects + assert_dom_equal %(

    2 errors prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    • User email can't be empty
    ), error_messages_for("post", "user") + + # reverse the order, error order changes and so does the title + assert_dom_equal %(

    2 errors prohibited this user from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for("user", "post") + + # add the default to put post back in the title + assert_dom_equal %(

    2 errors prohibited this post from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for("user", "post", :object_name => "post") + + # symbols work as well + assert_dom_equal %(

    2 errors prohibited this post from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for(:user, :post, :object_name => :post) + + # any default works too + assert_dom_equal %(

    2 errors prohibited this monkey from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for(:user, :post, :object_name => "monkey") + + # should space object name + assert_dom_equal %(

    2 errors prohibited this chunky bacon from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for(:user, :post, :object_name => "chunky_bacon") + + # hide header and explanation messages with nil or empty string + assert_dom_equal %(
    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for(:user, :post, :header_message => nil, :message => "") + + # override header and explanation messages + header_message = "Yikes! Some errors" + message = "Please fix the following fields and resubmit:" + assert_dom_equal %(

    #{header_message}

    #{message}

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for(:user, :post, :header_message => header_message, :message => message) + end + + def test_error_messages_for_non_instance_variable + actual_user = @user + actual_post = @post + @user = nil + @post = nil + + #explicitly set object + assert_dom_equal %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ), error_messages_for("post", :object => actual_post) + + #multiple objects + assert_dom_equal %(

    2 errors prohibited this user from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), error_messages_for("user", "post", :object => [actual_user, actual_post]) + + #nil object + assert_equal '', error_messages_for('user', :object => nil) + end + + def test_error_messages_for_model_objects + error = error_messages_for(@post) + assert_dom_equal %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ), + error + + error = error_messages_for(@user, @post) + assert_dom_equal %(

    2 errors prohibited this user from being saved

    There were problems with the following fields:

    • User email can't be empty
    • Author name can't be empty
    ), + error + end + + def test_form_with_string_multipart + assert_dom_equal( + %(


    \n


    ), + form("post", :multipart => true) + ) + end + + def test_default_form_builder_with_dynamic_form_helpers + form_for(@post, :as => :post, :url => {}) do |f| + concat f.error_message_on('author_name') + concat f.error_messages + end + + expected = %(
    ) + + %(
    can't be empty
    ) + + %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ) + + %(
    ) + + assert_dom_equal expected, output_buffer + end + + def test_default_form_builder_no_instance_variable + post = @post + @post = nil + + form_for(post, :as => :post, :url => {}) do |f| + concat f.error_message_on('author_name') + concat f.error_messages + end + + expected = %(
    ) + + %(
    can't be empty
    ) + + %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ) + + %(
    ) + + assert_dom_equal expected, output_buffer + end +end \ No newline at end of file diff --git a/spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb b/spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb new file mode 100644 index 000000000..f62a43cce --- /dev/null +++ b/spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb @@ -0,0 +1,9 @@ +require 'rubygems' +require 'test/unit' +require 'active_support' +require 'active_support/core_ext' +require 'action_view' +require 'action_controller' +require 'action_controller/test_case' +require 'active_model' +require 'action_view/helpers/dynamic_form' From de3511638cc73d8032bf6f95466729e9d86dd8b0 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 29 Jun 2010 14:04:03 -0400 Subject: [PATCH 27/54] 0.9.0.rc3 --- VERSION | 2 +- clearance.gemspec | 269 ++++++++++++------ .../app/views/passwords/edit.html.erb | 21 ++ .../app/views/passwords/new.html.erb | 15 + .../app/views/sessions/new.html.erb | 21 ++ .../app/views/users/_inputs.html.erb | 6 + spec/rails_root/app/views/users/new.html.erb | 10 + ... 20100629180247_clearance_create_users.rb} | 0 spec/rails_root/db/schema.rb | 2 +- 9 files changed, 253 insertions(+), 93 deletions(-) create mode 100644 spec/rails_root/app/views/passwords/edit.html.erb create mode 100644 spec/rails_root/app/views/passwords/new.html.erb create mode 100644 spec/rails_root/app/views/sessions/new.html.erb create mode 100644 spec/rails_root/app/views/users/_inputs.html.erb create mode 100644 spec/rails_root/app/views/users/new.html.erb rename spec/rails_root/db/migrate/{20100629153603_clearance_create_users.rb => 20100629180247_clearance_create_users.rb} (100%) diff --git a/VERSION b/VERSION index a7396a564..f74cbcd89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.0.rc2 +0.9.0.rc3 diff --git a/clearance.gemspec b/clearance.gemspec index a457451df..df9bfeb73 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -1,15 +1,11 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command -# -*- encoding: utf-8 -*- - Gem::Specification.new do |s| s.name = %q{clearance} s.version = IO.read(File.join(File.dirname(__FILE__), 'VERSION')) s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"] - s.date = %q{2010-06-11} + s.date = %q{2010-06-29} + s.summary = %q{Rails authentication with email & password.} s.description = %q{Rails authentication with email & password.} s.email = %q{support@thoughtbot.com} s.extra_rdoc_files = [ @@ -18,105 +14,196 @@ Gem::Specification.new do |s| ] s.files = [ "CHANGELOG.md", - "LICENSE", - "README.md", - "Rakefile", - "app/controllers/clearance/confirmations_controller.rb", - "app/controllers/clearance/passwords_controller.rb", - "app/controllers/clearance/sessions_controller.rb", - "app/controllers/clearance/users_controller.rb", - "app/models/clearance_mailer.rb", - "app/views/clearance_mailer/change_password.html.erb", - "app/views/clearance_mailer/confirmation.html.erb", - "app/views/passwords/edit.html.erb", - "app/views/passwords/new.html.erb", - "app/views/sessions/new.html.erb", - "app/views/users/_form.html.erb", - "app/views/users/new.html.erb", - "config/routes.rb", - "lib/clearance.rb", - "lib/clearance/authentication.rb", - "lib/clearance/configuration.rb", - "lib/clearance/engine.rb", - "lib/clearance/extensions/errors.rb", - "lib/clearance/extensions/rescue.rb", - "lib/clearance/user.rb", - "lib/rails/generators/clearance_features_generator.rb", - "lib/rails/generators/clearance_features_templates/features/password_reset.feature", - "lib/rails/generators/clearance_features_templates/features/sign_in.feature", - "lib/rails/generators/clearance_features_templates/features/sign_out.feature", - "lib/rails/generators/clearance_features_templates/features/sign_up.feature", - "lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb", - "lib/rails/generators/clearance_generator.rb", - "lib/rails/generators/clearance_templates/README", - "lib/rails/generators/clearance_templates/clearance.rb", - "lib/rails/generators/clearance_templates/factories.rb", - "lib/rails/generators/clearance_templates/migrations/create_users.rb", - "lib/rails/generators/clearance_templates/migrations/update_users.rb", - "lib/rails/generators/clearance_templates/user.rb", - "lib/rails/generators/clearance_views_generator.rb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/edit.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/new.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/sessions/new.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/users/_inputs.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/users/new.html.erb", - "rails/init.rb", - "shoulda_macros/clearance.rb" + "LICENSE", + "README.md", + "Rakefile", + "VERSION", + "app/controllers/clearance/confirmations_controller.rb", + "app/controllers/clearance/passwords_controller.rb", + "app/controllers/clearance/sessions_controller.rb", + "app/controllers/clearance/users_controller.rb", + "app/models/clearance_mailer.rb", + "app/views/clearance_mailer/change_password.html.erb", + "app/views/clearance_mailer/confirmation.html.erb", + "app/views/passwords/edit.html.erb", + "app/views/passwords/new.html.erb", + "app/views/sessions/new.html.erb", + "app/views/users/_form.html.erb", + "app/views/users/new.html.erb", + "clearance.gemspec", + "config/routes.rb", + "cucumber.yml", + "lib/clearance.rb", + "lib/clearance/authentication.rb", + "lib/clearance/configuration.rb", + "lib/clearance/engine.rb", + "lib/clearance/extensions/errors.rb", + "lib/clearance/extensions/rescue.rb", + "lib/clearance/user.rb", + "lib/rails/generators/clearance_features_generator.rb", + "lib/rails/generators/clearance_features_templates/features/password_reset.feature", + "lib/rails/generators/clearance_features_templates/features/sign_in.feature", + "lib/rails/generators/clearance_features_templates/features/sign_out.feature", + "lib/rails/generators/clearance_features_templates/features/sign_up.feature", + "lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb", + "lib/rails/generators/clearance_generator.rb", + "lib/rails/generators/clearance_templates/README", + "lib/rails/generators/clearance_templates/clearance.rb", + "lib/rails/generators/clearance_templates/factories.rb", + "lib/rails/generators/clearance_templates/migrations/create_users.rb", + "lib/rails/generators/clearance_templates/migrations/update_users.rb", + "lib/rails/generators/clearance_templates/user.rb", + "lib/rails/generators/clearance_views_generator.rb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/edit.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/new.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/sessions/new.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/users/_inputs.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/users/new.html.erb", + "rails/init.rb", + "shoulda_macros/clearance.rb" ] + s.homepage = %q{http://github.com/thoughtbot/clearance} s.rdoc_options = ["--charset=UTF-8"] s.require_paths = ["lib"] s.rubygems_version = %q{1.3.7} - s.summary = %q{Rails authentication with email & password.} s.test_files = [ + "spec/rails_root/Gemfile", + "spec/rails_root/README", + "spec/rails_root/Rakefile", + "spec/rails_root/app/controllers/accounts_controller.rb", + "spec/rails_root/app/controllers/application_controller.rb", + "spec/rails_root/app/helpers/application_helper.rb", + "spec/rails_root/app/models/user.rb", + "spec/rails_root/app/views/accounts/edit.html.erb", + "spec/rails_root/app/views/layouts/application.html.erb", + "spec/rails_root/config.ru", + "spec/rails_root/config/application.rb", + "spec/rails_root/config/boot.rb", + "spec/rails_root/config/cucumber.yml", + "spec/rails_root/config/database.yml", + "spec/rails_root/config/environment.rb", + "spec/rails_root/config/environments/development.rb", + "spec/rails_root/config/environments/production.rb", + "spec/rails_root/config/environments/test.rb", + "spec/rails_root/config/initializers/backtrace_silencers.rb", + "spec/rails_root/config/initializers/clearance.rb", + "spec/rails_root/config/initializers/inflections.rb", + "spec/rails_root/config/initializers/mime_types.rb", + "spec/rails_root/config/initializers/secret_token.rb", + "spec/rails_root/config/initializers/session_store.rb", + "spec/rails_root/config/locales/en.yml", + "spec/rails_root/config/routes.rb", + "spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb", + "spec/rails_root/db/schema.rb", + "spec/rails_root/doc/README_FOR_APP", + "spec/rails_root/features/password_reset.feature", + "spec/rails_root/features/sign_in.feature", + "spec/rails_root/features/sign_out.feature", + "spec/rails_root/features/sign_up.feature", + "spec/rails_root/features/step_definitions/clearance_steps.rb", + "spec/rails_root/features/step_definitions/web_steps.rb", + "spec/rails_root/features/support/env.rb", + "spec/rails_root/features/support/paths.rb", + "spec/rails_root/lib/tasks/cucumber.rake", + "spec/rails_root/public/404.html", + "spec/rails_root/public/422.html", + "spec/rails_root/public/500.html", + "spec/rails_root/public/favicon.ico", + "spec/rails_root/public/images/rails.png", + "spec/rails_root/public/javascripts/application.js", + "spec/rails_root/public/javascripts/controls.js", + "spec/rails_root/public/javascripts/dragdrop.js", + "spec/rails_root/public/javascripts/effects.js", + "spec/rails_root/public/javascripts/prototype.js", + "spec/rails_root/public/javascripts/rails.js", + "spec/rails_root/public/robots.txt", + "spec/rails_root/script/cucumber", + "spec/rails_root/script/rails", + "spec/rails_root/spec/factories/clearance.rb", + "spec/rails_root/vendor/plugins/clearance", + "spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", + "spec/rails_root/vendor/plugins/dynamic_form/README", + "spec/rails_root/vendor/plugins/dynamic_form/Rakefile", + "spec/rails_root/vendor/plugins/dynamic_form/init.rb", + "spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", + "spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml", + "spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", + "spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", + "spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", "test/controllers/confirmations_controller_test.rb", - "test/controllers/passwords_controller_test.rb", - "test/controllers/sessions_controller_test.rb", - "test/controllers/users_controller_test.rb", - "test/models/clearance_mailer_test.rb", - "test/models/user_test.rb", - "test/rails_root/app/controllers/accounts_controller.rb", - "test/rails_root/app/controllers/application_controller.rb", - "test/rails_root/app/helpers/application_helper.rb", - "test/rails_root/app/models/user.rb", - "test/rails_root/config/application.rb", - "test/rails_root/config/boot.rb", - "test/rails_root/config/environment.rb", - "test/rails_root/config/environments/development.rb", - "test/rails_root/config/environments/production.rb", - "test/rails_root/config/environments/test.rb", - "test/rails_root/config/initializers/backtrace_silencers.rb", - "test/rails_root/config/initializers/clearance.rb", - "test/rails_root/config/initializers/inflections.rb", - "test/rails_root/config/initializers/mime_types.rb", - "test/rails_root/config/initializers/secret_token.rb", - "test/rails_root/config/initializers/session_store.rb", - "test/rails_root/config/routes.rb", - "test/rails_root/features/step_definitions/web_steps.rb", - "test/rails_root/features/support/env.rb", - "test/rails_root/features/support/paths.rb", - "test/rails_root/test/factories/clearance.rb", - "test/rails_root/test/functional/accounts_controller_test.rb", - "test/rails_root/test/performance/browsing_test.rb", - "test/rails_root/test/test_helper.rb", - "test/rails_root/vendor/plugins/dynamic_form/init.rb", - "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", - "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", - "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", - "test/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", - "test/test_helper.rb" + "test/controllers/passwords_controller_test.rb", + "test/controllers/sessions_controller_test.rb", + "test/controllers/users_controller_test.rb", + "test/models/clearance_mailer_test.rb", + "test/models/user_test.rb", + "test/rails_root/Gemfile", + "test/rails_root/README", + "test/rails_root/Rakefile", + "test/rails_root/app/controllers/accounts_controller.rb", + "test/rails_root/app/controllers/application_controller.rb", + "test/rails_root/app/helpers/application_helper.rb", + "test/rails_root/app/models/user.rb", + "test/rails_root/app/views/accounts/edit.html.erb", + "test/rails_root/app/views/layouts/application.html.erb", + "test/rails_root/config.ru", + "test/rails_root/config/application.rb", + "test/rails_root/config/boot.rb", + "test/rails_root/config/cucumber.yml", + "test/rails_root/config/database.yml", + "test/rails_root/config/environment.rb", + "test/rails_root/config/environments/development.rb", + "test/rails_root/config/environments/production.rb", + "test/rails_root/config/environments/test.rb", + "test/rails_root/config/initializers/backtrace_silencers.rb", + "test/rails_root/config/initializers/clearance.rb", + "test/rails_root/config/initializers/inflections.rb", + "test/rails_root/config/initializers/mime_types.rb", + "test/rails_root/config/initializers/secret_token.rb", + "test/rails_root/config/initializers/session_store.rb", + "test/rails_root/config/locales/en.yml", + "test/rails_root/config/routes.rb", + "test/rails_root/doc/README_FOR_APP", + "test/rails_root/features/step_definitions/web_steps.rb", + "test/rails_root/features/support/env.rb", + "test/rails_root/features/support/paths.rb", + "test/rails_root/lib/tasks/cucumber.rake", + "test/rails_root/public/404.html", + "test/rails_root/public/422.html", + "test/rails_root/public/500.html", + "test/rails_root/public/favicon.ico", + "test/rails_root/public/images/rails.png", + "test/rails_root/public/javascripts/application.js", + "test/rails_root/public/javascripts/controls.js", + "test/rails_root/public/javascripts/dragdrop.js", + "test/rails_root/public/javascripts/effects.js", + "test/rails_root/public/javascripts/prototype.js", + "test/rails_root/public/javascripts/rails.js", + "test/rails_root/public/robots.txt", + "test/rails_root/script/cucumber", + "test/rails_root/script/rails", + "test/rails_root/test/factories/clearance.rb", + "test/rails_root/test/functional/accounts_controller_test.rb", + "test/rails_root/test/performance/browsing_test.rb", + "test/rails_root/test/test_helper.rb", + "test/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", + "test/rails_root/vendor/plugins/dynamic_form/README", + "test/rails_root/vendor/plugins/dynamic_form/Rakefile", + "test/rails_root/vendor/plugins/dynamic_form/init.rb", + "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", + "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml", + "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", + "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", + "test/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", + "test/test_helper.rb" ] s.add_dependency('rails', '~>3.0.0.beta4') + s.add_development_dependency('rspec', [">= 1.3.0"]) if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 3 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - else - end - else end end diff --git a/spec/rails_root/app/views/passwords/edit.html.erb b/spec/rails_root/app/views/passwords/edit.html.erb new file mode 100644 index 000000000..6d46ad97c --- /dev/null +++ b/spec/rails_root/app/views/passwords/edit.html.erb @@ -0,0 +1,21 @@ +

    Change your password

    + +

    + Your password has been reset. Choose a new password below. +

    + +<%= semantic_form_for(:user, + :url => user_password_path(@user, :token => @user.confirmation_token), + :html => { :method => :put }) do |form| %> + <%= form.error_messages %> + <%= form.inputs do -%> + <%= form.input :password, :as => :password, + :label => "Choose password" %> + <%= form.input :password_confirmation, :as => :password, + :label => "Confirm password" %> + <% end -%> + <%= form.buttons do -%> + <%= form.commit_button "Save this password" %> + <% end -%> +<% end %> + diff --git a/spec/rails_root/app/views/passwords/new.html.erb b/spec/rails_root/app/views/passwords/new.html.erb new file mode 100644 index 000000000..caff97b14 --- /dev/null +++ b/spec/rails_root/app/views/passwords/new.html.erb @@ -0,0 +1,15 @@ +

    Reset your password

    + +

    + We will email you a link to reset your password. +

    + +<%= semantic_form_for :password, :url => passwords_path do |form| -%> + <%= form.inputs do -%> + <%= form.input :email, :label => "Email address" %> + <% end -%> + <%= form.buttons do -%> + <%= form.commit_button "Reset password" %> + <% end -%> +<% end -%> + diff --git a/spec/rails_root/app/views/sessions/new.html.erb b/spec/rails_root/app/views/sessions/new.html.erb new file mode 100644 index 000000000..b9cce4ac2 --- /dev/null +++ b/spec/rails_root/app/views/sessions/new.html.erb @@ -0,0 +1,21 @@ +

    Sign in

    + +<%= semantic_form_for :session, :url => session_path do |form| %> + <%= form.inputs do %> + <%= form.input :email %> + <%= form.input :password, :as => :password %> + <% end %> + <%= form.buttons do %> + <%= form.commit_button "Sign in" %> + <% end %> +<% end %> + +
      +
    • + <%= link_to "Sign up", sign_up_path %> +
      • +
    • + <%= link_to "Forgot password?", new_password_path %> +
      • +
    + diff --git a/spec/rails_root/app/views/users/_inputs.html.erb b/spec/rails_root/app/views/users/_inputs.html.erb new file mode 100644 index 000000000..bf9ab005b --- /dev/null +++ b/spec/rails_root/app/views/users/_inputs.html.erb @@ -0,0 +1,6 @@ +<%= form.inputs do %> + <%= form.input :email %> + <%= form.input :password %> + <%= form.input :password_confirmation, :label => "Confirm password" %> +<% end %> + diff --git a/spec/rails_root/app/views/users/new.html.erb b/spec/rails_root/app/views/users/new.html.erb new file mode 100644 index 000000000..baf869068 --- /dev/null +++ b/spec/rails_root/app/views/users/new.html.erb @@ -0,0 +1,10 @@ +

    Sign up

    + +<%= semantic_form_for @user do |form| %> + <%= form.error_messages %> + <%= render :partial => "/users/inputs", :locals => { :form => form } %> + <%= form.buttons do %> + <%= form.commit_button "Sign up" %> + <% end %> +<% end %> + diff --git a/spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb b/spec/rails_root/db/migrate/20100629180247_clearance_create_users.rb similarity index 100% rename from spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb rename to spec/rails_root/db/migrate/20100629180247_clearance_create_users.rb diff --git a/spec/rails_root/db/schema.rb b/spec/rails_root/db/schema.rb index 162315349..40fc9cfd0 100644 --- a/spec/rails_root/db/schema.rb +++ b/spec/rails_root/db/schema.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20100629153603) do +ActiveRecord::Schema.define(:version => 20100629180247) do create_table "users", :force => true do |t| t.string "email" From c16c90fb67ae4bbb44bebe94877a70ee1e18c360 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 29 Jun 2010 14:05:30 -0400 Subject: [PATCH 28/54] remove create_users migration from files list --- clearance.gemspec | 209 ---------------------------------------------- 1 file changed, 209 deletions(-) delete mode 100644 clearance.gemspec diff --git a/clearance.gemspec b/clearance.gemspec deleted file mode 100644 index df9bfeb73..000000000 --- a/clearance.gemspec +++ /dev/null @@ -1,209 +0,0 @@ -Gem::Specification.new do |s| - s.name = %q{clearance} - s.version = IO.read(File.join(File.dirname(__FILE__), 'VERSION')) - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"] - s.date = %q{2010-06-29} - s.summary = %q{Rails authentication with email & password.} - s.description = %q{Rails authentication with email & password.} - s.email = %q{support@thoughtbot.com} - s.extra_rdoc_files = [ - "LICENSE", - "README.md" - ] - s.files = [ - "CHANGELOG.md", - "LICENSE", - "README.md", - "Rakefile", - "VERSION", - "app/controllers/clearance/confirmations_controller.rb", - "app/controllers/clearance/passwords_controller.rb", - "app/controllers/clearance/sessions_controller.rb", - "app/controllers/clearance/users_controller.rb", - "app/models/clearance_mailer.rb", - "app/views/clearance_mailer/change_password.html.erb", - "app/views/clearance_mailer/confirmation.html.erb", - "app/views/passwords/edit.html.erb", - "app/views/passwords/new.html.erb", - "app/views/sessions/new.html.erb", - "app/views/users/_form.html.erb", - "app/views/users/new.html.erb", - "clearance.gemspec", - "config/routes.rb", - "cucumber.yml", - "lib/clearance.rb", - "lib/clearance/authentication.rb", - "lib/clearance/configuration.rb", - "lib/clearance/engine.rb", - "lib/clearance/extensions/errors.rb", - "lib/clearance/extensions/rescue.rb", - "lib/clearance/user.rb", - "lib/rails/generators/clearance_features_generator.rb", - "lib/rails/generators/clearance_features_templates/features/password_reset.feature", - "lib/rails/generators/clearance_features_templates/features/sign_in.feature", - "lib/rails/generators/clearance_features_templates/features/sign_out.feature", - "lib/rails/generators/clearance_features_templates/features/sign_up.feature", - "lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb", - "lib/rails/generators/clearance_generator.rb", - "lib/rails/generators/clearance_templates/README", - "lib/rails/generators/clearance_templates/clearance.rb", - "lib/rails/generators/clearance_templates/factories.rb", - "lib/rails/generators/clearance_templates/migrations/create_users.rb", - "lib/rails/generators/clearance_templates/migrations/update_users.rb", - "lib/rails/generators/clearance_templates/user.rb", - "lib/rails/generators/clearance_views_generator.rb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/edit.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/new.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/sessions/new.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/users/_inputs.html.erb", - "lib/rails/generators/clearance_views_templates/formtastic/erb/users/new.html.erb", - "rails/init.rb", - "shoulda_macros/clearance.rb" - ] - - s.homepage = %q{http://github.com/thoughtbot/clearance} - s.rdoc_options = ["--charset=UTF-8"] - s.require_paths = ["lib"] - s.rubygems_version = %q{1.3.7} - s.test_files = [ - "spec/rails_root/Gemfile", - "spec/rails_root/README", - "spec/rails_root/Rakefile", - "spec/rails_root/app/controllers/accounts_controller.rb", - "spec/rails_root/app/controllers/application_controller.rb", - "spec/rails_root/app/helpers/application_helper.rb", - "spec/rails_root/app/models/user.rb", - "spec/rails_root/app/views/accounts/edit.html.erb", - "spec/rails_root/app/views/layouts/application.html.erb", - "spec/rails_root/config.ru", - "spec/rails_root/config/application.rb", - "spec/rails_root/config/boot.rb", - "spec/rails_root/config/cucumber.yml", - "spec/rails_root/config/database.yml", - "spec/rails_root/config/environment.rb", - "spec/rails_root/config/environments/development.rb", - "spec/rails_root/config/environments/production.rb", - "spec/rails_root/config/environments/test.rb", - "spec/rails_root/config/initializers/backtrace_silencers.rb", - "spec/rails_root/config/initializers/clearance.rb", - "spec/rails_root/config/initializers/inflections.rb", - "spec/rails_root/config/initializers/mime_types.rb", - "spec/rails_root/config/initializers/secret_token.rb", - "spec/rails_root/config/initializers/session_store.rb", - "spec/rails_root/config/locales/en.yml", - "spec/rails_root/config/routes.rb", - "spec/rails_root/db/migrate/20100629153603_clearance_create_users.rb", - "spec/rails_root/db/schema.rb", - "spec/rails_root/doc/README_FOR_APP", - "spec/rails_root/features/password_reset.feature", - "spec/rails_root/features/sign_in.feature", - "spec/rails_root/features/sign_out.feature", - "spec/rails_root/features/sign_up.feature", - "spec/rails_root/features/step_definitions/clearance_steps.rb", - "spec/rails_root/features/step_definitions/web_steps.rb", - "spec/rails_root/features/support/env.rb", - "spec/rails_root/features/support/paths.rb", - "spec/rails_root/lib/tasks/cucumber.rake", - "spec/rails_root/public/404.html", - "spec/rails_root/public/422.html", - "spec/rails_root/public/500.html", - "spec/rails_root/public/favicon.ico", - "spec/rails_root/public/images/rails.png", - "spec/rails_root/public/javascripts/application.js", - "spec/rails_root/public/javascripts/controls.js", - "spec/rails_root/public/javascripts/dragdrop.js", - "spec/rails_root/public/javascripts/effects.js", - "spec/rails_root/public/javascripts/prototype.js", - "spec/rails_root/public/javascripts/rails.js", - "spec/rails_root/public/robots.txt", - "spec/rails_root/script/cucumber", - "spec/rails_root/script/rails", - "spec/rails_root/spec/factories/clearance.rb", - "spec/rails_root/vendor/plugins/clearance", - "spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", - "spec/rails_root/vendor/plugins/dynamic_form/README", - "spec/rails_root/vendor/plugins/dynamic_form/Rakefile", - "spec/rails_root/vendor/plugins/dynamic_form/init.rb", - "spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", - "spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml", - "spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", - "spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", - "spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", - "test/controllers/confirmations_controller_test.rb", - "test/controllers/passwords_controller_test.rb", - "test/controllers/sessions_controller_test.rb", - "test/controllers/users_controller_test.rb", - "test/models/clearance_mailer_test.rb", - "test/models/user_test.rb", - "test/rails_root/Gemfile", - "test/rails_root/README", - "test/rails_root/Rakefile", - "test/rails_root/app/controllers/accounts_controller.rb", - "test/rails_root/app/controllers/application_controller.rb", - "test/rails_root/app/helpers/application_helper.rb", - "test/rails_root/app/models/user.rb", - "test/rails_root/app/views/accounts/edit.html.erb", - "test/rails_root/app/views/layouts/application.html.erb", - "test/rails_root/config.ru", - "test/rails_root/config/application.rb", - "test/rails_root/config/boot.rb", - "test/rails_root/config/cucumber.yml", - "test/rails_root/config/database.yml", - "test/rails_root/config/environment.rb", - "test/rails_root/config/environments/development.rb", - "test/rails_root/config/environments/production.rb", - "test/rails_root/config/environments/test.rb", - "test/rails_root/config/initializers/backtrace_silencers.rb", - "test/rails_root/config/initializers/clearance.rb", - "test/rails_root/config/initializers/inflections.rb", - "test/rails_root/config/initializers/mime_types.rb", - "test/rails_root/config/initializers/secret_token.rb", - "test/rails_root/config/initializers/session_store.rb", - "test/rails_root/config/locales/en.yml", - "test/rails_root/config/routes.rb", - "test/rails_root/doc/README_FOR_APP", - "test/rails_root/features/step_definitions/web_steps.rb", - "test/rails_root/features/support/env.rb", - "test/rails_root/features/support/paths.rb", - "test/rails_root/lib/tasks/cucumber.rake", - "test/rails_root/public/404.html", - "test/rails_root/public/422.html", - "test/rails_root/public/500.html", - "test/rails_root/public/favicon.ico", - "test/rails_root/public/images/rails.png", - "test/rails_root/public/javascripts/application.js", - "test/rails_root/public/javascripts/controls.js", - "test/rails_root/public/javascripts/dragdrop.js", - "test/rails_root/public/javascripts/effects.js", - "test/rails_root/public/javascripts/prototype.js", - "test/rails_root/public/javascripts/rails.js", - "test/rails_root/public/robots.txt", - "test/rails_root/script/cucumber", - "test/rails_root/script/rails", - "test/rails_root/test/factories/clearance.rb", - "test/rails_root/test/functional/accounts_controller_test.rb", - "test/rails_root/test/performance/browsing_test.rb", - "test/rails_root/test/test_helper.rb", - "test/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", - "test/rails_root/vendor/plugins/dynamic_form/README", - "test/rails_root/vendor/plugins/dynamic_form/Rakefile", - "test/rails_root/vendor/plugins/dynamic_form/init.rb", - "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", - "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml", - "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", - "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", - "test/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", - "test/test_helper.rb" - ] - - s.add_dependency('rails', '~>3.0.0.beta4') - s.add_development_dependency('rspec', [">= 1.3.0"]) - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - end -end - From 3608e3997f7359b9a442d34ae94115cfa0adc96a Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 29 Jun 2010 14:05:54 -0400 Subject: [PATCH 29/54] Release 0.9.0.rc3 From 9a477b24535910ab583925119177e237d5a12fa1 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 29 Jun 2010 14:06:39 -0400 Subject: [PATCH 30/54] Add gemspec back --- clearance.gemspec | 208 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 clearance.gemspec diff --git a/clearance.gemspec b/clearance.gemspec new file mode 100644 index 000000000..db98e2252 --- /dev/null +++ b/clearance.gemspec @@ -0,0 +1,208 @@ +Gem::Specification.new do |s| + s.name = %q{clearance} + s.version = IO.read(File.join(File.dirname(__FILE__), 'VERSION')) + + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"] + s.date = %q{2010-06-29} + s.summary = %q{Rails authentication with email & password.} + s.description = %q{Rails authentication with email & password.} + s.email = %q{support@thoughtbot.com} + s.extra_rdoc_files = [ + "LICENSE", + "README.md" + ] + s.files = [ + "CHANGELOG.md", + "LICENSE", + "README.md", + "Rakefile", + "VERSION", + "app/controllers/clearance/confirmations_controller.rb", + "app/controllers/clearance/passwords_controller.rb", + "app/controllers/clearance/sessions_controller.rb", + "app/controllers/clearance/users_controller.rb", + "app/models/clearance_mailer.rb", + "app/views/clearance_mailer/change_password.html.erb", + "app/views/clearance_mailer/confirmation.html.erb", + "app/views/passwords/edit.html.erb", + "app/views/passwords/new.html.erb", + "app/views/sessions/new.html.erb", + "app/views/users/_form.html.erb", + "app/views/users/new.html.erb", + "clearance.gemspec", + "config/routes.rb", + "cucumber.yml", + "lib/clearance.rb", + "lib/clearance/authentication.rb", + "lib/clearance/configuration.rb", + "lib/clearance/engine.rb", + "lib/clearance/extensions/errors.rb", + "lib/clearance/extensions/rescue.rb", + "lib/clearance/user.rb", + "lib/rails/generators/clearance_features_generator.rb", + "lib/rails/generators/clearance_features_templates/features/password_reset.feature", + "lib/rails/generators/clearance_features_templates/features/sign_in.feature", + "lib/rails/generators/clearance_features_templates/features/sign_out.feature", + "lib/rails/generators/clearance_features_templates/features/sign_up.feature", + "lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb", + "lib/rails/generators/clearance_generator.rb", + "lib/rails/generators/clearance_templates/README", + "lib/rails/generators/clearance_templates/clearance.rb", + "lib/rails/generators/clearance_templates/factories.rb", + "lib/rails/generators/clearance_templates/migrations/create_users.rb", + "lib/rails/generators/clearance_templates/migrations/update_users.rb", + "lib/rails/generators/clearance_templates/user.rb", + "lib/rails/generators/clearance_views_generator.rb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/edit.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/passwords/new.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/sessions/new.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/users/_inputs.html.erb", + "lib/rails/generators/clearance_views_templates/formtastic/erb/users/new.html.erb", + "rails/init.rb", + "shoulda_macros/clearance.rb" + ] + + s.homepage = %q{http://github.com/thoughtbot/clearance} + s.rdoc_options = ["--charset=UTF-8"] + s.require_paths = ["lib"] + s.rubygems_version = %q{1.3.7} + s.test_files = [ + "spec/rails_root/Gemfile", + "spec/rails_root/README", + "spec/rails_root/Rakefile", + "spec/rails_root/app/controllers/accounts_controller.rb", + "spec/rails_root/app/controllers/application_controller.rb", + "spec/rails_root/app/helpers/application_helper.rb", + "spec/rails_root/app/models/user.rb", + "spec/rails_root/app/views/accounts/edit.html.erb", + "spec/rails_root/app/views/layouts/application.html.erb", + "spec/rails_root/config.ru", + "spec/rails_root/config/application.rb", + "spec/rails_root/config/boot.rb", + "spec/rails_root/config/cucumber.yml", + "spec/rails_root/config/database.yml", + "spec/rails_root/config/environment.rb", + "spec/rails_root/config/environments/development.rb", + "spec/rails_root/config/environments/production.rb", + "spec/rails_root/config/environments/test.rb", + "spec/rails_root/config/initializers/backtrace_silencers.rb", + "spec/rails_root/config/initializers/clearance.rb", + "spec/rails_root/config/initializers/inflections.rb", + "spec/rails_root/config/initializers/mime_types.rb", + "spec/rails_root/config/initializers/secret_token.rb", + "spec/rails_root/config/initializers/session_store.rb", + "spec/rails_root/config/locales/en.yml", + "spec/rails_root/config/routes.rb", + "spec/rails_root/db/schema.rb", + "spec/rails_root/doc/README_FOR_APP", + "spec/rails_root/features/password_reset.feature", + "spec/rails_root/features/sign_in.feature", + "spec/rails_root/features/sign_out.feature", + "spec/rails_root/features/sign_up.feature", + "spec/rails_root/features/step_definitions/clearance_steps.rb", + "spec/rails_root/features/step_definitions/web_steps.rb", + "spec/rails_root/features/support/env.rb", + "spec/rails_root/features/support/paths.rb", + "spec/rails_root/lib/tasks/cucumber.rake", + "spec/rails_root/public/404.html", + "spec/rails_root/public/422.html", + "spec/rails_root/public/500.html", + "spec/rails_root/public/favicon.ico", + "spec/rails_root/public/images/rails.png", + "spec/rails_root/public/javascripts/application.js", + "spec/rails_root/public/javascripts/controls.js", + "spec/rails_root/public/javascripts/dragdrop.js", + "spec/rails_root/public/javascripts/effects.js", + "spec/rails_root/public/javascripts/prototype.js", + "spec/rails_root/public/javascripts/rails.js", + "spec/rails_root/public/robots.txt", + "spec/rails_root/script/cucumber", + "spec/rails_root/script/rails", + "spec/rails_root/spec/factories/clearance.rb", + "spec/rails_root/vendor/plugins/clearance", + "spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", + "spec/rails_root/vendor/plugins/dynamic_form/README", + "spec/rails_root/vendor/plugins/dynamic_form/Rakefile", + "spec/rails_root/vendor/plugins/dynamic_form/init.rb", + "spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", + "spec/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml", + "spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", + "spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", + "spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", + "test/controllers/confirmations_controller_test.rb", + "test/controllers/passwords_controller_test.rb", + "test/controllers/sessions_controller_test.rb", + "test/controllers/users_controller_test.rb", + "test/models/clearance_mailer_test.rb", + "test/models/user_test.rb", + "test/rails_root/Gemfile", + "test/rails_root/README", + "test/rails_root/Rakefile", + "test/rails_root/app/controllers/accounts_controller.rb", + "test/rails_root/app/controllers/application_controller.rb", + "test/rails_root/app/helpers/application_helper.rb", + "test/rails_root/app/models/user.rb", + "test/rails_root/app/views/accounts/edit.html.erb", + "test/rails_root/app/views/layouts/application.html.erb", + "test/rails_root/config.ru", + "test/rails_root/config/application.rb", + "test/rails_root/config/boot.rb", + "test/rails_root/config/cucumber.yml", + "test/rails_root/config/database.yml", + "test/rails_root/config/environment.rb", + "test/rails_root/config/environments/development.rb", + "test/rails_root/config/environments/production.rb", + "test/rails_root/config/environments/test.rb", + "test/rails_root/config/initializers/backtrace_silencers.rb", + "test/rails_root/config/initializers/clearance.rb", + "test/rails_root/config/initializers/inflections.rb", + "test/rails_root/config/initializers/mime_types.rb", + "test/rails_root/config/initializers/secret_token.rb", + "test/rails_root/config/initializers/session_store.rb", + "test/rails_root/config/locales/en.yml", + "test/rails_root/config/routes.rb", + "test/rails_root/doc/README_FOR_APP", + "test/rails_root/features/step_definitions/web_steps.rb", + "test/rails_root/features/support/env.rb", + "test/rails_root/features/support/paths.rb", + "test/rails_root/lib/tasks/cucumber.rake", + "test/rails_root/public/404.html", + "test/rails_root/public/422.html", + "test/rails_root/public/500.html", + "test/rails_root/public/favicon.ico", + "test/rails_root/public/images/rails.png", + "test/rails_root/public/javascripts/application.js", + "test/rails_root/public/javascripts/controls.js", + "test/rails_root/public/javascripts/dragdrop.js", + "test/rails_root/public/javascripts/effects.js", + "test/rails_root/public/javascripts/prototype.js", + "test/rails_root/public/javascripts/rails.js", + "test/rails_root/public/robots.txt", + "test/rails_root/script/cucumber", + "test/rails_root/script/rails", + "test/rails_root/test/factories/clearance.rb", + "test/rails_root/test/functional/accounts_controller_test.rb", + "test/rails_root/test/performance/browsing_test.rb", + "test/rails_root/test/test_helper.rb", + "test/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", + "test/rails_root/vendor/plugins/dynamic_form/README", + "test/rails_root/vendor/plugins/dynamic_form/Rakefile", + "test/rails_root/vendor/plugins/dynamic_form/init.rb", + "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb", + "test/rails_root/vendor/plugins/dynamic_form/lib/action_view/locale/en.yml", + "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb", + "test/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb", + "test/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb", + "test/test_helper.rb" + ] + + s.add_dependency('rails', '~>3.0.0.beta4') + s.add_development_dependency('rspec', [">= 1.3.0"]) + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 3 + end +end + From 23156937bf0c4230c034d32bead030671961bb30 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Tue, 29 Jun 2010 14:06:44 -0400 Subject: [PATCH 31/54] Release 0.9.0.rc3 From e7d7e60c1554c4bddb81d35a2a665c73ec6434bc Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sat, 17 Jul 2010 17:21:55 -0500 Subject: [PATCH 32/54] Move filter_parameters into engine initializer, using clearance as a real gem for tests --- .../clearance/confirmations_controller.rb | 2 -- .../clearance/passwords_controller.rb | 1 - .../clearance/sessions_controller.rb | 1 - app/controllers/clearance/users_controller.rb | 1 - lib/clearance/engine.rb | 3 +++ spec/rails_root/vendor/plugins/clearance | 1 - test/rails_root/Gemfile | 18 +----------------- 7 files changed, 4 insertions(+), 23 deletions(-) delete mode 120000 spec/rails_root/vendor/plugins/clearance diff --git a/app/controllers/clearance/confirmations_controller.rb b/app/controllers/clearance/confirmations_controller.rb index 9c82e25bf..b1b3d3f48 100644 --- a/app/controllers/clearance/confirmations_controller.rb +++ b/app/controllers/clearance/confirmations_controller.rb @@ -7,8 +7,6 @@ class Clearance::ConfirmationsController < ApplicationController before_filter :forbid_missing_token, :only => [:new, :create] before_filter :forbid_non_existent_user, :only => [:new, :create] - filter_parameter_logging :token - def new create end diff --git a/app/controllers/clearance/passwords_controller.rb b/app/controllers/clearance/passwords_controller.rb index 26de4e978..fef36fd69 100644 --- a/app/controllers/clearance/passwords_controller.rb +++ b/app/controllers/clearance/passwords_controller.rb @@ -4,7 +4,6 @@ class Clearance::PasswordsController < ApplicationController skip_before_filter :authenticate, :only => [:new, :create, :edit, :update] before_filter :forbid_missing_token, :only => [:edit, :update] before_filter :forbid_non_existent_user, :only => [:edit, :update] - filter_parameter_logging :password, :password_confirmation def new render :template => 'passwords/new' diff --git a/app/controllers/clearance/sessions_controller.rb b/app/controllers/clearance/sessions_controller.rb index d4e005b96..41694189d 100644 --- a/app/controllers/clearance/sessions_controller.rb +++ b/app/controllers/clearance/sessions_controller.rb @@ -3,7 +3,6 @@ class Clearance::SessionsController < ApplicationController skip_before_filter :authenticate, :only => [:new, :create, :destroy] protect_from_forgery :except => :create - filter_parameter_logging :password def new render :template => 'sessions/new' diff --git a/app/controllers/clearance/users_controller.rb b/app/controllers/clearance/users_controller.rb index 36c94e8e1..45d61c488 100644 --- a/app/controllers/clearance/users_controller.rb +++ b/app/controllers/clearance/users_controller.rb @@ -3,7 +3,6 @@ class Clearance::UsersController < ApplicationController skip_before_filter :authenticate, :only => [:new, :create] before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in? - filter_parameter_logging :password def new @user = ::User.new(params[:user]) diff --git a/lib/clearance/engine.rb b/lib/clearance/engine.rb index caa8cf9a3..d22a6ea58 100644 --- a/lib/clearance/engine.rb +++ b/lib/clearance/engine.rb @@ -3,5 +3,8 @@ module Clearance class Engine < Rails::Engine + initializer "clearance.filter" do |app| + app.config.filter_parameters += [:token, :password, :password_confirmation] + end end end diff --git a/spec/rails_root/vendor/plugins/clearance b/spec/rails_root/vendor/plugins/clearance deleted file mode 120000 index 75cf25522..000000000 --- a/spec/rails_root/vendor/plugins/clearance +++ /dev/null @@ -1 +0,0 @@ -/home/mike/clearance \ No newline at end of file diff --git a/test/rails_root/Gemfile b/test/rails_root/Gemfile index 0effe5d75..44b09361a 100644 --- a/test/rails_root/Gemfile +++ b/test/rails_root/Gemfile @@ -21,20 +21,4 @@ gem 'cucumber-rails', '0.3.2' gem 'cucumber', '0.8.0' gem 'launchy' -# Use unicorn as the web server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# Bundle the extra gems: -# gem 'bj' -# gem 'nokogiri', '1.4.1' -# gem 'sqlite3-ruby', :require => 'sqlite3' -# gem 'aws-s3', :require => 'aws/s3' - -# Bundle gems for certain environments: -# gem 'rspec', :group => :test -# group :test do -# gem 'webrat' -# end +gem 'clearance', :path => '../..' From 01de98d145af29497073dc4abb3e040c1ad5bab0 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sun, 18 Jul 2010 09:36:14 -0500 Subject: [PATCH 33/54] Updating to cucumber 0.8.5 and stop symlinking the plugin --- Rakefile | 2 -- test/rails_root/Gemfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 9da189cd3..07bcbc63a 100644 --- a/Rakefile +++ b/Rakefile @@ -100,13 +100,11 @@ namespace :generator do FileUtils.rm_rf(each) end - FileUtils.rm_rf("test/rails_root/vendor/plugins/clearance") FileUtils.rm_rf("test/rails_root/app/views/passwords") FileUtils.rm_rf("test/rails_root/app/views/sessions") FileUtils.rm_rf("test/rails_root/app/views/users") FileUtils.mkdir_p("test/rails_root/vendor/plugins") clearance_root = File.expand_path(File.dirname(__FILE__)) - system("ln -s #{clearance_root} test/rails_root/vendor/plugins/clearance") FileList["test/rails_root/features/*.feature"].each do |each| FileUtils.rm_rf(each) end diff --git a/test/rails_root/Gemfile b/test/rails_root/Gemfile index 44b09361a..7fd124af9 100644 --- a/test/rails_root/Gemfile +++ b/test/rails_root/Gemfile @@ -18,7 +18,7 @@ gem 'nokogiri', '1.4.1' gem 'capybara' gem 'database_cleaner' gem 'cucumber-rails', '0.3.2' -gem 'cucumber', '0.8.0' +gem 'cucumber', '0.8.5' gem 'launchy' gem 'clearance', :path => '../..' From 26b41367261f95a69815bc16616ef300426703c0 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sun, 18 Jul 2010 09:48:33 -0500 Subject: [PATCH 34/54] Bumping to 0.9.0.rc4 --- VERSION | 2 +- clearance.gemspec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f74cbcd89..14ccad222 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.0.rc3 +0.9.0.rc4 diff --git a/clearance.gemspec b/clearance.gemspec index db98e2252..16c6f0f48 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -120,7 +120,6 @@ Gem::Specification.new do |s| "spec/rails_root/script/cucumber", "spec/rails_root/script/rails", "spec/rails_root/spec/factories/clearance.rb", - "spec/rails_root/vendor/plugins/clearance", "spec/rails_root/vendor/plugins/dynamic_form/MIT-LICENSE", "spec/rails_root/vendor/plugins/dynamic_form/README", "spec/rails_root/vendor/plugins/dynamic_form/Rakefile", From b929edbb84b00c6dd042e5cf46e8d51f1f4c3c11 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sun, 18 Jul 2010 18:01:49 -0500 Subject: [PATCH 35/54] Moving shoulda_macros into lib so it can be required when bundled --- shoulda_macros/clearance.rb => lib/clearance/shoulda_macros.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename shoulda_macros/clearance.rb => lib/clearance/shoulda_macros.rb (100%) diff --git a/shoulda_macros/clearance.rb b/lib/clearance/shoulda_macros.rb similarity index 100% rename from shoulda_macros/clearance.rb rename to lib/clearance/shoulda_macros.rb From b75b21c93acdf2f0c74a23c6a6600e02eef23ade Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Mon, 19 Jul 2010 09:04:13 -0400 Subject: [PATCH 36/54] Bumping to 0.9.0.rc5 --- VERSION | 2 +- clearance.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 14ccad222..834e2273f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.0.rc4 +0.9.0.rc5 diff --git a/clearance.gemspec b/clearance.gemspec index 16c6f0f48..b96f4b468 100644 --- a/clearance.gemspec +++ b/clearance.gemspec @@ -39,6 +39,7 @@ Gem::Specification.new do |s| "lib/clearance/engine.rb", "lib/clearance/extensions/errors.rb", "lib/clearance/extensions/rescue.rb", + "lib/clearance/shoulda_macros.rb", "lib/clearance/user.rb", "lib/rails/generators/clearance_features_generator.rb", "lib/rails/generators/clearance_features_templates/features/password_reset.feature", @@ -60,7 +61,6 @@ Gem::Specification.new do |s| "lib/rails/generators/clearance_views_templates/formtastic/erb/users/_inputs.html.erb", "lib/rails/generators/clearance_views_templates/formtastic/erb/users/new.html.erb", "rails/init.rb", - "shoulda_macros/clearance.rb" ] s.homepage = %q{http://github.com/thoughtbot/clearance} From 4e3c7d100d8df8a11a507b00b6d04e29ebec9347 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Wed, 21 Jul 2010 16:22:36 -0400 Subject: [PATCH 37/54] Fix another path to the old shoulda macros location --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 5817346ae..9df9fdf19 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,7 +11,7 @@ rescue LoadError end -require File.join(File.dirname(__FILE__), '..', 'shoulda_macros', 'clearance') +require 'clearance/shoulda_macros' class ActiveSupport::TestCase self.use_transactional_fixtures = true From 676828d7c415c69ba2308cdfa810ff750d33ac11 Mon Sep 17 00:00:00 2001 From: Jeremy Weiskotten Date: Mon, 26 Jul 2010 21:42:20 -0400 Subject: [PATCH 38/54] Changed routes to use Rails 3 DSL. This removes a deprecation warning triggered by the block parameter. --- config/routes.rb | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 662225b6e..445d705ac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,30 +1,23 @@ -Rails.application.routes.draw do |map| - map.resources :passwords, +Rails.application.routes.draw do + resources :passwords, :controller => 'clearance/passwords', :only => [:new, :create] - map.resource :session, + resource :session, :controller => 'clearance/sessions', :only => [:new, :create, :destroy] - map.resources :users, :controller => 'clearance/users' do |users| - users.resource :password, + resources :users, :controller => 'clearance/users' do + resource :password, :controller => 'clearance/passwords', :only => [:create, :edit, :update] - users.resource :confirmation, + resource :confirmation, :controller => 'clearance/confirmations', :only => [:new, :create] end - map.sign_up 'sign_up', - :controller => 'clearance/users', - :action => 'new' - map.sign_in 'sign_in', - :controller => 'clearance/sessions', - :action => 'new' - map.sign_out 'sign_out', - :controller => 'clearance/sessions', - :action => 'destroy', - :method => :delete + match 'sign_up' => 'clearance/users#new', :as => 'sign_up' + match 'sign_in' => 'clearance/sessions#new', :as => 'sign_in' + match 'sign_out' => 'clearance/sessions#destroy', :via => :delete, :as => 'sign_out' end From 73dcb75dd4d2fae0441ff6faf0c12e3973d9c149 Mon Sep 17 00:00:00 2001 From: Jeremy Weiskotten Date: Mon, 26 Jul 2010 21:46:56 -0400 Subject: [PATCH 39/54] Updated README instructions for Rails 3. Fixed a few typos. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8d48b8911..1121ca0d1 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ and add your route in config/routes.rb: See config/routes.rb for all the routes Clearance provides. Actions that redirect (create, update, and destroy) in Clearance controllers -can be overriden by re-defining url_after_(action) methods as seen above. +can be overridden by re-defining url_after_(action) methods as seen above. Optional Cucumber features -------------------------- @@ -92,11 +92,11 @@ Run the Cucumber generator and Clearance feature generator: Edit your Gemfile to include: - gem 'factory_girl' + gem 'factory_girl_rails' Edit your config/enviroments/cucumber.rb to include the following: - ActionMailer::Base.default_url_options = { :host => 'localhost:3000' } + config.action_mailer.default_url_options = { :host => 'localhost:3000' } Then run rake! @@ -115,8 +115,8 @@ Authors ------- Clearance was extracted out of [Hoptoad](http://hoptoadapp.com). We merged the -authentication code from two of thoughtbot client Rails apps and have since -used it each time we need authentication. +authentication code from two of thoughtbot's client Rails apps and have since +used it each time we needed authentication. The following people have improved the library. Thank you! From 201bfbf4f41c960f17891606c28e0199b1b09d47 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sat, 21 Aug 2010 23:31:42 -0400 Subject: [PATCH 40/54] VERSION file is one dir up --- lib/rails/generators/clearance_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rails/generators/clearance_generator.rb b/lib/rails/generators/clearance_generator.rb index ea19886e8..5b148e5fb 100644 --- a/lib/rails/generators/clearance_generator.rb +++ b/lib/rails/generators/clearance_generator.rb @@ -62,7 +62,7 @@ def migration_target_name end def schema_version - IO.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).strip.gsub(/[^\d]/, '_') + IO.read(File.join(File.dirname(__FILE__), '..', '..', '..', 'VERSION')).strip.gsub(/[^\d]/, '_') end def upgrading_clearance_again? From 0933cf844a0456ce386a6002ecbae3fe66c8f07d Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sat, 21 Aug 2010 23:37:46 -0400 Subject: [PATCH 41/54] Bumping to rc6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 834e2273f..d27fffd34 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.0.rc5 +0.9.0.rc6 From 21a615b66634d38ad2fc748913f3fb6280845076 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Sun, 22 Aug 2010 02:32:40 -0400 Subject: [PATCH 42/54] Sign out path link needs DELETE verb, visit for capybara only does GET so follow the link instead --- .../step_definitions/clearance_steps.rb | 7 +- spec/rails_root/Gemfile | 2 +- .../app/views/layouts/application.html.erb | 2 +- ... 20100822062949_clearance_create_users.rb} | 0 spec/rails_root/db/schema.rb | 2 +- .../step_definitions/clearance_steps.rb | 7 +- spec/rails_root/vendor/plugins/clearance | 1 + .../lib/action_view/locale/en.yml | 6 +- test/rails_root/Gemfile | 2 +- test/rails_root/Gemfile.lock | 147 ++++++++++++++++++ .../app/views/layouts/application.html.erb | 2 +- .../lib/action_view/locale/en.yml | 6 +- 12 files changed, 169 insertions(+), 15 deletions(-) rename spec/rails_root/db/migrate/{20100629180247_clearance_create_users.rb => 20100822062949_clearance_create_users.rb} (100%) create mode 120000 spec/rails_root/vendor/plugins/clearance create mode 100644 test/rails_root/Gemfile.lock diff --git a/lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb b/lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb index fe025cd9b..027575524 100644 --- a/lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb +++ b/lib/rails/generators/clearance_features_templates/features/step_definitions/clearance_steps.rb @@ -108,8 +108,11 @@ And %{I press "Sign in"} end -When /^I sign out$/ do - visit '/sign_out' +When "I sign out" do + steps %{ + When I go to the homepage + And I follow "Sign out" + } end When /^I request password reset link to be sent to "(.*)"$/ do |email| diff --git a/spec/rails_root/Gemfile b/spec/rails_root/Gemfile index 0effe5d75..5ada292cf 100644 --- a/spec/rails_root/Gemfile +++ b/spec/rails_root/Gemfile @@ -9,7 +9,7 @@ gem 'sqlite3-ruby', :require => 'sqlite3' gem 'mocha' -gem 'formtastic', "1.0.0.beta", :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3" +gem 'formtastic', :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3" gem 'shoulda', '>= 2.11', :git => "git://github.com/thoughtbot/shoulda.git" gem 'factory_girl_rails' diff --git a/spec/rails_root/app/views/layouts/application.html.erb b/spec/rails_root/app/views/layouts/application.html.erb index 491a49fa3..a053dcbdd 100644 --- a/spec/rails_root/app/views/layouts/application.html.erb +++ b/spec/rails_root/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@