picolena 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (390) hide show
  1. data/History.txt +11 -4
  2. data/Manifest.txt +1 -0
  3. data/README.txt +2 -2
  4. data/bin/picolena +1 -1
  5. data/config/hoe.rb +10 -10
  6. data/lib/picolena/USAGE +1 -1
  7. data/lib/picolena/config/basic.rb +11 -11
  8. data/lib/picolena/picolena_generator.rb +15 -14
  9. data/lib/picolena/templates/app/controllers/application.rb +5 -5
  10. data/lib/picolena/templates/app/controllers/documents_controller.rb +17 -9
  11. data/lib/picolena/templates/app/helpers/documents_helper.rb +15 -14
  12. data/lib/picolena/templates/app/models/document.rb +28 -37
  13. data/lib/picolena/templates/app/models/finder.rb +12 -37
  14. data/lib/picolena/templates/app/models/indexer.rb +58 -37
  15. data/lib/picolena/templates/app/models/plain_text_extractor.rb +16 -16
  16. data/lib/picolena/templates/app/models/query.rb +5 -5
  17. data/lib/picolena/templates/app/views/documents/show.html.haml +3 -3
  18. data/lib/picolena/templates/app/views/layouts/application.html.haml +2 -2
  19. data/lib/picolena/templates/config/environment.rb +1 -1
  20. data/lib/picolena/templates/config/initializers/002_load_indexed_dirs.rb +8 -8
  21. data/lib/picolena/templates/config/initializers/003_load_white_list_IPs.rb +8 -8
  22. data/lib/picolena/templates/config/initializers/005_load_custom_title_and_names_and_links.rb +5 -5
  23. data/lib/picolena/templates/config/initializers/006_load_icons.rb +9 -7
  24. data/lib/picolena/templates/lang/ui/es.yml +1 -1
  25. data/lib/picolena/templates/lib/core_exts.rb +7 -7
  26. data/lib/picolena/templates/lib/plain_text_extractor_DSL.rb +10 -10
  27. data/lib/picolena/templates/lib/plain_text_extractors/ms.excel.rb +1 -1
  28. data/lib/picolena/templates/lib/plain_text_extractors/plain_text.rb +2 -2
  29. data/lib/picolena/templates/lib/tasks/index.rake +8 -3
  30. data/lib/picolena/templates/lib/tasks/install_dependencies.rake +2 -2
  31. data/lib/picolena/templates/lib/tasks/log.rake +1 -1
  32. data/lib/picolena/templates/public/.htaccess +3 -3
  33. data/lib/picolena/templates/public/images/flags/sv.png +0 -0
  34. data/lib/picolena/templates/public/stylesheets/style.css +2 -2
  35. data/lib/picolena/templates/script/spec_server +1 -1
  36. data/lib/picolena/templates/spec/controllers/application_controller_spec.rb +2 -2
  37. data/lib/picolena/templates/spec/controllers/documents_controller_spec.rb +17 -17
  38. data/lib/picolena/templates/spec/helpers/application_helper_spec.rb +2 -2
  39. data/lib/picolena/templates/spec/helpers/documents_helper_spec.rb +3 -3
  40. data/lib/picolena/templates/spec/models/basic_finder_spec.rb +14 -14
  41. data/lib/picolena/templates/spec/models/document_spec.rb +7 -15
  42. data/lib/picolena/templates/spec/models/finder_spec.rb +45 -38
  43. data/lib/picolena/templates/spec/models/host_indexing_system_spec.rb +5 -5
  44. data/lib/picolena/templates/spec/models/index_directories_spec.rb +2 -2
  45. data/lib/picolena/templates/spec/models/plain_text_extractor_spec.rb +6 -6
  46. data/lib/picolena/templates/spec/models/query_spec.rb +7 -7
  47. data/lib/picolena/templates/spec/rcov.opts +1 -1
  48. data/lib/picolena/templates/spec/test_dirs/indexed/basic/myfirstjavaprog.java +1 -1
  49. data/lib/picolena/templates/spec/test_dirs/indexed/basic/queens.for +1 -1
  50. data/lib/picolena/templates/spec/test_dirs/indexed/lang/hugo +74 -74
  51. data/lib/picolena/templates/spec/test_dirs/indexed/lang/lorca +56 -56
  52. data/lib/picolena/templates/spec/test_dirs/indexed/others/7.html +4 -4
  53. data/lib/picolena/templates/spec/test_dirs/indexed/others/ccmatrix1.cpp +6 -6
  54. data/lib/picolena/templates/spec/test_dirs/indexed/others/lemonde.htm +326 -326
  55. data/lib/picolena/templates/spec/test_dirs/indexed/others/nested/ReadMe.rtf +62 -62
  56. data/lib/picolena/templates/spec/test_dirs/indexed/others/xor.vee +0 -1
  57. data/lib/picolena/templates/spec/test_dirs/indexed/others/zafh.net.html +1 -1
  58. data/lib/picolena/version.rb +1 -1
  59. data/lib/rubigen_ext.rb +1 -1
  60. data/rails_plugins/globalite/CHANGELOG +1 -1
  61. data/rails_plugins/globalite/README +19 -19
  62. data/rails_plugins/globalite/lang/rails/de-DE.yml +6 -6
  63. data/rails_plugins/globalite/lang/rails/en-UK.yml +10 -10
  64. data/rails_plugins/globalite/lang/rails/en-US.yml +10 -10
  65. data/rails_plugins/globalite/lang/rails/es-ES.yml +11 -11
  66. data/rails_plugins/globalite/lang/rails/fr-FR.yml +10 -10
  67. data/rails_plugins/globalite/lang/rails/it.yml +10 -10
  68. data/rails_plugins/globalite/lang/rails/pt-BR.yml +6 -6
  69. data/rails_plugins/globalite/lang/rails/pt-PT.yml +6 -6
  70. data/rails_plugins/globalite/lib/globalite/l10n.rb +25 -25
  71. data/rails_plugins/globalite/lib/globalite/locale.rb +9 -9
  72. data/rails_plugins/globalite/lib/rails/core_ext.rb +4 -4
  73. data/rails_plugins/globalite/lib/rails/localization.rb +3 -3
  74. data/rails_plugins/globalite/lib/rails/localized_action_view.rb +17 -17
  75. data/rails_plugins/globalite/lib/rails/localized_active_record.rb +4 -4
  76. data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers/DateHelper.html +19 -19
  77. data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers/FormOptionsHelper.html +9 -9
  78. data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers/NumberHelper.html +8 -8
  79. data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers.html +5 -5
  80. data/rails_plugins/globalite/rdoc/classes/ActionView.html +5 -5
  81. data/rails_plugins/globalite/rdoc/classes/ActiveRecord/Errors.html +6 -6
  82. data/rails_plugins/globalite/rdoc/classes/ActiveRecord.html +5 -5
  83. data/rails_plugins/globalite/rdoc/classes/Array.html +6 -6
  84. data/rails_plugins/globalite/rdoc/classes/Date.html +8 -8
  85. data/rails_plugins/globalite/rdoc/classes/Globalite/L10n.html +49 -49
  86. data/rails_plugins/globalite/rdoc/classes/Globalite.html +6 -6
  87. data/rails_plugins/globalite/rdoc/classes/Kernel.html +6 -6
  88. data/rails_plugins/globalite/rdoc/classes/Locale.html +11 -11
  89. data/rails_plugins/globalite/rdoc/classes/Time.html +8 -8
  90. data/rails_plugins/globalite/rdoc/files/README.html +5 -5
  91. data/rails_plugins/globalite/rdoc/files/lib/globalite/l10n_rb.html +5 -5
  92. data/rails_plugins/globalite/rdoc/files/lib/globalite/locale_rb.html +5 -5
  93. data/rails_plugins/globalite/rdoc/files/lib/globalite_rb.html +5 -5
  94. data/rails_plugins/globalite/rdoc/files/lib/rails/core_ext_rb.html +5 -5
  95. data/rails_plugins/globalite/rdoc/files/lib/rails/localization_rb.html +5 -5
  96. data/rails_plugins/globalite/rdoc/files/lib/rails/localized_action_view_rb.html +5 -5
  97. data/rails_plugins/globalite/rdoc/files/lib/rails/localized_active_record_rb.html +5 -5
  98. data/rails_plugins/globalite/rdoc/fr_class_index.html +1 -1
  99. data/rails_plugins/globalite/rdoc/fr_file_index.html +1 -1
  100. data/rails_plugins/globalite/rdoc/fr_method_index.html +1 -1
  101. data/rails_plugins/globalite/rdoc/index.html +1 -1
  102. data/rails_plugins/globalite/spec/core_localization_spec.rb +18 -18
  103. data/rails_plugins/globalite/spec/l10n_spec.rb +25 -25
  104. data/rails_plugins/globalite/tasks/globalite_tasks.rake +6 -6
  105. data/rails_plugins/rspec/CHANGES +16 -16
  106. data/rails_plugins/rspec/README +2 -2
  107. data/rails_plugins/rspec/Rakefile +1 -1
  108. data/rails_plugins/rspec/UPGRADE +1 -1
  109. data/rails_plugins/rspec/autotest/discover.rb +1 -1
  110. data/rails_plugins/rspec/examples/pure/autogenerated_docstrings_example.rb +5 -5
  111. data/rails_plugins/rspec/examples/pure/before_and_after_example.rb +2 -2
  112. data/rails_plugins/rspec/examples/pure/behave_as_example.rb +5 -5
  113. data/rails_plugins/rspec/examples/pure/custom_expectation_matchers.rb +7 -7
  114. data/rails_plugins/rspec/examples/pure/file_accessor.rb +1 -1
  115. data/rails_plugins/rspec/examples/pure/file_accessor_spec.rb +2 -2
  116. data/rails_plugins/rspec/examples/pure/helper_method_example.rb +1 -1
  117. data/rails_plugins/rspec/examples/pure/legacy_spec.rb +2 -2
  118. data/rails_plugins/rspec/examples/pure/predicate_example.rb +2 -2
  119. data/rails_plugins/rspec/examples/pure/shared_example_group_example.rb +11 -11
  120. data/rails_plugins/rspec/examples/pure/shared_stack_examples.rb +4 -4
  121. data/rails_plugins/rspec/examples/pure/stack.rb +6 -6
  122. data/rails_plugins/rspec/examples/pure/stack_spec.rb +7 -7
  123. data/rails_plugins/rspec/examples/pure/stack_spec_with_nested_example_groups.rb +10 -10
  124. data/rails_plugins/rspec/examples/pure/stubbing_example.rb +4 -4
  125. data/rails_plugins/rspec/examples/stories/adder.rb +2 -2
  126. data/rails_plugins/rspec/examples/stories/addition +8 -8
  127. data/rails_plugins/rspec/examples/stories/calculator.rb +5 -5
  128. data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb +7 -7
  129. data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb +13 -13
  130. data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb +5 -5
  131. data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb +2 -2
  132. data/rails_plugins/rspec/examples/stories/game-of-life/life/game.rb +3 -3
  133. data/rails_plugins/rspec/examples/stories/game-of-life/life/grid.rb +10 -10
  134. data/rails_plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb +5 -5
  135. data/rails_plugins/rspec/failing_examples/failure_in_setup.rb +3 -3
  136. data/rails_plugins/rspec/failing_examples/failure_in_teardown.rb +3 -3
  137. data/rails_plugins/rspec/failing_examples/mocking_example.rb +1 -1
  138. data/rails_plugins/rspec/failing_examples/raising_example.rb +11 -11
  139. data/rails_plugins/rspec/failing_examples/team_spec.rb +5 -5
  140. data/rails_plugins/rspec/lib/autotest/rspec.rb +5 -5
  141. data/rails_plugins/rspec/lib/spec/example/configuration.rb +4 -4
  142. data/rails_plugins/rspec/lib/spec/example/example_group_factory.rb +3 -3
  143. data/rails_plugins/rspec/lib/spec/example/example_group_methods.rb +1 -1
  144. data/rails_plugins/rspec/lib/spec/example/example_matcher.rb +2 -2
  145. data/rails_plugins/rspec/lib/spec/example/example_methods.rb +4 -4
  146. data/rails_plugins/rspec/lib/spec/example/pending.rb +1 -1
  147. data/rails_plugins/rspec/lib/spec/expectations/differs/default.rb +5 -5
  148. data/rails_plugins/rspec/lib/spec/expectations/errors.rb +1 -1
  149. data/rails_plugins/rspec/lib/spec/expectations/handler.rb +5 -5
  150. data/rails_plugins/rspec/lib/spec/expectations.rb +1 -1
  151. data/rails_plugins/rspec/lib/spec/extensions/main.rb +8 -8
  152. data/rails_plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb +2 -2
  153. data/rails_plugins/rspec/lib/spec/matchers/be.rb +18 -18
  154. data/rails_plugins/rspec/lib/spec/matchers/be_close.rb +4 -4
  155. data/rails_plugins/rspec/lib/spec/matchers/change.rb +20 -20
  156. data/rails_plugins/rspec/lib/spec/matchers/eql.rb +4 -4
  157. data/rails_plugins/rspec/lib/spec/matchers/equal.rb +4 -4
  158. data/rails_plugins/rspec/lib/spec/matchers/has.rb +8 -8
  159. data/rails_plugins/rspec/lib/spec/matchers/have.rb +9 -9
  160. data/rails_plugins/rspec/lib/spec/matchers/include.rb +7 -7
  161. data/rails_plugins/rspec/lib/spec/matchers/match.rb +6 -6
  162. data/rails_plugins/rspec/lib/spec/matchers/operator_matcher.rb +1 -1
  163. data/rails_plugins/rspec/lib/spec/matchers/raise_error.rb +6 -6
  164. data/rails_plugins/rspec/lib/spec/matchers/respond_to.rb +7 -7
  165. data/rails_plugins/rspec/lib/spec/matchers/satisfy.rb +4 -4
  166. data/rails_plugins/rspec/lib/spec/matchers/simple_matcher.rb +3 -3
  167. data/rails_plugins/rspec/lib/spec/matchers/throw_symbol.rb +8 -8
  168. data/rails_plugins/rspec/lib/spec/matchers.rb +2 -2
  169. data/rails_plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb +3 -3
  170. data/rails_plugins/rspec/lib/spec/mocks/argument_expectation.rb +32 -32
  171. data/rails_plugins/rspec/lib/spec/mocks/error_generator.rb +13 -13
  172. data/rails_plugins/rspec/lib/spec/mocks/errors.rb +1 -1
  173. data/rails_plugins/rspec/lib/spec/mocks/message_expectation.rb +38 -38
  174. data/rails_plugins/rspec/lib/spec/mocks/methods.rb +3 -3
  175. data/rails_plugins/rspec/lib/spec/mocks/mock.rb +5 -5
  176. data/rails_plugins/rspec/lib/spec/mocks/order_group.rb +5 -5
  177. data/rails_plugins/rspec/lib/spec/mocks/proxy.rb +4 -4
  178. data/rails_plugins/rspec/lib/spec/mocks/space.rb +3 -3
  179. data/rails_plugins/rspec/lib/spec/mocks/spec_methods.rb +1 -1
  180. data/rails_plugins/rspec/lib/spec/mocks.rb +13 -13
  181. data/rails_plugins/rspec/lib/spec/rake/spectask.rb +4 -4
  182. data/rails_plugins/rspec/lib/spec/rake/verify_rcov.rb +9 -9
  183. data/rails_plugins/rspec/lib/spec/runner/backtrace_tweaker.rb +2 -2
  184. data/rails_plugins/rspec/lib/spec/runner/formatter/base_formatter.rb +7 -7
  185. data/rails_plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb +13 -13
  186. data/rails_plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb +1 -1
  187. data/rails_plugins/rspec/lib/spec/runner/formatter/html_formatter.rb +8 -8
  188. data/rails_plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb +7 -7
  189. data/rails_plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb +2 -2
  190. data/rails_plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb +5 -5
  191. data/rails_plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb +4 -4
  192. data/rails_plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb +6 -6
  193. data/rails_plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb +12 -12
  194. data/rails_plugins/rspec/lib/spec/runner/heckle_runner.rb +6 -6
  195. data/rails_plugins/rspec/lib/spec/runner/option_parser.rb +5 -5
  196. data/rails_plugins/rspec/lib/spec/runner/options.rb +8 -8
  197. data/rails_plugins/rspec/lib/spec/runner/reporter.rb +14 -14
  198. data/rails_plugins/rspec/lib/spec/runner.rb +41 -41
  199. data/rails_plugins/rspec/lib/spec/story/extensions/main.rb +6 -6
  200. data/rails_plugins/rspec/lib/spec/story/extensions/regexp.rb +1 -1
  201. data/rails_plugins/rspec/lib/spec/story/extensions/string.rb +1 -1
  202. data/rails_plugins/rspec/lib/spec/story/given_scenario.rb +1 -1
  203. data/rails_plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb +6 -6
  204. data/rails_plugins/rspec/lib/spec/story/runner/scenario_collector.rb +2 -2
  205. data/rails_plugins/rspec/lib/spec/story/runner/scenario_runner.rb +5 -5
  206. data/rails_plugins/rspec/lib/spec/story/runner/story_mediator.rb +20 -20
  207. data/rails_plugins/rspec/lib/spec/story/runner/story_parser.rb +29 -29
  208. data/rails_plugins/rspec/lib/spec/story/runner/story_runner.rb +8 -8
  209. data/rails_plugins/rspec/lib/spec/story/runner.rb +7 -7
  210. data/rails_plugins/rspec/lib/spec/story/scenario.rb +1 -1
  211. data/rails_plugins/rspec/lib/spec/story/step.rb +5 -5
  212. data/rails_plugins/rspec/lib/spec/story/step_group.rb +12 -12
  213. data/rails_plugins/rspec/lib/spec/story/step_mother.rb +6 -6
  214. data/rails_plugins/rspec/lib/spec/story/story.rb +5 -5
  215. data/rails_plugins/rspec/lib/spec/story/world.rb +16 -16
  216. data/rails_plugins/rspec/lib/spec/translator.rb +21 -21
  217. data/rails_plugins/rspec/lib/spec/version.rb +2 -2
  218. data/rails_plugins/rspec/lib/spec.rb +1 -1
  219. data/rails_plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb +1 -1
  220. data/rails_plugins/rspec/pre_commit/lib/pre_commit/rspec.rb +6 -6
  221. data/rails_plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb +6 -6
  222. data/rails_plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb +1 -1
  223. data/rails_plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb +1 -1
  224. data/rails_plugins/rspec/report.html +3 -3
  225. data/rails_plugins/rspec/spec/autotest/discover_spec.rb +2 -2
  226. data/rails_plugins/rspec/spec/autotest/rspec_spec.rb +30 -30
  227. data/rails_plugins/rspec/spec/autotest_matchers.rb +7 -7
  228. data/rails_plugins/rspec/spec/spec/example/configuration_spec.rb +5 -5
  229. data/rails_plugins/rspec/spec/spec/example/example_group_factory_spec.rb +5 -5
  230. data/rails_plugins/rspec/spec/spec/example/example_group_methods_spec.rb +3 -3
  231. data/rails_plugins/rspec/spec/spec/example/example_group_spec.rb +2 -2
  232. data/rails_plugins/rspec/spec/spec/example/example_matcher_spec.rb +10 -10
  233. data/rails_plugins/rspec/spec/spec/example/example_runner_spec.rb +29 -29
  234. data/rails_plugins/rspec/spec/spec/example/example_spec.rb +6 -6
  235. data/rails_plugins/rspec/spec/spec/example/nested_example_group_spec.rb +2 -2
  236. data/rails_plugins/rspec/spec/spec/example/pending_module_spec.rb +3 -3
  237. data/rails_plugins/rspec/spec/spec/example/predicate_matcher_spec.rb +1 -1
  238. data/rails_plugins/rspec/spec/spec/example/shared_example_group_spec.rb +4 -4
  239. data/rails_plugins/rspec/spec/spec/expectations/extensions/object_spec.rb +12 -12
  240. data/rails_plugins/rspec/spec/spec/expectations/fail_with_spec.rb +8 -8
  241. data/rails_plugins/rspec/spec/spec/extensions/main_spec.rb +6 -6
  242. data/rails_plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb +2 -2
  243. data/rails_plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb +2 -2
  244. data/rails_plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb +2 -2
  245. data/rails_plugins/rspec/spec/spec/matchers/be_spec.rb +5 -5
  246. data/rails_plugins/rspec/spec/spec/matchers/change_spec.rb +14 -14
  247. data/rails_plugins/rspec/spec/spec/matchers/description_generation_spec.rb +25 -25
  248. data/rails_plugins/rspec/spec/spec/matchers/exist_spec.rb +5 -5
  249. data/rails_plugins/rspec/spec/spec/matchers/handler_spec.rb +16 -16
  250. data/rails_plugins/rspec/spec/spec/matchers/have_spec.rb +13 -13
  251. data/rails_plugins/rspec/spec/spec/matchers/match_spec.rb +1 -1
  252. data/rails_plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb +1 -1
  253. data/rails_plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb +17 -17
  254. data/rails_plugins/rspec/spec/spec/matchers/raise_error_spec.rb +20 -20
  255. data/rails_plugins/rspec/spec/spec/matchers/respond_to_spec.rb +10 -10
  256. data/rails_plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb +3 -3
  257. data/rails_plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb +2 -2
  258. data/rails_plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb +2 -2
  259. data/rails_plugins/rspec/spec/spec/mocks/bug_report_10263.rb +3 -3
  260. data/rails_plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb +4 -4
  261. data/rails_plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb +1 -1
  262. data/rails_plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb +1 -1
  263. data/rails_plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb +1 -1
  264. data/rails_plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb +12 -12
  265. data/rails_plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb +3 -3
  266. data/rails_plugins/rspec/spec/spec/mocks/mock_space_spec.rb +1 -1
  267. data/rails_plugins/rspec/spec/spec/mocks/mock_spec.rb +56 -56
  268. data/rails_plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb +3 -3
  269. data/rails_plugins/rspec/spec/spec/mocks/once_counts_spec.rb +1 -1
  270. data/rails_plugins/rspec/spec/spec/mocks/options_hash_spec.rb +1 -1
  271. data/rails_plugins/rspec/spec/spec/mocks/partial_mock_spec.rb +16 -16
  272. data/rails_plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb +10 -10
  273. data/rails_plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb +13 -13
  274. data/rails_plugins/rspec/spec/spec/mocks/stub_spec.rb +7 -7
  275. data/rails_plugins/rspec/spec/spec/mocks/twice_counts_spec.rb +6 -6
  276. data/rails_plugins/rspec/spec/spec/package/bin_spec_spec.rb +1 -1
  277. data/rails_plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb +2 -2
  278. data/rails_plugins/rspec/spec/spec/runner/command_line_spec.rb +1 -1
  279. data/rails_plugins/rspec/spec/spec/runner/drb_command_line_spec.rb +2 -2
  280. data/rails_plugins/rspec/spec/spec/runner/execution_context_spec.rb +2 -2
  281. data/rails_plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb +2 -2
  282. data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html +1 -1
  283. data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html +2 -2
  284. data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html +1 -1
  285. data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html +1 -1
  286. data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html +3 -3
  287. data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb +1 -1
  288. data/rails_plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb +9 -9
  289. data/rails_plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb +4 -4
  290. data/rails_plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb +1 -1
  291. data/rails_plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb +5 -5
  292. data/rails_plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html +13 -13
  293. data/rails_plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html +2 -2
  294. data/rails_plugins/rspec/spec/spec/runner/heckle_runner_spec.rb +1 -1
  295. data/rails_plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb +3 -3
  296. data/rails_plugins/rspec/spec/spec/runner/option_parser_spec.rb +9 -9
  297. data/rails_plugins/rspec/spec/spec/runner/options_spec.rb +13 -13
  298. data/rails_plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb +1 -1
  299. data/rails_plugins/rspec/spec/spec/spec_classes.rb +8 -8
  300. data/rails_plugins/rspec/spec/spec/story/builders.rb +7 -7
  301. data/rails_plugins/rspec/spec/spec/story/extensions/main_spec.rb +6 -6
  302. data/rails_plugins/rspec/spec/spec/story/given_scenario_spec.rb +3 -3
  303. data/rails_plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb +12 -12
  304. data/rails_plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb +2 -2
  305. data/rails_plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb +21 -21
  306. data/rails_plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb +22 -22
  307. data/rails_plugins/rspec/spec/spec/story/runner/story_parser_spec.rb +55 -55
  308. data/rails_plugins/rspec/spec/spec/story/runner/story_runner_spec.rb +44 -44
  309. data/rails_plugins/rspec/spec/spec/story/runner_spec.rb +18 -18
  310. data/rails_plugins/rspec/spec/spec/story/scenario_spec.rb +2 -2
  311. data/rails_plugins/rspec/spec/spec/story/step_group_spec.rb +20 -20
  312. data/rails_plugins/rspec/spec/spec/story/step_mother_spec.rb +14 -14
  313. data/rails_plugins/rspec/spec/spec/story/step_spec.rb +33 -33
  314. data/rails_plugins/rspec/spec/spec/story/story_spec.rb +12 -12
  315. data/rails_plugins/rspec/spec/spec/translator_spec.rb +12 -12
  316. data/rails_plugins/rspec/spec/spec_helper.rb +5 -5
  317. data/rails_plugins/rspec/stories/resources/helpers/story_helper.rb +1 -1
  318. data/rails_plugins/rspec/stories/resources/steps/running_rspec.rb +4 -4
  319. data/rails_plugins/rspec/stories/resources/test/spec_and_test_together.rb +2 -2
  320. data/rails_plugins/rspec/stories/resources/test/test_case_with_should_methods.rb +1 -1
  321. data/rails_plugins/rspec/story_server/prototype/javascripts/builder.js +14 -14
  322. data/rails_plugins/rspec/story_server/prototype/javascripts/controls.js +61 -61
  323. data/rails_plugins/rspec/story_server/prototype/javascripts/dragdrop.js +144 -144
  324. data/rails_plugins/rspec/story_server/prototype/javascripts/effects.js +127 -127
  325. data/rails_plugins/rspec/story_server/prototype/javascripts/rspec.js +15 -15
  326. data/rails_plugins/rspec/story_server/prototype/javascripts/scriptaculous.js +7 -7
  327. data/rails_plugins/rspec/story_server/prototype/javascripts/slider.js +37 -37
  328. data/rails_plugins/rspec/story_server/prototype/javascripts/sound.js +4 -4
  329. data/rails_plugins/rspec/story_server/prototype/javascripts/unittest.js +66 -66
  330. data/rails_plugins/rspec/story_server/prototype/stories.html +9 -9
  331. data/rails_plugins/rspec_on_rails/MIT-LICENSE +11 -11
  332. data/rails_plugins/rspec_on_rails/generators/rspec/templates/rcov.opts +1 -1
  333. data/rails_plugins/rspec_on_rails/generators/rspec/templates/script/spec_server +1 -1
  334. data/rails_plugins/rspec_on_rails/generators/rspec_controller/USAGE +1 -1
  335. data/rails_plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb +2 -2
  336. data/rails_plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb +1 -1
  337. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb +12 -12
  338. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb +35 -35
  339. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb +2 -2
  340. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb +2 -2
  341. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb +1 -1
  342. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb +2 -2
  343. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/routing_spec.rb +11 -11
  344. data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb +1 -1
  345. data/rails_plugins/rspec_on_rails/lib/autotest/rails_rspec.rb +3 -3
  346. data/rails_plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb +4 -4
  347. data/rails_plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb +1 -1
  348. data/rails_plugins/rspec_on_rails/lib/spec/rails/example/render_observer.rb +4 -4
  349. data/rails_plugins/rspec_on_rails/lib/spec/rails/example/view_example_group.rb +1 -1
  350. data/rails_plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb +1 -1
  351. data/rails_plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb +1 -1
  352. data/rails_plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb +10 -10
  353. data/rails_plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb +6 -6
  354. data/rails_plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb +7 -7
  355. data/rails_plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb +1 -1
  356. data/rails_plugins/rspec_on_rails/lib/spec/rails.rb +8 -8
  357. data/rails_plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb +6 -6
  358. data/rails_plugins/rspec_on_rails/spec/rails/example/controller_isolation_spec.rb +1 -1
  359. data/rails_plugins/rspec_on_rails/spec/rails/example/controller_spec_spec.rb +22 -22
  360. data/rails_plugins/rspec_on_rails/spec/rails/example/helper_spec_spec.rb +1 -1
  361. data/rails_plugins/rspec_on_rails/spec/rails/example/ivar_proxy_spec.rb +3 -3
  362. data/rails_plugins/rspec_on_rails/spec/rails/example/shared_behaviour_spec.rb +2 -2
  363. data/rails_plugins/rspec_on_rails/spec/rails/example/view_spec_spec.rb +8 -8
  364. data/rails_plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb +7 -7
  365. data/rails_plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb +1 -1
  366. data/rails_plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb +37 -37
  367. data/rails_plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb +1 -1
  368. data/rails_plugins/rspec_on_rails/spec/rails/matchers/have_text_spec.rb +4 -4
  369. data/rails_plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb +26 -26
  370. data/rails_plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb +18 -18
  371. data/rails_plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb +2 -2
  372. data/rails_plugins/rspec_on_rails/spec/spec_helper.rb +1 -1
  373. data/rails_plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb +9 -9
  374. data/rails_plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb +7 -7
  375. data/rails_plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb +5 -5
  376. data/rails_plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb +10 -10
  377. data/rails_plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb +1 -1
  378. data/rails_plugins/rspec_on_rails/stories/transactions_should_rollback.rb +1 -1
  379. data/rails_plugins/rspec_on_rails/tasks/rspec.rake +4 -4
  380. data/script/txt2html +1 -1
  381. data/setup.rb +4 -4
  382. data/tasks/hack.rake +3 -3
  383. data/website/index.html +2 -2
  384. data/website/index.txt +1 -1
  385. data/website/index_devjavu +3 -3
  386. data/website/javascripts/rounded_corners_lite.inc.js +1 -1
  387. data/website/stylesheets/screen.css +2 -2
  388. data.tar.gz.sig +0 -0
  389. metadata +2 -1
  390. metadata.gz.sig +2 -1
