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
@@ -1,7 +1,7 @@
1
1
  module Spec
2
2
  module Story
3
3
  module Runner
4
-
4
+
5
5
  class IllegalStepError < StandardError
6
6
  def initialize(state, event)
7
7
  super("Illegal attempt to create a #{event} after a #{state}")
@@ -14,7 +14,7 @@ module Spec
14
14
  @current_story_lines = []
15
15
  transition_to(:starting_state)
16
16
  end
17
-
17
+
18
18
  def parse(lines)
19
19
  lines.reject! {|line| line == ""}
20
20
  until lines.empty?
@@ -22,7 +22,7 @@ module Spec
22
22
  end
23
23
  @state.eof
24
24
  end
25
-
25
+
26
26
  def process_line(line)
27
27
  line.strip!
28
28
  case line
@@ -41,34 +41,34 @@ module Spec
41
41
  @current_story_lines.clear
42
42
  add_story_line(title)
43
43
  end
44
-
44
+
45
45
  def add_story_line(line)
46
46
  @current_story_lines << line
47
47
  end
48
-
48
+
49
49
  def create_story()
50
50
  unless @current_story_lines.empty?
51
51
  @story_mediator.create_story(@current_story_lines[0].gsub("Story: ",""), @current_story_lines[1..-1].join("\n"))
52
52
  @current_story_lines.clear
53
53
  end
54
54
  end
55
-
55
+
56
56
  def create_scenario(title)
57
57
  @story_mediator.create_scenario(title.gsub("Scenario: ",""))
58
58
  end
59
-
59
+
60
60
  def create_given(name)
61
61
  @story_mediator.create_given(name)
62
62
  end
63
-
63
+
64
64
  def create_given_scenario(name)
65
65
  @story_mediator.create_given_scenario(name)
66
66
  end
67
-
67
+
68
68
  def create_when(name)
69
69
  @story_mediator.create_when(name)
70
70
  end
71
-
71
+
72
72
  def create_then(name)
73
73
  @story_mediator.create_then(name)
74
74
  end
@@ -76,7 +76,7 @@ module Spec
76
76
  def transition_to(key)
77
77
  @state = states[key]
78
78
  end
79
-
79
+
80
80
  def states
81
81
  @states ||= {
82
82
  :starting_state => StartingState.new(self),
@@ -87,12 +87,12 @@ module Spec
87
87
  :then_state => ThenState.new(self)
88
88
  }
89
89
  end
90
-
90
+
91
91
  class State
92
92
  def initialize(parser)
93
93
  @parser = parser
94
94
  end
95
-
95
+
96
96
  def story(line)
97
97
  @parser.init_story(line)
98
98
  @parser.transition_to(:story_state)
@@ -107,17 +107,17 @@ module Spec
107
107
  @parser.create_given(remove_tag_from(:given, line))
108
108
  @parser.transition_to(:given_state)
109
109
  end
110
-
110
+
111
111
  def given_scenario(line)
112
112
  @parser.create_given_scenario(remove_tag_from(:givenscenario, line))
113
113
  @parser.transition_to(:given_state)
114
114
  end
115
-
115
+
116
116
  def event(line)
117
117
  @parser.create_when(remove_tag_from(:when, line))
118
118
  @parser.transition_to(:when_state)
119
119
  end
120
-
120
+
121
121
  def outcome(line)
122
122
  @parser.create_then(remove_tag_from(:then, line))
123
123
  @parser.transition_to(:then_state)
@@ -126,24 +126,24 @@ module Spec
126
126
  def remove_tag_from(tag, line)
127
127
  tokens = line.split
128
128
  # validation of tag can go here
