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.
Files changed (385) hide show
  1. data/.gems +0 -8
  2. data/.gitignore +3 -1
  3. data/Rakefile +1 -5
  4. data/VERSION +1 -1
  5. data/bin/refinery-update-core +11 -2
  6. data/config/application.rb +6 -1
  7. data/config/environments/development.rb +10 -6
  8. data/config/settings.rb +3 -0
  9. data/db/migrate/20100305023036_change_users_columns_for_authlogic.rb +46 -0
  10. data/db/migrate/20100305023037_remove_unused_users_columns.rb +16 -0
  11. data/db/migrate/20100312155331_make_user_perishable_token_nullable.rb +13 -0
  12. data/db/migrate/20100312160327_make_user_persistence_token_nullable.rb +13 -0
  13. data/db/migrate/20100315203301_remove_state_from_users.rb +9 -0
  14. data/db/schema.rb +8 -21
  15. data/db/seeds.rb +5 -19
  16. data/lib/refinery/tasks/refinery.rb +1 -1
  17. data/public/javascripts/admin.js +6 -2
  18. data/public/javascripts/jquery-ui-1.8.min.js +374 -0
  19. data/public/javascripts/jquery.js +606 -444
  20. data/public/javascripts/refinery/admin.js +30 -9
  21. data/public/javascripts/refinery/boot_wym.js +4 -0
  22. data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +3 -4
  23. data/public/stylesheets/refinery/refinery.css +11 -0
  24. data/public/stylesheets/wymeditor/skins/refinery/skin.css +3 -1
  25. data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +5 -5
  26. data/readme.md +13 -10
  27. data/test/fixtures/users.yml +5 -5
  28. data/test/functional/dashboard_controller_test.rb +0 -4
  29. data/test/functional/images_controller_test.rb +0 -3
  30. data/test/test_helper.rb +7 -3
  31. data/themes/hemingway/views/layouts/application.html.erb +1 -12
  32. data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +1 -3
  33. data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +3 -14
  34. data/vendor/plugins/authentication/app/controllers/users_controller.rb +26 -37
  35. data/vendor/plugins/authentication/app/models/user.rb +29 -112
  36. data/vendor/plugins/authentication/app/models/user_mailer.rb +8 -5
  37. data/vendor/plugins/authentication/app/models/user_session.rb +9 -0
  38. data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
  39. data/vendor/plugins/authentication/app/views/sessions/new.html.erb +5 -4
  40. data/vendor/plugins/authentication/lib/authenticated_system.rb +40 -30
  41. data/vendor/plugins/authentication/rails/init.rb +9 -0
  42. data/vendor/plugins/authlogic/CHANGELOG.rdoc +345 -0
  43. data/vendor/plugins/authlogic/LICENSE +20 -0
  44. data/vendor/plugins/authlogic/README.rdoc +246 -0
  45. data/vendor/plugins/authlogic/Rakefile +42 -0
  46. data/vendor/plugins/authlogic/VERSION.yml +5 -0
  47. data/vendor/plugins/authlogic/authlogic.gemspec +217 -0
  48. data/vendor/plugins/authlogic/generators/session/session_generator.rb +9 -0
  49. data/vendor/plugins/authlogic/generators/session/templates/session.rb +2 -0
  50. data/vendor/plugins/authlogic/init.rb +1 -0
  51. data/vendor/plugins/authlogic/lib/authlogic.rb +64 -0
  52. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb +107 -0
  53. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb +110 -0
  54. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb +60 -0
  55. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb +141 -0
  56. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb +24 -0
  57. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb +355 -0
  58. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb +105 -0
  59. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb +68 -0
  60. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb +61 -0
  61. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb +139 -0
  62. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb +65 -0
  63. data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb +32 -0
  64. data/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb +42 -0
  65. data/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb +55 -0
  66. data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb +67 -0
  67. data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb +30 -0
  68. data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb +48 -0
  69. data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/sinatra_adapter.rb +61 -0
  70. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb +43 -0
  71. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb +90 -0
  72. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb +34 -0
  73. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb +35 -0
  74. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha256.rb +50 -0
  75. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb +50 -0
  76. data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/wordpress.rb +43 -0
  77. data/vendor/plugins/authlogic/lib/authlogic/i18n.rb +83 -0
  78. data/vendor/plugins/authlogic/lib/authlogic/i18n/translator.rb +15 -0
  79. data/vendor/plugins/authlogic/lib/authlogic/random.rb +33 -0
  80. data/vendor/plugins/authlogic/lib/authlogic/regex.rb +25 -0
  81. data/vendor/plugins/authlogic/lib/authlogic/session/activation.rb +58 -0
  82. data/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb +64 -0
  83. data/vendor/plugins/authlogic/lib/authlogic/session/base.rb +37 -0
  84. data/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb +96 -0
  85. data/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb +99 -0
  86. data/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb +130 -0
  87. data/vendor/plugins/authlogic/lib/authlogic/session/existence.rb +93 -0
  88. data/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb +63 -0
  89. data/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb +58 -0
  90. data/vendor/plugins/authlogic/lib/authlogic/session/id.rb +41 -0
  91. data/vendor/plugins/authlogic/lib/authlogic/session/klass.rb +78 -0
  92. data/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb +95 -0
  93. data/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb +59 -0
  94. data/vendor/plugins/authlogic/lib/authlogic/session/params.rb +101 -0
  95. data/vendor/plugins/authlogic/lib/authlogic/session/password.rb +240 -0
  96. data/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb +18 -0
  97. data/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb +70 -0
  98. data/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb +34 -0
  99. data/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb +101 -0
  100. data/vendor/plugins/authlogic/lib/authlogic/session/session.rb +62 -0
  101. data/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb +82 -0
  102. data/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb +50 -0
  103. data/vendor/plugins/authlogic/lib/authlogic/session/validation.rb +82 -0
  104. data/vendor/plugins/authlogic/lib/authlogic/test_case.rb +120 -0
  105. data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb +45 -0
  106. data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb +14 -0
  107. data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_logger.rb +10 -0
  108. data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_request.rb +19 -0
  109. data/vendor/plugins/authlogic/lib/authlogic/test_case/rails_request_adapter.rb +30 -0
  110. data/vendor/plugins/authlogic/rails/init.rb +1 -0
  111. data/vendor/plugins/authlogic/shoulda_macros/authlogic.rb +69 -0
  112. data/vendor/plugins/authlogic/test/acts_as_authentic_test/base_test.rb +18 -0
  113. data/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb +97 -0
  114. data/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb +36 -0
  115. data/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb +109 -0
  116. data/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb +27 -0
  117. data/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb +236 -0
  118. data/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb +90 -0
  119. data/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb +55 -0
  120. data/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb +40 -0
  121. data/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb +84 -0
  122. data/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb +44 -0
  123. data/vendor/plugins/authlogic/test/authenticates_many_test.rb +16 -0
  124. data/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb +14 -0
  125. data/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb +14 -0
  126. data/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb +23 -0
  127. data/vendor/plugins/authlogic/test/crypto_provider_test/sha256_test.rb +14 -0
  128. data/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb +14 -0
  129. data/vendor/plugins/authlogic/test/fixtures/companies.yml +5 -0
  130. data/vendor/plugins/authlogic/test/fixtures/employees.yml +17 -0
  131. data/vendor/plugins/authlogic/test/fixtures/projects.yml +3 -0
  132. data/vendor/plugins/authlogic/test/fixtures/users.yml +24 -0
  133. data/vendor/plugins/authlogic/test/i18n_test.rb +33 -0
  134. data/vendor/plugins/authlogic/test/libs/affiliate.rb +7 -0
  135. data/vendor/plugins/authlogic/test/libs/company.rb +6 -0
  136. data/vendor/plugins/authlogic/test/libs/employee.rb +7 -0
  137. data/vendor/plugins/authlogic/test/libs/employee_session.rb +2 -0
  138. data/vendor/plugins/authlogic/test/libs/ldaper.rb +3 -0
  139. data/vendor/plugins/authlogic/test/libs/ordered_hash.rb +9 -0
  140. data/vendor/plugins/authlogic/test/libs/project.rb +3 -0
  141. data/vendor/plugins/authlogic/test/libs/user.rb +5 -0
  142. data/vendor/plugins/authlogic/test/libs/user_session.rb +6 -0
  143. data/vendor/plugins/authlogic/test/random_test.rb +49 -0
  144. data/vendor/plugins/authlogic/test/session_test/activation_test.rb +43 -0
  145. data/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb +36 -0
  146. data/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb +101 -0
  147. data/vendor/plugins/authlogic/test/session_test/callbacks_test.rb +6 -0
  148. data/vendor/plugins/authlogic/test/session_test/cookies_test.rb +112 -0
  149. data/vendor/plugins/authlogic/test/session_test/credentials_test.rb +0 -0
  150. data/vendor/plugins/authlogic/test/session_test/existence_test.rb +64 -0
  151. data/vendor/plugins/authlogic/test/session_test/http_auth_test.rb +28 -0
  152. data/vendor/plugins/authlogic/test/session_test/id_test.rb +17 -0
  153. data/vendor/plugins/authlogic/test/session_test/klass_test.rb +40 -0
  154. data/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb +62 -0
  155. data/vendor/plugins/authlogic/test/session_test/magic_states_test.rb +60 -0
  156. data/vendor/plugins/authlogic/test/session_test/params_test.rb +53 -0
  157. data/vendor/plugins/authlogic/test/session_test/password_test.rb +106 -0
  158. data/vendor/plugins/authlogic/test/session_test/perishability_test.rb +15 -0
  159. data/vendor/plugins/authlogic/test/session_test/persistence_test.rb +21 -0
  160. data/vendor/plugins/authlogic/test/session_test/scopes_test.rb +60 -0
  161. data/vendor/plugins/authlogic/test/session_test/session_test.rb +59 -0
  162. data/vendor/plugins/authlogic/test/session_test/timeout_test.rb +52 -0
  163. data/vendor/plugins/authlogic/test/session_test/unauthorized_record_test.rb +13 -0
  164. data/vendor/plugins/authlogic/test/session_test/validation_test.rb +23 -0
  165. data/vendor/plugins/authlogic/test/test_helper.rb +182 -0
  166. data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
  167. data/vendor/plugins/friendly_id/Changelog.md +243 -0
  168. data/vendor/plugins/friendly_id/Contributors.md +30 -0
  169. data/vendor/plugins/friendly_id/Gemfile +2 -0
  170. data/vendor/plugins/friendly_id/Guide.md +509 -0
  171. data/vendor/plugins/friendly_id/LICENSE +19 -0
  172. data/vendor/plugins/friendly_id/README.md +76 -0
  173. data/vendor/plugins/friendly_id/Rakefile +68 -0
  174. data/vendor/plugins/friendly_id/extras/README.txt +3 -0
  175. data/vendor/plugins/friendly_id/extras/bench.rb +59 -0
  176. data/vendor/plugins/friendly_id/extras/extras.rb +31 -0
  177. data/vendor/plugins/friendly_id/extras/prof.rb +14 -0
  178. data/vendor/plugins/friendly_id/extras/template-gem.rb +26 -0
  179. data/vendor/plugins/friendly_id/extras/template-plugin.rb +28 -0
  180. data/vendor/plugins/friendly_id/friendly_id.gemspec +40 -0
  181. data/vendor/plugins/friendly_id/generators/friendly_id/friendly_id_generator.rb +28 -0
  182. data/vendor/plugins/friendly_id/generators/friendly_id/templates/create_slugs.rb +18 -0
  183. data/vendor/plugins/friendly_id/lib/friendly_id.rb +67 -0
  184. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2.rb +47 -0
  185. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/configuration.rb +66 -0
  186. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/finders.rb +140 -0
  187. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/simple_model.rb +162 -0
  188. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/slug.rb +111 -0
  189. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/slugged_model.rb +323 -0
  190. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/tasks.rb +66 -0
  191. data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/tasks/friendly_id.rake +19 -0
  192. data/vendor/plugins/friendly_id/lib/friendly_id/configuration.rb +132 -0
  193. data/vendor/plugins/friendly_id/lib/friendly_id/finders.rb +106 -0
  194. data/vendor/plugins/friendly_id/lib/friendly_id/slug_string.rb +292 -0
  195. data/vendor/plugins/friendly_id/lib/friendly_id/slugged.rb +91 -0
  196. data/vendor/plugins/friendly_id/lib/friendly_id/status.rb +35 -0
  197. data/vendor/plugins/friendly_id/lib/friendly_id/test.rb +175 -0
  198. data/vendor/plugins/friendly_id/lib/friendly_id/version.rb +8 -0
  199. data/vendor/plugins/friendly_id/rails/init.rb +2 -0
  200. data/vendor/plugins/friendly_id/test/active_record2/basic_slugged_model_test.rb +14 -0
  201. data/vendor/plugins/friendly_id/test/active_record2/cached_slug_test.rb +61 -0
  202. data/vendor/plugins/friendly_id/test/active_record2/core.rb +93 -0
  203. data/vendor/plugins/friendly_id/test/active_record2/custom_normalizer_test.rb +20 -0
  204. data/vendor/plugins/friendly_id/test/active_record2/custom_table_name_test.rb +22 -0
  205. data/vendor/plugins/friendly_id/test/active_record2/deprecated_test.rb +23 -0
  206. data/vendor/plugins/friendly_id/test/active_record2/scoped_model_test.rb +111 -0
  207. data/vendor/plugins/friendly_id/test/active_record2/simple_test.rb +59 -0
  208. data/vendor/plugins/friendly_id/test/active_record2/slug_test.rb +34 -0
  209. data/vendor/plugins/friendly_id/test/active_record2/slugged.rb +30 -0
  210. data/vendor/plugins/friendly_id/test/active_record2/slugged_status_test.rb +61 -0
  211. data/vendor/plugins/friendly_id/test/active_record2/sti_test.rb +22 -0
  212. data/vendor/plugins/friendly_id/test/active_record2/support/database.mysql.yml +4 -0
  213. data/vendor/plugins/friendly_id/test/active_record2/support/database.postgres.yml +6 -0
  214. data/vendor/plugins/friendly_id/test/active_record2/support/database.sqlite3.yml +2 -0
  215. data/vendor/plugins/friendly_id/test/active_record2/support/models.rb +78 -0
  216. data/vendor/plugins/friendly_id/test/active_record2/tasks_test.rb +82 -0
  217. data/vendor/plugins/friendly_id/test/active_record2/test_helper.rb +114 -0
  218. data/vendor/plugins/friendly_id/test/friendly_id_test.rb +60 -0
  219. data/vendor/plugins/friendly_id/test/slug_string_test.rb +78 -0
  220. data/vendor/plugins/friendly_id/test/test_helper.rb +9 -0
  221. data/vendor/plugins/hpricot/CHANGELOG +88 -0
  222. data/vendor/plugins/hpricot/COPYING +18 -0
  223. data/vendor/plugins/hpricot/README +275 -0
  224. data/vendor/plugins/hpricot/Rakefile +272 -0
  225. data/vendor/plugins/hpricot/ext/fast_xs/FastXsService.java +1030 -0
  226. data/vendor/plugins/hpricot/ext/fast_xs/extconf.rb +4 -0
  227. data/vendor/plugins/hpricot/ext/fast_xs/fast_xs.c +201 -0
  228. data/vendor/plugins/hpricot/ext/hpricot_scan/HpricotCss.java +831 -0
  229. data/vendor/plugins/hpricot/ext/hpricot_scan/HpricotScanService.java +2086 -0
  230. data/vendor/plugins/hpricot/ext/hpricot_scan/MANIFEST +0 -0
  231. data/vendor/plugins/hpricot/ext/hpricot_scan/extconf.rb +6 -0
  232. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_common.rl +76 -0
  233. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.c +3503 -0
  234. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.java.rl +155 -0
  235. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.rl +115 -0
  236. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.c +6927 -0
  237. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.h +79 -0
  238. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.java.rl +1152 -0
  239. data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.rl +788 -0
  240. data/vendor/plugins/hpricot/extras/mingw-rbconfig.rb +176 -0
  241. data/vendor/plugins/hpricot/hpricot.gemspec +17 -0
  242. data/vendor/plugins/hpricot/lib/hpricot.rb +26 -0
  243. data/vendor/plugins/hpricot/lib/hpricot/blankslate.rb +63 -0
  244. data/vendor/plugins/hpricot/lib/hpricot/builder.rb +216 -0
  245. data/vendor/plugins/hpricot/lib/hpricot/elements.rb +510 -0
  246. data/vendor/plugins/hpricot/lib/hpricot/htmlinfo.rb +691 -0
  247. data/vendor/plugins/hpricot/lib/hpricot/inspect.rb +103 -0
  248. data/vendor/plugins/hpricot/lib/hpricot/modules.rb +40 -0
  249. data/vendor/plugins/hpricot/lib/hpricot/parse.rb +38 -0
  250. data/vendor/plugins/hpricot/lib/hpricot/tag.rb +219 -0
  251. data/vendor/plugins/hpricot/lib/hpricot/tags.rb +164 -0
  252. data/vendor/plugins/hpricot/lib/hpricot/traverse.rb +839 -0
  253. data/vendor/plugins/hpricot/lib/hpricot/xchar.rb +94 -0
  254. data/vendor/plugins/hpricot/setup.rb +1585 -0
  255. data/vendor/plugins/hpricot/test/files/basic.xhtml +17 -0
  256. data/vendor/plugins/hpricot/test/files/boingboing.html +2266 -0
  257. data/vendor/plugins/hpricot/test/files/cy0.html +3653 -0
  258. data/vendor/plugins/hpricot/test/files/immob.html +400 -0
  259. data/vendor/plugins/hpricot/test/files/pace_application.html +1320 -0
  260. data/vendor/plugins/hpricot/test/files/tenderlove.html +16 -0
  261. data/vendor/plugins/hpricot/test/files/uswebgen.html +220 -0
  262. data/vendor/plugins/hpricot/test/files/utf8.html +1054 -0
  263. data/vendor/plugins/hpricot/test/files/week9.html +1723 -0
  264. data/vendor/plugins/hpricot/test/files/why.xml +19 -0
  265. data/vendor/plugins/hpricot/test/load_files.rb +7 -0
  266. data/vendor/plugins/hpricot/test/nokogiri-bench.rb +64 -0
  267. data/vendor/plugins/hpricot/test/test_alter.rb +96 -0
  268. data/vendor/plugins/hpricot/test/test_builder.rb +37 -0
  269. data/vendor/plugins/hpricot/test/test_parser.rb +428 -0
  270. data/vendor/plugins/hpricot/test/test_paths.rb +25 -0
  271. data/vendor/plugins/hpricot/test/test_preserved.rb +88 -0
  272. data/vendor/plugins/hpricot/test/test_xml.rb +28 -0
  273. data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +1 -6
  274. data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +0 -11
  275. data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +10 -6
  276. data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
  277. data/vendor/plugins/inquiries/config/routes.rb +1 -1
  278. data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +16 -3
  279. data/vendor/plugins/pages/app/models/page_part.rb +9 -0
  280. data/vendor/plugins/rails_indexes/lib/indexer.rb +0 -2
  281. data/vendor/plugins/refinery/app/views/admin/_head.html.erb +2 -1
  282. data/vendor/plugins/refinery/app/views/shared/_head.html.erb +0 -1
  283. data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +23 -11
  284. data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
  285. data/vendor/plugins/refinery/app/views/wymiframe.html.erb +2 -1
  286. data/vendor/plugins/refinery/lib/generators/refinery/USAGE +1 -1
  287. data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +2 -2
  288. data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -0
  289. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +6 -0
  290. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +5 -3
  291. data/vendor/plugins/refinery/lib/refinery/application_helper.rb +2 -2
  292. data/vendor/plugins/refinery/lib/refinery/initializer.rb +4 -41
  293. data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +7 -3
  294. data/vendor/plugins/slim_scrooge/README.textile +112 -0
  295. data/vendor/plugins/slim_scrooge/Rakefile +29 -0
  296. data/vendor/plugins/slim_scrooge/VERSION.yml +5 -0
  297. data/vendor/plugins/slim_scrooge/ext/Rakefile +42 -0
  298. data/vendor/plugins/slim_scrooge/ext/extconf.rb +5 -0
  299. data/vendor/plugins/slim_scrooge/lib/slim_scrooge.rb +16 -0
  300. data/vendor/plugins/slim_scrooge/lib/slim_scrooge/callsite.rb +96 -0
  301. data/vendor/plugins/slim_scrooge/lib/slim_scrooge/callsites.rb +70 -0
  302. data/vendor/plugins/slim_scrooge/lib/slim_scrooge/monitored_hash.rb +103 -0
  303. data/vendor/plugins/slim_scrooge/lib/slim_scrooge/result_set.rb +38 -0
  304. data/vendor/plugins/slim_scrooge/lib/slim_scrooge/simple_set.rb +34 -0
  305. data/vendor/plugins/slim_scrooge/lib/slim_scrooge/slim_scrooge.rb +46 -0
  306. data/vendor/plugins/slim_scrooge/rails/init.rb +8 -0
  307. data/vendor/plugins/slim_scrooge/slim_scrooge.gemspec +62 -0
  308. data/vendor/plugins/slim_scrooge/slim_scrooge_windows.gemspec +59 -0
  309. data/vendor/plugins/slim_scrooge/test/active_record_setup.rb +3 -0
  310. data/vendor/plugins/slim_scrooge/test/helper.rb +91 -0
  311. data/vendor/plugins/slim_scrooge/test/models/course.rb +2 -0
  312. data/vendor/plugins/slim_scrooge/test/schema/schema.rb +5 -0
  313. data/vendor/plugins/slim_scrooge/test/setup.rb +5 -0
  314. data/vendor/plugins/themes/app/models/theme.rb +7 -0
  315. data/vendor/plugins/themes/lib/theme_server.rb +3 -1
  316. data/vendor/plugins/themes/rails/init.rb +16 -13
  317. data/vendor/plugins/will_paginate/.manifest +43 -0
  318. data/vendor/plugins/will_paginate/CHANGELOG.rdoc +139 -0
  319. data/vendor/plugins/will_paginate/LICENSE +18 -0
  320. data/vendor/plugins/will_paginate/README.rdoc +107 -0
  321. data/vendor/plugins/will_paginate/Rakefile +53 -0
  322. data/vendor/plugins/will_paginate/examples/apple-circle.gif +0 -0
  323. data/vendor/plugins/will_paginate/examples/index.haml +69 -0
  324. data/vendor/plugins/will_paginate/examples/index.html +92 -0
  325. data/vendor/plugins/will_paginate/examples/pagination.css +90 -0
  326. data/vendor/plugins/will_paginate/examples/pagination.sass +91 -0
  327. data/vendor/plugins/will_paginate/init.rb +1 -0
  328. data/vendor/plugins/will_paginate/lib/will_paginate.rb +90 -0
  329. data/vendor/plugins/will_paginate/lib/will_paginate/array.rb +16 -0
  330. data/vendor/plugins/will_paginate/lib/will_paginate/collection.rb +146 -0
  331. data/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb +43 -0
  332. data/vendor/plugins/will_paginate/lib/will_paginate/finder.rb +264 -0
  333. data/vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb +170 -0
  334. data/vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb +37 -0
  335. data/vendor/plugins/will_paginate/lib/will_paginate/version.rb +9 -0
  336. data/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb +408 -0
  337. data/vendor/plugins/will_paginate/test/boot.rb +21 -0
  338. data/vendor/plugins/will_paginate/test/collection_test.rb +143 -0
  339. data/vendor/plugins/will_paginate/test/console +8 -0
  340. data/vendor/plugins/will_paginate/test/database.yml +22 -0
  341. data/vendor/plugins/will_paginate/test/finder_test.rb +473 -0
  342. data/vendor/plugins/will_paginate/test/fixtures/admin.rb +3 -0
  343. data/vendor/plugins/will_paginate/test/fixtures/developer.rb +14 -0
  344. data/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml +13 -0
  345. data/vendor/plugins/will_paginate/test/fixtures/project.rb +15 -0
  346. data/vendor/plugins/will_paginate/test/fixtures/projects.yml +6 -0
  347. data/vendor/plugins/will_paginate/test/fixtures/replies.yml +29 -0
  348. data/vendor/plugins/will_paginate/test/fixtures/reply.rb +7 -0
  349. data/vendor/plugins/will_paginate/test/fixtures/schema.rb +38 -0
  350. data/vendor/plugins/will_paginate/test/fixtures/topic.rb +10 -0
  351. data/vendor/plugins/will_paginate/test/fixtures/topics.yml +30 -0
  352. data/vendor/plugins/will_paginate/test/fixtures/user.rb +2 -0
  353. data/vendor/plugins/will_paginate/test/fixtures/users.yml +35 -0
  354. data/vendor/plugins/will_paginate/test/helper.rb +37 -0
  355. data/vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb +43 -0
  356. data/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb +75 -0
  357. data/vendor/plugins/will_paginate/test/lib/load_fixtures.rb +11 -0
  358. data/vendor/plugins/will_paginate/test/lib/view_test_process.rb +179 -0
  359. data/vendor/plugins/will_paginate/test/tasks.rake +59 -0
  360. data/vendor/plugins/will_paginate/test/view_test.rb +373 -0
  361. data/vendor/plugins/will_paginate/will_paginate.gemspec +19 -0
  362. metadata +308 -27
  363. data/db/migrate/20091029034951_remove_blurb_from_news_items.rb +0 -9
  364. data/public/javascripts/jquery-ui-1.8rc1.min.js +0 -375
  365. data/test/fixtures/news_items.yml +0 -14
  366. data/test/unit/news_items_test.rb +0 -33
  367. data/vendor/plugins/authentication/test/fixtures/users.yml +0 -19
  368. data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +0 -85
  369. data/vendor/plugins/authentication/test/functional/users_controller_test.rb +0 -99
  370. data/vendor/plugins/authentication/test/unit/user_test.rb +0 -164
  371. data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +0 -5
  372. data/vendor/plugins/news/app/controllers/news_items_controller.rb +0 -20
  373. data/vendor/plugins/news/app/models/news_item.rb +0 -24
  374. data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +0 -19
  375. data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +0 -15
  376. data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +0 -1
  377. data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +0 -31
  378. data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +0 -1
  379. data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +0 -8
  380. data/vendor/plugins/news/app/views/news_items/index.html.erb +0 -17
  381. data/vendor/plugins/news/app/views/news_items/index.rss.builder +0 -26
  382. data/vendor/plugins/news/app/views/news_items/show.html.erb +0 -13
  383. data/vendor/plugins/news/config/routes.rb +0 -7
  384. data/vendor/plugins/news/news.md +0 -20
  385. data/vendor/plugins/news/rails/init.rb +0 -11
