rspec 1.1.12 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (267) hide show
  1. data/.autotest +2 -1
  2. data/.document +7 -0
  3. data/History.txt +58 -0
  4. data/License.txt +1 -1
  5. data/Manifest.txt +45 -82
  6. data/README.txt +3 -6
  7. data/Rakefile +33 -13
  8. data/Ruby1.9.markdown +32 -0
  9. data/TODO.txt +10 -4
  10. data/Upgrade.markdown +63 -0
  11. data/bin/spec +1 -1
  12. data/cucumber.yml +3 -0
  13. data/examples/failing/{failing_autogenerated_docstrings_example.rb → failing_implicit_docstrings_example.rb} +0 -0
  14. data/examples/failing/pending_example.rb +9 -0
  15. data/examples/failing/spec_helper.rb +1 -1
  16. data/examples/passing/{custom_expectation_matchers.rb → custom_matchers.rb} +0 -0
  17. data/examples/passing/filtered_formatter.rb +18 -0
  18. data/examples/passing/filtered_formatter_example.rb +31 -0
  19. data/examples/passing/implicit_docstrings_example.rb +18 -0
  20. data/examples/passing/spec_helper.rb +1 -1
  21. data/examples/ruby1.9.compatibility/access_to_constants_spec.rb +17 -18
  22. data/features/before_and_after_blocks/before_and_after_blocks.feature +4 -4
  23. data/features/example_groups/example_group_with_should_methods.feature +1 -1
  24. data/features/example_groups/{autogenerated_docstrings.feature → implicit_docstrings.feature} +7 -9
  25. data/features/example_groups/nested_groups.feature +1 -1
  26. data/features/heckle/heckle.feature +56 -0
  27. data/features/interop/examples_and_tests_together.feature +1 -1
  28. data/features/interop/test_but_not_test_unit.feature +1 -1
  29. data/features/interop/test_case_with_should_methods.feature +1 -1
  30. data/features/matchers/create_matcher.feature +115 -0
  31. data/features/mock_framework_integration/use_flexmock.feature +22 -4
  32. data/features/mock_framework_integration/use_mocha.feature +27 -0
  33. data/features/mock_framework_integration/use_rr.feature +27 -0
  34. data/features/mocks/mix_stubs_and_mocks.feature +22 -0
  35. data/features/pending/pending_examples.feature +81 -0
  36. data/features/step_definitions/running_rspec.rb +5 -3
  37. data/features/support/env.rb +1 -1
  38. data/features/support/matchers/smart_match.rb +2 -2
  39. data/lib/autotest/rspec.rb +1 -1
  40. data/lib/spec.rb +1 -1
  41. data/lib/{adapters → spec/adapters}/mock_frameworks/flexmock.rb +0 -0
  42. data/lib/{adapters → spec/adapters}/mock_frameworks/mocha.rb +0 -0
  43. data/lib/{adapters → spec/adapters}/mock_frameworks/rr.rb +0 -0
  44. data/lib/{adapters → spec/adapters}/mock_frameworks/rspec.rb +0 -1
  45. data/lib/spec/autorun.rb +3 -0
  46. data/lib/spec/dsl.rb +3 -1
  47. data/lib/spec/dsl/matchers.rb +13 -0
  48. data/lib/spec/example.rb +4 -0
  49. data/lib/spec/example/before_and_after_hooks.rb +5 -20
  50. data/lib/spec/example/errors.rb +3 -3
  51. data/lib/spec/example/example_description.rb +15 -0
  52. data/lib/spec/example/example_group.rb +0 -15
  53. data/lib/spec/example/example_group_factory.rb +34 -46
  54. data/lib/spec/example/example_group_hierarchy.rb +53 -0
  55. data/lib/spec/example/example_group_methods.rb +101 -211
  56. data/lib/spec/example/example_methods.rb +61 -81
  57. data/lib/spec/example/module_reopening_fix.rb +23 -1
  58. data/lib/spec/example/pending.rb +3 -2
  59. data/lib/spec/example/predicate_matchers.rb +47 -0
  60. data/lib/spec/example/subject.rb +91 -0
  61. data/lib/spec/expectations.rb +1 -1
  62. data/lib/spec/expectations/differs/default.rb +0 -1
  63. data/lib/spec/expectations/extensions.rb +0 -1
  64. data/lib/spec/expectations/handler.rb +13 -6
  65. data/lib/spec/interop/test.rb +5 -0
  66. data/lib/spec/interop/test/unit/testcase.rb +5 -22
  67. data/lib/spec/matchers.rb +22 -8
  68. data/lib/spec/matchers/be.rb +4 -9
  69. data/lib/spec/matchers/be_close.rb +20 -5
  70. data/lib/spec/matchers/be_instance_of.rb +45 -0
  71. data/lib/spec/matchers/be_kind_of.rb +45 -0
  72. data/lib/spec/matchers/change.rb +8 -6
  73. data/lib/spec/matchers/compatibility.rb +14 -0
  74. data/lib/spec/matchers/eql.rb +24 -6
  75. data/lib/spec/matchers/equal.rb +24 -6
  76. data/lib/spec/matchers/exist.rb +21 -5
  77. data/lib/spec/matchers/extensions/instance_exec.rb +25 -0
  78. data/lib/spec/matchers/generated_descriptions.rb +2 -2
  79. data/lib/spec/matchers/has.rb +28 -11
  80. data/lib/spec/matchers/have.rb +2 -2
  81. data/lib/spec/matchers/include.rb +2 -2
  82. data/lib/spec/matchers/match.rb +25 -7
  83. data/lib/spec/matchers/match_array.rb +3 -3
  84. data/lib/spec/matchers/matcher.rb +51 -0
  85. data/lib/spec/matchers/method_missing.rb +2 -2
  86. data/lib/spec/matchers/operator_matcher.rb +12 -5
  87. data/lib/spec/matchers/raise_error.rb +3 -3
  88. data/lib/spec/matchers/respond_to.rb +3 -3
  89. data/lib/spec/matchers/satisfy.rb +7 -7
  90. data/lib/spec/matchers/throw_symbol.rb +3 -5
  91. data/lib/spec/mocks.rb +3 -3
  92. data/lib/spec/mocks/argument_expectation.rb +15 -15
  93. data/lib/spec/mocks/{argument_constraints.rb → argument_matchers.rb} +19 -23
  94. data/lib/spec/mocks/error_generator.rb +5 -8
  95. data/lib/spec/mocks/framework.rb +1 -1
  96. data/lib/spec/mocks/message_expectation.rb +5 -13
  97. data/lib/spec/mocks/mock.rb +4 -5
  98. data/lib/spec/mocks/proxy.rb +9 -5
  99. data/lib/spec/mocks/spec_methods.rb +10 -1
  100. data/lib/spec/rake/spectask.rb +0 -1
  101. data/lib/spec/runner.rb +6 -28
  102. data/lib/spec/runner/configuration.rb +3 -3
  103. data/lib/spec/runner/drb_command_line.rb +2 -1
  104. data/lib/spec/runner/example_group_runner.rb +3 -2
  105. data/lib/spec/runner/formatter/base_text_formatter.rb +34 -19
  106. data/lib/spec/runner/formatter/failing_example_groups_formatter.rb +3 -5
  107. data/lib/spec/runner/formatter/html_formatter.rb +2 -3
  108. data/lib/spec/runner/formatter/nested_text_formatter.rb +7 -25
  109. data/lib/spec/runner/formatter/progress_bar_formatter.rb +1 -1
  110. data/lib/spec/runner/formatter/snippet_extractor.rb +1 -1
  111. data/lib/spec/runner/formatter/specdoc_formatter.rb +1 -7
  112. data/lib/spec/runner/heckle_runner.rb +3 -6
  113. data/lib/spec/runner/heckle_runner_unsupported.rb +1 -1
  114. data/lib/spec/runner/option_parser.rb +19 -21
  115. data/lib/spec/runner/options.rb +32 -27
  116. data/lib/spec/runner/reporter.rb +8 -9
  117. data/lib/spec/test/unit.rb +10 -0
  118. data/lib/spec/version.rb +2 -2
  119. data/{features/support → resources}/helpers/cmdline.rb +2 -2
  120. data/resources/rake/verify_rcov.rake +1 -1
  121. data/resources/spec/example_group_with_should_methods.rb +1 -1
  122. data/resources/spec/simple_spec.rb +1 -1
  123. data/resources/test/spec_and_test_together.rb +2 -3
  124. data/resources/test/spec_including_test_but_not_unit.rb +1 -1
  125. data/resources/test/test_case_with_should_methods.rb +2 -3
  126. data/spec/autotest/autotest_helper.rb +0 -1
  127. data/spec/autotest/rspec_spec.rb +95 -98
  128. data/spec/spec/dsl/main_spec.rb +3 -3
  129. data/spec/spec/dsl/matchers_spec.rb +25 -0
  130. data/spec/spec/example/example_group_class_definition_spec.rb +14 -15
  131. data/spec/spec/example/example_group_factory_spec.rb +31 -44
  132. data/spec/spec/example/example_group_methods_spec.rb +86 -52
  133. data/spec/spec/example/example_group_spec.rb +32 -79
  134. data/spec/spec/example/example_matcher_spec.rb +10 -10
  135. data/spec/spec/example/example_methods_spec.rb +108 -242
  136. data/spec/spec/example/nested_example_group_spec.rb +2 -2
  137. data/spec/spec/example/pending_module_spec.rb +66 -41
  138. data/spec/spec/example/shared_example_group_spec.rb +4 -4
  139. data/spec/spec/{matchers → expectations}/handler_spec.rb +52 -4
  140. data/spec/spec/interop/test/unit/resources/spec_that_fails.rb +2 -2
  141. data/spec/spec/interop/test/unit/resources/spec_that_passes.rb +2 -2
  142. data/spec/spec/interop/test/unit/resources/spec_with_errors.rb +2 -2
  143. data/spec/spec/interop/test/unit/resources/spec_with_options_hash.rb +2 -2
  144. data/spec/spec/interop/test/unit/resources/test_case_that_fails.rb +2 -2
  145. data/spec/spec/interop/test/unit/resources/test_case_that_passes.rb +2 -2
  146. data/spec/spec/interop/test/unit/resources/test_case_with_errors.rb +2 -2
  147. data/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb +2 -2
  148. data/spec/spec/interop/test/unit/testcase_spec.rb +0 -4
  149. data/spec/spec/matchers/be_close_spec.rb +1 -1
  150. data/spec/spec/matchers/be_instance_of_spec.rb +29 -0
  151. data/spec/spec/matchers/be_kind_of_spec.rb +29 -0
  152. data/spec/spec/matchers/change_spec.rb +20 -0
  153. data/spec/spec/matchers/compatibility_spec.rb +34 -0
  154. data/spec/spec/matchers/description_generation_spec.rb +0 -12
  155. data/spec/spec/matchers/eql_spec.rb +2 -2
  156. data/spec/spec/matchers/equal_spec.rb +2 -2
  157. data/spec/spec/matchers/exist_spec.rb +8 -4
  158. data/spec/spec/matchers/have_spec.rb +4 -4
  159. data/spec/spec/matchers/match_spec.rb +2 -2
  160. data/spec/spec/matchers/matcher_methods_spec.rb +1 -1
  161. data/spec/spec/matchers/matcher_spec.rb +97 -0
  162. data/spec/spec/matchers/throw_symbol_spec.rb +8 -8
  163. data/spec/spec/mocks/{bug_report_496.rb → bug_report_496_spec.rb} +0 -0
  164. data/spec/spec/mocks/{failing_mock_argument_constraints_spec.rb → failing_argument_matchers_spec.rb} +2 -2
  165. data/spec/spec/mocks/hash_including_matcher_spec.rb +4 -4
  166. data/spec/spec/mocks/hash_not_including_matcher_spec.rb +3 -3
  167. data/spec/spec/mocks/mock_spec.rb +27 -2
  168. data/spec/spec/mocks/nil_expectation_warning_spec.rb +1 -1
  169. data/spec/spec/mocks/partial_mock_spec.rb +18 -3
  170. data/spec/spec/mocks/{passing_mock_argument_constraints_spec.rb → passing_argument_matchers_spec.rb} +6 -6
  171. data/spec/spec/mocks/stubbed_message_expectations_spec.rb +13 -1
  172. data/spec/spec/package/bin_spec_spec.rb +2 -2
  173. data/spec/spec/runner/configuration_spec.rb +12 -12
  174. data/spec/spec/runner/drb_command_line_spec.rb +71 -73
  175. data/spec/spec/runner/formatter/base_text_formatter_spec.rb +82 -1
  176. data/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb +8 -8
  177. data/spec/spec/runner/formatter/failing_examples_formatter_spec.rb +4 -4
  178. data/spec/spec/runner/formatter/html_formatted-1.8.6.html +8 -8
  179. data/spec/spec/runner/formatter/html_formatted-1.8.7.html +38 -26
  180. data/spec/spec/runner/formatter/html_formatted-1.9.1.html +61 -53
  181. data/spec/spec/runner/formatter/html_formatter_spec.rb +100 -48
  182. data/spec/spec/runner/formatter/nested_text_formatter_spec.rb +20 -34
  183. data/spec/spec/runner/formatter/profile_formatter_spec.rb +2 -1
  184. data/spec/spec/runner/formatter/progress_bar_formatter_spec.rb +9 -6
  185. data/spec/spec/runner/formatter/specdoc_formatter_spec.rb +6 -6
  186. data/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html +20 -20
  187. data/spec/spec/runner/formatter/text_mate_formatted-1.8.7.html +38 -26
  188. data/spec/spec/runner/formatter/text_mate_formatted-1.9.1.html +55 -47
  189. data/spec/spec/runner/formatter/{spec_mate_formatter_spec.rb → text_mate_formatter_spec.rb} +11 -9
  190. data/spec/spec/runner/heckle_runner_spec.rb +1 -1
  191. data/spec/spec/runner/heckler_spec.rb +1 -1
  192. data/spec/spec/runner/option_parser_spec.rb +28 -11
  193. data/spec/spec/runner/options_spec.rb +34 -0
  194. data/spec/spec/runner/reporter_spec.rb +66 -62
  195. data/spec/spec/runner/resources/utf8_encoded.rb +1 -0
  196. data/spec/spec/runner/spec_drb.opts +1 -0
  197. data/spec/spec/runner_spec.rb +7 -5
  198. data/spec/spec_helper.rb +24 -2
  199. metadata +49 -90
  200. data/examples/passing/autogenerated_docstrings_example.rb +0 -25
  201. data/examples/passing/before_and_after_example.rb +0 -40
  202. data/examples/passing/behave_as_example.rb +0 -45
  203. data/examples/passing/legacy_spec.rb +0 -11
  204. data/examples/passing/priority.txt +0 -1
  205. data/features/support/helpers/story_helper.rb +0 -16
  206. data/lib/spec/expectations/extensions/string_and_symbol.rb +0 -17
  207. data/lib/spec/runner/formatter/story/html_formatter.rb +0 -174
  208. data/lib/spec/runner/formatter/story/plain_text_formatter.rb +0 -194
  209. data/lib/spec/runner/formatter/story/progress_bar_formatter.rb +0 -42
  210. data/lib/spec/story.rb +0 -10
  211. data/lib/spec/story/extensions.rb +0 -3
  212. data/lib/spec/story/extensions/main.rb +0 -86
  213. data/lib/spec/story/extensions/regexp.rb +0 -9
  214. data/lib/spec/story/extensions/string.rb +0 -9
  215. data/lib/spec/story/given_scenario.rb +0 -14
  216. data/lib/spec/story/runner.rb +0 -57
  217. data/lib/spec/story/runner/plain_text_story_runner.rb +0 -48
  218. data/lib/spec/story/runner/scenario_collector.rb +0 -18
  219. data/lib/spec/story/runner/scenario_runner.rb +0 -54
  220. data/lib/spec/story/runner/story_mediator.rb +0 -137
  221. data/lib/spec/story/runner/story_parser.rb +0 -247
  222. data/lib/spec/story/runner/story_runner.rb +0 -74
  223. data/lib/spec/story/scenario.rb +0 -14
  224. data/lib/spec/story/step.rb +0 -70
  225. data/lib/spec/story/step_group.rb +0 -89
  226. data/lib/spec/story/step_mother.rb +0 -38
  227. data/lib/spec/story/story.rb +0 -39
  228. data/lib/spec/story/world.rb +0 -124
  229. data/resources/spec/spec_with_flexmock.rb +0 -19
  230. data/rspec.gemspec +0 -32
  231. data/spec/spec/matchers/mock_constraint_matchers_spec.rb +0 -24
  232. data/spec/spec/runner/formatter/story/html_formatter_spec.rb +0 -135
  233. data/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb +0 -600
  234. data/spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb +0 -82
  235. data/spec/spec/spec_spec.rb +0 -21
  236. data/spec/spec/story/builders.rb +0 -46
  237. data/spec/spec/story/extensions/main_spec.rb +0 -161
  238. data/spec/spec/story/extensions_spec.rb +0 -14
  239. data/spec/spec/story/given_scenario_spec.rb +0 -27
  240. data/spec/spec/story/runner/plain_text_story_runner_spec.rb +0 -90
  241. data/spec/spec/story/runner/scenario_collector_spec.rb +0 -27
  242. data/spec/spec/story/runner/scenario_runner_spec.rb +0 -214
  243. data/spec/spec/story/runner/story_mediator_spec.rb +0 -143
  244. data/spec/spec/story/runner/story_parser_spec.rb +0 -401
  245. data/spec/spec/story/runner/story_runner_spec.rb +0 -294
  246. data/spec/spec/story/runner_spec.rb +0 -93
  247. data/spec/spec/story/scenario_spec.rb +0 -18
  248. data/spec/spec/story/step_group_spec.rb +0 -157
  249. data/spec/spec/story/step_mother_spec.rb +0 -84
  250. data/spec/spec/story/step_spec.rb +0 -272
  251. data/spec/spec/story/story_helper.rb +0 -2
  252. data/spec/spec/story/story_spec.rb +0 -84
  253. data/spec/spec/story/world_spec.rb +0 -423
  254. data/story_server/prototype/javascripts/builder.js +0 -136
  255. data/story_server/prototype/javascripts/controls.js +0 -972
  256. data/story_server/prototype/javascripts/dragdrop.js +0 -976
  257. data/story_server/prototype/javascripts/effects.js +0 -1117
  258. data/story_server/prototype/javascripts/prototype.js +0 -4140
  259. data/story_server/prototype/javascripts/rspec.js +0 -149
  260. data/story_server/prototype/javascripts/scriptaculous.js +0 -58
  261. data/story_server/prototype/javascripts/slider.js +0 -276
  262. data/story_server/prototype/javascripts/sound.js +0 -55
  263. data/story_server/prototype/javascripts/unittest.js +0 -568
  264. data/story_server/prototype/lib/server.rb +0 -24
  265. data/story_server/prototype/stories.html +0 -176
  266. data/story_server/prototype/stylesheets/rspec.css +0 -136
  267. data/story_server/prototype/stylesheets/test.css +0 -90