129
- tokens[0].downcase.match(/#{tag.to_s}:?/) ?
129
+ tokens[0].downcase.match(/#{tag.to_s}:?/) ?
130
130
  (tokens[1..-1].join(' ')) : line
131
131
  end
132
132
 
133
133
  def eof
134
134
  end
135
-
135
+
136
136
  def other(line)
137
137
  # no-op - supports header text before the first story in a file
138
138
  end
139
139
  end
140
-
140
+
141
141
  class StartingState < State
142
142
  def initialize(parser)
143
143
  @parser = parser
144
144
  end
145
145
  end
146
-
146
+
147
147
  class StoryState < State
148
148
  def one_more_of_the_same(line)
149
149
  other(line)
@@ -153,29 +153,29 @@ module Spec
153
153
  @parser.create_story
154
154
  @parser.add_story_line(line)
155
155
  end
156
-
156
+
157
157
  def scenario(line)
158
158
  @parser.create_story
159
159
  @parser.create_scenario(line)
160
160
  @parser.transition_to(:scenario_state)
161
161
  end
162
-
162
+
163
163
  def given(line)
164
164
  other(line)
165
165
  end
166
-
166
+
167
167
  def event(line)
168
168
  other(line)
169
169
  end
170
-
170
+
171
171
  def outcome(line)
172
172
  other(line)
173
173
  end
174
-
174
+
175
175
  def other(line)
176
176
  @parser.add_story_line(line)
177
177
  end
178
-
178
+
179
179
  def eof
180
180
  @parser.create_story
181
181
  end
@@ -190,17 +190,17 @@ module Spec
190
190
  @parser.create_scenario(line)
191
191
  end
192
192
  end
193
-
193
+
194
194
  class GivenState < State
195
195
  def one_more_of_the_same(line)
196
196
  @parser.create_given(remove_tag_from(:and, line))
197
197
  end
198
-
198
+
199
199
  def given(line)
200
200
  @parser.create_given(remove_tag_from(:given, line))
201
201
  end
202
202
  end
203
-
203
+
204
204
  class WhenState < State
205
205
  def one_more_of_the_same(line)
206
206
  @parser.create_when(remove_tag_from(:and ,line))
@@ -4,14 +4,14 @@ module Spec
4
4
  class StoryRunner
5
5
  class << self
6
6
  attr_accessor :current_story_runner
7
-
7
+
8
8
  def scenario_from_current_story(scenario_name)
9
9
  current_story_runner.scenario_from_current_story(scenario_name)
10
10
  end
11
11
  end
12
-
12
+
13
13
  attr_accessor :stories, :scenarios, :current_story
14
-
14
+
15
15
  def initialize(scenario_runner, world_creator = World)
16
16
  StoryRunner.current_story_runner = self
17
17
  @scenario_runner = scenario_runner
@@ -21,18 +21,18 @@ module Spec
21
21
  @scenarios = []
22
22
  @listeners = []
23
23
  end
24
-
24
+
25
25
  def Story(title, narrative, params = {}, &body)
26
26
  story = Story.new(title, narrative, params, &body)
27
27
  @stories << story
28
-
28
+
29
29
  # collect scenarios
30
30
  collector = ScenarioCollector.new(story)
31
31
  story.run_in(collector)
32
32
  @scenarios += collector.scenarios
33
33
  @scenarios_by_story[story.title] = collector.scenarios
34
34
  end
35
-
35
+
36
36
  def run_stories
37
37
  return if @stories.empty?
38
38
  @listeners.each { |l| l.run_started(scenarios.size) }
@@ -54,11 +54,11 @@ module Spec
54
54
  @listeners.each { |l| l.collected_steps(unique_steps) }
55
55
  @listeners.each { |l| l.run_ended }
56
56
  end
57
-
57
+
58
58
  def add_listener(listener)
59
59
  @listeners << listener
60
60
  end
61
-
61
+
62
62
  def scenario_from_current_story(scenario_name)
63
63
  @scenarios_by_story[@current_story.title].find {|s| s.name == scenario_name }
64
64
  end
@@ -12,7 +12,7 @@ module Spec
12
12
  def run_options # :nodoc:
13
13
  @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout)
14
14
  end
15
-
15
+
16
16
  def story_runner # :nodoc:
17
17
  unless @story_runner
18
18
  @story_runner = StoryRunner.new(scenario_runner, world_creator)
@@ -23,33 +23,33 @@ module Spec
23
23
  end
24
24
  @story_runner
25
25
  end
26
-
26
+
27
27
  def scenario_runner # :nodoc:
28
28
  @scenario_runner ||= ScenarioRunner.new
29
29
  end
30
-
30
+
31
31
  def world_creator # :nodoc:
32
32
  @world_creator ||= World
33
33
  end
34
-
34
+
35
35
  # Use this to register a customer output formatter.
36
36
  def register_listener(listener)
37
37
  story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended
38
38
  world_creator.add_listener(listener) # found_scenario, step_succeeded, step_failed, step_failed
39
39
  scenario_runner.add_listener(listener) # scenario_started, scenario_succeeded, scenario_pending, scenario_failed
40
40
  end
41
-
41
+
42
42
  def register_exit_hook # :nodoc:
43
43
  at_exit do
44
44
  Runner.story_runner.run_stories unless $!
45
45
  end
46
46
  # TODO exit with non-zero status if run fails
47
47
  end
48
-
48
+
49
49
  def dry_run
50
50
  run_options.dry_run
51
51
  end
52
-
52
+
53
53
  end
54
54
  end
55
55
  end
@@ -3,7 +3,7 @@ module Spec
3
3
  module Story
4
4
  class Scenario
5
5
  attr_accessor :name, :body, :story
6
-
6
+
7
7
  def initialize(story, name, &body)
8
8
  @story = story
9
9
  @name = name
@@ -3,7 +3,7 @@ module Spec
3
3
  class Step
4
4
  PARAM_PATTERN = /(\$\w*)/
5
5
  PARAM_OR_GROUP_PATTERN = /(\$\w*)|\(.*?\)/
6
-
6
+
7
7
  attr_reader :name
8
8
  def initialize(name, &block)
9
9
  @name = name
@@ -22,23 +22,23 @@ module Spec
22
22
  define_method(sanitized_name, &block)
23
23
  end
24
24
  end
25
-
25
+
26
26
  def sanitize(a_string_or_regexp)
27
27
  return a_string_or_regexp.source if Regexp == a_string_or_regexp
28
28
  a_string_or_regexp.to_s
29
29
  end
30
-
30
+
31
31
 
32
32
  def matches?(name)
33
33
  !(matches = name.match(@expression)).nil?
34
34
  end
35
-
35
+
36
36
  def parse_args(name)
37
37
  name.match(@expression)[1..-1]
38
38
  end
39
39
 
40
40
  private
41
-
41
+
42
42
  def assign_expression(string_or_regexp)
43
43
  if String === string_or_regexp
44
44
  expression = string_or_regexp.dup
@@ -15,7 +15,7 @@ module Spec
15
15
  @step_group.instance_eval(&block) if block
16
16
  @step_group
17
17
  end
18
-
18
+
19
19
  def initialize(init_defaults=true, &block)
20
20
  @hash_of_lists_of_steps = Hash.new {|h, k| h[k] = []}
21
21
  if init_defaults
@@ -23,7 +23,7 @@ module Spec
23
23
  end
24
24
  instance_eval(&block) if block
25
25
  end
26
-
26
+
27
27
  def find(type, name)
28
28
  @hash_of_lists_of_steps[type].each do |step|
29
29
  return step if step.matches?(name)
@@ -34,15 +34,15 @@ module Spec
34
34
  def GivenScenario(name, &block)
35
35
  create_matcher(:given_scenario, name, &block)
36
36
  end
37
-
37
+
38
38
  def Given(name, &block)
39
39
  create_matcher(:given, name, &block)
40
40
  end
41
-
41
+
42
42
  def When(name, &block)
43
43
  create_matcher(:when, name, &block)
44
44
  end
45
-
45
+
46
46
  def Then(name, &block)
47
47
  create_matcher(:then, name, &block)
48
48
  end
@@ -51,39 +51,39 @@ module Spec
51
51
  alias :given :Given
52
52
  alias :when :When
53
53
  alias :then :Then
54
-
54
+
55
55
  def add(type, steps)
56
56
  (@hash_of_lists_of_steps[type] << steps).flatten!
57
57
  end
58
-
58
+
59
59
  def clear
60
60
  @hash_of_lists_of_steps.clear
61
61
  end
62
-
62
+
63
63
  def empty?
64
64
  [:given_scenario, :given, :when, :then].each do |type|
65
65
  return false unless @hash_of_lists_of_steps[type].empty?
66
66
  end
67
67
  return true
68
68
  end
69
-
69
+
70
70
  def add_to(other_step_matchers)
71
71
  [:given_scenario, :given, :when, :then].each do |type|
72
72
  other_step_matchers.add(type, @hash_of_lists_of_steps[type])
73
73
  end
74
74
  end
75
-
75
+
76
76
  def <<(other_step_matchers)
77
77
  other_step_matchers.add_to(self) if other_step_matchers.respond_to?(:add_to)
78
78
  end
79
-
79
+
80
80
  # TODO - make me private
81
81
  def create_matcher(type, name, &block)
82
82
  matcher = Step.new(name, &block)
83
83
  @hash_of_lists_of_steps[type] << matcher
84
84
  matcher
85
85
  end
86
-
86
+
87
87
  end
88
88
  end
89
89
  end
@@ -4,15 +4,15 @@ module Spec
4
4
  def initialize
5
5
  @steps = StepGroup.new
6
6
  end
7
-
7
+
8
8
  def use(new_step_group)
9
9
  @steps << new_step_group
10
10
  end
11
-
11
+
12
12
  def store(type, step)
13
13
  @steps.add(type, step)
14
14
  end
15
-
15
+
16
16
  def find(type, name)
17
17
  if @steps.find(type, name).nil?
18
18
  @steps.add(type,
@@ -23,15 +23,15 @@ module Spec
23
23
  end
24
24
  @steps.find(type, name)
25
25
  end
26
-
26
+
27
27
  def clear
28
28
  @steps.clear
29
29
  end
30
-
30
+
31
31
  def empty?
32
32
  @steps.empty?
33
33
  end
34
-
34
+
35
35
  end
36
36
  end
37
37
  end
@@ -2,22 +2,22 @@ module Spec
2
2
  module Story
3
3
  class Story
4
4
  attr_reader :title, :narrative
5
-
5
+
6
6
  def initialize(title, narrative, params = {}, &body)
7
7
  @body = body
8
8
  @title = title
9
9
  @narrative = narrative
10
10
  @params = params
11
11
  end
12
-
12
+
13
13
  def [](key)
14
14
  @params[key]
15
15
  end
16
-
16
+
17
17
  def run_in(obj)
18
18
  obj.instance_eval(&@body)
19
19
  end
20
-
20
+
21
21
  def assign_steps_to(assignee)
22
22
  if @params[:steps]
23
23
  assignee.use(@params[:steps])
@@ -33,7 +33,7 @@ module Spec
33
33
  end
34
34
  end
35
35
  end
36
-
36
+
37
37
  def steps_for(key)
38
38
  $rspec_story_steps[key]
39
39
  end
@@ -7,7 +7,7 @@ module Spec
7
7
  module Story
8
8
  =begin
9
9
  A World represents the actual instance a scenario will run in.
10
-
10
+
11
11
  The runner ensures any instance variables and methods defined anywhere
12
12
  in a story block are available to all the scenarios. This includes
13
13
  variables that are created or referenced inside Given, When and Then
@@ -23,23 +23,23 @@ module Spec
23
23
  def create(cls = Object, *args)
24
24
  cls.new(*args).extend(World)
25
25
  end
26
-
26
+
27
27
  def listeners
28
28
  @listeners ||= []
29
29
  end
30
-
30
+
31
31
  def add_listener(listener)
32
32
  listeners() << listener
33
33
  end
34
-
34
+
35
35
  def step_mother
36
36
  @step_mother ||= StepMother.new
37
37
  end
38
-
38
+
39
39
  def use(steps)
40
40
  step_mother.use(steps)
41
41
  end
42
-
42
+
43
43
  def step_names
44
44
  @step_names ||= []
45
45
  end
@@ -54,7 +54,7 @@ module Spec
54
54
  @listeners.replace(current_listeners)
55
55
  end
56
56
  end
57
-
57
+
58
58
  def store_and_call(world, type, name, *args, &block)
59
59
  if block_given?
60
60
  step_mother.store(type, Step.new(name, &block))
@@ -63,7 +63,7 @@ module Spec
63
63
 
64
64
  step_name = step.name
65
65
  step_names << step_name
66
-
66
+
67
67
  # It's important to have access to the parsed args here, so
68
68
  # we can give them to the listeners. The HTML reporter needs
69
69
  # the args so it can style them. See the generated output in
@@ -83,40 +83,40 @@ module Spec
83
83
  errors << e
84
84
  end
85
85
  end
86
-
86
+
87
87
  def errors
88
88
  @errors ||= []
89
89
  end
90
90
  end # end of class << self
91
-
91
+
92
92
  def start_collecting_errors
93
93
  errors.clear
94
94
  end
95
-
95
+
96
96
  def errors
97
97
  World.errors
98
98
  end
99
-
99
+
100
100
  def GivenScenario(name)
101
101
  World.run_given_scenario_with_suspended_listeners(self, :'given scenario', name, GivenScenario.new(name))
102
102
  @__previous_step = :given
103
103
  end
104
-
104
+
105
105
  def Given(name, *args, &block)
106
106
  World.store_and_call self, :given, name, *args, &block
107
107
  @__previous_step = :given
108
108
  end
109
-
109
+
110
110
  def When(name, *args, &block)
111
111
  World.store_and_call self, :when, name, *args, &block
112
112
  @__previous_step = :when
113
113
  end
114
-
114
+
115
115
  def Then(name, *args, &block)
116
116
  World.store_and_call self, :then, name, *args, &block
117
117
  @__previous_step = :then
118
118
  end
119
-
119
+
120
120
  def And(name, *args, &block)
121
121
  World.store_and_call self, @__previous_step, name, *args, &block
122
122
  end