refinerycms 0.9.6.19 → 0.9.6.21
Sign up to get free protection for your applications and to get access to all the features.
- data/.gems +0 -8
- data/.gitignore +3 -1
- data/Rakefile +1 -5
- data/VERSION +1 -1
- data/bin/refinery-update-core +11 -2
- data/config/application.rb +6 -1
- data/config/environments/development.rb +10 -6
- data/config/settings.rb +3 -0
- data/db/migrate/20100305023036_change_users_columns_for_authlogic.rb +46 -0
- data/db/migrate/20100305023037_remove_unused_users_columns.rb +16 -0
- data/db/migrate/20100312155331_make_user_perishable_token_nullable.rb +13 -0
- data/db/migrate/20100312160327_make_user_persistence_token_nullable.rb +13 -0
- data/db/migrate/20100315203301_remove_state_from_users.rb +9 -0
- data/db/schema.rb +8 -21
- data/db/seeds.rb +5 -19
- data/lib/refinery/tasks/refinery.rb +1 -1
- data/public/javascripts/admin.js +6 -2
- data/public/javascripts/jquery-ui-1.8.min.js +374 -0
- data/public/javascripts/jquery.js +606 -444
- data/public/javascripts/refinery/admin.js +30 -9
- data/public/javascripts/refinery/boot_wym.js +4 -0
- data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +3 -4
- data/public/stylesheets/refinery/refinery.css +11 -0
- data/public/stylesheets/wymeditor/skins/refinery/skin.css +3 -1
- data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +5 -5
- data/readme.md +13 -10
- data/test/fixtures/users.yml +5 -5
- data/test/functional/dashboard_controller_test.rb +0 -4
- data/test/functional/images_controller_test.rb +0 -3
- data/test/test_helper.rb +7 -3
- data/themes/hemingway/views/layouts/application.html.erb +1 -12
- data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +1 -3
- data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +3 -14
- data/vendor/plugins/authentication/app/controllers/users_controller.rb +26 -37
- data/vendor/plugins/authentication/app/models/user.rb +29 -112
- data/vendor/plugins/authentication/app/models/user_mailer.rb +8 -5
- data/vendor/plugins/authentication/app/models/user_session.rb +9 -0
- data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/sessions/new.html.erb +5 -4
- data/vendor/plugins/authentication/lib/authenticated_system.rb +40 -30
- data/vendor/plugins/authentication/rails/init.rb +9 -0
- data/vendor/plugins/authlogic/CHANGELOG.rdoc +345 -0
- data/vendor/plugins/authlogic/LICENSE +20 -0
- data/vendor/plugins/authlogic/README.rdoc +246 -0
- data/vendor/plugins/authlogic/Rakefile +42 -0
- data/vendor/plugins/authlogic/VERSION.yml +5 -0
- data/vendor/plugins/authlogic/authlogic.gemspec +217 -0
- data/vendor/plugins/authlogic/generators/session/session_generator.rb +9 -0
- data/vendor/plugins/authlogic/generators/session/templates/session.rb +2 -0
- data/vendor/plugins/authlogic/init.rb +1 -0
- data/vendor/plugins/authlogic/lib/authlogic.rb +64 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb +107 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb +110 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb +60 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb +141 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb +24 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb +355 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb +105 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb +68 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb +61 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb +139 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb +65 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb +32 -0
- data/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb +42 -0
- data/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb +55 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb +67 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb +30 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb +48 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/sinatra_adapter.rb +61 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb +43 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb +90 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb +34 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb +35 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha256.rb +50 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb +50 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/wordpress.rb +43 -0
- data/vendor/plugins/authlogic/lib/authlogic/i18n.rb +83 -0
- data/vendor/plugins/authlogic/lib/authlogic/i18n/translator.rb +15 -0
- data/vendor/plugins/authlogic/lib/authlogic/random.rb +33 -0
- data/vendor/plugins/authlogic/lib/authlogic/regex.rb +25 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/activation.rb +58 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb +64 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/base.rb +37 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb +96 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb +99 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb +130 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/existence.rb +93 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb +63 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb +58 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/id.rb +41 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/klass.rb +78 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb +95 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb +59 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/params.rb +101 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/password.rb +240 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb +18 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb +70 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb +34 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb +101 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/session.rb +62 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb +82 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb +50 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/validation.rb +82 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case.rb +120 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb +45 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb +14 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_logger.rb +10 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_request.rb +19 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/rails_request_adapter.rb +30 -0
- data/vendor/plugins/authlogic/rails/init.rb +1 -0
- data/vendor/plugins/authlogic/shoulda_macros/authlogic.rb +69 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/base_test.rb +18 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb +97 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb +36 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb +109 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb +27 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb +236 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb +90 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb +55 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb +40 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb +84 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb +44 -0
- data/vendor/plugins/authlogic/test/authenticates_many_test.rb +16 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb +14 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb +14 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb +23 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/sha256_test.rb +14 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb +14 -0
- data/vendor/plugins/authlogic/test/fixtures/companies.yml +5 -0
- data/vendor/plugins/authlogic/test/fixtures/employees.yml +17 -0
- data/vendor/plugins/authlogic/test/fixtures/projects.yml +3 -0
- data/vendor/plugins/authlogic/test/fixtures/users.yml +24 -0
- data/vendor/plugins/authlogic/test/i18n_test.rb +33 -0
- data/vendor/plugins/authlogic/test/libs/affiliate.rb +7 -0
- data/vendor/plugins/authlogic/test/libs/company.rb +6 -0
- data/vendor/plugins/authlogic/test/libs/employee.rb +7 -0
- data/vendor/plugins/authlogic/test/libs/employee_session.rb +2 -0
- data/vendor/plugins/authlogic/test/libs/ldaper.rb +3 -0
- data/vendor/plugins/authlogic/test/libs/ordered_hash.rb +9 -0
- data/vendor/plugins/authlogic/test/libs/project.rb +3 -0
- data/vendor/plugins/authlogic/test/libs/user.rb +5 -0
- data/vendor/plugins/authlogic/test/libs/user_session.rb +6 -0
- data/vendor/plugins/authlogic/test/random_test.rb +49 -0
- data/vendor/plugins/authlogic/test/session_test/activation_test.rb +43 -0
- data/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb +36 -0
- data/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb +101 -0
- data/vendor/plugins/authlogic/test/session_test/callbacks_test.rb +6 -0
- data/vendor/plugins/authlogic/test/session_test/cookies_test.rb +112 -0
- data/vendor/plugins/authlogic/test/session_test/credentials_test.rb +0 -0
- data/vendor/plugins/authlogic/test/session_test/existence_test.rb +64 -0
- data/vendor/plugins/authlogic/test/session_test/http_auth_test.rb +28 -0
- data/vendor/plugins/authlogic/test/session_test/id_test.rb +17 -0
- data/vendor/plugins/authlogic/test/session_test/klass_test.rb +40 -0
- data/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb +62 -0
- data/vendor/plugins/authlogic/test/session_test/magic_states_test.rb +60 -0
- data/vendor/plugins/authlogic/test/session_test/params_test.rb +53 -0
- data/vendor/plugins/authlogic/test/session_test/password_test.rb +106 -0
- data/vendor/plugins/authlogic/test/session_test/perishability_test.rb +15 -0
- data/vendor/plugins/authlogic/test/session_test/persistence_test.rb +21 -0
- data/vendor/plugins/authlogic/test/session_test/scopes_test.rb +60 -0
- data/vendor/plugins/authlogic/test/session_test/session_test.rb +59 -0
- data/vendor/plugins/authlogic/test/session_test/timeout_test.rb +52 -0
- data/vendor/plugins/authlogic/test/session_test/unauthorized_record_test.rb +13 -0
- data/vendor/plugins/authlogic/test/session_test/validation_test.rb +23 -0
- data/vendor/plugins/authlogic/test/test_helper.rb +182 -0
- data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
- data/vendor/plugins/friendly_id/Changelog.md +243 -0
- data/vendor/plugins/friendly_id/Contributors.md +30 -0
- data/vendor/plugins/friendly_id/Gemfile +2 -0
- data/vendor/plugins/friendly_id/Guide.md +509 -0
- data/vendor/plugins/friendly_id/LICENSE +19 -0
- data/vendor/plugins/friendly_id/README.md +76 -0
- data/vendor/plugins/friendly_id/Rakefile +68 -0
- data/vendor/plugins/friendly_id/extras/README.txt +3 -0
- data/vendor/plugins/friendly_id/extras/bench.rb +59 -0
- data/vendor/plugins/friendly_id/extras/extras.rb +31 -0
- data/vendor/plugins/friendly_id/extras/prof.rb +14 -0
- data/vendor/plugins/friendly_id/extras/template-gem.rb +26 -0
- data/vendor/plugins/friendly_id/extras/template-plugin.rb +28 -0
- data/vendor/plugins/friendly_id/friendly_id.gemspec +40 -0
- data/vendor/plugins/friendly_id/generators/friendly_id/friendly_id_generator.rb +28 -0
- data/vendor/plugins/friendly_id/generators/friendly_id/templates/create_slugs.rb +18 -0
- data/vendor/plugins/friendly_id/lib/friendly_id.rb +67 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2.rb +47 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/configuration.rb +66 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/finders.rb +140 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/simple_model.rb +162 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/slug.rb +111 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/slugged_model.rb +323 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/tasks.rb +66 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/tasks/friendly_id.rake +19 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/configuration.rb +132 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/finders.rb +106 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/slug_string.rb +292 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/slugged.rb +91 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/status.rb +35 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/test.rb +175 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/version.rb +8 -0
- data/vendor/plugins/friendly_id/rails/init.rb +2 -0
- data/vendor/plugins/friendly_id/test/active_record2/basic_slugged_model_test.rb +14 -0
- data/vendor/plugins/friendly_id/test/active_record2/cached_slug_test.rb +61 -0
- data/vendor/plugins/friendly_id/test/active_record2/core.rb +93 -0
- data/vendor/plugins/friendly_id/test/active_record2/custom_normalizer_test.rb +20 -0
- data/vendor/plugins/friendly_id/test/active_record2/custom_table_name_test.rb +22 -0
- data/vendor/plugins/friendly_id/test/active_record2/deprecated_test.rb +23 -0
- data/vendor/plugins/friendly_id/test/active_record2/scoped_model_test.rb +111 -0
- data/vendor/plugins/friendly_id/test/active_record2/simple_test.rb +59 -0
- data/vendor/plugins/friendly_id/test/active_record2/slug_test.rb +34 -0
- data/vendor/plugins/friendly_id/test/active_record2/slugged.rb +30 -0
- data/vendor/plugins/friendly_id/test/active_record2/slugged_status_test.rb +61 -0
- data/vendor/plugins/friendly_id/test/active_record2/sti_test.rb +22 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/database.mysql.yml +4 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/database.postgres.yml +6 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/database.sqlite3.yml +2 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/models.rb +78 -0
- data/vendor/plugins/friendly_id/test/active_record2/tasks_test.rb +82 -0
- data/vendor/plugins/friendly_id/test/active_record2/test_helper.rb +114 -0
- data/vendor/plugins/friendly_id/test/friendly_id_test.rb +60 -0
- data/vendor/plugins/friendly_id/test/slug_string_test.rb +78 -0
- data/vendor/plugins/friendly_id/test/test_helper.rb +9 -0
- data/vendor/plugins/hpricot/CHANGELOG +88 -0
- data/vendor/plugins/hpricot/COPYING +18 -0
- data/vendor/plugins/hpricot/README +275 -0
- data/vendor/plugins/hpricot/Rakefile +272 -0
- data/vendor/plugins/hpricot/ext/fast_xs/FastXsService.java +1030 -0
- data/vendor/plugins/hpricot/ext/fast_xs/extconf.rb +4 -0
- data/vendor/plugins/hpricot/ext/fast_xs/fast_xs.c +201 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/HpricotCss.java +831 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/HpricotScanService.java +2086 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/MANIFEST +0 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/extconf.rb +6 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_common.rl +76 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.c +3503 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.java.rl +155 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.rl +115 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.c +6927 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.h +79 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.java.rl +1152 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.rl +788 -0
- data/vendor/plugins/hpricot/extras/mingw-rbconfig.rb +176 -0
- data/vendor/plugins/hpricot/hpricot.gemspec +17 -0
- data/vendor/plugins/hpricot/lib/hpricot.rb +26 -0
- data/vendor/plugins/hpricot/lib/hpricot/blankslate.rb +63 -0
- data/vendor/plugins/hpricot/lib/hpricot/builder.rb +216 -0
- data/vendor/plugins/hpricot/lib/hpricot/elements.rb +510 -0
- data/vendor/plugins/hpricot/lib/hpricot/htmlinfo.rb +691 -0
- data/vendor/plugins/hpricot/lib/hpricot/inspect.rb +103 -0
- data/vendor/plugins/hpricot/lib/hpricot/modules.rb +40 -0
- data/vendor/plugins/hpricot/lib/hpricot/parse.rb +38 -0
- data/vendor/plugins/hpricot/lib/hpricot/tag.rb +219 -0
- data/vendor/plugins/hpricot/lib/hpricot/tags.rb +164 -0
- data/vendor/plugins/hpricot/lib/hpricot/traverse.rb +839 -0
- data/vendor/plugins/hpricot/lib/hpricot/xchar.rb +94 -0
- data/vendor/plugins/hpricot/setup.rb +1585 -0
- data/vendor/plugins/hpricot/test/files/basic.xhtml +17 -0
- data/vendor/plugins/hpricot/test/files/boingboing.html +2266 -0
- data/vendor/plugins/hpricot/test/files/cy0.html +3653 -0
- data/vendor/plugins/hpricot/test/files/immob.html +400 -0
- data/vendor/plugins/hpricot/test/files/pace_application.html +1320 -0
- data/vendor/plugins/hpricot/test/files/tenderlove.html +16 -0
- data/vendor/plugins/hpricot/test/files/uswebgen.html +220 -0
- data/vendor/plugins/hpricot/test/files/utf8.html +1054 -0
- data/vendor/plugins/hpricot/test/files/week9.html +1723 -0
- data/vendor/plugins/hpricot/test/files/why.xml +19 -0
- data/vendor/plugins/hpricot/test/load_files.rb +7 -0
- data/vendor/plugins/hpricot/test/nokogiri-bench.rb +64 -0
- data/vendor/plugins/hpricot/test/test_alter.rb +96 -0
- data/vendor/plugins/hpricot/test/test_builder.rb +37 -0
- data/vendor/plugins/hpricot/test/test_parser.rb +428 -0
- data/vendor/plugins/hpricot/test/test_paths.rb +25 -0
- data/vendor/plugins/hpricot/test/test_preserved.rb +88 -0
- data/vendor/plugins/hpricot/test/test_xml.rb +28 -0
- data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +1 -6
- data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +0 -11
- data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +10 -6
- data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
- data/vendor/plugins/inquiries/config/routes.rb +1 -1
- data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +16 -3
- data/vendor/plugins/pages/app/models/page_part.rb +9 -0
- data/vendor/plugins/rails_indexes/lib/indexer.rb +0 -2
- data/vendor/plugins/refinery/app/views/admin/_head.html.erb +2 -1
- data/vendor/plugins/refinery/app/views/shared/_head.html.erb +0 -1
- data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +23 -11
- data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
- data/vendor/plugins/refinery/app/views/wymiframe.html.erb +2 -1
- data/vendor/plugins/refinery/lib/generators/refinery/USAGE +1 -1
- data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +2 -2
- data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -0
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +6 -0
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +5 -3
- data/vendor/plugins/refinery/lib/refinery/application_helper.rb +2 -2
- data/vendor/plugins/refinery/lib/refinery/initializer.rb +4 -41
- data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +7 -3
- data/vendor/plugins/slim_scrooge/README.textile +112 -0
- data/vendor/plugins/slim_scrooge/Rakefile +29 -0
- data/vendor/plugins/slim_scrooge/VERSION.yml +5 -0
- data/vendor/plugins/slim_scrooge/ext/Rakefile +42 -0
- data/vendor/plugins/slim_scrooge/ext/extconf.rb +5 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge.rb +16 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/callsite.rb +96 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/callsites.rb +70 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/monitored_hash.rb +103 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/result_set.rb +38 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/simple_set.rb +34 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/slim_scrooge.rb +46 -0
- data/vendor/plugins/slim_scrooge/rails/init.rb +8 -0
- data/vendor/plugins/slim_scrooge/slim_scrooge.gemspec +62 -0
- data/vendor/plugins/slim_scrooge/slim_scrooge_windows.gemspec +59 -0
- data/vendor/plugins/slim_scrooge/test/active_record_setup.rb +3 -0
- data/vendor/plugins/slim_scrooge/test/helper.rb +91 -0
- data/vendor/plugins/slim_scrooge/test/models/course.rb +2 -0
- data/vendor/plugins/slim_scrooge/test/schema/schema.rb +5 -0
- data/vendor/plugins/slim_scrooge/test/setup.rb +5 -0
- data/vendor/plugins/themes/app/models/theme.rb +7 -0
- data/vendor/plugins/themes/lib/theme_server.rb +3 -1
- data/vendor/plugins/themes/rails/init.rb +16 -13
- data/vendor/plugins/will_paginate/.manifest +43 -0
- data/vendor/plugins/will_paginate/CHANGELOG.rdoc +139 -0
- data/vendor/plugins/will_paginate/LICENSE +18 -0
- data/vendor/plugins/will_paginate/README.rdoc +107 -0
- data/vendor/plugins/will_paginate/Rakefile +53 -0
- data/vendor/plugins/will_paginate/examples/apple-circle.gif +0 -0
- data/vendor/plugins/will_paginate/examples/index.haml +69 -0
- data/vendor/plugins/will_paginate/examples/index.html +92 -0
- data/vendor/plugins/will_paginate/examples/pagination.css +90 -0
- data/vendor/plugins/will_paginate/examples/pagination.sass +91 -0
- data/vendor/plugins/will_paginate/init.rb +1 -0
- data/vendor/plugins/will_paginate/lib/will_paginate.rb +90 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/array.rb +16 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/collection.rb +146 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb +43 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/finder.rb +264 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb +170 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb +37 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/version.rb +9 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb +408 -0
- data/vendor/plugins/will_paginate/test/boot.rb +21 -0
- data/vendor/plugins/will_paginate/test/collection_test.rb +143 -0
- data/vendor/plugins/will_paginate/test/console +8 -0
- data/vendor/plugins/will_paginate/test/database.yml +22 -0
- data/vendor/plugins/will_paginate/test/finder_test.rb +473 -0
- data/vendor/plugins/will_paginate/test/fixtures/admin.rb +3 -0
- data/vendor/plugins/will_paginate/test/fixtures/developer.rb +14 -0
- data/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml +13 -0
- data/vendor/plugins/will_paginate/test/fixtures/project.rb +15 -0
- data/vendor/plugins/will_paginate/test/fixtures/projects.yml +6 -0
- data/vendor/plugins/will_paginate/test/fixtures/replies.yml +29 -0
- data/vendor/plugins/will_paginate/test/fixtures/reply.rb +7 -0
- data/vendor/plugins/will_paginate/test/fixtures/schema.rb +38 -0
- data/vendor/plugins/will_paginate/test/fixtures/topic.rb +10 -0
- data/vendor/plugins/will_paginate/test/fixtures/topics.yml +30 -0
- data/vendor/plugins/will_paginate/test/fixtures/user.rb +2 -0
- data/vendor/plugins/will_paginate/test/fixtures/users.yml +35 -0
- data/vendor/plugins/will_paginate/test/helper.rb +37 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb +43 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb +75 -0
- data/vendor/plugins/will_paginate/test/lib/load_fixtures.rb +11 -0
- data/vendor/plugins/will_paginate/test/lib/view_test_process.rb +179 -0
- data/vendor/plugins/will_paginate/test/tasks.rake +59 -0
- data/vendor/plugins/will_paginate/test/view_test.rb +373 -0
- data/vendor/plugins/will_paginate/will_paginate.gemspec +19 -0
- metadata +308 -27
- data/db/migrate/20091029034951_remove_blurb_from_news_items.rb +0 -9
- data/public/javascripts/jquery-ui-1.8rc1.min.js +0 -375
- data/test/fixtures/news_items.yml +0 -14
- data/test/unit/news_items_test.rb +0 -33
- data/vendor/plugins/authentication/test/fixtures/users.yml +0 -19
- data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +0 -85
- data/vendor/plugins/authentication/test/functional/users_controller_test.rb +0 -99
- data/vendor/plugins/authentication/test/unit/user_test.rb +0 -164
- data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +0 -5
- data/vendor/plugins/news/app/controllers/news_items_controller.rb +0 -20
- data/vendor/plugins/news/app/models/news_item.rb +0 -24
- data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +0 -19
- data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +0 -15
- data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +0 -1
- data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +0 -31
- data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +0 -1
- data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +0 -8
- data/vendor/plugins/news/app/views/news_items/index.html.erb +0 -17
- data/vendor/plugins/news/app/views/news_items/index.rss.builder +0 -26
- data/vendor/plugins/news/app/views/news_items/show.html.erb +0 -13
- data/vendor/plugins/news/config/routes.rb +0 -7
- data/vendor/plugins/news/news.md +0 -20
- data/vendor/plugins/news/rails/init.rb +0 -11
@@ -0,0 +1,24 @@
|
|
1
|
+
module Authlogic
|
2
|
+
module ActsAsAuthentic
|
3
|
+
# Magic columns are like ActiveRecord's created_at and updated_at columns. They are "magically" maintained for
|
4
|
+
# you. Authlogic has the same thing, but these are maintained on the session side. Please see Authlogic::Session::MagicColumns
|
5
|
+
# for more details. This module merely adds validations for the magic columns if they exist.
|
6
|
+
module MagicColumns
|
7
|
+
def self.included(klass)
|
8
|
+
klass.class_eval do
|
9
|
+
add_acts_as_authentic_module(Methods)
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
# Methods relating to the magic columns
|
14
|
+
module Methods
|
15
|
+
def self.included(klass)
|
16
|
+
klass.class_eval do
|
17
|
+
validates_numericality_of :login_count, :only_integer => :true, :greater_than_or_equal_to => 0, :allow_nil => true if column_names.include?("login_count")
|
18
|
+
validates_numericality_of :failed_login_count, :only_integer => :true, :greater_than_or_equal_to => 0, :allow_nil => true if column_names.include?("failed_login_count")
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,355 @@
|
|
1
|
+
module Authlogic
|
2
|
+
module ActsAsAuthentic
|
3
|
+
# This module has a lot of neat functionality. It is responsible for encrypting your password, salting it, and verifying it.
|
4
|
+
# It can also help you transition to a new encryption algorithm. See the Config sub module for configuration options.
|
5
|
+
module Password
|
6
|
+
def self.included(klass)
|
7
|
+
klass.class_eval do
|
8
|
+
extend Config
|
9
|
+
add_acts_as_authentic_module(Callbacks)
|
10
|
+
add_acts_as_authentic_module(Methods)
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
# All configuration for the password aspect of acts_as_authentic.
|
15
|
+
module Config
|
16
|
+
# The name of the crypted_password field in the database.
|
17
|
+
#
|
18
|
+
# * <tt>Default:</tt> :crypted_password, :encrypted_password, :password_hash, or :pw_hash
|
19
|
+
# * <tt>Accepts:</tt> Symbol
|
20
|
+
def crypted_password_field(value = nil)
|
21
|
+
rw_config(:crypted_password_field, value, first_column_to_exist(nil, :crypted_password, :encrypted_password, :password_hash, :pw_hash))
|
22
|
+
end
|
23
|
+
alias_method :crypted_password_field=, :crypted_password_field
|
24
|
+
|
25
|
+
# The name of the password_salt field in the database.
|
26
|
+
#
|
27
|
+
# * <tt>Default:</tt> :password_salt, :pw_salt, :salt, nil if none exist
|
28
|
+
# * <tt>Accepts:</tt> Symbol
|
29
|
+
def password_salt_field(value = nil)
|
30
|
+
rw_config(:password_salt_field, value, first_column_to_exist(nil, :password_salt, :pw_salt, :salt))
|
31
|
+
end
|
32
|
+
alias_method :password_salt_field=, :password_salt_field
|
33
|
+
|
34
|
+
# Whether or not to require a password confirmation. If you don't want your users to confirm their password
|
35
|
+
# just set this to false.
|
36
|
+
#
|
37
|
+
# * <tt>Default:</tt> true
|
38
|
+
# * <tt>Accepts:</tt> Boolean
|
39
|
+
def require_password_confirmation(value = nil)
|
40
|
+
rw_config(:require_password_confirmation, value, true)
|
41
|
+
end
|
42
|
+
alias_method :require_password_confirmation=, :require_password_confirmation
|
43
|
+
|
44
|
+
# By default passwords are required when a record is new or the crypted_password is blank, but if both of these things
|
45
|
+
# are met a password is not required. In this case, blank passwords are ignored.
|
46
|
+
#
|
47
|
+
# Think about a profile page, where the user can edit all of their information, including changing their password.
|
48
|
+
# If they do not want to change their password they just leave the fields blank. This will try to set the password to
|
49
|
+
# a blank value, in which case is incorrect behavior. As such, Authlogic ignores this. But let's say you have a completely
|
50
|
+
# separate page for resetting passwords, you might not want to ignore blank passwords. If this is the case for you, then
|
51
|
+
# just set this value to false.
|
52
|
+
#
|
53
|
+
# * <tt>Default:</tt> true
|
54
|
+
# * <tt>Accepts:</tt> Boolean
|
55
|
+
def ignore_blank_passwords(value = nil)
|
56
|
+
rw_config(:ignore_blank_passwords, value, true)
|
57
|
+
end
|
58
|
+
alias_method :ignore_blank_passwords=, :ignore_blank_passwords
|
59
|
+
|
60
|
+
# When calling valid_password?("some pass") do you want to check that password against what's in that object or whats in
|
61
|
+
# the datbase. Take this example:
|
62
|
+
#
|
63
|
+
# u = User.first
|
64
|
+
# u.password = "new pass"
|
65
|
+
# u.valid_password?("old pass")
|
66
|
+
#
|
67
|
+
# Should the last line above return true or false? The record hasn't been saved yet, so most would assume true.
|
68
|
+
# Other would assume false. So I let you decide by giving you this option.
|
69
|
+
#
|
70
|
+
# * <tt>Default:</tt> true
|
71
|
+
# * <tt>Accepts:</tt> Boolean
|
72
|
+
def check_passwords_against_database(value = nil)
|
73
|
+
rw_config(:check_passwords_against_database, value, true)
|
74
|
+
end
|
75
|
+
alias_method :check_passwords_against_database=, :check_passwords_against_database
|
76
|
+
|
77
|
+
# Whether or not to validate the password field.
|
78
|
+
#
|
79
|
+
# * <tt>Default:</tt> true
|
80
|
+
# * <tt>Accepts:</tt> Boolean
|
81
|
+
def validate_password_field(value = nil)
|
82
|
+
rw_config(:validate_password_field, value, true)
|
83
|
+
end
|
84
|
+
alias_method :validate_password_field=, :validate_password_field
|
85
|
+
|
86
|
+
# A hash of options for the validates_length_of call for the password field. Allows you to change this however you want.
|
87
|
+
#
|
88
|
+
# <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
|
89
|
+
# merge options into it. Checkout the convenience function merge_validates_length_of_password_field_options to merge
|
90
|
+
# options.</b>
|
91
|
+
#
|
92
|
+
# * <tt>Default:</tt> {:minimum => 4, :if => :require_password?}
|
93
|
+
# * <tt>Accepts:</tt> Hash of options accepted by validates_length_of
|
94
|
+
def validates_length_of_password_field_options(value = nil)
|
95
|
+
rw_config(:validates_length_of_password_field_options, value, {:minimum => 4, :if => :require_password?})
|
96
|
+
end
|
97
|
+
alias_method :validates_length_of_password_field_options=, :validates_length_of_password_field_options
|
98
|
+
|
99
|
+
# A convenience function to merge options into the validates_length_of_login_field_options. So intead of:
|
100
|
+
#
|
101
|
+
# self.validates_length_of_password_field_options = validates_length_of_password_field_options.merge(:my_option => my_value)
|
102
|
+
#
|
103
|
+
# You can do this:
|
104
|
+
#
|
105
|
+
# merge_validates_length_of_password_field_options :my_option => my_value
|
106
|
+
def merge_validates_length_of_password_field_options(options = {})
|
107
|
+
self.validates_length_of_password_field_options = validates_length_of_password_field_options.merge(options)
|
108
|
+
end
|
109
|
+
|
110
|
+
# A hash of options for the validates_confirmation_of call for the password field. Allows you to change this however you want.
|
111
|
+
#
|
112
|
+
# <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
|
113
|
+
# merge options into it. Checkout the convenience function merge_validates_length_of_password_field_options to merge
|
114
|
+
# options.</b>
|
115
|
+
#
|
116
|
+
# * <tt>Default:</tt> {:if => :require_password?}
|
117
|
+
# * <tt>Accepts:</tt> Hash of options accepted by validates_confirmation_of
|
118
|
+
def validates_confirmation_of_password_field_options(value = nil)
|
119
|
+
rw_config(:validates_confirmation_of_password_field_options, value, {:if => :require_password?})
|
120
|
+
end
|
121
|
+
alias_method :validates_confirmation_of_password_field_options=, :validates_confirmation_of_password_field_options
|
122
|
+
|
123
|
+
# See merge_validates_length_of_password_field_options. The same thing, except for validates_confirmation_of_password_field_options
|
124
|
+
def merge_validates_confirmation_of_password_field_options(options = {})
|
125
|
+
self.validates_confirmation_of_password_field_options = validates_confirmation_of_password_field_options.merge(options)
|
126
|
+
end
|
127
|
+
|
128
|
+
# A hash of options for the validates_length_of call for the password_confirmation field. Allows you to change this however you want.
|
129
|
+
#
|
130
|
+
# <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
|
131
|
+
# merge options into it. Checkout the convenience function merge_validates_length_of_password_field_options to merge
|
132
|
+
# options.</b>
|
133
|
+
#
|
134
|
+
# * <tt>Default:</tt> validates_length_of_password_field_options
|
135
|
+
# * <tt>Accepts:</tt> Hash of options accepted by validates_length_of
|
136
|
+
def validates_length_of_password_confirmation_field_options(value = nil)
|
137
|
+
rw_config(:validates_length_of_password_confirmation_field_options, value, validates_length_of_password_field_options)
|
138
|
+
end
|
139
|
+
alias_method :validates_length_of_password_confirmation_field_options=, :validates_length_of_password_confirmation_field_options
|
140
|
+
|
141
|
+
# See merge_validates_length_of_password_field_options. The same thing, except for validates_length_of_password_confirmation_field_options
|
142
|
+
def merge_validates_length_of_password_confirmation_field_options(options = {})
|
143
|
+
self.validates_length_of_password_confirmation_field_options = validates_length_of_password_confirmation_field_options.merge(options)
|
144
|
+
end
|
145
|
+
|
146
|
+
# The class you want to use to encrypt and verify your encrypted passwords. See the Authlogic::CryptoProviders module for more info
|
147
|
+
# on the available methods and how to create your own.
|
148
|
+
#
|
149
|
+
# * <tt>Default:</tt> CryptoProviders::Sha512
|
150
|
+
# * <tt>Accepts:</tt> Class
|
151
|
+
def crypto_provider(value = nil)
|
152
|
+
rw_config(:crypto_provider, value, CryptoProviders::Sha512)
|
153
|
+
end
|
154
|
+
alias_method :crypto_provider=, :crypto_provider
|
155
|
+
|
156
|
+
# Let's say you originally encrypted your passwords with Sha1. Sha1 is starting to join the party with MD5 and you want to switch
|
157
|
+
# to something stronger. No problem, just specify your new and improved algorithm with the crypt_provider option and then let
|
158
|
+
# Authlogic know you are transitioning from Sha1 using this option. Authlogic will take care of everything, including transitioning
|
159
|
+
# your users to the new algorithm. The next time a user logs in, they will be granted access using the old algorithm and their
|
160
|
+
# password will be resaved with the new algorithm. All new users will obviously use the new algorithm as well.
|
161
|
+
#
|
162
|
+
# Lastly, if you want to transition again, you can pass an array of crypto providers. So you can transition from as many algorithms
|
163
|
+
# as you want.
|
164
|
+
#
|
165
|
+
# * <tt>Default:</tt> nil
|
166
|
+
# * <tt>Accepts:</tt> Class or Array
|
167
|
+
def transition_from_crypto_providers(value = nil)
|
168
|
+
rw_config(:transition_from_crypto_providers, (!value.nil? && [value].flatten.compact) || value, [])
|
169
|
+
end
|
170
|
+
alias_method :transition_from_crypto_providers=, :transition_from_crypto_providers
|
171
|
+
end
|
172
|
+
|
173
|
+
# Callbacks / hooks to allow other modules to modify the behavior of this module.
|
174
|
+
module Callbacks
|
175
|
+
METHODS = [
|
176
|
+
"before_password_set", "after_password_set",
|
177
|
+
"before_password_verification", "after_password_verification"
|
178
|
+
]
|
179
|
+
|
180
|
+
def self.included(klass)
|
181
|
+
return if klass.crypted_password_field.nil?
|
182
|
+
klass.define_callbacks *METHODS
|
183
|
+
|
184
|
+
# If Rails 3, support the new callback syntax
|
185
|
+
if klass.metaclass.method_defined?(:set_callback)
|
186
|
+
METHODS.each do |method|
|
187
|
+
klass.class_eval <<-"end_eval", __FILE__, __LINE__
|
188
|
+
def self.#{method}(*methods, &block)
|
189
|
+
set_callback :#{method}, *methods, &block
|
190
|
+
end
|
191
|
+
end_eval
|
192
|
+
end
|
193
|
+
end
|
194
|
+
end
|
195
|
+
|
196
|
+
private
|
197
|
+
METHODS.each do |method|
|
198
|
+
class_eval <<-"end_eval", __FILE__, __LINE__
|
199
|
+
def #{method}
|
200
|
+
run_callbacks(:#{method}) { |result, object| result == false }
|
201
|
+
end
|
202
|
+
end_eval
|
203
|
+
end
|
204
|
+
end
|
205
|
+
|
206
|
+
# The methods related to the password field.
|
207
|
+
module Methods
|
208
|
+
def self.included(klass)
|
209
|
+
return if klass.crypted_password_field.nil?
|
210
|
+
|
211
|
+
klass.class_eval do
|
212
|
+
include InstanceMethods
|
213
|
+
|
214
|
+
if validate_password_field
|
215
|
+
validates_length_of :password, validates_length_of_password_field_options
|
216
|
+
|
217
|
+
if require_password_confirmation
|
218
|
+
validates_confirmation_of :password, validates_confirmation_of_password_field_options
|
219
|
+
validates_length_of :password_confirmation, validates_length_of_password_confirmation_field_options
|
220
|
+
end
|
221
|
+
end
|
222
|
+
|
223
|
+
after_save :reset_password_changed
|
224
|
+
end
|
225
|
+
end
|
226
|
+
|
227
|
+
module InstanceMethods
|
228
|
+
# The password
|
229
|
+
def password
|
230
|
+
@password
|
231
|
+
end
|
232
|
+
|
233
|
+
# This is a virtual method. Once a password is passed to it, it will create new password salt as well as encrypt
|
234
|
+
# the password.
|
235
|
+
def password=(pass)
|
236
|
+
return if ignore_blank_passwords? && pass.blank?
|
237
|
+
before_password_set
|
238
|
+
@password = pass
|
239
|
+
send("#{password_salt_field}=", Authlogic::Random.friendly_token) if password_salt_field
|
240
|
+
send("#{crypted_password_field}=", crypto_provider.encrypt(*encrypt_arguments(@password, false, act_like_restful_authentication? ? :restful_authentication : nil)))
|
241
|
+
@password_changed = true
|
242
|
+
after_password_set
|
243
|
+
end
|
244
|
+
|
245
|
+
# Accepts a raw password to determine if it is the correct password or not. Notice the second argument. That defaults to the value of
|
246
|
+
# check_passwords_against_database. See that method for mor information, but basically it just tells Authlogic to check the password
|
247
|
+
# against the value in the database or the value in the object.
|
248
|
+
def valid_password?(attempted_password, check_against_database = check_passwords_against_database?)
|
249
|
+
crypted = check_against_database && send("#{crypted_password_field}_changed?") ? send("#{crypted_password_field}_was") : send(crypted_password_field)
|
250
|
+
return false if attempted_password.blank? || crypted.blank?
|
251
|
+
before_password_verification
|
252
|
+
|
253
|
+
crypto_providers.each_with_index do |encryptor, index|
|
254
|
+
# The arguments_type of for the transitioning from restful_authentication
|
255
|
+
arguments_type = (act_like_restful_authentication? && index == 0) ||
|
256
|
+
(transition_from_restful_authentication? && index > 0 && encryptor == Authlogic::CryptoProviders::Sha1) ?
|
257
|
+
:restful_authentication : nil
|
258
|
+
|
259
|
+
if encryptor.matches?(crypted, *encrypt_arguments(attempted_password, check_against_database, arguments_type))
|
260
|
+
transition_password(attempted_password) if transition_password?(index, encryptor, crypted, check_against_database)
|
261
|
+
after_password_verification
|
262
|
+
return true
|
263
|
+
end
|
264
|
+
end
|
265
|
+
|
266
|
+
false
|
267
|
+
end
|
268
|
+
|
269
|
+
# Resets the password to a random friendly token.
|
270
|
+
def reset_password
|
271
|
+
friendly_token = Authlogic::Random.friendly_token
|
272
|
+
self.password = friendly_token
|
273
|
+
self.password_confirmation = friendly_token
|
274
|
+
end
|
275
|
+
alias_method :randomize_password, :reset_password
|
276
|
+
|
277
|
+
# Resets the password to a random friendly token and then saves the record.
|
278
|
+
def reset_password!
|
279
|
+
reset_password
|
280
|
+
save_without_session_maintenance(false)
|
281
|
+
end
|
282
|
+
alias_method :randomize_password!, :reset_password!
|
283
|
+
|
284
|
+
private
|
285
|
+
def check_passwords_against_database?
|
286
|
+
self.class.check_passwords_against_database == true
|
287
|
+
end
|
288
|
+
|
289
|
+
def crypto_providers
|
290
|
+
[crypto_provider] + transition_from_crypto_providers
|
291
|
+
end
|
292
|
+
|
293
|
+
def encrypt_arguments(raw_password, check_against_database, arguments_type = nil)
|
294
|
+
salt = nil
|
295
|
+
salt = (check_against_database && send("#{password_salt_field}_changed?") ? send("#{password_salt_field}_was") : send(password_salt_field)) if password_salt_field
|
296
|
+
|
297
|
+
case arguments_type
|
298
|
+
when :restful_authentication
|
299
|
+
[REST_AUTH_SITE_KEY, salt, raw_password, REST_AUTH_SITE_KEY].compact
|
300
|
+
else
|
301
|
+
[raw_password, salt].compact
|
302
|
+
end
|
303
|
+
end
|
304
|
+
|
305
|
+
# Determines if we need to tranisiton the password.
|
306
|
+
# If the index > 0 then we are using an "transition from" crypto provider.
|
307
|
+
# If the encryptor has a cost and the cost it outdated.
|
308
|
+
# If we aren't using database values
|
309
|
+
# If we are using database values, only if the password hasnt change so we don't overwrite any changes
|
310
|
+
def transition_password?(index, encryptor, crypted, check_against_database)
|
311
|
+
(index > 0 || (encryptor.respond_to?(:cost_matches?) && !encryptor.cost_matches?(send(crypted_password_field)))) &&
|
312
|
+
(!check_against_database || !send("#{crypted_password_field}_changed?"))
|
313
|
+
end
|
314
|
+
|
315
|
+
def transition_password(attempted_password)
|
316
|
+
self.password = attempted_password
|
317
|
+
save(false)
|
318
|
+
end
|
319
|
+
|
320
|
+
def require_password?
|
321
|
+
new_record? || password_changed? || send(crypted_password_field).blank?
|
322
|
+
end
|
323
|
+
|
324
|
+
def ignore_blank_passwords?
|
325
|
+
self.class.ignore_blank_passwords == true
|
326
|
+
end
|
327
|
+
|
328
|
+
def password_changed?
|
329
|
+
@password_changed == true
|
330
|
+
end
|
331
|
+
|
332
|
+
def reset_password_changed
|
333
|
+
@password_changed = nil
|
334
|
+
end
|
335
|
+
|
336
|
+
def crypted_password_field
|
337
|
+
self.class.crypted_password_field
|
338
|
+
end
|
339
|
+
|
340
|
+
def password_salt_field
|
341
|
+
self.class.password_salt_field
|
342
|
+
end
|
343
|
+
|
344
|
+
def crypto_provider
|
345
|
+
self.class.crypto_provider
|
346
|
+
end
|
347
|
+
|
348
|
+
def transition_from_crypto_providers
|
349
|
+
self.class.transition_from_crypto_providers
|
350
|
+
end
|
351
|
+
end
|
352
|
+
end
|
353
|
+
end
|
354
|
+
end
|
355
|
+
end
|
@@ -0,0 +1,105 @@
|
|
1
|
+
module Authlogic
|
2
|
+
module ActsAsAuthentic
|
3
|
+
# This provides a handy token that is "perishable". Meaning the token is only good for a certain amount of time. This is perfect for
|
4
|
+
# resetting password, confirming accounts, etc. Typically during these actions you send them this token in via their email. Once they
|
5
|
+
# use the token and do what they need to do, that token should expire. Don't worry about maintaining this, changing it, or expiring it
|
6
|
+
# yourself. Authlogic does all of this for you. See the sub modules for all of the tools Authlogic provides to you.
|
7
|
+
module PerishableToken
|
8
|
+
def self.included(klass)
|
9
|
+
klass.class_eval do
|
10
|
+
extend Config
|
11
|
+
add_acts_as_authentic_module(Methods)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
# Change how the perishable token works.
|
16
|
+
module Config
|
17
|
+
# When using the find_using_perishable_token method the token can expire. If the token is expired, no
|
18
|
+
# record will be returned. Use this option to specify how long the token is valid for.
|
19
|
+
#
|
20
|
+
# * <tt>Default:</tt> 10.minutes
|
21
|
+
# * <tt>Accepts:</tt> Fixnum
|
22
|
+
def perishable_token_valid_for(value = nil)
|
23
|
+
rw_config(:perishable_token_valid_for, (!value.nil? && value.to_i) || value, 10.minutes.to_i)
|
24
|
+
end
|
25
|
+
alias_method :perishable_token_valid_for=, :perishable_token_valid_for
|
26
|
+
|
27
|
+
# Authlogic tries to expire and change the perishable token as much as possible, without comprising
|
28
|
+
# it's purpose. This is for security reasons. If you want to manage it yourself, you can stop
|
29
|
+
# Authlogic from getting your in way by setting this to true.
|
30
|
+
#
|
31
|
+
# * <tt>Default:</tt> false
|
32
|
+
# * <tt>Accepts:</tt> Boolean
|
33
|
+
def disable_perishable_token_maintenance(value = nil)
|
34
|
+
rw_config(:disable_perishable_token_maintenance, value, false)
|
35
|
+
end
|
36
|
+
alias_method :disable_perishable_token_maintenance=, :disable_perishable_token_maintenance
|
37
|
+
end
|
38
|
+
|
39
|
+
# All methods relating to the perishable token.
|
40
|
+
module Methods
|
41
|
+
def self.included(klass)
|
42
|
+
return if !klass.column_names.include?("perishable_token")
|
43
|
+
|
44
|
+
klass.class_eval do
|
45
|
+
extend ClassMethods
|
46
|
+
include InstanceMethods
|
47
|
+
|
48
|
+
validates_uniqueness_of :perishable_token, :if => :perishable_token_changed?
|
49
|
+
before_save :reset_perishable_token, :unless => :disable_perishable_token_maintenance?
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
# Class level methods for the perishable token
|
54
|
+
module ClassMethods
|
55
|
+
# Use this methdo to find a record with a perishable token. This method does 2 things for you:
|
56
|
+
#
|
57
|
+
# 1. It ignores blank tokens
|
58
|
+
# 2. It enforces the perishable_token_valid_for configuration option.
|
59
|
+
#
|
60
|
+
# If you want to use a different timeout value, just pass it as the second parameter:
|
61
|
+
#
|
62
|
+
# User.find_using_perishable_token(token, 1.hour)
|
63
|
+
def find_using_perishable_token(token, age = self.perishable_token_valid_for)
|
64
|
+
return if token.blank?
|
65
|
+
age = age.to_i
|
66
|
+
|
67
|
+
conditions_sql = "perishable_token = ?"
|
68
|
+
conditions_subs = [token]
|
69
|
+
|
70
|
+
if column_names.include?("updated_at") && age > 0
|
71
|
+
conditions_sql += " and updated_at > ?"
|
72
|
+
conditions_subs << age.seconds.ago
|
73
|
+
end
|
74
|
+
|
75
|
+
find(:first, :conditions => [conditions_sql, *conditions_subs])
|
76
|
+
end
|
77
|
+
|
78
|
+
# This method will raise ActiveRecord::NotFound if no record is found.
|
79
|
+
def find_using_perishable_token!(token, age = perishable_token_valid_for)
|
80
|
+
find_using_perishable_token(token, age) || raise(ActiveRecord::RecordNotFound)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
# Instance level methods for the perishable token.
|
85
|
+
module InstanceMethods
|
86
|
+
# Resets the perishable token to a random friendly token.
|
87
|
+
def reset_perishable_token
|
88
|
+
self.perishable_token = Random.friendly_token
|
89
|
+
end
|
90
|
+
|
91
|
+
# Same as reset_perishable_token, but then saves the record afterwards.
|
92
|
+
def reset_perishable_token!
|
93
|
+
reset_perishable_token
|
94
|
+
save_without_session_maintenance(false)
|
95
|
+
end
|
96
|
+
|
97
|
+
# A convenience method based on the disable_perishable_token_maintenance configuration option.
|
98
|
+
def disable_perishable_token_maintenance?
|
99
|
+
self.class.disable_perishable_token_maintenance == true
|
100
|
+
end
|
101
|
+
end
|
102
|
+
end
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|