@@ -1,149 +0,0 @@
1
- var InPlaceEditor = {};
2
- InPlaceEditor.Local = Class.create();
3
- Object.extend(Object.extend(InPlaceEditor.Local.prototype, Ajax.InPlaceEditor.prototype), {
4
- enterHover: function() {},
5
- leaveHover: function() {},
6
- onComplete: function() {},
7
- handleFormSubmission: function(e) {
8
- var value = $F(this._controls.editor);
9
- RSpec.addStockStep(value);
10
- this.element.innerHTML = value;
11
- this.leaveEditMode();
12
- if (e) Event.stop(e);
13
- }
14
- });
15
-
16
- var RSpec = {
17
- stockSteps: function() {
18
- return $('stock_steps').childElements().map(function(li){
19
- return li.innerHTML;
20
- }).sort();
21
- },
22
-
23
- addStockStep: function(stockStep) {
24
- if(!this.stockSteps().include(stockStep)) {
25
- $('stock_steps').appendChild(Builder.node('li', {}, stockStep));
26
- }
27
- },
28
-
29
- makeParamEditors: function() {
30
- $$('span.param').each(function(span) {
31
- span.removeClassName('param');
32
- span.addClassName('param_editor');
33
- new InPlaceEditor.Local(span, null, {});
34
- });
35
- },
36
-
37
- setId: function(e) {
38
- if(!this.currentId) this.currentId = 0;
39
- this.currentId++;
40
- e.id = "id_" + this.currentId;
41
- },
42
-
43
- applyUi: function() {
44
- this.setUpTogglers();
45
- this.makeParamEditors();
46
-
47
- var currentId = 0;
48
- $$('ul.steps').each(function(ul) {
49
- RSpec.setId(ul);
50
- var footer = document.createElement("p");
51
- var addStepLink = document.createElement("a");
52
- addStepLink.href = "#";
53
- addStepLink.appendChild(document.createTextNode('Add step'));
54
- footer.appendChild(addStepLink);
55
- ul.parentNode.appendChild(footer);
56
-
57
- Sortable.create(ul, {
58
- scroll: window
59
- });
60
-
61
- /* Disable for now - it messes with the autocomplete's visibility (zIndex galore)
62
- Droppables.add(footer, {
63
- hoverclass: 'wastebin',
64
- onDrop: function(li, droppable, evt) {
65
- li.remove();
66
- }
67
- });
68
- */
69
- Event.observe(addStepLink, 'click', function() {
70
- var form = Builder.node('form', {});
71
-
72
- var li = Builder.node('li', {className: 'new'});
73
- var input = Builder.node('input', {}, 'New step here');
74
- var autoComplete = Builder.node('div', {className: 'auto_complete'}, '');
75
-
76
- li.appendChild(form);
77
- form.appendChild(input);
78
- form.appendChild(autoComplete);
79
- ul.appendChild(li);
80
- Sortable.destroy(ul);
81
- Sortable.create(ul);
82
-
83
- Event.observe(form, 'submit', function(e) {
84
- var value = input.value;
85
- Element.remove(this);
86
- li.innerHTML = value.gsub(/(\$[a-z]*)/, '<span class="param">#{1}</span>');
87
- RSpec.makeParamEditors();
88
- if (e) Event.stop(e);
89
- });
90
-
91
- var ac = new Autocompleter.Local(input, autoComplete, RSpec.stockSteps(), {});
92
- input.focus();
93
- });
94
- })
95
- },
96
-
97
- setUpTogglers: function() {
98
- $$('dt').each(function(dt) {
99
- var dd = dt.parentNode.getElementsByTagName('dd')[0];
100
- dt.onclick = function(){
101
- dd.toggle();
102
- }
103
- });
104
- }
105
- };
106
-
107
- var StoryDom = {
108
- narrativeText: function(s) {
109
- return s.split(/\n/m).map(function(line){
110
- if(line == "" || line.match(/^\s+$/) ) {
111
- return null;
112
- } else {
113
- return " " + (line.gsub(/^\s+/, '').gsub(/<br \/>/, "\n").gsub(/<br>/, "\n"));
114
- }
115
- }).compact().join("");
116
- },
117
-
118
- stepText: function(s) {
119
- return s.gsub(/<span[^>]*>([^<]*)<\/span>/, "#{1}");
120
- },
121
-
122
- scenario: function(dl) {
123
- var scenario = ' Scenario: ' + dl.getElementsByTagName('dt')[0].innerHTML + '\n';
124
- scenario += $A(dl.getElementsByTagName('li')).map(function(li){
125
- return ' ' + StoryDom.stepText(li.innerHTML);
126
- }).join("\n") + "\n";
127
- return scenario;
128
- },
129
-
130
- story: function() {
131
- var dl = $$('dl.story')[0];
132
- var story = 'Story: ' + dl.getElementsByTagName('dt')[0].innerHTML + '\n\n';
133
- story += this.narrativeText(dl.getElementsByTagName('p')[0].innerHTML) + '\n';
134
- story += $A(dl.getElementsByTagName('dl')).map(function(scenarioDl){
135
- return StoryDom.scenario(scenarioDl);
136
- }).join("\n");
137
- return story;
138
- },
139
-
140
- save: function() {
141
- new Ajax.Request('stories', {
142
- postBody: this.story()
143
- });
144
- }
145
- };
146
-
147
- Event.observe(window, 'load', function() {
148
- RSpec.applyUi();
149
- });
@@ -1,58 +0,0 @@
1
- // script.aculo.us scriptaculous.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
2
-
3
- // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
4
- //
5
- // Permission is hereby granted, free of charge, to any person obtaining
6
- // a copy of this software and associated documentation files (the
7
- // "Software"), to deal in the Software without restriction, including
8
- // without limitation the rights to use, copy, modify, merge, publish,
9
- // distribute, sublicense, and/or sell copies of the Software, and to
10
- // permit persons to whom the Software is furnished to do so, subject to
11
- // the following conditions:
12
- //
13
- // The above copyright notice and this permission notice shall be
14
- // included in all copies or substantial portions of the Software.
15
- //
16
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
- // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20
- // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21
- // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
- //
24
- // For details, see the script.aculo.us web site: http://script.aculo.us/
25
-
26
- var Scriptaculous = {
27
- Version: '1.8.0_pre1',
28
- require: function(libraryName) {
29
- // inserting via DOM fails in Safari 2.0, so brute force approach
30
- document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
31
- },
32
- REQUIRED_PROTOTYPE: '1.6.0',
33
- load: function() {
34
- function convertVersionString(versionString){
35
- var r = versionString.split('.');
36
- return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
37
- }
38
-
39
- if((typeof Prototype=='undefined') ||
40
- (typeof Element == 'undefined') ||
41
- (typeof Element.Methods=='undefined') ||
42
- (convertVersionString(Prototype.Version) <
43
- convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
44
- throw("script.aculo.us requires the Prototype JavaScript framework >= " +
45
- Scriptaculous.REQUIRED_PROTOTYPE);
46
-
47
- $A(document.getElementsByTagName("script")).findAll( function(s) {
48
- return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
49
- }).each( function(s) {
50
- var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
51
- var includes = s.src.match(/\?.*load=([a-z,]*)/);
52
- (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
53
- function(include) { Scriptaculous.require(path+include+'.js') });
54
- });
55
- }
56
- }
57
-
58
- Scriptaculous.load();
@@ -1,276 +0,0 @@
1
- // script.aculo.us slider.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
2
-
3
- // Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs
4
- //
5
- // script.aculo.us is freely distributable under the terms of an MIT-style license.
6
- // For details, see the script.aculo.us web site: http://script.aculo.us/
7
-
8
- if (!Control) var Control = { };
9
- Control.Slider = Class.create();
10
-
11
- // options:
12
- // axis: 'vertical', or 'horizontal' (default)
13
- //
14
- // callbacks:
15
- // onChange(value)
16
- // onSlide(value)
17
- Control.Slider.prototype = {
18
- initialize: function(handle, track, options) {
19
- var slider = this;
20
-
21
- if (Object.isArray(handle)) {
22
- this.handles = handle.collect( function(e) { return $(e) });
23
- } else {
24
- this.handles = [$(handle)];
25
- }
26
-
27
- this.track = $(track);
28
- this.options = options || { };
29
-
30
- this.axis = this.options.axis || 'horizontal';
31
- this.increment = this.options.increment || 1;
32
- this.step = parseInt(this.options.step || '1');
33
- this.range = this.options.range || $R(0,1);
34
-
35
- this.value = 0; // assure backwards compat
36
- this.values = this.handles.map( function() { return 0 });
37
- this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
38
- this.options.startSpan = $(this.options.startSpan || null);
39
- this.options.endSpan = $(this.options.endSpan || null);
40
-
41
- this.restricted = this.options.restricted || false;
42
-
43
- this.maximum = this.options.maximum || this.range.end;
44
- this.minimum = this.options.minimum || this.range.start;
45
-
46
- // Will be used to align the handle onto the track, if necessary
47
- this.alignX = parseInt(this.options.alignX || '0');
48
- this.alignY = parseInt(this.options.alignY || '0');
49
-
50
- this.trackLength = this.maximumOffset() - this.minimumOffset();
51
-
52
- this.handleLength = this.isVertical() ?
53
- (this.handles[0].offsetHeight != 0 ?
54
- this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
55
- (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
56
- this.handles[0].style.width.replace(/px$/,""));
57
-
58
- this.active = false;
59
- this.dragging = false;
60
- this.disabled = false;
61
-
62
- if (this.options.disabled) this.setDisabled();
63
-
64
- // Allowed values array
65
- this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
66
- if (this.allowedValues) {
67
- this.minimum = this.allowedValues.min();
68
- this.maximum = this.allowedValues.max();
69
- }
70
-
71
- this.eventMouseDown = this.startDrag.bindAsEventListener(this);
72
- this.eventMouseUp = this.endDrag.bindAsEventListener(this);
73
- this.eventMouseMove = this.update.bindAsEventListener(this);
74
-
75
- // Initialize handles in reverse (make sure first handle is active)
76
- this.handles.each( function(h,i) {
77
- i = slider.handles.length-1-i;
78
- slider.setValue(parseFloat(
79
- (Object.isArray(slider.options.sliderValue) ?
80
- slider.options.sliderValue[i] : slider.options.sliderValue) ||
81
- slider.range.start), i);
82
- h.makePositioned().observe("mousedown", slider.eventMouseDown);
83
- });
84
-
85
- this.track.observe("mousedown", this.eventMouseDown);
86
- document.observe("mouseup", this.eventMouseUp);
87
- document.observe("mousemove", this.eventMouseMove);
88
-
89
- this.initialized = true;
90
- },
91
- dispose: function() {
92
- var slider = this;
93
- Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
94
- Event.stopObserving(document, "mouseup", this.eventMouseUp);
95
- Event.stopObserving(document, "mousemove", this.eventMouseMove);
96
- this.handles.each( function(h) {
97
- Event.stopObserving(h, "mousedown", slider.eventMouseDown);
98
- });
99
- },
100
- setDisabled: function(){
101
- this.disabled = true;
102
- },
103
- setEnabled: function(){
104
- this.disabled = false;
105
- },
106
- getNearestValue: function(value){
107
- if (this.allowedValues){
108
- if (value >= this.allowedValues.max()) return(this.allowedValues.max());
109
- if (value <= this.allowedValues.min()) return(this.allowedValues.min());
110
-
111
- var offset = Math.abs(this.allowedValues[0] - value);
112
- var newValue = this.allowedValues[0];
113
- this.allowedValues.each( function(v) {
114
- var currentOffset = Math.abs(v - value);
115
- if (currentOffset <= offset){
116
- newValue = v;
117
- offset = currentOffset;
118
- }
119
- });
120
- return newValue;
121
- }
122
- if (value > this.range.end) return this.range.end;
123
- if (value < this.range.start) return this.range.start;
124
- return value;
125
- },
126
- setValue: function(sliderValue, handleIdx){
127
- if (!this.active) {
128
- this.activeHandleIdx = handleIdx || 0;
129
- this.activeHandle = this.handles[this.activeHandleIdx];
130
- this.updateStyles();
131
- }
132
- handleIdx = handleIdx || this.activeHandleIdx || 0;
133
- if (this.initialized && this.restricted) {
134
- if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
135
- sliderValue = this.values[handleIdx-1];
136
- if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
137
- sliderValue = this.values[handleIdx+1];
138
- }
139
- sliderValue = this.getNearestValue(sliderValue);
140
- this.values[handleIdx] = sliderValue;
141
- this.value = this.values[0]; // assure backwards compat
142
-
143
- this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
144
- this.translateToPx(sliderValue);
145
-
146
- this.drawSpans();
147
- if (!this.dragging || !this.event) this.updateFinished();
148
- },
149
- setValueBy: function(delta, handleIdx) {
150
- this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
151
- handleIdx || this.activeHandleIdx || 0);
152
- },
153
- translateToPx: function(value) {
154
- return Math.round(
155
- ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
156
- (value - this.range.start)) + "px";
157
- },
158
- translateToValue: function(offset) {
159
- return ((offset/(this.trackLength-this.handleLength) *
160
- (this.range.end-this.range.start)) + this.range.start);
161
- },
162
- getRange: function(range) {
163
- var v = this.values.sortBy(Prototype.K);
164
- range = range || 0;
165
- return $R(v[range],v[range+1]);
166
- },
167
- minimumOffset: function(){
168
- return(this.isVertical() ? this.alignY : this.alignX);
169
- },
170
- maximumOffset: function(){
171
- return(this.isVertical() ?
172
- (this.track.offsetHeight != 0 ? this.track.offsetHeight :
173
- this.track.style.height.replace(/px$/,"")) - this.alignY :
174
- (this.track.offsetWidth != 0 ? this.track.offsetWidth :
175
- this.track.style.width.replace(/px$/,"")) - this.alignY);
176
- },
177
- isVertical: function(){
178
- return (this.axis == 'vertical');
179
- },
180
- drawSpans: function() {
181
- var slider = this;
182
- if (this.spans)
183
- $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
184
- if (this.options.startSpan)
185
- this.setSpan(this.options.startSpan,
186
- $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
187
- if (this.options.endSpan)
188
- this.setSpan(this.options.endSpan,
189
- $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
190
- },
191
- setSpan: function(span, range) {
192
- if (this.isVertical()) {
193
- span.style.top = this.translateToPx(range.start);
194
- span.style.height = this.translateToPx(range.end - range.start + this.range.start);
195
- } else {
196
- span.style.left = this.translateToPx(range.start);
197
- span.style.width = this.translateToPx(range.end - range.start + this.range.start);
198
- }
199
- },
200
- updateStyles: function() {
201
- this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
202
- Element.addClassName(this.activeHandle, 'selected');
203
- },
204
- startDrag: function(event) {
205
- if (Event.isLeftClick(event)) {
206
- if (!this.disabled){
207
- this.active = true;
208
-
209
- var handle = Event.element(event);
210
- var pointer = [Event.pointerX(event), Event.pointerY(event)];
211
- var track = handle;
212
- if (track==this.track) {
213
- var offsets = Position.cumulativeOffset(this.track);
214
- this.event = event;
215
- this.setValue(this.translateToValue(
216
- (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
217
- ));
218
- var offsets = Position.cumulativeOffset(this.activeHandle);
219
- this.offsetX = (pointer[0] - offsets[0]);
220
- this.offsetY = (pointer[1] - offsets[1]);
221
- } else {
222
- // find the handle (prevents issues with Safari)
223
- while((this.handles.indexOf(handle) == -1) && handle.parentNode)
224
- handle = handle.parentNode;
225
-
226
- if (this.handles.indexOf(handle)!=-1) {
227
- this.activeHandle = handle;
228
- this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
229
- this.updateStyles();
230
-
231
- var offsets = Position.cumulativeOffset(this.activeHandle);
232
- this.offsetX = (pointer[0] - offsets[0]);
233
- this.offsetY = (pointer[1] - offsets[1]);
234
- }
235
- }
236
- }
237
- Event.stop(event);
238
- }
239
- },
240
- update: function(event) {
241
- if (this.active) {
242
- if (!this.dragging) this.dragging = true;
243
- this.draw(event);
244
- if (Prototype.Browser.WebKit) window.scrollBy(0,0);
245
- Event.stop(event);
246
- }
247
- },
248
- draw: function(event) {
249
- var pointer = [Event.pointerX(event), Event.pointerY(event)];
250
- var offsets = Position.cumulativeOffset(this.track);
251
- pointer[0] -= this.offsetX + offsets[0];
252
- pointer[1] -= this.offsetY + offsets[1];
253
- this.event = event;
254
- this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
255
- if (this.initialized && this.options.onSlide)
256
- this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
257
- },
258
- endDrag: function(event) {
259
- if (this.active && this.dragging) {
260
- this.finishDrag(event, true);
261
- Event.stop(event);
262
- }
263
- this.active = false;
264
- this.dragging = false;
265
- },
266
- finishDrag: function(event, success) {
267
- this.active = false;
268
- this.dragging = false;
269
- this.updateFinished();
270
- },
271
- updateFinished: function() {
272
- if (this.initialized && this.options.onChange)
273
- this.options.onChange(this.values.length>1 ? this.values : this.value, this);
274
- this.event = null;
275
- }
276
- }