@@ -2,7 +2,7 @@
2
2
 
3
3
  // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
4
4
  // (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
5
- //
5
+ //
6
6
  // script.aculo.us is freely distributable under the terms of an MIT-style license.
7
7
  // For details, see the script.aculo.us web site: http://script.aculo.us/
8
8
 
@@ -34,7 +34,7 @@ var Droppables = {
34
34
  options._containers.push($(containment));
35
35
  }
36
36
  }
37
-
37
+
38
38
  if(options.accept) options.accept = [options.accept].flatten();
39
39
 
40
40
  Element.makePositioned(element); // fix IE
@@ -42,34 +42,34 @@ var Droppables = {
42
42
 
43
43
  this.drops.push(options);
44
44
  },
45
-
45
+
46
46
  findDeepestChild: function(drops) {
47
47
  deepest = drops[0];
48
-
48
+
49
49
  for (i = 1; i < drops.length; ++i)
50
50
  if (Element.isParent(drops[i].element, deepest.element))
51
51
  deepest = drops[i];
52
-
52
+
53
53
  return deepest;
54
54
  },
55
55
 
56
56
  isContained: function(element, drop) {
57
57
  var containmentNode;
58
58
  if(drop.tree) {
59
- containmentNode = element.treeNode;
59
+ containmentNode = element.treeNode;
60
60
  } else {
61
61
  containmentNode = element.parentNode;
62
62
  }
63
63
  return drop._containers.detect(function(c) { return containmentNode == c });
64
64
  },