@@ -0,0 +1,47 @@
1
+ require File.join(File.dirname(__FILE__), "active_record2", "configuration")
2
+ require File.join(File.dirname(__FILE__), "active_record2", "finders")
3
+ require File.join(File.dirname(__FILE__), "active_record2", "simple_model")
4
+ require File.join(File.dirname(__FILE__), "active_record2", "slugged_model")
5
+ require File.join(File.dirname(__FILE__), "active_record2", "slug")
6
+ require File.join(File.dirname(__FILE__), "active_record2", "tasks")
7
+
8
+ module FriendlyId
9
+
10
+ module ActiveRecord2
11
+
12
+ include FriendlyId::Base
13
+
14
+ def has_friendly_id(method, options = {}, &block)
15
+ class_inheritable_accessor :friendly_id_config
16
+ write_inheritable_attribute :friendly_id_config, Configuration.new(self,
17
+ method, options.merge(:normalizer => block))
18
+ if friendly_id_config.use_slug?
19
+ include SluggedModel
20
+ else
21
+ include SimpleModel
22
+ end
23
+ end
24
+
25
+ private
26
+
27
+ # Prevent the cached_slug column from being accidentally or maliciously
28
+ # overwritten. Note that +attr_protected+ is used to protect the cached_slug
29
+ # column, unless you have already invoked +attr_accessible+. So if you
30
+ # wish to use +attr_accessible+, you must invoke it BEFORE you invoke
31
+ # {#has_friendly_id} in your class.
32
+ def protect_friendly_id_attributes
33
+ # only protect the column if the class is not already using attributes_accessible
34
+ if !accessible_attributes
35
+ if friendly_id_config.custom_cache_column?
36
+ attr_protected friendly_id_config.cache_column
37
+ end
38
+ attr_protected :cached_slug
39
+ end
40
+ end
41
+
42
+ end
43
+ end
44
+
45
+ class ActiveRecord::Base
46
+ extend FriendlyId::ActiveRecord2
47
+ end
@@ -0,0 +1,66 @@
1
+ module FriendlyId
2
+ module ActiveRecord2
3
+
4
+ class Configuration < FriendlyId::Configuration
5
+
6
+ # The column used to cache the friendly_id string. If no column is specified,
7
+ # FriendlyId will look for a column named +cached_slug+ and use it automatically
8
+ # if it exists. If for some reason you have a column named +cached_slug+
9
+ # but don't want FriendlyId to modify it, pass the option
10
+ # +:cache_column => false+ to {FriendlyId::ActiveRecord2#has_friendly_id has_friendly_id}.
11
+ attr_accessor :cache_column
12
+
13
+ # An array of classes for which the configured class serves as a
14
+ # FriendlyId scope.
15
+ attr_reader :child_scopes
16
+
17
+ attr_reader :custom_cache_column
18
+
19
+ def cache_column
20
+ return @cache_column if defined?(@cache_column)
21
+ @cache_column = autodiscover_cache_column
22
+ end
23
+
24
+ def cache_column?
25
+ !! cache_column
26
+ end
27
+
28
+ def cache_column=(cache_column)
29
+ @cache_column = cache_column
30
+ @custom_cache_column = cache_column
31
+ end
32
+
33
+ def cache_finders?
34
+ !! cache_column
35
+ end
36
+
37
+ def child_scopes
38
+ @child_scopes ||= associated_friendly_classes.select { |klass| klass.friendly_id_config.scopes_over?(configured_class) }
39
+ end
40
+
41
+ def custom_cache_column?
42
+ !! custom_cache_column
43
+ end
44
+
45
+ def scope_for(record)
46
+ scope? ? record.send(scope).to_param : nil
47
+ end
48
+
49
+ def scopes_over?(klass)
50
+ scope? && scope == klass.to_s.underscore.to_sym
51
+ end
52
+
53
+ private
54
+
55
+ def autodiscover_cache_column
56
+ :cached_slug if configured_class.columns.any? { |column| column.name == 'cached_slug' }
57
+ end
58
+
59
+ def associated_friendly_classes
60
+ configured_class.reflect_on_all_associations.select { |assoc|
61
+ assoc.klass.uses_friendly_id? }.map(&:klass)
62
+ end
63
+
64
+ end
65
+ end
66
+ end
@@ -0,0 +1,140 @@
1
+ module FriendlyId
2
+
3
+ # The adapter for Ruby on Rails's ActiveRecord. Compatible with AR 2.2.x -
4
+ # 2.3.x.
5
+ module ActiveRecord2
6
+
7
+ # The classes in this module are used internally by FriendlyId, and exist
8
+ # largely to avoid polluting the ActiveRecord models with too many
9
+ # FriendlyId-specific methods.
10
+ module Finders
11
+
12
+ # FinderProxy is used to choose which finder class to instantiate;
13
+ # depending on the model_class's +friendly_id_config+ and the options
14
+ # passed into the constructor, it will decide whether to use simple or
15
+ # slugged finder, a single or multiple finder, and in the case of slugs,
16
+ # a cached or uncached finder.
17
+ class FinderProxy
18
+
19
+ attr_reader :finder
20
+ attr :finder_class
21
+ attr :ids
22
+ attr :model_class
23
+ attr :options
24
+
25
+ def initialize(ids, model_class, options={})
26
+ @ids = ids
27
+ @model_class = model_class
28
+ @options = options
29
+ end
30
+
31
+ def method_missing(symbol, *args)
32
+ finder.send(symbol, *args)
33
+ end
34
+
35
+ # Perform the find query.
36
+ def finder
37
+ @finder ||= finder_class.new(ids, model_class, options)
38
+ end
39
+
40
+ private
41
+
42
+ def finder_class
43
+ @finder_class ||= slugged? ? slugged_finder_class : simple_finder_class
44
+ end
45
+
46
+ private
47
+
48
+ def cache_available?
49
+ !! model_class.friendly_id_config.cache_column
50
+ end
51
+
52
+ def multiple?
53
+ ids.kind_of? Array
54
+ end
55
+
56
+ def multiple_slugged_finder_class
57
+ use_cache? ? SluggedModel::CachedMultipleFinder : SluggedModel::MultipleFinder
58
+ end
59
+
60
+ def simple_finder_class
61
+ multiple? ? SimpleModel::MultipleFinder : SimpleModel::SingleFinder
62
+ end
63
+
64
+ def slugged?
65
+ !! model_class.friendly_id_config.use_slug?
66
+ end
67
+
68
+ def slugged_finder_class
69
+ multiple? ? multiple_slugged_finder_class : single_slugged_finder_class
70
+ end
71
+
72
+ def scoped?
73
+ !! options[:scope]
74
+ end
75
+
76
+ def single_slugged_finder_class
77
+ use_cache? ? SluggedModel::CachedSingleFinder : SluggedModel::SingleFinder
78
+ end
79
+
80
+ def use_cache?
81
+ cache_available? and !scoped?
82
+ end
83
+
84
+ end
85
+
86
+ # Wraps finds for multiple records using an array of friendly_ids.
87
+ # @abstract
88
+ module Multiple
89
+
90
+ attr_reader :friendly_ids, :results, :unfriendly_ids
91
+
92
+ def initialize(ids, model_class, options={})
93
+ @friendly_ids, @unfriendly_ids = ids.partition {|id| FriendlyId::Finders::Base.friendly?(id) }
94
+ @unfriendly_ids = @unfriendly_ids.map {|id| id.class.respond_to?(:friendly_id_config) ? id.id : id}
95
+ super
96
+ end
97
+
98
+ private
99
+
100
+ # An error message to use when the wrong number of results was returned.
101
+ def error_message
102
+ "Couldn't find all %s with IDs (%s) AND %s (found %d results, but was looking for %d)" % [
103
+ model_class.name.pluralize,
104
+ ids.join(', '),
105
+ sanitize_sql(options[:conditions]),
106
+ results.size,
107
+ expected_size
108
+ ]
109
+ end
110
+
111
+ # How many results do we expect?
112
+ def expected_size
113
+ limited? ? limit : offset_size
114
+ end
115
+
116
+ # The limit option passed to the find.
117
+ def limit
118
+ options[:limit]
119
+ end
120
+
121
+ # Is the find limited?
122
+ def limited?
123
+ offset_size > limit if limit
124
+ end
125
+
126
+ # The offset used for the find. If no offset was passed, 0 is returned.
127
+ def offset
128
+ options[:offset].to_i
129
+ end
130
+
131
+ # The number of ids, minus the offset.
132
+ def offset_size
133
+ ids.size - offset
134
+ end
135
+
136
+ end
137
+
138
+ end
139
+ end
140
+ end
@@ -0,0 +1,162 @@
1
+ module FriendlyId
2
+ module ActiveRecord2
3
+
4
+ module SimpleModel
5
+
6
+ # Some basic methods common to {MultipleFinder} and {SingleFinder}.
7
+ module SimpleFinder
8
+
9
+ # The column used to store the friendly_id.
10
+ def column
11
+ "#{table_name}.#{friendly_id_config.column}"
12
+ end
13
+
14
+ # The model's fully-qualified and quoted primary key.
15
+ def primary_key
16
+ "#{quoted_table_name}.#{model_class.send :primary_key}"
17
+ end
18
+
19
+ end
20
+
21
+ class MultipleFinder
22
+
23
+ include FriendlyId::Finders::Base
24
+ include FriendlyId::ActiveRecord2::Finders::Multiple
25
+ include SimpleFinder
26
+
27
+ def find
28
+ @results = with_scope(:find => options) { find_every :conditions => conditions }
29
+ raise(::ActiveRecord::RecordNotFound, error_message) if @results.size != expected_size
30
+ friendly_results.each { |result| result.friendly_id_status.name = result.to_param }
31
+ @results
32
+ end
33
+
34
+ private
35
+
36
+ def conditions
37
+ ["#{primary_key} IN (?) OR #{column} IN (?)", unfriendly_ids, friendly_ids]
38
+ end
39
+
40
+ def friendly_results
41
+ results.select { |result| friendly_ids.include? result.to_param }
42
+ end
43
+
44
+ end
45
+
46
+ class SingleFinder
47
+
48
+ include FriendlyId::Finders::Base
49
+ include FriendlyId::Finders::Single
50
+ include SimpleFinder
51
+
52
+ def find
53
+ result = with_scope(:find => find_options) { find_initial options }
54
+ raise ::ActiveRecord::RecordNotFound.new if friendly? && !result
55
+ result.friendly_id_status.name = id if result
56
+ result
57
+ end
58
+
59
+ private
60
+
61
+ def find_options
62
+ @find_options ||= {:conditions => {column => id}}
63
+ end
64
+
65
+ end
66
+
67
+ # The methods in this module override ActiveRecord's +find_one+ and
68
+ # +find_some+ to add FriendlyId's features.
69
+ module FinderMethods
70
+ protected
71
+
72
+ def find_one(id, options)
73
+ finder = Finders::FinderProxy.new(id, self, options)
74
+ !finder.friendly? ? super : finder.find
75
+ end
76
+
77
+ def find_some(ids_and_names, options)
78
+ Finders::FinderProxy.new(ids_and_names, self, options).find
79
+ end
80
+ end
81
+
82
+ # These methods will be removed in FriendlyId 3.0.
83
+ module DeprecatedMethods
84
+
85
+ # Was the record found using one of its friendly ids?
86
+ # @deprecated Please use #friendly_id_status.friendly?
87
+ def found_using_friendly_id?
88
+ warn("found_using_friendly_id? is deprecated and will be removed in 3.0. Please use #friendly_id_status.friendly?")
89
+ friendly_id_status.friendly?
90
+ end
91
+
92
+ # Was the record found using its numeric id?
93
+ # @deprecated Please use #friendly_id_status.numeric?
94
+ def found_using_numeric_id?
95
+ warn("found_using_numeric_id is deprecated and will be removed in 3.0. Please use #friendly_id_status.numeric?")
96
+ friendly_id_status.numeric?
97
+ end
98
+
99
+ # Was the record found using an old friendly id, or its numeric id?
100
+ # @deprecated Please use !#friendly_id_status.best?
101
+ def has_better_id?
102
+ warn("has_better_id? is deprecated and will be removed in 3.0. Please use !#friendly_id_status.best?")
103
+ ! friendly_id_status.best?
104
+ end
105
+
106
+ end
107
+
108
+ def self.included(base)
109
+ base.class_eval do
110
+ column = friendly_id_config.column
111
+ validate :validate_friendly_id
112
+ validates_presence_of column
113
+ validates_length_of column, :maximum => friendly_id_config.max_length
114
+ after_update :update_scopes
115
+ extend FinderMethods
116
+ include DeprecatedMethods
117
+ end
118
+ end
119
+
120
+ # Get the {FriendlyId::Status} after the find has been performed.
121
+ def friendly_id_status
122
+ @friendly_id_status ||= Status.new :record => self
123
+ end
124
+
125
+ # Returns the friendly_id.
126
+ def friendly_id
127
+ send friendly_id_config.column
128
+ end
129
+ alias best_id friendly_id
130
+
131
+ # Returns the friendly id, or if none is available, the numeric id.
132
+ def to_param
133
+ (friendly_id || id).to_s
134
+ end
135
+
136
+ private
137
+
138
+ # The old and new values for the friendly_id column.
139
+ def friendly_id_changes
140
+ changes[friendly_id_config.column.to_s]
141
+ end
142
+
143
+ # Update the slugs for any model that is using this model as its
144
+ # FriendlyId scope.
145
+ def update_scopes
146
+ if changes = friendly_id_changes
147
+ friendly_id_config.child_scopes.each do |klass|
148
+ Slug.update_all "scope = '#{changes[1]}'", ["sluggable_type = ? AND scope = ?", klass.to_s, changes[0]]
149
+ end
150
+ end
151
+ end
152
+
153
+ def validate_friendly_id
154
+ if result = friendly_id_config.reserved_error_message(friendly_id)
155
+ self.errors.add(*result)
156
+ return false
157
+ end
158
+ end
159
+
160
+ end
161
+ end
162
+ end
@@ -0,0 +1,111 @@
1
+ module FriendlyId
2
+ module ActiveRecord2
3
+
4
+ module DeprecatedSlugMethods
5
+ # @deprecated Please use String#parse_friendly_id
6
+ def parse(string)
7
+ warn("Slug#parse is deprecated and will be removed in FriendlyId 3.0. Please use String#parse_friendly_id.")
8
+ string.to_s.parse_friendly_id
9
+ end
10
+
11
+ # @deprecated Please use SlugString#normalize.
12
+ def normalize(slug_text)
13
+ warn("Slug#normalize is deprecated and will be removed in FriendlyId 3.0. Please use SlugString#normalize.")
14
+ raise BlankError if slug_text.blank?
15
+ SlugString.new(slug_text.to_s).normalize.to_s
16
+ end
17
+
18
+ # @deprecated Please use SlugString#approximate_ascii."
19
+ def strip_diacritics(string)
20
+ warn("Slug#strip_diacritics is deprecated and will be removed in FriendlyId 3.0. Please use SlugString#approximate_ascii.")
21
+ raise BlankError if string.blank?
22
+ SlugString.new(string).approximate_ascii
23
+ end
24
+
25
+ # @deprecated Please use SlugString#to_ascii.
26
+ def strip_non_ascii(string)
27
+ warn("Slug#strip_non_ascii is deprecated and will be removed in FriendlyId 3.0. Please use SlugString#to_ascii.")
28
+ raise BlankError if string.blank?
29
+ SlugString.new(string).to_ascii
30
+ end
31
+
32
+ end
33
+
34
+ end
35
+
36
+ end
37
+
38
+ # A Slug is a unique, human-friendly identifier for an ActiveRecord.
39
+ class Slug < ::ActiveRecord::Base
40
+
41
+ extend FriendlyId::ActiveRecord2::DeprecatedSlugMethods
42
+
43
+ table_name = "slugs"
44
+ belongs_to :sluggable, :polymorphic => true
45
+ before_save :enable_name_reversion, :set_sequence
46
+ validate :validate_name
47
+ named_scope :similar_to, lambda {|slug| {:conditions => {
48
+ :name => slug.name,
49
+ :scope => slug.scope,
50
+ :sluggable_type => slug.sluggable_type
51
+ },
52
+ :order => "sequence ASC"
53
+ }
54
+ }
55
+
56
+ # Whether this slug is the most recent of its owner's slugs.
57
+ def current?
58
+ sluggable.slug == self
59
+ end
60
+
61
+ def outdated?
62
+ !current?
63
+ end
64
+
65
+ # @deprecated Please used Slug#current?
66
+ def is_most_recent?
67
+ warn("Slug#is_most_recent? is deprecated and will be removed in FriendlyId 3.0. Please use Slug#current?")
68
+ current?
69
+ end
70
+
71
+ def to_friendly_id
72
+ sequence > 1 ? friendly_id_with_sequence : name
73
+ end
74
+
75
+ # Raise a FriendlyId::SlugGenerationError if the slug name is blank.
76
+ def validate_name
77
+ if name.blank?
78
+ raise FriendlyId::BlankError.new("slug.name can not be blank.")
79
+ end
80
+ end
81
+
82
+ private
83
+
84
+ # If we're renaming back to a previously used friendly_id, delete the
85
+ # slug so that we can recycle the name without having to use a sequence.
86
+ def enable_name_reversion
87
+ sluggable.slugs.find_all_by_name_and_scope(name, scope).each { |slug| slug.destroy }
88
+ end
89
+
90
+ def friendly_id_with_sequence
91
+ "#{name}#{separator}#{sequence}"
92
+ end
93
+
94
+ def similar_to_other_slugs?
95
+ !similar_slugs.empty?
96
+ end
97
+
98
+ def similar_slugs
99
+ self.class.similar_to(self)
100
+ end
101
+
102
+ def separator
103
+ sluggable.friendly_id_config.sequence_separator
104
+ end
105
+
106
+ def set_sequence
107
+ return unless new_record?
108
+ self.sequence = similar_slugs.last.sequence.succ if similar_to_other_slugs?
109
+ end
110
+
111
+ end