picolena 0.1.5 → 0.1.6
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +11 -4
- data/Manifest.txt +1 -0
- data/README.txt +2 -2
- data/bin/picolena +1 -1
- data/config/hoe.rb +10 -10
- data/lib/picolena/USAGE +1 -1
- data/lib/picolena/config/basic.rb +11 -11
- data/lib/picolena/picolena_generator.rb +15 -14
- data/lib/picolena/templates/app/controllers/application.rb +5 -5
- data/lib/picolena/templates/app/controllers/documents_controller.rb +17 -9
- data/lib/picolena/templates/app/helpers/documents_helper.rb +15 -14
- data/lib/picolena/templates/app/models/document.rb +28 -37
- data/lib/picolena/templates/app/models/finder.rb +12 -37
- data/lib/picolena/templates/app/models/indexer.rb +58 -37
- data/lib/picolena/templates/app/models/plain_text_extractor.rb +16 -16
- data/lib/picolena/templates/app/models/query.rb +5 -5
- data/lib/picolena/templates/app/views/documents/show.html.haml +3 -3
- data/lib/picolena/templates/app/views/layouts/application.html.haml +2 -2
- data/lib/picolena/templates/config/environment.rb +1 -1
- data/lib/picolena/templates/config/initializers/002_load_indexed_dirs.rb +8 -8
- data/lib/picolena/templates/config/initializers/003_load_white_list_IPs.rb +8 -8
- data/lib/picolena/templates/config/initializers/005_load_custom_title_and_names_and_links.rb +5 -5
- data/lib/picolena/templates/config/initializers/006_load_icons.rb +9 -7
- data/lib/picolena/templates/lang/ui/es.yml +1 -1
- data/lib/picolena/templates/lib/core_exts.rb +7 -7
- data/lib/picolena/templates/lib/plain_text_extractor_DSL.rb +10 -10
- data/lib/picolena/templates/lib/plain_text_extractors/ms.excel.rb +1 -1
- data/lib/picolena/templates/lib/plain_text_extractors/plain_text.rb +2 -2
- data/lib/picolena/templates/lib/tasks/index.rake +8 -3
- data/lib/picolena/templates/lib/tasks/install_dependencies.rake +2 -2
- data/lib/picolena/templates/lib/tasks/log.rake +1 -1
- data/lib/picolena/templates/public/.htaccess +3 -3
- data/lib/picolena/templates/public/images/flags/sv.png +0 -0
- data/lib/picolena/templates/public/stylesheets/style.css +2 -2
- data/lib/picolena/templates/script/spec_server +1 -1
- data/lib/picolena/templates/spec/controllers/application_controller_spec.rb +2 -2
- data/lib/picolena/templates/spec/controllers/documents_controller_spec.rb +17 -17
- data/lib/picolena/templates/spec/helpers/application_helper_spec.rb +2 -2
- data/lib/picolena/templates/spec/helpers/documents_helper_spec.rb +3 -3
- data/lib/picolena/templates/spec/models/basic_finder_spec.rb +14 -14
- data/lib/picolena/templates/spec/models/document_spec.rb +7 -15
- data/lib/picolena/templates/spec/models/finder_spec.rb +45 -38
- data/lib/picolena/templates/spec/models/host_indexing_system_spec.rb +5 -5
- data/lib/picolena/templates/spec/models/index_directories_spec.rb +2 -2
- data/lib/picolena/templates/spec/models/plain_text_extractor_spec.rb +6 -6
- data/lib/picolena/templates/spec/models/query_spec.rb +7 -7
- data/lib/picolena/templates/spec/rcov.opts +1 -1
- data/lib/picolena/templates/spec/test_dirs/indexed/basic/myfirstjavaprog.java +1 -1
- data/lib/picolena/templates/spec/test_dirs/indexed/basic/queens.for +1 -1
- data/lib/picolena/templates/spec/test_dirs/indexed/lang/hugo +74 -74
- data/lib/picolena/templates/spec/test_dirs/indexed/lang/lorca +56 -56
- data/lib/picolena/templates/spec/test_dirs/indexed/others/7.html +4 -4
- data/lib/picolena/templates/spec/test_dirs/indexed/others/ccmatrix1.cpp +6 -6
- data/lib/picolena/templates/spec/test_dirs/indexed/others/lemonde.htm +326 -326
- data/lib/picolena/templates/spec/test_dirs/indexed/others/nested/ReadMe.rtf +62 -62
- data/lib/picolena/templates/spec/test_dirs/indexed/others/xor.vee +0 -1
- data/lib/picolena/templates/spec/test_dirs/indexed/others/zafh.net.html +1 -1
- data/lib/picolena/version.rb +1 -1
- data/lib/rubigen_ext.rb +1 -1
- data/rails_plugins/globalite/CHANGELOG +1 -1
- data/rails_plugins/globalite/README +19 -19
- data/rails_plugins/globalite/lang/rails/de-DE.yml +6 -6
- data/rails_plugins/globalite/lang/rails/en-UK.yml +10 -10
- data/rails_plugins/globalite/lang/rails/en-US.yml +10 -10
- data/rails_plugins/globalite/lang/rails/es-ES.yml +11 -11
- data/rails_plugins/globalite/lang/rails/fr-FR.yml +10 -10
- data/rails_plugins/globalite/lang/rails/it.yml +10 -10
- data/rails_plugins/globalite/lang/rails/pt-BR.yml +6 -6
- data/rails_plugins/globalite/lang/rails/pt-PT.yml +6 -6
- data/rails_plugins/globalite/lib/globalite/l10n.rb +25 -25
- data/rails_plugins/globalite/lib/globalite/locale.rb +9 -9
- data/rails_plugins/globalite/lib/rails/core_ext.rb +4 -4
- data/rails_plugins/globalite/lib/rails/localization.rb +3 -3
- data/rails_plugins/globalite/lib/rails/localized_action_view.rb +17 -17
- data/rails_plugins/globalite/lib/rails/localized_active_record.rb +4 -4
- data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers/DateHelper.html +19 -19
- data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers/FormOptionsHelper.html +9 -9
- data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers/NumberHelper.html +8 -8
- data/rails_plugins/globalite/rdoc/classes/ActionView/Helpers.html +5 -5
- data/rails_plugins/globalite/rdoc/classes/ActionView.html +5 -5
- data/rails_plugins/globalite/rdoc/classes/ActiveRecord/Errors.html +6 -6
- data/rails_plugins/globalite/rdoc/classes/ActiveRecord.html +5 -5
- data/rails_plugins/globalite/rdoc/classes/Array.html +6 -6
- data/rails_plugins/globalite/rdoc/classes/Date.html +8 -8
- data/rails_plugins/globalite/rdoc/classes/Globalite/L10n.html +49 -49
- data/rails_plugins/globalite/rdoc/classes/Globalite.html +6 -6
- data/rails_plugins/globalite/rdoc/classes/Kernel.html +6 -6
- data/rails_plugins/globalite/rdoc/classes/Locale.html +11 -11
- data/rails_plugins/globalite/rdoc/classes/Time.html +8 -8
- data/rails_plugins/globalite/rdoc/files/README.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/globalite/l10n_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/globalite/locale_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/globalite_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/rails/core_ext_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/rails/localization_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/rails/localized_action_view_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/files/lib/rails/localized_active_record_rb.html +5 -5
- data/rails_plugins/globalite/rdoc/fr_class_index.html +1 -1
- data/rails_plugins/globalite/rdoc/fr_file_index.html +1 -1
- data/rails_plugins/globalite/rdoc/fr_method_index.html +1 -1
- data/rails_plugins/globalite/rdoc/index.html +1 -1
- data/rails_plugins/globalite/spec/core_localization_spec.rb +18 -18
- data/rails_plugins/globalite/spec/l10n_spec.rb +25 -25
- data/rails_plugins/globalite/tasks/globalite_tasks.rake +6 -6
- data/rails_plugins/rspec/CHANGES +16 -16
- data/rails_plugins/rspec/README +2 -2
- data/rails_plugins/rspec/Rakefile +1 -1
- data/rails_plugins/rspec/UPGRADE +1 -1
- data/rails_plugins/rspec/autotest/discover.rb +1 -1
- data/rails_plugins/rspec/examples/pure/autogenerated_docstrings_example.rb +5 -5
- data/rails_plugins/rspec/examples/pure/before_and_after_example.rb +2 -2
- data/rails_plugins/rspec/examples/pure/behave_as_example.rb +5 -5
- data/rails_plugins/rspec/examples/pure/custom_expectation_matchers.rb +7 -7
- data/rails_plugins/rspec/examples/pure/file_accessor.rb +1 -1
- data/rails_plugins/rspec/examples/pure/file_accessor_spec.rb +2 -2
- data/rails_plugins/rspec/examples/pure/helper_method_example.rb +1 -1
- data/rails_plugins/rspec/examples/pure/legacy_spec.rb +2 -2
- data/rails_plugins/rspec/examples/pure/predicate_example.rb +2 -2
- data/rails_plugins/rspec/examples/pure/shared_example_group_example.rb +11 -11
- data/rails_plugins/rspec/examples/pure/shared_stack_examples.rb +4 -4
- data/rails_plugins/rspec/examples/pure/stack.rb +6 -6
- data/rails_plugins/rspec/examples/pure/stack_spec.rb +7 -7
- data/rails_plugins/rspec/examples/pure/stack_spec_with_nested_example_groups.rb +10 -10
- data/rails_plugins/rspec/examples/pure/stubbing_example.rb +4 -4
- data/rails_plugins/rspec/examples/stories/adder.rb +2 -2
- data/rails_plugins/rspec/examples/stories/addition +8 -8
- data/rails_plugins/rspec/examples/stories/calculator.rb +5 -5
- data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb +7 -7
- data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb +13 -13
- data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb +5 -5
- data/rails_plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb +2 -2
- data/rails_plugins/rspec/examples/stories/game-of-life/life/game.rb +3 -3
- data/rails_plugins/rspec/examples/stories/game-of-life/life/grid.rb +10 -10
- data/rails_plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb +5 -5
- data/rails_plugins/rspec/failing_examples/failure_in_setup.rb +3 -3
- data/rails_plugins/rspec/failing_examples/failure_in_teardown.rb +3 -3
- data/rails_plugins/rspec/failing_examples/mocking_example.rb +1 -1
- data/rails_plugins/rspec/failing_examples/raising_example.rb +11 -11
- data/rails_plugins/rspec/failing_examples/team_spec.rb +5 -5
- data/rails_plugins/rspec/lib/autotest/rspec.rb +5 -5
- data/rails_plugins/rspec/lib/spec/example/configuration.rb +4 -4
- data/rails_plugins/rspec/lib/spec/example/example_group_factory.rb +3 -3
- data/rails_plugins/rspec/lib/spec/example/example_group_methods.rb +1 -1
- data/rails_plugins/rspec/lib/spec/example/example_matcher.rb +2 -2
- data/rails_plugins/rspec/lib/spec/example/example_methods.rb +4 -4
- data/rails_plugins/rspec/lib/spec/example/pending.rb +1 -1
- data/rails_plugins/rspec/lib/spec/expectations/differs/default.rb +5 -5
- data/rails_plugins/rspec/lib/spec/expectations/errors.rb +1 -1
- data/rails_plugins/rspec/lib/spec/expectations/handler.rb +5 -5
- data/rails_plugins/rspec/lib/spec/expectations.rb +1 -1
- data/rails_plugins/rspec/lib/spec/extensions/main.rb +8 -8
- data/rails_plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb +2 -2
- data/rails_plugins/rspec/lib/spec/matchers/be.rb +18 -18
- data/rails_plugins/rspec/lib/spec/matchers/be_close.rb +4 -4
- data/rails_plugins/rspec/lib/spec/matchers/change.rb +20 -20
- data/rails_plugins/rspec/lib/spec/matchers/eql.rb +4 -4
- data/rails_plugins/rspec/lib/spec/matchers/equal.rb +4 -4
- data/rails_plugins/rspec/lib/spec/matchers/has.rb +8 -8
- data/rails_plugins/rspec/lib/spec/matchers/have.rb +9 -9
- data/rails_plugins/rspec/lib/spec/matchers/include.rb +7 -7
- data/rails_plugins/rspec/lib/spec/matchers/match.rb +6 -6
- data/rails_plugins/rspec/lib/spec/matchers/operator_matcher.rb +1 -1
- data/rails_plugins/rspec/lib/spec/matchers/raise_error.rb +6 -6
- data/rails_plugins/rspec/lib/spec/matchers/respond_to.rb +7 -7
- data/rails_plugins/rspec/lib/spec/matchers/satisfy.rb +4 -4
- data/rails_plugins/rspec/lib/spec/matchers/simple_matcher.rb +3 -3
- data/rails_plugins/rspec/lib/spec/matchers/throw_symbol.rb +8 -8
- data/rails_plugins/rspec/lib/spec/matchers.rb +2 -2
- data/rails_plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb +3 -3
- data/rails_plugins/rspec/lib/spec/mocks/argument_expectation.rb +32 -32
- data/rails_plugins/rspec/lib/spec/mocks/error_generator.rb +13 -13
- data/rails_plugins/rspec/lib/spec/mocks/errors.rb +1 -1
- data/rails_plugins/rspec/lib/spec/mocks/message_expectation.rb +38 -38
- data/rails_plugins/rspec/lib/spec/mocks/methods.rb +3 -3
- data/rails_plugins/rspec/lib/spec/mocks/mock.rb +5 -5
- data/rails_plugins/rspec/lib/spec/mocks/order_group.rb +5 -5
- data/rails_plugins/rspec/lib/spec/mocks/proxy.rb +4 -4
- data/rails_plugins/rspec/lib/spec/mocks/space.rb +3 -3
- data/rails_plugins/rspec/lib/spec/mocks/spec_methods.rb +1 -1
- data/rails_plugins/rspec/lib/spec/mocks.rb +13 -13
- data/rails_plugins/rspec/lib/spec/rake/spectask.rb +4 -4
- data/rails_plugins/rspec/lib/spec/rake/verify_rcov.rb +9 -9
- data/rails_plugins/rspec/lib/spec/runner/backtrace_tweaker.rb +2 -2
- data/rails_plugins/rspec/lib/spec/runner/formatter/base_formatter.rb +7 -7
- data/rails_plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb +13 -13
- data/rails_plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb +1 -1
- data/rails_plugins/rspec/lib/spec/runner/formatter/html_formatter.rb +8 -8
- data/rails_plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb +7 -7
- data/rails_plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb +2 -2
- data/rails_plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb +5 -5
- data/rails_plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb +4 -4
- data/rails_plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb +6 -6
- data/rails_plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb +12 -12
- data/rails_plugins/rspec/lib/spec/runner/heckle_runner.rb +6 -6
- data/rails_plugins/rspec/lib/spec/runner/option_parser.rb +5 -5
- data/rails_plugins/rspec/lib/spec/runner/options.rb +8 -8
- data/rails_plugins/rspec/lib/spec/runner/reporter.rb +14 -14
- data/rails_plugins/rspec/lib/spec/runner.rb +41 -41
- data/rails_plugins/rspec/lib/spec/story/extensions/main.rb +6 -6
- data/rails_plugins/rspec/lib/spec/story/extensions/regexp.rb +1 -1
- data/rails_plugins/rspec/lib/spec/story/extensions/string.rb +1 -1
- data/rails_plugins/rspec/lib/spec/story/given_scenario.rb +1 -1
- data/rails_plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb +6 -6
- data/rails_plugins/rspec/lib/spec/story/runner/scenario_collector.rb +2 -2
- data/rails_plugins/rspec/lib/spec/story/runner/scenario_runner.rb +5 -5
- data/rails_plugins/rspec/lib/spec/story/runner/story_mediator.rb +20 -20
- data/rails_plugins/rspec/lib/spec/story/runner/story_parser.rb +29 -29
- data/rails_plugins/rspec/lib/spec/story/runner/story_runner.rb +8 -8
- data/rails_plugins/rspec/lib/spec/story/runner.rb +7 -7
- data/rails_plugins/rspec/lib/spec/story/scenario.rb +1 -1
- data/rails_plugins/rspec/lib/spec/story/step.rb +5 -5
- data/rails_plugins/rspec/lib/spec/story/step_group.rb +12 -12
- data/rails_plugins/rspec/lib/spec/story/step_mother.rb +6 -6
- data/rails_plugins/rspec/lib/spec/story/story.rb +5 -5
- data/rails_plugins/rspec/lib/spec/story/world.rb +16 -16
- data/rails_plugins/rspec/lib/spec/translator.rb +21 -21
- data/rails_plugins/rspec/lib/spec/version.rb +2 -2
- data/rails_plugins/rspec/lib/spec.rb +1 -1
- data/rails_plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb +1 -1
- data/rails_plugins/rspec/pre_commit/lib/pre_commit/rspec.rb +6 -6
- data/rails_plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb +6 -6
- data/rails_plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb +1 -1
- data/rails_plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb +1 -1
- data/rails_plugins/rspec/report.html +3 -3
- data/rails_plugins/rspec/spec/autotest/discover_spec.rb +2 -2
- data/rails_plugins/rspec/spec/autotest/rspec_spec.rb +30 -30
- data/rails_plugins/rspec/spec/autotest_matchers.rb +7 -7
- data/rails_plugins/rspec/spec/spec/example/configuration_spec.rb +5 -5
- data/rails_plugins/rspec/spec/spec/example/example_group_factory_spec.rb +5 -5
- data/rails_plugins/rspec/spec/spec/example/example_group_methods_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/example/example_group_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/example/example_matcher_spec.rb +10 -10
- data/rails_plugins/rspec/spec/spec/example/example_runner_spec.rb +29 -29
- data/rails_plugins/rspec/spec/spec/example/example_spec.rb +6 -6
- data/rails_plugins/rspec/spec/spec/example/nested_example_group_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/example/pending_module_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/example/predicate_matcher_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/example/shared_example_group_spec.rb +4 -4
- data/rails_plugins/rspec/spec/spec/expectations/extensions/object_spec.rb +12 -12
- data/rails_plugins/rspec/spec/spec/expectations/fail_with_spec.rb +8 -8
- data/rails_plugins/rspec/spec/spec/extensions/main_spec.rb +6 -6
- data/rails_plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb +2 -2
- data/rails_plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/matchers/be_spec.rb +5 -5
- data/rails_plugins/rspec/spec/spec/matchers/change_spec.rb +14 -14
- data/rails_plugins/rspec/spec/spec/matchers/description_generation_spec.rb +25 -25
- data/rails_plugins/rspec/spec/spec/matchers/exist_spec.rb +5 -5
- data/rails_plugins/rspec/spec/spec/matchers/handler_spec.rb +16 -16
- data/rails_plugins/rspec/spec/spec/matchers/have_spec.rb +13 -13
- data/rails_plugins/rspec/spec/spec/matchers/match_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb +17 -17
- data/rails_plugins/rspec/spec/spec/matchers/raise_error_spec.rb +20 -20
- data/rails_plugins/rspec/spec/spec/matchers/respond_to_spec.rb +10 -10
- data/rails_plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/mocks/bug_report_10263.rb +3 -3
- data/rails_plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb +4 -4
- data/rails_plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb +12 -12
- data/rails_plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/mocks/mock_space_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/mocks/mock_spec.rb +56 -56
- data/rails_plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/mocks/once_counts_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/mocks/options_hash_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/mocks/partial_mock_spec.rb +16 -16
- data/rails_plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb +10 -10
- data/rails_plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb +13 -13
- data/rails_plugins/rspec/spec/spec/mocks/stub_spec.rb +7 -7
- data/rails_plugins/rspec/spec/spec/mocks/twice_counts_spec.rb +6 -6
- data/rails_plugins/rspec/spec/spec/package/bin_spec_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/runner/command_line_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/runner/drb_command_line_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/runner/execution_context_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html +1 -1
- data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html +2 -2
- data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html +1 -1
- data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html +1 -1
- data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html +3 -3
- data/rails_plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb +9 -9
- data/rails_plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb +4 -4
- data/rails_plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb +5 -5
- data/rails_plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html +13 -13
- data/rails_plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html +2 -2
- data/rails_plugins/rspec/spec/spec/runner/heckle_runner_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/runner/option_parser_spec.rb +9 -9
- data/rails_plugins/rspec/spec/spec/runner/options_spec.rb +13 -13
- data/rails_plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb +1 -1
- data/rails_plugins/rspec/spec/spec/spec_classes.rb +8 -8
- data/rails_plugins/rspec/spec/spec/story/builders.rb +7 -7
- data/rails_plugins/rspec/spec/spec/story/extensions/main_spec.rb +6 -6
- data/rails_plugins/rspec/spec/spec/story/given_scenario_spec.rb +3 -3
- data/rails_plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb +12 -12
- data/rails_plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb +21 -21
- data/rails_plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb +22 -22
- data/rails_plugins/rspec/spec/spec/story/runner/story_parser_spec.rb +55 -55
- data/rails_plugins/rspec/spec/spec/story/runner/story_runner_spec.rb +44 -44
- data/rails_plugins/rspec/spec/spec/story/runner_spec.rb +18 -18
- data/rails_plugins/rspec/spec/spec/story/scenario_spec.rb +2 -2
- data/rails_plugins/rspec/spec/spec/story/step_group_spec.rb +20 -20
- data/rails_plugins/rspec/spec/spec/story/step_mother_spec.rb +14 -14
- data/rails_plugins/rspec/spec/spec/story/step_spec.rb +33 -33
- data/rails_plugins/rspec/spec/spec/story/story_spec.rb +12 -12
- data/rails_plugins/rspec/spec/spec/translator_spec.rb +12 -12
- data/rails_plugins/rspec/spec/spec_helper.rb +5 -5
- data/rails_plugins/rspec/stories/resources/helpers/story_helper.rb +1 -1
- data/rails_plugins/rspec/stories/resources/steps/running_rspec.rb +4 -4
- data/rails_plugins/rspec/stories/resources/test/spec_and_test_together.rb +2 -2
- data/rails_plugins/rspec/stories/resources/test/test_case_with_should_methods.rb +1 -1
- data/rails_plugins/rspec/story_server/prototype/javascripts/builder.js +14 -14
- data/rails_plugins/rspec/story_server/prototype/javascripts/controls.js +61 -61
- data/rails_plugins/rspec/story_server/prototype/javascripts/dragdrop.js +144 -144
- data/rails_plugins/rspec/story_server/prototype/javascripts/effects.js +127 -127
- data/rails_plugins/rspec/story_server/prototype/javascripts/rspec.js +15 -15
- data/rails_plugins/rspec/story_server/prototype/javascripts/scriptaculous.js +7 -7
- data/rails_plugins/rspec/story_server/prototype/javascripts/slider.js +37 -37
- data/rails_plugins/rspec/story_server/prototype/javascripts/sound.js +4 -4
- data/rails_plugins/rspec/story_server/prototype/javascripts/unittest.js +66 -66
- data/rails_plugins/rspec/story_server/prototype/stories.html +9 -9
- data/rails_plugins/rspec_on_rails/MIT-LICENSE +11 -11
- data/rails_plugins/rspec_on_rails/generators/rspec/templates/rcov.opts +1 -1
- data/rails_plugins/rspec_on_rails/generators/rspec/templates/script/spec_server +1 -1
- data/rails_plugins/rspec_on_rails/generators/rspec_controller/USAGE +1 -1
- data/rails_plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb +2 -2
- data/rails_plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb +12 -12
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb +35 -35
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb +2 -2
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb +2 -2
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb +2 -2
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/routing_spec.rb +11 -11
- data/rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/lib/autotest/rails_rspec.rb +3 -3
- data/rails_plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb +4 -4
- data/rails_plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb +1 -1
- data/rails_plugins/rspec_on_rails/lib/spec/rails/example/render_observer.rb +4 -4
- data/rails_plugins/rspec_on_rails/lib/spec/rails/example/view_example_group.rb +1 -1
- data/rails_plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb +1 -1
- data/rails_plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb +1 -1
- data/rails_plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb +10 -10
- data/rails_plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb +6 -6
- data/rails_plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb +7 -7
- data/rails_plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb +1 -1
- data/rails_plugins/rspec_on_rails/lib/spec/rails.rb +8 -8
- data/rails_plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb +6 -6
- data/rails_plugins/rspec_on_rails/spec/rails/example/controller_isolation_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/spec/rails/example/controller_spec_spec.rb +22 -22
- data/rails_plugins/rspec_on_rails/spec/rails/example/helper_spec_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/spec/rails/example/ivar_proxy_spec.rb +3 -3
- data/rails_plugins/rspec_on_rails/spec/rails/example/shared_behaviour_spec.rb +2 -2
- data/rails_plugins/rspec_on_rails/spec/rails/example/view_spec_spec.rb +8 -8
- data/rails_plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb +7 -7
- data/rails_plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb +37 -37
- data/rails_plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb +1 -1
- data/rails_plugins/rspec_on_rails/spec/rails/matchers/have_text_spec.rb +4 -4
- data/rails_plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb +26 -26
- data/rails_plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb +18 -18
- data/rails_plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb +2 -2
- data/rails_plugins/rspec_on_rails/spec/spec_helper.rb +1 -1
- data/rails_plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb +9 -9
- data/rails_plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb +7 -7
- data/rails_plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb +5 -5
- data/rails_plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb +10 -10
- data/rails_plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb +1 -1
- data/rails_plugins/rspec_on_rails/stories/transactions_should_rollback.rb +1 -1
- data/rails_plugins/rspec_on_rails/tasks/rspec.rake +4 -4
- data/script/txt2html +1 -1
- data/setup.rb +4 -4
- data/tasks/hack.rake +3 -3
- data/website/index.html +2 -2
- data/website/index.txt +1 -1
- data/website/index_devjavu +3 -3
- data/website/javascripts/rounded_corners_lite.inc.js +1 -1
- data/website/stylesheets/screen.css +2 -2
- data.tar.gz.sig +0 -0
- metadata +2 -1
- metadata.gz.sig +2 -1
@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
|
|
3
3
|
describe "PlainTextExtractors" do
|
4
4
|
before(:all) do
|
5
5
|
Indexer.ensure_index_existence
|
6
|
-
end
|
7
|
-
|
6
|
+
end
|
7
|
+
|
8
8
|
PlainTextExtractor.all.each{|extractor|
|
9
9
|
extractor.exts.each{|ext|
|
10
10
|
should_extract= "should be able to extract content from #{extractor.description} (.#{ext})"
|
@@ -27,16 +27,16 @@ describe "PlainTextExtractors" do
|
|
27
27
|
end
|
28
28
|
}
|
29
29
|
}
|
30
|
-
|
30
|
+
|
31
31
|
it "should guess language when enough content is available" do
|
32
32
|
Document.new("spec/test_dirs/indexed/lang/goethe").language.should == "de"
|
33
33
|
Document.new("spec/test_dirs/indexed/lang/shakespeare").language.should == "en"
|
34
34
|
Document.new("spec/test_dirs/indexed/lang/lorca").language.should == "es"
|
35
35
|
Document.new("spec/test_dirs/indexed/lang/hugo").language.should == "fr"
|
36
|
-
end
|
37
|
-
|
36
|
+
end if Picolena::UseLanguageRecognition
|
37
|
+
|
38
38
|
it "should not try to guess language when file is too small" do
|
39
39
|
Document.new("spec/test_dirs/indexed/basic/hello.rb").language.should be_nil
|
40
40
|
Document.new("spec/test_dirs/indexed/README").language.should be_nil
|
41
|
-
end
|
41
|
+
end if Picolena::UseLanguageRecognition
|
42
42
|
end
|
@@ -11,11 +11,11 @@ describe Query do
|
|
11
11
|
:es=>["COMO", "NO", "O", "Y"],
|
12
12
|
:fr=>["COMME","NON","OU","ET"]
|
13
13
|
}
|
14
|
-
|
14
|
+
|
15
15
|
english_query_with_like_and_not=Query.extract_from("LIKE something NOT something")
|
16
16
|
english_query_with_or=Query.extract_from("test OR another")
|
17
17
|
english_query_with_and=Query.extract_from("test AND another")
|
18
|
-
|
18
|
+
|
19
19
|
language_and_keywords.each_pair{|ln,keywords|
|
20
20
|
Globalite.language = ln
|
21
21
|
like_bool, not_bool, or_bool, and_bool = keywords
|
@@ -27,15 +27,15 @@ describe Query do
|
|
27
27
|
Query.extract_from(raw_query_in_some_language_with_and).should == english_query_with_and
|
28
28
|
}
|
29
29
|
end
|
30
|
-
|
30
|
+
|
31
31
|
it "should accept field terms in different languages"
|
32
|
-
|
32
|
+
|
33
33
|
it "should use AND as default boolean ops" do
|
34
34
|
query_without_and = Query.extract_from("one AND two")
|
35
35
|
query_with_and = Query.extract_from("one two")
|
36
36
|
query_with_and.should == query_without_and
|
37
37
|
end
|
38
|
-
|
38
|
+
|
39
39
|
it "should convert foreign keywords to boolean operators only as whole-word" do
|
40
40
|
Globalite.language = :en
|
41
41
|
english_query_with_french_words = Query.extract_from("CETTE AND MIETTE")
|
@@ -47,10 +47,10 @@ describe Query do
|
|
47
47
|
Query.extract_from("CETTE ET MIETTE").should == english_query_with_french_words
|
48
48
|
Query.extract_from("STRALSUND UND BRODERBUND").should_not == english_query_with_german_words
|
49
49
|
end
|
50
|
-
|
50
|
+
|
51
51
|
it "should not be case sensitive" do
|
52
52
|
Query.extract_from("test").should == Query.extract_from("TEst")
|
53
53
|
Query.extract_from("test").should == Query.extract_from("tesT")
|
54
|
-
Query.extract_from("test").should_not == Query.extract_from("tesTe")
|
54
|
+
Query.extract_from("test").should_not == Query.extract_from("tesTe")
|
55
55
|
end
|
56
56
|
end
|
@@ -1,2 +1,2 @@
|
|
1
|
-
--exclude "spec/*,gems/*"
|
1
|
+
--exclude "spec/*,gems/*"
|
2
2
|
--rails
|
@@ -5,79 +5,79 @@ Depuis six mille ans la guerre
|
|
5
5
|
|
6
6
|
|
7
7
|
I
|
8
|
-
|
9
|
-
Depuis six mille ans la guerre
|
10
|
-
Plaît aux peuples querelleurs,
|
11
|
-
Et Dieu perd son temps à faire
|
12
|
-
Les étoiles et les fleurs.
|
13
|
-
|
14
|
-
Les conseils du ciel immense,
|
15
|
-
Du lys pur, du nid doré,
|
16
|
-
N'ôtent aucune démence
|
17
|
-
Du coeur de l'homme effaré.
|
18
|
-
|
19
|
-
Les carnages, les victoires,
|
20
|
-
Voilà notre grand amour ;
|
21
|
-
Et les multitudes noires
|
22
|
-
Ont pour grelot le tambour.
|
23
|
-
|
24
|
-
La gloire, sous ses chimères
|
25
|
-
Et sous ses chars triomphants,
|
26
|
-
Met toutes les pauvres mères
|
27
|
-
Et tous les petits enfants.
|
28
|
-
|
29
|
-
Notre bonheur est farouche ;
|
30
|
-
C'est de dire : Allons ! mourons !
|
31
|
-
Et c'est d'avoir à la bouche
|
32
|
-
La salive des clairons.
|
33
|
-
|
34
|
-
L'acier luit, les bivouacs fument ;
|
35
|
-
Pâles, nous nous déchaînons ;
|
36
|
-
Les sombres âmes s'allument
|
37
|
-
Aux lumières des canons.
|
38
|
-
|
39
|
-
Et cela pour des altesses
|
40
|
-
Qui, vous à peine enterrés,
|
41
|
-
Se feront des politesses
|
42
|
-
Pendant que vous pourrirez,
|
43
|
-
|
44
|
-
Et que, dans le champ funeste,
|
45
|
-
Les chacals et les oiseaux,
|
46
|
-
Hideux, iront voir s'il reste
|
47
|
-
De la chair après vos os !
|
48
|
-
|
49
|
-
Aucun peuple ne tolère
|
50
|
-
Qu'un autre vive à côté ;
|
51
|
-
Et l'on souffle la colère
|
52
|
-
Dans notre imbécillité.
|
53
|
-
|
54
|
-
C'est un Russe ! Égorge, assomme.
|
55
|
-
Un Croate ! Feu roulant.
|
56
|
-
C'est juste. Pourquoi cet homme
|
57
|
-
Avait-il un habit blanc ?
|
58
|
-
|
59
|
-
Celui-ci, je le supprime
|
60
|
-
Et m'en vais, le coeur serein,
|
61
|
-
Puisqu'il a commis le crime
|
62
|
-
De naître à droite du Rhin.
|
63
|
-
|
64
|
-
Rosbach ! Waterloo ! Vengeance !
|
65
|
-
L'homme, ivre d'un affreux bruit,
|
66
|
-
N'a plus d'autre intelligence
|
67
|
-
Que le massacre et la nuit.
|
68
|
-
|
69
|
-
On pourrait boire aux fontaines,
|
70
|
-
Prier dans l'ombre à genoux,
|
71
|
-
Aimer, songer sous les chênes ;
|
72
|
-
Tuer son frère est plus doux.
|
73
|
-
|
74
|
-
On se hache, on se harponne,
|
75
|
-
On court par monts et par vaux ;
|
76
|
-
L'épouvante se cramponne
|
77
|
-
Du poing aux crins des chevaux.
|
78
|
-
|
79
|
-
Et l'aube est là sur la plaine !
|
80
|
-
Oh ! j'admire, en vérité,
|
81
|
-
Qu'on puisse avoir de la haine
|
8
|
+
|
9
|
+
Depuis six mille ans la guerre
|
10
|
+
Plaît aux peuples querelleurs,
|
11
|
+
Et Dieu perd son temps à faire
|
12
|
+
Les étoiles et les fleurs.
|
13
|
+
|
14
|
+
Les conseils du ciel immense,
|
15
|
+
Du lys pur, du nid doré,
|
16
|
+
N'ôtent aucune démence
|
17
|
+
Du coeur de l'homme effaré.
|
18
|
+
|
19
|
+
Les carnages, les victoires,
|
20
|
+
Voilà notre grand amour ;
|
21
|
+
Et les multitudes noires
|
22
|
+
Ont pour grelot le tambour.
|
23
|
+
|
24
|
+
La gloire, sous ses chimères
|
25
|
+
Et sous ses chars triomphants,
|
26
|
+
Met toutes les pauvres mères
|
27
|
+
Et tous les petits enfants.
|
28
|
+
|
29
|
+
Notre bonheur est farouche ;
|
30
|
+
C'est de dire : Allons ! mourons !
|
31
|
+
Et c'est d'avoir à la bouche
|
32
|
+
La salive des clairons.
|
33
|
+
|
34
|
+
L'acier luit, les bivouacs fument ;
|
35
|
+
Pâles, nous nous déchaînons ;
|
36
|
+
Les sombres âmes s'allument
|
37
|
+
Aux lumières des canons.
|
38
|
+
|
39
|
+
Et cela pour des altesses
|
40
|
+
Qui, vous à peine enterrés,
|
41
|
+
Se feront des politesses
|
42
|
+
Pendant que vous pourrirez,
|
43
|
+
|
44
|
+
Et que, dans le champ funeste,
|
45
|
+
Les chacals et les oiseaux,
|
46
|
+
Hideux, iront voir s'il reste
|
47
|
+
De la chair après vos os !
|
48
|
+
|
49
|
+
Aucun peuple ne tolère
|
50
|
+
Qu'un autre vive à côté ;
|
51
|
+
Et l'on souffle la colère
|
52
|
+
Dans notre imbécillité.
|
53
|
+
|
54
|
+
C'est un Russe ! Égorge, assomme.
|
55
|
+
Un Croate ! Feu roulant.
|
56
|
+
C'est juste. Pourquoi cet homme
|
57
|
+
Avait-il un habit blanc ?
|
58
|
+
|
59
|
+
Celui-ci, je le supprime
|
60
|
+
Et m'en vais, le coeur serein,
|
61
|
+
Puisqu'il a commis le crime
|
62
|
+
De naître à droite du Rhin.
|
63
|
+
|
64
|
+
Rosbach ! Waterloo ! Vengeance !
|
65
|
+
L'homme, ivre d'un affreux bruit,
|
66
|
+
N'a plus d'autre intelligence
|
67
|
+
Que le massacre et la nuit.
|
68
|
+
|
69
|
+
On pourrait boire aux fontaines,
|
70
|
+
Prier dans l'ombre à genoux,
|
71
|
+
Aimer, songer sous les chênes ;
|
72
|
+
Tuer son frère est plus doux.
|
73
|
+
|
74
|
+
On se hache, on se harponne,
|
75
|
+
On court par monts et par vaux ;
|
76
|
+
L'épouvante se cramponne
|
77
|
+
Du poing aux crins des chevaux.
|
78
|
+
|
79
|
+
Et l'aube est là sur la plaine !
|
80
|
+
Oh ! j'admire, en vérité,
|
81
|
+
Qu'on puisse avoir de la haine
|
82
82
|
Quand l'alouette a chanté.
|
83
83
|
|
@@ -1,26 +1,26 @@
|
|
1
|
-
Verde que te quiero verde.
|
2
|
-
Verde viento. Verdes ramas.
|
3
|
-
El barco sobre la mar
|
4
|
-
y el caballo en la montaña.
|
5
|
-
Con la sombra en la cintura
|
6
|
-
ella sueña en su baranda,
|
7
|
-
verde carne, pelo verde,
|
8
|
-
con ojos de fría plata.
|
9
|
-
Verde que te quiero verde.
|
1
|
+
Verde que te quiero verde.
|
2
|
+
Verde viento. Verdes ramas.
|
3
|
+
El barco sobre la mar
|
4
|
+
y el caballo en la montaña.
|
5
|
+
Con la sombra en la cintura
|
6
|
+
ella sueña en su baranda,
|
7
|
+
verde carne, pelo verde,
|
8
|
+
con ojos de fría plata.
|
9
|
+
Verde que te quiero verde.
|
10
10
|
Bajo la luna gitana,
|
11
|
-
las cosas la están mirando
|
11
|
+
las cosas la están mirando
|
12
12
|
y ella no puede mirarlas.
|
13
|
-
Verde que te quiero verde.
|
14
|
-
Grandes estrellas de escarcha
|
15
|
-
vienen con el pez de sombra
|
16
|
-
que abre el camino del alba.
|
17
|
-
La higuera frota su viento
|
18
|
-
con la lija de sus ramas,
|
19
|
-
y el monte, gato garduño,
|
13
|
+
Verde que te quiero verde.
|
14
|
+
Grandes estrellas de escarcha
|
15
|
+
vienen con el pez de sombra
|
16
|
+
que abre el camino del alba.
|
17
|
+
La higuera frota su viento
|
18
|
+
con la lija de sus ramas,
|
19
|
+
y el monte, gato garduño,
|
20
20
|
eriza sus pitas agrias.
|
21
|
-
¿Pero quién vendra? ¿Y por dónde...?
|
22
|
-
Ella sigue en su baranda,
|
23
|
-
Verde came, pelo verde,
|
21
|
+
¿Pero quién vendra? ¿Y por dónde...?
|
22
|
+
Ella sigue en su baranda,
|
23
|
+
Verde came, pelo verde,
|
24
24
|
soñando en la mar amarga.
|
25
25
|
--Compadre, quiero cambiar
|
26
26
|
mi caballo por su casa,
|
@@ -28,59 +28,59 @@ mi montura por su espejo,
|
|
28
28
|
mi cuchillo per su manta.
|
29
29
|
Compadre, vengo sangrando,
|
30
30
|
desde los puertos de Cabra.
|
31
|
-
--Si yo pudiera, mocito,
|
32
|
-
este trato se cerraba.
|
33
|
-
Pero yo ya no soy yo,
|
31
|
+
--Si yo pudiera, mocito,
|
32
|
+
este trato se cerraba.
|
33
|
+
Pero yo ya no soy yo,
|
34
34
|
ni mi casa es ya mi casa.
|
35
|
-
--Compadre, quiero morir
|
36
|
-
decentemente en mi cama.
|
37
|
-
De acero, si puede ser,
|
38
|
-
con las sábanas de holanda.
|
39
|
-
¿No ves la herida que tengo
|
35
|
+
--Compadre, quiero morir
|
36
|
+
decentemente en mi cama.
|
37
|
+
De acero, si puede ser,
|
38
|
+
con las sábanas de holanda.
|
39
|
+
¿No ves la herida que tengo
|
40
40
|
desde el pecho a la garganta?
|
41
41
|
--Trescientas rosas morenas
|
42
|
-
lleva tu pechera blanca.
|
43
|
-
Tu sangre rezuma y huele
|
44
|
-
alrededor de tu faja.
|
42
|
+
lleva tu pechera blanca.
|
43
|
+
Tu sangre rezuma y huele
|
44
|
+
alrededor de tu faja.
|
45
45
|
Pero yo ya no soy yo,
|
46
46
|
ni mi casa es ya mi casa.
|
47
|
-
--Dejadme subir al menos
|
47
|
+
--Dejadme subir al menos
|
48
48
|
hasta las altas barandas;
|
49
|
-
¡dejadme subir!, dejadme,
|
50
|
-
hasta las verdes barandas.
|
51
|
-
Barandales de la luna
|
52
|
-
por donde retumba el agua.
|
53
|
-
Ya suben los dos compadres
|
54
|
-
hacia las altas barandas.
|
55
|
-
Dejando un rastro de sangre.
|
56
|
-
Dejando un rastro de lágrimas.
|
49
|
+
¡dejadme subir!, dejadme,
|
50
|
+
hasta las verdes barandas.
|
51
|
+
Barandales de la luna
|
52
|
+
por donde retumba el agua.
|
53
|
+
Ya suben los dos compadres
|
54
|
+
hacia las altas barandas.
|
55
|
+
Dejando un rastro de sangre.
|
56
|
+
Dejando un rastro de lágrimas.
|
57
57
|
Temblaban en los tejados
|
58
|
-
farolillos de hojalata.
|
59
|
-
Mil panderos de cristal
|
58
|
+
farolillos de hojalata.
|
59
|
+
Mil panderos de cristal
|
60
60
|
herían la madrugada.
|
61
61
|
Verde que te quiero verde,
|
62
|
-
verde viento, verdes ramas.
|
62
|
+
verde viento, verdes ramas.
|
63
63
|
Los dos compadres subieron.
|
64
|
-
El largo viento dejaba
|
64
|
+
El largo viento dejaba
|
65
65
|
en la boca un raro gusto
|
66
66
|
de hiel, de menta y de albahaca.
|
67
67
|
¡Compadre! ¿Donde está, díme?
|
68
|
-
¿Donde está tu niña amarga?
|
68
|
+
¿Donde está tu niña amarga?
|
69
69
|
¡Cuántas veces te esperó!
|
70
70
|
¡Cuántas veces te esperara,
|
71
|
-
cara fresca, negro pelo,
|
71
|
+
cara fresca, negro pelo,
|
72
72
|
en esta verde baranda!
|
73
73
|
Sobre el rostro del aljibe
|
74
|
-
se mecía la gitana.
|
75
|
-
Verde carne, pelo verde,
|
74
|
+
se mecía la gitana.
|
75
|
+
Verde carne, pelo verde,
|
76
76
|
con ojos de fría plata.
|
77
|
-
Un carámbano de luna
|
77
|
+
Un carámbano de luna
|
78
78
|
la sostiene sobre el agua.
|
79
|
-
La noche se puso íntima
|
80
|
-
como una pequeña plaza.
|
81
|
-
Guardias civiles borrachos
|
82
|
-
en la puerta golpeaban.
|
83
|
-
Verde que te qinero verde.
|
84
|
-
Verde viento. Verdes ramas.
|
85
|
-
El barco sobre la mar.
|
79
|
+
La noche se puso íntima
|
80
|
+
como una pequeña plaza.
|
81
|
+
Guardias civiles borrachos
|
82
|
+
en la puerta golpeaban.
|
83
|
+
Verde que te qinero verde.
|
84
|
+
Verde viento. Verdes ramas.
|
85
|
+
El barco sobre la mar.
|
86
86
|
Y el caballo en la montaña.
|
@@ -18,7 +18,7 @@
|
|
18
18
|
<h1 class="firstHeading">Pablo Picasso</h1>
|
19
19
|
<div id="bodyContent">
|
20
20
|
<div id="contentSub"></div>
|
21
|
-
|
21
|
+
|
22
22
|
<p><b>Pablo Ruiz Picasso</b> (October 25, 1881 – April 8, 1973) was a <a href="../../art/f.html" title="Spain">Spanish</a> painter and <a href="../../art/t/n.html" title="Sculpture">sculptor</a>. His full name is <b>Pablo Diego José Francisco de Paula Juan Nepomuceno María de los Remedios Crispín Crispiniano de la Santísima Trinidad Ruiz y Picasso</b>. One of the most recognized figures in 20th century <a href="../../art/h/6.html" title="Art">art</a>, he is best known as the co-founder, along with Georges Braque, of cubism. It has been estimated that Picasso produced about 13,500 paintings or designs, 100,000 prints or engravings, 34,000 book illustrations and 300 sculptures or ceramics.</p>
|
23
23
|
<table id="toc" class="toc" summary="Contents">
|
24
24
|
<tr>
|
@@ -53,7 +53,7 @@
|
|
53
53
|
</table>
|
54
54
|
<script type="text/javascript">
|
55
55
|
//<![CDATA[
|
56
|
-
if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); }
|
56
|
+
if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); }
|
57
57
|
//]]>
|
58
58
|
</script>
|
59
59
|
<div class="editsection" style="float:right;margin-left:5px;">[<a href="../../art/4/7.html" title="Edit section: Career">edit</a>]</div>
|
@@ -262,7 +262,7 @@
|
|
262
262
|
</tr>
|
263
263
|
</table>
|
264
264
|
|
265
|
-
<!--
|
265
|
+
<!--
|
266
266
|
Pre-expand include size: 8050 bytes
|
267
267
|
Post-expand include size: 2326 bytes
|
268
268
|
Template argument size: 1930 bytes
|
@@ -273,5 +273,5 @@ Retrieved from "<a href="http://localhost../../art/4/7.html">http://localhost../
|
|
273
273
|
</div>
|
274
274
|
</body>
|
275
275
|
</html>
|
276
|
-
<br/><br/><br/><div class="boilerplate" style="margin:0.5em auto;width:80%;background-color:#f7f8ff;border:2px solid #8888aa; padding:4px;font-size:85%;vertical-align:center" >This text comes from <a href="http://en.wikipedia.org/w/index.php?title=Pablo_Picasso">Wikipedia</a> the free encyclopedia. Permission is granted to copy, distribute and/or modify this document under the terms of the
|
276
|
+
<br/><br/><br/><div class="boilerplate" style="margin:0.5em auto;width:80%;background-color:#f7f8ff;border:2px solid #8888aa; padding:4px;font-size:85%;vertical-align:center" >This text comes from <a href="http://en.wikipedia.org/w/index.php?title=Pablo_Picasso">Wikipedia</a> the free encyclopedia. Permission is granted to copy, distribute and/or modify this document under the terms of the
|
277
277
|
<a href="license://gfdl/">GNU Free Documentation License</a>, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. For a complete list of contributors for a given article, visit the corresponding entry on the <a href="http://en.wikipedia.org/">English Wikipedia</a> and click on "History" . For more details about the license of an image, visit the corresponding entry on the <a href="http://en.wikipedia.org/">English Wikipedia</a> and click on the picture. </div></div>
|
@@ -19,9 +19,9 @@ static char buf[256];
|
|
19
19
|
CMatrix::CMatrix(char *name1,char *job)
|
20
20
|
{
|
21
21
|
sprintf(buf,"%s=%s;",name1,job);
|
22
|
-
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
22
|
+
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
23
23
|
throw SciError();
|
24
|
-
else
|
24
|
+
else
|
25
25
|
{
|
26
26
|
int lp;
|
27
27
|
C2F(cmatptr)(name1, &m, &n, &lp,strlen(name1));
|
@@ -35,14 +35,14 @@ CMatrix::CMatrix(char *name1,char *job)
|
|
35
35
|
void CMatrix::scijob(char *jobname)
|
36
36
|
{
|
37
37
|
sprintf(buf,jobname,name);
|
38
|
-
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
38
|
+
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
39
39
|
throw SciError();
|
40
40
|
}
|
41
41
|
|
42
42
|
CMatrix& CMatrix::plus(CMatrix &B)
|
43
43
|
{
|
44
44
|
sprintf(buf,"%s=%s+%s",this->name,this->name,B.name);
|
45
|
-
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
45
|
+
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
46
46
|
throw SciError();
|
47
47
|
int lp;
|
48
48
|
C2F(cmatptr)(name, &m, &n, &lp,strlen(name));
|
@@ -59,7 +59,7 @@ void CMatrix::print()
|
|
59
59
|
void CMatrix::inv()
|
60
60
|
{
|
61
61
|
sprintf(buf,"%s=inv(%s)",name,name);
|
62
|
-
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
62
|
+
if ( send_scilab_job(buf,strlen(buf)) != 0)
|
63
63
|
throw SciError();
|
64
64
|
int lp;
|
65
65
|
C2F(cmatptr)(name, &m, &n, &lp,strlen(name));
|
@@ -67,7 +67,7 @@ void CMatrix::inv()
|
|
67
67
|
}
|
68
68
|
|
69
69
|
|
70
|
-
void cc_test()
|
70
|
+
void cc_test()
|
71
71
|
{
|
72
72
|
CMatrix A("a","ones(2,2)");
|
73
73
|
CMatrix B("b","8");
|