65
-
65
+
66
66
  isAffected: function(point, element, drop) {
67
67
  return (
68
68
  (drop.element!=element) &&
69
69
  ((!drop._containers) ||
70
70
  this.isContained(element, drop)) &&
71
71
  ((!drop.accept) ||
72
- (Element.classNames(element).detect(
72
+ (Element.classNames(element).detect(
73
73
  function(v) { return drop.accept.include(v) } ) )) &&
74
74
  Position.within(drop.element, point[0], point[1]) );
75
75
  },
@@ -89,12 +89,12 @@ var Droppables = {
89
89
  show: function(point, element) {
90
90
  if(!this.drops.length) return;
91
91
  var drop, affected = [];
92
-
92
+
93
93
  this.drops.each( function(drop) {
94
94
  if(Droppables.isAffected(point, element, drop))
95
95
  affected.push(drop);
96
96
  });
97
-
97
+
98
98
  if(affected.length>0)
99
99
  drop = Droppables.findDeepestChild(affected);
100
100
 
@@ -103,7 +103,7 @@ var Droppables = {
103
103
  Position.within(drop.element, point[0], point[1]);
104
104
  if(drop.onHover)
105
105
  drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
106
-
106
+
107
107
  if (drop != this.last_active) Droppables.activate(drop);
108
108
  }
109
109
  },
@@ -114,8 +114,8 @@ var Droppables = {
114
114
 
115
115
  if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
116
116
  if (this.last_active.onDrop) {
117
- this.last_active.onDrop(element, this.last_active.element, event);
118
- return true;
117
+ this.last_active.onDrop(element, this.last_active.element, event);
118
+ return true;
119
119
  }
120
120
  },
121
121
 
@@ -128,20 +128,20 @@ var Droppables = {
128
128
  var Draggables = {
129
129
  drags: [],
130
130
  observers: [],
131
-
131
+
132
132
  register: function(draggable) {
133
133
  if(this.drags.length == 0) {
134
134
  this.eventMouseUp = this.endDrag.bindAsEventListener(this);
135
135
  this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
136
136
  this.eventKeypress = this.keyPress.bindAsEventListener(this);
137
-
137
+
138
138
  Event.observe(document, "mouseup", this.eventMouseUp);
139
139
  Event.observe(document, "mousemove", this.eventMouseMove);
140
140
  Event.observe(document, "keypress", this.eventKeypress);
141
141
  }
142
142
  this.drags.push(draggable);
143
143
  },
144
-
144
+
145
145
  unregister: function(draggable) {
146
146
  this.drags = this.drags.reject(function(d) { return d==draggable });
147
147
  if(this.drags.length == 0) {
@@ -150,24 +150,24 @@ var Draggables = {
150
150
  Event.stopObserving(document, "keypress", this.eventKeypress);
151
151
  }
152
152
  },
153
-
153
+
154
154
  activate: function(draggable) {
155
- if(draggable.options.delay) {
156
- this._timeout = setTimeout(function() {
157
- Draggables._timeout = null;
158
- window.focus();
159
- Draggables.activeDraggable = draggable;
160
- }.bind(this), draggable.options.delay);
155
+ if(draggable.options.delay) {
156
+ this._timeout = setTimeout(function() {
157
+ Draggables._timeout = null;
158
+ window.focus();
159
+ Draggables.activeDraggable = draggable;
160
+ }.bind(this), draggable.options.delay);
161
161
  } else {
162
162
  window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
163
163
  this.activeDraggable = draggable;
164
164
  }
165
165
  },
166
-
166
+
167
167
  deactivate: function() {
168
168
  this.activeDraggable = null;
169
169
  },
170
-
170
+
171
171
  updateDrag: function(event) {
172
172
  if(!this.activeDraggable) return;
173
173
  var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -175,36 +175,36 @@ var Draggables = {
175
175
  // the same coordinates, prevent needless redrawing (moz bug?)
176
176
  if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
177
177
  this._lastPointer = pointer;
178
-
178
+
179
179
  this.activeDraggable.updateDrag(event, pointer);
180
180
  },
181
-
181
+
182
182
  endDrag: function(event) {
183
- if(this._timeout) {
184
- clearTimeout(this._timeout);
185
- this._timeout = null;
183
+ if(this._timeout) {
184
+ clearTimeout(this._timeout);
185
+ this._timeout = null;
186
186
  }
187
187
  if(!this.activeDraggable) return;
188
188
  this._lastPointer = null;
189
189
  this.activeDraggable.endDrag(event);
190
190
  this.activeDraggable = null;
191
191
  },
192
-
192
+
193
193
  keyPress: function(event) {
194
194
  if(this.activeDraggable)
195
195
  this.activeDraggable.keyPress(event);
196
196
  },
197
-
197
+
198
198
  addObserver: function(observer) {
199
199
  this.observers.push(observer);
200
200
  this._cacheObserverCallbacks();
201
201
  },
202
-
202
+
203
203
  removeObserver: function(element) { // element instead of observer fixes mem leaks
204
204
  this.observers = this.observers.reject( function(o) { return o.element==element });
205
205
  this._cacheObserverCallbacks();
206
206
  },
207
-
207
+
208
208
  notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag'
209
209
  if(this[eventName+'Count'] > 0)
210
210
  this.observers.each( function(o) {
@@ -212,7 +212,7 @@ var Draggables = {
212
212
  });
213
213
  if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
214
214
  },
215
-
215
+
216
216
  _cacheObserverCallbacks: function() {
217
217
  ['onStart','onEnd','onDrag'].each( function(eventName) {
218
218
  Draggables[eventName+'Count'] = Draggables.observers.select(
@@ -239,12 +239,12 @@ Draggable.prototype = {
239
239
  },
240
240
  endeffect: function(element) {
241
241
  var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
242
- new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
242
+ new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
243
243
  queue: {scope:'_draggable', position:'end'},
244
- afterFinish: function(){
245
- Draggable._dragging[element] = false
244
+ afterFinish: function(){
245
+ Draggable._dragging[element] = false
246
246
  }
247
- });
247
+ });
248
248
  },
249
249
  zindex: 1000,
250
250
  revert: false,
@@ -255,57 +255,57 @@ Draggable.prototype = {
255
255
  snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] }
256
256
  delay: 0
257
257
  };
258
-
258
+
259
259
  if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
260
260
  Object.extend(defaults, {
261
261
  starteffect: function(element) {
262
262
  element._opacity = Element.getOpacity(element);
263
263
  Draggable._dragging[element] = true;
264
- new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
264
+ new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
265
265
  }
266
266
  });
267
-
267
+
268
268
  var options = Object.extend(defaults, arguments[1] || { });
269
269
 
270
270
  this.element = $(element);
271
-
271
+
272
272
  if(options.handle && Object.isString(options.handle))
273
273
  this.handle = this.element.down('.'+options.handle, 0);
274
-
274
+
275
275
  if(!this.handle) this.handle = $(options.handle);
276
276
  if(!this.handle) this.handle = this.element;
277
-
277
+
278
278
  if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
279
279
  options.scroll = $(options.scroll);
280
280
  this._isScrollChild = Element.childOf(this.element, options.scroll);
281
281
  }
282
282
 
283
- Element.makePositioned(this.element); // fix IE
283
+ Element.makePositioned(this.element); // fix IE
284
284
 
285
285
  this.options = options;
286
- this.dragging = false;
286
+ this.dragging = false;
287
287
 
288
288
  this.eventMouseDown = this.initDrag.bindAsEventListener(this);
289
289
  Event.observe(this.handle, "mousedown", this.eventMouseDown);
290
-
290
+
291
291
  Draggables.register(this);
292
292
  },
293
-
293
+
294
294
  destroy: function() {
295
295
  Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
296
296
  Draggables.unregister(this);
297
297
  },
298
-
298
+
299
299
  currentDelta: function() {
300
300
  return([
301
301
  parseInt(Element.getStyle(this.element,'left') || '0'),
302
302
  parseInt(Element.getStyle(this.element,'top') || '0')]);
303
303
  },
304
-
304
+
305
305
  initDrag: function(event) {
306
306
  if(!Object.isUndefined(Draggable._dragging[this.element]) &&
307
307
  Draggable._dragging[this.element]) return;
308
- if(Event.isLeftClick(event)) {
308
+ if(Event.isLeftClick(event)) {
309
309
  // abort on form elements, fixes a Firefox issue
310
310
  var src = Event.element(event);
311
311
  if((tag_name = src.tagName.toUpperCase()) && (
@@ -314,26 +314,26 @@ Draggable.prototype = {
314
314
  tag_name=='OPTION' ||
315
315
  tag_name=='BUTTON' ||
316
316
  tag_name=='TEXTAREA')) return;
317
-
317
+
318
318
  var pointer = [Event.pointerX(event), Event.pointerY(event)];
319
319
  var pos = Position.cumulativeOffset(this.element);
320
320
  this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
321
-
321
+
322
322
  Draggables.activate(this);
323
323
  Event.stop(event);
324
324
  }
325
325
  },
326
-
326
+
327
327
  startDrag: function(event) {
328
328
  this.dragging = true;
329
329
  if(!this.delta)
330
330
  this.delta = this.currentDelta();
331
-
331
+
332
332
  if(this.options.zindex) {
333
333
  this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
334
334
  this.element.style.zIndex = this.options.zindex;
335
335
  }
336
-
336
+
337
337
  if(this.options.ghosting) {
338
338
  this._clone = this.element.cloneNode(true);
339
339
  this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
@@ -341,7 +341,7 @@ Draggable.prototype = {
341
341
  Position.absolutize(this.element);
342
342
  this.element.parentNode.insertBefore(this._clone, this.element);
343
343
  }
344
-
344
+
345
345
  if(this.options.scroll) {
346
346
  if (this.options.scroll == window) {
347
347
  var where = this._getWindowScroll(this.options.scroll);
@@ -352,28 +352,28 @@ Draggable.prototype = {
352
352
  this.originalScrollTop = this.options.scroll.scrollTop;
353
353
  }
354
354
  }
355
-
355
+
356
356
  Draggables.notify('onStart', this, event);
357
-
357
+
358
358
  if(this.options.starteffect) this.options.starteffect(this.element);
359
359
  },
360
-
360
+
361
361
  updateDrag: function(event, pointer) {
362
362
  if(!this.dragging) this.startDrag(event);
363
-
363
+
364
364
  if(!this.options.quiet){
365
365
  Position.prepare();
366
366
  Droppables.show(pointer, this.element);
367
367
  }
368
-
368
+
369
369
  Draggables.notify('onDrag', this, event);
370
-
370
+
371
371
  this.draw(pointer);
372
372
  if(this.options.change) this.options.change(this);
373
-
373
+
374
374
  if(this.options.scroll) {
375
375
  this.stopScrolling();
376
-
376
+
377
377
  var p;
378
378
  if (this.options.scroll == window) {
379
379
  with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
@@ -391,16 +391,16 @@ Draggable.prototype = {
391
391
  if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
392
392
  this.startScrolling(speed);
393
393
  }
394
-
394
+
395
395
  // fix AppleWebKit rendering
396
396
  if(Prototype.Browser.WebKit) window.scrollBy(0,0);
397
-
397
+
398
398
  Event.stop(event);
399
399
  },
400
-
400
+
401
401
  finishDrag: function(event, success) {
402
402
  this.dragging = false;
403
-
403
+
404
404
  if(this.options.quiet){
405
405
  Position.prepare();
406
406
  var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -415,17 +415,17 @@ Draggable.prototype = {
415
415
  this._clone = null;
416
416
  }
417
417
 
418
- var dropped = false;
419
- if(success) {
420
- dropped = Droppables.fire(event, this.element);
421
- if (!dropped) dropped = false;
418
+ var dropped = false;
419
+ if(success) {
420
+ dropped = Droppables.fire(event, this.element);
421
+ if (!dropped) dropped = false;
422
422
  }
423
423
  if(dropped && this.options.onDropped) this.options.onDropped(this.element);
424
424
  Draggables.notify('onEnd', this, event);
425
425
 
426
426
  var revert = this.options.revert;
427
427
  if(revert && Object.isFunction(revert)) revert = revert(this.element);
428
-
428
+
429
429
  var d = this.currentDelta();
430
430
  if(revert && this.options.reverteffect) {
431
431
  if (dropped == 0 || revert != 'failure')
@@ -438,45 +438,45 @@ Draggable.prototype = {
438
438
  if(this.options.zindex)
439
439
  this.element.style.zIndex = this.originalZ;
440
440
 
441
- if(this.options.endeffect)
441
+ if(this.options.endeffect)
442
442
  this.options.endeffect(this.element);
443
-
443
+
444
444
  Draggables.deactivate(this);
445
445
  Droppables.reset();
446
446
  },
447
-
447
+
448
448
  keyPress: function(event) {
449
449
  if(event.keyCode!=Event.KEY_ESC) return;
450
450
  this.finishDrag(event, false);
451
451
  Event.stop(event);
452
452
  },
453
-
453
+
454
454
  endDrag: function(event) {
455
455
  if(!this.dragging) return;
456
456
  this.stopScrolling();
457
457
  this.finishDrag(event, true);
458
458
  Event.stop(event);
459
459
  },
460
-
460
+
461
461
  draw: function(point) {
462
462
  var pos = Position.cumulativeOffset(this.element);
463
463
  if(this.options.ghosting) {
464
464
  var r = Position.realOffset(this.element);
465
465
  pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
466
466
  }
467
-
467
+
468
468
  var d = this.currentDelta();
469
469
  pos[0] -= d[0]; pos[1] -= d[1];
470
-
470
+
471
471
  if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
472
472
  pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
473
473
  pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
474
474
  }
475
-
476
- var p = [0,1].map(function(i){
477
- return (point[i]-pos[i]-this.offset[i])
475
+
476
+ var p = [0,1].map(function(i){
477
+ return (point[i]-pos[i]-this.offset[i])
478
478
  }.bind(this));
479
-
479
+
480
480
  if(this.options.snap) {
481
481
  if(Object.isFunction(this.options.snap)) {
482
482
  p = this.options.snap(p[0],p[1],this);
@@ -489,16 +489,16 @@ Draggable.prototype = {
489
489
  return (v/this.options.snap).round()*this.options.snap }.bind(this))
490
490
  }
491
491
  }}
492
-
492
+
493
493
  var style = this.element.style;
494
494
  if((!this.options.constraint) || (this.options.constraint=='horizontal'))
495
495
  style.left = p[0] + "px";
496
496
  if((!this.options.constraint) || (this.options.constraint=='vertical'))
497
497
  style.top = p[1] + "px";
498
-
498
+
499
499
  if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
500
500
  },
501
-
501
+
502
502
  stopScrolling: function() {
503
503
  if(this.scrollInterval) {
504
504
  clearInterval(this.scrollInterval);
@@ -506,14 +506,14 @@ Draggable.prototype = {
506
506
  Draggables._lastScrollPointer = null;
507
507
  }
508
508
  },
509
-
509
+
510
510
  startScrolling: function(speed) {
511
511
  if(!(speed[0] || speed[1])) return;
512
512
  this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
513
513
  this.lastScrolled = new Date();
514
514
  this.scrollInterval = setInterval(this.scroll.bind(this), 10);
515
515
  },
516
-
516
+
517
517
  scroll: function() {
518
518
  var current = new Date();
519
519
  var delta = current - this.lastScrolled;
@@ -529,7 +529,7 @@ Draggable.prototype = {
529
529
  this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
530
530
  this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000;
531
531
  }
532
-
532
+
533
533
  Position.prepare();
534
534
  Droppables.show(Draggables._lastPointer, this.element);
535
535
  Draggables.notify('onDrag', this);
@@ -543,10 +543,10 @@ Draggable.prototype = {
543
543
  Draggables._lastScrollPointer[1] = 0;
544
544
  this.draw(Draggables._lastScrollPointer);
545
545
  }
546
-
546
+
547
547
  if(this.options.change) this.options.change(this);
548
548
  },
549
-
549
+
550
550
  _getWindowScroll: function(w) {
551
551
  var T, L, W, H;
552
552
  with (w.document) {
@@ -581,11 +581,11 @@ SortableObserver.prototype = {
581
581
  this.observer = observer;
582
582
  this.lastValue = Sortable.serialize(this.element);
583
583
  },
584
-
584
+
585
585
  onStart: function() {
586
586
  this.lastValue = Sortable.serialize(this.element);
587
587
  },
588
-
588
+
589
589
  onEnd: function() {
590
590
  Sortable.unmark();
591
591
  if(this.lastValue != Sortable.serialize(this.element))
@@ -595,11 +595,11 @@ SortableObserver.prototype = {
595
595
 
596
596
  var Sortable = {
597
597
  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
598
-
598
+
599
599
  sortables: { },
600
-
600
+
601
601
  _findRootElement: function(element) {
602
- while (element.tagName.toUpperCase() != "BODY") {
602
+ while (element.tagName.toUpperCase() != "BODY") {
603
603
  if(element.id && Sortable.sortables[element.id]) return element;
604
604
  element = element.parentNode;
605
605
  }
@@ -610,22 +610,22 @@ var Sortable = {
610
610
  if(!element) return;
611
611
  return Sortable.sortables[element.id];
612
612
  },
613
-
613
+
614
614
  destroy: function(element){
615
615
  var s = Sortable.options(element);
616
-
616
+
617
617
  if(s) {
618
618
  Draggables.removeObserver(s.element);
619
619
  s.droppables.each(function(d){ Droppables.remove(d) });
620
620
  s.draggables.invoke('destroy');
621
-
621
+
622
622
  delete Sortable.sortables[s.element.id];
623
623
  }
624
624
  },
625
625
 
626
626
  create: function(element) {
627
627
  element = $(element);
628
- var options = Object.extend({
628
+ var options = Object.extend({
629
629
  element: element,
630
630
  tag: 'li', // assumes li children, override with tag: 'tagname'
631
631
  dropOnEmpty: false,
@@ -639,17 +639,17 @@ var Sortable = {
639
639
  delay: 0,
640
640
  hoverclass: null,
641
641
  ghosting: false,
642
- quiet: false,
642
+ quiet: false,
643
643
  scroll: false,
644
644
  scrollSensitivity: 20,
645
645
  scrollSpeed: 15,
646
646
  format: this.SERIALIZE_RULE,
647
-
648
- // these take arrays of elements or ids and can be
647
+
648
+ // these take arrays of elements or ids and can be
649
649
  // used for better initialization performance
650
650
  elements: false,
651
651
  handles: false,
652
-
652
+
653
653
  onChange: Prototype.emptyFunction,
654
654
  onUpdate: Prototype.emptyFunction
655
655
  }, arguments[1] || { });
@@ -686,7 +686,7 @@ var Sortable = {
686
686
  if(options.zindex)
687
687
  options_for_draggable.zindex = options.zindex;
688
688
 
689
- // build options for the droppables
689
+ // build options for the droppables
690
690
  var options_for_droppable = {
691
691
  overlap: options.overlap,
692
692
  containment: options.containment,
@@ -694,7 +694,7 @@ var Sortable = {
694
694
  hoverclass: options.hoverclass,
695
695
  onHover: Sortable.onHover
696
696
  }
697
-
697
+
698
698
  var options_for_tree = {
699
699
  onHover: Sortable.onEmptyHover,
700
700
  overlap: options.overlap,
@@ -703,7 +703,7 @@ var Sortable = {
703
703
  }
704
704
 
705
705
  // fix for gecko engine
706
- Element.cleanWhitespace(element);
706
+ Element.cleanWhitespace(element);
707
707
 
708
708
  options.draggables = [];
709
709
  options.droppables = [];
@@ -716,14 +716,14 @@ var Sortable = {
716
716
 
717
717
  (options.elements || this.findElements(element, options) || []).each( function(e,i) {
718
718
  var handle = options.handles ? $(options.handles[i]) :
719
- (options.handle ? $(e).getElementsByClassName(options.handle)[0] : e);
719
+ (options.handle ? $(e).getElementsByClassName(options.handle)[0] : e);
720
720
  options.draggables.push(
721
721
  new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
722
722
  Droppables.add(e, options_for_droppable);
723
723
  if(options.tree) e.treeNode = element;
724
- options.droppables.push(e);
724
+ options.droppables.push(e);
725
725
  });
726
-
726
+
727
727
  if(options.tree) {
728
728
  (Sortable.findTreeElements(element, options) || []).each( function(e) {
729
729
  Droppables.add(e, options_for_tree);
@@ -745,7 +745,7 @@ var Sortable = {
745
745
  return Element.findChildren(
746
746
  element, options.only, options.tree ? true : false, options.tag);
747
747
  },
748
-
748
+
749
749
  findTreeElements: function(element, options) {
750
750
  return Element.findChildren(
751
751
  element, options.only, options.tree ? true : false, options.treeTag);
@@ -762,7 +762,7 @@ var Sortable = {
762
762
  var oldParentNode = element.parentNode;
763
763
  element.style.visibility = "hidden"; // fix gecko rendering
764
764
  dropon.parentNode.insertBefore(element, dropon);
765
- if(dropon.parentNode!=oldParentNode)
765
+ if(dropon.parentNode!=oldParentNode)
766
766
  Sortable.options(oldParentNode).onChange(element);
767
767
  Sortable.options(dropon.parentNode).onChange(element);
768
768
  }
@@ -773,26 +773,26 @@ var Sortable = {
773
773
  var oldParentNode = element.parentNode;
774
774
  element.style.visibility = "hidden"; // fix gecko rendering
775
775
  dropon.parentNode.insertBefore(element, nextElement);
776
- if(dropon.parentNode!=oldParentNode)
776
+ if(dropon.parentNode!=oldParentNode)
777
777
  Sortable.options(oldParentNode).onChange(element);
778
778
  Sortable.options(dropon.parentNode).onChange(element);
779
779
  }
780
780
  }
781
781
  },
782
-
782
+
783
783
  onEmptyHover: function(element, dropon, overlap) {
784
784
  var oldParentNode = element.parentNode;
785
785
  var droponOptions = Sortable.options(dropon);
786
-
786
+
787
787
  if(!Element.isParent(dropon, element)) {
788
788
  var index;
789
-
789
+
790
790
  var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
791
791
  var child = null;
792
-
792
+
793
793
  if(children) {
794
794
  var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
795
-
795
+
796
796
  for (index = 0; index < children.length; index += 1) {
797
797
  if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
798
798
  offset -= Element.offsetSize (children[index], droponOptions.overlap);
@@ -805,9 +805,9 @@ var Sortable = {
805
805
  }
806
806
  }
807
807
  }
808
-
808
+
809
809
  dropon.insertBefore(element, child);
810
-
810
+
811
811
  Sortable.options(oldParentNode).onChange(element);
812
812
  droponOptions.onChange(element);
813
813
  }
@@ -820,34 +820,34 @@ var Sortable = {
820
820
  mark: function(dropon, position) {
821
821
  // mark on ghosting only
822
822
  var sortable = Sortable.options(dropon.parentNode);
823
- if(sortable && !sortable.ghosting) return;
823
+ if(sortable && !sortable.ghosting) return;
824
824
 
825
825
  if(!Sortable._marker) {
826
- Sortable._marker =
826
+ Sortable._marker =
827
827
  ($('dropmarker') || Element.extend(document.createElement('DIV'))).
828
828
  hide().addClassName('dropmarker').setStyle({position:'absolute'});
829
829
  document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
830
- }
830
+ }
831
831
  var offsets = Position.cumulativeOffset(dropon);
832
832
  Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
833
-
833
+
834
834
  if(position=='after')
835
- if(sortable.overlap == 'horizontal')
835
+ if(sortable.overlap == 'horizontal')
836
836
  Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
837
837
  else
838
838
  Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
839
-
839
+
840
840
  Sortable._marker.show();
841
841
  },
842
-
842
+
843
843
  _tree: function(element, options, parent) {
844
844
  var children = Sortable.findElements(element, options) || [];
845
-
845
+
846
846
  for (var i = 0; i < children.length; ++i) {
847
847
  var match = children[i].id.match(options.format);
848
848
 
849
849
  if (!match) continue;
850
-
850
+
851
851
  var child = {
852
852
  id: encodeURIComponent(match ? match[1] : null),
853
853
  element: element,
@@ -856,15 +856,15 @@ var Sortable = {
856
856
  position: parent.children.length,
857
857
  container: $(children[i]).down(options.treeTag)
858
858
  }
859
-
859
+
860
860
  /* Get the element containing the children and recurse over it */
861
861
  if (child.container)
862
862
  this._tree(child.container, options, child)
863
-
863
+
864
864
  parent.children.push (child);
865
865
  }
866
866
 
867
- return parent;
867
+ return parent;
868
868
  },
869
869
 
870
870
  tree: function(element) {
@@ -877,7 +877,7 @@ var Sortable = {
877
877
  name: element.id,
878
878
  format: sortableOptions.format
879
879
  }, arguments[1] || { });
880
-
880
+
881
881
  var root = {
882
882
  id: null,
883
883
  parent: null,
@@ -885,7 +885,7 @@ var Sortable = {
885
885
  container: element,
886
886
  position: 0
887
887
  }
888
-
888
+
889
889
  return Sortable._tree(element, options, root);
890
890
  },
891
891
 
@@ -901,7 +901,7 @@ var Sortable = {
901
901
  sequence: function(element) {
902
902
  element = $(element);
903
903
  var options = Object.extend(this.options(element), arguments[1] || { });
904
-
904
+
905
905
  return $(this.findElements(element, options) || []).map( function(item) {
906
906
  return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
907
907
  });
@@ -910,14 +910,14 @@ var Sortable = {
910
910
  setSequence: function(element, new_sequence) {
911
911
  element = $(element);
912
912
  var options = Object.extend(this.options(element), arguments[2] || { });
913
-
913
+
914
914
  var nodeMap = { };
915
915
  this.findElements(element, options).each( function(n) {
916
916
  if (n.id.match(options.format))
917
917
  nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
918
918
  n.parentNode.removeChild(n);
919
919
  });
920
-
920
+
921
921
  new_sequence.each(function(ident) {
922
922
  var n = nodeMap[ident];
923
923
  if (n) {
@@ -926,16 +926,16 @@ var Sortable = {
926
926
  }
927
927
  });
928
928
  },
929
-
929
+
930
930
  serialize: function(element) {
931
931
  element = $(element);
932
932
  var options = Object.extend(Sortable.options(element), arguments[1] || { });
933
933
  var name = encodeURIComponent(
934
934
  (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
935
-
935
+
936
936
  if (options.tree) {
937
937
  return Sortable.tree(element, arguments[1]).children.map( function (item) {
938
- return [name + Sortable._constructIndex(item) + "[id]=" +
938
+ return [name + Sortable._constructIndex(item) + "[id]=" +
939
939
  encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
940
940
  }).flatten().join('&');
941
941
  } else {
@@ -953,7 +953,7 @@ Element.isParent = function(child, element) {
953
953
  return Element.isParent(child.parentNode, element);
954
954
  }
955
955
 
956
- Element.findChildren = function(element, only, recursive, tagName) {
956
+ Element.findChildren = function(element, only, recursive, tagName) {
957
957
  if(!element.hasChildNodes()) return null;
958
958
  tagName = tagName.toUpperCase();
959
959
  if(only) only = [only].flatten();