@@ -2,7 +2,7 @@ * bug fixes: * Added forgotten public/images/flags to generator file. - + == 0.1.5 2008-04-25 * 1 major enhancement: @@ -10,7 +10,7 @@ * 1 minor enhancement: * flags to indicate found language - + * bug fixes: * No more (or just less?) index lock errors @@ -36,7 +36,7 @@ * cache à la Google * minor enhancements: - * easier configuration. Every picolena specific conf files in config/custom + * easier configuration. Every picolena specific conf files in config/custom * lots of refactoring * bug fixes History.txt @@ -8,7 +8,7 @@ Picolena is a lightweight ferret-powered documents search engine written in Ruby on rails: 1. Just let Ferret index any directory you want. - 2. Enter queries on your browser to get corresponding documents in a few milliseconds. + 2. Enter queries on your browser to get corresponding documents in a few milliseconds. == FEATURES: @@ -33,7 +33,7 @@ web-server just like you would with any Rails application. picolena ~/shared_documents /media/literature cd picolena ruby script/server - + This would create the picolena file structure, index every file inside ~/shared_documents and /media/literature, and launch a web-server available at http://localhost:3000 == REQUIREMENTS: README.txt @@ -14,7 +14,7 @@ end action= ARGV.include?("--spec-only") ? "testing" : "installing" require 'rubigen/scripts/generate' -source = RubiGen::PathSource.new(:application, +source = RubiGen::PathSource.new(:application, File.join(File.dirname(__FILE__), "../lib")) RubiGen::Base.reset_sources RubiGen::Base.append_sources source bin/picolena @@ -28,21 +28,21 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge end -REV = nil -# UNCOMMENT IF REQUIRED: +REV = nil +# UNCOMMENT IF REQUIRED: # REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil VERS = Picolena::VERSION::STRING + (REV ? ".#{REV}" : "") RDOC_OPTS = ['--quiet', '--title', 'picolena documentation', "--opname", "index.html", - "--line-numbers", + "--line-numbers", "--main", "README", "--inline-source"] class Hoe - def extra_deps - @extra_deps.reject! { |x| Array(x).first == 'hoe' } + def extra_deps + @extra_deps.reject! { |x| Array(x).first == 'hoe' } @extra_deps - end + end end # Generate all the Rake tasks @@ -54,10 +54,10 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p| p.url = HOMEPATH p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT p.test_globs = ["spec/picolena_spec.rb"] - + files_to_clean = File.readlines(File.join(File.dirname(__FILE__),'files_to_clean')).collect{|line| line.chomp} p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']+files_to_clean #An array of file patterns to delete on clean. - + # == Optional p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n") p.extra_deps = [ ['rails', '>= 2.0.2'], @@ -70,9 +70,9 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p| ['paginator', '>= 1.1.0'], ['rspec', '>= 1.1.3'] ] - + #p.spec_extras = {} # A hash of extra values to set in the gemspec. - + p.rdoc_pattern = /txt$/ end config/hoe.rb @@ -9,7 +9,7 @@ Example: picolena ~/shared_documents /media/literature cd picolena ruby script/server - + This would create the picolena file structure, index every file inside ~/shared_documents and /media/literature, and launch a web-server available at http://localhost:3000 \ No newline at end of file lib/picolena/USAGE @@ -2,16 +2,16 @@ module Picolena # Specify indexes path. # Storage should be sufficient in order to store all indexed data. IndexesSavePath=File.join(RAILS_ROOT, 'tmp/ferret_indexes/') - - + + # Which language should be used? # English (:en), German (:de), French (:fr) and Spanish (:es) are currently supported # English is chosen by default. # If you'd like to use another language, you can find templates in #{RAILS_ROOT}/lang/ui, # then add your own language in this directory, and modify this line: Globalite.language = :en - - + + # Is more than one language used in indexed documents? # Picolena can try to recognise the language used, and save it in the index. # It is then possible to look for documents according to their language. @@ -19,15 +19,15 @@ module Picolena # If every document is written in the same language, turning UseLanguageRecognition to false # will speed up the indexing process UseLanguageRecognition = true - + # Specify which locale should be used by Ferret Ferret.locale = "en_US.UTF-8" - - + + # Results per page ResultsPerPage = 10 - - + + # Length of "probably unique id" 's # Those id's are used to characterize every document, thus allowing tiny URLs in Controllers # HashLength = 10 @@ -37,8 +37,8 @@ module Picolena # The more documents you have, the bigger HashLength should be in order to avoid collisions. # It would not be wise (and specs won't pass) to specify HashLength smaller than 10. HashLength = 10 - - + + # Specify the default Levenshtein distance when using FuzzyQuery # see http://ferret.davebalmain.com/api/classes/Ferret/QueryParser.html for more information. Ferret::Search::FuzzyQuery.default_min_similarity=0.6 lib/picolena/config/basic.rb @@ -3,14 +3,14 @@ require 'fileutils' require 'pathname' class PicolenaGenerator < RubiGen::Base #:nodoc: - + DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) - + default_options :destination => 'picolena' - + attr_reader :name - + def initialize(runtime_args, runtime_options = {}) super usage if args.empty? and !options[:spec_only] @@ -20,17 +20,17 @@ class PicolenaGenerator < RubiGen::Base #:nodoc: abs_dir=Pathname.new(relative_path).realpath.to_s "\"#{abs_dir}\" : \"#{abs_dir}\"" }.join("\n ") - + extract_options end def manifest script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] } - + record do |m| #Create base dir m.directory '' - + # Picolena file structure, without any plugin. BASEDIRS.each { |path| # Ensure appropriate folder exists @@ -38,7 +38,7 @@ class PicolenaGenerator < RubiGen::Base #:nodoc: # Copy every file included in BASEDIRS m.folder path, path } - + # Moved plugins away so they don't get parsed by rdoc/ri. RAILS_PLUGINS.each{ |path| plugin_source = '../../../rails_plugins/'+path @@ -56,7 +56,7 @@ class PicolenaGenerator < RubiGen::Base #:nodoc: %w( about breakpointer console destroy generate performance/benchmarker performance/profiler performance/request process/reaper process/spawner process/inspector runner server plugin spec spec_server).each do |file| m.file "script/#{file}", "script/#{file}", script_options end - + # Picolena configuration files m.file '../config/white_list_ip.yml', 'config/custom/white_list_ip.yml' m.file '../config/basic.rb', 'config/custom/picolena.rb' @@ -69,10 +69,10 @@ class PicolenaGenerator < RubiGen::Base #:nodoc: m.file '../../../README.txt', 'README' m.file '../../../README.txt', 'doc/README_FOR_APP' m.file 'Rakefile', 'Rakefile' - + unless options[:no_index] # Indexing documents for development environment - m.rake 'index:create' + m.rake 'index:create' # Mirroring Ferret development index instead of indexing documents again for production. m.mirror 'tmp/ferret_indexes/development', 'tmp/ferret_indexes/production' end @@ -109,10 +109,10 @@ EOS opts.on(nil, "--spec-only", "Test picolena framework without installing it."){ options[:spec_only]=true options[:no_index]=true - options[:destination]=File.join(Dir::tmpdir,"picolena_test_#{Time.now.to_i}") + options[:destination]=File.join(Dir::tmpdir,"picolena_test_#{Time.now.to_i}") } end - + def extract_options # for each option, extract it into a local variable (and create an "attr_reader :author" at the top) # Templates can access these value via the attr_reader-generated methods, but not the @@ -170,7 +170,7 @@ EOS tmp/sessions tmp/sockets ) - + RAILS_PLUGINS=%w( globalite globalite/data lib/picolena/picolena_generator.rb @@ -3,23 +3,23 @@ # The request is sent to DocumentsController only if the IP is included in the white list. # Otherwise, it returns "Access denied" 403. -class ApplicationController < ActionController::Base +class ApplicationController < ActionController::Base session :disabled => true before_filter :should_only_be_available_for_white_list_IPs, :except=> :access_denied - + # Returns 403 status in case of an unknown remote IP address def access_denied render :text=>"Access denied", :status => 403 end - + # Redirects to documents_url in case route hasn't been recognised def unknown_request flash[:warning]="Unknown URL" redirect_to documents_url end - + private - + # Tries to match remote IP address with the white list defined in config/custom/white_list_ip.yml # Redirects to :access_denied if the remote IP is not white listed. def should_only_be_available_for_white_list_IPs lib/picolena/templates/app/controllers/application.rb @@ -6,17 +6,17 @@ # - displays document content # - displays cached content. -class DocumentsController < ApplicationController +class DocumentsController < ApplicationController before_filter :check_if_valid_link, :only=> [:download, :content, :cached] - + # Actually doesn't check anything at all. Just a redirect to show_document(query) # # FIXME: remove this useless action, and go directly from submit button to GET :action => show def check_query redirect_to :action=>'show', :id=>params[:query] end - - + + # Show the matching documents for a given query def show start=Time.now @@ -31,14 +31,14 @@ class DocumentsController < ApplicationController @total_hits=finder.total_hits @time_needed=Time.now-start end - - + + # Download the file whose probably_unique_id is given. # If the checksum is incorrect, redirect to documents_url via no_valid_link def download send_file @document.complete_path end - + # Returns the content of the document identified by probably_unique_id, as it is *now*. def content end @@ -47,9 +47,9 @@ class DocumentsController < ApplicationController # similar to Google cache. def cached end - + private - + # Returns corresponding document for any given "probably unique id" # Redirects to no_valid_link if: # there are more than one matching document (hash collision) @@ -58,7 +58,7 @@ class DocumentsController < ApplicationController @probably_unique_id=params[:id] @document=Document.find_by_unique_id(@probably_unique_id) rescue no_valid_link end - + # Flashes a warning and redirects to documents_url. def no_valid_link flash[:warning]="no valid link" lib/picolena/templates/app/controllers/documents_controller.rb @@ -3,7 +3,7 @@ module DocumentsHelper def nothing_found? @matching_documents.nil? or @matching_documents.entries.empty? end - + # Very basic pagination. # Provides liks to Next, Prev and FirstPage when needed. def should_paginate(page,query) @@ -11,7 +11,7 @@ module DocumentsHelper (link_to("←", :action => :show, :id => query, :page => page.prev.number) if page.prev?), (link_to("→", :action => :show, :id => query, :page => page.next.number) if page.next?)].compact.join(" | ") end - + # Returns a localized sentence like "Results 1-10 of 12 for Zimbabwe (0.472s)" or # "Résultats 1-2 parmi 2 pour whatever (0.012s)" def describe_results(page, total_hits, dt, query) @@ -24,45 +24,45 @@ module DocumentsHelper show_time_needed(dt) ].join(' ') end - + # Returns the time needed to treat the query and launch the search, with a ms precision : (0.472s) def show_time_needed(dt) content_tag(:small,'('<<number_with_precision(dt,3)<<'s)') end - + # When possible, highlights content of the document that matches the query. def highlight_matching_content(document) content_tag(:ul,document.matching_content.collect{|sentence| content_tag(:li,h(sentence).gsub(/<<(.*?)>>/,'<strong>\1</strong>').gsub(/\v|\f/,'')) }) if document.matching_content end - + def language_icon_for(document) (lang=document.language) && link_to(image_tag("flags/#{lang}.png"), document_url('lang:'<<lang)) end - + # Returns icon and filename for any given document. def icon_and_filename_for(document) [icon_for(document.extname),document.filename].join(" ") end - + # Returns the location (if avaible) of the filetype icon. - def icon_for(filetype) + def icon_for(filetype) icon_symbol=FiletypeToIconSymbol[filetype.downcase.sub(/^\./,'')] image_tag("icons/#{icon_symbol}.png") if icon_symbol end - + # Returns a link to a backup search engine that could maybe find more results for the same query. def link_to_backup_search_engine(query) link_to :backup_search_engine_name.l, :backup_search_engine_url.l<<query end - + # For any indexed document, returns a link to its containing directory. def link_to_containing_directory(document) link_name=image_tag('icons/remote_folder.png')<<' '<<content_tag(:small,document.alias_path) link_to link_name, document.alias_path, :target=>'_blank' end - + # For any indexed document, returns a link to show its content. def link_to_plain_text_content(document) link_name=image_tag('icons/plain_text_small.png')<<' '<<content_tag(:small,:text_content.l) lib/picolena/templates/app/helpers/documents_helper.rb @@ -2,14 +2,14 @@ class Document attr_reader :complete_path attr_accessor :user, :score, :matching_content - + def initialize(path) #To ensure @complete_path is an absolute direction. @complete_path=File.expand_path(path) validate_existence_of_file validate_in_indexed_directory end - + #Delegating properties to File::method_name(complete_path) [:dirname, :basename, :extname, :size?, :file?, :read, :ext_as_sym].each{|method_name| define_method(method_name){File.send(method_name,complete_path)} @@ -17,19 +17,19 @@ class Document alias_method :size, :size? alias_method :filename, :basename alias_method :to_s, :basename - + # Returns filename without extension # "buildings.odt" => "buildings" def basename filename.chomp(extname) end - + # End users should not always know where documents are stored internally. # An alias path can be specified in config/indexed_directories.yml - # + # # For example, with: # "/media/wiki_dump/" : "http://www.mycompany.com/wiki/" - # + # # The documents # "/media/wiki_dump/organigram.odp" # will be displayed as being: @@ -39,7 +39,7 @@ class Document alias_dir=Picolena::IndexedDirectories[original_dir] dirname.sub(original_dir,alias_dir) end - + # Returns an id for this document. # This id will be used in Controllers in order to get tiny urls. # Since it's a base26 hash of the absolute filename, it can only be "probably unique". @@ -47,41 +47,41 @@ class Document def probably_unique_id @probably_unique_id||=complete_path.base26_hash end - + # Returns true iff some PlainTextExtractor has been defined to convert it to plain text. # Document.new("presentation.pdf").supported? => true # Document.new("presentation.some_weird_extension").supported? => false def supported? PlainTextExtractor.supported_extensions.include?(self.ext_as_sym) end - + # Retrieves content as it is *now*. def content PlainTextExtractor.extract_content_from(complete_path) end - + # Cache à la Google. # Returns content as it was at the time it was indexed. def cached from_index[:content] end - + # FIXME: Not just date anymore. # Returns the last modification date before the document got indexed. # Useful to know how old a document is, and to which version the cache corresponds. def date from_index[:modified].sub(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/,'\1-\2-\3 \4:\5:\6') end - + def mtime from_index[:modified].to_i end - + # Returns language. def language from_index[:language] end - + # Fields that are shared between every document. def self.default_fields_for(complete_path) { @@ -91,35 +91,35 @@ class Document :basename => File.basename(complete_path, File.extname(complete_path)).gsub(/_/,' '), :filetype => File.extname(complete_path), :modified => File.mtime(complete_path).strftime("%Y%m%d%H%M%S") - } + } end - + private - + # Retrieves the document from the index. # Useful to get meta-info about it. def from_index Indexer.index[probably_unique_id] end - + def self.find_by_unique_id(probably_unique_id) new(Indexer.index[probably_unique_id][:complete_path]) end - + def in_indexed_directory? !indexed_directory.nil? end - + def indexed_directory Picolena::IndexedDirectories.keys.find{|indexed_dir| dirname.starts_with?(indexed_dir) - } + } end - + def validate_existence_of_file raise Errno::ENOENT, @complete_path unless file? end - + def validate_in_indexed_directory raise ArgumentError, "required document is not in indexed directory" unless in_indexed_directory? end lib/picolena/templates/app/models/document.rb @@ -1,10 +1,10 @@ -class Finder +class Finder attr_reader :query - + def index @@index ||= Indexer.index end - + def initialize(raw_query,page=1,results_per_page=Picolena::ResultsPerPage) @query = Query.extract_from(raw_query) @raw_query= raw_query @@ -13,7 +13,7 @@ class Finder @offset=(page.to_i-1)*results_per_page index_should_have_documents end - + def execute! @matching_documents=[] start=Time.now @@ -36,12 +36,12 @@ class Finder @time_needed=Time.now-start @total_hits=top_docs.total_hits end - + # Returns true if it has been executed. def executed? @executed end - + # To ensure that # matching_documents # total_hits @@ -53,7 +53,7 @@ class Finder instance_variable_get("@#{attribute_name}") } } - + # Returns matching document for any given query only if # exactly one document is found. # Raises otherwise. @@ -71,9 +71,9 @@ class Finder def self.reload! @@index = nil end - + private - + def index_should_have_documents raise IndexError, "no document found" unless index.size > 0 end lib/picolena/templates/app/models/finder.rb @@ -3,7 +3,7 @@ class Indexer @@exclude = /(Thumbs\.db)/ # Number of threads that will be used during indexing process @@max_threads_number = 8 - + class << self def index_every_directory(remove_first=false) clear! if remove_first @@ -18,29 +18,29 @@ class Indexer index.optimize log :debug => "Indexing done in #{Time.now-start} s." end - + def index_directory_with_multithreads(dir) log :debug => "Indexing #{dir}, #{@@max_threads_number} threads" - + indexing_list=Dir[File.join(dir,"**/*")].select{|filename| File.file?(filename) && filename !~ @@exclude } - + indexing_list_chunks=indexing_list.in_transposed_slices(@@max_threads_number) - + # It initializes the Index before launching multithreaded # indexing. Otherwise, two threads could try to instantiate # an IndexWriter at the same time, and get a # Ferret::Store::Lock::LockError index - + indexing_list_chunks.each_with_thread{|chunk| chunk.each{|filename| add_file(filename) } } end - + def add_file(complete_path) default_fields = Document.default_fields_for(complete_path) begin @@ -54,14 +54,14 @@ class Indexer end index << document end - + # Ensures index is closed, and removes every index file for RAILS_ENV. def clear!(all=false) close to_remove=all ? Picolena::IndexesSavePath : Picolena::IndexSavePath Dir.glob(File.join(to_remove,'**/*')).each{|f| FileUtils.rm(f) if File.file?(f)} end - + # Closes the index and # ensures that a new Index is instantiated next time index is called. def close @@ -69,28 +69,28 @@ class Indexer # Ferret will SEGFAULT otherwise. @@index = nil end - + # Only one IndexWriter should be instantiated. # If one index already exists, returns it. # Creates it otherwise. def index - @@index ||= Ferret::Index::Index.new(default_index_params) + @@index ||= Ferret::Index::Index.new(default_index_params) end - + def ensure_index_existence index_every_directory(:remove_first) unless index_exists? or RAILS_ENV=="production" end - + def doc_count index.writer.doc_count end - + private - + def index_exists? index_filename and File.exists?(index_filename) end - + def index_filename Dir.glob(File.join(Picolena::IndexSavePath,'*.cfs')).first end @@ -100,7 +100,7 @@ class Indexer IndexerLogger.send(level,message) } end - + def default_index_params { :path => Picolena::IndexSavePath, @@ -110,7 +110,7 @@ class Indexer :key => :probably_unique_id } end - + def default_field_infos returning Ferret::Index::FieldInfos.new do |field_infos| field_infos.add_field(:complete_path, :store => :yes, :index => :untokenized) lib/picolena/templates/app/models/indexer.rb @@ -2,52 +2,52 @@ require 'plain_text_extractor_DSL' class PlainTextExtractor include PlainTextExtractorDSL - class<<self + class<<self # Returns every defined extractor def all Picolena::Extractors end - + # Add an extractor to the extractors list def add(extractor) all<<extractor end - + # Returns every required dependency for every defined extractor def dependencies @@dependencies||=all.collect{|extractor| extractor.dependencies}.flatten.compact.uniq.sort end - + # Returns every supported file extensions def supported_extensions @@supported_exts||=all.collect{|extractor| extractor.exts}.flatten.compact.uniq end - + # Finds which extractor should be used for a given file. - # Raises if the file is unsupported. + # Raises if the file is unsupported. def find_by_filename(filename) ext=File.ext_as_sym(filename) returning find_by_extension(ext) do |found_extractor| found_extractor.source=filename end end - + # Finds which extractor should be used for a given file, according to its extension # Raises if the file is unsupported. def find_by_extension(ext) all.find{|extractor| extractor.exts.include?(ext)} || raise(ArgumentError, "no convertor for .#{ext}") end - + # Launches extractor on given file and outputs plain text result def extract_content_from(source) find_by_filename(source).extract_content end - + # Launches extractor on given file and outputs plain text result and language (if found) def extract_content_and_language_from(source) find_by_filename(source).extract_content_and_language end - + # Returns which language guesser should be used by the system. # Returns nil if none is found. def language_guesser @@ -56,7 +56,7 @@ class PlainTextExtractor end attr_accessor :source - + # Parses command in order to know which programs are needed. # rspec will then check that every dependecy is installed on the system def dependencies @@ -66,21 +66,21 @@ class PlainTextExtractor @dependencies end end - + ## Conversion part - + # destination method can be used by some conversion command that cannot output to stdout (example?) # a file containing plain text result will first be written by command, and then be read by extract_content. def destination require 'tmpdir' @@temp_file_as_destination ||= File.join(Dir::tmpdir,"ferret_#{Time.now.to_i}") end - + # Replaces generic command with specific source and destination (if specified) files def specific_command command.sub('SOURCE','"'<<source<<'"').sub('DESTINATION','"'<<destination<<'"') end - + # Returns plain text content of source file def extract_content if command.is_a?(String) then @@ -102,7 +102,7 @@ class PlainTextExtractor command.call(source) end end - + # Returns plain text content and language of source file, # using mguesser to guess used language. # This method only returns probable language if the content is bigger than 500 chars lib/picolena/templates/app/models/plain_text_extractor.rb @@ -4,10 +4,10 @@ class Query def extract_from(raw_query) parser.parse(convert_to_english(raw_query)) end - + private - - # Converts query keywords to english so they can be parsed by Ferret. + + # Converts query keywords to english so they can be parsed by Ferret. def convert_to_english(raw_query) to_en={ /\b#{:AND.l}\b/=>'AND', @@ -22,9 +22,9 @@ class Query } to_en.inject(raw_query){|mem,non_english_to_english_keyword| mem.gsub(*non_english_to_english_keyword) - } + } end - + # Instantiates a QueryParser once, and keeps it in cache. def parser @@parser ||= Ferret::QueryParser.new(:fields => [:content, :filename, :basename, :filetype, :modified], :or_default => false, :analyzer=>Picolena::Analyzer) lib/picolena/templates/app/models/query.rb @@ -12,7 +12,7 @@ IndexerLogger=Logger.new($stdout) # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') -Rails::Initializer.run do |config| +Rails::Initializer.run do |config| # We don't need no stinkin' AR! # Ferret backs us up. config.frameworks -= [ :active_record ] lib/picolena/templates/config/environment.rb @@ -1,5 +1,5 @@ locale_name: Español -page_title: Buscador Picolena +page_title: Buscador Picolena help: Ayuda help_file: /help/PicolenaHowTo-es.pdf type_your_query_here: teclee por favor su búsqueda lib/picolena/templates/lang/ui/es.yml @@ -3,13 +3,13 @@ class MimeType def self.all @@all end - + def self.add(exts,mime_name) all<<new(exts,mime_name) end - + attr_reader :exts, :name - + def initialize(exts,mime_name) @exts,@name=exts,mime_name end @@ -61,17 +61,17 @@ class File def self.ext_as_sym(filename) File.extname(filename).sub(/^\./,'').downcase.to_sym rescue :no_extension end - + def self.mime(filename) ext=ext_as_sym(filename) m=MimeType.all.find{|m| m.exts.include?(ext)} m ? m.name : 'application/octet-stream' end - + def self.encoding(source) parse_for_charset="grep -io charset=[a-z0-9\\-]* | sed 's/charset=//i'" if File.extname(source)[0,4]==".htm" then - enc=%x{head -n20 \"#{source}\" | #{parse_for_charset}}.chomp + enc=%x{head -n20 \"#{source}\" | #{parse_for_charset}}.chomp else enc=%x{file -i \"#{source}\" | #{parse_for_charset}}.chomp end @@ -85,7 +85,7 @@ class File enc end end - + def self.read_and_remove(filename) content=read(filename) FileUtils.rm filename, :force=>true lib/picolena/templates/lib/core_exts.rb @@ -11,45 +11,45 @@ module PlainTextExtractorDSL attr_reader :exts, :mime_name, :description, :command, :content_and_file_examples - + def initialize(&block) @content_and_file_examples=[] self.instance_eval(&block) PlainTextExtractor.add(self) MimeType.add(self.exts,self.mime_name) end - + def every(*exts) @exts=exts end - + def as(mime_name) @mime_name=mime_name end - + def aka(description) @description=description end - + def which_requires(*dependencies) @dependencies=dependencies end - + #used by rspec to test extractors: # which_should_for_example_extract 'in a pdf file', :from => 'basic.pdf' # or_extract 'some other stuff inside another pdf file', :from => 'yet_another.pdf' # #this spec will pass if 'basic.pdf' and 'yet_another.pdf' are included in an indexed directory, if every dependency is installed, - #and if plain text output from the extractor applied to 'basic.pdf' and 'yet_another.pdf' respectively include 'in a pdf file' and 'some other stuff inside another pdf file' + #and if plain text output from the extractor applied to 'basic.pdf' and 'yet_another.pdf' respectively include 'in a pdf file' and 'some other stuff inside another pdf file' def which_should_for_example_extract(content, file) @content_and_file_examples << [content,file[:from]] end - + #it allows to define specs in this way: # which_should_for_example_extract 'Hello world!', :from => 'hello.rb' # or_extract 'text inside!', :from => 'crossed.txt' alias_method :or_extract, :which_should_for_example_extract - + def with(command_as_hash_or_string=nil,&block) #TODO: Find a better way to manage platforms, and include OS X, Vista, BSD... platform=case RUBY_PLATFORM @@ -71,7 +71,7 @@ module PlainTextExtractorDSL # On linux and mac_os platforms, it returns "pdftotext -enc UTF-8 SOURCE -", # on windows, it returns "some other command" # - # If commands for linux & mac os were different : + # If commands for linux & mac os were different : # with "some command" => :on_linux, # "another command" => :on_mac_os, # "yet another command" => :on_windows lib/picolena/templates/lib/plain_text_extractor_DSL.rb @@ -21,7 +21,7 @@ PlainTextExtractor.new { text_cells=zipfile.read("xl/sharedStrings.xml").split(/</).grep(/^t/).collect{|l| l.sub(/^[^>]+>/,'') } - + sheet_names=zipfile.read("xl/workbook.xml").split(/</).grep(/^sheet /).collect{|l| l.scan(/name="([^"]*)"/) } lib/picolena/templates/lib/plain_text_extractors/ms.excel.rb @@ -13,7 +13,7 @@ PlainTextExtractor.new { } # for dependencies spec which_requires 'iconv' - + # to check if the extractor is working with basic plain text files which_should_for_example_extract 'Hello world!', :from => 'hello.rb' or_extract 'text inside!', :from => 'crossed.txt' @@ -25,7 +25,7 @@ PlainTextExtractor.new { or_extract 'This program calculates greatest common divisors', :from=>'gcd.c' or_extract 'p 3 square.dat', :from => 'square.ins' or_extract 'Do loop (global)', :from => 'xor.vee' - + # to check if other charsets are supported or_extract 'püöüökäößß AND ßklüöü', :from => 'utf-8.txt' or_extract 'Themenliste für Adsorptionskälte', :from => 'iso-8859-1.txt' lib/picolena/templates/lib/plain_text_extractors/plain_text.rb @@ -1,10 +1,10 @@ desc 'Ferret index maintenance tasks' -namespace :index do +namespace :index do desc 'Clear indexes' task :clear => :environment do Indexer.clear! :all end - + desc 'Create index' task :create => :environment do Indexer.index_every_directory(remove_first=true) @@ -14,7 +14,12 @@ namespace :index do task :update => :environment do Indexer.index_every_directory end - + + desc 'Returns the number of indexed documents' + task :size => :environment do + puts "#{Indexer.doc_count} documents are currently indexed in #{Picolena::IndexSavePath}" + end + # Search index with query "some query" : # rake index:search query="some query" desc 'Search index' lib/picolena/templates/lib/tasks/index.rake @@ -14,14 +14,14 @@ namespace :install_dependencies do # odt2txt package not available on previous versions desc 'Install required packages on Ubuntu' task :on_ubuntu => :on_debian - + desc 'Install required gems and programs on Windows' task :on_windows_xp do #NOTE: Long way to go before it runs on XP. $stderr.puts "Implement me!" end - desc 'Install required gems and packages on Mac Os' + desc 'Install required gems and packages on Mac Os' task :on_mac_os do $stderr.puts "Implement me!" end lib/picolena/templates/lib/tasks/install_dependencies.rake @@ -1,6 +1,6 @@ desc 'Ferret index maintenance tasks' -namespace :log do +namespace :log do desc 'Parse log files for queries' task :queries do show_action_regexp=/Processing DocumentsController#show $for ([\d\.]+) at ([\d\- :]+)$ \[GET\]/ lib/picolena/templates/lib/tasks/log.rake @@ -5,14 +5,14 @@ Options +FollowSymLinks +ExecCGI # If you don't want Rails to look in certain directories, # use the following rewrite rules so that Apache won't rewrite certain requests -# +# # Example: # RewriteCond %{REQUEST_URI} ^/notrails.* # RewriteRule .* - [L] # Redirect all requests not available on the filesystem to Rails # By default the cgi dispatcher is used which is very slow -# +# # For better performance replace the dispatcher with the fastcgi one # # Example: @@ -33,7 +33,7 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L] # In case Rails experiences terminal errors # Instead of displaying this message you can supply a file here which will be rendered instead -# +# # Example: # ErrorDocument 500 /500.html lib/picolena/templates/public/.htaccess @@ -96,14 +96,14 @@ h1, h2, h3, h4, h5, h6, p, form { border-left-color:#696; border-right-color:#363; border-bottom-color:#363;} - + #mainimg input.btn:hover{ color:#EE8907;} #mainimg input.text_field{ border: 2px solid #88b000; background: #fff; - margin-right: 5px; + margin-right: 5px; } #contentarea hr { lib/picolena/templates/public/stylesheets/style.css @@ -23,7 +23,7 @@ module Spec active_connections.delete(name) end end - end + end if ActionController.const_defined?(:Dispatcher) dispatcher = ::ActionController::Dispatcher.new($stdout) lib/picolena/templates/script/spec_server @@ -5,12 +5,12 @@ describe ApplicationController do get 'access_denied' response.headers["Status"].should == "403 Forbidden" end - + it "should render 'Access denied' text when denying access" do get 'access_denied' response.body.should == 'Access denied' end - + it "should flash a warning if given a wrong request" do get 'unknown_request' response.should be_redirect lib/picolena/templates/spec/controllers/application_controller_spec.rb @@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "DocumentsController called from unknown IP" do controller_name "documents" - + before(:all) do @backup=Picolena::WhiteListIPs end - + it "should deny access" do # Displays a warning otherwise Picolena.send(:remove_const, :WhiteListIPs) && Picolena::WhiteListIPs=/Something that won't match/ @@ -23,75 +23,75 @@ describe "DocumentsController called from unknown IP" do end end -describe DocumentsController do +describe DocumentsController do it "GET 'index' should be succesful" do get 'index' response.should be_success end - + it "POST 'check_query' should check query and redirect to show" do post 'check_query', {:query => 'basic test'} response.should be_redirect - response.should redirect_to(document_url('basic test')) + response.should redirect_to(document_url('basic test')) end - + it "POST 'check_query' should accept . and redirect to show" do post 'check_query', {:query => 'basic.test'} response.should be_redirect response.should redirect_to(:action=>'show', :id=>'basic.test') end - + it "POST 'check_query' should accept ? and redirect to show" do post 'check_query', {:query => '?ric'} response.should be_redirect - response.should redirect_to(:action=>'show', :id=>'?ric') + response.should redirect_to(:action=>'show', :id=>'?ric') end - + it "POST 'check_query' should accept empty query but should redirect to index" do post 'check_query', {:query => ''} response.should be_redirect response.should redirect_to(:action=>'index') end - + it "GET 'show' should find corresponding docs" do get 'show', :id=>'forschung an fachhochschulen nachhaltige energietechnik' response.should be_success assigns[:matching_documents].any?{|doc| doc.filename=="zafh.net.html"}.should be_true end - + it "GET 'show' should accept * in queries" do lambda{get 'show', :id=>'*ric'}.should_not raise_error response.should be_success assigns[:matching_documents].entries.should_not be_empty assigns[:matching_documents].any?{|doc| doc.matching_content.join.starts_with?("<<Éric>> Mößer\n\n\f")}.should be_true end - + it "GET 'show' should accept ? in queries" do lambda{get 'show', :id=>'?ric'}.should_not raise_error(ActionController::RoutingError) response.should be_success assigns[:matching_documents].entries.should_not be_empty assigns[:matching_documents].any?{|doc| doc.filename=="basic.tex"}.should be_true end - + it "GET 'show' should accept . in queries" do lambda{get 'show', :id=>'basic.pdf'}.should_not raise_error(ActionController::RoutingError) response.should be_success assigns[:matching_documents].entries.should_not be_empty assigns[:matching_documents].any?{|doc| doc.matching_content.join.starts_with?("just another content test in a pdf file")}.should be_true end - + it "GET 'show' should accept combined queries" do get 'show', :id=>'test filetype:pdf' response.should be_success assigns[:matching_documents].entries.should_not be_empty end - + it "GET 'show' should accept empty query but should redirect to index" do lambda{get 'show', :id=>''}.should_not raise_error response.should be_success assigns[:matching_documents].entries.should be_empty end - + it "GET 'download' should be successful with correct ID" do get 'show', :id=>'basic.pdf' response.should be_success @@ -101,7 +101,7 @@ describe DocumentsController do assigns[:document].complete_path == d.complete_path response.should be_success end - + it "GET 'download' should redirect if wrong id" do probably_unique_id="Not a document".base26_hash get 'download', :id=>probably_unique_id lib/picolena/templates/spec/controllers/documents_controller_spec.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ApplicationHelper do - + #Delete this example and add some real ones or delete this file it "should include the ApplicationHelper" do included_modules = self.metaclass.send :included_modules included_modules.should include(ApplicationHelper) end - + end lib/picolena/templates/spec/helpers/application_helper_spec.rb @@ -1,10 +1,10 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe DocumentsHelper do +describe DocumentsHelper do it "shouldn't raise if matching not in content field" PlainTextExtractor.supported_extensions.each{|ext| - it "should have an icon for .#{ext} filetype" do + it "should have an icon for .#{ext} filetype" do icon_for(ext.to_s).should_not be_nil end } lib/picolena/templates/spec/helpers/documents_helper_spec.rb @@ -8,24 +8,24 @@ describe "Finder without index on disk" do @new_index_path=File.join(Dir::tmpdir,'ferret_tst') Picolena::IndexSavePath.replace(@new_index_path) end - + before(:each) do Indexer.clear! end - + it "should create index" do Picolena::IndexedDirectories.replace({'spec/test_dirs/indexed/just_one_doc'=>'//justonedoc/'}) lambda {@finder_with_new_index=Finder.new("test moi")}.should change(Indexer, :index_exists?).from(false).to(true) File.exists?(File.join(@new_index_path,'_0.cfs')).should be_true Indexer.index.size.should >0 end - + it "should raise if index is still empty after trying to create it" do Picolena::IndexedDirectories.replace({'spec/test_dirs/empty_folder'=>'//empty_folder/'}) lambda {Finder.new("doesn't matter anyway")}.should raise_error(IndexError, "no document found") File.exists?(File.join(@new_index_path,'_0.cfs')).should be_false end - + after(:all) do Picolena::IndexedDirectories.replace(@original_indexed_dirs) Picolena::IndexSavePath.replace(@original_index_path) @@ -45,11 +45,11 @@ fields={ :language => :language } -describe "Basic Finder" do +describe "Basic Finder" do before(:all) do Indexer.index_every_directory(remove_first=true) end - + it "should accept one parameter as query, and 2 optionals for paginating" do lambda {Finder.new}.should raise_error(ArgumentError, "wrong number of arguments (0 for 1)") # show first page with 10 results per page @@ -65,37 +65,37 @@ describe "Basic Finder" do it "should return matching documents if executed successfully" do finder_with_valid_query=Finder.new("district heating") finder_with_valid_query.should respond_to(:matching_documents) - + matching_documents=finder_with_valid_query.matching_documents matching_documents.should_not be_empty - + matching_documents_filenames=matching_documents.collect{|d| d.filename} matching_documents_filenames.should include("Simulation of district heating systems for evaluation of real-time control strategies.pdf") matching_documents_filenames.should include("Types of malfunction in DH substations.doc") end - + it "should know if it has been executed" do @finder=Finder.new("some query") lambda {@finder.execute!}.should change(@finder, :executed?).from(false).to(true) end - + it "should not warn anything if index is up to date" - + it "should warn if index is not up to date" - + fields.each_pair do |description,field_name| it "should index #{description} as :#{field_name}" do Indexer.index.field_infos[field_name].should be_an_instance_of(Ferret::Index::FieldInfo) end end - + it "should know how much time was needed for execution" do finder=Finder.new("yet another stupid query") finder.executed?.should be_nil finder.time_needed.should > 0 finder.executed?.should be_true end - + it "should not need more than 100ms to find documents" do finder=Finder.new("district heating") finder.execute! lib/picolena/templates/spec/models/basic_finder_spec.rb @@ -13,18 +13,18 @@ describe Document do before(:each) do @valid_random_doc=Document.find(:random) rescue Document.new("spec/test_dirs/indexed/basic/basic.pdf") end - + it "should be an existing file" do lambda {Document.new("/patapouf.txt")}.should raise_error(Errno::ENOENT) lambda {@valid_random_doc}.should_not raise_error lambda {Document.new("spec/test_dirs/not_indexed/Rakefile")}.should_not raise_error(Errno::ENOENT) end - + it "should belong to an indexed directory" do lambda {@valid_random_doc}.should_not raise_error lambda {Document.new("spec/test_dirs/not_indexed/Rakefile")}.should raise_error(ArgumentError, "required document is not in indexed directory") end - + basic_pdf_attribute.each{|attribute,expected_value| it "should know its #{attribute}" do @valid_random_doc.should respond_to(attribute) @@ -32,31 +32,31 @@ describe Document do @basic_pdf.send(attribute).should == expected_value end } - + it "should know which user it belongs to, if specified" do @valid_random_doc.should respond_to(:user) @valid_random_doc.user.should be_nil @valid_random_doc.user="eric" @valid_random_doc.user.should == "eric" end - + it "should know its content" do another_doc=Document.new("spec/test_dirs/indexed/basic/plain.txt") another_doc.content.should == "just a content test\nin a txt file" end - + it "should know its alias_path" do @valid_random_doc.should respond_to(:alias_path) @valid_random_doc.alias_path.starts_with?("http://picolena.devjavu.com/browser/trunk/lib/picolena/templates/spec/test_dirs/indexed").should be_true end - + it "should let finder specify its score" do @valid_random_doc.should respond_to(:score) @valid_random_doc.score.should be_nil @valid_random_doc.score=25 @valid_random_doc.score.should == 25 end - + it "should let finder specify its matching content" do @valid_random_doc.should respond_to(:matching_content) @valid_random_doc.matching_content.should be_nil lib/picolena/templates/spec/models/document_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' def revert_changes!(file,content) File.open(file,'w'){|might_have_been_modified| might_have_been_modified.write content - } + } end describe Finder do @@ -13,7 +13,7 @@ describe Finder do # To be sure this file has the right content revert_changes!("spec/test_dirs/indexed/others/placeholder.txt","Absorption and Adsorption cooling machines!!!") - + once_upon_a_time=Time.local(1982,2,16,20,42) a_bit_later=Time.local(1983,12,9,9) nineties=Time.local(1990) @@ -23,41 +23,41 @@ describe Finder do File.utime(0, nineties, 'spec/test_dirs/indexed/others/placeholder.txt') Indexer.index_every_directory(remove_first=true) end - + it "should find documents according to their basename when specified with basename:query" do matching_documents_filename=Finder.new("basename:crossed").matching_documents.collect{|d| d.filename} matching_documents_filename.should include("crossed.txt") matching_documents_filename.should include("crossed.text") end - + it "should find documents according to their filename when specified with file:query or filename:query" do Finder.new("filename:crossed.text").matching_documents.collect{|d| d.content}.should include("txt inside!") Finder.new("file:crossed.txt").matching_documents.collect{|d| d.content}.should include("text inside!") end - + it "should find documents according to their extension when specified with filetype:query" do Finder.new("filetype:odt").matching_documents.should_not be_empty Finder.new("filetype:pdf").matching_documents.should_not be_empty end - + it "should find documents according to their filename/basename/filetype even when unspecified" do Finder.new("crossed.text").matching_documents.should_not be_empty Finder.new("html").matching_documents.collect{|d| d.filename}.should include("zafh.net.html") Finder.new("crossed").total_hits.should >= 2 end - + it "should give a boost to basename, filename and filetype in index" do index=Indexer.index index.field_infos[:basename].boost.should > 1.0 index.field_infos[:filename].boost.should > 1.0 index.field_infos[:filetype].boost.should > 1.0 end - + it "should also index unreadable files with known mimetypes" do Finder.new("unreadable.pdf").matching_documents.should_not be_empty Finder.new("too_small.doc").matching_documents.should_not be_empty end - + it "should also index files with unknown mimetypes" do Finder.new("filetype:xyz").matching_document.basename.should == "ghjopdfg" Finder.new("filetype:abc").matching_document.filename.should == "asfg.abc" @@ -65,30 +65,30 @@ describe Finder do #Support for xls has been added meanwhile. The test is still valid though. Finder.new("table.xls").matching_document.size.should == 8704 end - + it "should also index files with upper/mixed case extension" do Finder.new("filetype:pdf").matching_documents.entries.find{|doc| doc.filename=="other_basic.PDF"}.should_not be_nil Finder.new("filetype:doc").matching_documents.entries.find{|doc| doc.filename=="other_too_small.dOc"}.should_not be_nil end - + it "should also index content of files with upper/mixed case extension" do Finder.new("'just another content test\nin a pdf file'").matching_documents.entries.find{|doc| doc.filename=="other_basic.PDF"}.should_not be_nil end - + it "should also accept utf8 queries" do lambda{Finder.new("Éric Mößer")}.should_not raise_error end - + it "should find documents according to their utf8 content" do Finder.new("Éric Mößer ext:pdf").matching_document.basename.should == "utf8" Finder.new("no me hace daño").matching_document.size.should == 30 Finder.new("Éric Mößer filetype:pdf").matching_document.filename.should == "utf8.pdf" end - + it "should find documents according to their utf8 filenames" do Finder.new("bäñüßé").matching_document.content.should == "just to know if files are indexed with utf8 filenames" end - + it "should find documents according to their modification date" do Finder.new("date:<1982").matching_documents.should be_empty Finder.new("19831209*").matching_document.basename.should == "office2003-word-template" @@ -99,7 +99,7 @@ describe Finder do it "should not concatenate cells from xls file" do Finder.new("content:ABC").matching_documents.select{|doc| doc.extname==".xls"}.should be_empty end - + it "should not raise if an indexed document has been moved/deleted, but just ignore it" do @basic_dir='spec/test_dirs/indexed/basic/' @from=File.join(@basic_dir,'another_plain.text') @@ -113,29 +113,29 @@ describe Finder do File.rename(@to,@from) if File.exists?(@to) end end - + it "should not index content of binary files" - + # Ferret sometimes SEGFAULT crashed with '*.pdf' queries it "should not crash while looking for *.pdf" do @finder=Finder.new("some query") lambda{@finder=Finder.new("*.pdf")}.should_not raise_error @finder.matching_documents.should_not be_empty end - + it "should use ? as placeholder" do Finder.new("A?sorption machines").matching_document.matching_content.should include("<<Absorption>> and <<Adsorption>> cooling <<machines>>!!!") end - + it "should use * as placeholder" do results=Finder.new("A*ption machines").matching_document.matching_content.should include("<<Absorption>> and <<Adsorption>> cooling <<machines>>!!!") end - + it "should not index those stupid Thumbs.db files" do Finder.new("Thumbs.db").matching_documents.should be_empty Finder.new("filetype:db").matching_documents.should_not be_empty end - + it "should keep content cached" do filename = "spec/test_dirs/indexed/others/placeholder.txt" content_before = "Absorption and Adsorption cooling machines!!!" @@ -147,7 +147,7 @@ describe Finder do some_doc.content.should_not == content_before some_doc.cached.should == content_before end - + after(:all) do revert_changes!("spec/test_dirs/indexed/others/placeholder.txt","Absorption and Adsorption cooling machines!!!") end lib/picolena/templates/spec/models/finder_spec.rb @@ -6,19 +6,19 @@ describe "Host indexing system" do IO.popen("which #{dependency}"){|i| i.read.should_not be_empty} end end - + it "should have a language guesser installed" do PlainTextExtractor.language_guesser.should_not be_nil end - + it "should know which IP addresses are allowed (config/custom/white_list_ip.yml)" do File.should be_readable('config/custom/white_list_ip.yml') end - + it "should know which directories are to be indexed (config/custom/indexed_directories.yml)" do File.should be_readable('config/custom/indexed_directories.yml') end - + it "should be able to calculate base26 hash from strings" do "test_dirs/indexed/010/decrepito.pdf".base26_hash(5).should == "rails" "test_dirs/indexed/migrations/000_restreins.rb".base26_hash(5).should == "ricou" @@ -26,7 +26,7 @@ describe "Host indexing system" do "test_dirs/indexed/1148/plots.odt".base26_hash(8).should == "picolehn" "whatever.pdf".base26_hash(10).should == "bbuxhynait" end - + it "should not use too small a hash for Document#probably_unique_id" do Picolena::HashLength.should_not < 10 end lib/picolena/templates/spec/models/host_indexing_system_spec.rb @@ -4,11 +4,11 @@ describe "IndexedDirectories" do it "should be defined" do lambda {Picolena::IndexedDirectories}.should_not raise_error(NameError) end - + it "should not be empty" do Picolena::IndexedDirectories.should_not be_empty end - + it "should only contain existing directories" do Picolena::IndexedDirectories.keys.all?{|dir| File.should be_directory(dir) lib/picolena/templates/spec/models/index_directories_spec.rb @@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "PlainTextExtractors" do before(:all) do Indexer.ensure_index_existence - end - + end + PlainTextExtractor.all.each{|extractor| extractor.exts.each{|ext| should_extract= "should be able to extract content from #{extractor.description} (.#{ext})" @@ -27,14 +27,14 @@ describe "PlainTextExtractors" do end } } - + it "should guess language when enough content is available" do Document.new("spec/test_dirs/indexed/lang/goethe").language.should == "de" Document.new("spec/test_dirs/indexed/lang/shakespeare").language.should == "en" Document.new("spec/test_dirs/indexed/lang/lorca").language.should == "es" Document.new("spec/test_dirs/indexed/lang/hugo").language.should == "fr" end if Picolena::UseLanguageRecognition - + it "should not try to guess language when file is too small" do Document.new("spec/test_dirs/indexed/basic/hello.rb").language.should be_nil Document.new("spec/test_dirs/indexed/README").language.should be_nil lib/picolena/templates/spec/models/plain_text_extractor_spec.rb @@ -11,11 +11,11 @@ describe Query do :es=>["COMO", "NO", "O", "Y"], :fr=>["COMME","NON","OU","ET"] } - + english_query_with_like_and_not=Query.extract_from("LIKE something NOT something") english_query_with_or=Query.extract_from("test OR another") english_query_with_and=Query.extract_from("test AND another") - + language_and_keywords.each_pair{|ln,keywords| Globalite.language = ln like_bool, not_bool, or_bool, and_bool = keywords @@ -27,15 +27,15 @@ describe Query do Query.extract_from(raw_query_in_some_language_with_and).should == english_query_with_and } end - + it "should accept field terms in different languages" - + it "should use AND as default boolean ops" do query_without_and = Query.extract_from("one AND two") query_with_and = Query.extract_from("one two") query_with_and.should == query_without_and end - + it "should convert foreign keywords to boolean operators only as whole-word" do Globalite.language = :en english_query_with_french_words = Query.extract_from("CETTE AND MIETTE") @@ -47,10 +47,10 @@ describe Query do Query.extract_from("CETTE ET MIETTE").should == english_query_with_french_words Query.extract_from("STRALSUND UND BRODERBUND").should_not == english_query_with_german_words end - + it "should not be case sensitive" do Query.extract_from("test").should == Query.extract_from("TEst") Query.extract_from("test").should == Query.extract_from("tesT") - Query.extract_from("test").should_not == Query.extract_from("tesTe") + Query.extract_from("test").should_not == Query.extract_from("tesTe") end end lib/picolena/templates/spec/models/query_spec.rb @@ -1,2 +1,2 @@ ---exclude "spec/*,gems/*" +--exclude "spec/*,gems/*" --rails \ No newline at end of file lib/picolena/templates/spec/rcov.opts @@ -1,5 +1,5 @@ class myfirstjavaprog -{ +{ public static void main(String args[]) { System.out.println("Hello World!"); lib/picolena/templates/spec/test_dirs/indexed/basic/myfirstjavaprog.java @@ -5,7 +5,7 @@ LOGICAL POSSIBLE X=2 Y=3 - CALL NEW(BOARD) + CALL NEW(BOARD) DO I=1,1 POSSIBLE=.FALSE. X=4 lib/picolena/templates/spec/test_dirs/indexed/basic/queens.for @@ -5,79 +5,79 @@ Depuis six mille ans la guerre I - -Depuis six mille ans la guerre -Plaît aux peuples querelleurs, -Et Dieu perd son temps à faire -Les étoiles et les fleurs. - -Les conseils du ciel immense, -Du lys pur, du nid doré, -N'ôtent aucune démence -Du coeur de l'homme effaré. - -Les carnages, les victoires, -Voilà notre grand amour ; -Et les multitudes noires -Ont pour grelot le tambour. - -La gloire, sous ses chimères -Et sous ses chars triomphants, -Met toutes les pauvres mères -Et tous les petits enfants. - -Notre bonheur est farouche ; -C'est de dire : Allons ! mourons ! -Et c'est d'avoir à la bouche -La salive des clairons. - -L'acier luit, les bivouacs fument ; -Pâles, nous nous déchaînons ; -Les sombres âmes s'allument -Aux lumières des canons. - -Et cela pour des altesses -Qui, vous à peine enterrés, -Se feront des politesses -Pendant que vous pourrirez, - -Et que, dans le champ funeste, -Les chacals et les oiseaux, -Hideux, iront voir s'il reste -De la chair après vos os ! - -Aucun peuple ne tolère -Qu'un autre vive à côté ; -Et l'on souffle la colère -Dans notre imbécillité. - -C'est un Russe ! Égorge, assomme. -Un Croate ! Feu roulant. -C'est juste. Pourquoi cet homme -Avait-il un habit blanc ? - -Celui-ci, je le supprime -Et m'en vais, le coeur serein, -Puisqu'il a commis le crime -De naître à droite du Rhin. - -Rosbach ! Waterloo ! Vengeance ! -L'homme, ivre d'un affreux bruit, -N'a plus d'autre intelligence -Que le massacre et la nuit. - -On pourrait boire aux fontaines, -Prier dans l'ombre à genoux, -Aimer, songer sous les chênes ; -Tuer son frère est plus doux. - -On se hache, on se harponne, -On court par monts et par vaux ; -L'épouvante se cramponne -Du poing aux crins des chevaux. - -Et l'aube est là sur la plaine ! -Oh ! j'admire, en vérité, -Qu'on puisse avoir de la haine + +Depuis six mille ans la guerre +Plaît aux peuples querelleurs, +Et Dieu perd son temps à faire +Les étoiles et les fleurs. + +Les conseils du ciel immense, +Du lys pur, du nid doré, +N'ôtent aucune démence +Du coeur de l'homme effaré. + +Les carnages, les victoires, +Voilà notre grand amour ; +Et les multitudes noires +Ont pour grelot le tambour. + +La gloire, sous ses chimères +Et sous ses chars triomphants, +Met toutes les pauvres mères +Et tous les petits enfants. + +Notre bonheur est farouche ; +C'est de dire : Allons ! mourons ! +Et c'est d'avoir à la bouche +La salive des clairons. + +L'acier luit, les bivouacs fument ; +Pâles, nous nous déchaînons ; +Les sombres âmes s'allument +Aux lumières des canons. + +Et cela pour des altesses +Qui, vous à peine enterrés, +Se feront des politesses +Pendant que vous pourrirez, + +Et que, dans le champ funeste, +Les chacals et les oiseaux, +Hideux, iront voir s'il reste +De la chair après vos os ! + +Aucun peuple ne tolère +Qu'un autre vive à côté ; +Et l'on souffle la colère +Dans notre imbécillité. + +C'est un Russe ! Égorge, assomme. +Un Croate ! Feu roulant. +C'est juste. Pourquoi cet homme +Avait-il un habit blanc ? + +Celui-ci, je le supprime +Et m'en vais, le coeur serein, +Puisqu'il a commis le crime +De naître à droite du Rhin. + +Rosbach ! Waterloo ! Vengeance ! +L'homme, ivre d'un affreux bruit, +N'a plus d'autre intelligence +Que le massacre et la nuit. + +On pourrait boire aux fontaines, +Prier dans l'ombre à genoux, +Aimer, songer sous les chênes ; +Tuer son frère est plus doux. + +On se hache, on se harponne, +On court par monts et par vaux ; +L'épouvante se cramponne +Du poing aux crins des chevaux. + +Et l'aube est là sur la plaine ! +Oh ! j'admire, en vérité, +Qu'on puisse avoir de la haine Quand l'alouette a chanté. lib/picolena/templates/spec/test_dirs/indexed/lang/hugo @@ -1,26 +1,26 @@ -Verde que te quiero verde. -Verde viento. Verdes ramas. -El barco sobre la mar -y el caballo en la montaña. -Con la sombra en la cintura -ella sueña en su baranda, -verde carne, pelo verde, -con ojos de fría plata. -Verde que te quiero verde. +Verde que te quiero verde. +Verde viento. Verdes ramas. +El barco sobre la mar +y el caballo en la montaña. +Con la sombra en la cintura +ella sueña en su baranda, +verde carne, pelo verde, +con ojos de fría plata. +Verde que te quiero verde. Bajo la luna gitana, -las cosas la están mirando +las cosas la están mirando y ella no puede mirarlas. -Verde que te quiero verde. -Grandes estrellas de escarcha -vienen con el pez de sombra -que abre el camino del alba. -La higuera frota su viento -con la lija de sus ramas, -y el monte, gato garduño, +Verde que te quiero verde. +Grandes estrellas de escarcha +vienen con el pez de sombra +que abre el camino del alba. +La higuera frota su viento +con la lija de sus ramas, +y el monte, gato garduño, eriza sus pitas agrias. -¿Pero quién vendra? ¿Y por dónde...? -Ella sigue en su baranda, -Verde came, pelo verde, +¿Pero quién vendra? ¿Y por dónde...? +Ella sigue en su baranda, +Verde came, pelo verde, soñando en la mar amarga. --Compadre, quiero cambiar mi caballo por su casa, @@ -28,59 +28,59 @@ mi montura por su espejo, mi cuchillo per su manta. Compadre, vengo sangrando, desde los puertos de Cabra. ---Si yo pudiera, mocito, -este trato se cerraba. -Pero yo ya no soy yo, +--Si yo pudiera, mocito, +este trato se cerraba. +Pero yo ya no soy yo, ni mi casa es ya mi casa. ---Compadre, quiero morir -decentemente en mi cama. -De acero, si puede ser, -con las sábanas de holanda. -¿No ves la herida que tengo +--Compadre, quiero morir +decentemente en mi cama. +De acero, si puede ser, +con las sábanas de holanda. +¿No ves la herida que tengo desde el pecho a la garganta? --Trescientas rosas morenas -lleva tu pechera blanca. -Tu sangre rezuma y huele -alrededor de tu faja. +lleva tu pechera blanca. +Tu sangre rezuma y huele +alrededor de tu faja. Pero yo ya no soy yo, ni mi casa es ya mi casa. ---Dejadme subir al menos +--Dejadme subir al menos hasta las altas barandas; -¡dejadme subir!, dejadme, -hasta las verdes barandas. -Barandales de la luna -por donde retumba el agua. -Ya suben los dos compadres -hacia las altas barandas. -Dejando un rastro de sangre. -Dejando un rastro de lágrimas. +¡dejadme subir!, dejadme, +hasta las verdes barandas. +Barandales de la luna +por donde retumba el agua. +Ya suben los dos compadres +hacia las altas barandas. +Dejando un rastro de sangre. +Dejando un rastro de lágrimas. Temblaban en los tejados -farolillos de hojalata. -Mil panderos de cristal +farolillos de hojalata. +Mil panderos de cristal herían la madrugada. Verde que te quiero verde, -verde viento, verdes ramas. +verde viento, verdes ramas. Los dos compadres subieron. -El largo viento dejaba +El largo viento dejaba en la boca un raro gusto de hiel, de menta y de albahaca. ¡Compadre! ¿Donde está, díme? -¿Donde está tu niña amarga? +¿Donde está tu niña amarga? ¡Cuántas veces te esperó! ¡Cuántas veces te esperara, -cara fresca, negro pelo, +cara fresca, negro pelo, en esta verde baranda! Sobre el rostro del aljibe -se mecía la gitana. -Verde carne, pelo verde, +se mecía la gitana. +Verde carne, pelo verde, con ojos de fría plata. -Un carámbano de luna +Un carámbano de luna la sostiene sobre el agua. -La noche se puso íntima -como una pequeña plaza. -Guardias civiles borrachos -en la puerta golpeaban. -Verde que te qinero verde. -Verde viento. Verdes ramas. -El barco sobre la mar. +La noche se puso íntima +como una pequeña plaza. +Guardias civiles borrachos +en la puerta golpeaban. +Verde que te qinero verde. +Verde viento. Verdes ramas. +El barco sobre la mar. Y el caballo en la montaña. lib/picolena/templates/spec/test_dirs/indexed/lang/lorca @@ -18,7 +18,7 @@ <h1 class="firstHeading">Pablo Picasso</h1> <div id="bodyContent"> <div id="contentSub"></div> - + <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> <table id="toc" class="toc" summary="Contents"> <tr> @@ -53,7 +53,7 @@ </table> <script type="text/javascript"> //<![CDATA[ - if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } + if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } //]]> </script> <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 @@ </tr> </table> - <script src="http://medias.lemonde.fr/mmpub/js/wousdat.js"></script><script language=JavaScript>OAS_AD('x10');</script> <script language=JavaScript>OAS_AD('x01');</script> - +  <table width="1000" cellpadding="0" cellspacing="0" border="0" class=tete> <tr> - <td width=340 align=center> - <a href=/web/sequence/0,2-3208,1-0,0.html><img src='http://medias.lemonde.fr/mmpub/img/lgo/lemondefr_grd.gif' alt='LeMonde.fr' border='0'></a><br><span class=tt-dt>Mise à jour à <font color=#990000><b>15 h 44 </b></font> - Paris</span> + <td width=340 align=center> + <a href=/web/sequence/0,2-3208,1-0,0.html><img src='http://medias.lemonde.fr/mmpub/img/lgo/lemondefr_grd.gif' alt='LeMonde.fr' border='0'></a><br><span class=tt-dt>Mise ï¿½ jour ï¿½ <font color=#990000><b>15 h 44 </b></font> - Paris</span> </td> <td style="border-right: solid 1px white" >  @@ -177,21 +177,21 @@ function OAS_AD(pos) { function affAboJournal() { var contenu = ""; - contenu += "<a href=\"http://eu.link.decdna.net/n/14763/31113/www.lemonde.fr/10av5o1;11;4;;690;;689zdb;;;;;1;/i/c?0&pq=%2fabojournal%2f%3fxtor%3dAL%2d32280085\" target=\"_blank\">» Abonnez-vous au journal <br /><span style=\"padding-left: 10px\"><i>Le Monde</i> : 16€/mois</span></a>"; + contenu += "<a href=\"http://eu.link.decdna.net/n/14763/31113/www.lemonde.fr/10av5o1;11;4;;690;;689zdb;;;;;1;/i/c?0&pq=%2fabojournal%2f%3fxtor%3dAL%2d32280085\" target=\"_blank\">» Abonnez-vous au journal ï¿½<br /><span style=\"padding-left: 10px\"><i>Le Monde</i> : 16ï¿½/mois</span></a>"; document.write(contenu); - + } -function trim(chaine) { - // espaces au debut - while (chaine.substring(0,1) == ' ') +function trim(chaine) { + // espaces au debut + while (chaine.substring(0,1) == ' ') chaine = chaine.substring(1, chaine.length); - // espaces a la fin + // espaces a la fin while (chaine.substring(chaine.length-1,chaine.length) == ' ') chaine = chaine.substring(0, chaine.length-1); return chaine; -} +} function ValideRechercheSimple(leForm) { @@ -199,7 +199,7 @@ function ValideRechercheSimple(leForm) { var eAccentAigu = "e"; var eAccentCirc = "e"; var aAccentGrav = "a"; - + //On teste si le javascript >= 1.2 if ((String.fromCharCode(232))!=false && (String.fromCharCode(232))!=null) { @@ -231,11 +231,11 @@ function ValideRechercheSimple(leForm) { // leForm.query.focus(); // return false; //} - + return true; - + } //fonction de masquage des element en fonction du click sur les bouton radio @@ -243,21 +243,21 @@ function showHide(param) { var zoneSaisie = document.getElementById('query'); var zoneListe = document.getElementById('col_periode'); switch (param) { - + case 0: - + zoneSaisie.setAttribute('size',34); zoneListe.style.visibility=''; zoneListe.style.display="inline"; document.getElementById('formrech').setAttribute('target',''); break; case 1: - + zoneSaisie.setAttribute('size',53); zoneListe.style.visibility ="hidden"; zoneListe.style.display="none"; document.getElementById('formrech').setAttribute('target','_blank'); - + break; } } @@ -265,25 +265,25 @@ function showHide(param) { </script> <form id="formrech" method="get" action="http://www.lemonde.fr/web/recherche_resultats/1,13-0,1-0,0.html" name="recherche_simple" onsubmit="return ValideRechercheSimple(this)"> - + <input type="hidden" name="dans" value="dansarticle"> <input type="hidden" name="num_page" value="1"> <input type="hidden" name="booleen" value="et"> - <input type="hidden" name="ordre" value="pertinence"> + <input type="hidden" name="ordre" value="pertinence"> <table cellpadding=0 width=310 cellspacing=3 border=0 class=tete3 > <tr valign=top> <td><span class="rec"><b>Recherchez</b></span><br> <input type="text" name="query" value="" size="34" maxlength="40" id="query"></td> <td nowrap valign="bottom"> <span id="col_periode">depuis<br> - <select name="periode"> + <select name="periode"> <option value="1" >aujourd'hui <option value="7" >7 jours <option value="30" selected>1 mois <option value="365" >1 an <option value="1987" >détailler </select> - </span> + </span> <input type="image" src="http://medias.lemonde.fr/mmpub/img/bt/rech.gif" alt="Valider" align="absmiddle"> </td> @@ -291,15 +291,15 @@ function showHide(param) { <tr> <td colspan="3"> <input name="sur" type="radio" value="LEMONDE" checked="checked" onclick="showHide(0);">sur Le Monde.fr - + <input name="sur" type="radio" value="YAHOO" onclick="showHide(1);"><img src="http://medias.lemonde.fr/mmpub/img/lgo/yahoosearch-gratuit-182x17.gif" alt="Yahoo!" align="middle"> - - - + + + </td> </tr> -  - </table> +  + </table> <table cellpadding="0" width="100%" cellspacing="5" border="0" bgcolor="#CECECE"> <tr> <td width="50%" valign="top"><a href="http://www.lemonde.fr/web/inscription_newsletter/1,27-0,1-0,0.html" onclick="xt_clic('N','Recevoir newsletters Home')" style="color: #990000;">» Recevez les newsletters<br /><span style="padding-left: 10px">gratuites</span></a></td> <td width="50%" valign="top"><script language="javascript">affAboJournal();</script></td> </tr></table></form>  @@ -310,12 +310,12 @@ function showHide(param) { <td valign=middle width=140>  <script language=javascript src=http://www.lemonde.fr/web/barre_login/0,0-0,1-0,0.js></script> - + </td> </tr></table>   - + <script language="JavaScript1.1">  @@ -490,11 +490,11 @@ document.write(""+dayarray[day]+" "+daym+" "+montharray[month]+" "+year+"");   <table width=1000 cellpadding=0 cellspacing=0 bgcolor=e7e7e7><tr><td align=center><script language=JavaScript>OAS_AD('Top1');</script></td></tr></table> - +   - +    @@ -505,7 +505,7 @@ document.write(""+dayarray[day]+" "+daym+" "+montharray[month]+" "+year+""); <div class=pg-gch>  -  +  <table width="450" cellpadding="0" cellspacing="0" border="0"> <tr valign="top"> @@ -513,33 +513,33 @@ document.write(""+dayarray[day]+" "+daym+" "+montharray[month]+" "+year+""); </tr> <tr valign="top"> <td class="desc"> - <div id="description_977705">Que feront les syndicats si leur grève est un succès mais que le gouvernement ne change rien à sa réforme des régimes spéciaux ?</div><div class="type">Pratique <a href="/web/article/0,1-0@2-823448,36-977710@51-973287,0.html" name="lien" itemid="977710" >Les lignes de TGV et le métro parisien seront très perturbés</a></div><div class="type">Compte rendu <a href="/web/article/0,1-0@2-3224,36-977568@51-973287,0.html" name="lien" itemid="977568" >Régimes spéciaux : M. Thibault reçu par M. Bertrand, Mme Idrac prône la négociation</a></div> <a href="/web/article/0,1-0@2-3232,36-977677@51-973287,0.html" class="type" name="lien" itemid="977677" >Analyse</a> | <a href="/web/article/0,1-0@2-3224,36-977560@51-973287,0.html" class="type" name="lien" itemid="977560" >Revue de presse</a> | <a href="/web/article/0,1-0@2-3224,36-977573@51-973287,0.html" class="type" name="lien" itemid="977573" >Les faits</a><br> + <div id="description_977705">Que feront les syndicats si leur grï¿½ve est un succï¿½s mais que le gouvernement ne change rien ï¿½ sa rï¿½forme des rï¿½gimes spï¿½ciaux ?</div><div class="type">Pratique <a href="/web/article/0,1-0@2-823448,36-977710@51-973287,0.html" name="lien" itemid="977710" >Les lignes de TGV et le mï¿½tro parisien seront trï¿½s perturbï¿½s</a></div><div class="type">Compte rendu <a href="/web/article/0,1-0@2-3224,36-977568@51-973287,0.html" name="lien" itemid="977568" >Rï¿½gimes spï¿½ciaux : M. Thibault reï¿½u par M. Bertrand, Mme Idrac prï¿½ne la nï¿½gociation</a></div> <a href="/web/article/0,1-0@2-3232,36-977677@51-973287,0.html" class="type" name="lien" itemid="977677" >Analyse</a> | <a href="/web/article/0,1-0@2-3224,36-977560@51-973287,0.html" class="type" name="lien" itemid="977560" >Revue de presse</a> | <a href="/web/article/0,1-0@2-3224,36-977573@51-973287,0.html" class="type" name="lien" itemid="977573" >Les faits</a><br> </td> <td align=right> - <a href="/web/article/0,1-0@2-823448,36-977705@51-973287,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_2_ill_977914_cgt.jpg width=228 height=152 border=0 alt='Le secrétaire général de la fédération des cheminots CGT Didier Le Reste, le 31 octobre 2007 au siège de la CGT à Montreuil. | AFP/BERTRAND GUAY' title='Le secrétaire général de la fédération des cheminots CGT Didier Le Reste, le 31 octobre 2007 au siège de la CGT à Montreuil. | AFP/BERTRAND GUAY' align=left vspace=4 hspace=4></a> + <a href="/web/article/0,1-0@2-823448,36-977705@51-973287,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_2_ill_977914_cgt.jpg width=228 height=152 border=0 alt='Le secrï¿½taire gï¿½nï¿½ral de la fï¿½dï¿½ration des cheminots CGT Didier Le Reste, le 31 octobre 2007 au siï¿½ge de la CGT ï¿½ Montreuil. | AFP/BERTRAND GUAY' title='Le secrï¿½taire gï¿½nï¿½ral de la fï¿½dï¿½ration des cheminots CGT Didier Le Reste, le 31 octobre 2007 au siï¿½ge de la CGT ï¿½ Montreuil. | AFP/BERTRAND GUAY' align=left vspace=4 hspace=4></a> </td> </tr> </table> <div class=ligne> </div>  - + - <div class=tit2><a href="/web/article/0,1-0@2-3234,36-977727@51-977835,0.html" id="titre_977727" name="lien" itemid="977727">Emirates veut faire de Dubaï une plaque tournante du trafic aérien</a></div> - <div id="description_977727"> "Le modèle économique d'Emirates consiste à détourner le flux de passagers transitant par l'Europe vers son hub de Dubaï", explique un consultant.</div> - <div class="type">Infographie <a href="/web/infog/0,47-0@2-3234,54-977639@51-977835,0.html" name="lien" itemid="977639" >Emirates est devenu, en très peu de temps, une des premières compagnies mondiales</a></div><div class="type">Les faits <a href="/web/article/0,1-0@2-3234,36-977065@51-977835,0.html" name="lien" itemid="977065" >Commande record de Dubaï Emirates à Airbus</a></div> + <div class=tit2><a href="/web/article/0,1-0@2-3234,36-977727@51-977835,0.html" id="titre_977727" name="lien" itemid="977727">Emirates veut faire de Dubaï¿½ une plaque tournante du trafic aï¿½rien</a></div> + <div id="description_977727"> "Le modï¿½le ï¿½conomique d'Emirates consiste ï¿½ dï¿½tourner le flux de passagers transitant par l'Europe vers son hub de Dubaï¿½", explique un consultant.</div> + <div class="type">Infographie <a href="/web/infog/0,47-0@2-3234,54-977639@51-977835,0.html" name="lien" itemid="977639" >Emirates est devenu, en trï¿½s peu de temps, une des premiï¿½res compagnies mondiales</a></div><div class="type">Les faits <a href="/web/article/0,1-0@2-3234,36-977065@51-977835,0.html" name="lien" itemid="977065" >Commande record de Dubaï¿½ Emirates ï¿½ Airbus</a></div> <div class=ligne> </div>  - + - <div class=tit2><a href="/web/article/0,1-0@2-3218,36-977682@51-891944,0.html" id="titre_977682" name="lien" itemid="977682">Réunion d'Annapolis : Ehoud Olmert confronté à une forte opposition en Israël</a></div> - <div class="type">Les faits <a href="/web/article/0,1-0@2-3218,36-977683@51-891944,0.html" name="lien" itemid="977683" >A Gaza, le Hamas tire sur le Fatah qui célébrait la mémoire de Yasser Arafat</a></div><div class="type">Reportage <a href="/web/article/0,1-0@2-3218,36-976413@51-891944,0.html" name="lien" itemid="976413" >Gaza, terre fantôme des médias israéliens</a></div> + <div class=tit2><a href="/web/article/0,1-0@2-3218,36-977682@51-891944,0.html" id="titre_977682" name="lien" itemid="977682">Rï¿½union d'Annapolis : Ehoud Olmert confrontï¿½ ï¿½ une forte opposition en Israï¿½l</a></div> + <div class="type">Les faits <a href="/web/article/0,1-0@2-3218,36-977683@51-891944,0.html" name="lien" itemid="977683" >A Gaza, le Hamas tire sur le Fatah qui cï¿½lï¿½brait la mï¿½moire de Yasser Arafat</a></div><div class="type">Reportage <a href="/web/article/0,1-0@2-3218,36-976413@51-891944,0.html" name="lien" itemid="976413" >Gaza, terre fantï¿½me des mï¿½dias israï¿½liens</a></div> <div class=ligne> </div>   - + <div style='width:450px'> <div class=zone-b> @@ -549,41 +549,41 @@ document.write(""+dayarray[day]+" "+daym+" "+montharray[month]+" "+year+""); </div>  - + <div style='width:450px'> <div class=zone-b> - <div class=tit3><a href="/web/article/0,1-0@2-3214,36-977668@51-951246,0.html" name="lien" itemid="977668"><b id="titre_977668">Nicolas Sarkozy défend sa politique économique devant le Parlement européen</b></a></div> + <div class=tit3><a href="/web/article/0,1-0@2-3214,36-977668@51-951246,0.html" name="lien" itemid="977668"><b id="titre_977668">Nicolas Sarkozy dï¿½fend sa politique ï¿½conomique devant le Parlement europï¿½en</b></a></div> <br> </div> </div>  - + <div style='width:450px'> <div class=zone-b> - <div class=tit3><a href="/web/article/0,1-0@2-3212,36-977663@51-754471,0.html" name="lien" itemid="977663"><b id="titre_977663">173 000 personnes ont fui Mogadiscio au cours des deux dernières semaines</b></a></div> + <div class=tit3><a href="/web/article/0,1-0@2-3212,36-977663@51-754471,0.html" name="lien" itemid="977663"><b id="titre_977663">173 000 personnes ont fui Mogadiscio au cours des deux derniï¿½res semaines</b></a></div> <br> </div> </div>  - + <div style='width:450px'> <div class=zone-b> - <div class=tit3><a href="/web/article/0,1-0@2-3260,36-960052@51-973997,0.html" name="lien" itemid="960052"><b id="titre_960052">Le prix Interallié attribué à Christophe Ono-dit-Biot </b></a></div> + <div class=tit3><a href="/web/article/0,1-0@2-3260,36-960052@51-973997,0.html" name="lien" itemid="960052"><b id="titre_960052">Le prix Interalliï¿½ attribuï¿½ ï¿½ Christophe Ono-dit-Biot </b></a></div> <a href="/web/portfolio/0,12-0@2-3246,31-977650@51-973997,0.html" class="type" name="lien" itemid="977650" >Portfolio</a> | <a href="/web/article/0,1-0@2-3260,36-977457@51-973997,0.html" class="type" name="lien" itemid="977457" >Les faits</a> | <a href="/web/blog/0,39-0,48-969558,0.html" target=_blank class="type" name="lien" itemid="969558" >Blog</a><br> </div> </div>  - + <div style='width:450px'> <div class=zone-b> - <div class=tit3><a href="/web/article/0,1-0@2-3214,36-977254@51-970782,0.html" name="lien" itemid="977254"><b id="titre_977254">Les Danois se prononcent sur l'alliance des libéraux avec l'extrême droite</b></a></div> + <div class=tit3><a href="/web/article/0,1-0@2-3214,36-977254@51-970782,0.html" name="lien" itemid="977254"><b id="titre_977254">Les Danois se prononcent sur l'alliance des libï¿½raux avec l'extrï¿½me droite</b></a></div> <br> </div> </div> @@ -592,7 +592,7 @@ document.write(""+dayarray[day]+" "+daym+" "+montharray[month]+" "+year+""); </div>  - + <table width="459" cellpadding="1" cellspacing="1" border="0" class="br-out"> <tr valign="middle"> <td style="border-right:solid 1px #336699"><a href="javascript:ouvrir_jelec();"><img src="http://medias.lemonde.fr/mmpub/img/icn/pdf.gif" alt="" width="18" height="17" border="0" hspace="4" align="absmiddle">Journal Electronique</a></td> @@ -608,26 +608,26 @@ document.write(""+dayarray[day]+" "+daym+" "+montharray[month]+" "+year+"");  - + <div class=pg-gch>  <center><script language=JavaScript>OAS_AD('Frame2');</script></center>    - +  - - - - - - -<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3210,1-0,0.html">INTERNATIONAL</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977704@51-925598,0.html'>La coalition allemande rallonge la durée d'indemnité pour les chômeurs âgés</a> | <a class=type href='/web/article/0,1-0@2-3234,36-976883@51-925598,0.html'>Les faits</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977703@51-974215,0.html'>Rome demande une modification des règles de libre circulation dans l'Union européenne</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977701@51-977361,0.html'>Paris et Berlin lancent une politique d'immigration commune</a> | <a class=type href='/web/article/0,1-0@2-3214,36-977256@51-977361,0.html'>Cadrage</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977690@51-973116,0.html'>Election présidentielle : l'opposition géorgienne désigne son candidat contre M. Saakachvili</a> | <a class=type href='/web/article/0,1-0@2-3214,36-976855@51-973116,0.html'>Eclairage</a> | <a class=type href='/web/article/0,1-0@2-3214,36-976856@51-973116,0.html'>Entretien</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977752@51-972553,0.html'>Grigori Pasko, en dissidence surveillée</a> | <a class=type href='/web/article/0,1-0@2-609984,36-977638@51-972553,0.html'>Compte rendu</a></div> - + + + + + +<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3210,1-0,0.html">INTERNATIONAL</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977704@51-925598,0.html'>La coalition allemande rallonge la durï¿½e d'indemnitï¿½ pour les chï¿½meurs ï¿½gï¿½s</a> | <a class=type href='/web/article/0,1-0@2-3234,36-976883@51-925598,0.html'>Les faits</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977703@51-974215,0.html'>Rome demande une modification des rï¿½gles de libre circulation dans l'Union europï¿½enne</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977701@51-977361,0.html'>Paris et Berlin lancent une politique d'immigration commune</a> | <a class=type href='/web/article/0,1-0@2-3214,36-977256@51-977361,0.html'>Cadrage</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977690@51-973116,0.html'>Election prï¿½sidentielle : l'opposition gï¿½orgienne dï¿½signe son candidat contre M. Saakachvili</a> | <a class=type href='/web/article/0,1-0@2-3214,36-976855@51-973116,0.html'>Eclairage</a> | <a class=type href='/web/article/0,1-0@2-3214,36-976856@51-973116,0.html'>Entretien</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3214,36-977752@51-972553,0.html'>Grigori Pasko, en dissidence surveillï¿½e</a> | <a class=type href='/web/article/0,1-0@2-609984,36-977638@51-972553,0.html'>Compte rendu</a></div> + +  - + <div class="saut_ligne" style="height:16px;"></div> <a href="/web/sequence/0,2-3232,1-0,0.html"><img src="http://medias.lemonde.fr/mmpub/img/tit/1024_op_extra_wide.gif" alt="Opinions" border="0"></a> <div class=box> <div style="float:left;width:216px;margin-right:4px;"> - <div class=lien-2><span class=type-gr>Editorial du "Monde"</span> <a href="/web/article/0,1-0@2-3232,36-977676,0.html">L'université en otage</a></div><div class=lien-2><span class=type-gr>Analyse</span> <a href="/web/article/0,1-0@2-3232,36-977677,0.html">Régimes spéciaux, grèves spéciales, par Michel Noblecourt</a></div><div class=lien-2><span class=type-gr>Ecofrictions</span> <a href="/web/article/0,1-0@2-3232,36-977789,0.html">Frais bancaires : une loi pour rien ?, par Anne Michel</a></div></div><div style="float:left;width:220px;margin-right:0px;"><div class=lien-2><span class=type-gr>Chronique "International"</span> <a href="/web/article/0,1-0@2-3232,36-977679,0.html">La macédoine, ou l'art d'accommoder les restes, par Daniel Vernet</a></div><div class=lien-2><span class=type-gr>Vu & commenté</span> <a href="/web/article/0,1-0@2-3232,36-977787,0.html">La prostitution à Paris, grise et banale, par Dominique Dhombres</a></div><div class=lien-2><span class=type-gr>Billet</span> <a href="/web/article/0,1-0@2-3232,36-977788,0.html">Tsunami, par Robert Solé</a></div> + <div class=lien-2><span class=type-gr>Editorial du "Monde"</span> <a href="/web/article/0,1-0@2-3232,36-977676,0.html">L'universitï¿½ en otage</a></div><div class=lien-2><span class=type-gr>Analyse</span> <a href="/web/article/0,1-0@2-3232,36-977677,0.html">Rï¿½gimes spï¿½ciaux, grï¿½ves spï¿½ciales, par Michel Noblecourt</a></div><div class=lien-2><span class=type-gr>Ecofrictions</span> <a href="/web/article/0,1-0@2-3232,36-977789,0.html">Frais bancaires : une loi pour rien ?, par Anne Michel</a></div></div><div style="float:left;width:220px;margin-right:0px;"><div class=lien-2><span class=type-gr>Chronique "International"</span> <a href="/web/article/0,1-0@2-3232,36-977679,0.html">La macï¿½doine, ou l'art d'accommoder les restes, par Daniel Vernet</a></div><div class=lien-2><span class=type-gr>Vu & commentï¿½</span> <a href="/web/article/0,1-0@2-3232,36-977787,0.html">La prostitution ï¿½ Paris, grise et banale, par Dominique Dhombres</a></div><div class=lien-2><span class=type-gr>Billet</span> <a href="/web/article/0,1-0@2-3232,36-977788,0.html">Tsunami, par Robert Solï¿½</a></div> <div class=lien-2><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" alt="" border="0"> <a href="/web/sequence/0,2-3232,1-0,0.html">Toutes les opinions</a></div> </div> <div class="saut_ligne"></div> </div> - <div class="saut_ligne"></div><div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-823448,1-0,0.html">POLITIQUE</a></div><div class=lien-2><a href='/web/article/0,1-0@2-823448,36-977722,0.html'>Divorce entre M. Flosse et le gouvernement sur la réforme de la Polynésie</a><br></div><div class=lien-2><a href='/web/article/0,1-0@2-823448,36-977710,0.html'>Les lignes de TGV et le métro parisien seront très perturbés</a><br></div><div class=lien-2><a href='/web/article/0,1-0@2-823448,36-977705,0.html'>Les syndicats ont peur de perdre la bataille de l'opinion</a><br></div> -<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3224,1-0,0.html">SOCIÉTÉ</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3224,36-977614@51-976955,0.html'>Yvan Colonna met en cause l'enquête de la police</a> | <a class=type href='/web/article/0,1-0@2-3224,36-977721@51-976955,0.html'>Compte rendu</a> | <a class=type href='/web/son/0,54-0@2-3224,63-977536@51-976955,0.html'>Audio</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3224,36-977712@51-970849,0.html'>Le projet de loi de fusion ANPE-Unedic est prêt</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977711@51-972923,0.html'>Le taux de chômage s'établit à 8,1 % au deuxième trimestre</a> | <a class=type href='/web/article/0,1-0@2-823448,36-977534@51-972923,0.html'>Les faits</a></div><div class=lien-2></div> + <div class="saut_ligne"></div><div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-823448,1-0,0.html">POLITIQUE</a></div><div class=lien-2><a href='/web/article/0,1-0@2-823448,36-977722,0.html'>Divorce entre M. Flosse et le gouvernement sur la rï¿½forme de la Polynï¿½sie</a><br></div><div class=lien-2><a href='/web/article/0,1-0@2-823448,36-977710,0.html'>Les lignes de TGV et le mï¿½tro parisien seront trï¿½s perturbï¿½s</a><br></div><div class=lien-2><a href='/web/article/0,1-0@2-823448,36-977705,0.html'>Les syndicats ont peur de perdre la bataille de l'opinion</a><br></div> +<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3224,1-0,0.html">SOCIï¿½Tï¿½</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3224,36-977614@51-976955,0.html'>Yvan Colonna met en cause l'enquï¿½te de la police</a> | <a class=type href='/web/article/0,1-0@2-3224,36-977721@51-976955,0.html'>Compte rendu</a> | <a class=type href='/web/son/0,54-0@2-3224,63-977536@51-976955,0.html'>Audio</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3224,36-977712@51-970849,0.html'>Le projet de loi de fusion ANPE-Unedic est prï¿½t</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977711@51-972923,0.html'>Le taux de chï¿½mage s'ï¿½tablit ï¿½ 8,1 % au deuxiï¿½me trimestre</a> | <a class=type href='/web/article/0,1-0@2-823448,36-977534@51-972923,0.html'>Les faits</a></div><div class=lien-2></div> -  +  <div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3234,1-0,0.html">ECONOMIE</a></div><table width='450' cellpadding='0' cellspacing='0' border='0'> <tr valign='top'> - <td width='87'><a href='/web/article/0,1-0@2-3234,36-977728@51-974931,0.html'><a href="/web/article/0,1-0@2-3234,36-977728@51-974931,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_1_ill_861179_53026914sp001_citigroup_los.jpg width=87 height=58 border=0 alt='Le siège de Citigroup à New York City, le 7 juin 2005. La première banque mondiale a été duremement touchée par la crise des subprimes. | AFP/Spencer Platt' title='Le siège de Citigroup à New York City, le 7 juin 2005. La première banque mondiale a été duremement touchée par la crise des subprimes. | AFP/Spencer Platt' ></a></a></td> + <td width='87'><a href='/web/article/0,1-0@2-3234,36-977728@51-974931,0.html'><a href="/web/article/0,1-0@2-3234,36-977728@51-974931,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_1_ill_861179_53026914sp001_citigroup_los.jpg width=87 height=58 border=0 alt='Le siï¿½ge de Citigroup ï¿½ New York City, le 7 juin 2005. La premiï¿½re banque mondiale a ï¿½tï¿½ duremement touchï¿½e par la crise des subprimes. | AFP/Spencer Platt' title='Le siï¿½ge de Citigroup ï¿½ New York City, le 7 juin 2005. La premiï¿½re banque mondiale a ï¿½tï¿½ duremement touchï¿½e par la crise des subprimes. | AFP/Spencer Platt' ></a></a></td> <td class=zoneb> - <b><a href='/web/article/0,1-0@2-3234,36-977728@51-974931,0.html'>Les "subprimes" pourraient coûter 400 milliards de dollars aux banques</a></b> + <b><a href='/web/article/0,1-0@2-3234,36-977728@51-974931,0.html'>Les "subprimes" pourraient coï¿½ter 400 milliards de dollars aux banques</a></b> </td> </tr> </table> - <div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977729@51-946421,0.html'>Dominique Strauss-Kahn obtient l'apurement total de la dette du Liberia</a> | <a class=type href='/web/article/0,1-0@2-3234,36-977730@51-946421,0.html'>Zoom</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977740@51-971495,0.html'>Porsche reste le constructeur le plus rentable du monde grâce à Volkswagen</a></div><div class=lien-2></div> + <div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977729@51-946421,0.html'>Dominique Strauss-Kahn obtient l'apurement total de la dette du Liberia</a> | <a class=type href='/web/article/0,1-0@2-3234,36-977730@51-946421,0.html'>Zoom</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977740@51-971495,0.html'>Porsche reste le constructeur le plus rentable du monde grï¿½ce ï¿½ Volkswagen</a></div><div class=lien-2></div> -  -<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3236,1-0,0.html">MÉDIAS</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3236,36-977744@51-977847,0.html'>La grogne des radios privées musicales</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3236,36-977746@51-977849,0.html'>La diffusion des principaux journaux américains enregistre un recul</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3236,36-977761@51-977862,0.html'>Quotidiens régionaux : les nouveaux empires</a> | <a class=type href='/web/article/0,1-0@2-3236,36-977762@51-977862,0.html'>Eclairage</a> | <a class=type href='/web/infog/0,47-0@2-3234,54-977641@51-977862,0.html'>Infographie</a></div><div class=lien-2></div> +  +<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3236,1-0,0.html">Mï¿½DIAS</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3236,36-977744@51-977847,0.html'>La grogne des radios privï¿½es musicales</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3236,36-977746@51-977849,0.html'>La diffusion des principaux journaux amï¿½ricains enregistre un recul</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3236,36-977761@51-977862,0.html'>Quotidiens rï¿½gionaux : les nouveaux empires</a> | <a class=type href='/web/article/0,1-0@2-3236,36-977762@51-977862,0.html'>Eclairage</a> | <a class=type href='/web/infog/0,47-0@2-3234,54-977641@51-977862,0.html'>Infographie</a></div><div class=lien-2></div> -  -<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3242,1-0,0.html">SPORTS</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3242,36-977747@51-977081,0.html'>Football : le Calcio suspendu pendant un week-end après l'éruption de violence de tifosi</a> | <a class=type href='/web/article/0,1-0@2-3242,36-977293@51-977081,0.html'>Reportage</a> | <a class=type href='/web/video/0,47-0@2-3214,54-977145@51-977081,0.html'>Vidéo</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3242,36-977745@51-970258,0.html'>Voile : Franck Cammas et Stève Ravussin s'approchent de Salvador de Bahia</a> | <a class=type href='/web/article/0,1-0@2-3242,36-977290@51-970258,0.html'>Compte rendu</a> | <a class=type href='/web/article/0,1-0@2-3242,36-976886@51-970258,0.html'>Cadrage</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3242,36-977644@51-966666,0.html'>Masters de Shanghaï : Gasquet s'offre Djokovic et préserve ses chances</a> | <a class=type href='/web/article/0,1-0@2-3242,36-977289@51-966666,0.html'>Compte rendu</a></div><div class=lien-2></div> +  +<div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3242,1-0,0.html">SPORTS</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3242,36-977747@51-977081,0.html'>Football : le Calcio suspendu pendant un week-end aprï¿½s l'ï¿½ruption de violence de tifosi</a> | <a class=type href='/web/article/0,1-0@2-3242,36-977293@51-977081,0.html'>Reportage</a> | <a class=type href='/web/video/0,47-0@2-3214,54-977145@51-977081,0.html'>Vidï¿½o</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3242,36-977745@51-970258,0.html'>Voile : Franck Cammas et Stï¿½ve Ravussin s'approchent de Salvador de Bahia</a> | <a class=type href='/web/article/0,1-0@2-3242,36-977290@51-970258,0.html'>Compte rendu</a> | <a class=type href='/web/article/0,1-0@2-3242,36-976886@51-970258,0.html'>Cadrage</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3242,36-977644@51-966666,0.html'>Masters de Shanghaï¿½ : Gasquet s'offre Djokovic et prï¿½serve ses chances</a> | <a class=type href='/web/article/0,1-0@2-3242,36-977289@51-966666,0.html'>Compte rendu</a></div><div class=lien-2></div> -  +  <div class='saut_ligne' style='height:8px;'></div> <div class='quad_pub__main'> <div class='quad_pub__pub_gauche'> @@ -691,40 +691,40 @@ ENTETE_GABARIT --> </div> <div class='saut_ligne'></div> </div> -  +  <div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-651865,1-0,0.html">TECHNOLOGIES</a></div><table width='450' cellpadding='0' cellspacing='0' border='0'> <tr valign='top'> <td width='87'><a href='/web/article/0,1-0@2-651865,36-977479@51-968783,0.html'><a href="/web/article/0,1-0@2-651865,36-977479@51-968783,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977518_269599.jpg width=87 height=58 border=0 alt='Mark Zuckerberg, fondateur de Facebook. | AP' title='Mark Zuckerberg, fondateur de Facebook. | AP' ></a></a></td> <td class=zoneb> - <b><a href='/web/article/0,1-0@2-651865,36-977479@51-968783,0.html'>Les membres de Facebook appellent à la résistance</a> | <a class=type href='/web/article/0,1-0@2-651865,36-976841@51-968783,0.html'>Compte rendu</a> | <a class=type href='/web/article/0,1-0@2-651865,36-976878@51-968783,0.html'>Entretien</a></b> + <b><a href='/web/article/0,1-0@2-651865,36-977479@51-968783,0.html'>Les membres de Facebook appellent ï¿½ la rï¿½sistance</a> | <a class=type href='/web/article/0,1-0@2-651865,36-976841@51-968783,0.html'>Compte rendu</a> | <a class=type href='/web/article/0,1-0@2-651865,36-976878@51-968783,0.html'>Entretien</a></b> </td> </tr> </table> - <div class=lien-2><a href='/web/article/0,1-0@2-3238,36-976914@51-974274,0.html'>Un cadre équipé pour recevoir les photos prises d'un mobile</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977732@51-936229,0.html'>Bruxelles veut une régulation européenne des télécoms</a></div><div class=lien-2></div> + <div class=lien-2><a href='/web/article/0,1-0@2-3238,36-976914@51-974274,0.html'>Un cadre ï¿½quipï¿½ pour recevoir les photos prises d'un mobile</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3234,36-977732@51-936229,0.html'>Bruxelles veut une rï¿½gulation europï¿½enne des tï¿½lï¿½coms</a></div><div class=lien-2></div> -  +  <div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3244,1-0,0.html">ENVIRONNEMENT, SCIENCES</a></div><table width='450' cellpadding='0' cellspacing='0' border='0'> <tr valign='top'> - <td width='87'><a href='/web/article/0,1-0@2-3214,36-977476@51-977481,0.html'><a href="/web/article/0,1-0@2-3214,36-977476@51-977481,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977477_berlin.jpg width=87 height=58 border=0 alt='La chancelière allemande Angela Merkel et le président français Nicolas Sarkozy, lundi 12 novembre 2007 à Berlin. | AP/Marcus Brandt' title='La chancelière allemande Angela Merkel et le président français Nicolas Sarkozy, lundi 12 novembre 2007 à Berlin. | AP/Marcus Brandt' ></a></a></td> + <td width='87'><a href='/web/article/0,1-0@2-3214,36-977476@51-977481,0.html'><a href="/web/article/0,1-0@2-3214,36-977476@51-977481,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977477_berlin.jpg width=87 height=58 border=0 alt='La chanceliï¿½re allemande Angela Merkel et le prï¿½sident franï¿½ais Nicolas Sarkozy, lundi 12 novembre 2007 ï¿½ Berlin. | AP/Marcus Brandt' title='La chanceliï¿½re allemande Angela Merkel et le prï¿½sident franï¿½ais Nicolas Sarkozy, lundi 12 novembre 2007 ï¿½ Berlin. | AP/Marcus Brandt' ></a></a></td> <td class=zoneb> - <b><a href='/web/article/0,1-0@2-3214,36-977476@51-977481,0.html'>La France et l'Allemagne affichent leur unité sur le projet Galileo</a></b> + <b><a href='/web/article/0,1-0@2-3214,36-977476@51-977481,0.html'>La France et l'Allemagne affichent leur unitï¿½ sur le projet Galileo</a></b> </td> </tr> </table> - <div class=lien-2><a href='/web/portfolio/0,12-0@2-3210,31-977667@51-976327,0.html'>Début de marée noire en mer Noire </a> | <a class=type href='/web/article/0,1-0@2-3214,36-977252@51-976327,0.html'>Les faits</a> | <a class=type href='/web/article/0,1-0@2-3244,36-977086@51-976327,0.html'>Les faits</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3216,36-977304@51-977399,0.html'>Inde : les chantiers interdits d'Alang</a></div><div class=lien-2></div> + <div class=lien-2><a href='/web/portfolio/0,12-0@2-3210,31-977667@51-976327,0.html'>Dï¿½but de marï¿½e noire en mer Noire </a> | <a class=type href='/web/article/0,1-0@2-3214,36-977252@51-976327,0.html'>Les faits</a> | <a class=type href='/web/article/0,1-0@2-3244,36-977086@51-976327,0.html'>Les faits</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3216,36-977304@51-977399,0.html'>Inde : les chantiers interdits d'Alang</a></div><div class=lien-2></div> -  +  <div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3246,1-0,0.html">CULTURE</a></div><table width='450' cellpadding='0' cellspacing='0' border='0'> <tr valign='top'> - <td width='87'><a href='/web/article/0,1-0@2-3246,36-977321@51-973569,0.html'><a href="/web/article/0,1-0@2-3246,36-977321@51-973569,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977207_recent-experiences.jpg width=87 height=58 border=0 alt='"Recent Experiences", une pièce de théâtre d'Amir Reza Koohestani au Théâtre de la Bastille à Paris, jusqu'au 18 novembre 2007. | D.R.' title='"Recent Experiences", une pièce de théâtre d'Amir Reza Koohestani au Théâtre de la Bastille à Paris, jusqu'au 18 novembre 2007. | D.R.' ></a></a></td> + <td width='87'><a href='/web/article/0,1-0@2-3246,36-977321@51-973569,0.html'><a href="/web/article/0,1-0@2-3246,36-977321@51-973569,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977207_recent-experiences.jpg width=87 height=58 border=0 alt='"Recent Experiences", une piï¿½ce de thï¿½ï¿½tre d'Amir Reza Koohestani au Thï¿½ï¿½tre de la Bastille ï¿½ Paris, jusqu'au 18 novembre 2007. | D.R.' title='"Recent Experiences", une piï¿½ce de thï¿½ï¿½tre d'Amir Reza Koohestani au Thï¿½ï¿½tre de la Bastille ï¿½ Paris, jusqu'au 18 novembre 2007. | D.R.' ></a></a></td> <td class=zoneb> - <b><a href='/web/article/0,1-0@2-3246,36-977321@51-973569,0.html'>Théâtre : "Recent Experiences", le noir destin de quatre femmes solitaires</a></b> + <b><a href='/web/article/0,1-0@2-3246,36-977321@51-973569,0.html'>Thï¿½ï¿½tre : "Recent Experiences", le noir destin de quatre femmes solitaires</a></b> </td> </tr> </table> - <div class=lien-2><a href='/web/article/0,1-0@2-3260,36-977549@51-977554,0.html'>"XIII" : un héros, 1 million de cibles</a> | <a class=type href='/web/article/0,1-0@2-3260,36-977548@51-977554,0.html'>Entretien</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3246,36-977309@51-977402,0.html'>La guerre froide revit à Moscou</a></div><div class=lien-2></div> + <div class=lien-2><a href='/web/article/0,1-0@2-3260,36-977549@51-977554,0.html'>"XIII" : un hï¿½ros, 1 million de cibles</a> | <a class=type href='/web/article/0,1-0@2-3260,36-977548@51-977554,0.html'>Entretien</a></div><div class=lien-2><a href='/web/article/0,1-0@2-3246,36-977309@51-977402,0.html'>La guerre froide revit ï¿½ Moscou</a></div><div class=lien-2></div> -  +  <div class=sq-tt><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-sq.gif" alt="*" width="18" height="18" border="0" align="absmiddle"> <a href="/web/sequence/0,2-3238,1-0,0.html">RENDEZ-VOUS</a></div><table width='450' cellpadding='0' cellspacing='0' border='0'> <tr valign='top'> <td width='87'><a href='/web/article/0,1-0@2-3238,36-977331@51-977420,0.html'><a href="/web/article/0,1-0@2-3238,36-977331@51-977420,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2006/06/09/h_1_ill_758131_londres-drapeaux.jpg width=87 height=58 border=0 alt='Des drapeaux anglais dans les rues de Londres. | GAMMA/CAMERAPRESS/STEPHEN LOCK' title='Des drapeaux anglais dans les rues de Londres. | GAMMA/CAMERAPRESS/STEPHEN LOCK' ></a></a></td> @@ -737,12 +737,12 @@ ENTETE_GABARIT -->  - +  - +   - + </div> </td> <td width="195"> @@ -754,13 +754,13 @@ ENTETE_GABARIT -->   -<div class=lien-2><a href=/web/depeches/0,14-0,39-33204002@7-37,0.html>Retraites: François Fillon "ne transigera pas sur les principes"</a> <span class=dt>Reuters 15h20</span></div><div class=lien-2><a href=/web/depeches/0,14-0,39-33203947@7-37,0.html>Kouchner appelle à un consensus sur le président libanais</a> <span class=dt>Reuters 15h17</span></div><div class=lien-2><a href=/web/depeches/0,14-0,39-33203873@7-37,0.html>Le Hamas arrête des dizaines de membres du Fatah à Gaza</a> <span class=dt>Reuters 15h13</span></div><div class=lien-2><a href=/web/depeches/0,14-0,39-33203725@7-37,0.html>Les Vingt-Sept en désaccord sur les dossiers fiscaux</a> <span class=dt>Reuters 15h07</span></div> +<div class=lien-2><a href=/web/depeches/0,14-0,39-33204002@7-37,0.html>Retraites: Franï¿½ois Fillon "ne transigera pas sur les principes"</a> <span class=dt>Reuters 15h20</span></div><div class=lien-2><a href=/web/depeches/0,14-0,39-33203947@7-37,0.html>Kouchner appelle ï¿½ un consensus sur le prï¿½sident libanais</a> <span class=dt>Reuters 15h17</span></div><div class=lien-2><a href=/web/depeches/0,14-0,39-33203873@7-37,0.html>Le Hamas arrï¿½te des dizaines de membres du Fatah ï¿½ Gaza</a> <span class=dt>Reuters 15h13</span></div><div class=lien-2><a href=/web/depeches/0,14-0,39-33203725@7-37,0.html>Les Vingt-Sept en dï¿½saccord sur les dossiers fiscaux</a> <span class=dt>Reuters 15h07</span></div> <div class="lien-2"> - <a href="/web/depeches/0,14-0,7-37,0.html"><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" alt="" border="0"> Toutes les dépêches</a> + <a href="/web/depeches/0,14-0,7-37,0.html"><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" alt="" border="0"> Toutes les dï¿½pï¿½ches</a> </div> - </div> + </div> </div> - +  <script language=JavaScript>OAS_AD('Position1');</script>  @@ -790,13 +790,13 @@ ENTETE_GABARIT --> //--> </script> <div class=pg-mil><div class=gr-tt> JOURNAL ELECTRONIQUE </div> <div class=box> - <a href="javascript:ouvrir_jelec()"><center><img src="http://www.lemonde.fr/journalelectronique/vignettes/lettre/20071114/20071114QUO.jpg" border="0" width="85px" height="122px" style="margin: 3px 0px; border-color: #bbbbbb; border-width: 1px 1px 1px 1px;" alt=""><img src="http://medias.lemonde.fr/mmpub/img/tit/page_2.jpg" border="0" width="85px" height="122px" style="margin: 3px 0px; border-color: #bbbbbb; border-width: 1px 1px 1px 0px;" alt=""></center><span class=type>Nouveau !</span> L'édition du 14 novembre 2007 est en ligne</a> - + <a href="javascript:ouvrir_jelec()"><center><img src="http://www.lemonde.fr/journalelectronique/vignettes/lettre/20071114/20071114QUO.jpg" border="0" width="85px" height="122px" style="margin: 3px 0px; border-color: #bbbbbb; border-width: 1px 1px 1px 1px;" alt=""><img src="http://medias.lemonde.fr/mmpub/img/tit/page_2.jpg" border="0" width="85px" height="122px" style="margin: 3px 0px; border-color: #bbbbbb; border-width: 1px 1px 1px 0px;" alt=""></center><span class=type>Nouveau !</span> L'ï¿½dition du 14 novembre 2007 est en ligne</a> + </div> <div class=box> <img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" alt=""><a href="/web/inscription_newsletter/1,27-0,1-0,0.html" onclick="xt_clic('N','Recevoir newsletter JE Home')">Recevez la newsletter</a> </div> - + </div>  <script language=JavaScript>OAS_AD('Position2');</script>  @@ -807,44 +807,44 @@ ENTETE_GABARIT --> <div class=pg-mil> <div class=gr-tt>BLOGS</div> <div class=box> - + <div class=lien-2><a href="http://chine.blog.lemonde.fr/" target=_new>Arty People, Party People (2/2)</a> <span class=bl-auteur> par Ji Le</span> <span class=leg>Un oeil sur la Chine</span> </div> - <div class=lien-2><a href="http://casadei.blog.lemonde.fr/" target=_new>"Ecrire le Liban à jamais"</a> - <span class=bl-auteur> par Marie Depecker</span> <span class=leg>Regarder, vivre, écrire le Liban!</span> + <div class=lien-2><a href="http://casadei.blog.lemonde.fr/" target=_new>"Ecrire le Liban ï¿½ jamais"</a> + <span class=bl-auteur> par Marie Depecker</span> <span class=leg>Regarder, vivre, ï¿½crire le Liban!</span> </div> <div class=lien-2><a href="http://correcteurs.blog.lemonde.fr/" target=_new>Entre Marseille et Toulon</a> <span class=bl-auteur> par Olivier Houdart et Martine Rousseau </span> <span class=leg>Langue sauce piquante</span> </div> - <div class=lien-2><a href="http://lesyeuxouverts.blog.lemonde.fr/" target=_new>Sophie après l'Himalaya</a> - <span class=bl-auteur> par Ludovic Maillard</span> <span class=leg>"Françaises, Français..."</span> + <div class=lien-2><a href="http://lesyeuxouverts.blog.lemonde.fr/" target=_new>Sophie aprï¿½s l'Himalaya</a> + <span class=bl-auteur> par Ludovic Maillard</span> <span class=leg>"Franï¿½aises, Franï¿½ais..."</span> </div> <div class=lien-2><a href="http://nicerugby.blog.lemonde.fr/" target=_new>L'ASM Clermont Auvergne sur les chapeaux de roues</a> <span class=bl-auteur> par Paul-Henri Safayan et Julien Schramm</span> <span class=leg>Nice rugby</span> </div> <div class=lien-2><a href="http://pisani.blog.lemonde.fr/" target=_new>1 laptop x enfant x 2</a> - <span class=bl-auteur> par Francis Pisani</span> <span class=leg>Transnets, des gadgets aux réseaux</span> + <span class=bl-auteur> par Francis Pisani</span> <span class=leg>Transnets, des gadgets aux rï¿½seaux</span> </div> - + <div class="lien-2">Autres blogs<br /> - - <a href="http://passouline.blog.lemonde.fr/" target=_new><img alt="La république des livres" title="La république des livres" border=0 width=57 src="http://medias.lemonde.fr/mmpub/edt/ill/2005/03/17/h_1_ill_626766_pierre_assouline.jpg"></img></a> - - + + <a href="http://passouline.blog.lemonde.fr/" target=_new><img alt="La rï¿½publique des livres" title="La rï¿½publique des livres" border=0 width=57 src="http://medias.lemonde.fr/mmpub/edt/ill/2005/03/17/h_1_ill_626766_pierre_assouline.jpg"></img></a> + + <a href="http://lunettesrouges.blog.lemonde.fr/" target=_new><img alt="Amateur d'art" title="Amateur d'art" border=0 width=57 src="http://medias.lemonde.fr/mmpub/edt/ill/2005/09/16/h_1_ill_664287_lunettes-rouges.jpg"></img></a> - - + + <a href="http://clesnes.blog.lemonde.fr/" target=_new><img alt="Big Picture" title="Big Picture" border=0 width=57 src="http://medias.lemonde.fr/mmpub/edt/ill/2005/03/17/h_1_ill_626779_corine_lesnes03.jpg"></img></a> - + </div> <div class="saut_ligne"></div> </div> <div class=box> <img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" alt=""> - <a href="http://abonnes.lemonde.fr/web/ep/blog_inscrit/1,27-0,1-0,0.html">Créez votre blog</a> + <a href="http://abonnes.lemonde.fr/web/ep/blog_inscrit/1,27-0,1-0,0.html">Crï¿½ez votre blog</a> <br/> <img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" alt=""> <a href="/web/blogs/0,39-0,48-0,0.html">Tous les blogs</a> @@ -890,13 +890,13 @@ var slide_show_img_widget = 0; var slide_show_text_elem = 0; var slide_show_num_elem = 0; -//) && ($ct < $_gab_contexte_affichage->_confAffichage['FairePart_/General']['nb_fairepart_max_en_une']); +//) && ($ct < $_gab_contexte_affichage->_confAffichage['FairePart_/General']['nb_fairepart_max_en_une']); construit_carnet_slide_show = function() { var slide_show_img_elem = document.getElementById ('div_img_slide_show_carnet'); var slide_show_text_elem = document.getElementById ('div_text_slide_show_carnet'); var slide_show_num_elem = document.getElementById ('div_num_slide_show_carnet'); - + slide_show_img_widget = new slideShowWidget(slide_show_img_elem); slide_show_text_widget = new slideShowWidget(slide_show_text_elem); slide_show_num_widget = new slideShowWidget(slide_show_num_elem); @@ -909,7 +909,7 @@ construit_carnet_slide_show = function() var num = slide_show_img_widget.showRandomFirstElem(); slide_show_text_widget.showFirstElemWithNum(num); slide_show_num_widget.showFirstElemWithNum(num); - + //on demarre un slide show en auto } @@ -919,29 +919,29 @@ if (window.addEventListener) window.addEventListener("load", construit_carnet_slide_show, false); else window.attachEvent("onload", construit_carnet_slide_show); - + </script> <div style="display:none;"> <img width="140" onclick="window.open('http://fairepart.lemonde.fr/faire-part/visualisation-faire-part-du-jour.html?_fpid=1-1352502000-18589-71ff96489cdc356084dffedefe5f1da8');" - height="105px" - style="cursor:pointer" + height="105px" + style="cursor:pointer" title="naissance" alt="naissance" id="image_carnet_0" src="http://medias.lemonde.fr/mmpub/fp/img/a/aa/aa1/aa16306b0d55f9139cbc8abf80d95389/orane_284_moyenne.jpg" border="0"></img> - + <div style='width:33px;text-align:center;height:20px;' id="fairepart_num_carnet_0" > 1/1 <div class="saut_ligne"></div> </div> - + <div style='width:160px;' id="texte_carnet_0"> <a target="_blank" href="http://fairepart.lemonde.fr/faire-part/visualisation-faire-part-du-jour.html?_fpid=1-1352502000-18589-71ff96489cdc356084dffedefe5f1da8"> naissance </a> <div class="saut_ligne"></div> </div> - + </div> <div class=pg-mil> @@ -949,14 +949,14 @@ else <div class="box"> <div style="width:140px;height:105px;float:left; position:relative;overflow:display;" id="div_img_slide_show_carnet"> </div> - + <div style="float:left;padding-left:5px;"> - + <a href="javascript:var a=1;"><img border=0 src="http://medias.lemonde.fr/mmpub/img/tit/noire_prev.gif"></img></a> <a href="javascript:var a=1;"><img border=0 src="http://medias.lemonde.fr/mmpub/img/tit/noire_suiv.gif"></img></a> <div style="width:33px;height:25px;overflow:display;position:relative;" id="div_num_slide_show_carnet"></div> </div> - + <div class="saut_ligne" style="height:3px;"></div> <div style="width:160px;height:62px;position:relative;" id="div_text_slide_show_carnet"> </div> @@ -974,18 +974,18 @@ else </div>  <div class=pg-mil> - <div class=gr-tt>VOTRE DERNIÈRE RÉACTION</div> - <div class=box><div class=lien>"(1) Sur les deux groupes que j'ai trouvé qui se disent résistants, quasi 0 échange entre membres. (2) Et, oui, Claire G., merci de le rappeler, rien de nouveau. (3) Quelle solution ? Vivre "under the radar", sans cartes, sans identité, suspect éternel à défaut d'être prospect éternel ? Ou le retour au maquis. Mais apparemment, on finit toujours par s'y faire attraper aussi ;)" - <div align=right class=type-gr>par Stephane G.</div></div><div class=lien>Une des 34 réactions à l'article <a href=/web/article/0,1-0@2-651865,36-977479,0.html>Les membres de Facebook appellent à la résistance</a></div></div><div class=box><img src=http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif alt=""> <a href=/web/article/reactions/0,1-0@2-651865,36-977479,0.html>Réagissez à cet article</a></div></div> <script language=JavaScript>OAS_AD('Position3');</script> - -  + <div class=gr-tt>VOTRE DERNIï¿½RE Rï¿½ACTION</div> + <div class=box><div class=lien>"(1) Sur les deux groupes que j'ai trouvï¿½ qui se disent rï¿½sistants, quasi 0 ï¿½change entre membres. (2) Et, oui, Claire G., merci de le rappeler, rien de nouveau. (3) Quelle solution ? Vivre "under the radar", sans cartes, sans identitï¿½, suspect ï¿½ternel ï¿½ dï¿½faut d'ï¿½tre prospect ï¿½ternel ? Ou le retour au maquis. Mais apparemment, on finit toujours par s'y faire attraper aussi ;)" + <div align=right class=type-gr>par Stephane G.</div></div><div class=lien>Une des 34 rï¿½actions ï¿½ l'article <a href=/web/article/0,1-0@2-651865,36-977479,0.html>Les membres de Facebook appellent ï¿½ la rï¿½sistance</a></div></div><div class=box><img src=http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif alt=""> <a href=/web/article/reactions/0,1-0@2-651865,36-977479,0.html>Rï¿½agissez ï¿½ cet article</a></div></div> <script language=JavaScript>OAS_AD('Position3');</script> + +   <div class=pg-mil> -<div class="gr-tt">LES PLUS ENVOYÉS</div> -<div class="box"><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977303,0.html>Moi, Laurent S., chirurgien de l'hôpital public</a> Société</div><div class="lien-2"><a href=/web/article/0,1-0@2-651865,36-977479,0.html>Les membres de Facebook appellent à la résistance</a> Technologies</div><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977259,0.html>HLM : la rénovation urbaine pourrait accroître la pénurie</a> Société</div><div class="lien-2"><a href=/web/article/0,1-0@2-3234,36-977278,0.html>François Bourguignon : "La Banque mondiale peut devenir la banque de l'environnement"</a> Economie</div><div class="lien-2"><a href=/web/portfolio/0,12-0@2-3244,31-976300,0.html>Six espèces d'ours sur huit menacées</a> Environnement, Sciences</div><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977089,0.html>La coordination étudiante appelle au blocage des gares mardi</a> Société</div><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977105,0.html>Les grèves annoncées pour les quinze prochains jours</a> Société</div><div class="lien-2"><a href=/web/article/0,1-0@2-3234,36-977276,0.html>La découverte de réserves de pétrole ferait du Brésil l'un des dix principaux producteurs</a> Economie</div> </div> +<div class="gr-tt">LES PLUS ENVOYï¿½S</div> +<div class="box"><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977303,0.html>Moi, Laurent S., chirurgien de l'hï¿½pital public</a> Sociï¿½tï¿½</div><div class="lien-2"><a href=/web/article/0,1-0@2-651865,36-977479,0.html>Les membres de Facebook appellent ï¿½ la rï¿½sistance</a> Technologies</div><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977259,0.html>HLM : la rï¿½novation urbaine pourrait accroï¿½tre la pï¿½nurie</a> Sociï¿½tï¿½</div><div class="lien-2"><a href=/web/article/0,1-0@2-3234,36-977278,0.html>Franï¿½ois Bourguignon : "La Banque mondiale peut devenir la banque de l'environnement"</a> Economie</div><div class="lien-2"><a href=/web/portfolio/0,12-0@2-3244,31-976300,0.html>Six espï¿½ces d'ours sur huit menacï¿½es</a> Environnement, Sciences</div><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977089,0.html>La coordination ï¿½tudiante appelle au blocage des gares mardi</a> Sociï¿½tï¿½</div><div class="lien-2"><a href=/web/article/0,1-0@2-3224,36-977105,0.html>Les grï¿½ves annoncï¿½es pour les quinze prochains jours</a> Sociï¿½tï¿½</div><div class="lien-2"><a href=/web/article/0,1-0@2-3234,36-977276,0.html>La dï¿½couverte de rï¿½serves de pï¿½trole ferait du Brï¿½sil l'un des dix principaux producteurs</a> Economie</div> </div> </div><div class=pg-mil> - <div class=gr-tt>VOS RECOMMANDÉS</div> - <div class=box><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-3224,36-977084,0.html>Le principal adjoint d'un collège de Pierrefitte, en Seine-Saint-Denis, poignardé</a> Société</div><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-3232,36-977230,0.html>Petits conseils à l'usage des voyageurs, par Laurent Greilsamer</a> Opinions</div><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-823448,36-977534,0.html>Le collectif ACDC accuse l'Insee d'"escamoter" les vrais chiffres du chômage</a> Politique</div><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-3216,36-977304,0.html>Chantiers interdits</a> Asie-Pacifique</div></div></div>  + <div class=gr-tt>VOS RECOMMANDï¿½S</div> + <div class=box><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-3224,36-977084,0.html>Le principal adjoint d'un collï¿½ge de Pierrefitte, en Seine-Saint-Denis, poignardï¿½</a> Sociï¿½tï¿½</div><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-3232,36-977230,0.html>Petits conseils ï¿½ l'usage des voyageurs, par Laurent Greilsamer</a> Opinions</div><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-823448,36-977534,0.html>Le collectif ACDC accuse l'Insee d'"escamoter" les vrais chiffres du chï¿½mage</a> Politique</div><div class=lien-2><a href=http://www.lemonde.fr/web/article/0,1-0@2-3216,36-977304,0.html>Chantiers interdits</a> Asie-Pacifique</div></div></div>    <link rel="stylesheet" type="text/css" href="http://medias.lemonde.fr/mmpub/css/lienpromo.css" /> @@ -994,110 +994,110 @@ else <div class="mv-box"> <div class="lien-2"> <a href="/web/lien_promo/0,55-0,1-0,0.html?keyword=voyage&accroche=Votre voyage au meilleur prix">Voyages : Envolez-vous en quelques clics</a> </div> <div class="lien-2"> <a href="/web/lien_promo/0,55-0,1-0,0.html?keyword=rencontre&accroche=Faites des rencontres en quelques clics !">Rencontre : 3,2,1... Connectez-vous !</a> </div> - <div class="lien-2"> <a href="/web/lien_promo/0,55-0,1-0,0.html?keyword=billet avion&accroche=Réservez votre vol en ligne">Billet d'avion : Réservez en ligne</a> </div> + <div class="lien-2"> <a href="/web/lien_promo/0,55-0,1-0,0.html?keyword=billet avion&accroche=Rï¿½servez votre vol en ligne">Billet d'avion : Rï¿½servez en ligne</a> </div> <div class="lien-2"> <a href="/web/lien_promo/0,55-0,1-0,0.html?keyword=achat ordinateur&accroche=PC portables en promotion !">Ordinateur portable : Les promos du web</a> </div> </div> </div>   - + </td> <td width="338" class="pg-dtebg" >  <center><script language=JavaScript>OAS_AD('TopRight');</script></center> - -<div class="pg-dte"> <div class="header-bg-direct"><div style="width:5px;float:left;"> </div><div style="float:left;"><img src="http://medias.lemonde.fr/mmpub/img/tit/animated_en_direct_icon.gif"></div><div class="header-txt" style="float:left;">EN DIRECT</div></div><div class="box" style="min-height:66px;"><a href="/web/chat/0,46-0@2-3328,55-976754,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/09/v_5_ill_976778_birnbaum.jpg width=87 height=111 border=0 alt='Jean Birnbaum, journaliste au "Monde". | DR' title='Jean Birnbaum, journaliste au "Monde". | DR' align="right" style="display:block"></a><span class="type-direct">Chat à 15 heures</span><br><a href="/web/chat/0,46-0@2-3328,55-976754,0.html">Femmes-hommes : où est passée la différence des sexes ?</a><br>Débat en direct avec Jean Birnbaum, journaliste au "Monde", mardi 13 novembre 2007 à 15 h 00<div style="clear:both;"></div></div><div class="box"><span class="type-gr">Chat mercredi à 15 heures</span><a href="/web/chat/0,46-0@2-3234,55-975809,0.html" style="margin-left:5px;">Quels peuvent être les impacts de la hausse continuelle de l'euro sur les économies européennes ?</a><br></div></div> + +<div class="pg-dte"> <div class="header-bg-direct"><div style="width:5px;float:left;"> </div><div style="float:left;"><img src="http://medias.lemonde.fr/mmpub/img/tit/animated_en_direct_icon.gif"></div><div class="header-txt" style="float:left;">EN DIRECT</div></div><div class="box" style="min-height:66px;"><a href="/web/chat/0,46-0@2-3328,55-976754,0.html"><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/09/v_5_ill_976778_birnbaum.jpg width=87 height=111 border=0 alt='Jean Birnbaum, journaliste au "Monde". | DR' title='Jean Birnbaum, journaliste au "Monde". | DR' align="right" style="display:block"></a><span class="type-direct">Chat ï¿½ 15 heures</span><br><a href="/web/chat/0,46-0@2-3328,55-976754,0.html">Femmes-hommes : oï¿½ est passï¿½e la diffï¿½rence des sexes ?</a><br>Dï¿½bat en direct avec Jean Birnbaum, journaliste au "Monde", mardi 13 novembre 2007 ï¿½ 15 h 00<div style="clear:both;"></div></div><div class="box"><span class="type-gr">Chat mercredi ï¿½ 15 heures</span><a href="/web/chat/0,46-0@2-3234,55-975809,0.html" style="margin-left:5px;">Quels peuvent ï¿½tre les impacts de la hausse continuelle de l'euro sur les ï¿½conomies europï¿½ennes ?</a><br></div></div> <center><script language=JavaScript>if (provenance_elt !=-1) {OAS_AD('x40')} else {OAS_AD('Middle')}</script></center> - -<div class=pg-dte><a href="/web/panorama/0,11-0@2-3236,32-977215,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_9_radiozapping_07111_326.jpg width=326 height=60 border=0 alt='Le Radiozapping, chaque jour à midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' title='Le Radiozapping, chaque jour à midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' ></a></div> - + +<div class=pg-dte><a href="/web/panorama/0,11-0@2-3236,32-977215,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_9_radiozapping_07111_326.jpg width=326 height=60 border=0 alt='Le Radiozapping, chaque jour ï¿½ midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' title='Le Radiozapping, chaque jour ï¿½ midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' ></a></div> + <div class="pg-dte"> - <div class="header-bg"><div class="header-txt">GRÈVE DU 14 NOVEMBRE</div></div> + <div class="header-bg"><div class="header-txt">GRï¿½VE DU 14 NOVEMBRE</div></div> <div class="box"> - + <table width=313 cellpadding=0 cellspacing=0 border=0> - <tr valign=top> - <td style=padding-right:4px><a href="/web/article/0,1-0@2-3224,36-977533@51-977527,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_968143_204180.jpg width=87 height=58 border=0 alt='La direction de la SNCF s'attend à un taux de grévistes de 70 % à partir du 13 novembre au soir, un taux équivalent à celui enregistré lors de la grève du 18 octobre. | REUTERS/BENOIT TESSIER' title='La direction de la SNCF s'attend à un taux de grévistes de 70 % à partir du 13 novembre au soir, un taux équivalent à celui enregistré lors de la grève du 18 octobre. | REUTERS/BENOIT TESSIER' ></a></td> + <tr valign=top> + <td style=padding-right:4px><a href="/web/article/0,1-0@2-3224,36-977533@51-977527,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_968143_204180.jpg width=87 height=58 border=0 alt='La direction de la SNCF s'attend ï¿½ un taux de grï¿½vistes de 70 % ï¿½ partir du 13 novembre au soir, un taux ï¿½quivalent ï¿½ celui enregistrï¿½ lors de la grï¿½ve du 18 octobre. | REUTERS/BENOIT TESSIER' title='La direction de la SNCF s'attend ï¿½ un taux de grï¿½vistes de 70 % ï¿½ partir du 13 novembre au soir, un taux ï¿½quivalent ï¿½ celui enregistrï¿½ lors de la grï¿½ve du 18 octobre. | REUTERS/BENOIT TESSIER' ></a></td> <td> <div class=type-gr>Pratique - <a href="/web/article/0,1-0@2-3224,36-977533@51-977527,0.html" >De fortes perturbations prévues dans les transports</a><br> + <a href="/web/article/0,1-0@2-3224,36-977533@51-977527,0.html" >De fortes perturbations prï¿½vues dans les transports</a><br> </td> </tr> <tr> <td colspan=2> - - <div class=lien><span class=type-gr>Revue de Web</span> <a href="/web/articleinteractif/0,41-0@2-3224,49-977504@51-977527,0.html" >Se déplacer pendant les grèves : le système D</a><br></div> - - <div class=lien><span class=type-gr>Les clés</span> <a href="/web/article/0,1-0@2-3224,36-977483@51-977527,0.html" >Le point sur la réforme des régimes spéciaux de retraite</a><br></div> - + + <div class=lien><span class=type-gr>Revue de Web</span> <a href="/web/articleinteractif/0,41-0@2-3224,49-977504@51-977527,0.html" >Se dï¿½placer pendant les grï¿½ves : le systï¿½me D</a><br></div> + + <div class=lien><span class=type-gr>Les clï¿½s</span> <a href="/web/article/0,1-0@2-3224,36-977483@51-977527,0.html" >Le point sur la rï¿½forme des rï¿½gimes spï¿½ciaux de retraite</a><br></div> + </td> </tr> - </table> + </table> </div></div></div> - -<div class="pg-dte"> <div class="box-ab"> <div class="header-bg-ab"></div> <div style="text-align:center;padding:2px;"> <table cellspacing="2" width="316" style="margin:auto"><tr height="108px"><td width="148px"><p><span class="type-abo">La 12:15</span><br><a href="http://abonnes.lemonde.fr/web/newsletter/0,30-0,62-977115@60-1@45-2,0.html" >Japon : l'économie croît plus que prévu - Vodafone en hausse - Le prix du baril pèse sur la demande</a></p><p><span class="type-abo">Dossier</span><br><a href="http://abonnes.lemonde.fr/web/dossier/0,3-0@2-3224,14-835881,0.html" >Ecole : l'inégalité des chances ?</a></p></td><td width="160px"><a href="http://abonnes.lemonde.fr/web/thematique/0,42-0@2-823448,53-974441,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_12_thema_EU_traite_155x103.jpg width=155 height=103 border=0 alt='Adopté les 18 et 19 octobre 2007 par le Conseil européen, le traité de Lisbonne devra être ratifié par chacun des vingt-sept pays membres avant les élections européennes de juin 2009. | AP/ALIK KEPLICZ' title='Adopté les 18 et 19 octobre 2007 par le Conseil européen, le traité de Lisbonne devra être ratifié par chacun des vingt-sept pays membres avant les élections européennes de juin 2009. | AP/ALIK KEPLICZ' style="margin:3px;"></a></td></tr><tr><td style="background-color:white;" colspan="2" height="20px"><a href="/cgi-bin/ACHATS/acheter.cgi?offre=ZOP"><p><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" border=0> 6€ par mois,30 jours offerts. Abonnez-vous</a></p></td></tr></table></div></div></div> - + +<div class="pg-dte"> <div class="box-ab"> <div class="header-bg-ab"></div> <div style="text-align:center;padding:2px;"> <table cellspacing="2" width="316" style="margin:auto"><tr height="108px"><td width="148px"><p><span class="type-abo">La 12:15</span><br><a href="http://abonnes.lemonde.fr/web/newsletter/0,30-0,62-977115@60-1@45-2,0.html" >Japon : l'ï¿½conomie croï¿½t plus que prï¿½vu - Vodafone en hausse - Le prix du baril pï¿½se sur la demande</a></p><p><span class="type-abo">Dossier</span><br><a href="http://abonnes.lemonde.fr/web/dossier/0,3-0@2-3224,14-835881,0.html" >Ecole : l'inï¿½galitï¿½ des chances ?</a></p></td><td width="160px"><a href="http://abonnes.lemonde.fr/web/thematique/0,42-0@2-823448,53-974441,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_12_thema_EU_traite_155x103.jpg width=155 height=103 border=0 alt='Adoptï¿½ les 18 et 19 octobre 2007 par le Conseil europï¿½en, le traitï¿½ de Lisbonne devra ï¿½tre ratifiï¿½ par chacun des vingt-sept pays membres avant les ï¿½lections europï¿½ennes de juin 2009. | AP/ALIK KEPLICZ' title='Adoptï¿½ les 18 et 19 octobre 2007 par le Conseil europï¿½en, le traitï¿½ de Lisbonne devra ï¿½tre ratifiï¿½ par chacun des vingt-sept pays membres avant les ï¿½lections europï¿½ennes de juin 2009. | AP/ALIK KEPLICZ' style="margin:3px;"></a></td></tr><tr><td style="background-color:white;" colspan="2" height="20px"><a href="/cgi-bin/ACHATS/acheter.cgi?offre=ZOP"><p><img src="http://medias.lemonde.fr/mmpub/img/icn/fl-rg.gif" border=0> 6€ par mois,30 jours offerts. Abonnez-vous</a></p></td></tr></table></div></div></div> + <div class=pg-dte><a href="http://abonnes.lemonde.fr/web/vi/0,47-0@2-3212,54-969056,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/10/23/h_9_appel_petrole_afrique326.jpg width=326 height=60 border=0 alt='Pipeline en Afrique. | A. FARNSWORTH' title='Pipeline en Afrique. | A. FARNSWORTH' ></a></div><center><script language=JavaScript>OAS_AD('Middle2');</script></center> - + <div class="pg-dte"> <div class="header-bg"><div class="header-txt">SORTIE DU NOUVEL ALBUM DE "XIII"</div></div> <div class="box"> - + <table width=313 cellpadding=0 cellspacing=0 border=0> - <tr valign=top> - <td style=padding-right:4px><a href="/web/article/0,1-0@2-3260,36-977549@51-977554,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_1_ill_977553_sans-titre-2.jpg width=87 height=58 border=0 alt='La série de bande dessinée "XIII" a vu le jour en 1984. | Dargaud' title='La série de bande dessinée "XIII" a vu le jour en 1984. | Dargaud' ></a></td> + <tr valign=top> + <td style=padding-right:4px><a href="/web/article/0,1-0@2-3260,36-977549@51-977554,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_1_ill_977553_sans-titre-2.jpg width=87 height=58 border=0 alt='La sï¿½rie de bande dessinï¿½e "XIII" a vu le jour en 1984. | Dargaud' title='La sï¿½rie de bande dessinï¿½e "XIII" a vu le jour en 1984. | Dargaud' ></a></td> <td> <div class=type-gr>Les faits - <a href="/web/article/0,1-0@2-3260,36-977549@51-977554,0.html" >"XIII" : un héros, 1 million de cibles</a><br> + <a href="/web/article/0,1-0@2-3260,36-977549@51-977554,0.html" >"XIII" : un hï¿½ros, 1 million de cibles</a><br> </td> </tr> <tr> <td colspan=2> - - <div class=lien><span class=type-gr>Entretien</span> <a href="/web/article/0,1-0@2-3260,36-977548@51-977554,0.html" >"Je préfère frustrer que décevoir"</a><br></div> - + + <div class=lien><span class=type-gr>Entretien</span> <a href="/web/article/0,1-0@2-3260,36-977548@51-977554,0.html" >"Je prï¿½fï¿½re frustrer que dï¿½cevoir"</a><br></div> + </td> </tr> - </table> + </table> </div></div></div> - + <style> .appel-lepost { background-color: #fff; font-family:Arial,sans-serif; font-size:10px; border:1px solid #F83C77; margin:5px 0px 5px; position:relative; text-align:left; padding:0; } .appel-lepost ul { margin:1em 0.5em 1em; padding: 0px; } - .appel-lepost li { line-height: 1.5em; margin-bottom:0.5em; list-style-type:none; } + .appel-lepost li { line-height: 1.5em; margin-bottom:0.5em; list-style-type:none; } .appel-lepost h4.intitule-lien { border:medium none; margin:0pt; padding:0pt; text-align:center;} .appel-lepost h4.intitule-lien a { color:#003366; font-size:12px; } - .appel-lepost h4.intitule-lien a:hover { color:#990000; font-size:12px; } + .appel-lepost h4.intitule-lien a:hover { color:#990000; font-size:12px; } </style><div class=pg-dte> <div align="center"><img src="http://a1692.g.akamai.net/n/1692/2042/1077898746/pubs.lemonde.fr/RealMedia/ads/Creatives/OasDefault/publicite/pub300t.gif"></div><div class="appel-lepost"><script language=javascript> num = parseInt(Math.random()*7); xnum = num+3; - nom_photo = 'http://medias.lemonde.fr/mmpub/img/tetiere_post_'+num+'.jpg'; - document.write('<a href="http://www.lepost.fr/?xtor=ADC-2'+xnum+'" target="_blank"><img src="'+nom_photo+'" width=324 border="0"></a>'); + nom_photo = 'http://medias.lemonde.fr/mmpub/img/tetiere_post_'+num+'.jpg'; + document.write('<a href="http://www.lepost.fr/?xtor=ADC-2'+xnum+'" target="_blank"><img src="'+nom_photo+'" width=324 border="0"></a>'); </script><ul> <li> - <h4 class="intitule-lien"> <a href="http://www.lepost.fr/article/2007/11/12/1050505_exclusif-le-nouveau-johnny-aujourd-hui-sur-le-post.html?xtor=ADC-16" target="_blank"><span style="color:#F83C77;">»</span> Aujourd'hui, Johnny en EXCLUSIVITE sur Le Post</a></h4> + <h4 class="intitule-lien"> <a href="http://www.lepost.fr/article/2007/11/12/1050505_exclusif-le-nouveau-johnny-aujourd-hui-sur-le-post.html?xtor=ADC-16" target="_blank"><span style="color:#F83C77;">ï¿½</span> Aujourd'hui, Johnny en EXCLUSIVITE sur Le Post</a></h4> </li> <li> - <h4 class="intitule-lien"> <a href="http://www.lepost.fr/article/2007/11/06/1047688_les-universites-de-rennes-et-toulouse-sont-bloquees.html?xtor=ADC-19" target="_blank"><span style="color:#F83C77;">»</span> Les facs bloquées : ville par ville</a></h4> - </li> + <h4 class="intitule-lien"> <a href="http://www.lepost.fr/article/2007/11/06/1047688_les-universites-de-rennes-et-toulouse-sont-bloquees.html?xtor=ADC-19" target="_blank"><span style="color:#F83C77;">ï¿½</span> Les facs bloquï¿½es : ville par ville</a></h4> + </li> <li> - <h4 class="intitule-lien"> <a href="http://www.lepost.fr/article/2007/11/12/1050577_comment-sarkozy-va-t-il-detourner-les-medias-de-la-greve.html?xtor=ADC-13" target="_blank"><span style="color:#F83C77;">»</span> Grèves : comment Sarkozy pourrait détourner l'attention des médias</a></h4> - </li> + <h4 class="intitule-lien"> <a href="http://www.lepost.fr/article/2007/11/12/1050577_comment-sarkozy-va-t-il-detourner-les-medias-de-la-greve.html?xtor=ADC-13" target="_blank"><span style="color:#F83C77;">ï¿½</span> Grï¿½ves : comment Sarkozy pourrait dï¿½tourner l'attention des mï¿½dias</a></h4> + </li> </ul> <div align="center"> - <a href="http://www.lepost.fr/?xtor=ADC-22" target="_blank"><img alt="" src="http://medias.lemonde.fr/mmpub/img/footer_post.png" border="0" style="margin-bottom: 3px;" /></a> + <a href="http://www.lepost.fr/?xtor=ADC-22" target="_blank"><img alt="" src="http://medias.lemonde.fr/mmpub/img/footer_post.png" border="0" style="margin-bottom: 3px;" /></a> </div> </div> </div> <center><script language=JavaScript>OAS_AD('Middle1');</script></center> - -<div class="pg-dte"> <div class="header-bg"><div class="header-txt">VOIR</div></div> <div class="box"><table border=0 cellspacing="0" cellpadding="0"><tr><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3208,31-977892,0.html" ><div class="bt-big-off" id="voir_bt_0" onmouseover="voir_on(0)" onmouseout="voir_out(0)">Dessins du jour</div></a></div></td><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3210,31-977667,0.html" ><div class="bt-big-off" id="voir_bt_1" onmouseover="voir_on(1)" onmouseout="voir_out(1)">Portfolio</div></a></div></td><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3244,31-976300,0.html" ><div class="bt-big-off" id="voir_bt_2" onmouseover="voir_on(2)" onmouseout="voir_out(2)">Portfolio</div></a></div></td></tr><tr><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3246,31-977650,0.html" ><div class="bt-big-off" id="voir_bt_3" onmouseover="voir_on(3)" onmouseout="voir_out(3)">Portfolio</div></a></div></td><td><div class="no-underline"><a href="/web/video/0,47-0@2-3210,54-977600,0.html" ><div class="bt-big-off" id="voir_bt_4" onmouseover="voir_on(4)" onmouseout="voir_out(4)">Vidéo</div></a></div></td><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3246,31-973772,0.html" ><div class="bt-big-off" id="voir_bt_5" onmouseover="voir_on(5)" onmouseout="voir_out(5)">Portfolio</div></a></div></td></tr><tr><td colspan="3"><div class="content"><div id="voir_content_0" style="display:none;"><a href='/web/portfolio/0,12-0@2-3208,31-977892,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977891_07111419_napo+x1d1_web.jpg width=155 height=103 border=0 alt='Jour de grève | ' title='Jour de grève | ' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Mercredi 14 novembre 2007</div></a></div><div id="voir_content_1" style="display:none;"><a href='/web/portfolio/0,12-0@2-3210,31-977667,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977657_277794.jpg width=155 height=103 border=0 alt='Un oiseau couvert de pétrole, près du port de Kavkaz, le 13 novembre 2007. | AP/SERGEI GRITS' title='Un oiseau couvert de pétrole, près du port de Kavkaz, le 13 novembre 2007. | AP/SERGEI GRITS' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Début de marée noire en mer Noire</div></a></div><div id="voir_content_2" style="display:none;"><a href='/web/portfolio/0,12-0@2-3244,31-976300,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/09/v_13_ill_976249_giant_panda1_c_david_sheppard.jpg width=100 height=127 border=0 alt='Le panda géant est une espèce "en danger", selon la classification de l'UICN. | UICN' title='Le panda géant est une espèce "en danger", selon la classification de l'UICN. | UICN' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Six espèces d'ours sur huit menacées</div></a></div><div id="voir_content_3" style="display:none;"><a href='/web/portfolio/0,12-0@2-3246,31-977650,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977631_pennac_renaudot.jpg width=155 height=103 border=0 alt='Daniel Pennac, le 5 novembre 2007 à Paris. | AP' title='Daniel Pennac, le 5 novembre 2007 à Paris. | AP' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Les prix littéraires 2007</div></a></div><div id="voir_content_4" style="display:none;"><a href='/web/video/0,47-0@2-3210,54-977600,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977551_policemangun_282546.jpg width=155 height=103 border=0 alt='Des milliers de policiers anti-émeutes bloquaient mardi 13 novembre toutes les routes menant à un quartier de Lahore, où Mme Bhutto séjourne actuellement. Les policiers ont pris position derrière les véhicules et une rangée de barrières en métal coiffées de fil barbelé. La maison d'un député de son parti dans laquelle séjourne Mme Bhutto n'était pas visible au-delà du périmètre de sécurité. | AFP/Arif Ali' title='Des milliers de policiers anti-émeutes bloquaient mardi 13 novembre toutes les routes menant à un quartier de Lahore, où Mme Bhutto séjourne actuellement. Les policiers ont pris position derrière les véhicules et une rangée de barrières en métal coiffées de fil barbelé. La maison d'un député de son parti dans laquelle séjourne Mme Bhutto n'était pas visible au-delà du périmètre de sécurité. | AFP/Arif Ali' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>La résidence de Mme Bhutto encerclée par la police</div></a></div><div id="voir_content_5" style="display:none;"><a href='/web/portfolio/0,12-0@2-3246,31-973772,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/02/h_12_ill_973776_cambodge.jpg width=155 height=103 border=0 alt=' | Mark Remissa/Photoquai' title=' | Mark Remissa/Photoquai' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Photoquai, première biennale des images du monde à Paris</div></a></div></div></td></tr></table></div></div> + +<div class="pg-dte"> <div class="header-bg"><div class="header-txt">VOIR</div></div> <div class="box"><table border=0 cellspacing="0" cellpadding="0"><tr><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3208,31-977892,0.html" ><div class="bt-big-off" id="voir_bt_0" onmouseover="voir_on(0)" onmouseout="voir_out(0)">Dessins du jour</div></a></div></td><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3210,31-977667,0.html" ><div class="bt-big-off" id="voir_bt_1" onmouseover="voir_on(1)" onmouseout="voir_out(1)">Portfolio</div></a></div></td><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3244,31-976300,0.html" ><div class="bt-big-off" id="voir_bt_2" onmouseover="voir_on(2)" onmouseout="voir_out(2)">Portfolio</div></a></div></td></tr><tr><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3246,31-977650,0.html" ><div class="bt-big-off" id="voir_bt_3" onmouseover="voir_on(3)" onmouseout="voir_out(3)">Portfolio</div></a></div></td><td><div class="no-underline"><a href="/web/video/0,47-0@2-3210,54-977600,0.html" ><div class="bt-big-off" id="voir_bt_4" onmouseover="voir_on(4)" onmouseout="voir_out(4)">Vidéo</div></a></div></td><td><div class="no-underline"><a href="/web/portfolio/0,12-0@2-3246,31-973772,0.html" ><div class="bt-big-off" id="voir_bt_5" onmouseover="voir_on(5)" onmouseout="voir_out(5)">Portfolio</div></a></div></td></tr><tr><td colspan="3"><div class="content"><div id="voir_content_0" style="display:none;"><a href='/web/portfolio/0,12-0@2-3208,31-977892,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977891_07111419_napo+x1d1_web.jpg width=155 height=103 border=0 alt='Jour de grï¿½ve | ' title='Jour de grï¿½ve | ' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Mercredi 14 novembre 2007</div></a></div><div id="voir_content_1" style="display:none;"><a href='/web/portfolio/0,12-0@2-3210,31-977667,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977657_277794.jpg width=155 height=103 border=0 alt='Un oiseau couvert de pï¿½trole, prï¿½s du port de Kavkaz, le 13 novembre 2007. | AP/SERGEI GRITS' title='Un oiseau couvert de pï¿½trole, prï¿½s du port de Kavkaz, le 13 novembre 2007. | AP/SERGEI GRITS' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Dï¿½but de marï¿½e noire en mer Noire</div></a></div><div id="voir_content_2" style="display:none;"><a href='/web/portfolio/0,12-0@2-3244,31-976300,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/09/v_13_ill_976249_giant_panda1_c_david_sheppard.jpg width=100 height=127 border=0 alt='Le panda gï¿½ant est une espï¿½ce "en danger", selon la classification de l'UICN. | UICN' title='Le panda gï¿½ant est une espï¿½ce "en danger", selon la classification de l'UICN. | UICN' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Six espï¿½ces d'ours sur huit menacï¿½es</div></a></div><div id="voir_content_3" style="display:none;"><a href='/web/portfolio/0,12-0@2-3246,31-977650,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977631_pennac_renaudot.jpg width=155 height=103 border=0 alt='Daniel Pennac, le 5 novembre 2007 ï¿½ Paris. | AP' title='Daniel Pennac, le 5 novembre 2007 ï¿½ Paris. | AP' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Les prix littï¿½raires 2007</div></a></div><div id="voir_content_4" style="display:none;"><a href='/web/video/0,47-0@2-3210,54-977600,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_12_ill_977551_policemangun_282546.jpg width=155 height=103 border=0 alt='Des milliers de policiers anti-ï¿½meutes bloquaient mardi 13 novembre toutes les routes menant ï¿½ un quartier de Lahore, oï¿½ Mme Bhutto sï¿½journe actuellement. Les policiers ont pris position derriï¿½re les vï¿½hicules et une rangï¿½e de barriï¿½res en mï¿½tal coiffï¿½es de fil barbelï¿½. La maison d'un dï¿½putï¿½ de son parti dans laquelle sï¿½journe Mme Bhutto n'ï¿½tait pas visible au-delï¿½ du pï¿½rimï¿½tre de sï¿½curitï¿½. | AFP/Arif Ali' title='Des milliers de policiers anti-ï¿½meutes bloquaient mardi 13 novembre toutes les routes menant ï¿½ un quartier de Lahore, oï¿½ Mme Bhutto sï¿½journe actuellement. Les policiers ont pris position derriï¿½re les vï¿½hicules et une rangï¿½e de barriï¿½res en mï¿½tal coiffï¿½es de fil barbelï¿½. La maison d'un dï¿½putï¿½ de son parti dans laquelle sï¿½journe Mme Bhutto n'ï¿½tait pas visible au-delï¿½ du pï¿½rimï¿½tre de sï¿½curitï¿½. | AFP/Arif Ali' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>La rï¿½sidence de Mme Bhutto encerclï¿½e par la police</div></a></div><div id="voir_content_5" style="display:none;"><a href='/web/portfolio/0,12-0@2-3246,31-973772,0.html' ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/02/h_12_ill_973776_cambodge.jpg width=155 height=103 border=0 alt=' | Mark Remissa/Photoquai' title=' | Mark Remissa/Photoquai' style="float:left; margin-right:5px;margin-bottom:3px;" vspace=4 hspace=1><div class=lien>Photoquai, premiï¿½re biennale des images du monde ï¿½ Paris</div></a></div></div></td></tr></table></div></div> <script language="JavaScript">  - - + + <div class="pg-dte"> <div class="header-bg"><a href="/web/sequence/0,2-823448,1-0,0.html"><div class="header-arrow"><div class="header-txt">POLITIQUE</div></div></a></div><div class="box-no-pad" style="text-align:center;padding-top:2px;padding-bottom:2px;"><div style="text-align:left;font: 11px/15px verdana, sans-serif; color: #222222;"> <img src="http://medias.lemonde.fr/medias/image_article/drapeau.gif" alt="Politique" title="Politique" style="float: left; margin-right: 5px;" border="0" height="58" width="87"></a> <a href="http://www.lemonde.fr/web/sequence/0,2-823448,1-0,0.html"><font class="type">TOUTE L'ACTUALITÉ POLITIQUE</font></a><br> - <a href="http://www.lemonde.fr/web/sequence/0,2-823448,1-0,0.html">Suivez l'actualité politique au quotidien</a><br> -L'info en continu, portraits, chats, vidéos, suivi complet du Web.<br> + <a href="http://www.lemonde.fr/web/sequence/0,2-823448,1-0,0.html">Suivez l'actualitï¿½ politique au quotidien</a><br> +L'info en continu, portraits, chats, vidï¿½os, suivi complet du Web.<br> <span class="type-gr">Fil RSS</span><a href="http://www.lemonde.fr/rss/fil/0,57-0,64-823353,0.xml"> Recevez l'actu politique en continu</a><br> - <div style="clear:both;"></div> + <div style="clear:both;"></div> </div> </div><div class="box"> <table cellpadding=0 cellspacing=0 border=0> <tr valign=top> - + <td width=91> - <a href="/web/article/0,1-0@2-823448,36-977722,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_1_ill_977917_flosse.jpg width=87 height=58 border=0 alt='Le secrétaire d'Etat chargé de l'Outre-Mer, Christian Estrosi, s'entretient avec le sénateur UMP Gaston Flosse, le 31 Octobre 2007 à Papeete, lors d'une visite officielle dans la région. | AFP/GREGORY BOISSY' title='Le secrétaire d'Etat chargé de l'Outre-Mer, Christian Estrosi, s'entretient avec le sénateur UMP Gaston Flosse, le 31 Octobre 2007 à Papeete, lors d'une visite officielle dans la région. | AFP/GREGORY BOISSY' ></a> + <a href="/web/article/0,1-0@2-823448,36-977722,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/13/h_1_ill_977917_flosse.jpg width=87 height=58 border=0 alt='Le secrï¿½taire d'Etat chargï¿½ de l'Outre-Mer, Christian Estrosi, s'entretient avec le sï¿½nateur UMP Gaston Flosse, le 31 Octobre 2007 ï¿½ Papeete, lors d'une visite officielle dans la rï¿½gion. | AFP/GREGORY BOISSY' title='Le secrï¿½taire d'Etat chargï¿½ de l'Outre-Mer, Christian Estrosi, s'entretient avec le sï¿½nateur UMP Gaston Flosse, le 31 Octobre 2007 ï¿½ Papeete, lors d'une visite officielle dans la rï¿½gion. | AFP/GREGORY BOISSY' ></a> </td> <td> <div class=type-gr>Les faits</div> - <a href="/web/article/0,1-0@2-823448,36-977722,0.html" >Divorce entre M. Flosse et le gouvernement sur la réforme de la Polynésie</a><br> + <a href="/web/article/0,1-0@2-823448,36-977722,0.html" >Divorce entre M. Flosse et le gouvernement sur la rï¿½forme de la Polynï¿½sie</a><br> </td> </tr> <tr> <td colspan=2> - - <div class=lien><span class=type-gr>Pratique</span> <a href="/web/article/0,1-0@2-823448,36-977710,0.html" >Les lignes de TGV et le métro parisien seront très perturbés</a></div> - - <div class=lien><span class=type-gr>Radiozapping </span> <a href="/web/panorama/0,11-0@2-3236,32-977215,0.html" >"La grève, c'est aussi la fête !" </a></div> - + + <div class=lien><span class=type-gr>Pratique</span> <a href="/web/article/0,1-0@2-823448,36-977710,0.html" >Les lignes de TGV et le mï¿½tro parisien seront trï¿½s perturbï¿½s</a></div> + + <div class=lien><span class=type-gr>Radiozapping </span> <a href="/web/panorama/0,11-0@2-3236,32-977215,0.html" >"La grï¿½ve, c'est aussi la fï¿½te !" </a></div> + </td> </tr> </table> - </div> <div class="box"> + </div> <div class="box"> <table border="0" cellpadding="0" cellspacing="0"> <tbody> <tr valign="top"> - + <td width="91"> <a href="http://www.lemonde.fr/web/articleinteractif/0,41-0@2-823448,49-974593,0.html"><img src="http://medias.lemonde.fr/mmpub/edt/ill/2007/10/18/h_1_ill_968199_ratp_242853.jpg" alt="Pratique" title="Pratique" border="0" height="58" width="87"></a> </td> - + <td> - <div class="type-gr">Les clés</div> - <a href="http://www.lemonde.fr/web/articleinteractif/0,41-0@2-823448,49-974593,0.html">Les mouvements de grève prévus en novembre</a><br> + <div class="type-gr">Les clï¿½s</div> + <a href="http://www.lemonde.fr/web/articleinteractif/0,41-0@2-823448,49-974593,0.html">Les mouvements de grï¿½ve prï¿½vus en novembre</a><br> </td> </tr> </tbody> </table> -</div> +</div> </div> - - + + <div class="pg-dte"> <div class="header-bg"><a href="/web/sequence/0,2-3504,1-0,0.html"><div class="header-arrow"><div class="header-txt">TALENTS.FR</div></div></a></div><div class="box">Les offres d'emploi, les informations et les chiffres. </div> <div class=box> -<div class=lien><a href="http://www.talents.fr/web/article/0,1-0@2-3504,36-977169@51-821368,0.html" target="_blank">Emploi des handicapés : la fonction publique contrainte de revoir sa copie</div> -<div class=lien><a href="http://www.talents.fr/web/article/0,1-0@2-3504,36-977172@51-821368,0.html" target="_blank">La prévention des risques psychosociaux se développe</a></div> +<div class=lien><a href="http://www.talents.fr/web/article/0,1-0@2-3504,36-977169@51-821368,0.html" target="_blank">Emploi des handicapï¿½s : la fonction publique contrainte de revoir sa copie</div> +<div class=lien><a href="http://www.talents.fr/web/article/0,1-0@2-3504,36-977172@51-821368,0.html" target="_blank">La prï¿½vention des risques psychosociaux se dï¿½veloppe</a></div> </div> -<a href="http://www.talents.fr/web/articleinteractif/0,41-0@2-3506,49-938867@45-3998@51-938868,0.html" onclick="xt_clic('N','testetvous')" target=_blank><img src=http://medias.lemonde.fr/mmpub/img/com/appel-testetvous-326x64.gif border=0></a> +<a href="http://www.talents.fr/web/articleinteractif/0,41-0@2-3506,49-938867@45-3998@51-938868,0.html" onclick="xt_clic('N','testetvous')" target=_blank><img src=http://medias.lemonde.fr/mmpub/img/com/appel-testetvous-326x64.gif border=0></a> </div> - -<div class="pg-dte"> <div class="header-bg"><div class="header-txt">FOCUS</div></div> <table class="focus" cellspacing="0" cellpadding="0" width="326"> <tr><td width="50%" class="foo"><a href="/web/chat/0,46-0@2-3234,55-975818,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2005/06/22/h_1_ill_665026_ent_reserves_050622_reuters.jpg width=87 height=58 border=0 alt='Le baril de pétrole se rapproche du seuil de 100 dollars. | Atef Hassan/Reuters' title='Le baril de pétrole se rapproche du seuil de 100 dollars. | Atef Hassan/Reuters' ></a><br><span class="type-gr">Chat</span><br><a href="/web/chat/0,46-0@2-3234,55-975818,0.html" >Jean-François Gruson : "L'impact de la hausse actuelle du pétrole est moins fort que lors des chocs de 1973 ou 1979"</a></td><td width="50%" class="bar"><a href="/web/article/0,1-0@2-3224,36-977303,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977138_bistouri.jpg width=87 height=58 border=0 alt='"Je voudrais tenter de rétablir la vérité du métier de chirurgien". | GAMMA/CARSON GANCI' title='"Je voudrais tenter de rétablir la vérité du métier de chirurgien". | GAMMA/CARSON GANCI' ></a><br><span class="type-gr">Témoignage</span><br><a href="/web/article/0,1-0@2-3224,36-977303,0.html" >Moi, Laurent S., chirurgien de l'hôpital public</a></td></tr><tr><td width="50%" class="bar"><a href="/web/article/0,1-0@2-3216,36-977304,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2006/02/16/h_1_ill_742198_alang.jpg width=87 height=58 border=0 alt='Des ouvriers du chantier d'Alang, en Inde, le 21 janvier 2006. | AFP/EMMANUEL DUNAND' title='Des ouvriers du chantier d'Alang, en Inde, le 21 janvier 2006. | AFP/EMMANUEL DUNAND' ></a><br><span class="type-gr">Reportage</span><br><a href="/web/article/0,1-0@2-3216,36-977304,0.html" >Inde : les chantiers interdits d'Alang</a></td><td width="50%" class="foo"><a href="/web/article/0,1-0@2-3246,36-977307,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977139_johnny-hallyday.jpg width=87 height=58 border=0 alt='Johnny Hallyday à Paris, le 15 octobre 2007. | GAMMA/PIERRE HOUNSFIELD/EYEDEA PRESSE' title='Johnny Hallyday à Paris, le 15 octobre 2007. | GAMMA/PIERRE HOUNSFIELD/EYEDEA PRESSE' ></a><br><span class="type-gr">Les faits</span><br><a href="/web/article/0,1-0@2-3246,36-977307,0.html" >Johnny Hallyday sort son "album de blues", devenu un enjeu inattendu pour sa carrière</a></td></tr><tr><td width="50%" class="foo"><a href="/web/chat/0,46-0@2-3224,55-966503,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/10/15/h_1_ill_967310_avocats.jpg width=87 height=58 border=0 alt='Des avocats manifestent le 12 octobre 2007 devant le palais de justice de Lille lors de la venue du garde des sceaux, Rachida Dati, et du premier ministre, François Fillon. | AFP/PHILIPPE HUGUEN' title='Des avocats manifestent le 12 octobre 2007 devant le palais de justice de Lille lors de la venue du garde des sceaux, Rachida Dati, et du premier ministre, François Fillon. | AFP/PHILIPPE HUGUEN' ></a><br><span class="type-gr">Chat</span><br><a href="/web/chat/0,46-0@2-3224,55-966503,0.html" >Le réforme de la carte judiciaire "risque d'éloigner le citoyen des tribunaux"</a></td><td width="50%" class="bar"><a href="/web/article/0,1-0@2-3246,36-977312,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/v_5_ill_977140_aff-animal.jpg width=87 height=111 border=0 alt='Affiche de l'exposition "Animal" au Musée Dapper à Paris, jusqu'au 30 mars 2008. | D.R.' title='Affiche de l'exposition "Animal" au Musée Dapper à Paris, jusqu'au 30 mars 2008. | D.R.' ></a><br><span class="type-gr">Critique</span><br><a href="/web/article/0,1-0@2-3246,36-977312,0.html" >Exposition : l'animal en Afrique, puissance surnaturelle</a></td></tr></table></div> - -<div class="pg-dte"> <div class="header-bg"><div class="header-txt">LA PAUSE</div></div> <table class="focus" cellspacing="0" cellpadding="0" width="326"> <tr> <td width="50%" class="pause"><a href="/web/panorama/0,11-0@2-3236,32-977215,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_12_radiozapping155.jpg width=153 height=103 border=0 alt='Le Radiozapping, chaque jour à midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' title='Le Radiozapping, chaque jour à midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' ></a> </td> <td width="50%" class="pause"><a href="/web/vi/0,47-0@2-3546,54-929092,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/06/29/h_12_blog-inter-155.jpg width=155 height=103 border=0 alt='Une carte interactive de blogs d'abonnés du Monde.fr aux quatre coins du monde. | DR' title='Une carte interactive de blogs d'abonnés du Monde.fr aux quatre coins du monde. | DR' ></a> </td> </tr> </table></div> + +<div class="pg-dte"> <div class="header-bg"><div class="header-txt">FOCUS</div></div> <table class="focus" cellspacing="0" cellpadding="0" width="326"> <tr><td width="50%" class="foo"><a href="/web/chat/0,46-0@2-3234,55-975818,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2005/06/22/h_1_ill_665026_ent_reserves_050622_reuters.jpg width=87 height=58 border=0 alt='Le baril de pï¿½trole se rapproche du seuil de 100 dollars. | Atef Hassan/Reuters' title='Le baril de pï¿½trole se rapproche du seuil de 100 dollars. | Atef Hassan/Reuters' ></a><br><span class="type-gr">Chat</span><br><a href="/web/chat/0,46-0@2-3234,55-975818,0.html" >Jean-Franï¿½ois Gruson : "L'impact de la hausse actuelle du pï¿½trole est moins fort que lors des chocs de 1973 ou 1979"</a></td><td width="50%" class="bar"><a href="/web/article/0,1-0@2-3224,36-977303,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977138_bistouri.jpg width=87 height=58 border=0 alt='"Je voudrais tenter de rï¿½tablir la vï¿½ritï¿½ du mï¿½tier de chirurgien". | GAMMA/CARSON GANCI' title='"Je voudrais tenter de rï¿½tablir la vï¿½ritï¿½ du mï¿½tier de chirurgien". | GAMMA/CARSON GANCI' ></a><br><span class="type-gr">Tï¿½moignage</span><br><a href="/web/article/0,1-0@2-3224,36-977303,0.html" >Moi, Laurent S., chirurgien de l'hï¿½pital public</a></td></tr><tr><td width="50%" class="bar"><a href="/web/article/0,1-0@2-3216,36-977304,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2006/02/16/h_1_ill_742198_alang.jpg width=87 height=58 border=0 alt='Des ouvriers du chantier d'Alang, en Inde, le 21 janvier 2006. | AFP/EMMANUEL DUNAND' title='Des ouvriers du chantier d'Alang, en Inde, le 21 janvier 2006. | AFP/EMMANUEL DUNAND' ></a><br><span class="type-gr">Reportage</span><br><a href="/web/article/0,1-0@2-3216,36-977304,0.html" >Inde : les chantiers interdits d'Alang</a></td><td width="50%" class="foo"><a href="/web/article/0,1-0@2-3246,36-977307,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_1_ill_977139_johnny-hallyday.jpg width=87 height=58 border=0 alt='Johnny Hallyday ï¿½ Paris, le 15 octobre 2007. | GAMMA/PIERRE HOUNSFIELD/EYEDEA PRESSE' title='Johnny Hallyday ï¿½ Paris, le 15 octobre 2007. | GAMMA/PIERRE HOUNSFIELD/EYEDEA PRESSE' ></a><br><span class="type-gr">Les faits</span><br><a href="/web/article/0,1-0@2-3246,36-977307,0.html" >Johnny Hallyday sort son "album de blues", devenu un enjeu inattendu pour sa carriï¿½re</a></td></tr><tr><td width="50%" class="foo"><a href="/web/chat/0,46-0@2-3224,55-966503,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/10/15/h_1_ill_967310_avocats.jpg width=87 height=58 border=0 alt='Des avocats manifestent le 12 octobre 2007 devant le palais de justice de Lille lors de la venue du garde des sceaux, Rachida Dati, et du premier ministre, Franï¿½ois Fillon. | AFP/PHILIPPE HUGUEN' title='Des avocats manifestent le 12 octobre 2007 devant le palais de justice de Lille lors de la venue du garde des sceaux, Rachida Dati, et du premier ministre, Franï¿½ois Fillon. | AFP/PHILIPPE HUGUEN' ></a><br><span class="type-gr">Chat</span><br><a href="/web/chat/0,46-0@2-3224,55-966503,0.html" >Le rï¿½forme de la carte judiciaire "risque d'ï¿½loigner le citoyen des tribunaux"</a></td><td width="50%" class="bar"><a href="/web/article/0,1-0@2-3246,36-977312,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/v_5_ill_977140_aff-animal.jpg width=87 height=111 border=0 alt='Affiche de l'exposition "Animal" au Musï¿½e Dapper ï¿½ Paris, jusqu'au 30 mars 2008. | D.R.' title='Affiche de l'exposition "Animal" au Musï¿½e Dapper ï¿½ Paris, jusqu'au 30 mars 2008. | D.R.' ></a><br><span class="type-gr">Critique</span><br><a href="/web/article/0,1-0@2-3246,36-977312,0.html" >Exposition : l'animal en Afrique, puissance surnaturelle</a></td></tr></table></div> + +<div class="pg-dte"> <div class="header-bg"><div class="header-txt">LA PAUSE</div></div> <table class="focus" cellspacing="0" cellpadding="0" width="326"> <tr> <td width="50%" class="pause"><a href="/web/panorama/0,11-0@2-3236,32-977215,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/11/12/h_12_radiozapping155.jpg width=153 height=103 border=0 alt='Le Radiozapping, chaque jour ï¿½ midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' title='Le Radiozapping, chaque jour ï¿½ midi, tout ce qu'il ne fallait pas rater des matinales radio. | Le Monde.fr' ></a> </td> <td width="50%" class="pause"><a href="/web/vi/0,47-0@2-3546,54-929092,0.html" ><img src=http://medias.lemonde.fr/mmpub/edt/ill/2007/06/29/h_12_blog-inter-155.jpg width=155 height=103 border=0 alt='Une carte interactive de blogs d'abonnï¿½s du Monde.fr aux quatre coins du monde. | DR' title='Une carte interactive de blogs d'abonnï¿½s du Monde.fr aux quatre coins du monde. | DR' ></a> </td> </tr> </table></div> <div class="pg-dte"><div class="header-bg"><div class="header-txt">SERVICES</div></div><div class="box"><table border=0 cellspacing="0" cellpadding="0"><tr> -<td><div class="no-underline"><a href="http://www.lemonde.fr/web/meteo/0,31-0,42-355,0.html" onclick="xt_clic('N','Services: Méteo')"><div class="bt-big-off" id="ser_bt_0" onmouseover="ser_on(0)" onmouseout="ser_out(0)">Météo</div></a></div></td> -<td><div class="no-underline"><a href="/web/eco/accueil/0,58-0@2-3234,1-0,0.html?NAV1=MAR&NAV2=ACCUEIL" onclick="xt_clic('N','Services: Marchés')"><div class="bt-big-off" id="ser_bt_1" onmouseover="ser_on(1)" onmouseout="ser_out(1)">Marchés</div></a></div></td> +<td><div class="no-underline"><a href="http://www.lemonde.fr/web/meteo/0,31-0,42-355,0.html" onclick="xt_clic('N','Services: Mï¿½teo')"><div class="bt-big-off" id="ser_bt_0" onmouseover="ser_on(0)" onmouseout="ser_out(0)">Mï¿½tï¿½o</div></a></div></td> +<td><div class="no-underline"><a href="/web/eco/accueil/0,58-0@2-3234,1-0,0.html?NAV1=MAR&NAV2=ACCUEIL" onclick="xt_clic('N','Services: Marchï¿½s')"><div class="bt-big-off" id="ser_bt_1" onmouseover="ser_on(1)" onmouseout="ser_out(1)">Marchés</div></a></div></td> <td><div class="no-underline"><a href="/web/rss/0,48-0,1-0,0.html" onclick="xt_clic('N','Services: RSS')"><div class="bt-big-off" id="ser_bt_2" onmouseover="ser_on(2)" onmouseout="ser_out(2)">RSS & Podcast</div></a></div></td> </tr><tr> <td><div class="no-underline"><a href="/web/inscription/formulaire/1,27-0,1-0,0.html" onclick="xt_clic('N','Services: Newsletters')"><div class="bt-big-off" id="ser_bt_3" onmouseover="ser_on(3)" onmouseout="ser_out(3)">Newsletters</div></a></div></td> @@ -1247,7 +1247,7 @@ L'info en continu, portraits, chats, vid <tr> <td colspan="3"><div class="content"> <div id="ser_content_0" class="service"> - <a href="http://www.lemonde.fr/web/meteo/0,31-0,42-355,0.html"><img src="http://medias.lemonde.fr/mmpub/img/icn/met/gd/18.gif" border="0" alt="Pluie fine. Partiellement ensoleillé. Vif." title="Pluie fine. Partiellement ensoleillé. Vif." style="float:left; margin-right:5px;margin-bottom:3px;" hspace=1></a> <div class="desc"> <a href="http://www.lemonde.fr/web/meteo/0,31-0,42-355,0.html">Paris, France</a><br/> <b>7 °C</b><br/>Pluie fine. Partiellement ensoleillé. Vif. </div></div> + <a href="http://www.lemonde.fr/web/meteo/0,31-0,42-355,0.html"><img src="http://medias.lemonde.fr/mmpub/img/icn/met/gd/18.gif" border="0" alt="Pluie fine. Partiellement ensoleillï¿½. Vif." title="Pluie fine. Partiellement ensoleillï¿½. Vif." style="float:left; margin-right:5px;margin-bottom:3px;" hspace=1></a> <div class="desc"> <a href="http://www.lemonde.fr/web/meteo/0,31-0,42-355,0.html">Paris, France</a><br/> <b>7 ï¿½C</b><br/>Pluie fine. Partiellement ensoleillï¿½. Vif. </div></div> <link type="text/css" rel="stylesheet" href="http://medias.lemonde.fr/mmpub/css/finance_graphcoldroite.css"> <script language="javascript">   -<div class="header-bg"><div class="header-txt">VOTRE AVIS</div></div><div class=box>En ce qui concerne les revendications des manifestants et des grévistes sur les régimes spéciaux de retraite, souhaitez-vous que le gouvernement…<br><br> +<div class="header-bg"><div class="header-txt">VOTRE AVIS</div></div><div class=box>En ce qui concerne les revendications des manifestants et des grï¿½vistes sur les rï¿½gimes spï¿½ciaux de retraite, souhaitez-vous que le gouvernementï¿½<br><br> <script language="javascript"> -function getCookieVal (offset) +function getCookieVal (offset) { var endstr = document.cookie.indexOf (";", offset); if (endstr == -1) endstr = document.cookie.length; - return unescape(document.cookie.substring(offset, endstr)); + return unescape(document.cookie.substring(offset, endstr)); } -function GetCookie (name) +function GetCookie (name) { - var arg = name + "="; + var arg = name + "="; var alen = arg.length; var clen = document.cookie.length; var i = 0; @@ -1547,20 +1547,20 @@ function GetCookie (name) } return null; } -function FixCookieDate (date) +function FixCookieDate (date) { var base = new Date(0); var skew = base.getTime(); // dawn of (Unix) time - should be 0 if (skew > 0) // Except on the Mac - ahead of its time - date.setTime (date.getTime() - skew); -} -function SetCookie (name,value,expires,path,domain,secure) + date.setTime (date.getTime() - skew); +} +function SetCookie (name,value,expires,path,domain,secure) { document.cookie = name + "=" + escape (value) + ((expires) ? "; expires=" + expires.toGMTString() : "") + ((path) ? "; path=" + path : "") + ((domain) ? "; domain=" + domain : "") + - ((secure) ? "; secure" : ""); + ((secure) ? "; secure" : ""); } var nom_cookie="sondage977670"; // Si on n'a pas de cookie, on n'a pas vote @@ -1568,13 +1568,13 @@ if (!GetCookie(nom_cookie)) { var expdate = new Date (); var cookie_domaine = ".lemonde.fr"; FixCookieDate (expdate); // Correct for Mac date bug - call only once for given Date object! - expdate.setTime (expdate.getTime() + 604800000); // On fixe la durée de vie du cookie pour un sondage donné à une semaine + expdate.setTime (expdate.getTime() + 604800000); // On fixe la durï¿½e de vie du cookie pour un sondage donnï¿½ ï¿½ une semaine var nom_cookie="sondage977670"; var path_cookie="/"; - document.write('<form name=form_sond977670 method=post action=http://www-org.lemonde.fr/web/sondage/insertion/1,25-0@2-3208,15-977670,0.html><input type=radio name=num_reponse value=5335>… en tienne compte et modifie ses projets <br><br><input type=radio name=num_reponse value=5336>… ou n'en tienne pas compte et maintienne ses projet<br><br><input type=radio name=num_reponse value=5337>Sans opinion<br><br><div align=center><input type="submit" name="Exprimez-vous" value="Exprimez-vous" class=bouton onclick="javascript:SetCookie(nom_cookie, 1, expdate,path_cookie,cookie_domaine); document.form_sond977670.submit();"></div></form></div>'); + document.write('<form name=form_sond977670 method=post action=http://www-org.lemonde.fr/web/sondage/insertion/1,25-0@2-3208,15-977670,0.html><input type=radio name=num_reponse value=5335>ï¿½ en tienne compte et modifie ses projets <br><br><input type=radio name=num_reponse value=5336>ï¿½ ou n'en tienne pas compte et maintienne ses projet<br><br><input type=radio name=num_reponse value=5337>Sans opinion<br><br><div align=center><input type="submit" name="Exprimez-vous" value="Exprimez-vous" class=bouton onclick="javascript:SetCookie(nom_cookie, 1, expdate,path_cookie,cookie_domaine); document.form_sond977670.submit();"></div></form></div>'); } else { - document.write('… en tienne compte et modifie ses projets .<br><img src=http://medias.lemonde.fr/mmpub/img/bg/x_99.gif height=12 width=74.8> <b>37.4 %</b><br><br>… ou n'en tienne pas compte et maintienne ses projet.<br><img src=http://medias.lemonde.fr/mmpub/img/bg/x_99.gif height=12 width=118.2> <b>59.1 %</b><br><br>Sans opinion.<br><img src=http://medias.lemonde.fr/mmpub/img/bg/x_99.gif height=12 width=7.2> <b>3.6 %</b><br><br><div class=dt>Nombre de votants : 2321</div></div>');} + document.write('ï¿½ en tienne compte et modifie ses projets .<br><img src=http://medias.lemonde.fr/mmpub/img/bg/x_99.gif height=12 width=74.8> <b>37.4 %</b><br><br>ï¿½ ou n'en tienne pas compte et maintienne ses projet.<br><img src=http://medias.lemonde.fr/mmpub/img/bg/x_99.gif height=12 width=118.2> <b>59.1 %</b><br><br>Sans opinion.<br><img src=http://medias.lemonde.fr/mmpub/img/bg/x_99.gif height=12 width=7.2> <b>3.6 %</b><br><br><div class=dt>Nombre de votants : 2321</div></div>');} ; </script> @@ -1634,27 +1634,27 @@ else <td width="323" class="pnav" rowspan=2 > <img src="http://medias.lemonde.fr/mmpub/img/icn/journal.gif" width="75" height="59" border="0" align="right" alt=""> <img src="http://medias.lemonde.fr/mmpub/img/lgo/lemonde.gif" border="0" vspace="2" alt=""><br> - <a href="http://eu.link.decdna.net/n/14763/31113/www.lemonde.fr/9a6886bd0025030000001fa400000000136ef32d0000000000000000000000000000000100/i/c?0&pq=%2fabojournal%2f%3fxtor%3dAL%2d32280017" onclick="xt_clic('N','Monde')" target=_top>» Abonnez-vous au <i>Monde</i> à -60%</a><br><a href="http://www.lemonde.fr/monabo/" onclick="xt_clic('N','Deja abonne au journal')" target=_top>» Déjà abonné au journal</a><br><a href="http://www.lemonde.fr/kiosque" onclick="xt_clic('N','Le journal en kiosque')" target=_top>» Le journal en kiosque</a><br> - </td> + <a href="http://eu.link.decdna.net/n/14763/31113/www.lemonde.fr/9a6886bd0025030000001fa400000000136ef32d0000000000000000000000000000000100/i/c?0&pq=%2fabojournal%2f%3fxtor%3dAL%2d32280017" onclick="xt_clic('N','Monde')" target=_top>» Abonnez-vous au <i>Monde</i> ï¿½ -60%</a><br><a href="http://www.lemonde.fr/monabo/" onclick="xt_clic('N','Deja abonne au journal')" target=_top>» Dï¿½jï¿½ abonnï¿½ au journal</a><br><a href="http://www.lemonde.fr/kiosque" onclick="xt_clic('N','Le journal en kiosque')" target=_top>» Le journal en kiosque</a><br> + </td> </tr> <tr class="pnav" valign=top> <td width="100"> - <a href="http://www.lemonde.fr/web/sequence/0,2-3208,1-0,0.html" onclick="xt_clic('N','A la une')" target=_top>» A la une</a><br><a href="http://abonnes.lemonde.fr/web/desk/0,26-3424,1-0,0.html" onclick="xt_clic('N','Le Desk')" target=_top>» Le Desk</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3232,1-0,0.html" onclick="xt_clic('N','Opinions')" target=_top>» Opinions</a> + <a href="http://www.lemonde.fr/web/sequence/0,2-3208,1-0,0.html" onclick="xt_clic('N','A la une')" target=_top>» A la une</a><br><a href="http://abonnes.lemonde.fr/web/desk/0,26-3424,1-0,0.html" onclick="xt_clic('N','Le Desk')" target=_top>» Le Desk</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3232,1-0,0.html" onclick="xt_clic('N','Opinions')" target=_top>» Opinions</a> </td> <td width="100"> - <a href="http://www.lemonde.fr/web/recherche/1,13-0,1-0,0.html" onclick="xt_clic('N','Archives')" target=_top>» Archives</a><br><a href="http://forums.lemonde.fr" onclick="xt_clic('N','Forums')" target=_top>» Forums</a><br><a href="http://www.lemonde.fr/web/blogs/0,39-0,48-0,0.html" onclick="xt_clic('N','Blogs')" target=_top>» Blogs</a> + <a href="http://www.lemonde.fr/web/recherche/1,13-0,1-0,0.html" onclick="xt_clic('N','Archives')" target=_top>» Archives</a><br><a href="http://forums.lemonde.fr" onclick="xt_clic('N','Forums')" target=_top>» Forums</a><br><a href="http://www.lemonde.fr/web/blogs/0,39-0,48-0,0.html" onclick="xt_clic('N','Blogs')" target=_top>» Blogs</a> </td> <td width="100"> - <a href="http://www.lemonde.fr/web/sequence/0,2-3404,1-0,0.html" onclick="xt_clic('N','Examens')" target=_top>» Examens</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3246,1-0,0.html" onclick="xt_clic('N','Culture')" target=_top>» Culture</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3234,1-0,0.html" onclick="xt_clic('N','Economie')" target=_top>» Economie</a> + <a href="http://www.lemonde.fr/web/sequence/0,2-3404,1-0,0.html" onclick="xt_clic('N','Examens')" target=_top>» Examens</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3246,1-0,0.html" onclick="xt_clic('N','Culture')" target=_top>» Culture</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3234,1-0,0.html" onclick="xt_clic('N','Economie')" target=_top>» Economie</a> </td> <td width="100"> - <a href="http://www.lemonde.fr/web/meteo/0,31-0,42-0,0.html" onclick="xt_clic('N','Meteo')" target=_top>» Météo</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3382,1-0,0.html" onclick="xt_clic('N','Carnet')" target=_top>» Carnet</a><br><a href="http://lemonde.immostreet.com" onclick="xt_clic('N','Immobilier')" target=_top>» Immobilier</a> + <a href="http://www.lemonde.fr/web/meteo/0,31-0,42-0,0.html" onclick="xt_clic('N','Meteo')" target=_top>» Mï¿½tï¿½o</a><br><a href="http://www.lemonde.fr/web/sequence/0,2-3382,1-0,0.html" onclick="xt_clic('N','Carnet')" target=_top>» Carnet</a><br><a href="http://lemonde.immostreet.com" onclick="xt_clic('N','Immobilier')" target=_top>» Immobilier</a> </td> <td width="100"> - <a href="http://www.talents.fr/" onclick="xt_clic('N','Emploi')" target=_top>» Emploi</a><br><a href="http://shop.lemonde.fr" onclick="xt_clic('N','Shopping')" target=_top>» Shopping</a><br><a href="http://nautisme.lemonde.fr" onclick="xt_clic('N','Nautisme')" target=_top>» Nautisme</a> + <a href="http://www.talents.fr/" onclick="xt_clic('N','Emploi')" target=_top>» Emploi</a><br><a href="http://shop.lemonde.fr" onclick="xt_clic('N','Shopping')" target=_top>» Shopping</a><br><a href="http://nautisme.lemonde.fr" onclick="xt_clic('N','Nautisme')" target=_top>» Nautisme</a> </td> <td width="100"> - <a href="http://www.lemonde.fr/web/sequence/0,2-3546,1-0,0.html" onclick="xt_clic('N','Voyages')" target=_top>» Voyages</a><br><a href="http://www.lemonde.fr/web/inscription_newsletter/1,27-0,1-0,0.html" onclick="xt_clic('N','Newsletters')" target=_top>» Newsletters</a><br><a href="http://www.lemonde.fr/web/rss/0,48-0,1-0,0.html" onclick="xt_clic('N','RSS')" target=_top>» RSS</a> + <a href="http://www.lemonde.fr/web/sequence/0,2-3546,1-0,0.html" onclick="xt_clic('N','Voyages')" target=_top>» Voyages</a><br><a href="http://www.lemonde.fr/web/inscription_newsletter/1,27-0,1-0,0.html" onclick="xt_clic('N','Newsletters')" target=_top>» Newsletters</a><br><a href="http://www.lemonde.fr/web/rss/0,48-0,1-0,0.html" onclick="xt_clic('N','RSS')" target=_top>» RSS</a> </td> </tr> </table>  @@ -1693,7 +1693,7 @@ else   -<div class="pd" ><a href="http://www.lemonde.fr/cgi-bin/ACHATS/acheter.cgi?offre=ZOP" target=_top><img src="http://medias.lemonde.fr/mmpub/img/bt/sabonner.gif" border=0 align=absmiddle></a><a href="http://www.lemonde.fr/demo/" target=_top><img src="http://medias.lemonde.fr/mmpub/img/bt/visiter.gif" border=0 align=absmiddle></a> <a href="http://www.lemonde.fr/web/article/0,1-0@2-3388,36-139039,0.html" target=_top>© Le Monde.fr</a> | <a href="http://www.ojd.com/fr/adhchif/adhe_list.php?mode=chif&cat=1784 " target=_top>Fréquentation certifiée par l'OJD</a> | <a href="http://www.lemonde.fr/cgv" target=_top>CGV</a> | <a href="http://www.lemonde.fr/web/article/0,1-0@2-3388,36-875325,0.html" target=_top>Mentions légales</a> | <a href="http://www.lemonde.fr/web/sequence/0,2-3386,1-0,0.html" target=_top>Qui sommes-nous ?</a> | <a href="http://www.lemonde.fr/web/sitemap/0,0-0,1-0,0.html" target=_top>Index</a> | <a href="http://www.lemonde.fr/web/articleinteractif/0,41-0@2-3388,49-625731,0.html" target=_top>Aide</a> </div> +<div class="pd" ><a href="http://www.lemonde.fr/cgi-bin/ACHATS/acheter.cgi?offre=ZOP" target=_top><img src="http://medias.lemonde.fr/mmpub/img/bt/sabonner.gif" border=0 align=absmiddle></a><a href="http://www.lemonde.fr/demo/" target=_top><img src="http://medias.lemonde.fr/mmpub/img/bt/visiter.gif" border=0 align=absmiddle></a> <a href="http://www.lemonde.fr/web/article/0,1-0@2-3388,36-139039,0.html" target=_top>© Le Monde.fr</a>ï¿½| <a href="http://www.ojd.com/fr/adhchif/adhe_list.php?mode=chif&cat=1784 " target=_top>Frï¿½quentation certifiï¿½e par l'OJD</a>ï¿½| <a href="http://www.lemonde.fr/cgv" target=_top>CGV</a>ï¿½| <a href="http://www.lemonde.fr/web/article/0,1-0@2-3388,36-875325,0.html" target=_top>Mentions lï¿½gales</a>ï¿½| <a href="http://www.lemonde.fr/web/sequence/0,2-3386,1-0,0.html" target=_top>Qui sommes-nous ?</a>ï¿½| <a href="http://www.lemonde.fr/web/sitemap/0,0-0,1-0,0.html" target=_top>Index</a>ï¿½| <a href="http://www.lemonde.fr/web/articleinteractif/0,41-0@2-3388,49-625731,0.html" target=_top>Aide</a>ï¿½</div>   @@ -1713,10 +1713,10 @@ var TAG_CHAPITRE = ''; TAG_COMPTAGE="homepage/index"; TAG_SITE="&s2=5"; if (cookie_chap !=null && cookie_chap !="") { - if (cookie_chap !='ABONNE' && cookie_chap != 'QUOTIDIEN') { + if (cookie_chap !='ABONNE' && cookie_chap != 'QUOTIDIEN') { TAG_CHAPITRE = cookie_chap +'::'; TAG_SITE = '&s2=23'; - } + } } hsi = '<img width="1" height="1" src="http://logc2.xiti.com/hit.xiti?s=43260'+TAG_SITE; hsi += '&p='+TAG_CHAPITRE+TAG_COMPTAGE+'&hl=' + hsh.getHours() + 'x' + hsh.getMinutes() + 'x' + hsh.getSeconds(); lib/picolena/templates/spec/test_dirs/indexed/others/lemonde.htm @@ -10,36 +10,36 @@ {\f165\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f497\fswiss\fcharset238\fprq2 Tahoma CE;}{\f498\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f500\fswiss\fcharset161\fprq2 Tahoma Greek;}{\f501\fswiss\fcharset162\fprq2 Tahoma Tur;} {\f502\fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f503\fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f504\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f505\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f506\fswiss\fcharset222\fprq2 Tahoma (Thai);}} {\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; -\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 -\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\s1\ql \fi-432\li432\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx432\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin432\itap0 -\b\f1\fs28\lang1033\langfe1033\kerning28\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 1;}{\s2\ql \fi-576\li576\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx576\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin576\itap0 -\b\i\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 2;}{\s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls11\ilvl2\outlinelevel2\adjustright\rin0\lin720\itap0 -\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 3;}{\s4\ql \fi-864\li864\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx864\aspalpha\aspnum\faauto\ls11\ilvl3\outlinelevel3\adjustright\rin0\lin864\itap0 -\b\f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 4;}{\s5\ql \fi-1008\li1008\ri0\sb240\sa60\widctlpar\jclisttab\tx1008\aspalpha\aspnum\faauto\ls11\ilvl4\outlinelevel4\adjustright\rin0\lin1008\itap0 -\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 5;}{\s6\ql \fi-1152\li1152\ri0\sb240\sa60\widctlpar\jclisttab\tx1152\aspalpha\aspnum\faauto\ls11\ilvl5\outlinelevel5\adjustright\rin0\lin1152\itap0 -\i\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 6;}{\s7\ql \fi-1296\li1296\ri0\sb240\sa60\widctlpar\jclisttab\tx1296\aspalpha\aspnum\faauto\ls11\ilvl6\outlinelevel6\adjustright\rin0\lin1296\itap0 -\f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 7;}{\s8\ql \fi-1440\li1440\ri0\sb240\sa60\widctlpar\jclisttab\tx1440\aspalpha\aspnum\faauto\ls11\ilvl7\outlinelevel7\adjustright\rin0\lin1440\itap0 -\i\f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 8;}{\s9\ql \fi-1584\li1584\ri0\sb240\sa60\widctlpar\jclisttab\tx1584\aspalpha\aspnum\faauto\ls11\ilvl8\outlinelevel8\adjustright\rin0\lin1584\itap0 +\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\s1\ql \fi-432\li432\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx432\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin432\itap0 +\b\f1\fs28\lang1033\langfe1033\kerning28\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 1;}{\s2\ql \fi-576\li576\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx576\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin576\itap0 +\b\i\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 2;}{\s3\ql \fi-720\li720\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls11\ilvl2\outlinelevel2\adjustright\rin0\lin720\itap0 +\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 3;}{\s4\ql \fi-864\li864\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx864\aspalpha\aspnum\faauto\ls11\ilvl3\outlinelevel3\adjustright\rin0\lin864\itap0 +\b\f1\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 4;}{\s5\ql \fi-1008\li1008\ri0\sb240\sa60\widctlpar\jclisttab\tx1008\aspalpha\aspnum\faauto\ls11\ilvl4\outlinelevel4\adjustright\rin0\lin1008\itap0 +\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 5;}{\s6\ql \fi-1152\li1152\ri0\sb240\sa60\widctlpar\jclisttab\tx1152\aspalpha\aspnum\faauto\ls11\ilvl5\outlinelevel5\adjustright\rin0\lin1152\itap0 +\i\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 6;}{\s7\ql \fi-1296\li1296\ri0\sb240\sa60\widctlpar\jclisttab\tx1296\aspalpha\aspnum\faauto\ls11\ilvl6\outlinelevel6\adjustright\rin0\lin1296\itap0 +\f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 7;}{\s8\ql \fi-1440\li1440\ri0\sb240\sa60\widctlpar\jclisttab\tx1440\aspalpha\aspnum\faauto\ls11\ilvl7\outlinelevel7\adjustright\rin0\lin1440\itap0 +\i\f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 8;}{\s9\ql \fi-1584\li1584\ri0\sb240\sa60\widctlpar\jclisttab\tx1584\aspalpha\aspnum\faauto\ls11\ilvl8\outlinelevel8\adjustright\rin0\lin1584\itap0 \b\i\f1\fs18\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 9;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 -\f1\fs18\cf6\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 Body Text;}{\s16\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\cf11\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext16 +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv +\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\f1\fs18\cf6\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 Body Text;}{\s16\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\cf11\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext16 Body Text 3;}{\s17\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\cf6\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 \sbasedon0 \snext17 Body Text 2;}{ \s18\ql \li1440\ri1440\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin1440\lin1440\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext18 Block Text;}{ \s19\ql \fi210\li0\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon15 \snext19 Body Text First Indent;}{ \s20\ql \li283\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext20 Body Text Indent;}{ \s21\ql \fi210\li283\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon17 \snext21 Body Text First Indent 2;}{\s22\ql \li283\ri0\sa120\sl480\slmult1 -\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext22 Body Text Indent 2;}{\s23\ql \li283\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 -\fs16\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext23 Body Text Indent 3;}{\s24\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext22 Body Text Indent 2;}{\s23\ql \li283\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 +\fs16\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext23 Body Text Indent 3;}{\s24\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \ssemihidden caption;}{\s25\ql \li4252\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin4252\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext25 Closing;}{ \s26\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext26 \ssemihidden annotation text;}{ -\s27\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Date;}{\s28\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \cbpat9 -\f36\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext28 \ssemihidden Document Map;}{\s29\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +\s27\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Date;}{\s28\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \cbpat9 +\f36\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext28 \ssemihidden Document Map;}{\s29\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext29 E-mail Signature;}{\s30\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext30 \ssemihidden endnote text;}{ \s31\ql \li2880\ri0\widctlpar\phpg\posxc\posyb\absh-1980\absw7920\dxfrtext180\dfrmtxtx180\dfrmtxty0\aspalpha\aspnum\faauto\adjustright\rin0\lin2880\itap0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext31 envelope address;}{ \s32\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext32 envelope return;}{\s33\ql \li0\ri0\widctlpar -\tqc\tx4536\tqr\tx9072\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext33 footer;}{\s34\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 -\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext34 \ssemihidden footnote text;}{\s35\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\tqc\tx4536\tqr\tx9072\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext33 footer;}{\s34\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext34 \ssemihidden footnote text;}{\s35\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext35 header;}{\s36\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \i\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext36 HTML Address;} {\s37\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext37 HTML Preformatted;}{ \s38\ql \fi-200\li200\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin200\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd \ssemihidden index 1;}{ @@ -56,27 +56,27 @@ Body Text 3;}{\s17\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0 \s49\ql \fi-283\li566\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin566\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext49 List 2;}{ \s50\ql \fi-283\li849\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin849\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext50 List 3;}{ \s51\ql \fi-283\li1132\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1132\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext51 List 4;}{ -\s52\ql \fi-283\li1415\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1415\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext52 List 5;}{\s53\ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360{\*\pn -\pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin360\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext53 \sautoupd List Bullet;}{\s54\ql \fi-360\li643\ri0\widctlpar\jclisttab\tx643{\*\pn -\pnlvlbody\ilvl0\ls2\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin643\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext54 \sautoupd List Bullet 2;}{\s55\ql \fi-360\li926\ri0\widctlpar\jclisttab\tx926{\*\pn +\s52\ql \fi-283\li1415\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1415\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext52 List 5;}{\s53\ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360{\*\pn +\pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin360\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext53 \sautoupd List Bullet;}{\s54\ql \fi-360\li643\ri0\widctlpar\jclisttab\tx643{\*\pn +\pnlvlbody\ilvl0\ls2\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin643\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext54 \sautoupd List Bullet 2;}{\s55\ql \fi-360\li926\ri0\widctlpar\jclisttab\tx926{\*\pn \pnlvlbody\ilvl0\ls3\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls3\adjustright\rin0\lin926\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext55 \sautoupd List Bullet 3;}{\s56\ql \fi-360\li1209\ri0\widctlpar \jclisttab\tx1209{\*\pn \pnlvlbody\ilvl0\ls4\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin1209\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext56 \sautoupd List Bullet 4;}{ -\s57\ql \fi-360\li1492\ri0\widctlpar\jclisttab\tx1492{\*\pn \pnlvlbody\ilvl0\ls5\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1492\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext57 \sautoupd +\s57\ql \fi-360\li1492\ri0\widctlpar\jclisttab\tx1492{\*\pn \pnlvlbody\ilvl0\ls5\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1492\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext57 \sautoupd List Bullet 5;}{\s58\ql \li283\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin283\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext58 List Continue;}{ \s59\ql \li566\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin566\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext59 List Continue 2;}{ \s60\ql \li849\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin849\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext60 List Continue 3;}{ \s61\ql \li1132\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1132\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext61 List Continue 4;}{ -\s62\ql \li1415\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1415\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext62 List Continue 5;}{\s63\ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360{\*\pn -\pnlvlbody\ilvl0\ls6\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls6\adjustright\rin0\lin360\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext63 List Number;}{\s64\ql \fi-360\li643\ri0\widctlpar\jclisttab\tx643{\*\pn -\pnlvlbody\ilvl0\ls7\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls7\adjustright\rin0\lin643\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext64 List Number 2;}{\s65\ql \fi-360\li926\ri0\widctlpar\jclisttab\tx926{\*\pn -\pnlvlbody\ilvl0\ls8\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls8\adjustright\rin0\lin926\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext65 List Number 3;}{\s66\ql \fi-360\li1209\ri0\widctlpar\jclisttab\tx1209{\*\pn -\pnlvlbody\ilvl0\ls9\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls9\adjustright\rin0\lin1209\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext66 List Number 4;}{\s67\ql \fi-360\li1492\ri0\widctlpar\jclisttab\tx1492{\*\pn +\s62\ql \li1415\ri0\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1415\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext62 List Continue 5;}{\s63\ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360{\*\pn +\pnlvlbody\ilvl0\ls6\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls6\adjustright\rin0\lin360\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext63 List Number;}{\s64\ql \fi-360\li643\ri0\widctlpar\jclisttab\tx643{\*\pn +\pnlvlbody\ilvl0\ls7\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls7\adjustright\rin0\lin643\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext64 List Number 2;}{\s65\ql \fi-360\li926\ri0\widctlpar\jclisttab\tx926{\*\pn +\pnlvlbody\ilvl0\ls8\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls8\adjustright\rin0\lin926\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext65 List Number 3;}{\s66\ql \fi-360\li1209\ri0\widctlpar\jclisttab\tx1209{\*\pn +\pnlvlbody\ilvl0\ls9\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls9\adjustright\rin0\lin1209\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext66 List Number 4;}{\s67\ql \fi-360\li1492\ri0\widctlpar\jclisttab\tx1492{\*\pn \pnlvlbody\ilvl0\ls10\pnrnot0\pndec }\aspalpha\aspnum\faauto\ls10\adjustright\rin0\lin1492\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext67 List Number 5;}{\s68\ql \li0\ri0\widctlpar \tx480\tx960\tx1440\tx1920\tx2400\tx2880\tx3360\tx3840\tx4320\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext68 \ssemihidden macro;}{\s69\ql \fi-1134\li1134\ri0\widctlpar\brdrt -\brdrs\brdrw15\brsp20 \brdrl\brdrs\brdrw15\brsp20 \brdrb\brdrs\brdrw15\brsp20 \brdrr\brdrs\brdrw15\brsp20 \aspalpha\aspnum\faauto\adjustright\rin0\lin1134\rtlgutter\itap0 \shading2000 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +\brdrs\brdrw15\brsp20 \brdrl\brdrs\brdrw15\brsp20 \brdrb\brdrs\brdrw15\brsp20 \brdrr\brdrs\brdrw15\brsp20 \aspalpha\aspnum\faauto\adjustright\rin0\lin1134\rtlgutter\itap0 \shading2000 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext69 Message Header;}{\s70\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext70 Normal (Web);}{ -\s71\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext71 Normal Indent;}{\s72\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 -\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Note Heading;}{\s73\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext73 +\s71\ql \li720\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext71 Normal Indent;}{\s72\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Note Heading;}{\s73\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext73 Plain Text;}{\s74\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Salutation;}{ \s75\ql \li4252\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin4252\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext75 Signature;}{ \s76\qc \li0\ri0\sa60\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext76 Subtitle;}{ @@ -92,17 +92,17 @@ Plain Text;}{\s74\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\ \s86\ql \li1000\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1000\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd \ssemihidden toc 6;}{ \s87\ql \li1200\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1200\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd \ssemihidden toc 7;}{ \s88\ql \li1400\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1400\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd \ssemihidden toc 8;}{ -\s89\ql \li1600\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1600\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd \ssemihidden toc 9;}{\*\cs90 \additive \ul\cf2 \sbasedon10 Hyperlink;}{\*\cs91 -\additive \ul\cf12 \sbasedon10 FollowedHyperlink;}{\*\cs92 \additive \sbasedon10 eudoraheader;}{\s93\ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0 \f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext93 HTML Body;}{\*\cs94 \additive -\sbasedon10 page number;}{\s95\ql \fi-1584\li1584\ri0\sb240\sa60\widctlpar\jclisttab\tx1584\aspalpha\aspnum\faauto\ls11\ilvl8\outlinelevel8\adjustright\rin0\lin1584\itap0 \b\i\f1\fs18\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon9 \snext95 +\s89\ql \li1600\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1600\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd \ssemihidden toc 9;}{\*\cs90 \additive \ul\cf2 \sbasedon10 Hyperlink;}{\*\cs91 +\additive \ul\cf12 \sbasedon10 FollowedHyperlink;}{\*\cs92 \additive \sbasedon10 eudoraheader;}{\s93\ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0 \f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext93 HTML Body;}{\*\cs94 \additive +\sbasedon10 page number;}{\s95\ql \fi-1584\li1584\ri0\sb240\sa60\widctlpar\jclisttab\tx1584\aspalpha\aspnum\faauto\ls11\ilvl8\outlinelevel8\adjustright\rin0\lin1584\itap0 \b\i\f1\fs18\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon9 \snext95 nromal;}{\s96\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 \sbasedon0 \snext96 fixed;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0} -{\*\listtable{\list\listtemplateid238311458\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li1492\jclisttab\tx1492\lin1492 }{\listname -;}\listid-132}{\list\listtemplateid1399480858\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li1209\jclisttab\tx1209\lin1209 }{\listname -;}\listid-131}{\list\listtemplateid125368044\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li926\jclisttab\tx926\lin926 }{\listname -;}\listid-130}{\list\listtemplateid-7427840\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li643\jclisttab\tx643\lin643 }{\listname +{\*\listtable{\list\listtemplateid238311458\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li1492\jclisttab\tx1492\lin1492 }{\listname +;}\listid-132}{\list\listtemplateid1399480858\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li1209\jclisttab\tx1209\lin1209 }{\listname +;}\listid-131}{\list\listtemplateid125368044\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li926\jclisttab\tx926\lin926 }{\listname +;}\listid-130}{\list\listtemplateid-7427840\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\fi-360\li643\jclisttab\tx643\lin643 }{\listname ;}\listid-129}{\list\listtemplateid-82277808\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li1492\jclisttab\tx1492\lin1492 } {\listname ;}\listid-128}{\list\listtemplateid-810542932\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li1209 -\jclisttab\tx1209\lin1209 }{\listname ;}\listid-127}{\list\listtemplateid-1997484882\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 +\jclisttab\tx1209\lin1209 }{\listname ;}\listid-127}{\list\listtemplateid-1997484882\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li926\jclisttab\tx926\lin926 }{\listname ;}\listid-126}{\list\listtemplateid-329112990\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;} \f3\fbias0 \fi-360\li643\jclisttab\tx643\lin643 }{\listname ;}\listid-125}{\list\listtemplateid-1135548856\listsimple{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext \'02\'00.;}{\levelnumbers\'01;}\fi-360\li360\jclisttab\tx360\lin360 }{\listname ;}\listid-120}{\list\listtemplateid-256891814\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext @@ -118,33 +118,33 @@ nromal;}{\s96\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\aspalpha\aspnum\ {\listoverride\listid-129\listoverridecount0\ls2}{\listoverride\listid-130\listoverridecount0\ls3}{\listoverride\listid-131\listoverridecount0\ls4}{\listoverride\listid-132\listoverridecount0\ls5}{\listoverride\listid-119\listoverridecount0\ls6} {\listoverride\listid-125\listoverridecount0\ls7}{\listoverride\listid-126\listoverridecount0\ls8}{\listoverride\listid-127\listoverridecount0\ls9}{\listoverride\listid-128\listoverridecount0\ls10}{\listoverride\listid393167707\listoverridecount0\ls11}} {\*\rsidtbl \rsid3212768\rsid3221105\rsid7020582\rsid11021023\rsid15285138}{\*\generator Microsoft Word 11.0.6359;}{\info{\title Beta information}{\author Lars Henrik Morset}{\operator Lars Henrik Morset }{\creatim\yr2005\mo10\dy4\hr9\min29} -{\revtim\yr2005\mo10\dy4\hr9\min29}{\printim\yr2001\mo5\dy9\hr10\min51}{\version2}{\edmins4}{\nofpages1}{\nofwords135}{\nofchars775}{\*\company Morset Sound Development}{\nofcharsws909}{\vern24703}}\margl1417\margr1417\margt1417\margb1417 +{\revtim\yr2005\mo10\dy4\hr9\min29}{\printim\yr2001\mo5\dy9\hr10\min51}{\version2}{\edmins4}{\nofpages1}{\nofwords135}{\nofchars775}{\*\company Morset Sound Development}{\nofcharsws909}{\vern24703}}\margl1417\margr1417\margt1417\margb1417 \widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow0\dgvshow0 \jexpand\viewkind3\viewscale100\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl\rsidroot11021023 \fet0{\*\ftnsep \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 { -\insrsid3221105 \chftnsep -\par }}{\*\ftnsepc \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3221105 \chftnsepc -\par }}{\*\aftnsep \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3221105 \chftnsep -\par }}{\*\aftnsepc \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3221105 \chftnsepc +\insrsid3221105 \chftnsep +\par }}{\*\ftnsepc \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3221105 \chftnsepc +\par }}{\*\aftnsep \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3221105 \chftnsep +\par }}{\*\aftnsepc \pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3221105 \chftnsepc \par }}\sectd \linex0\endnhere\sectdefaultcl\sftnbj {\footer \pard\plain \s33\ql \li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\field{\*\fldinst { -\cs94\insrsid3221105 PAGE }}{\fldrslt {\cs94\lang1024\langfe1024\noproof\insrsid3221105 1}}}{\insrsid3221105 +\cs94\insrsid3221105 PAGE }}{\fldrslt {\cs94\lang1024\langfe1024\noproof\insrsid3221105 1}}}{\insrsid3221105 \par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}} {\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8 -\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\bkmkstart _Toc519138597}{\*\bkmkstart _Toc514039177}{\*\bkmkstart _Toc516296399}{\listtext\pard\plain\s1 -\b\f1\fs28\kerning28\insrsid3212768 \hich\af1\dbch\af0\loch\f1 1\tab}\pard\plain \s1\ql \fi-432\li432\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx432\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin432\itap0\pararsid3212768 +\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\bkmkstart _Toc519138597}{\*\bkmkstart _Toc514039177}{\*\bkmkstart _Toc516296399}{\listtext\pard\plain\s1 +\b\f1\fs28\kerning28\insrsid3212768 \hich\af1\dbch\af0\loch\f1 1\tab}\pard\plain \s1\ql \fi-432\li432\ri0\sb240\sa60\keepn\widctlpar\jclisttab\tx432\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin432\itap0\pararsid3212768 \b\f1\fs28\lang1033\langfe1033\kerning28\cgrid\langnp1033\langfenp1033 {\insrsid3212768 Remaining i}{\insrsid3221105\charrsid3212768 ssues -\par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\insrsid3221105 +\par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\insrsid3221105 \par General: \par }{\insrsid3221105 Small parts are not completed in the Help file documentation. -\par }{\insrsid3212768 +\par }{\insrsid3212768 \par Resampling when limiting the upper frequency of sine sweep give strange effects, this can be fixed by including a lowpass filter. -\par }{\insrsid3221105 +\par }{\insrsid3221105 \par }{\b\insrsid3221105 Room Acoustics \par }{\insrsid3221105 Schroeder curve for 1/3 octave should have negative x-axis to include effects of backwards filtering. -\par -\par Please see }{\field{\*\fldinst {\insrsid3221105 HYPERLINK "http://www.winmls.com" }{\insrsid11021023 {\*\datafield +\par +\par Please see }{\field{\*\fldinst {\insrsid3221105 HYPERLINK "http://www.winmls.com" }{\insrsid11021023 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b02000000170000000f0000007700770077002e00770069006e006d006c0073002e0063006f006d000000e0c9ea79f9bace118c8200aa004ba90b2e00000068007400740070003a002f002f007700770077002e00770069006e006d006c0073002e0063006f006d002f00000000}} }{\fldrslt {\cs90\ul\cf2\insrsid3221105 www.winmls.com}}}{\insrsid3221105 for more information about the software. -\par }{\insrsid3212768 +\par }{\insrsid3212768 \par {\listtext\pard\plain\s1 \b\f1\fs28\kerning28\insrsid3212768 \hich\af1\dbch\af0\loch\f1 2\tab}}\pard\plain \s1\ql \fi-432\li432\ri0\sb240\sa60\keepn\widctlpar \jclisttab\tx432\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin432\itap0\pararsid3212768 \b\f1\fs28\lang1033\langfe1033\kerning28\cgrid\langnp1033\langfenp1033 {\insrsid3212768 Update 1.07 \par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3212768 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 {\*\bkmkend _Toc519138597}{\*\bkmkend _Toc514039177}{\*\bkmkend _Toc516296399} @@ -153,24 +153,24 @@ nromal;}{\s96\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\aspalpha\aspnum\ \jclisttab\tx576\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin576\itap0\pararsid3212768 \b\i\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 New setups \par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3212768 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 G}{\insrsid3212768 o to }{\b\insrsid3212768\charrsid3212768 Setup->Load...}{ \insrsid3212768 }{\insrsid3212768 to load the}{\insrsid3212768 setup}{\insrsid3212768 s described below. -\par +\par \par For measuring standing waves in a room: \par Room Acoustics_ -\par -\par }{\insrsid3212768 For measuring loudness, -\par }{\b\insrsid3212768\charrsid3212768 Level (Noise)_Loudness ISO532B DIN45631}{\b\insrsid3212768 -\par }{\insrsid3212768 +\par +\par }{\insrsid3212768 For measuring loudness, +\par }{\b\insrsid3212768\charrsid3212768 Level (Noise)_Loudness ISO532B DIN45631}{\b\insrsid3212768 +\par }{\insrsid3212768 \par {\listtext\pard\plain\s2 \b\i\f1\insrsid3212768 \hich\af1\dbch\af0\loch\f1 2.2\tab}}\pard\plain \s2\ql \fi-576\li576\ri0\sb240\sa60\keepn\widctlpar \jclisttab\tx576\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin576\itap0\pararsid3212768 \b\i\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 New features \par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3212768 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 Wizard now supports multiple languages. -\par +\par \par Sine sweep can be inverted. -\par +\par \par {\listtext\pard\plain\s2 \b\i\f1\insrsid3212768 \hich\af1\dbch\af0\loch\f1 2.3\tab}}\pard\plain \s2\ql \fi-576\li576\ri0\sb240\sa60\keepn\widctlpar \jclisttab\tx576\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin576\itap0\pararsid3212768 \b\i\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 Bug fixes \par }\pard\plain \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3212768 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\insrsid3212768 Toolbar positioning problem should now be fixed. \par }{\insrsid15285138 If microphone compensation is used, harmonic distortion }{\insrsid3221105 sine sweep measurement}{\insrsid15285138 }{\insrsid3221105 considers this}{\insrsid15285138 . -\par }{\insrsid3221105 +\par }{\insrsid3221105 \par }{\insrsid3212768 Several minor fixes -\par +\par \par }} \ No newline at end of file lib/picolena/templates/spec/test_dirs/indexed/others/nested/ReadMe.rtf @@ -2166,4 +2166,3 @@ ) ) ) - \ No newline at end of file lib/picolena/templates/spec/test_dirs/indexed/others/xor.vee @@ -6,7 +6,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - rails_plugins/globalite/rdoc/classes/ActionView.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -103,7 +103,7 @@ Module <a href="Helpers/NumberHelper.html" class="link">ActionView::Helpers::Num - +  rails_plugins/globalite/rdoc/classes/ActionView/Helpers.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -118,7 +118,7 @@ href="DateHelper.html#M000042">distance_of_time_in_words</a> </div> - +  @@ -133,7 +133,7 @@ href="DateHelper.html#M000042">distance_of_time_in_words</a> <span class="method-name">date_select</span><span class="method-args">(object_name, method, options = {})</span> </a> </div> - + <div class="method-description"> <p> alias_method :orig_date_select, :<a @@ -164,7 +164,7 @@ href="DateHelper.html#M000043">date_select</a> <span class="method-name">datetime_select</span><span class="method-args">(object_name, method, options = {})</span> </a> </div> - + <div class="method-description"> <p> alias_method :orig_datetime_select, :<a @@ -195,7 +195,7 @@ href="DateHelper.html#M000044">datetime_select</a> <span class="method-name">distance_of_time_in_words</span><span class="method-args">(from_time, to_time = 0, include_seconds = false)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000042-source');return false;">[Source]</a></p> @@ -207,7 +207,7 @@ href="DateHelper.html#M000044">datetime_select</a> 12: <span class="ruby-identifier">to_time</span> = <span class="ruby-identifier">to_time</span>.<span class="ruby-identifier">to_time</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">to_time</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:to_time</span>) 13: <span class="ruby-identifier">distance_in_minutes</span> = (((<span class="ruby-identifier">to_time</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">from_time</span>).<span class="ruby-identifier">abs</span>)<span class="ruby-operator">/</span><span class="ruby-value">60</span>).<span class="ruby-identifier">round</span> 14: <span class="ruby-identifier">distance_in_seconds</span> = ((<span class="ruby-identifier">to_time</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">from_time</span>).<span class="ruby-identifier">abs</span>).<span class="ruby-identifier">round</span> -15: +15: 16: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">distance_in_minutes</span> 17: <span class="ruby-keyword kw">when</span> <span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">1</span> 18: <span class="ruby-keyword kw">return</span> (<span class="ruby-identifier">distance_in_minutes</span><span class="ruby-operator">==</span><span class="ruby-value">0</span>) <span class="ruby-operator">?</span> <span class="ruby-identifier">:date_helper_less_than_a_minute</span>.<span class="ruby-identifier">l</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">:date_helper_one_minute</span>.<span class="ruby-identifier">l</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">include_seconds</span> @@ -215,19 +215,19 @@ href="DateHelper.html#M000044">datetime_select</a> 20: <span class="ruby-keyword kw">when</span> <span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">5</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_less_than_x_seconds</span>.<span class="ruby-identifier">l</span> , <span class="ruby-value">5</span> ) 21: <span class="ruby-keyword kw">when</span> <span class="ruby-value">6</span><span class="ruby-operator">..</span><span class="ruby-value">10</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_less_than_x_seconds</span>.<span class="ruby-identifier">l</span> , <span class="ruby-value">10</span> ) 22: <span class="ruby-keyword kw">when</span> <span class="ruby-value">11</span><span class="ruby-operator">..</span><span class="ruby-value">20</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_less_than_x_seconds</span>.<span class="ruby-identifier">l</span> , <span class="ruby-value">20</span> ) -23: <span class="ruby-keyword kw">when</span> <span class="ruby-value">21</span><span class="ruby-operator">..</span><span class="ruby-value">40</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_half_a_minute</span>.<span class="ruby-identifier">l</span> -24: <span class="ruby-keyword kw">when</span> <span class="ruby-value">41</span><span class="ruby-operator">..</span><span class="ruby-value">59</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_less_than_a_minute</span>.<span class="ruby-identifier">l</span> -25: <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">:date_helper_one_minute</span>.<span class="ruby-identifier">l</span> +23: <span class="ruby-keyword kw">when</span> <span class="ruby-value">21</span><span class="ruby-operator">..</span><span class="ruby-value">40</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_half_a_minute</span>.<span class="ruby-identifier">l</span> +24: <span class="ruby-keyword kw">when</span> <span class="ruby-value">41</span><span class="ruby-operator">..</span><span class="ruby-value">59</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_less_than_a_minute</span>.<span class="ruby-identifier">l</span> +25: <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">:date_helper_one_minute</span>.<span class="ruby-identifier">l</span> 26: <span class="ruby-keyword kw">end</span> -27: +27: 28: <span class="ruby-keyword kw">when</span> <span class="ruby-value">2</span><span class="ruby-operator">..</span><span class="ruby-value">44</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>(<span class="ruby-identifier">:date_helper_x_minutes</span>.<span class="ruby-identifier">l</span>, <span class="ruby-identifier">distance_in_minutes</span>) -29: <span class="ruby-keyword kw">when</span> <span class="ruby-value">45</span><span class="ruby-operator">..</span><span class="ruby-value">89</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_hour</span>.<span class="ruby-identifier">l</span> +29: <span class="ruby-keyword kw">when</span> <span class="ruby-value">45</span><span class="ruby-operator">..</span><span class="ruby-value">89</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_hour</span>.<span class="ruby-identifier">l</span> 30: <span class="ruby-keyword kw">when</span> <span class="ruby-value">90</span><span class="ruby-operator">..</span><span class="ruby-value">1439</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_x_hours</span>.<span class="ruby-identifier">l</span> , (<span class="ruby-identifier">distance_in_minutes</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">/</span> <span class="ruby-value">60.0</span>).<span class="ruby-identifier">round</span> ) -31: <span class="ruby-keyword kw">when</span> <span class="ruby-value">1440</span><span class="ruby-operator">..</span><span class="ruby-value">2879</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_day</span>.<span class="ruby-identifier">l</span> +31: <span class="ruby-keyword kw">when</span> <span class="ruby-value">1440</span><span class="ruby-operator">..</span><span class="ruby-value">2879</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_day</span>.<span class="ruby-identifier">l</span> 32: <span class="ruby-keyword kw">when</span> <span class="ruby-value">2880</span><span class="ruby-operator">..</span><span class="ruby-value">43199</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_x_days</span>.<span class="ruby-identifier">l</span> , (<span class="ruby-identifier">distance_in_minutes</span> <span class="ruby-operator">/</span> <span class="ruby-value">1440</span>).<span class="ruby-identifier">round</span> ) -33: <span class="ruby-keyword kw">when</span> <span class="ruby-value">43200</span><span class="ruby-operator">..</span><span class="ruby-value">86399</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_month</span>.<span class="ruby-identifier">l</span> +33: <span class="ruby-keyword kw">when</span> <span class="ruby-value">43200</span><span class="ruby-operator">..</span><span class="ruby-value">86399</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_month</span>.<span class="ruby-identifier">l</span> 34: <span class="ruby-keyword kw">when</span> <span class="ruby-value">86400</span><span class="ruby-operator">..</span><span class="ruby-value">525959</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_x_months</span>.<span class="ruby-identifier">l</span> , (<span class="ruby-identifier">distance_in_minutes</span> <span class="ruby-operator">/</span> <span class="ruby-value">43200</span>).<span class="ruby-identifier">round</span> ) -35: <span class="ruby-keyword kw">when</span> <span class="ruby-value">525960</span><span class="ruby-operator">..</span><span class="ruby-value">1051919</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_year</span>.<span class="ruby-identifier">l</span> +35: <span class="ruby-keyword kw">when</span> <span class="ruby-value">525960</span><span class="ruby-operator">..</span><span class="ruby-value">1051919</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">:date_helper_one_year</span>.<span class="ruby-identifier">l</span> 36: <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">format</span>( <span class="ruby-identifier">:date_helper_x_years</span>.<span class="ruby-identifier">l</span> , (<span class="ruby-identifier">distance_in_minutes</span> <span class="ruby-operator">/</span> <span class="ruby-value">525960</span>).<span class="ruby-identifier">round</span> ) 37: <span class="ruby-keyword kw">end</span> 38: <span class="ruby-keyword kw">end</span> @@ -244,7 +244,7 @@ href="DateHelper.html#M000044">datetime_select</a> <span class="method-name">select_month</span><span class="method-args">(date, options = {})</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000045-source');return false;">[Source]</a></p> @@ -269,7 +269,7 @@ href="DateHelper.html#M000044">datetime_select</a> 109: <span class="ruby-keyword kw">else</span> 110: <span class="ruby-identifier">month_names</span>[<span class="ruby-identifier">month_number</span>] 111: <span class="ruby-keyword kw">end</span> -112: +112: 113: <span class="ruby-identifier">month_options</span> <span class="ruby-operator"><<</span> ((<span class="ruby-identifier">val</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">month_number</span>) <span class="ruby-operator">?</span> 114: <span class="ruby-node">%(<option value="#{month_number}" selected="selected">#{month_name}</option>\n)</span> <span class="ruby-operator">:</span> 115: <span class="ruby-node">%(<option value="#{month_number}">#{month_name}</option>\n)</span> rails_plugins/globalite/rdoc/classes/ActionView/Helpers/DateHelper.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -95,7 +95,7 @@ - +  @@ -110,7 +110,7 @@ <span class="method-name">country_options_for_select</span><span class="method-args">(selected = nil, priority_countries = nil)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000040-source');return false;">[Source]</a></p> @@ -119,18 +119,18 @@ <span class="ruby-comment cmt"># File lib/rails/localized_action_view.rb, line 127</span> 127: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">country_options_for_select</span>(<span class="ruby-identifier">selected</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">priority_countries</span> = <span class="ruby-keyword kw">nil</span>) 128: <span class="ruby-identifier">country_options</span> = <span class="ruby-value str">""</span> -129: +129: 130: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">priority_countries</span> 131: <span class="ruby-identifier">country_options</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">options_for_select</span>(<span class="ruby-identifier">priority_countries</span>, <span class="ruby-identifier">selected</span>) 132: <span class="ruby-identifier">country_options</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">"<option value=\"\">-------------</option>\n"</span> 133: <span class="ruby-keyword kw">end</span> -134: +134: 135: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">priority_countries</span> <span class="ruby-operator">&&</span> <span class="ruby-identifier">priority_countries</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">selected</span>) 136: <span class="ruby-identifier">country_options</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">options_for_select</span>(<span class="ruby-identifier">:countries_list</span>.<span class="ruby-identifier">l</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">priority_countries</span>, <span class="ruby-identifier">selected</span>) 137: <span class="ruby-keyword kw">else</span> 138: <span class="ruby-identifier">country_options</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">options_for_select</span>(<span class="ruby-identifier">:countries_list</span>.<span class="ruby-identifier">l</span>, <span class="ruby-identifier">selected</span>) 139: <span class="ruby-keyword kw">end</span> -140: +140: 141: <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">country_options</span> 142: <span class="ruby-keyword kw">end</span> </pre> rails_plugins/globalite/rdoc/classes/ActionView/Helpers/FormOptionsHelper.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -108,7 +108,7 @@ </div> - +  @@ -123,7 +123,7 @@ <span class="method-name">number_to_currency</span><span class="method-args">(number, options = {})</span> </a> </div> - + <div class="method-description"> <p> modify <a href="NumberHelper.html#M000041">number_to_currency</a> to accept @@ -143,10 +143,10 @@ modify <a href="NumberHelper.html#M000041">number_to_currency</a> to accept 51: <span class="ruby-comment cmt"># end</span> 52: <span class="ruby-comment cmt"># options[:order] ||= [:unit, :number]</span> 53: <span class="ruby-identifier">options</span> = <span class="ruby-identifier">options</span>.<span class="ruby-identifier">stringify_keys</span> -54: +54: 55: <span class="ruby-identifier">precision</span>, <span class="ruby-identifier">unit</span>, <span class="ruby-identifier">separator</span>, <span class="ruby-identifier">delimiter</span> = <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value str">"precision"</span>) { <span class="ruby-value">2</span> }, <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value str">"unit"</span>) { <span class="ruby-value str">"$"</span> }, <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value str">"separator"</span>) { <span class="ruby-value str">"."</span> }, <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value str">"delimiter"</span>) { <span class="ruby-value str">","</span> } 56: <span class="ruby-identifier">separator</span> = <span class="ruby-value str">""</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">precision</span> <span class="ruby-operator">></span> <span class="ruby-value">0</span> -57: +57: 58: <span class="ruby-comment cmt">#add leading space before trailing unit</span> 59: <span class="ruby-identifier">unit</span> = <span class="ruby-value str">" "</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">unit</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-value str">"order"</span>] <span class="ruby-operator">==</span> [<span class="ruby-value str">'number'</span>, <span class="ruby-value str">'unit'</span>] 60: <span class="ruby-identifier">output</span> = <span class="ruby-value str">''</span> rails_plugins/globalite/rdoc/classes/ActionView/Helpers/NumberHelper.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -94,7 +94,7 @@ - +  rails_plugins/globalite/rdoc/classes/ActiveRecord.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -101,7 +101,7 @@ - +  @@ -116,7 +116,7 @@ <span class="method-name">relocalize</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p> Reloads the localization rails_plugins/globalite/rdoc/classes/ActiveRecord/Errors.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -114,7 +114,7 @@ </div> - +  @@ -129,7 +129,7 @@ <span class="method-name">to_sentence</span><span class="method-args">(options = {})</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000003-source');return false;">[Source]</a></p> rails_plugins/globalite/rdoc/classes/Array.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -102,7 +102,7 @@ - +  @@ -115,7 +115,7 @@ <div class="method-heading"> <span class="method-name">l</span><span class="method-args">(format='default')</span> </div> - + <div class="method-description"> <p> Alias for <a href="Date.html#M000009">localize</a> @@ -131,7 +131,7 @@ Alias for <a href="Date.html#M000009">localize</a> <span class="method-name">localize</span><span class="method-args">(format='default')</span> </a> </div> - + <div class="method-description"> <p> Acts the same as strftime, but returns a localized version of the formatted @@ -150,7 +150,7 @@ date string. 43: <span class="ruby-identifier">cc</span> = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">sub</span>(<span class="ruby-regexp re">/^%[EO]?(.)$/o</span>, <span class="ruby-value str">'%\\1'</span>) 44: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">cc</span> 45: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%A'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_day_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">wday</span>] -46: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%a'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_abbr_day_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">wday</span>] +46: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%a'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_abbr_day_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">wday</span>] 47: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%B'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_month_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">mon</span>] 48: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%b'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_abbr_month_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">mon</span>] 49: <span class="ruby-comment cmt">#when '%c'; o << :date_helper_time_formats.l[:default] ? :date_helper_date_formats.l[:default] : strftime('%Y-%m-%d')</span> rails_plugins/globalite/rdoc/classes/Date.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -105,7 +105,7 @@ - +  @@ -120,7 +120,7 @@ <span class="method-name">localize_rails</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000011-source');return false;">[Source]</a></p> rails_plugins/globalite/rdoc/classes/Globalite.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -134,7 +134,7 @@ </table> </div> </div> - +  @@ -149,7 +149,7 @@ <span class="method-name">add_localization_source</span><span class="method-args">(path)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000025-source');return false;">[Source]</a></p> @@ -173,7 +173,7 @@ <span class="method-name">add_reserved_key</span><span class="method-args">(*key)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000032-source');return false;">[Source]</a></p> @@ -194,7 +194,7 @@ <div class="method-heading"> <span class="method-name">add_reserved_keys</span><span class="method-args">(*key)</span> </div> - + <div class="method-description"> <p> Alias for <a href="L10n.html#M000032">add_reserved_key</a> @@ -210,7 +210,7 @@ Alias for <a href="L10n.html#M000032">add_reserved_key</a> <span class="method-name">countries</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000014-source');return false;">[Source]</a></p> @@ -231,7 +231,7 @@ Alias for <a href="L10n.html#M000032">add_reserved_key</a> <div class="method-heading"> <span class="method-name">country</span><span class="method-args">()</span> </div> - + <div class="method-description"> <p> Alias for <a href="L10n.html#M000018">current_country</a> @@ -247,7 +247,7 @@ Alias for <a href="L10n.html#M000018">current_country</a> <span class="method-name">current_country</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000018-source');return false;">[Source]</a></p> @@ -270,7 +270,7 @@ Alias for <a href="L10n.html#M000018">current_country</a> <span class="method-name">current_country=</span><span class="method-args">(country)</span> </a> </div> - + <div class="method-description"> <p> Set the current <a href="L10n.html#M000019">country</a> code (ISO 3166 <a @@ -292,20 +292,20 @@ the <a href="L10n.html#M000019">country</a> will be set as :* 79: <span class="ruby-identifier">load_localization!</span> <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">defined?</span> <span class="ruby-constant">RAILS_ENV</span> <span class="ruby-operator">&&</span> <span class="ruby-constant">RAILS_ENV</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'development'</span> 80: <span class="ruby-identifier">country</span> = <span class="ruby-identifier">country</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">upcase</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">country</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Symbol</span> 81: <span class="ruby-identifier">country</span> = <span class="ruby-identifier">country</span>.<span class="ruby-identifier">upcase</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">country</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">String</span> <span class="ruby-operator">&&</span> <span class="ruby-operator">!</span><span class="ruby-identifier">country</span>.<span class="ruby-identifier">empty?</span> - 82: + 82: 83: <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">"#{current_language}-#{country}"</span>.<span class="ruby-identifier">to_sym</span>) 84: <span class="ruby-ivar">@@current_country</span> = <span class="ruby-identifier">country</span> 85: <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">locale</span><span class="ruby-operator">|</span> <span class="ruby-identifier">locale</span> <span class="ruby-operator">=~</span> <span class="ruby-node">/[a-z][a-z]-#{country.to_s}/</span> } - 86: <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span><span class="ruby-operator">|</span> - 87: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">country</span>.<span class="ruby-identifier">to_s</span>) + 86: <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span><span class="ruby-operator">|</span> + 87: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">country</span>.<span class="ruby-identifier">to_s</span>) 88: <span class="ruby-ivar">@new_language</span> = <span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>)[<span class="ruby-value">0</span>].<span class="ruby-identifier">downcase</span>.<span class="ruby-identifier">to_sym</span> 89: <span class="ruby-keyword kw">end</span> 90: <span class="ruby-keyword kw">end</span> 91: <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@new_language</span> - 92: <span class="ruby-ivar">@@current_language</span> = <span class="ruby-ivar">@new_language</span> - 93: <span class="ruby-ivar">@@current_country</span> = <span class="ruby-identifier">country</span> + 92: <span class="ruby-ivar">@@current_language</span> = <span class="ruby-ivar">@new_language</span> + 93: <span class="ruby-ivar">@@current_country</span> = <span class="ruby-identifier">country</span> 94: <span class="ruby-keyword kw">end</span> - 95: <span class="ruby-keyword kw">else</span> + 95: <span class="ruby-keyword kw">else</span> 96: <span class="ruby-ivar">@@current_country</span> = <span class="ruby-identifier">:*</span> 97: <span class="ruby-keyword kw">end</span> 98: <span class="ruby-constant">Locale</span>.<span class="ruby-identifier">update_session_locale</span> @@ -324,7 +324,7 @@ the <a href="L10n.html#M000019">country</a> will be set as :* <span class="method-name">current_language</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000016-source');return false;">[Source]</a></p> @@ -347,7 +347,7 @@ the <a href="L10n.html#M000019">country</a> will be set as :* <span class="method-name">current_language=</span><span class="method-args">(language)</span> </a> </div> - + <div class="method-description"> <p> Set the current <a href="L10n.html#M000017">language</a> ( ISO 639-1 <a @@ -363,17 +363,17 @@ href="L10n.html#M000017">language</a> <pre> <span class="ruby-comment cmt"># File lib/globalite/l10n.rb, line 54</span> 54: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">current_language=</span>(<span class="ruby-identifier">language</span>) -55: +55: 56: <span class="ruby-identifier">language</span> = <span class="ruby-identifier">language</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">downcase</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">language</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Symbol</span> 57: <span class="ruby-identifier">language</span> = <span class="ruby-identifier">language</span>.<span class="ruby-identifier">downcase</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">language</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">String</span> <span class="ruby-operator">&&</span> <span class="ruby-operator">!</span><span class="ruby-identifier">language</span>.<span class="ruby-identifier">empty?</span> -58: +58: 59: <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@languages</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">language</span>) 60: <span class="ruby-ivar">@@current_language</span> = <span class="ruby-identifier">language</span> 61: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@@locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">"#{language}-#{@@current_country}"</span>.<span class="ruby-identifier">to_sym</span>) 62: <span class="ruby-ivar">@@current_country</span> = <span class="ruby-identifier">:*</span> 63: <span class="ruby-keyword kw">end</span> 64: <span class="ruby-keyword kw">end</span> -65: +65: 66: <span class="ruby-constant">Locale</span>.<span class="ruby-identifier">update_session_locale</span> 67: <span class="ruby-identifier">localize_rails</span> 68: <span class="ruby-ivar">@@current_language</span> @@ -391,7 +391,7 @@ href="L10n.html#M000017">language</a> <span class="method-name">current_locale</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000020-source');return false;">[Source]</a></p> @@ -414,7 +414,7 @@ href="L10n.html#M000017">language</a> <span class="method-name">current_locale=</span><span class="method-args">(locale)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000024-source');return false;">[Source]</a></p> @@ -437,7 +437,7 @@ href="L10n.html#M000017">language</a> <span class="method-name">default_language</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000013-source');return false;">[Source]</a></p> @@ -458,7 +458,7 @@ href="L10n.html#M000017">language</a> <div class="method-heading"> <span class="method-name">l_with_args</span><span class="method-args">(key, args={})</span> </div> - + <div class="method-description"> <p> Alias for <a href="L10n.html#M000030">localize_with_args</a> @@ -472,7 +472,7 @@ Alias for <a href="L10n.html#M000030">localize_with_args</a> <div class="method-heading"> <span class="method-name">language</span><span class="method-args">()</span> </div> - + <div class="method-description"> <p> Alias for <a href="L10n.html#M000016">current_language</a> @@ -488,7 +488,7 @@ Alias for <a href="L10n.html#M000016">current_language</a> <span class="method-name">languages</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000012-source');return false;">[Source]</a></p> @@ -511,7 +511,7 @@ Alias for <a href="L10n.html#M000016">current_language</a> <span class="method-name">load_localization!</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p> Loads ALL the UI localization in memory, I might want to refactor this @@ -525,7 +525,7 @@ href="L10n.html#M000012">languages</a> with 900 strings in each) <span class="ruby-comment cmt"># File lib/globalite/l10n.rb, line 154</span> 154: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">load_localization!</span> 155: <span class="ruby-identifier">reset_l10n_data</span> -156: +156: 157: <span class="ruby-comment cmt"># Load the rails localization</span> 158: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">rails_localization_files</span> 159: <span class="ruby-identifier">rails_localization_files</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">file</span><span class="ruby-operator">|</span> @@ -540,17 +540,17 @@ href="L10n.html#M000012">languages</a> with 900 strings in each) 168: <span class="ruby-keyword kw">end</span> 169: <span class="ruby-ivar">@@languages</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">lang</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@languages</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">lang</span> 170: <span class="ruby-keyword kw">else</span> -171: <span class="ruby-ivar">@@languages</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">lang</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@languages</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">lang</span> +171: <span class="ruby-ivar">@@languages</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">lang</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@languages</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">lang</span> 172: <span class="ruby-ivar">@f_locale</span> = <span class="ruby-node">"#{lang}-*"</span>.<span class="ruby-identifier">to_sym</span> 173: <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@f_locale</span>] = <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@f_locale</span>].<span class="ruby-identifier">merge</span>(<span class="ruby-constant">YAML</span>.<span class="ruby-identifier">load_file</span>(<span class="ruby-identifier">file</span>).<span class="ruby-identifier">symbolize_keys</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@f_locale</span>) 174: <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@f_locale</span>] = <span class="ruby-constant">YAML</span>.<span class="ruby-identifier">load_file</span>(<span class="ruby-identifier">file</span>).<span class="ruby-identifier">symbolize_keys</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@f_locale</span>) 175: <span class="ruby-keyword kw">end</span> 176: <span class="ruby-keyword kw">end</span> 177: <span class="ruby-keyword kw">end</span> -178: +178: 179: <span class="ruby-comment cmt"># Load the UI localization</span> 180: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">ui_localization_files</span> -181: <span class="ruby-identifier">ui_localization_files</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">file</span><span class="ruby-operator">|</span> +181: <span class="ruby-identifier">ui_localization_files</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">file</span><span class="ruby-operator">|</span> 182: <span class="ruby-identifier">lang</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">file</span>, <span class="ruby-value str">'.*'</span>)[<span class="ruby-value">0</span>,<span class="ruby-value">2</span>].<span class="ruby-identifier">downcase</span>.<span class="ruby-identifier">to_sym</span> 183: <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">file</span>, <span class="ruby-value str">'.*'</span>)[<span class="ruby-value">3</span>,<span class="ruby-value">5</span>] 184: <span class="ruby-identifier">country</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">file</span>, <span class="ruby-value str">'.*'</span>)[<span class="ruby-value">3</span>,<span class="ruby-value">5</span>].<span class="ruby-identifier">upcase</span>.<span class="ruby-identifier">to_sym</span> @@ -562,7 +562,7 @@ href="L10n.html#M000012">languages</a> with 900 strings in each) 190: <span class="ruby-ivar">@file_locale</span> = <span class="ruby-node">"#{lang}-#{country}"</span>.<span class="ruby-identifier">to_sym</span> 191: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@file_locale</span>) 192: <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@file_locale</span>] = <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@file_locale</span>].<span class="ruby-identifier">merge</span>(<span class="ruby-constant">YAML</span>.<span class="ruby-identifier">load_file</span>(<span class="ruby-identifier">file</span>).<span class="ruby-identifier">symbolize_keys</span>) -193: <span class="ruby-keyword kw">else</span> +193: <span class="ruby-keyword kw">else</span> 194: <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@file_locale</span>] = <span class="ruby-constant">YAML</span>.<span class="ruby-identifier">load_file</span>(<span class="ruby-identifier">file</span>).<span class="ruby-identifier">symbolize_keys</span> 195: <span class="ruby-keyword kw">end</span> 196: <span class="ruby-keyword kw">end</span> @@ -582,7 +582,7 @@ href="L10n.html#M000012">languages</a> with 900 strings in each) <div class="method-heading"> <span class="method-name">loc</span><span class="method-args">(key, string='__localization_missing__', args={})</span> </div> - + <div class="method-description"> <p> Alias for <a href="L10n.html#M000028">localize</a> @@ -596,7 +596,7 @@ Alias for <a href="L10n.html#M000028">localize</a> <div class="method-heading"> <span class="method-name">locale</span><span class="method-args">()</span> </div> - + <div class="method-description"> <p> Alias for <a href="L10n.html#M000020">current_locale</a> @@ -612,7 +612,7 @@ Alias for <a href="L10n.html#M000020">current_locale</a> <span class="method-name">locales</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000015-source');return false;">[Source]</a></p> @@ -635,7 +635,7 @@ Alias for <a href="L10n.html#M000020">current_locale</a> <span class="method-name">localization_sources</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000026-source');return false;">[Source]</a></p> @@ -658,7 +658,7 @@ Alias for <a href="L10n.html#M000020">current_locale</a> <span class="method-name">localizations</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p> List <a href="L10n.html#M000027">localizations</a> for the current <a @@ -670,12 +670,12 @@ href="L10n.html#M000021">locale</a> <pre> <span class="ruby-comment cmt"># File lib/globalite/l10n.rb, line 117</span> 117: <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">localizations</span> -118: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-constant">Locale</span>.<span class="ruby-identifier">code</span>) +118: <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-constant">Locale</span>.<span class="ruby-identifier">code</span>) 119: <span class="ruby-identifier">locales</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">key</span><span class="ruby-operator">|</span> <span class="ruby-ivar">@t_locale</span> = <span class="ruby-identifier">key</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">"#{@@current_language.to_s}"</span>) } 120: <span class="ruby-ivar">@@locales</span>[<span class="ruby-ivar">@t_locale</span>] <span class="ruby-operator">||</span> {} -121: <span class="ruby-keyword kw">else</span> +121: <span class="ruby-keyword kw">else</span> 122: <span class="ruby-ivar">@@locales</span>[<span class="ruby-constant">Locale</span>.<span class="ruby-identifier">code</span>] <span class="ruby-operator">||</span> {} -123: <span class="ruby-keyword kw">end</span> +123: <span class="ruby-keyword kw">end</span> 124: <span class="ruby-keyword kw">end</span> </pre> </div> @@ -690,7 +690,7 @@ href="L10n.html#M000021">locale</a> <span class="method-name">localize</span><span class="method-args">(key, string='__localization_missing__', args={})</span> </a> </div> - + <div class="method-description"> <p> Returns the translation for the key, a string can be passed to replaced a @@ -720,7 +720,7 @@ missing translation TODO support interpolation of passed arguments <span class="method-name">localize_with_args</span><span class="method-args">(key, args={})</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000030-source');return false;">[Source]</a></p> @@ -743,7 +743,7 @@ missing translation TODO support interpolation of passed arguments <span class="method-name">reset_l10n_data</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000034-source');return false;">[Source]</a></p> @@ -770,7 +770,7 @@ missing translation TODO support interpolation of passed arguments <span class="method-name">interpolate_string</span><span class="method-args">(string, args={})</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000038-source');return false;">[Source]</a></p> @@ -798,7 +798,7 @@ missing translation TODO support interpolation of passed arguments <span class="method-name">rails_localization_files</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p> Rails localization files, doesn‘t support <a @@ -826,7 +826,7 @@ href="L10n.html#M000017">language</a> <span class="method-name">ui_localization_files</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000036-source');return false;">[Source]</a></p> rails_plugins/globalite/rdoc/classes/Globalite/L10n.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -102,7 +102,7 @@ added <a href="Kernel.html#M000046">Boolean</a> function to - +  @@ -117,7 +117,7 @@ added <a href="Kernel.html#M000046">Boolean</a> function to <span class="method-name">Boolean</span><span class="method-args">(string)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000046-source');return false;">[Source]</a></p> rails_plugins/globalite/rdoc/classes/Kernel.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -128,7 +128,7 @@ </table> </div> </div> - +  @@ -143,7 +143,7 @@ <span class="method-name">code</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000006-source');return false;">[Source]</a></p> @@ -166,7 +166,7 @@ <span class="method-name">country</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000005-source');return false;">[Source]</a></p> @@ -189,7 +189,7 @@ <span class="method-name">language</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000004-source');return false;">[Source]</a></p> @@ -212,7 +212,7 @@ <span class="method-name">set_code</span><span class="method-args">(locale= code)</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000007-source');return false;">[Source]</a></p> @@ -220,7 +220,7 @@ <pre> <span class="ruby-comment cmt"># File lib/globalite/locale.rb, line 20</span> 20: <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">set_code</span>(<span class="ruby-identifier">locale</span>= <span class="ruby-identifier">code</span>) -21: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>) <span class="ruby-operator">&&</span> <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">length</span>.<span class="ruby-identifier">between?</span>(<span class="ruby-value">4</span>,<span class="ruby-value">5</span>) <span class="ruby-operator">&&</span> <span class="ruby-constant">Globalite</span>.<span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_sym</span>) +21: <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>) <span class="ruby-operator">&&</span> <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">length</span>.<span class="ruby-identifier">between?</span>(<span class="ruby-value">4</span>,<span class="ruby-value">5</span>) <span class="ruby-operator">&&</span> <span class="ruby-constant">Globalite</span>.<span class="ruby-identifier">locales</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_sym</span>) 22: <span class="ruby-constant">Globalite</span>.<span class="ruby-identifier">current_language</span> = <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>)[<span class="ruby-value">0</span>].<span class="ruby-identifier">downcase</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>)[<span class="ruby-value">0</span>] 23: <span class="ruby-constant">Globalite</span>.<span class="ruby-identifier">current_country</span> = <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>)[<span class="ruby-value">1</span>].<span class="ruby-identifier">upcase</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">locale</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'-'</span>)[<span class="ruby-value">1</span>] 24: <span class="ruby-identifier">set_session_locale</span>(<span class="ruby-node">"#{Globalite.language}-#{Globalite.country}"</span>) @@ -239,7 +239,7 @@ <span class="method-name">update_session_locale</span><span class="method-args">()</span> </a> </div> - + <div class="method-description"> <p><a class="source-toggle" href="#" onclick="toggleCode('M000008-source');return false;">[Source]</a></p> rails_plugins/globalite/rdoc/classes/Locale.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -102,7 +102,7 @@ - +  @@ -115,7 +115,7 @@ <div class="method-heading"> <span class="method-name">l</span><span class="method-args">(format='default')</span> </div> - + <div class="method-description"> <p> Alias for <a href="Time.html#M000001">localize</a> @@ -131,7 +131,7 @@ Alias for <a href="Time.html#M000001">localize</a> <span class="method-name">localize</span><span class="method-args">(format='default')</span> </a> </div> - + <div class="method-description"> <p> Acts the same as strftime, but returns a localized version of the formatted @@ -150,7 +150,7 @@ date/time string. 20: <span class="ruby-identifier">cc</span> = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">sub</span>(<span class="ruby-regexp re">/^%[EO]?(.)$/o</span>, <span class="ruby-value str">'%\\1'</span>) 21: <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">cc</span> 22: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%A'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_day_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">wday</span>] -23: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%a'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_abbr_day_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">wday</span>] +23: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%a'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_abbr_day_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">wday</span>] 24: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%B'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_month_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">mon</span>] 25: <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'%b'</span>; <span class="ruby-identifier">o</span> <span class="ruby-operator"><<</span> <span class="ruby-identifier">:date_helper_abbr_month_names</span>.<span class="ruby-identifier">l</span>[<span class="ruby-identifier">mon</span>] 26: <span class="ruby-comment cmt">#when '%c'; o << :date_helper_time_formats.l[:default] ? :date_helper_date_formats.l[:default] : strftime('%Y-%m-%d')</span> rails_plugins/globalite/rdoc/classes/Time.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -339,7 +339,7 @@ href="http://railsontherun.com/globalite">railsontherun.com/globalite</a> - +  rails_plugins/globalite/rdoc/files/README.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -84,7 +84,7 @@ - +  rails_plugins/globalite/rdoc/files/lib/globalite/l10n_rb.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -84,7 +84,7 @@ - +  rails_plugins/globalite/rdoc/files/lib/globalite/locale_rb.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -102,7 +102,7 @@ Add support for localization keys - +  rails_plugins/globalite/rdoc/files/lib/globalite_rb.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -91,7 +91,7 @@ ruby built-in and standard classes. - +  rails_plugins/globalite/rdoc/files/lib/rails/core_ext_rb.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -84,7 +84,7 @@ - +  rails_plugins/globalite/rdoc/files/lib/rails/localization_rb.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -84,7 +84,7 @@ - +  rails_plugins/globalite/rdoc/files/lib/rails/localized_action_view_rb.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -25,7 +25,7 @@ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -34,10 +34,10 @@ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -84,7 +84,7 @@ - +  rails_plugins/globalite/rdoc/files/lib/rails/localized_active_record_rb.html @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> rails_plugins/globalite/rdoc/fr_class_index.html @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> rails_plugins/globalite/rdoc/fr_file_index.html @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> rails_plugins/globalite/rdoc/fr_method_index.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> rails_plugins/globalite/rdoc/index.html @@ -7,15 +7,15 @@ include ActionView::Helpers::NumberHelper include ActionView::Helpers::FormOptionsHelper describe "when Rails is loaded" do - + before(:each) do Globalite.current_locale = 'en-US' end - + it "should have loaded fr" do Globalite.locales.should include(:"fr-FR") - end - + end + it "should have loaded the rails localization file in English and French" do :error_message_inclusion.l.should == "is not included in the list" Globalite.locale = :"fr-FR" @@ -25,13 +25,13 @@ describe "when Rails is loaded" do Globalite.localizations[:error_message_inclusion].should_not be(nil) :error_message_inclusion.l.should == "n'est pas inclus dans la liste." end - + it "ActiveRecord error messages should be localized in English" do ActiveRecord::Errors.default_error_messages[:confirmation].should include("doesn't match confirmation") Globalite.current_language = :fr ActiveRecord::Errors.default_error_messages[:confirmation].should include("ne correspond pas à la confirmation") end - + it "distance_of_time_in_words should be localized properly" do from = Time.mktime(2004, 3, 6, 21, 41, 18) distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 25)).should == "less than a minute" @@ -40,42 +40,42 @@ describe "when Rails is loaded" do distance_of_time_in_words(from, Time.mktime(2004, 3, 6, 21, 41, 25)).should == "moins d'une minute" distance_of_time_in_words(Time.mktime(2004, 3, 7, 1, 20), from).should == "environ 4 heures" end - + it "currency should be localized" do number_to_currency(123).should == "$123.00" Globalite.current_language = :fr number_to_currency(123).should == "123,00 €" end - + it "should support different locales" do Globalite.current_locale = :"en-US" number_to_currency(123).should == "$123.00" Globalite.current_locale = :"en-UK" number_to_currency(123).should == "£123.00" end - + it "date_select should be localized" do select_day(Time.mktime(2003, 8, 16)).should == %Q(<select id=\"date_day\" name=\"date[day]\">\n<option value=\"1\">1</option>\n<option value=\"2\">2</option>\n<option value=\"3\">3</option>\n<option value=\"4\">4</option>\n<option value=\"5\">5</option>\n<option value=\"6\">6</option>\n<option value=\"7\">7</option>\n<option value=\"8\">8</option>\n<option value=\"9\">9</option>\n<option value=\"10\">10</option>\n<option value=\"11\">11</option>\n<option value=\"12\">12</option>\n<option value=\"13\">13</option>\n<option value=\"14\">14</option>\n<option value=\"15\">15</option>\n<option value=\"16\" selected=\"selected\">16</option>\n<option value=\"17\">17</option>\n<option value=\"18\">18</option>\n<option value=\"19\">19</option>\n<option value=\"20\">20</option>\n<option value=\"21\">21</option>\n<option value=\"22\">22</option>\n<option value=\"23\">23</option>\n<option value=\"24\">24</option>\n<option value=\"25\">25</option>\n<option value=\"26\">26</option>\n<option value=\"27\">27</option>\n<option value=\"28\">28</option>\n<option value=\"29\">29</option>\n<option value=\"30\">30</option>\n<option value=\"31\">31</option>\n</select>\n) - + select_day(Time.mktime(2003, 8, 16), :include_blank => true).should == %Q(<select id="date_day" name="date[day]">\n<option value=""></option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n) select_day(16, :include_blank => true).should == %Q(<select id="date_day" name="date[day]">\n<option value=""></option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n) Globalite.current_language = :fr select_day(Time.mktime(2003, 8, 16)).should == %Q(<select id=\"date_day\" name=\"date[day]\">\n<option value=\"1\">1</option>\n<option value=\"2\">2</option>\n<option value=\"3\">3</option>\n<option value=\"4\">4</option>\n<option value=\"5\">5</option>\n<option value=\"6\">6</option>\n<option value=\"7\">7</option>\n<option value=\"8\">8</option>\n<option value=\"9\">9</option>\n<option value=\"10\">10</option>\n<option value=\"11\">11</option>\n<option value=\"12\">12</option>\n<option value=\"13\">13</option>\n<option value=\"14\">14</option>\n<option value=\"15\">15</option>\n<option value=\"16\" selected=\"selected\">16</option>\n<option value=\"17\">17</option>\n<option value=\"18\">18</option>\n<option value=\"19\">19</option>\n<option value=\"20\">20</option>\n<option value=\"21\">21</option>\n<option value=\"22\">22</option>\n<option value=\"23\">23</option>\n<option value=\"24\">24</option>\n<option value=\"25\">25</option>\n<option value=\"26\">26</option>\n<option value=\"27\">27</option>\n<option value=\"28\">28</option>\n<option value=\"29\">29</option>\n<option value=\"30\">30</option>\n<option value=\"31\">31</option>\n</select>\n) - + end - + it "datetime_select should be localized" do select_datetime(nil, :prefix => "date[first]").should include('January') Globalite.language = :fr select_datetime(nil, :prefix => "date[first]").should include('Janvier') end - + it "the months names and their abbreviations should be localized" do select_month(Time.mktime(2003, 8, 16)).should == %Q(<select id=\"date_month\" name=\"date[month]\">\n<option value=\"1\">January</option>\n<option value=\"2\">February</option>\n<option value=\"3\">March</option>\n<option value=\"4\">April</option>\n<option value=\"5\">May</option>\n<option value=\"6\">June</option>\n<option value=\"7\">July</option>\n<option value=\"8\" selected=\"selected\">August</option>\n<option value=\"9\">September</option>\n<option value=\"10\">October</option>\n<option value=\"11\">November</option>\n<option value=\"12\">December</option>\n</select>\n) Globalite.language = :fr select_month(Time.mktime(2003, 8, 16)).should == %Q(<select id=\"date_month\" name=\"date[month]\">\n<option value=\"1\">Janvier</option>\n<option value=\"2\">Février</option>\n<option value=\"3\">Mars</option>\n<option value=\"4\">Avril</option>\n<option value=\"5\">Mai</option>\n<option value=\"6\">Juin</option>\n<option value=\"7\">Juillet</option>\n<option value=\"8\" selected=\"selected\">Août</option>\n<option value=\"9\">Septembre</option>\n<option value=\"10\">Octobre</option>\n<option value=\"11\">Novembre</option>\n<option value=\"12\">Décembre</option>\n</select>\n) end - + it "the country list should be localized" do expected_en = %Q(<option value=\"Afghanistan\">Afghanistan</option>\n<option value=\"Albania\">Albania</option>\n<option value=\"Algeria\">Algeria</option>\n<option value=\"American Samoa\">American Samoa</option>\n<option value=\"Andorra\">Andorra</option>\n<option value=\"Angola\">Angola</option>\n<option value=\"Anguilla\">Anguilla</option>\n<option value=\"Antarctica\">Antarctica</option>\n<option value=\"Antigua And Barbuda\">Antigua And Barbuda</option>\n<option value=\"Argentina\">Argentina</option>\n<option value=\"Armenia\">Armenia</option>\n<option value=\"Aruba\">Aruba</option>\n<option value=\"Australia\">Australia</option>\n<option value=\"Austria\">Austria</option>\n<option value=\"Azerbaijan\") country_options_for_select.should include(expected_en) @@ -83,7 +83,7 @@ describe "when Rails is loaded" do expected_fr = %Q(<option value=\"Afghanistan\">Afghanistan</option>\n<option value=\"Albanie\">Albanie</option>\n<option value=\"Algérie\">Algérie</option>\n) country_options_for_select.should include(expected_fr) end - + it 'time should be localized' do t = Time.parse('2006-12-25 13:55') t.to_formatted_s(:long).should == 'December 25, 2006 13:55' @@ -93,19 +93,19 @@ describe "when Rails is loaded" do # custom format t.l('%a, %A, %d %b %B %Y %H:%M:%S %p').should == "Lun, Lundi, 25 Déc Décembre 2006 13:55:00 pm" end - + it 'date should be localized' do d = Date.new(2007,05,13) d.l.should == '2007-05-13' Globalite.current_language = :fr d.l(:short).should == '13 Mai' end - + it 'an array to sentence should be localized' do us = ['Heidi', 'Matt'] us.to_sentence.should == 'Heidi and Matt' Globalite.current_language = :fr us.to_sentence.should == 'Heidi et Matt' end - + end \ No newline at end of file rails_plugins/globalite/spec/core_localization_spec.rb @@ -9,39 +9,39 @@ describe "After loading languages, Globalite" do it 'should have loaded en-US spec localization' do Globalite.locales.should include(:"en-US") end - + it 'should have some default translations' do :error_message_exclusion.l.should_not be(nil) Globalite.localize(:welcome_friend).should_not be(nil) end - + it 'should have loaded the Rails localizations' do [:"es-*", :"fr-FR", :"pt-PT", :"en-US", :"it-*", :"es-ES", :"pt-BR", :"en-UK"].each { |locale| Globalite.locales.should include(locale) } [:UK, :US, :ES, :FR, :BR, :PT].each { |country| Globalite.countries.should include(country) } [:en, :es, :fr, :it, :pt].each { |language| Globalite.languages.should include(language) } end - + it 'should have both the UI and the RAILS translations even if a country isn t selected' do Globalite.language = :fr :welcome_friend.l.should_not == "__localization_missing__" :date_helper_one_month.l.should_not == "__localization_missing__" end - + it 'should have a list of unique languages' do Globalite.languages.should be_an_instance_of(Array) Globalite.languages.should == Globalite.languages.uniq end - + it 'should have a list of unique countries' do Globalite.countries.should be_an_instance_of(Array) Globalite.countries.should == Globalite.countries.uniq end - + it 'should have a list of unique locales' do Globalite.locales.should be_an_instance_of(Array) Globalite.locales.should == Globalite.locales.uniq end - + it "should have at least some English localization" do Globalite.languages.should include(:en) end @@ -52,7 +52,7 @@ describe "After loading languages, Globalite" do Globalite.current_country = :FR Globalite.current_country.should == (:FR) end - + it "should be able to switch between existing languages" do Globalite.language = :fr Globalite.locale.should == (:'fr-FR') @@ -60,7 +60,7 @@ describe "After loading languages, Globalite" do Globalite.localize(:welcome_friend).should_not == string Globalite.localize(:welcome_friend).should == "Bienvenue l'ami!" Globalite.localize(:welcome_friend).should_not == "__localization_missing__" - + Globalite.language = :es Globalite.localize(:welcome_friend).should_not == string Globalite.localize(:welcome_friend).should_not == "__localization_missing__" @@ -68,7 +68,7 @@ describe "After loading languages, Globalite" do Globalite.current_language = nil Globalite.localize(:welcome_friend).should_not == string Globalite.localize(:welcome_friend).should_not == "__localization_missing__" - + Globalite.current_language = :en Globalite.current_country = :US Globalite.locales.should include(:"en-US") @@ -99,10 +99,10 @@ describe "After loading languages, Globalite" do Globalite.language = :fr Globalite.locale.should == "fr-*".to_sym Globalite.countries.include?(:XY).should be(false) - + Globalite.country = :XY Globalite.current_locale.should == "fr-*".to_sym - end + end it "should let you assign a valid locale" do Globalite.current_locale = :"fr-*" @@ -112,7 +112,7 @@ describe "After loading languages, Globalite" do it "should auto assign a language if you try to set a country defined in an available locale" do Globalite.current_locale = :"fr-*" Globalite.current_country = :US - Globalite.current_locale.should == "en-US".to_sym + Globalite.current_locale.should == "en-US".to_sym end it "should auto assign a wild card if a country isn't assigned" do @@ -120,10 +120,10 @@ describe "After loading languages, Globalite" do Globalite.current_locale.should == "fr-*".to_sym end - it "should find translations for a locale without country even though there's no generic translation for the language" do + it "should find translations for a locale without country even though there's no generic translation for the language" do Globalite.current_locale = :"fr-*" Globalite.current_language = :en - Globalite.current_language.should == :en + Globalite.current_language.should == :en Globalite.localizations.should_not be {} end @@ -152,14 +152,14 @@ describe "After loading languages, Globalite" do Globalite.add_reserved_key key Globalite.reserved_keys.size.should == 2 end - + it "shouldn't be able to set a unsupported locale" do Locale.set_code :"te-st" Locale.code.should == :"en-*" Locale.set_code 'test' Locale.code.should == :"en-*" end - + end describe "When a non-existent language is set" do @@ -195,11 +195,11 @@ describe "a localization key (in general)" do Globalite.language = :fr Globalite.language = :en Globalite.locale.should == :'en-*' - + :welcome_friend.localize.should == "Welcome mate!" :error_message_exclusion.l.should == "is reserved" end - + it "should return an optional string if the localization is missing" do :unknown_key.l("this is my replacement string").should == "this is my replacement string" end @@ -217,33 +217,33 @@ describe "a localization key (in general)" do :welcome_user.l_with_args({:user => :user.l}).should == "Cher utilisateur, Bienvenue!" :many_args_test.l_with_args({:name => 'Matt', :what => 'déchire', :other => 'Serieusement'}).should == 'Serieusement, Matt vraiment déchire comme une bete ;)' end - + it "should handle localizated pluralization properly" do Globalite.current_language = :fr :simple_pluralization.l.should == "2 erreurs" end - + it "should handle custom pluralization properly" do Globalite.current_language = :fr :pluralization_test.l.should == "Heidi a vu trois 3 chevaux dans le parc" end - + it "should handle pluralization with passed arguments" do Globalite.current_language = :fr :pluralization_with_passed_args.l_with_args({:count => 2}).should == "Heidi a vu trois 2 chevaux dans le parc" end - + end describe "an alternative location with localization files" do before(:all) do Globalite.add_localization_source(File.dirname(__FILE__) + '/lang/rails') end - + it "could be added to the localization source path" do Globalite.load_localization!.should include("/spec/lang/rails/zz.yml") end - + it "should have been loaded properly" do Globalite.languages.should include(:zz) Globalite.locales.should include(:"zz-*") rails_plugins/globalite/spec/l10n_spec.rb @@ -1,14 +1,14 @@ namespace :globalite do namespace :localization do - # Returns a hash with the missing localizations compared to the original locale + # Returns a hash with the missing localizations compared to the original locale def missing_localizations(org_base='en-US') @langs = {} @missing_localizations = {} @l_files = Dir[File.join( RAILS_ROOT, '/lang/ui', '*.yml')] - @l_files.each do |file| + @l_files.each do |file| if YAML.load_file(file) - @langs[File.basename(file, '.*')] = YAML.load_file(file).symbolize_keys + @langs[File.basename(file, '.*')] = YAML.load_file(file).symbolize_keys else p "error with the following file: #{file}, the file might be empty" end @@ -36,11 +36,11 @@ namespace :globalite do @missing_localizations = missing_localizations(@org_base) if @missing_localizations.blank? p 'all localization files are up to date' - else + else @missing_localizations.each_key do |lang| p "#{@missing_localizations[lang].length} translations missing in #{lang}" if @missing_localizations[lang].length > 0 - end - end + end + end end end rails_plugins/globalite/tasks/globalite_tasks.rake @@ -179,8 +179,8 @@ follow the upgrade instructions and run 'script/generate rspec' you'll be fine, step you need to manually go into spec_helper.rb and remove the call to that method (if present - it might not be if you haven't upgraded in a while). -Warning: Implementors of custom formatters. Formatters will now be sent an Example object instead of just a -String for #example_started, #example_passed and #example_failed. In certain scenarios +Warning: Implementors of custom formatters. Formatters will now be sent an Example object instead of just a +String for #example_started, #example_passed and #example_failed. In certain scenarios (Spec::Ui with Spec::Distributed), the formatter must ask the Example for its sequence number instead of keeping track of a sequence number internal to the formatter. Most of you shouldn't need to upgrade your formatters though - the Example#to_s method returns the example name/description, so you should be @@ -220,7 +220,7 @@ able to use the passed Example instance as if it were a String. * Fixed [#11903] config.include with behaviour_type 'hash' does not work * Examples without blocks and pending is now reported with a P instead of a * * Pending blocks that now pass are rendered blue -* New behaviour for after: If an after block raises an error, the other ones will still run instead of bailing at the first. +* New behaviour for after: If an after block raises an error, the other ones will still run instead of bailing at the first. * Made it possible to run spec from RSpec.tmbundle with --drb against a Rails spec_server. * Applied [#11868] Add ability for pending to optionally hold a failing block and to fail when it passes (Patch from Bob Cotton) * Fixed [#11843] watir_behaviour missing from spec_ui gem @@ -344,7 +344,7 @@ This is a bugfix release. * Applied [#10567] Call setup and teardown using before and after callbacks == Version 0.9.2 -This is a quick maintenance release. +This is a quick maintenance release. * Added some website love * Fixed [#10542] reverse predicate matcher syntax @@ -365,13 +365,13 @@ backwards compatibility). This allows you to express specs like this: The command line features four new options that give you more control over what specs are being run and in what order. This can be used to verify that your specs are -independent (by running in opposite order with --reverse). It can also be used to cut +independent (by running in opposite order with --reverse). It can also be used to cut down feedback time by running the most recently modified specs first (--loadby mtime --reverse). Further, --example replaces the old --spec option, and it can now take a file name of -spec names as an alternative to just a spec name. The --format failing_examples:file.txt -option allows you to output an --example compatible file, which makes it possible to only -rerun the specs that failed in the last run. Spec::Rails uses all of these four options +spec names as an alternative to just a spec name. The --format failing_examples:file.txt +option allows you to output an --example compatible file, which makes it possible to only +rerun the specs that failed in the last run. Spec::Rails uses all of these four options by default to optimise your RSpec experience. There is now a simple configuration model. For Spec::Rails, you do something like this: @@ -388,7 +388,7 @@ RSpec's own mock framework. Just put this: Spec::Runner.configure do |config| config.mock_with :mocha end - + or this: Spec::Runner.configure do |config| @@ -457,7 +457,7 @@ See Spec::DSL::Behaviour for more on predicate_matchers * Moved all of the Spec::Rails specs down to the plugins directory - now you can run the specs after you install. * Updated RSpec.tmbundle to the 0.9 syntax and replaced context/specify with describe/it. * Applied [#9232] ActionController::Base#render is sometimes protected (patch from Dan Manges) -* Added --reverse option, allowing contexts/specs to be run in reverse order. +* Added --reverse option, allowing contexts/specs to be run in reverse order. * Added --loadby option, allowing better control over load order for spec files. mtime and file.txt supported. * Implemented [#8696] --order option (see --reverse and --loadby) * Added describe/it as aliases for context/specify - suggestion from Dan North. @@ -485,7 +485,7 @@ This release introduces a new approach to handling expectations using Expression See Upgrade[http://rspec.rubyforge.org/upgrade.html], Spec::Expectations, Spec::Matchers and RELEASE-PLAN for more info. This release also improves the spec command line by adding DRb support and making it possible to -store command line options in a file. This means a more flexible RSpec experience with Rails, +store command line options in a file. This means a more flexible RSpec experience with Rails, Rake and editor plugins like TextMate. It also sports myriad new features, bug fixes, patches and general goodness: @@ -637,7 +637,7 @@ Bug fixes and a couple o' new features. * Added [#6560] controller.session should be available before the action * Added support for should_have_rjs :visual_effect * Different printing and colours for unmet expectations (red) and other exceptions (magenta) -* Simplified method_missing on mock_methods to make it less invasive on partial mocks. +* Simplified method_missing on mock_methods to make it less invasive on partial mocks. == Version 0.7.0 @@ -751,7 +751,7 @@ RSpec on Rails. * Applied [#5065] to support using define_method rather than method_missing to capture expected messages on mocks. Thanks to Eero Saynatkari for the tip that made it work. * Restructured directories and Modules in order to separate rspec into three distinct Modules: Spec::Expectations, Spec::Runner and Spec::Mocks. This will allow us to more easily integrate other mock frameworks and/or allow test/unit users to take advantage of the expectation API. * Applied [#5620] support any boolean method and arbitrary comparisons (5.should_be < 6) (Patch from Mike Williams) - + == Version 0.6.3 This release fixes some minor bugs related to RSpec on Rails @@ -790,7 +790,7 @@ This release makes an official commitment to underscore_syntax (with no more sup * Fixed bug (5292) that caused mock argument matching to fail * Converted ALL tests to use underscore syntax * Fixed all remaining problems with underscores revealed by converting all the tests to underscores -* Enhanced sugar to support combinations of methods (i.e. once.and_return) +* Enhanced sugar to support combinations of methods (i.e. once.and_return) * Simplified helper structure taking advantage of dot/underscore combos (i.e. should.be.an_instance_of, which can be expressed as should be_an_instance_of) * Added support for at_most in mocks * Added support for should_not_receive(:msg) (will be removing should_receive(:msg).never some time soon) @@ -844,7 +844,7 @@ minor enhancements. * Output of various formatters is now flushed - to get more continuous output. == Version 0.5.11 -This release makes test2spec usable with Rails (with some manual steps). +This release makes test2spec usable with Rails (with some manual steps). See http://rspec.rubyforge.org/tools/rails.html for more details * test2spec now correctly translates bodies of helper methods (non- test_*, setup and teardown ones). @@ -1039,7 +1039,7 @@ This release adds some shoulds and improves error reporting == Version 0.1.0 -This is the first preview release of RSpec, a Behaviour-Driven Development library for Ruby +This is the first preview release of RSpec, a Behaviour-Driven Development library for Ruby * Added Rake script with tasks for gems, rdoc etc. * Added an XForge task to make release go easier. rails_plugins/rspec/CHANGES @@ -16,7 +16,7 @@ Spec::Expectations supports setting expectations on your objects so you can do things like: result.should equal(expected_result) - + Spec::Mocks supports creating Mock Objects, Stubs, and adding Mock/Stub behaviour to your existing objects. @@ -58,7 +58,7 @@ Once those are all installed, you should be able to run the suite with the follo * cd .. * rake pre_commit -Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core +Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core and stdlib - with a few exceptions: * The spec command line uses diff-lcs when --diff is specified. rails_plugins/rspec/README @@ -21,7 +21,7 @@ PKG_VERSION = Spec::VERSION::STRING PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_FILES = FileList[ '[A-Z]*', - 'lib/**/*.rb', + 'lib/**/*.rb', 'spec/**/*', 'examples/**/*', 'failing_examples/**/*', rails_plugins/rspec/Rakefile @@ -25,7 +25,7 @@ You'll need to update spec/spec_helper.rb accordingly. You can either just re-generate it: script/generate rspec - + Or modify spec_helper.rb based on the template, which can be found at: vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb \ No newline at end of file rails_plugins/rspec/UPGRADE @@ -1,5 +1,5 @@ # Used just for us to develop rspec with Autotest -# We could symbolic link rspec/vendor/plugins/rspec => rspec/., but +# We could symbolic link rspec/vendor/plugins/rspec => rspec/., but # this leads to a problem with subversion on windows. Autotest # uses Ruby's load path, which contains ".", so this is a workaround # (albeit, an unclean one) rails_plugins/rspec/autotest/discover.rb @@ -3,17 +3,17 @@ require File.dirname(__FILE__) + '/spec_helper' # Run spec w/ -fs to see the output of this file describe "Examples with no descriptions" do - + # description is auto-generated as "should equal(5)" based on the last #should it do 3.should equal(3) 5.should equal(5) end - + it { 3.should be < 5 } - + it { ["a"].should include("a") } - + it { [1,2,3].should respond_to(:size) } - + end rails_plugins/rspec/examples/pure/autogenerated_docstrings_example.rb @@ -10,7 +10,7 @@ describe "State created in before(:all)" do before :each do @isolated = 1 end - + it "should be accessible from example" do @sideeffect.should == 1 $global.should == 1 @@ -32,7 +32,7 @@ describe "State created in before(:all)" do after :each do $global += 1 end - + after :all do $global.should == 3 $global = 0 rails_plugins/rspec/examples/pure/before_and_after_example.rb @@ -9,21 +9,21 @@ def behave_as_musician end module BehaveAsExample - + class BluesGuitarist def read_notes; end def turn_down_amp; end end - + class RockGuitarist def read_notes; end def turn_down_amp; end end - + class ClassicGuitarist def read_notes; end end - + describe BluesGuitarist do it "should behave as guitarist" do BluesGuitarist.new.should behave_as_electric_musician @@ -41,5 +41,5 @@ module BehaveAsExample ClassicGuitarist.new.should behave_as_musician end end - + end rails_plugins/rspec/examples/pure/behave_as_example.rb @@ -3,21 +3,21 @@ module AnimalSpecHelper def initialize(food) @food = food end - + def matches?(animal) @animal = animal @animal.eats?(@food) end - + def failure_message "expected #{@animal} to eat #{@food}, but it does not" end - + def negative_failure_message "expected #{@animal} not to eat #{@food}, but it does" end end - + def eat(food) Eat.new(food) end @@ -29,7 +29,7 @@ module Animals return foods_i_eat.include?(food) end end - + class Mouse < Animal def foods_i_eat [:cheese] @@ -41,11 +41,11 @@ module Animals before(:each) do @mouse = Animals::Mouse.new end - + it "should eat cheese" do @mouse.should eat(:cheese) end - + it "should not eat cat" do @mouse.should_not eat(:cat) end rails_plugins/rspec/examples/pure/custom_expectation_matchers.rb @@ -10,7 +10,7 @@ end if __FILE__ == $0 require File.dirname(__FILE__) + '/io_processor' require 'pathname' - + accessor = FileAccessor.new io_processor = IoProcessor.new file = Pathname.new ARGV[0] rails_plugins/rspec/examples/pure/file_accessor.rb @@ -27,11 +27,11 @@ describe "A FileAccessor" do # These are the primary actor's neighbours, which we mock. file = mock "Pathname" io_processor = mock "IoProcessor" - + io = StringIO.new "whatever" file.should_receive(:open).and_yield io io_processor.should_receive(:process).with(io) - + accessor.open_and_handle_with(file, io_processor) end rails_plugins/rspec/examples/pure/file_accessor_spec.rb @@ -5,7 +5,7 @@ module HelperMethodExample def helper_method "received call" end - + it "should make that method available to specs" do helper_method.should == "received call" end rails_plugins/rspec/examples/pure/helper_method_example.rb @@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper' context "A legacy spec" do setup do end - + specify "should work fine" do end - + teardown do end end rails_plugins/rspec/examples/pure/legacy_spec.rb @@ -4,7 +4,7 @@ class BddFramework def intuitive? true end - + def adopted_quickly? true end @@ -19,7 +19,7 @@ describe "BDD framework" do it "should be adopted quickly" do @bdd_framework.should be_adopted_quickly end - + it "should be intuitive" do @bdd_framework.should be_intuitive end rails_plugins/rspec/examples/pure/predicate_example.rb @@ -6,26 +6,26 @@ module SharedExampleGroupExample "stuff" end end - + class AnotherThing def what_things_do "stuff" end end - + class YetAnotherThing def what_things_do "stuff" end end - + # A SharedExampleGroup is an example group that doesn't get run. # You can create one like this: share_examples_for "most things" do def helper_method "helper method" end - + it "should do what things do" do @thing.what_things_do.should == "stuff" end @@ -37,19 +37,19 @@ module SharedExampleGroupExample def helper_method "helper method" end - + it "should do what things do" do @thing.what_things_do.should == "stuff" end end - + describe OneThing do - # Now you can include the shared example group like this, which + # Now you can include the shared example group like this, which # feels more like what you might say ... it_should_behave_like "most things" - + before(:each) { @thing = OneThing.new } - + it "should have access to helper methods defined in the shared example group" do helper_method.should == "helper method" end @@ -59,7 +59,7 @@ module SharedExampleGroupExample # ... or you can include the example group like this, which # feels more like the programming language we love. it_should_behave_like MostThings - + before(:each) { @thing = AnotherThing.new } it "should have access to helper methods defined in the shared example group" do @@ -71,7 +71,7 @@ module SharedExampleGroupExample # ... or you can include the example group like this, which # feels more like the programming language we love. include MostThings - + before(:each) { @thing = AnotherThing.new } it "should have access to helper methods defined in the shared example group" do rails_plugins/rspec/examples/pure/shared_example_group_example.rb @@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), *%w[spec_helper]) shared_examples_for "non-empty Stack" do it { @stack.should_not be_empty } - + it "should return the top item when sent #peek" do @stack.peek.should == @last_item_added end @@ -12,18 +12,18 @@ shared_examples_for "non-empty Stack" do @stack.peek.should == @last_item_added @stack.peek.should == @last_item_added end - + it "should return the top item when sent #pop" do @stack.pop.should == @last_item_added end - + it "should remove the top item when sent #pop" do @stack.pop.should == @last_item_added unless @stack.empty? @stack.pop.should_not == @last_item_added end end - + end shared_examples_for "non-full Stack" do rails_plugins/rspec/examples/pure/shared_stack_examples.rb @@ -5,26 +5,26 @@ class StackOverflowError < RuntimeError end class Stack - + def initialize @items = [] end - + def push object raise StackOverflowError if @items.length == 10 @items.push object end - + def pop raise StackUnderflowError if @items.empty? @items.delete @items.last end - + def peek raise StackUnderflowError if @items.empty? @items.last end - + def empty? @items.empty? end @@ -32,5 +32,5 @@ class Stack def full? @items.length == 10 end - + end rails_plugins/rspec/examples/pure/stack.rb @@ -6,16 +6,16 @@ describe Stack, " (empty)" do before(:each) do @stack = Stack.new end - + # NOTE that this one auto-generates the description "should be empty" it { @stack.should be_empty } - + it_should_behave_like "non-full Stack" - + it "should complain when sent #peek" do lambda { @stack.peek }.should raise_error(StackUnderflowError) end - + it "should complain when sent #pop" do lambda { @stack.pop }.should raise_error(StackUnderflowError) end @@ -39,7 +39,7 @@ describe Stack, " (with one item less than capacity)" do (1..9).each { |i| @stack.push i } @last_item_added = 9 end - + it_should_behave_like "non-empty Stack" it_should_behave_like "non-full Stack" end @@ -52,12 +52,12 @@ describe Stack, " (full)" do end # NOTE that this one auto-generates the description "should be full" - it { @stack.should be_full } + it { @stack.should be_full } it_should_behave_like "non-empty Stack" it "should complain on #push" do lambda { @stack.push Object.new }.should raise_error(StackOverflowError) end - + end rails_plugins/rspec/examples/pure/stack_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/stack' require File.dirname(__FILE__) + '/shared_stack_examples' describe Stack do - + before(:each) do @stack = Stack.new end @@ -11,13 +11,13 @@ describe Stack do describe "(empty)" do it { @stack.should be_empty } - + it_should_behave_like "non-full Stack" - + it "should complain when sent #peek" do lambda { @stack.peek }.should raise_error(StackUnderflowError) end - + it "should complain when sent #pop" do lambda { @stack.pop }.should raise_error(StackUnderflowError) end @@ -25,7 +25,7 @@ describe Stack do end describe "(with one item)" do - + before(:each) do @stack.push 3 @last_item_added = 3 @@ -37,31 +37,31 @@ describe Stack do end describe "(with one item less than capacity)" do - + before(:each) do (1..9).each { |i| @stack.push i } @last_item_added = 9 end - + it_should_behave_like "non-empty Stack" it_should_behave_like "non-full Stack" end describe "(full)" do - + before(:each) do (1..10).each { |i| @stack.push i } @last_item_added = 10 end - it { @stack.should be_full } + it { @stack.should be_full } it_should_behave_like "non-empty Stack" it "should complain on #push" do lambda { @stack.push Object.new }.should raise_error(StackOverflowError) end - + end end rails_plugins/rspec/examples/pure/stack_spec_with_nested_example_groups.rb @@ -19,7 +19,7 @@ describe "A stubbed method on a class" do StubbableClass.stub!(:find).and_return(:stub_return) StubbableClass.find(1).should equal(:stub_return) end - + it "should revert to the original method after each spec" do StubbableClass.find(1).should equal(:original_return) end @@ -43,7 +43,7 @@ describe "A mock" do mock.stub!(:msg).and_return(:value) (1..10).each {mock.msg.should equal(:value)} end - + it "can stub! and mock" do mock = mock("stubbing mock") mock.stub!(:stub_message).and_return(:stub_value) @@ -52,7 +52,7 @@ describe "A mock" do mock.mock_message.should equal(:mock_value) (1..10).each {mock.stub_message.should equal(:stub_value)} end - + it "can stub! and mock the same message" do mock = mock("stubbing mock") mock.stub!(:msg).and_return(:stub_value) @@ -66,4 +66,4 @@ describe "A mock" do end end - + rails_plugins/rspec/examples/pure/stubbing_example.rb @@ -2,11 +2,11 @@ class Adder def initialize @addends = [] end - + def <<(val) @addends << val end - + def sum @addends.inject(0) { |sum_so_far, val| sum_so_far + val } end rails_plugins/rspec/examples/stories/adder.rb @@ -10,25 +10,25 @@ Story: simple addition Scenario: add one plus one Given an addend of 1 And an addend of 1 - + When the addends are addeds - + Then the sum should be 3 And the corks should be popped - + Scenario: add two plus five Given an addend of 2 And an addend of 5 - + When the addends are added - + Then the sum should be 7 Then it should snow - + Scenario: add three more GivenScenario add two plus five And an addend of 3 - + When the addends are added - + Then the sum should be 10 rails_plugins/rspec/examples/stories/addition @@ -10,7 +10,7 @@ class AdditionMatchers < Spec::Story::StepGroup end end -steps = AdditionMatchers.new do |add| +steps = AdditionMatchers.new do |add| add.then("the sum should be $sum") do |sum| @sum.should == sum.to_i end @@ -34,10 +34,10 @@ Story "addition", %{ When "they are added" Then "the sum should be 5" end - + # This scenario uses GivenScenario, which silently runs # all the steps in a previous scenario. - + Scenario "add 4 more" do GivenScenario "2 + 3" Given "an addend of 4" @@ -52,13 +52,13 @@ class Adder def << addend addends << addend end - + def sum @addends.inject(0) do |result, addend| result + addend.to_i end end - + def addends @addends ||= [] end rails_plugins/rspec/examples/stories/calculator.rb @@ -4,31 +4,31 @@ describe Game do it 'should have a grid' do # given game = Game.new(5, 5) - + # then game.grid.should be_kind_of(Grid) end - + it 'should create a cell' do # given game = Game.new(2, 2) expected_grid = Grid.from_string( 'X. ..' ) - + # when game.create_at(0, 0) - + # then game.grid.should == expected_grid end - + it 'should destroy a cell' do # given game = Game.new(2,2) game.grid = Grid.from_string('X. ..') - + # when game.destroy_at(0,0) - + # then game.grid.should == Grid.from_string('.. ..') end rails_plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb @@ -6,60 +6,60 @@ describe Grid do [0, 0, 0] ] grid = Grid.new(2, 3) - + # when contents = grid.contents - + # then contents.should == expected_contents end - + it 'should compare equal based on its contents' do # given grid1 = Grid.new(2, 3) grid2 = Grid.new(2, 3) - + # then grid1.should == grid2 end - + it 'should be able to replace its contents' do # given grid = Grid.new(2,2) new_contents = [[0,1,0], [1,0,1]] - + # when grid.contents = new_contents - + # then grid.contents.should == new_contents grid.rows.should == 2 grid.columns.should == 3 end - + it 'should add an organism' do # given grid = Grid.new(2, 2) expected = Grid.new(2, 2) expected.contents = [[1,0],[0,0]] - + # when grid.create_at(0,0) - + # then grid.should == expected end - + it 'should create itself from a string' do # given expected = Grid.new 3, 3 expected.create_at(0,0) expected.create_at(1,0) expected.create_at(2,2) - + # when actual = Grid.from_string "X.. X.. ..X" - + # then actual.should == expected end rails_plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb @@ -4,19 +4,19 @@ Story "I can create a cell", %(As a game producer I want to create a cell So that I can show the grid to people), :steps_for => :life do - + Scenario "nothing to see here" do Given "a game with dimensions", 3, 3 do |rows,cols| @game = Game.new(rows,cols) end - + Then "the grid should look like", %( ... ... ... ) end - + Scenario "all on its lonesome" do Given "a game with dimensions", 2, 2 When "I create a cell at", 1, 1 do |row,col| @@ -27,7 +27,7 @@ Story "I can create a cell", .X ) end - + Scenario "the grid has three cells" do Given "a game with dimensions", 3, 3 When "I create a cell at", 0, 0 @@ -39,7 +39,7 @@ Story "I can create a cell", ..X ) end - + Scenario "more cells more more" do GivenScenario "the grid has three cells" When "I create a cell at", 2, 0 rails_plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb @@ -4,9 +4,9 @@ Story 'I can kill a cell', %(As a game producer I want to kill a cell So that when I make a mistake I don't have to start again), :steps_for => :life do - + Scenario "bang, you're dead" do - + Given 'a game that looks like', %( XX. .X. rails_plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb @@ -3,15 +3,15 @@ class Game def initialize(rows,cols) @grid = Grid.new(rows, cols) end - + def create_at(row,col) @grid.create_at(row,col) end - + def destroy_at(row,col) @grid.destroy_at(row, col) end - + def self.from_string(dots) grid = Grid.from_string(dots) game = new(grid.rows, grid.columns) rails_plugins/rspec/examples/stories/game-of-life/life/game.rb @@ -1,36 +1,36 @@ class Grid - + attr_accessor :contents - + def initialize(rows, cols) @contents = [] rows.times do @contents << [0] * cols end end - + def rows @contents.size end - + def columns @contents[0].size end - + def ==(other) self.contents == other.contents end - + def create_at(row,col) @contents[row][col] = 1 end - + def destroy_at(row,col) @contents[row][col] = 0 end - + def self.from_string(str) row_strings = str.split(' ') grid = new(row_strings.size, row_strings[0].size) - + row_strings.each_with_index do |row, row_index| row_chars = row.split(//) row_chars.each_with_index do |col_char, col_index| @@ -39,5 +39,5 @@ class Grid end return grid end - + end rails_plugins/rspec/examples/stories/game-of-life/life/grid.rb @@ -3,17 +3,17 @@ require File.dirname(__FILE__) + '/spec_helper' # Run spec w/ -fs to see the output of this file describe "Failing examples with no descriptions" do - + # description is auto-generated as "should equal(5)" based on the last #should it do 3.should equal(2) 5.should equal(5) end - + it { 3.should be > 5 } - + it { ["a"].should include("b") } - + it { [1,2,3].should_not respond_to(:size) } - + end rails_plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb @@ -1,10 +1,10 @@ describe "This example" do - + before(:each) do NonExistentClass.new end - + it "should be listed as failing in setup" do end - + end rails_plugins/rspec/failing_examples/failure_in_setup.rb @@ -1,10 +1,10 @@ describe "This example" do - + it "should be listed as failing in teardown" do end - + after(:each) do NonExistentClass.new end - + end rails_plugins/rspec/failing_examples/failure_in_teardown.rb @@ -12,7 +12,7 @@ describe "Mocker" do mock = mock("poke me") mock.should_receive(:poke) end - + it "should fail when messages are received out of order" do mock = mock("one two three") mock.should_receive(:one).ordered rails_plugins/rspec/failing_examples/mocking_example.rb @@ -1,17 +1,17 @@ describe "This example" do - + it "should show that a NoMethodError is raised but an Exception was expected" do proc { ''.nonexistent_method }.should raise_error end - + it "should pass" do proc { ''.nonexistent_method }.should raise_error(NoMethodError) end - + it "should show that a NoMethodError is raised but a SyntaxError was expected" do proc { ''.nonexistent_method }.should raise_error(SyntaxError) end - + it "should show that nothing is raised when SyntaxError was expected" do proc { }.should raise_error(SyntaxError) end @@ -19,29 +19,29 @@ describe "This example" do it "should show that a NoMethodError is raised but a Exception was expected" do proc { ''.nonexistent_method }.should_not raise_error end - + it "should show that a NoMethodError is raised" do proc { ''.nonexistent_method }.should_not raise_error(NoMethodError) end - + it "should also pass" do proc { ''.nonexistent_method }.should_not raise_error(SyntaxError) end - + it "should show that a NoMethodError is raised when nothing expected" do proc { ''.nonexistent_method }.should_not raise_error(Exception) end - + it "should show that the wrong message was received" do proc { raise StandardError.new("what is an enterprise?") }.should raise_error(StandardError, "not this") end - + it "should show that the unexpected error/message was thrown" do proc { raise StandardError.new("abc") }.should_not raise_error(StandardError, "abc") end - + it "should pass too" do proc { raise StandardError.new("abc") }.should_not raise_error(StandardError, "xyz") end - + end rails_plugins/rspec/failing_examples/raising_example.rb @@ -22,15 +22,15 @@ class Players end describe "A new team" do - + before(:each) do @team = Team.new end - + it "should have 3 players (failing example)" do @team.should have(3).players end - + it "should include some player (failing example)" do @team.players.should include("Some Player") end @@ -38,7 +38,7 @@ describe "A new team" do it "should include 5 (failing example)" do @team.players.should include(5) end - + it "should have no players" - + end rails_plugins/rspec/failing_examples/team_spec.rb @@ -4,13 +4,13 @@ Autotest.add_hook :initialize do |at| at.clear_mappings # watch out: Ruby bug (1.8.6): # %r(/) != /\// - at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| - filename + at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| + filename } - at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| + at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| ["spec/#{m[1]}_spec.rb"] } - at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { + at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { at.files_matching %r%^spec/.*_spec\.rb$% } end @@ -40,7 +40,7 @@ class Autotest::Rspec < Autotest def make_test_cmd(files_to_test) return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}" end - + def add_options_if_present File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : "" end rails_plugins/rspec/lib/autotest/rspec.rb @@ -22,7 +22,7 @@ module Spec result; \ end attr_writer :run - + def exit?; \ !Object.const_defined?(:Test) || Test::Unit.run?; \ end rails_plugins/rspec/lib/spec.rb @@ -30,11 +30,11 @@ module Spec mock_framework end end - + def mock_framework # :nodoc: @mock_framework ||= mock_framework_path("rspec") end - + # Declares modules to be included in all example groups (<tt>describe</tt> blocks). # # config.include(My::Bottle, My::Cup) @@ -75,7 +75,7 @@ module Spec def predicate_matchers @predicate_matchers ||= {} end - + # Prepends a global <tt>before</tt> block to all example groups. # See #append_before for filtering semantics. def prepend_before(*args, &proc) @@ -135,7 +135,7 @@ module Spec def get_type_from_options(options) options[:type] || options[:behaviour_type] end - + def mock_framework_path(framework_name) File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "plugins", "mock_frameworks", framework_name)) end rails_plugins/rspec/lib/spec/example/configuration.rb @@ -12,13 +12,13 @@ module Spec # # Spec::Example::ExampleGroupFactory.register(:farm, Spec::Farm::Example::FarmExampleGroup) # - # This will cause Main#describe from a file living in + # This will cause Main#describe from a file living in # <tt>spec/farm</tt> to create example group instances of type # Spec::Farm::Example::FarmExampleGroup. def register(id, example_group_class) @example_group_types[id] = example_group_class end - + # Sets the default ExampleGroup class def default(example_group_class) old = @example_group_types @@ -33,7 +33,7 @@ module Spec @example_group_types[id] end end - + def create_example_group(*args, &block) opts = Hash === args.last ? args.last : {} if opts[:shared] rails_plugins/rspec/lib/spec/example/example_group_factory.rb @@ -18,7 +18,7 @@ module Spec klass.register {} Spec::Runner.register_at_exit_hook end - + # Makes the describe/it syntax available from a class. For example: # # class StackSpec < Spec::ExampleGroup rails_plugins/rspec/lib/spec/example/example_group_methods.rb @@ -5,14 +5,14 @@ module Spec @example_group_description = example_group_description @example_name = example_name end - + def matches?(specified_examples) specified_examples.each do |specified_example| return true if matches_literal_example?(specified_example) || matches_example_not_considering_modules?(specified_example) end false end - + protected def matches_literal_example?(specified_example) specified_example =~ /(^#{example_group_regex} #{example_regexp}$|^#{example_group_regex}$|^#{example_group_with_before_all_regexp}$|^#{example_regexp}$)/ rails_plugins/rspec/lib/spec/example/example_matcher.rb @@ -11,7 +11,7 @@ module Spec def execute(options, instance_variables) options.reporter.example_started(self) set_instance_variables_from_hash(instance_variables) - + execution_error = nil Timeout.timeout(options.timeout) do begin @@ -63,7 +63,7 @@ module Spec def description @_defined_description || @_matcher_description || "NO NAME" end - + def set_instance_variables_from_hash(ivars) ivars.each do |variable_name, value| # Ruby 1.9 requires variable.to_s on the next line @@ -85,11 +85,11 @@ module Spec def implementation_backtrace eval("caller", @_implementation) end - + protected include Matchers include Pending - + def before_example setup_mocks_for_rspec self.class.run_before_each(self) rails_plugins/rspec/lib/spec/example/example_methods.rb @@ -1,5 +1,5 @@ module Spec - module Example + module Example module Pending def pending(message = "TODO") if block_given? rails_plugins/rspec/lib/spec/example/pending.rb @@ -4,7 +4,7 @@ require 'spec/expectations/extensions' require 'spec/expectations/handler' module Spec - + # Spec::Expectations lets you set expectations on your objects. # # result.should == 37 rails_plugins/rspec/lib/spec/expectations.rb @@ -23,14 +23,14 @@ module Spec output = "" diffs = Diff::LCS.diff(data_old, data_new) return output if diffs.empty? - oldhunk = hunk = nil + oldhunk = hunk = nil file_length_difference = 0 diffs.each do |piece| begin hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, context_lines, file_length_difference) - file_length_difference = hunk.file_length_difference - next unless oldhunk + file_length_difference = hunk.file_length_difference + next unless oldhunk # Hunks may overlap, which is why we need to be careful when our # diff includes lines of context. Otherwise, we might print # redundant lines. @@ -43,10 +43,10 @@ module Spec oldhunk = hunk output << "\n" end - end + end #Handle the last remaining hunk output << oldhunk.diff(format) << "\n" - end + end def diff_as_object(target,expected) diff_as_string(PP.pp(target,""), PP.pp(expected,"")) rails_plugins/rspec/lib/spec/expectations/differs/default.rb @@ -5,7 +5,7 @@ module Spec superclass = ['Test::Unit::AssertionFailedError', '::StandardError'].map do |c| eval(c) rescue nil end.compact.first - + class ExpectationNotMetError < superclass end end rails_plugins/rspec/lib/spec/expectations/errors.rb @@ -1,21 +1,21 @@ module Spec module Expectations - class InvalidMatcherError < ArgumentError; end - + class InvalidMatcherError < ArgumentError; end + module MatcherHandlerHelper def describe_matcher(matcher) matcher.respond_to?(:description) ? matcher.description : "[#{matcher.class.name} does not provide a description]" end end - - class ExpectationMatcherHandler + + class ExpectationMatcherHandler class << self include MatcherHandlerHelper def handle_matcher(actual, matcher, &block) unless matcher.respond_to?(:matches?) raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}." end - + match = matcher.matches?(actual, &block) ::Spec::Matchers.generated_description = "should #{describe_matcher(matcher)}" Spec::Expectations.fail_with(matcher.failure_message) unless match rails_plugins/rspec/lib/spec/expectations/handler.rb @@ -27,7 +27,7 @@ module Spec Spec::Example::ExampleGroupFactory.create_example_group(*args, &block) end alias :context :describe - + # Creates an example group that can be shared by other example groups # # == Examples @@ -38,7 +38,7 @@ module Spec # # describe SmallEdition do # it_should_behave_like "All Editions" - # + # # it "should do small edition stuff" do # ... # end @@ -46,9 +46,9 @@ module Spec def share_examples_for(name, &block) describe(name, :shared => true, &block) end - + alias :shared_examples_for :share_examples_for - + # Creates a Shared Example Group and assigns it to a constant # # share_as :AllEditions do @@ -57,7 +57,7 @@ module Spec # # describe SmallEdition do # it_should_behave_like AllEditions - # + # # it "should do small edition stuff" do # ... # end @@ -68,7 +68,7 @@ module Spec # # describe SmallEdition do # include AllEditions - # + # # it "should do small edition stuff" do # ... # end @@ -82,7 +82,7 @@ module Spec end private - + def rspec_options $rspec_options ||= begin; \ parser = ::Spec::Runner::OptionParser.new(STDERR, STDOUT); \ @@ -91,7 +91,7 @@ module Spec end $rspec_options end - + def init_rspec_options(options) $rspec_options = options if $rspec_options.nil? end rails_plugins/rspec/lib/spec/extensions/main.rb @@ -42,7 +42,7 @@ module Test end end alias_method :finished, :finished_with_rspec - + alias_method :setup_mediator_without_rspec, :setup_mediator def setup_mediator_with_rspec orig_io = @io @@ -53,7 +53,7 @@ module Test @io = orig_io end alias_method :setup_mediator, :setup_mediator_with_rspec - + end end end rails_plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb @@ -32,7 +32,7 @@ module Spec # # In addition to those Expression Matchers that are defined explicitly, RSpec will # create custom Matchers on the fly for any arbitrary predicate, giving your specs - # a much more natural language feel. + # a much more natural language feel. # # A Ruby predicate is a method that ends with a "?" and returns true or false. # Common examples are +empty?+, +nil?+, and +instance_of?+. @@ -151,6 +151,6 @@ module Spec class MatcherError < StandardError end - + end end rails_plugins/rspec/lib/spec/matchers.rb @@ -1,6 +1,6 @@ module Spec module Matchers - + class Be #:nodoc: def initialize(*args) if args.empty? @@ -11,7 +11,7 @@ module Spec @args = args @comparison = "" end - + def matches?(actual) @actual = actual if handling_predicate? @@ -35,17 +35,17 @@ module Spec return match_or_compare end end - + def failure_message return "expected #{@comparison}#{expected}, got #{@actual.inspect}" unless handling_predicate? return "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}" end - + def negative_failure_message return "expected not #{expected}, got #{@actual.inspect}" unless handling_predicate? return "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}" end - + def expected return "if to be satisfied" if @expected == :satisfy_if return true if @expected == :true @@ -53,7 +53,7 @@ module Spec return "nil" if @expected == :nil return @expected.inspect end - + def match_or_compare return @actual ? true : false if @expected == :satisfy_if return @actual == true if @expected == :true @@ -67,7 +67,7 @@ module Spec return @actual === @expected if @triple_equal return @actual.equal?(@expected) end - + def ==(expected) @prefix = "be " @double_equal = true @@ -115,7 +115,7 @@ module Spec @expected = expected self end - + def description "#{prefix_to_sentence}#{comparison}#{expected_to_sentence}#{args_to_sentence}" end @@ -134,7 +134,7 @@ module Spec @prefix = "" return expected end - + def handling_predicate? return false if [:true, :false, :nil].include?(@expected) return @handling_predicate @@ -143,25 +143,25 @@ module Spec def predicate "#{@expected.to_s}?".to_sym end - + def present_tense_predicate "#{@expected.to_s}s?".to_sym end - + def args_to_s return "" if @args.empty? inspected_args = @args.collect{|a| a.inspect} return "(#{inspected_args.join(', ')})" end - + def comparison @comparison end - + def expected_to_sentence split_words(@expected) end - + def prefix_to_sentence split_words(@prefix) end @@ -180,9 +180,9 @@ module Spec " #{@args[0...-1].join(', ')} and #{@args[-1]}" end end - + end - + # :call-seq: # should be # should be_true @@ -194,7 +194,7 @@ module Spec # # Given true, false, or nil, will pass if actual is # true, false or nil (respectively). Given no args means - # the caller should satisfy an if condition (to be or not to be). + # the caller should satisfy an if condition (to be or not to be). # # Predicates are any Ruby method that ends in a "?" and returns true or false. # Given be_ followed by arbitrary_predicate (without the "?"), RSpec will match @@ -204,7 +204,7 @@ module Spec # prefixed with "be_an_" (e.g. be_an_instance_of), "be_a_" (e.g. be_a_kind_of) # or "be_" (e.g. be_empty), letting you choose the prefix that best suits the predicate. # - # == Examples + # == Examples # # target.should be # target.should be_true rails_plugins/rspec/lib/spec/matchers/be.rb @@ -6,21 +6,21 @@ module Spec @expected = expected @delta = delta end - + def matches?(actual) @actual = actual (@actual - @expected).abs < @delta end - + def failure_message "expected #{@expected} +/- (< #{@delta}), got #{@actual}" end - + def description "be close to #{@expected} (within +- #{@delta})" end end - + # :call-seq: # should be_close(expected, delta) # should_not be_close(expected, delta) rails_plugins/rspec/lib/spec/matchers/be_close.rb @@ -1,6 +1,6 @@ module Spec module Matchers - + #Based on patch from Wilson Bilkovich class Change #:nodoc: def initialize(receiver=nil, message=nil, &block) @@ -8,7 +8,7 @@ module Spec @message = message @block = block end - + def matches?(target, &block) if block raise MatcherError.new(<<-EOF @@ -22,16 +22,16 @@ EOF return false if @to && (@to != @after) return (@before + @amount == @after) if @amount return ((@after - @before) >= @minimum) if @minimum - return ((@after - @before) <= @maximum) if @maximum + return ((@after - @before) <= @maximum) if @maximum return @before != @after end - + def execute_change @before = @block.nil? ? @receiver.send(@message) : @block.call @target.call @after = @block.nil? ? @receiver.send(@message) : @block.call end - + def failure_message if @to "#{result} should have been changed to #{@to.inspect}, but is now #{@after.inspect}" @@ -47,45 +47,45 @@ EOF "#{result} should have changed, but is still #{@before.inspect}" end end - + def result @message || "result" end - + def actual_delta @after - @before end - + def negative_failure_message "#{result} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}" end - + def by(amount) @amount = amount self end - + def by_at_least(minimum) @minimum = minimum self end - + def by_at_most(maximum) @maximum = maximum self - end - + end + def to(to) @to = to self end - + def from (from) @from = from self end end - + # :call-seq: # should change(receiver, message, &block) # should change(receiver, message, &block).by(value) @@ -97,20 +97,20 @@ EOF # == Examples # # lambda { - # team.add_player(player) + # team.add_player(player) # }.should change(roster, :count) # # lambda { - # team.add_player(player) + # team.add_player(player) # }.should change(roster, :count).by(1) # # lambda { - # team.add_player(player) + # team.add_player(player) # }.should change(roster, :count).by_at_least(1) # # lambda { # team.add_player(player) - # }.should change(roster, :count).by_at_most(1) + # }.should change(roster, :count).by_at_most(1) # # string = "string" # lambda { @@ -120,7 +120,7 @@ EOF # lambda { # person.happy_birthday # }.should change(person, :birthday).from(32).to(33) - # + # # lambda { # employee.develop_great_new_social_networking_app # }.should change(employee, :title).from("Mail Clerk").to("CEO") rails_plugins/rspec/lib/spec/matchers/change.rb @@ -1,11 +1,11 @@ module Spec module Matchers - + class Eql #:nodoc: def initialize(expected) @expected = expected end - + def matches?(actual) @actual = actual @actual.eql?(@expected) @@ -14,7 +14,7 @@ module Spec def failure_message return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual end - + def negative_failure_message return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual end @@ -23,7 +23,7 @@ module Spec "eql #{@expected.inspect}" end end - + # :call-seq: # should eql(expected) # should_not eql(expected) rails_plugins/rspec/lib/spec/matchers/eql.rb @@ -1,11 +1,11 @@ module Spec module Matchers - + class Equal #:nodoc: def initialize(expected) @expected = expected end - + def matches?(actual) @actual = actual @actual.equal?(@expected) @@ -18,12 +18,12 @@ module Spec def negative_failure_message return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual end - + def description "equal #{@expected.inspect}" end end - + # :call-seq: # should equal(expected) # should_not equal(expected) rails_plugins/rspec/lib/spec/matchers/equal.rb @@ -1,12 +1,12 @@ module Spec module Matchers - + class Has #:nodoc: def initialize(sym, *args) @sym = sym @args = args end - + def matches?(target) @target = target begin @@ -18,27 +18,27 @@ module Spec end return false end - + def failure_message raise @error if @error "expected ##{predicate}(#{@args[0].inspect}) to return true, got false" end - + def negative_failure_message raise @error if @error "expected ##{predicate}(#{@args[0].inspect}) to return false, got true" end - + def description "have key #{@args[0].inspect}" end - + private def predicate "#{@sym.to_s.sub("have_","has_")}?".to_sym end - + end - + end end rails_plugins/rspec/lib/spec/matchers/has.rb @@ -1,12 +1,12 @@ module Spec module Matchers - + class Have #:nodoc: def initialize(expected, relativity=:exactly) @expected = (expected == :no ? 0 : expected) @relativity = relativity end - + def relativities @relativities ||= { :exactly => "", @@ -14,7 +14,7 @@ module Spec :at_most => "at most " } end - + def method_missing(sym, *args, &block) @collection_name = sym @plural_collection_name = Inflector.pluralize(sym.to_s) if Object.const_defined?(:Inflector) @@ -22,7 +22,7 @@ module Spec @block = block self end - + def matches?(collection_owner) if collection_owner.respond_to?(@collection_name) collection = collection_owner.send(@collection_name, *@args, &@block) @@ -40,11 +40,11 @@ module Spec return @actual <= @expected if @relativity == :at_most return @actual == @expected end - + def not_a_collection "expected #{@collection_name} to be a collection but it does not respond to #length or #size" end - + def failure_message "expected #{relative_expectation} #{@collection_name}, got #{@actual}" end @@ -70,13 +70,13 @@ We recommend that you use this instead: EOF end end - + def description "have #{relative_expectation} #{@collection_name}" end - + private - + def relative_expectation "#{relativities[@relativity]}#{@expected}" end rails_plugins/rspec/lib/spec/matchers/have.rb @@ -2,11 +2,11 @@ module Spec module Matchers class Include #:nodoc: - + def initialize(*expecteds) @expecteds = expecteds end - + def matches?(actual) @actual = actual @expecteds.each do |expected| @@ -14,24 +14,24 @@ module Spec end true end - + def failure_message _message end - + def negative_failure_message _message("not ") end - + def description "include #{_pretty_print(@expecteds)}" end - + private def _message(maybe_not="") "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}" end - + def _pretty_print(array) result = "" array.each_with_index do |item, index| rails_plugins/rspec/lib/spec/matchers/include.rb @@ -1,30 +1,30 @@ module Spec module Matchers - + class Match #:nodoc: def initialize(expected) @expected = expected end - + def matches?(actual) @actual = actual return true if actual =~ @expected return false end - + def failure_message return "expected #{@actual.inspect} to match #{@expected.inspect}", @expected, @actual end - + def negative_failure_message return "expected #{@actual.inspect} not to match #{@expected.inspect}", @expected, @actual end - + def description "match #{@expected.inspect}" end end - + # :call-seq: # should match(regexp) # should_not match(regexp) rails_plugins/rspec/lib/spec/matchers/match.rb @@ -2,7 +2,7 @@ module Spec module Matchers class BaseOperatorMatcher attr_reader :generated_description - + def initialize(target) @target = target end rails_plugins/rspec/lib/spec/matchers/operator_matcher.rb @@ -1,6 +1,6 @@ module Spec module Matchers - + class RaiseError #:nodoc: def initialize(error_or_message=Exception, message=nil) if String === error_or_message @@ -11,7 +11,7 @@ module Spec @expected_message = message end end - + def matches?(proc) @raised_expected_error = false @raised_other = false @@ -46,7 +46,7 @@ module Spec end end end - + def failure_message return "expected #{expected_error}#{actual_error}" if @raised_other || !@raised_expected_error end @@ -54,11 +54,11 @@ module Spec def negative_failure_message "expected no #{expected_error}#{actual_error}" end - + def description "raise #{expected_error}" end - + private def expected_error case @expected_message @@ -75,7 +75,7 @@ module Spec @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}" end end - + # :call-seq: # should raise_error() # should raise_error(NamedError) rails_plugins/rspec/lib/spec/matchers/raise_error.rb @@ -1,12 +1,12 @@ module Spec module Matchers - + class RespondTo #:nodoc: def initialize(*names) @names = names @names_not_responded_to = [] end - + def matches?(target) @names.each do |name| unless target.respond_to?(name) @@ -15,20 +15,20 @@ module Spec end return @names_not_responded_to.empty? end - + def failure_message "expected target to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}" end - + def negative_failure_message "expected target not to respond to #{@names.collect {|name| name.inspect }.join(', ')}" end - + def description "respond to ##{@names.to_s}" end end - + # :call-seq: # should respond_to(*names) # should_not respond_to(*names) @@ -37,7 +37,7 @@ module Spec # provided. Names can be Strings or Symbols. # # == Examples - # + # def respond_to(*names) Matchers::RespondTo.new(*names) end rails_plugins/rspec/lib/spec/matchers/respond_to.rb @@ -1,17 +1,17 @@ module Spec module Matchers - + class Satisfy #:nodoc: def initialize(&block) @block = block end - + def matches?(actual, &block) @block = block if block @actual = actual @block.call(actual) end - + def failure_message "expected #{@actual} to satisfy block" end @@ -20,7 +20,7 @@ module Spec "expected #{@actual} not to satisfy block" end end - + # :call-seq: # should satisfy {} # should_not satisfy {} rails_plugins/rspec/lib/spec/matchers/satisfy.rb @@ -2,7 +2,7 @@ module Spec module Matchers class SimpleMatcher attr_reader :description - + def initialize(description, &match_block) @description = description @match_block = match_block @@ -16,12 +16,12 @@ module Spec def failure_message() return %[expected #{@description.inspect} but got #{@actual.inspect}] end - + def negative_failure_message() return %[expected not to get #{@description.inspect}, but got #{@actual.inspect}] end end - + def simple_matcher(message, &match_block) SimpleMatcher.new(message, &match_block) end rails_plugins/rspec/lib/spec/matchers/simple_matcher.rb @@ -1,12 +1,12 @@ module Spec module Matchers - + class ThrowSymbol #:nodoc: def initialize(expected=nil) @expected = expected @actual = nil end - + def matches?(proc) begin proc.call @@ -29,7 +29,7 @@ module Spec "expected #{expected} but nothing was thrown" end end - + def negative_failure_message if @expected "expected #{expected} not to be thrown" @@ -37,19 +37,19 @@ module Spec "expected no Symbol, got :#{@actual}" end end - + def description "throw #{expected}" end - + private - + def expected @expected.nil? ? "a Symbol" : @expected.inspect end - + end - + # :call-seq: # should throw_symbol() # should throw_symbol(:sym) rails_plugins/rspec/lib/spec/matchers/throw_symbol.rb @@ -23,12 +23,12 @@ module Spec # which can help clarify the role it is playing within a given spec. # # == Mock Objects - # + # # Mocks are objects that allow you to set and verify expectations that they will # receive specific messages during run time. They are very useful for specifying how the subject of # the spec interacts with its collaborators. This approach is widely known as "interaction # testing". - # + # # Mocks are also very powerful as a design tool. As you are # driving the implementation of a given class, Mocks provide an anonymous # collaborator that can change in behaviour as quickly as you can write an expectation in your @@ -36,12 +36,12 @@ module Spec # does not yet exist. As the shape of the class being specified becomes more clear, so do the # requirements for its collaborators - often leading to the discovery of new types that are # needed in your system. - # + # # Read Endo-Testing[http://www.mockobjects.com/files/endotesting.pdf] for a much # more in depth description of this process. - # + # # == Stubs - # + # # Stubs are objects that allow you to set "stub" responses to # messages. As Martin Fowler points out on his site, # mocks_arent_stubs[http://www.martinfowler.com/articles/mocksArentStubs.html]. @@ -49,25 +49,25 @@ module Spec # of Gerard Meszaros: Stubs provide canned responses to messages they might receive in a test, while # mocks allow you to specify and, subsquently, verify that certain messages should be received during # the execution of a test. - # + # # == Partial Mocks/Stubs - # + # # RSpec also supports partial mocking/stubbing, allowing you to add stub/mock behaviour # to instances of your existing classes. This is generally # something to be avoided, because changes to the class can have ripple effects on # seemingly unrelated specs. When specs fail due to these ripple effects, the fact # that some methods are being mocked can make it difficult to understand why a # failure is occurring. - # + # # That said, partials do allow you to expect and # verify interactions with class methods such as +#find+ and +#create+ # on Ruby on Rails model classes. - # + # # == Further Reading - # + # # There are many different viewpoints about the meaning of mocks and stubs. If you are interested # in learning more, here is some recommended reading: - # + # # * Mock Objects: http://www.mockobjects.com/ # * Endo-Testing: http://www.mockobjects.com/files/endotesting.pdf # * Mock Roles, Not Objects: http://www.mockobjects.com/files/mockrolesnotobjects.pdf @@ -110,7 +110,7 @@ module Spec # # my_mock.should_receive(:sym) # my_mock.should_not_receive(:sym) - # + # # == Expecting Arguments # # my_mock.should_receive(:sym).with(*args) @@ -137,7 +137,7 @@ module Spec # my_mock.should_receive(:sym).with(1, anything(), "b") #2nd argument can be anything at all # my_mock.should_receive(:sym).with(1, ducktype(:abs, :div), "b") # #2nd argument can be object that responds to #abs and #div - # + # # == Receive Counts # # my_mock.should_receive(:sym).once rails_plugins/rspec/lib/spec/mocks.rb @@ -10,15 +10,15 @@ module Spec def any_args AnyArgsConstraint.new end - + def anything AnyArgConstraint.new(nil) end - + def boolean BooleanArgConstraint.new(nil) end - + def no_args NoArgsConstraint.new end rails_plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb @@ -1,109 +1,109 @@ module Spec module Mocks - + class MatcherConstraint def initialize(matcher) @matcher = matcher end - + def matches?(value) @matcher.matches?(value) end end - + class LiteralArgConstraint def initialize(literal) @literal_value = literal end - + def matches?(value) @literal_value == value end end - + class RegexpArgConstraint def initialize(regexp) @regexp = regexp end - + def matches?(value) return value =~ @regexp unless value.is_a?(Regexp) value == @regexp end end - + class AnyArgConstraint def initialize(ignore) end - + def ==(other) true end - + # TODO - need this? def matches?(value) true end end - + class AnyArgsConstraint def description "any args" end end - + class NoArgsConstraint def description "no args" end - + def ==(args) args == [] end end - + class NumericArgConstraint def initialize(ignore) end - + def matches?(value) value.is_a?(Numeric) end end - + class BooleanArgConstraint def initialize(ignore) end - + def ==(value) matches?(value) end - + def matches?(value) return true if value.is_a?(TrueClass) return true if value.is_a?(FalseClass) false end end - + class StringArgConstraint def initialize(ignore) end - + def matches?(value) value.is_a?(String) end end - + class DuckTypeArgConstraint def initialize(*methods_to_respond_to) @methods_to_respond_to = methods_to_respond_to end - + def matches?(value) @methods_to_respond_to.all? { |sym| value.respond_to?(sym) } end - + def description "duck_type" end @@ -116,7 +116,7 @@ module Spec @@constraint_classes[:numeric] = NumericArgConstraint @@constraint_classes[:boolean] = BooleanArgConstraint @@constraint_classes[:string] = StringArgConstraint - + def initialize(args) @args = args if [:any_args] == args @@ -130,17 +130,17 @@ module Spec else @expected_params = process_arg_constraints(args) end end - + def process_arg_constraints(constraints) - constraints.collect do |constraint| + constraints.collect do |constraint| convert_constraint(constraint) end end - + def warn_deprecated(deprecated_method, instead) Kernel.warn "The #{deprecated_method} constraint is deprecated. Use #{instead} instead." end - + def convert_constraint(constraint) if [:anything, :numeric, :boolean, :string].include?(constraint) case constraint @@ -160,24 +160,24 @@ module Spec return RegexpArgConstraint.new(constraint) if constraint.is_a?(Regexp) return LiteralArgConstraint.new(constraint) end - + def is_matcher?(obj) return obj.respond_to?(:matches?) && obj.respond_to?(:description) end - + def check_args(args) return true if @expected_params.nil? return true if @expected_params == args return constraints_match?(args) end - + def constraints_match?(args) return false if args.length != @expected_params.length @expected_params.each_index { |i| return false unless @expected_params[i].matches?(args[i]) } return true end - + end - + end end rails_plugins/rspec/lib/spec/mocks/argument_expectation.rb @@ -2,12 +2,12 @@ module Spec module Mocks class ErrorGenerator attr_writer :opts - + def initialize(target, name) @target = target @name = name end - + def opts @opts ||= {} end @@ -15,47 +15,47 @@ module Spec def raise_unexpected_message_error(sym, *args) __raise "#{intro} received unexpected message :#{sym}#{arg_message(*args)}" end - + def raise_unexpected_message_args_error(expectation, *args) expected_args = format_args(*expectation.expected_args) actual_args = args.empty? ? "(no args)" : format_args(*args) __raise "#{intro} expected #{expectation.sym.inspect} with #{expected_args} but received it with #{actual_args}" end - + def raise_expectation_error(sym, expected_received_count, actual_received_count, *args) __raise "#{intro} expected :#{sym}#{arg_message(*args)} #{count_message(expected_received_count)}, but received it #{count_message(actual_received_count)}" end - + def raise_out_of_order_error(sym) __raise "#{intro} received :#{sym} out of order" end - + def raise_block_failed_error(sym, detail) __raise "#{intro} received :#{sym} but passed block failed with: #{detail}" end - + def raise_missing_block_error(args_to_yield) __raise "#{intro} asked to yield |#{arg_list(*args_to_yield)}| but no block was passed" end - + def raise_wrong_arity_error(args_to_yield, arity) __raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with arity of #{arity}" end - + private def intro @name ? "Mock '#{@name}'" : @target.inspect end - + def __raise(message) message = opts[:message] unless opts[:message].nil? Kernel::raise(Spec::Mocks::MockExpectationError, message) end - + def arg_message(*args) " with " + format_args(*args) end - + def format_args(*args) return "(no args)" if args.empty? || args == [:no_args] return "(any args)" if args == [:any_args] @@ -67,7 +67,7 @@ module Spec arg.respond_to?(:description) ? arg.description : arg.inspect end.join(", ") end - + def count_message(count) return "at least #{pretty_print(count.abs)}" if count < 0 return pretty_print(count) rails_plugins/rspec/lib/spec/mocks/error_generator.rb @@ -2,7 +2,7 @@ module Spec module Mocks class MockExpectationError < StandardError end - + class AmbiguousReturnError < StandardError end end rails_plugins/rspec/lib/spec/mocks/errors.rb @@ -3,7 +3,7 @@ module Spec class BaseExpectation attr_reader :sym - + def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={}) @error_generator = error_generator @error_generator.opts = opts @@ -22,7 +22,7 @@ module Spec @at_most = nil @args_to_yield = [] end - + def expected_args @args_expectation.args end @@ -42,7 +42,7 @@ module Spec # Ruby 1.9 - see where this is used below @ignore_args = !block_given? end - + # :call-seq: # and_raise() # and_raise(Exception) #any exception class @@ -57,27 +57,27 @@ module Spec def and_raise(exception=Exception) @exception_to_raise = exception end - + def and_throw(symbol) @symbol_to_throw = symbol end - + def and_yield(*args) @args_to_yield << args self end - + def matches(sym, args) @sym == sym and @args_expectation.check_args(args) end - + def invoke(args, block) @order_group.handle_order_constraint self begin Kernel::raise @exception_to_raise unless @exception_to_raise.nil? Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil? - + if !@method_block.nil? default_return_val = invoke_method_block(args) elsif @args_to_yield.size > 0 @@ -85,7 +85,7 @@ module Spec else default_return_val = nil end - + if @consecutive return invoke_consecutive_return_block(args, block) elsif @return_block @@ -97,7 +97,7 @@ module Spec @actual_received_count += 1 end end - + protected def invoke_method_block(args) @@ -107,7 +107,7 @@ module Spec @error_generator.raise_block_failed_error @sym, detail.message end end - + def invoke_with_yield(block) if block.nil? @error_generator.raise_missing_block_error @args_to_yield @@ -119,15 +119,15 @@ module Spec block.call(*args_to_yield_this_time) end end - + def invoke_consecutive_return_block(args, block) args << block unless block.nil? value = @return_block.call(*args) - + index = [@actual_received_count, value.size-1].min value[index] end - + def invoke_return_block(args, block) args << block unless block.nil? # Ruby 1.9 - when we set @return_block to return values @@ -140,39 +140,39 @@ module Spec end end end - + class MessageExpectation < BaseExpectation - + def matches_name_but_not_args(sym, args) @sym == sym and not @args_expectation.check_args(args) end - - def verify_messages_received + + def verify_messages_received return if ignoring_args? || matches_exact_count? || matches_at_least_count? || matches_at_most_count? - + generate_error rescue Spec::Mocks::MockExpectationError => error error.backtrace.insert(0, @expected_from) Kernel::raise error end - + def ignoring_args? @expected_received_count == :any end - + def matches_at_least_count? @at_least && @actual_received_count >= @expected_received_count end - + def matches_at_most_count? @at_most && @actual_received_count <= @expected_received_count end - + def matches_exact_count? @expected_received_count == @actual_received_count end - + def generate_error @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args) end @@ -182,17 +182,17 @@ module Spec @args_expectation = ArgumentExpectation.new(args) self end - + def exactly(n) set_expected_received_count :exactly, n self end - + def at_least(n) set_expected_received_count :at_least, n self end - + def at_most(n) set_expected_received_count :at_most, n self @@ -202,41 +202,41 @@ module Spec @method_block = block if block self end - + def any_number_of_times(&block) @method_block = block if block @expected_received_count = :any self end - + def never @expected_received_count = 0 self end - + def once(&block) @method_block = block if block @expected_received_count = 1 self end - + def twice(&block) @method_block = block if block @expected_received_count = 2 self end - + def ordered(&block) @method_block = block if block @order_group.register(self) @ordered = true self end - + def negative_expectation_for?(sym) return false end - + protected def set_expected_received_count(relativity, n) @at_least = (relativity == :at_least) @@ -250,18 +250,18 @@ module Spec 2 end end - + end - + class NegativeMessageExpectation < MessageExpectation def initialize(message, expectation_ordering, expected_from, sym, method_block) super(message, expectation_ordering, expected_from, sym, method_block, 0) end - + def negative_expectation_for?(sym) return @sym == sym end end - + end end rails_plugins/rspec/lib/spec/mocks/message_expectation.rb @@ -8,15 +8,15 @@ module Spec def should_not_receive(sym, &block) __mock_proxy.add_negative_message_expectation(caller(1)[0], sym.to_sym, &block) end - + def stub!(sym, opts={}) __mock_proxy.add_stub(caller(1)[0], sym.to_sym, opts) end - + def received_message?(sym, *args, &block) #:nodoc: __mock_proxy.received_message?(sym.to_sym, *args, &block) end - + def rspec_verify #:nodoc: __mock_proxy.verify end rails_plugins/rspec/lib/spec/mocks/methods.rb @@ -11,7 +11,7 @@ module Spec @options = parse_options(stubs_and_options) assign_stubs(stubs_and_options) end - + # This allows for comparing the mock to other objects that proxy # such as ActiveRecords belongs_to proxy objects # By making the other object run the comparison, we're sure the call gets delegated to the proxy target @@ -29,17 +29,17 @@ module Spec __mock_proxy.raise_unexpected_message_error sym, *args end end - + def inspect "#<#{self.class}:#{sprintf '0x%x', self.object_id} @name=#{@name.inspect}>" end - + private - + def parse_options(options) options.has_key?(:null_object) ? {:null_object => options.delete(:null_object)} : {} end - + def assign_stubs(stubs) stubs.each_pair do |message, response| stub!(message).and_return(response) rails_plugins/rspec/lib/spec/mocks/mock.rb @@ -5,25 +5,25 @@ module Spec @error_generator = error_generator @ordering = Array.new end - + def register(expectation) @ordering << expectation end - + def ready_for?(expectation) return @ordering.first == expectation end - + def consume @ordering.shift end - + def handle_order_constraint expectation return unless @ordering.include? expectation return consume if ready_for?(expectation) @error_generator.raise_out_of_order_error expectation.sym end - + end end end rails_plugins/rspec/lib/spec/mocks/order_group.rb @@ -79,14 +79,14 @@ module Spec def raise_unexpected_message_error(sym, *args) @error_generator.raise_unexpected_message_error sym, *args end - + private def __add(sym) $rspec_mocks.add(@target) unless $rspec_mocks.nil? define_expected_method(sym) end - + def define_expected_method(sym) if target_responds_to?(sym) && !metaclass.method_defined?(munge(sym)) munged_sym = munge(sym) @@ -95,7 +95,7 @@ module Spec end @proxied_methods << sym end - + metaclass_eval(<<-EOF, __FILE__, __LINE__) def #{sym}(*args, &block) __mock_proxy.message_received :#{sym}, *args, &block @@ -128,7 +128,7 @@ module Spec def metaclass_eval(str, filename, lineno) metaclass.class_eval(str, filename, lineno) end - + def metaclass (class << @target; self; end) end rails_plugins/rspec/lib/spec/mocks/proxy.rb @@ -10,16 +10,16 @@ module Spec mock.rspec_verify end end - + def reset_all mocks.each do |mock| mock.rspec_reset end mocks.clear end - + private - + def mocks @mocks ||= [] end rails_plugins/rspec/lib/spec/mocks/space.rb @@ -23,7 +23,7 @@ module Spec def mock(name, stubs_and_options={}) Spec::Mocks::Mock.new(name, stubs_and_options) end - + alias :stub :mock # Shortcut for creating a mock object that will return itself in response rails_plugins/rspec/lib/spec/mocks/spec_methods.rb @@ -11,7 +11,7 @@ module Spec # A Rake task that runs a set of specs. # # Example: - # + # # Spec::Rake::SpecTask.new do |t| # t.warning = true # t.rcov = true @@ -87,7 +87,7 @@ module Spec # Whether or not to use RCov (default is false) # See http://eigenclass.org/hiki.rb?rcov attr_accessor :rcov - + # Array of commandline options to pass to RCov. Defaults to ['--exclude', 'lib\/spec,bin\/spec']. # Ignored if rcov=false # Setting the RCOV_OPTS environment variable overrides this. @@ -117,7 +117,7 @@ module Spec # used, then the list of spec files is the union of the two. # Setting the SPEC environment variable overrides this. attr_accessor :spec_files - + # Use verbose output. If this is set to true, the task will print # the executed spec command to stdout. Defaults to false. attr_accessor :verbose @@ -210,7 +210,7 @@ module Spec STDERR.puts "RSPECOPTS is DEPRECATED and will be removed in a future version. Use SPEC_OPTS instead." if ENV['RSPECOPTS'] ENV['SPEC_OPTS'] || ENV['RSPECOPTS'] || spec_opts.join(" ") || "" end - + def evaluate(o) # :nodoc: case o when Proc then o.call rails_plugins/rspec/lib/spec/rake/spectask.rb @@ -5,23 +5,23 @@ module RCov class VerifyTask < Rake::TaskLib # Name of the task. Defaults to :verify_rcov attr_accessor :name - + # Path to the index.html file generated by RCov, which # is the file containing the total coverage. # Defaults to 'coverage/index.html' attr_accessor :index_html - + # Whether or not to output details. Defaults to true. attr_accessor :verbose - - # The threshold value (in percent) for coverage. If the - # actual coverage is not equal to this value, the task will raise an - # exception. + + # The threshold value (in percent) for coverage. If the + # actual coverage is not equal to this value, the task will raise an + # exception. attr_accessor :threshold - + # Require the threshold value be met exactly. This is the default. attr_accessor :require_exact_threshold - + def initialize(name=:verify_rcov) @name = name @index_html = 'coverage/index.html' @@ -31,7 +31,7 @@ module RCov raise "Threshold must be set" if @threshold.nil? define end - + def define desc "Verify that rcov coverage is at least #{threshold}%" task @name do rails_plugins/rspec/lib/spec/rake/verify_rcov.rb @@ -10,121 +10,121 @@ require 'spec/runner/class_and_arguments_parser' module Spec # == ExampleGroups and Examples - # - # Rather than expressing examples in classes, RSpec uses a custom DSLL (DSL light) to + # + # Rather than expressing examples in classes, RSpec uses a custom DSLL (DSL light) to # describe groups of examples. - # + # # A ExampleGroup is the equivalent of a fixture in xUnit-speak. It is a metaphor for the context # in which you will run your executable example - a set of known objects in a known starting state. # We begin be describing - # + # # describe Account do - # + # # before do # @account = Account.new # end - # + # # it "should have a balance of $0" do # @account.balance.should == Money.new(0, :dollars) # end - # + # # end - # + # # We use the before block to set up the Example (given), and then the #it method to # hold the example code that expresses the event (when) and the expected outcome (then). - # + # # == Helper Methods - # + # # A primary goal of RSpec is to keep the examples clear. We therefore prefer # less indirection than you might see in xUnit examples and in well factored, DRY production code. We feel # that duplication is OK if removing it makes it harder to understand an example without # having to look elsewhere to understand its context. - # + # # That said, RSpec does support some level of encapsulating common code in helper # methods that can exist within a context or within an included module. - # + # # == Setup and Teardown - # + # # You can use before and after within a Example. Both methods take an optional # scope argument so you can run the block before :each example or before :all examples - # + # # describe "..." do # before :all do # ... # end - # + # # before :each do # ... # end - # + # # it "should do something" do # ... # end - # + # # it "should do something else" do # ... # end - # + # # after :each do # ... # end - # + # # after :all do # ... # end - # + # # end - # + # # The <tt>before :each</tt> block will run before each of the examples, once for each example. Likewise, # the <tt>after :each</tt> block will run after each of the examples. - # + # # It is also possible to specify a <tt>before :all</tt> and <tt>after :all</tt> # block that will run only once for each behaviour, respectively before the first <code>before :each</code> # and after the last <code>after :each</code>. The use of these is generally discouraged, because it # introduces dependencies between the examples. Still, it might prove useful for very expensive operations # if you know what you are doing. - # + # # == Local helper methods - # + # # You can include local helper methods by simply expressing them within a context: - # + # # describe "..." do - # + # # it "..." do # helper_method # end - # + # # def helper_method # ... # end - # + # # end - # + # # == Included helper methods - # + # # You can include helper methods in multiple contexts by expressing them within # a module, and then including that module in your context: - # + # # module AccountExampleHelperMethods # def helper_method # ... # end # end - # + # # describe "A new account" do # include AccountExampleHelperMethods # before do # @account = Account.new # end - # + # # it "should have a balance of $0" do # helper_method # @account.balance.should eql(Money.new(0, :dollars)) # end # end - # + # # == Shared Example Groups - # + # # You can define a shared Example Group, that may be used on other groups # # share_examples_for "All Editions" do @@ -133,7 +133,7 @@ module Spec # # describe SmallEdition do # it_should_behave_like "All Editions" - # + # # it "should do small edition stuff" do # ... # end @@ -147,7 +147,7 @@ module Spec # # describe SmallEdition do # it_should_behave_like AllEditions - # + # # it "should do small edition stuff" do # ... # end @@ -158,7 +158,7 @@ module Spec # # describe SmallEdition do # include AllEditions - # + # # it "should do small edition stuff" do # ... # end @@ -168,7 +168,7 @@ module Spec def configuration # :nodoc: @configuration ||= Spec::Example::Configuration.new end - + # Use this to configure various configurable aspects of # RSpec: # @@ -183,7 +183,7 @@ module Spec def configure yield configuration end - + def register_at_exit_hook # :nodoc: $spec_runner_at_exit_hook_registered ||= nil unless $spec_runner_at_exit_hook_registered @@ -196,7 +196,7 @@ module Spec $spec_runner_at_exit_hook_registered = true end end - + end end end rails_plugins/rspec/lib/spec/runner.rb @@ -19,7 +19,7 @@ module Spec class QuietBacktraceTweaker < BacktraceTweaker unless defined?(IGNORE_PATTERNS) root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..')) - spec_files = Dir["#{root_dir}/lib/*"].map do |path| + spec_files = Dir["#{root_dir}/lib/*"].map do |path| subpath = path[root_dir.length..-1] /#{subpath}/ end @@ -37,7 +37,7 @@ module Spec /spec_server/ ] end - + def tweak_backtrace(error) return if error.backtrace.nil? error.backtrace.collect! do |line| rails_plugins/rspec/lib/spec/runner/backtrace_tweaker.rb @@ -1,14 +1,14 @@ module Spec module Runner module Formatter - # Baseclass for formatters that implements all required methods as no-ops. + # Baseclass for formatters that implements all required methods as no-ops. class BaseFormatter attr_accessor :example_group, :options, :where def initialize(options, where) @options = options @where = where end - + # This method is invoked before any examples are run, right after # they have all been collected. This can be useful for special # formatters that need to provide progress on feedback (graphical ones) @@ -36,12 +36,12 @@ module Spec end # This method is invoked when an +example+ fails, i.e. an exception occurred - # inside it (such as a failed should or other exception). +counter+ is the - # sequence number of the failure (starting at 1) and +failure+ is the associated + # inside it (such as a failed should or other exception). +counter+ is the + # sequence number of the failure (starting at 1) and +failure+ is the associated # Failure object. def example_failed(example, counter, failure) end - + # This method is invoked when an example is not yet implemented (i.e. has not # been provided a block), or when an ExamplePendingError is raised. # +message+ is the message from the ExamplePendingError, if it exists, or the @@ -60,11 +60,11 @@ module Spec # information about the failure. def dump_failure(counter, failure) end - + # This method is invoked after the dumping of examples and failures. def dump_summary(duration, example_count, failure_count, pending_count) end - + # This gets invoked after the summary if option is set to do so. def dump_pending end rails_plugins/rspec/lib/spec/runner/formatter/base_formatter.rb @@ -25,11 +25,11 @@ module Spec end @pending_examples = [] end - + def example_pending(example_group_description, example, message) @pending_examples << ["#{example_group_description} #{example.description}", message] end - + def dump_failure(counter, failure) @output.puts @output.puts "#{counter.to_s})" @@ -37,7 +37,7 @@ module Spec @output.puts format_backtrace(failure.exception.backtrace) @output.flush end - + def colourise(s, failure) if(failure.expectation_not_met?) red(s) @@ -47,7 +47,7 @@ module Spec magenta(s) end end - + def dump_summary(duration, example_count, failure_count, pending_count) return if dry_run? @output.puts @@ -55,7 +55,7 @@ module Spec @output.puts summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}" - summary << ", #{pending_count} pending" if pending_count > 0 + summary << ", #{pending_count} pending" if pending_count > 0 if failure_count == 0 if pending_count > 0 @@ -74,23 +74,23 @@ module Spec @output.puts @output.puts "Pending:" @pending_examples.each do |pending_example| - @output.puts "#{pending_example[0]} (#{pending_example[1]})" + @output.puts "#{pending_example[0]} (#{pending_example[1]})" end end @output.flush end - + def close if IO === @output - @output.close + @output.close end end - + def format_backtrace(backtrace) return "" if backtrace.nil? backtrace.map { |line| backtrace_line(line) }.join("\n") end - + protected def colour? @@ -100,7 +100,7 @@ module Spec def dry_run? @options.dry_run ? true : false end - + def backtrace_line(line) line.sub(/\A([^:]+:\d+)$/, '\\1:') end @@ -117,13 +117,13 @@ module Spec false end end - + def green(text); colour(text, "\e[32m"); end def red(text); colour(text, "\e[31m"); end def magenta(text); colour(text, "\e[35m"); end def yellow(text); colour(text, "\e[33m"); end def blue(text); colour(text, "\e[34m"); end - + end end end rails_plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb @@ -3,7 +3,7 @@ require 'spec/runner/formatter/base_text_formatter' module Spec module Runner module Formatter - class FailingExamplesFormatter < BaseTextFormatter + class FailingExamplesFormatter < BaseTextFormatter def example_failed(example, counter, failure) @output.puts "#{example_group.description} #{example.description}" @output.flush rails_plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb @@ -6,7 +6,7 @@ module Spec module Formatter class HtmlFormatter < BaseTextFormatter include ERB::Util # for the #h method - + def initialize(options, output) super @current_example_group_number = 0 @@ -17,12 +17,12 @@ module Spec def current_example_group_number @current_example_group_number end - + # The number of the currently running example (a global counter) def current_example_number @current_example_number end - + def start(example_count) @example_count = example_count @@ -97,7 +97,7 @@ module Spec @snippet_extractor ||= SnippetExtractor.new " <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(failure.exception)}</code></pre>" end - + def move_progress @output.puts " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>" @output.flush @@ -119,7 +119,7 @@ module Spec totals = "This was a dry-run" else totals = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}" - totals << ", #{pending_count} pending" if pending_count > 0 + totals << ", #{pending_count} pending" if pending_count > 0 end @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{duration} seconds</strong>\";</script>" @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>" @@ -130,10 +130,10 @@ module Spec @output.flush end - def html_header + def html_header <<-EOF <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -204,7 +204,7 @@ function makeYellow(element_id) { } EOF end - + def global_styles <<-EOF #rspec-header { rails_plugins/rspec/lib/spec/runner/formatter/html_formatter.rb @@ -4,20 +4,20 @@ module Spec module Runner module Formatter class ProfileFormatter < ProgressBarFormatter - + def initialize(options, where) super @example_times = [] end - + def start(count) @output.puts "Profiling enabled." end - + def example_started(example) @time = Time.now end - + def example_passed(example) super @example_times << [ @@ -26,15 +26,15 @@ module Spec Time.now - @time ] end - + def start_dump super @output.puts "\n\nTop 10 slowest examples:\n" - + @example_times = @example_times.sort_by do |description, example, time| time end.reverse - + @example_times[0..9].each do |description, example, time| @output.print red(sprintf("%.7f", time)) @output.puts " #{description} #{example}" rails_plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb @@ -13,13 +13,13 @@ module Spec @output.print green('.') @output.flush end - + def example_pending(example_group_description, example, message) super @output.print yellow('P') @output.flush end - + def start_dump @output.puts @output.flush rails_plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb @@ -5,14 +5,14 @@ module Spec class SnippetExtractor #:nodoc: class NullConverter; def convert(code, pre); code; end; end #:nodoc: begin; require 'rubygems'; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end - + def snippet(error) raw_code, line = snippet_for(error.backtrace[0]) highlighted = @@converter.convert(raw_code, false) highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter) post_process(highlighted, line) end - + def snippet_for(error_line) if error_line =~ /(.*):(\d+)/ file = $1 @@ -22,7 +22,7 @@ module Spec ["# Couldn't get snippet for #{error_line}", 1] end end - + def lines_around(file, line) if File.file?(file) lines = File.open(file).read.split("\n") @@ -35,7 +35,7 @@ module Spec "# Couldn't get snippet for #{file}" end end - + def post_process(highlighted, offending_line) new_lines = [] highlighted.split("\n").each_with_index do |line, i| @@ -45,7 +45,7 @@ module Spec end new_lines.join("\n") end - + end end end rails_plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb @@ -10,24 +10,24 @@ module Spec output.puts example_group.description output.flush end - + def example_failed(example, counter, failure) message = if failure.expectation_not_met? "- #{example.description} (FAILED - #{counter})" else "- #{example.description} (ERROR - #{counter})" end - + output.puts(failure.expectation_not_met? ? red(message) : magenta(message)) output.flush end - + def example_passed(example) message = "- #{example.description}" output.puts green(message) output.flush end - + def example_pending(example_group_description, example, message) super output.puts yellow("- #{example.description} (PENDING: #{message})") rails_plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb @@ -7,11 +7,11 @@ module Spec module Story class HtmlFormatter < BaseTextFormatter include ERB::Util - + def run_started(count) @output.puts <<-EOF <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -47,7 +47,7 @@ EOF </head> EOF end - + def story_started(title, narrative) @output.puts <<-EOF <dl class="story passed"> @@ -82,7 +82,7 @@ EOF </dl> EOF end - + def found_scenario(type, description) end @@ -112,11 +112,11 @@ EOF def step_failed(type, description, *args) print_step('failed', type, description, *args) end - + def print_step(klass, type, description, *args) spans = args.map { |arg| "<span class=\"param\">#{arg}</span>" } desc_string = description.step_name - arg_regexp = description.arg_regexp + arg_regexp = description.arg_regexp i = -1 inner = type.to_s.capitalize + ' ' + desc_string.gsub(arg_regexp) { |param| spans[i+=1] } @output.puts " <li class=\"#{klass}\">#{inner}</li>" rails_plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb @@ -13,7 +13,7 @@ module Spec @pending_steps = [] @previous_type = nil end - + def run_started(count) @count = count @output.puts "Running #@count scenarios\n\n" @@ -27,7 +27,7 @@ module Spec @output.print line end end - + def story_ended(title, narrative) @output.puts @output.puts @@ -39,22 +39,22 @@ module Spec @output.print "\n\n Scenario: #{scenario_name}" @scenario_ok = true end - + def scenario_succeeded(story_title, scenario_name) @successful_scenario_count += 1 end - + def scenario_failed(story_title, scenario_name, err) @options.backtrace_tweaker.tweak_backtrace(err) @failed_scenarios << [story_title, scenario_name, err] unless @scenario_already_failed @scenario_already_failed = true end - + def scenario_pending(story_title, scenario_name, msg) @pending_scenario_count += 1 unless @scenario_already_failed @scenario_already_failed = true end - + def run_ended @output.puts "#@count scenarios: #@successful_scenario_count succeeded, #{@failed_scenarios.size} failed, #@pending_scenario_count pending" unless @pending_steps.empty? @@ -74,32 +74,32 @@ module Spec #{err.backtrace.join("\n")} ] end - end + end end def step_upcoming(type, description, *args) end - + def step_succeeded(type, description, *args) found_step(type, description, false, *args) end - + def step_pending(type, description, *args) found_step(type, description, false, *args) @pending_steps << [@current_story_title, @current_scenario_name, description] @output.print " (PENDING)" @scenario_ok = false end - + def step_failed(type, description, *args) found_step(type, description, true, *args) @output.print red(@scenario_ok ? " (FAILED)" : " (SKIPPED)") @scenario_ok = false end - + def collected_steps(steps) end - + def method_missing(sym, *args, &block) #:nodoc: # noop - ignore unknown messages end rails_plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb @@ -12,7 +12,7 @@ module Spec @filter = filter @heckle_class = heckle_class end - + # Runs all the example groups held by +rspec_options+ once for each of the # methods in the matched classes. def heckle_with @@ -22,13 +22,13 @@ module Spec heckle_class_or_module(@filter) end end - + def heckle_method(class_name, method_name) verify_constant(class_name) heckle = @heckle_class.new(class_name, method_name, rspec_options) heckle.validate end - + def heckle_class_or_module(class_or_module_name) verify_constant(class_or_module_name) pattern = /^#{class_or_module_name}/ @@ -36,7 +36,7 @@ module Spec ObjectSpace.each_object(Class) do |klass| classes << klass if klass.name =~ pattern end - + classes.each do |klass| klass.instance_methods(false).each do |method_name| heckle = @heckle_class.new(klass.name, method_name, rspec_options) @@ -44,7 +44,7 @@ module Spec end end end - + def verify_constant(name) begin # This is defined in Heckle @@ -54,7 +54,7 @@ module Spec end end end - + #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base) class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle) def initialize(klass_name, method_name, rspec_options) rails_plugins/rspec/lib/spec/runner/heckle_runner.rb @@ -122,7 +122,7 @@ module Spec @options.argv = @argv.dup return if parse_generate_options return if parse_drb - + super(@argv) do |file| @options.files << file blk.call(file) if blk @@ -137,7 +137,7 @@ module Spec require file end end - + def parse_options_file(options_file) option_file_args = IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten @argv.push(*option_file_args) @@ -152,7 +152,7 @@ module Spec options_file = @argv.delete_at(index) end end - + if options_file write_generated_options(options_file) return true @@ -160,7 +160,7 @@ module Spec return false end end - + def write_generated_options(options_file) File.open(options_file, 'w') do |io| io.puts @argv.join("\n") @@ -191,7 +191,7 @@ module Spec def parse_help @out_stream.puts self exit if stdout? - end + end def stdout? @out_stream == $stdout rails_plugins/rspec/lib/spec/runner/option_parser.rb @@ -100,7 +100,7 @@ module Spec def examples_should_not_be_run @examples_should_be_run = false - end + end def colour=(colour) @colour = colour @@ -147,7 +147,7 @@ module Spec @format_options ||= [] @format_options << [format, where] end - + def formatters @format_options ||= [['progress', @output_stream]] @formatters ||= load_formatters(@format_options, EXAMPLE_FORMATTERS) @@ -157,7 +157,7 @@ module Spec @format_options ||= [['plain', @output_stream]] @formatters ||= load_formatters(@format_options, STORY_FORMATTERS) end - + def load_formatters(format_options, formatters) format_options.map do |format, where| formatter_type = if formatters[format] @@ -197,13 +197,13 @@ module Spec end result end - + protected def examples_should_be_run? return @examples_should_be_run unless @examples_should_be_run.nil? @examples_should_be_run = true end - + def differ_class=(klass) return unless klass @differ_class = klass @@ -227,7 +227,7 @@ module Spec if $_spec_spec ; raise e ; else exit(1) ; end end end - + def custom_runner return nil unless custom_runner? klass_name, arg = ClassAndArgumentsParser.parse(user_input_for_runner) @@ -238,13 +238,13 @@ module Spec def custom_runner? return user_input_for_runner ? true : false end - + def heckle returns = self.heckle_runner.heckle_with self.heckle_runner = nil returns end - + def sorted_files return sorter ? files.sort(&sorter) : files end rails_plugins/rspec/lib/spec/runner/options.rb @@ -2,27 +2,27 @@ module Spec module Runner class Reporter attr_reader :options, :example_groups - + def initialize(options) @options = options @options.reporter = self clear end - + def add_example_group(example_group) formatters.each do |f| f.add_example_group(example_group) end example_groups << example_group end - + def example_started(example) formatters.each{|f| f.example_started(example)} end - + def example_finished(example, error=nil) @examples << example - + if error.nil? example_passed(example) elsif Spec::Example::ExamplePendingError === error @@ -48,11 +48,11 @@ module Spec @start_time = Time.new formatters.each{|f| f.start(number_of_examples)} end - + def end @end_time = Time.new end - + # Dumps the summary and returns the total number of failures def dump formatters.each{|f| f.start_dump} @@ -74,7 +74,7 @@ module Spec def backtrace_tweaker @options.backtrace_tweaker end - + def clear @example_groups = [] @failures = [] @@ -83,7 +83,7 @@ module Spec @start_time = nil @end_time = nil end - + def dump_failures return if @failures.empty? @failures.inject(1) do |index, failure| @@ -99,21 +99,21 @@ module Spec return @end_time - @start_time unless (@end_time.nil? or @start_time.nil?) return "0.0" end - + def example_passed(example) formatters.each{|f| f.example_passed(example)} end - + def example_pending(example_group, example, message="Not Yet Implemented") @pending_count += 1 formatters.each do |f| f.example_pending(example_group.description, example, message) end end - + class Failure attr_reader :exception - + def initialize(example_name, exception) @example_name = example_name @exception = exception @@ -128,7 +128,7 @@ module Spec "#{@exception.class.name} in '#{@example_name}'" end end - + def pending_fixed? @exception.is_a?(Spec::Example::PendingExampleFixedError) end rails_plugins/rspec/lib/spec/runner/reporter.rb @@ -5,7 +5,7 @@ module Spec def Story(title, narrative, params = {}, &body) ::Spec::Story::Runner.story_runner.Story(title, narrative, params, &body) end - + # Calling this deprecated is silly, since it hasn't been released yet. But, for # those who are reading this - this will be deleted before the 1.1 release. def run_story(*args, &block) @@ -13,7 +13,7 @@ module Spec runner.instance_eval(&block) if block runner.run end - + # Creates (or appends to an existing) a namespaced group of steps for use in Stories # # == Examples @@ -28,8 +28,8 @@ module Spec steps.instance_eval(&block) if block steps end - - # Creates a context for running a Plain Text Story with specific groups of Steps. + + # Creates a context for running a Plain Text Story with specific groups of Steps. # Also supports adding arbitrary steps that will only be accessible to # the Story being run. # @@ -73,11 +73,11 @@ module Spec runner.run end end - + def rspec_story_steps # :nodoc: $rspec_story_steps ||= Spec::Story::StepGroupHash.new end - + end end end rails_plugins/rspec/lib/spec/story/extensions/main.rb @@ -2,7 +2,7 @@ class Regexp def step_name self.source end - + def arg_regexp ::Spec::Story::Step::PARAM_OR_GROUP_PATTERN end rails_plugins/rspec/lib/spec/story/extensions/regexp.rb @@ -2,7 +2,7 @@ class String def step_name self end - + def arg_regexp ::Spec::Story::Step::PARAM_PATTERN end rails_plugins/rspec/lib/spec/story/extensions/string.rb @@ -4,7 +4,7 @@ module Spec def initialize(name) @name = name end - + def perform(instance, ignore_name) scenario = Runner::StoryRunner.scenario_from_current_story(@name) Runner::ScenarioRunner.new.run(scenario, instance) rails_plugins/rspec/lib/spec/story/given_scenario.rb @@ -12,7 +12,7 @@ module Spec def run_options # :nodoc: @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout) end - + def story_runner # :nodoc: unless @story_runner @story_runner = StoryRunner.new(scenario_runner, world_creator) @@ -23,33 +23,33 @@ module Spec end @story_runner end - + def scenario_runner # :nodoc: @scenario_runner ||= ScenarioRunner.new end - + def world_creator # :nodoc: @world_creator ||= World end - + # Use this to register a customer output formatter. def register_listener(listener) story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended world_creator.add_listener(listener) # found_scenario, step_succeeded, step_failed, step_failed scenario_runner.add_listener(listener) # scenario_started, scenario_succeeded, scenario_pending, scenario_failed end - + def register_exit_hook # :nodoc: at_exit do Runner.story_runner.run_stories unless $! end # TODO exit with non-zero status if run fails end - + def dry_run run_options.dry_run end - + end end end rails_plugins/rspec/lib/spec/story/runner.rb @@ -6,7 +6,7 @@ module Spec # story file or a block, in which you can define the path using load. # # == Examples - # + # # PlainTextStoryRunner.new('path/to/file') # # PlainTextStoryRunner.new do |runner| @@ -17,26 +17,26 @@ module Spec @story_file = args.empty? ? nil : args.shift yield self if block_given? end - + def []=(key, value) @options[key] = value end - + def load(path) @story_file = path end - + def run raise "You must set a path to the file with the story. See the RDoc." if @story_file.nil? mediator = Spec::Story::Runner::StoryMediator.new(steps, Spec::Story::Runner.story_runner, @options) parser = Spec::Story::Runner::StoryParser.new(mediator) - story_text = File.read(@story_file) + story_text = File.read(@story_file) parser.parse(story_text.split("\n")) mediator.run_stories end - + def steps @step_group ||= Spec::Story::StepGroup.new yield @step_group if block_given? rails_plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb @@ -3,12 +3,12 @@ module Spec module Runner class ScenarioCollector attr_accessor :scenarios - + def initialize(story) @story = story @scenarios = [] end - + def Scenario(name, &body) @scenarios << Scenario.new(@story, name, &body) end rails_plugins/rspec/lib/spec/story/runner/scenario_collector.rb @@ -5,11 +5,11 @@ module Spec def initialize @listeners = [] end - + def run(scenario, world) @listeners.each { |l| l.scenario_started(scenario.story.title, scenario.name) } run_story_ignoring_scenarios(scenario.story, world) - + world.start_collecting_errors world.instance_eval(&scenario.body) if world.errors.empty? @@ -22,13 +22,13 @@ module Spec end end end - + def add_listener(listener) @listeners << listener end - + private - + def run_story_ignoring_scenarios(story, world) class << world def Scenario(name, &block) rails_plugins/rspec/lib/spec/story/runner/scenario_runner.rb @@ -9,48 +9,48 @@ @runner = runner @options = options end - + def stories @stories.collect { |p| p.to_proc } end - + def create_story(title, narrative) @stories << Story.new(title, narrative, @step_group, @options) end - + def create_scenario(title) current_story.add_scenario Scenario.new(title) end - + def create_given(name) current_scenario.add_step Step.new('Given', name) end - + def create_given_scenario(name) current_scenario.add_step Step.new('GivenScenario', name) end - + def create_when(name) current_scenario.add_step Step.new('When', name) end - + def create_then(name) current_scenario.add_step Step.new('Then', name) end - + def run_stories stories.each { |story| @runner.instance_eval(&story) } end - + private def current_story @stories.last end - + def current_scenario current_story.current_scenario end - + class Story def initialize(title, narrative, step_group, options) @title = title @@ -59,7 +59,7 @@ @step_group = step_group @options = options end - + def to_proc title = @title narrative = @narrative @@ -71,22 +71,22 @@ end end end - + def add_scenario(scenario) @scenarios << scenario end - + def current_scenario @scenarios.last end end - + class Scenario def initialize(name) @name = name @steps = [] end - + def to_proc name = @name steps = @steps.collect { |step| step.to_proc } @@ -96,18 +96,18 @@ end end end - + def add_step(step) @steps << step end end - + class Step def initialize(type, name) @type = type @name = name end - + def to_proc type = @type name = @name @@ -117,7 +117,7 @@ end end end - + end end end rails_plugins/rspec/lib/spec/story/runner/story_mediator.rb @@ -1,7 +1,7 @@ module Spec module Story module Runner - + class IllegalStepError < StandardError def initialize(state, event) super("Illegal attempt to create a #{event} after a #{state}") @@ -14,7 +14,7 @@ module Spec @current_story_lines = [] transition_to(:starting_state) end - + def parse(lines) lines.reject! {|line| line == ""} until lines.empty? @@ -22,7 +22,7 @@ module Spec end @state.eof end - + def process_line(line) line.strip! case line @@ -41,34 +41,34 @@ module Spec @current_story_lines.clear add_story_line(title) end - + def add_story_line(line) @current_story_lines << line end - + def create_story() unless @current_story_lines.empty? @story_mediator.create_story(@current_story_lines[0].gsub("Story: ",""), @current_story_lines[1..-1].join("\n")) @current_story_lines.clear end end - + def create_scenario(title) @story_mediator.create_scenario(title.gsub("Scenario: ","")) end - + def create_given(name) @story_mediator.create_given(name) end - + def create_given_scenario(name) @story_mediator.create_given_scenario(name) end - + def create_when(name) @story_mediator.create_when(name) end - + def create_then(name) @story_mediator.create_then(name) end @@ -76,7 +76,7 @@ module Spec def transition_to(key) @state = states[key] end - + def states @states ||= { :starting_state => StartingState.new(self), @@ -87,12 +87,12 @@ module Spec :then_state => ThenState.new(self) } end - + class State def initialize(parser) @parser = parser end - + def story(line) @parser.init_story(line) @parser.transition_to(:story_state) @@ -107,17 +107,17 @@ module Spec @parser.create_given(remove_tag_from(:given, line)) @parser.transition_to(:given_state) end - + def given_scenario(line) @parser.create_given_scenario(remove_tag_from(:givenscenario, line)) @parser.transition_to(:given_state) end - + def event(line) @parser.create_when(remove_tag_from(:when, line)) @parser.transition_to(:when_state) end - + def outcome(line) @parser.create_then(remove_tag_from(:then, line)) @parser.transition_to(:then_state) @@ -126,24 +126,24 @@ module Spec def remove_tag_from(tag, line) tokens = line.split # validation of tag can go here - tokens[0].downcase.match(/#{tag.to_s}:?/) ? + tokens[0].downcase.match(/#{tag.to_s}:?/) ? (tokens[1..-1].join(' ')) : line end def eof end - + def other(line) # no-op - supports header text before the first story in a file end end - + class StartingState < State def initialize(parser) @parser = parser end end - + class StoryState < State def one_more_of_the_same(line) other(line) @@ -153,29 +153,29 @@ module Spec @parser.create_story @parser.add_story_line(line) end - + def scenario(line) @parser.create_story @parser.create_scenario(line) @parser.transition_to(:scenario_state) end - + def given(line) other(line) end - + def event(line) other(line) end - + def outcome(line) other(line) end - + def other(line) @parser.add_story_line(line) end - + def eof @parser.create_story end @@ -190,17 +190,17 @@ module Spec @parser.create_scenario(line) end end - + class GivenState < State def one_more_of_the_same(line) @parser.create_given(remove_tag_from(:and, line)) end - + def given(line) @parser.create_given(remove_tag_from(:given, line)) end end - + class WhenState < State def one_more_of_the_same(line) @parser.create_when(remove_tag_from(:and ,line)) rails_plugins/rspec/lib/spec/story/runner/story_parser.rb @@ -4,14 +4,14 @@ module Spec class StoryRunner class << self attr_accessor :current_story_runner - + def scenario_from_current_story(scenario_name) current_story_runner.scenario_from_current_story(scenario_name) end end - + attr_accessor :stories, :scenarios, :current_story - + def initialize(scenario_runner, world_creator = World) StoryRunner.current_story_runner = self @scenario_runner = scenario_runner @@ -21,18 +21,18 @@ module Spec @scenarios = [] @listeners = [] end - + def Story(title, narrative, params = {}, &body) story = Story.new(title, narrative, params, &body) @stories << story - + # collect scenarios collector = ScenarioCollector.new(story) story.run_in(collector) @scenarios += collector.scenarios @scenarios_by_story[story.title] = collector.scenarios end - + def run_stories return if @stories.empty? @listeners.each { |l| l.run_started(scenarios.size) } @@ -54,11 +54,11 @@ module Spec @listeners.each { |l| l.collected_steps(unique_steps) } @listeners.each { |l| l.run_ended } end - + def add_listener(listener) @listeners << listener end - + def scenario_from_current_story(scenario_name) @scenarios_by_story[@current_story.title].find {|s| s.name == scenario_name } end rails_plugins/rspec/lib/spec/story/runner/story_runner.rb @@ -3,7 +3,7 @@ module Spec module Story class Scenario attr_accessor :name, :body, :story - + def initialize(story, name, &body) @story = story @name = name rails_plugins/rspec/lib/spec/story/scenario.rb @@ -3,7 +3,7 @@ module Spec class Step PARAM_PATTERN = /(\$\w*)/ PARAM_OR_GROUP_PATTERN = /(\$\w*)|$.*?$/ - + attr_reader :name def initialize(name, &block) @name = name @@ -22,23 +22,23 @@ module Spec define_method(sanitized_name, &block) end end - + def sanitize(a_string_or_regexp) return a_string_or_regexp.source if Regexp == a_string_or_regexp a_string_or_regexp.to_s end - + def matches?(name) !(matches = name.match(@expression)).nil? end - + def parse_args(name) name.match(@expression)[1..-1] end private - + def assign_expression(string_or_regexp) if String === string_or_regexp expression = string_or_regexp.dup rails_plugins/rspec/lib/spec/story/step.rb @@ -15,7 +15,7 @@ module Spec @step_group.instance_eval(&block) if block @step_group end - + def initialize(init_defaults=true, &block) @hash_of_lists_of_steps = Hash.new {|h, k| h[k] = []} if init_defaults @@ -23,7 +23,7 @@ module Spec end instance_eval(&block) if block end - + def find(type, name) @hash_of_lists_of_steps[type].each do |step| return step if step.matches?(name) @@ -34,15 +34,15 @@ module Spec def GivenScenario(name, &block) create_matcher(:given_scenario, name, &block) end - + def Given(name, &block) create_matcher(:given, name, &block) end - + def When(name, &block) create_matcher(:when, name, &block) end - + def Then(name, &block) create_matcher(:then, name, &block) end @@ -51,39 +51,39 @@ module Spec alias :given :Given alias :when :When alias :then :Then - + def add(type, steps) (@hash_of_lists_of_steps[type] << steps).flatten! end - + def clear @hash_of_lists_of_steps.clear end - + def empty? [:given_scenario, :given, :when, :then].each do |type| return false unless @hash_of_lists_of_steps[type].empty? end return true end - + def add_to(other_step_matchers) [:given_scenario, :given, :when, :then].each do |type| other_step_matchers.add(type, @hash_of_lists_of_steps[type]) end end - + def <<(other_step_matchers) other_step_matchers.add_to(self) if other_step_matchers.respond_to?(:add_to) end - + # TODO - make me private def create_matcher(type, name, &block) matcher = Step.new(name, &block) @hash_of_lists_of_steps[type] << matcher matcher end - + end end end rails_plugins/rspec/lib/spec/story/step_group.rb @@ -4,15 +4,15 @@ module Spec def initialize @steps = StepGroup.new end - + def use(new_step_group) @steps << new_step_group end - + def store(type, step) @steps.add(type, step) end - + def find(type, name) if @steps.find(type, name).nil? @steps.add(type, @@ -23,15 +23,15 @@ module Spec end @steps.find(type, name) end - + def clear @steps.clear end - + def empty? @steps.empty? end - + end end end rails_plugins/rspec/lib/spec/story/step_mother.rb @@ -2,22 +2,22 @@ module Spec module Story class Story attr_reader :title, :narrative - + def initialize(title, narrative, params = {}, &body) @body = body @title = title @narrative = narrative @params = params end - + def [](key) @params[key] end - + def run_in(obj) obj.instance_eval(&@body) end - + def assign_steps_to(assignee) if @params[:steps] assignee.use(@params[:steps]) @@ -33,7 +33,7 @@ module Spec end end end - + def steps_for(key) $rspec_story_steps[key] end rails_plugins/rspec/lib/spec/story/story.rb @@ -7,7 +7,7 @@ module Spec module Story =begin A World represents the actual instance a scenario will run in. - + The runner ensures any instance variables and methods defined anywhere in a story block are available to all the scenarios. This includes variables that are created or referenced inside Given, When and Then @@ -23,23 +23,23 @@ module Spec def create(cls = Object, *args) cls.new(*args).extend(World) end - + def listeners @listeners ||= [] end - + def add_listener(listener) listeners() << listener end - + def step_mother @step_mother ||= StepMother.new end - + def use(steps) step_mother.use(steps) end - + def step_names @step_names ||= [] end @@ -54,7 +54,7 @@ module Spec @listeners.replace(current_listeners) end end - + def store_and_call(world, type, name, *args, &block) if block_given? step_mother.store(type, Step.new(name, &block)) @@ -63,7 +63,7 @@ module Spec step_name = step.name step_names << step_name - + # It's important to have access to the parsed args here, so # we can give them to the listeners. The HTML reporter needs # the args so it can style them. See the generated output in @@ -83,40 +83,40 @@ module Spec errors << e end end - + def errors @errors ||= [] end end # end of class << self - + def start_collecting_errors errors.clear end - + def errors World.errors end - + def GivenScenario(name) World.run_given_scenario_with_suspended_listeners(self, :'given scenario', name, GivenScenario.new(name)) @__previous_step = :given end - + def Given(name, *args, &block) World.store_and_call self, :given, name, *args, &block @__previous_step = :given end - + def When(name, *args, &block) World.store_and_call self, :when, name, *args, &block @__previous_step = :when end - + def Then(name, *args, &block) World.store_and_call self, :then, name, *args, &block @__previous_step = :then end - + def And(name, *args, &block) World.store_and_call self, @__previous_step, name, *args, &block end rails_plugins/rspec/lib/spec/story/world.rb @@ -11,7 +11,7 @@ module Spec translate_file(from, to) end end - + def translate_dir(from, to) FileUtils.mkdir_p(to) unless File.directory?(to) Dir["#{from}/*"].each do |sub_from| @@ -43,35 +43,35 @@ module Spec line.gsub!(/:string/, 'an_instance_of(String)') return line if line =~ /(should_not|should)_receive/ - + line.gsub!(/(^\s*)context([\s*|$]['|"|A-Z])/, '\1describe\2') line.gsub!(/(^\s*)specify([\s*|\(]['|"|A-Z])/, '\1it\2') line.gsub!(/(^\s*)context_setup(\s*[do|\{])/, '\1before(:all)\2') line.gsub!(/(^\s*)context_teardown(\s*[do|\{])/, '\1after(:all)\2') line.gsub!(/(^\s*)setup(\s*[do|\{])/, '\1before(:each)\2') line.gsub!(/(^\s*)teardown(\s*[do|\{])/, '\1after(:each)\2') - + if line =~ /(.*\.)(should_not|should)(?:_be)(?!_)(.*)/m pre = $1 should = $2 post = $3 be_or_equal = post =~ /(<|>)/ ? "be" : "equal" - + return "#{pre}#{should} #{be_or_equal}#{post}" end - + if line =~ /(.*\.)(should_not|should)_(?!not)\s*(.*)/m pre = $1 should = $2 post = $3 - + post.gsub!(/^raise/, 'raise_error') post.gsub!(/^throw/, 'throw_symbol') - + unless standard_matcher?(post) post = "be_#{post}" end - + # Add parenthesis post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*$|\'|\"|\:|@| ]+)(\})/, '\1(\2)\3') # inside a block post.gsub!(/^(redirect_to)\s+(.*)/, '\1(\2)') # redirect_to, which often has http: @@ -84,22 +84,22 @@ module Spec line end - + def standard_matcher?(matcher) patterns = [ - /^be/, + /^be/, /^be_close/, - /^eql/, - /^equal/, - /^has/, - /^have/, - /^change/, + /^eql/, + /^equal/, + /^has/, + /^have/, + /^change/, /^include/, - /^match/, - /^raise_error/, - /^respond_to/, - /^redirect_to/, - /^satisfy/, + /^match/, + /^raise_error/, + /^respond_to/, + /^redirect_to/, + /^satisfy/, /^throw_symbol/, # Extra ones that we use in spec_helper /^pass/, @@ -109,6 +109,6 @@ module Spec matched = patterns.detect{ |p| matcher =~ p } !matched.nil? end - + end end rails_plugins/rspec/lib/spec/translator.rb @@ -13,8 +13,8 @@ module Spec FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')} (build #{BUILD_TIME_UTC})" NAME = "RSpec" - URL = "http://rspec.rubyforge.org/" - + URL = "http://rspec.rubyforge.org/" + DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby\n#{URL}" end end rails_plugins/rspec/lib/spec/version.rb @@ -42,7 +42,7 @@ class PreCommit def root_dir dir = File.dirname(__FILE__) File.expand_path("#{dir}/../../../..") - end + end def method_missing(method_name, *args, &block) if actor.respond_to?(method_name) rails_plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb @@ -8,7 +8,7 @@ class PreCommit::Rspec < PreCommit pre_commit_rails ok_to_commit end - + def check_for_gem_dependencies require "rubygems" gem 'rake' @@ -39,7 +39,7 @@ class PreCommit::Rspec < PreCommit end end end - + # TODO - move me up to the project root def touch_revision_storing_files files = [ @@ -56,13 +56,13 @@ class PreCommit::Rspec < PreCommit end end end - + def pre_commit_core Dir.chdir 'rspec' do rake = (PLATFORM == "i386-mswin32") ? "rake.bat" : "rake" system("#{rake} pre_commit --verbose --trace") raise "RSpec Core pre_commit failed" if error_code? - end + end end def pre_commit_textmate_bundle @@ -70,7 +70,7 @@ class PreCommit::Rspec < PreCommit rake = (PLATFORM == "i386-mswin32") ? "rake.bat" : "rake" system("#{rake} spec --verbose --trace") raise "RSpec Textmate Bundle specs failed" if error_code? - end + end end def install_dependencies @@ -104,7 +104,7 @@ class PreCommit::Rspec < PreCommit end end end - + def ok_to_commit puts "OK TO COMMIT" end rails_plugins/rspec/pre_commit/lib/pre_commit/rspec.rb @@ -42,7 +42,7 @@ class PreCommit::RspecOnRails < PreCommit rake_sh "spec" rake_sh "spec:plugins:rspec_on_rails" - + # TODO - why is this necessary? Shouldn't the specs leave # a clean DB? rake_sh "db:test:prepare" @@ -91,12 +91,12 @@ class PreCommit::RspecOnRails < PreCommit rm_rf 'spec/spec.opts' rm_rf 'spec/rcov.opts' end - + def copy(source, target) output = silent_sh("cp -R #{File.expand_path(source)} #{File.expand_path(target)}") raise "Error installing rspec" if shell_error?(output) end - + def generate_rspec result = silent_sh("ruby script/generate rspec --force") if error_code? || result =~ /^Missing/ @@ -158,7 +158,7 @@ class PreCommit::RspecOnRails < PreCommit raise "rspec_scaffold failed. #{result}" end end - + def purchase_migration_version "005" end @@ -205,7 +205,7 @@ class PreCommit::RspecOnRails < PreCommit end puts "#####################################################" end - + def generate_login_controller generator = "ruby script/generate rspec_controller login signup login logout --force" notice = <<-EOF @@ -269,7 +269,7 @@ class PreCommit::RspecOnRails < PreCommit end end end - + def update_dependencies check_dependencies VENDOR_DEPS.each do |dep| rails_plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb' ## -# This is not a complete specification of PreCommit, but +# This is not a complete specification of PreCommit, but # just a collection of bug fix regression tests. describe "The helper method PreCommit#silent_sh" do before do rails_plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb @@ -4,7 +4,7 @@ require 'fileutils' include FileUtils ## -# This is not a complete specification of PreCommit.RSpecOnRails, but +# This is not a complete specification of PreCommit.RSpecOnRails, but # just a collection of bug fix regression tests. describe "RSpecOnRails pre_commit" do before do rails_plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -252,8 +252,8 @@ a { <dl> <dt id="example_group_9">Autotest::Rspec handling failed results</dt> <script type="text/javascript">moveProgressBar('1.2');</script> - <dd class="spec passed"><span class="passed_spec_name">should scan the output into a multi-dimensional array, - consisting of the failing spec's name as the first element, + <dd class="spec passed"><span class="passed_spec_name">should scan the output into a multi-dimensional array, + consisting of the failing spec's name as the first element, and the failure as the second</span></dd> </dl> </div> rails_plugins/rspec/report.html @@ -10,10 +10,10 @@ end class Autotest describe Rspec, "discovery" do include DiscoveryHelper - + it "should add the rspec autotest plugin" do Autotest.should_receive(:add_discovery).and_yield load_discovery end - end + end end rails_plugins/rspec/spec/autotest/discover_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../autotest_helper" class Autotest - + module AutotestHelper def rspec_output <<-HERE @@ -22,8 +22,8 @@ Autotest::Rspec handling failed results should return an array of failed example Autotest::Rspec tests/specs for a given file should find all the specs for a given file (TODO) HERE end - - + + def common_setup @proc = mock Proc @kernel = mock Kernel @@ -45,15 +45,15 @@ HERE ] end end - + describe Rspec, "selection of rspec command" do include AutotestHelper - + before :each do common_setup @rspec_autotest = Rspec.new end - + it "should try to find the spec command if it exists in ./bin and use it above everything else" do File.stub!(:exists?).and_return true @@ -69,31 +69,31 @@ HERE @rspec_autotest.spec_command.should == "/foo/spec" end - + it "should raise an error if no spec command is found at all" do File.stub!(:exists?).and_return false - + lambda { @rspec_autotest.spec_command }.should raise_error(RspecCommandError, "No spec command could be found!") end - + end - + describe Rspec, "selection of rspec command (windows compatibility issues)" do include AutotestHelper - + before :each do common_setup end - + it "should use the ALT_SEPARATOR if it is non-nil" do @rspec_autotest = Rspec.new spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec") @rspec_autotest.stub!(:spec_commands).and_return [spec_command] @rspec_autotest.spec_command(@windows_alt_separator).should == spec_command.gsub('/', @windows_alt_separator) end - + it "should not use the ALT_SEPATOR if it is nil" do @windows_alt_separator = nil @rspec_autotest = Rspec.new @@ -103,7 +103,7 @@ HERE end end - describe Rspec, "adding spec.opts --options" do + describe Rspec, "adding spec.opts --options" do before :each do @rspec_autotest = Rspec.new end @@ -117,14 +117,14 @@ HERE File.stub!(:exist?).and_return false Rspec.new.add_options_if_present.should == "" end - end - + end + describe Rspec do before :each do @rspec_autotest = Rspec.new @rspec_autotest.stub!(:ruby).and_return "ruby" @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts" - + @ruby = @rspec_autotest.ruby @spec_command = @rspec_autotest.spec_command @options = @rspec_autotest.add_options_if_present @@ -136,60 +136,60 @@ HERE @files_to_test.stub!(:keys).and_return @files_to_test[:spec] @to_test = @files_to_test.keys.flatten.join ' ' end - + it "should make the apropriate test command" do @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} -S #{@spec_command} #{@options} #{@to_test}" end end - + describe Rspec, "mappings" do - + before(:each) do @lib_file = "lib/something.rb" @spec_file = "spec/something_spec.rb" @rspec_autotest = Rspec.new @rspec_autotest.hook :initialize end - + it "should find the spec file for a given lib file" do @rspec_autotest.should map_specs([@spec_file]).to(@lib_file) end - + it "should find the spec file if given a spec file" do @rspec_autotest.should map_specs([@spec_file]).to(@spec_file) end - + it "should only find the file if the file is being tracked (in @file)" do @rspec_autotest.should map_specs([]).to("lib/untracked_file") end end - + describe Rspec, "consolidating failures" do include AutotestHelper - + before :each do common_setup @rspec_autotest = Rspec.new - + @spec_file = "./spec/autotest/rspec_spec.rb" @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now}) @rspec_autotest.stub!(:find_files_to_test).and_return true end - + it "should return no failures if no failures were given in the output" do @rspec_autotest.consolidate_failures([[]]).should == {} end - + it "should return a hash with the spec filename => spec name for each failure or error" do @rspec_autotest.stub!(:test_files_for).and_return "./spec/autotest/rspec_spec.rb" foo = [ [ - "false should be false", + "false should be false", "expected: true,\n got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:" ] ] @rspec_autotest.consolidate_failures(foo).should == {@spec_file => ["false should be false"]} end - + end end rails_plugins/rspec/spec/autotest/rspec_spec.rb @@ -4,29 +4,29 @@ module Spec def initialize(specs) @specs = specs end - + def to(file) @file = file self end - + def matches?(autotest) @autotest = prepare autotest @actual = autotest.test_files_for(@file) @actual == @specs end - + def failure_message "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}" end - + private def prepare autotest stub_found_files autotest stub_find_order autotest autotest end - + def stub_found_files autotest found_files = @specs.inject({}){|h,f| h[f] = Time.at(0)} autotest.stub!(:find_files).and_return(found_files) @@ -38,10 +38,10 @@ module Spec end end - + def map_specs(specs) AutotestMappingMatcher.new(specs) end - + end end \ No newline at end of file rails_plugins/rspec/spec/autotest_matchers.rb @@ -2,13 +2,13 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Example - + describe Configuration do before(:each) do @config = Configuration.new @example_group = mock("example_group") end - + describe "#mock_with" do it "should default mock framework to rspec" do @@ -86,11 +86,11 @@ module Spec end end - + end describe Configuration do - + before(:each) do @config = Configuration.new @special_example_group = Class.new(ExampleGroup) @@ -136,7 +136,7 @@ module Spec end @example_group.it "calls prepend_before" do end - + @example_group.run order.should == [ :prepend__before_all, rails_plugins/rspec/spec/spec/example/configuration_spec.rb @@ -29,7 +29,7 @@ module Spec ExampleGroupFactory.get(@example_group).should == @example_group end - end + end describe ExampleGroupFactory, "#create_example_group" do it "should create a uniquely named class" do @@ -66,7 +66,7 @@ module Spec ) {} example_group.superclass.should == klass end - + it "should create a type indicated by :spec_path" do klass = Class.new(ExampleGroup) do def initialize(*args, &block); end @@ -77,7 +77,7 @@ module Spec ) {} example_group.superclass.should == klass end - + it "should create a type indicated by :spec_path (with spec_path generated by caller on windows)" do klass = Class.new(ExampleGroup) do def initialize(*args, &block); end @@ -88,7 +88,7 @@ module Spec ) {} example_group.superclass.should == klass end - + it "should create and register a Spec::Example::Example if :shared => true" do shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group( "name", :spec_path => '/blah/spec/models/blah.rb', :type => :controller, :shared => true @@ -120,7 +120,7 @@ module Spec end rspec_options.example_groups.should_not include(example_group) end - + after(:each) do Spec::Example::ExampleGroupFactory.reset end rails_plugins/rspec/spec/spec/example/example_group_factory_spec.rb @@ -320,12 +320,12 @@ module Spec end child_example_group.description.should == "ExampleGroup.foobar Does something" end - + it "should return the class name if nil" do example_group.set_description(nil) example_group.description.should =~ /Class:/ end - + it "should return the class name if nil" do example_group.set_description("") example_group.description.should =~ /Class:/ @@ -461,7 +461,7 @@ module Spec it "should add ExampleGroup to set of ExampleGroups to be run" do options.example_groups.delete(example_group) options.example_groups.should_not include(example_group) - + example_group.register {} options.example_groups.should include(example_group) end rails_plugins/rspec/spec/spec/example/example_group_methods_spec.rb @@ -97,7 +97,7 @@ module Spec reporter.should_not_receive(:add_example_group) example_group.run end - + describe "when before_each fails" do before(:each) do $example_ran = $after_each_ran = false @@ -116,7 +116,7 @@ module Spec example_group.run $example_ran.should be_false end - + it "should run after_each" do example_group.run $after_each_ran.should be_true rails_plugins/rspec/spec/spec/example/example_group_spec.rb @@ -7,15 +7,15 @@ module Spec def initialize(description) @description = description end - + def matches?(matcher) matcher.matches?(@description) end - + def failure_message "expected matcher.matches?(#{@description.inspect}) to return true, got false" end - + def negative_failure_message "expected matcher.matches?(#{@description.inspect}) to return false, got true" end @@ -27,22 +27,22 @@ module Spec describe ExampleMatcher, "#matches?" do include ExampleMatcherSpecHelper - + it "should match correct example_group and example" do matcher = ExampleMatcher.new("example_group", "example") matcher.should match_description("example_group example") end - + it "should not match wrong example" do matcher = ExampleMatcher.new("example_group", "other example") matcher.should_not match_description("example_group example") end - + it "should not match wrong example_group" do matcher = ExampleMatcher.new("other example_group", "example") matcher.should_not match_description("example_group example") end - + it "should match example only" do matcher = ExampleMatcher.new("example_group", "example") matcher.should match_description("example") @@ -57,16 +57,16 @@ module Spec matcher = ExampleMatcher.new("example_group", "example") matcher.should match_description("example_group before(:all)") end - + it "should escape regexp chars" do matcher = ExampleMatcher.new("(con|text)", "[example]") matcher.should_not match_description("con p") end - + it "should match when example_group is modularized" do matcher = ExampleMatcher.new("MyModule::MyClass", "example") matcher.should match_description("MyClass example") - end + end end describe ExampleMatcher, "#matches? normal case" do rails_plugins/rspec/spec/spec/example/example_matcher_spec.rb @@ -12,7 +12,7 @@ module Spec # describe("Some Examples") # end # end - # + # # def create_runner(example_definition) # example = @example_group_class.new(example_definition) # runner = ExampleGroup.new(@options, example) @@ -21,43 +21,43 @@ module Spec # runner # end # end - # + # # describe ExampleRunner, "#run with blank passing example" do # it_should_behave_like "Spec::Example::ExampleRunner#run" - # + # # before do # @e = @example_group_class.it("example") {} # @runner = create_runner(@e) # end - # + # # it "should send reporter example_started" do # @reporter.should_receive(:example_started).with(equal(@e)) # @runner.run # end - # + # # it "should report its name for dry run" do # @options.dry_run = true # @reporter.should_receive(:example_finished).with(equal(@e), nil) # @runner.run # end - # + # # it "should report success" do # @reporter.should_receive(:example_finished).with(equal(@e), nil) # @runner.run # end # end - # + # # describe ExampleRunner, "#run with a failing example" do # predicate_matchers[:is_a] = [:is_a?] # it_should_behave_like "Spec::Example::ExampleRunner#run" - # + # # before do # @e = @example_group_class.it("example") do # (2+2).should == 5 # end # @runner = create_runner(@e) # end - # + # # it "should report failure due to failure" do # @reporter.should_receive(:example_finished).with( # equal(@e), @@ -66,10 +66,10 @@ module Spec # @runner.run # end # end - # + # # describe ExampleRunner, "#run with a erroring example" do # it_should_behave_like "Spec::Example::ExampleRunner#run" - # + # # before do # @error = error = NonStandardError.new("in body") # @example_definition = @example_group_class.it("example") do @@ -77,7 +77,7 @@ module Spec # end # @runner = create_runner(@example_definition) # end - # + # # it "should report failure due to error" do # @reporter.should_receive(:example_finished).with( # equal(@example_definition), @@ -85,7 +85,7 @@ module Spec # ) # @runner.run # end - # + # # it "should run after_each block" do # @example_group_class.after(:each) do # raise("in after_each") @@ -95,12 +95,12 @@ module Spec # error.message.should eql("in body") # end # @runner.run - # end + # end # end - # + # # describe ExampleRunner, "#run where after_each fails" do # it_should_behave_like "Spec::Example::ExampleRunner#run" - # + # # before do # @example_ran = example_ran = false # @example_definition = @example_group_class.it("should not run") do @@ -109,7 +109,7 @@ module Spec # @runner = create_runner(@example_definition) # @example_group_class.after(:each) { raise(NonStandardError.new("in after_each")) } # end - # + # # it "should report failure location when in after_each" do # @reporter.should_receive(:example_finished) do |example_definition, error| # example_definition.should equal(@example_definition) @@ -118,37 +118,37 @@ module Spec # @runner.run # end # end - # + # # describe ExampleRunner, "#run with use cases" do # predicate_matchers[:is_a] = [:is_a?] # it_should_behave_like "Spec::Example::ExampleRunner#run" - # + # # it "should report NO NAME when told to use generated description with --dry-run" do # @options.dry_run = true # example_definition = @example_group_class.it() do # 5.should == 5 # end # runner = create_runner(example_definition) - # + # # @reporter.should_receive(:example_finished) do |example_definition, error| # example_definition.description.should == "NO NAME (Because of --dry-run)" # end # runner.run # end - # + # # it "should report given name if present with --dry-run" do # @options.dry_run = true # example_definition = @example_group_class.it("example name") do # 5.should == 5 # end # runner = create_runner(example_definition) - # + # # @reporter.should_receive(:example_finished) do |example_definition, error| # example_definition.description.should == "example name" # end # runner.run # end - # + # # it "should report NO NAME when told to use generated description with no expectations" do # example_definition = @example_group_class.it() {} # runner = create_runner(example_definition) @@ -157,35 +157,35 @@ module Spec # end # runner.run # end - # + # # it "should report NO NAME when told to use generated description and matcher fails" do # example_definition = @example_group_class.it() do # 5.should "" # Has no matches? method.. # end # runner = create_runner(example_definition) - # + # # @reporter.should_receive(:example_finished) do |example, error| # example_definition.description.should == "NO NAME (Because of Error raised in matcher)" # end # runner.run # end - # + # # it "should report generated description when told to and it is available" do # example_definition = @example_group_class.it() { # 5.should == 5 # } # runner = create_runner(example_definition) - # + # # @reporter.should_receive(:example_finished) do |example_definition, error| # example_definition.description.should == "should == 5" # end # runner.run # end - # + # # it "should unregister description_generated callback (lest a memory leak should build up)" do # example_definition = @example_group_class.it("something") # runner = create_runner(example_definition) - # + # # Spec::Matchers.should_receive(:example_finished) # runner.run # end rails_plugins/rspec/spec/spec/example/example_runner_spec.rb @@ -8,11 +8,11 @@ module Spec # foo # end # end - # + # # it "should tell you its docstring" do # @example.description.should == "example" # end - # + # # it "should execute its block in the context provided" do # context = Class.new do # def foo @@ -22,25 +22,25 @@ module Spec # @example.run_in(context).should == "foo" # end # end - # + # # describe Example, "#description" do # it "should default to NO NAME when not passed anything when there are no matchers" do # example = Example.new {} # example.run_in(Object.new) # example.description.should == "NO NAME" # end - # + # # it "should default to NO NAME description (Because of --dry-run) when passed nil and there are no matchers" do # example = Example.new(nil) {} # example.run_in(Object.new) # example.description.should == "NO NAME" # end - # + # # it "should allow description to be overridden" do # example = Example.new("Test description") # example.description.should == "Test description" # end - # + # # it "should use description generated from matcher when there is no passed in description" do # example = Example.new(nil) do # 1.should == 1 rails_plugins/rspec/spec/spec/example/example_spec.rb @@ -4,7 +4,7 @@ module Spec module Example describe 'Nested Example Groups' do parent = self - + def count @count ||= 0 @count = @count + 1 @@ -49,7 +49,7 @@ module Spec describe 'nested example group' do self.superclass.should == parent - + it "should run all before and after callbacks" do count.should == 5 end rails_plugins/rspec/spec/spec/example/nested_example_group_spec.rb @@ -1,14 +1,14 @@ module Spec module Example describe Pending do - + it 'should raise an ExamplePendingError if no block is supplied' do lambda { include Pending pending "TODO" }.should raise_error(ExamplePendingError, /TODO/) end - + it 'should raise an ExamplePendingError if a supplied block fails as expected' do lambda { include Pending @@ -17,7 +17,7 @@ module Spec end }.should raise_error(ExamplePendingError, /TODO/) end - + it 'should raise a PendingExampleFixedError if a supplied block starts working' do lambda { include Pending rails_plugins/rspec/spec/spec/example/pending_module_spec.rb @@ -7,7 +7,7 @@ module Spec distance_in_yards < 1000 end end - + describe "predicate_matcher[method_on_object] = matcher_method" do predicate_matchers[:swim] = :can_swim? it "should match matcher_method if method_on_object returns true" do rails_plugins/rspec/spec/spec/example/predicate_matcher_spec.rb @@ -130,11 +130,11 @@ module Spec shared_example_group = describe "all things", :shared => true do it "should do stuff" do end end - + example_group = describe "one thing" do include shared_example_group end - + example_group.number_of_examples.should == 1 end @@ -142,11 +142,11 @@ module Spec AllThings = describe "all things", :shared => true do it "should do stuff" do end end - + example_group = describe "one thing" do it_should_behave_like AllThings end - + example_group.number_of_examples.should == 1 end rails_plugins/rspec/spec/spec/example/shared_example_group_spec.rb @@ -7,12 +7,12 @@ describe Object, "#should" do @matcher.stub!(:matches?).and_return(true) @matcher.stub!(:failure_message) end - + it "should accept and interact with a matcher" do - @matcher.should_receive(:matches?).with(@target).and_return(true) + @matcher.should_receive(:matches?).with(@target).and_return(true) @target.should @matcher end - + it "should ask for a failure_message when matches? returns false" do @matcher.should_receive(:matches?).with(@target).and_return(false) @matcher.should_receive(:failure_message).and_return("the failure message") @@ -20,25 +20,25 @@ describe Object, "#should" do @target.should @matcher }.should fail_with("the failure message") end - + it "should raise error if it receives false directly" do lambda { @target.should false }.should raise_error(Spec::Expectations::InvalidMatcherError) end - + it "should raise error if it receives false (evaluated)" do lambda { @target.should eql?("foo") }.should raise_error(Spec::Expectations::InvalidMatcherError) end - + it "should raise error if it receives true" do lambda { @target.should true }.should raise_error(Spec::Expectations::InvalidMatcherError) end - + it "should raise error if it receives nil" do lambda { @target.should nil @@ -58,14 +58,14 @@ describe Object, "#should_not" do @target = "target" @matcher = mock("matcher") end - + it "should accept and interact with a matcher" do @matcher.should_receive(:matches?).with(@target).and_return(false) @matcher.stub!(:negative_failure_message) - + @target.should_not @matcher end - + it "should ask for a negative_failure_message when matches? returns true" do @matcher.should_receive(:matches?).with(@target).and_return(true) @matcher.should_receive(:negative_failure_message).and_return("the negative failure message") @@ -79,13 +79,13 @@ describe Object, "#should_not" do @target.should_not false }.should raise_error(Spec::Expectations::InvalidMatcherError) end - + it "should raise error if it receives false (evaluated)" do lambda { @target.should_not eql?("foo") }.should raise_error(Spec::Expectations::InvalidMatcherError) end - + it "should raise error if it receives true" do lambda { @target.should_not true rails_plugins/rspec/spec/spec/expectations/extensions/object_spec.rb @@ -5,13 +5,13 @@ describe Spec::Expectations, "#fail_with with no diff" do @old_differ = Spec::Expectations.differ Spec::Expectations.differ = nil end - + it "should handle just a message" do lambda { Spec::Expectations.fail_with "the message" }.should fail_with("the message") end - + it "should handle an Array" do lambda { Spec::Expectations.fail_with ["the message","expected","actual"] @@ -29,27 +29,27 @@ describe Spec::Expectations, "#fail_with with diff" do @differ = mock("differ") Spec::Expectations.differ = @differ end - + it "should not call differ if no expected/actual" do lambda { Spec::Expectations.fail_with "the message" }.should fail_with("the message") end - + it "should call differ if expected/actual are presented separately" do @differ.should_receive(:diff_as_string).and_return("diff") lambda { Spec::Expectations.fail_with "the message", "expected", "actual" }.should fail_with("the message\nDiff:diff") end - + it "should call differ if expected/actual are not strings" do @differ.should_receive(:diff_as_object).and_return("diff") lambda { Spec::Expectations.fail_with "the message", :expected, :actual }.should fail_with("the message\nDiff:diff") end - + it "should not call differ if expected or actual are procs" do @differ.should_not_receive(:diff_as_string) @differ.should_not_receive(:diff_as_object) @@ -57,14 +57,14 @@ describe Spec::Expectations, "#fail_with with diff" do Spec::Expectations.fail_with "the message", lambda {}, lambda {} }.should fail_with("the message") end - + it "should call differ if expected/actual are presented in an Array with message" do @differ.should_receive(:diff_as_string).with("actual","expected").and_return("diff") lambda { Spec::Expectations.fail_with(["the message", "expected", "actual"]) }.should fail_with(/the message\nDiff:diff/) end - + after(:each) do Spec::Expectations.differ = @old_differ end rails_plugins/rspec/spec/spec/expectations/fail_with_spec.rb @@ -16,7 +16,7 @@ module Spec @main.send(:rspec_options).should be_instance_of(Spec::Runner::Options) @main.send(:rspec_options).should === $rspec_options end - + specify {@main.should respond_to(:describe)} specify {@main.should respond_to(:context)} @@ -40,12 +40,12 @@ module Spec rspec_options.example_groups.should_not include(example_group) end - + it "should create a shared ExampleGroup with share_examples_for" do group = @main.share_examples_for "all things" do end group.should be_an_instance_of(Spec::Example::SharedExampleGroup) end - + describe "#share_as" do before(:each) do $share_as_examples_example_module_number ||= 1 @@ -58,18 +58,18 @@ module Spec group = @main.share_as @group_name do end group.should be_an_instance_of(Spec::Example::SharedExampleGroup) end - + it "should create a constant that points to a Module" do group = @main.share_as @group_name do end Object.const_get(@group_name).should equal(group) end - + it "should bark if you pass it something not-constantizable" do lambda do @group = @main.share_as "Non Constant" do end end.should raise_error(NameError, /The first argument to share_as must be a legal name for a constant/) end - + end end end rails_plugins/rspec/spec/spec/extensions/main_spec.rb @@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/test_unit_spec_helper' describe "ExampleGroup with test/unit/interop" do include TestUnitSpecHelper - + before(:each) do @dir = File.dirname(__FILE__) + "/resources" end - + describe "with passing examples" do it "should output 0 failures" do output = ruby("#{@dir}/spec_that_passes.rb") rails_plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb @@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/../../../../ruby_forker' module TestUnitSpecHelper include RubyForker - + def run_script(file_name) output = ruby(file_name) if !$?.success? || output.include?("FAILED") || output.include?("Error") raise output end output - end + end end \ No newline at end of file rails_plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb @@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/test_unit_spec_helper' describe "Test::Unit::TestCase" do include TestUnitSpecHelper - + before(:each) do @dir = File.dirname(__FILE__) + "/resources" end - + describe "with passing test case" do it "should output 0 failures" do output = ruby("#{@dir}/test_case_that_passes.rb") rails_plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' -describe "should be_predicate" do +describe "should be_predicate" do it "should pass when actual returns true for :predicate?" do actual = stub("actual", :happy? => true) actual.should be_happy @@ -17,7 +17,7 @@ describe "should be_predicate" do actual.should be_happy }.should fail_with("expected happy? to return true, got false") end - + it "should fail when actual does not respond to :predicate?" do lambda { Object.new.should be_happy @@ -30,7 +30,7 @@ describe "should_not be_predicate" do actual = stub("actual", :happy? => false) actual.should_not be_happy end - + it "should fail when actual returns true for :sym?" do actual = stub("actual", :happy? => true) lambda { @@ -59,7 +59,7 @@ describe "should be_predicate(*args)" do actual.should be_older_than(3) }.should fail_with("expected older_than?(3) to return true, got false") end - + it "should fail when actual does not respond to :predicate?" do lambda { Object.new.should be_older_than(3) @@ -73,7 +73,7 @@ describe "should_not be_predicate(*args)" do actual.should_receive(:older_than?).with(3).and_return(false) actual.should_not be_older_than(3) end - + it "should fail when actual returns true for :predicate?(*args)" do actual = mock("actual") actual.should_receive(:older_than?).with(3).and_return(true) rails_plugins/rspec/spec/spec/matchers/be_spec.rb @@ -54,7 +54,7 @@ describe "should change { block }" do lambda {}.should change{ @instance.some_value } end.should fail_with("result should have changed, but is still 5") end - + it "should warn if passed a block using do/end" do lambda do lambda {}.should change do @@ -78,7 +78,7 @@ describe "should_not change { block }" do lambda {@instance.some_value = 6}.should_not change { @instance.some_value } end.should fail_with("result should not have changed, but did change from 5 to 6") end - + it "should warn if passed a block using do/end" do lambda do lambda {}.should_not change do @@ -142,10 +142,10 @@ describe "should change(actual, message).by_at_least(expected)" do it "should pass when attribute is changed by greater than the expected amount" do lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(1) end - + it "should pass when attribute is changed by the expected amount" do lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(2) - end + end it "should fail when the attribute is changed by less than the expected amount" do lambda do @@ -164,10 +164,10 @@ describe "should change{ block }.by_at_least(expected)" do it "should pass when attribute is changed by greater than expected amount" do lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(1) end - + it "should pass when attribute is changed by the expected amount" do lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(2) - end + end it "should fail when the attribute is changed by less than the unexpected amount" do lambda do @@ -186,10 +186,10 @@ describe "should change(actual, message).by_at_most(expected)" do it "should pass when attribute is changed by less than the expected amount" do lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(3) end - + it "should pass when attribute is changed by the expected amount" do lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(2) - end + end it "should fail when the attribute is changed by greater than the expected amount" do lambda do @@ -208,10 +208,10 @@ describe "should change{ block }.by_at_most(expected)" do it "should pass when attribute is changed by less than expected amount" do lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(3) end - + it "should pass when attribute is changed by the expected amount" do lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(2) - end + end it "should fail when the attribute is changed by greater than the unexpected amount" do lambda do @@ -259,7 +259,7 @@ describe "should change(actual, message).to(new)" do @instance = SomethingExpected.new @instance.some_value = 'string' end - + it "should pass when attribute is == to expected value after executing block" do lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat") end @@ -276,7 +276,7 @@ describe "should change{ block }.to(new)" do @instance = SomethingExpected.new @instance.some_value = 'string' end - + it "should pass when attribute is == to expected value after executing block" do lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat") end @@ -293,7 +293,7 @@ describe "should change(actual, message).from(old).to(new)" do @instance = SomethingExpected.new @instance.some_value = 'string' end - + it "should pass when #to comes before #from" do lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat").from("string") end @@ -308,7 +308,7 @@ describe "should change{ block }.from(old).to(new)" do @instance = SomethingExpected.new @instance.some_value = 'string' end - + it "should pass when #to comes before #from" do lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat").from("string") end rails_plugins/rspec/spec/spec/matchers/change_spec.rb @@ -9,42 +9,42 @@ describe "Matchers should be able to generate their own descriptions" do "this".should == "this" Spec::Matchers.generated_description.should == "should == \"this\"" end - + it "should not == expected" do "this".should_not == "that" Spec::Matchers.generated_description.should == "should not == \"that\"" end - + it "should be empty (arbitrary predicate)" do [].should be_empty Spec::Matchers.generated_description.should == "should be empty" end - + it "should not be empty (arbitrary predicate)" do [1].should_not be_empty Spec::Matchers.generated_description.should == "should not be empty" end - + it "should be true" do true.should be_true Spec::Matchers.generated_description.should == "should be true" end - + it "should be false" do false.should be_false Spec::Matchers.generated_description.should == "should be false" end - + it "should be nil" do nil.should be_nil Spec::Matchers.generated_description.should == "should be nil" end - + it "should be > n" do 5.should be > 3 Spec::Matchers.generated_description.should == "should be > 3" end - + it "should be predicate arg1, arg2 and arg3" do 5.0.should be_between(0,10) Spec::Matchers.generated_description.should == "should be between 0 and 10" @@ -61,88 +61,88 @@ describe "Matchers should be able to generate their own descriptions" do 5.should be_an_instance_of(Fixnum) Spec::Matchers.generated_description.should == "should be an instance of Fixnum" end - + it "should equal" do expected = "expected" expected.should equal(expected) Spec::Matchers.generated_description.should == "should equal \"expected\"" end - + it "should_not equal" do 5.should_not equal(37) Spec::Matchers.generated_description.should == "should not equal 37" end - + it "should eql" do "string".should eql("string") Spec::Matchers.generated_description.should == "should eql \"string\"" end - + it "should not eql" do "a".should_not eql(:a) Spec::Matchers.generated_description.should == "should not eql :a" end - + it "should have_key" do {:a => "a"}.should have_key(:a) Spec::Matchers.generated_description.should == "should have key :a" end - + it "should have n items" do team.should have(3).players Spec::Matchers.generated_description.should == "should have 3 players" end - + it "should have at least n items" do team.should have_at_least(2).players Spec::Matchers.generated_description.should == "should have at least 2 players" end - + it "should have at most n items" do team.should have_at_most(4).players Spec::Matchers.generated_description.should == "should have at most 4 players" end - + it "should include" do [1,2,3].should include(3) Spec::Matchers.generated_description.should == "should include 3" end - + it "should match" do "this string".should match(/this string/) Spec::Matchers.generated_description.should == "should match /this string/" end - + it "should raise_error" do lambda { raise }.should raise_error Spec::Matchers.generated_description.should == "should raise Exception" end - + it "should raise_error with type" do lambda { raise }.should raise_error(RuntimeError) Spec::Matchers.generated_description.should == "should raise RuntimeError" end - + it "should raise_error with type and message" do lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error") Spec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\"" end - + it "should respond_to" do [].should respond_to(:insert) Spec::Matchers.generated_description.should == "should respond to #insert" end - + it "should throw symbol" do lambda { throw :what_a_mess }.should throw_symbol Spec::Matchers.generated_description.should == "should throw a Symbol" end - + it "should throw symbol (with named symbol)" do lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess) Spec::Matchers.generated_description.should == "should throw :what_a_mess" end - + def team Class.new do def players rails_plugins/rspec/spec/spec/matchers/description_generation_spec.rb @@ -12,7 +12,7 @@ class Substance @description end end - + class SubstanceTester include Spec::Matchers def initialize substance @@ -24,22 +24,22 @@ class SubstanceTester end describe "should exist," do - + before(:each) do @real = Substance.new true, 'something real' @imaginary = Substance.new false, 'something imaginary' end describe "within an example group" do - + it "should pass if target exists" do @real.should exist end - + it "should fail if target does not exist" do lambda { @imaginary.should exist }.should fail end - + it "should pass if target doesn't exist" do lambda { @real.should_not exist }.should fail end rails_plugins/rspec/spec/spec/matchers/exist_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module ExampleExpectations - + class ArbitraryMatcher def initialize(*args, &block) if args.last.is_a? Hash @@ -12,38 +12,38 @@ module ExampleExpectations end @block = block end - + def matches?(target) @target = target return @expected == target end - + def with(new_value) @expected = new_value self end - + def failure_message "expected #{@expected}, got #{@target}" end - + def negative_failure_message "expected not #{@expected}, got #{@target}" end end - + class PositiveOnlyMatcher < ArbitraryMatcher undef negative_failure_message rescue nil end - + def arbitrary_matcher(*args, &block) ArbitraryMatcher.new(*args, &block) end - + def positive_only_matcher(*args, &block) PositiveOnlyMatcher.new(*args, &block) end - + end module Spec @@ -55,7 +55,7 @@ module Spec matcher.should_receive(:matches?).with(actual).and_return(true) ExpectationMatcherHandler.handle_matcher(actual, matcher) end - + it "should explain when the matcher parameter is not a matcher" do begin nonmatcher = mock("nonmatcher") @@ -76,8 +76,8 @@ module Spec lambda { NegativeExpectationMatcherHandler.handle_matcher(actual, matcher) }.should fail_with(/Matcher does not support should_not.\n/) - end - + end + it "should ask the matcher if it matches" do matcher = mock("matcher") actual = Object.new @@ -85,7 +85,7 @@ module Spec matcher.should_receive(:matches?).with(actual).and_return(false) NegativeExpectationMatcherHandler.handle_matcher(actual, matcher) end - + it "should explain when the matcher parameter is not a matcher" do begin nonmatcher = mock("nonmatcher") @@ -97,10 +97,10 @@ module Spec e.message.should =~ /^Expected a matcher, got / end end - + describe ExpectationMatcherHandler do include ExampleExpectations - + it "should handle submitted args" do 5.should arbitrary_matcher(:expected => 5) 5.should arbitrary_matcher(:expected => "wrong").with(5) @@ -117,7 +117,7 @@ module Spec 5.should arbitrary_matcher(:expected => 4) { 5 } 5.should arbitrary_matcher(:expected => 4).with(5) { 3 } end - + it "should explain when matcher does not support should_not" do lambda { 5.should_not positive_only_matcher(:expected => 5) rails_plugins/rspec/spec/spec/matchers/handler_spec.rb @@ -35,7 +35,7 @@ describe "should have(n).items" do owner.should have(4).items_in_collection_with_size_method }.should fail_with("expected 4 items_in_collection_with_size_method, got 3") end - + it "should fail if target has a collection of items with > n members" do owner = create_collection_owner_with(3) lambda { @@ -49,7 +49,7 @@ end describe 'should have(1).item when Inflector is defined' do include HaveSpecHelper - + before do unless Object.const_defined?(:Inflector) class Inflector @@ -59,7 +59,7 @@ describe 'should have(1).item when Inflector is defined' do end end end - + it 'should pluralize the collection name' do owner = create_collection_owner_with(1) owner.should have(1).item @@ -87,7 +87,7 @@ describe "should_not have(n).items" do owner.should_not have(4).items_in_collection_with_length_method owner.should_not have(4).items_in_collection_with_size_method end - + it "should pass if target has a collection of items with > n members" do owner = create_collection_owner_with(3) owner.should_not have(2).items_in_collection_with_length_method @@ -129,7 +129,7 @@ describe "should have_exactly(n).items" do owner.should have_exactly(4).items_in_collection_with_size_method }.should fail_with("expected 4 items_in_collection_with_size_method, got 3") end - + it "should fail if target has a collection of items with > n members" do owner = create_collection_owner_with(3) lambda { @@ -149,7 +149,7 @@ describe "should have_at_least(n).items" do owner.should have_at_least(3).items_in_collection_with_length_method owner.should have_at_least(3).items_in_collection_with_size_method end - + it "should pass if target has a collection of items with > n members" do owner = create_collection_owner_with(3) owner.should have_at_least(2).items_in_collection_with_length_method @@ -165,17 +165,17 @@ describe "should have_at_least(n).items" do owner.should have_at_least(4).items_in_collection_with_size_method }.should fail_with("expected at least 4 items_in_collection_with_size_method, got 3") end - + it "should provide educational negative failure messages" do #given owner = create_collection_owner_with(3) length_matcher = have_at_least(3).items_in_collection_with_length_method size_matcher = have_at_least(3).items_in_collection_with_size_method - + #when length_matcher.matches?(owner) size_matcher.matches?(owner) - + #then length_matcher.negative_failure_message.should == <<-EOF Isn't life confusing enough? @@ -213,7 +213,7 @@ describe "should have_at_most(n).items" do owner.should have_at_most(2).items_in_collection_with_size_method }.should fail_with("expected at most 2 items_in_collection_with_size_method, got 3") end - + it "should pass if target has a collection of items with < n members" do owner = create_collection_owner_with(3) owner.should have_at_most(4).items_in_collection_with_length_method @@ -225,11 +225,11 @@ describe "should have_at_most(n).items" do owner = create_collection_owner_with(3) length_matcher = have_at_most(3).items_in_collection_with_length_method size_matcher = have_at_most(3).items_in_collection_with_size_method - + #when length_matcher.matches?(owner) size_matcher.matches?(owner) - + #then length_matcher.negative_failure_message.should == <<-EOF Isn't life confusing enough? @@ -238,7 +238,7 @@ Instead of having to figure out the meaning of this: We recommend that you use this instead: should have_at_least(4).items_in_collection_with_length_method EOF - + size_matcher.negative_failure_message.should == <<-EOF Isn't life confusing enough? Instead of having to figure out the meaning of this: rails_plugins/rspec/spec/spec/matchers/have_spec.rb @@ -10,7 +10,7 @@ describe "should match(expected)" do "string".should match(/rings/) }.should fail end - + it "should provide message, expected and actual on failure" do matcher = match(/rings/) matcher.matches?("string") rails_plugins/rspec/spec/spec/matchers/match_spec.rb @@ -62,7 +62,7 @@ This module should provide the following methods, each of which returns a Matche respond_to(:sym).should be_an_instance_of(RespondTo) end end - + describe "Spec::Matchers#method_missing" do it "should convert be_xyz to Be(:be_xyz)" do Be.should_receive(:new).with(:be_whatever) rails_plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb @@ -3,13 +3,13 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' require 'spec/expectations/differs/default' describe "should ==" do - + it "should delegate message to target" do subject = "apple" subject.should_receive(:==).with("apple").and_return(true) subject.should == "apple" end - + it "should fail when target.==(actual) returns false" do subject = "apple" Spec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n got: "apple" (using ==)], "orange", "apple") @@ -19,13 +19,13 @@ describe "should ==" do end describe "should_not ==" do - + it "should delegate message to target" do subject = "orange" subject.should_receive(:==).with("apple").and_return(false) subject.should_not == "apple" end - + it "should fail when target.==(actual) returns false" do subject = "apple" Spec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n got: "apple"], "apple", "apple") @@ -35,30 +35,30 @@ describe "should_not ==" do end describe "should ===" do - + it "should delegate message to target" do subject = "apple" subject.should_receive(:===).with("apple").and_return(true) subject.should === "apple" end - + it "should fail when target.===(actual) returns false" do subject = "apple" subject.should_receive(:===).with("orange").and_return(false) Spec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n got: "apple" (using ===)], "orange", "apple") subject.should === "orange" end - + end describe "should_not ===" do - + it "should delegate message to target" do subject = "orange" subject.should_receive(:===).with("apple").and_return(false) subject.should_not === "apple" end - + it "should fail when target.===(actual) returns false" do subject = "apple" subject.should_receive(:===).with("apple").and_return(true) @@ -69,13 +69,13 @@ describe "should_not ===" do end describe "should =~" do - + it "should delegate message to target" do subject = "foo" subject.should_receive(:=~).with(/oo/).and_return(true) subject.should =~ /oo/ end - + it "should fail when target.=~(actual) returns false" do subject = "fu" subject.should_receive(:=~).with(/oo/).and_return(false) @@ -86,13 +86,13 @@ describe "should =~" do end describe "should_not =~" do - + it "should delegate message to target" do subject = "fu" subject.should_receive(:=~).with(/oo/).and_return(false) subject.should_not =~ /oo/ end - + it "should fail when target.=~(actual) returns false" do subject = "foo" subject.should_receive(:=~).with(/oo/).and_return(true) @@ -103,7 +103,7 @@ describe "should_not =~" do end describe "should >" do - + it "should pass if > passes" do 4.should > 3 end @@ -116,7 +116,7 @@ describe "should >" do end describe "should >=" do - + it "should pass if >= passes" do 4.should > 3 4.should >= 4 @@ -130,7 +130,7 @@ describe "should >=" do end describe "should <" do - + it "should pass if < passes" do 4.should < 5 end @@ -143,7 +143,7 @@ describe "should <" do end describe "should <=" do - + it "should pass if <= passes" do 4.should <= 5 4.should <= 4 rails_plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb @@ -4,7 +4,7 @@ describe "should raise_error" do it "should pass if anything is raised" do lambda {raise}.should raise_error end - + it "should fail if nothing is raised" do lambda { lambda {}.should raise_error @@ -16,7 +16,7 @@ describe "should_not raise_error" do it "should pass if nothing is raised" do lambda {}.should_not raise_error end - + it "should fail if anything is raised" do lambda { lambda {raise}.should_not raise_error @@ -66,19 +66,19 @@ describe "should raise_error(NamedError)" do it "should pass if named error is raised" do lambda { non_existent_method }.should raise_error(NameError) end - + it "should fail if nothing is raised" do lambda { lambda { }.should raise_error(NameError) }.should fail_with("expected NameError but nothing was raised") end - + it "should fail if another error is raised (NameError)" do lambda { lambda { raise }.should raise_error(NameError) }.should fail_with("expected NameError, got RuntimeError") end - + it "should fail if another error is raised (NameError)" do lambda { lambda { load "non/existent/file" }.should raise_error(NameError) @@ -90,35 +90,35 @@ describe "should_not raise_error(NamedError)" do it "should pass if nothing is raised" do lambda { }.should_not raise_error(NameError) end - + it "should pass if another error is raised" do lambda { raise }.should_not raise_error(NameError) end - + it "should fail if named error is raised" do lambda { lambda { non_existent_method }.should_not raise_error(NameError) }.should fail_with(/expected no NameError, got #<NameError: undefined/) - end + end end describe "should raise_error(NamedError, error_message) with String" do it "should pass if named error is raised with same message" do lambda { raise "example message" }.should raise_error(RuntimeError, "example message") end - + it "should fail if nothing is raised" do lambda { lambda {}.should raise_error(RuntimeError, "example message") }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised") end - + it "should fail if incorrect error is raised" do lambda { lambda { raise }.should raise_error(NameError, "example message") }.should fail_with("expected NameError with \"example message\", got RuntimeError") end - + it "should fail if correct error is raised with incorrect message" do lambda { lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, "example message") @@ -130,15 +130,15 @@ describe "should_not raise_error(NamedError, error_message) with String" do it "should pass if nothing is raised" do lambda {}.should_not raise_error(RuntimeError, "example message") end - + it "should pass if a different error is raised" do lambda { raise }.should_not raise_error(NameError, "example message") end - + it "should pass if same error is raised with different message" do lambda { raise RuntimeError.new("not the example message") }.should_not raise_error(RuntimeError, "example message") end - + it "should fail if named error is raised with same message" do lambda { lambda { raise "example message" }.should_not raise_error(RuntimeError, "example message") @@ -150,19 +150,19 @@ describe "should raise_error(NamedError, error_message) with Regexp" do it "should pass if named error is raised with matching message" do lambda { raise "example message" }.should raise_error(RuntimeError, /ample mess/) end - + it "should fail if nothing is raised" do lambda { lambda {}.should raise_error(RuntimeError, /ample mess/) }.should fail_with("expected RuntimeError with message matching /ample mess/ but nothing was raised") end - + it "should fail if incorrect error is raised" do lambda { lambda { raise }.should raise_error(NameError, /ample mess/) }.should fail_with("expected NameError with message matching /ample mess/, got RuntimeError") end - + it "should fail if correct error is raised with incorrect message" do lambda { lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, /less than ample mess/) @@ -174,15 +174,15 @@ describe "should_not raise_error(NamedError, error_message) with Regexp" do it "should pass if nothing is raised" do lambda {}.should_not raise_error(RuntimeError, /ample mess/) end - + it "should pass if a different error is raised" do lambda { raise }.should_not raise_error(NameError, /ample mess/) end - + it "should pass if same error is raised with non-matching message" do lambda { raise RuntimeError.new("non matching message") }.should_not raise_error(RuntimeError, /ample mess/) end - + it "should fail if named error is raised with matching message" do lambda { lambda { raise "example message" }.should_not raise_error(RuntimeError, /ample mess/) rails_plugins/rspec/spec/spec/matchers/raise_error_spec.rb @@ -1,37 +1,37 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' describe "should respond_to(:sym)" do - + it "should pass if target responds to :sym" do Object.new.should respond_to(:methods) end - + it "should fail target does not respond to :sym" do lambda { Object.new.should respond_to(:some_method) }.should fail_with("expected target to respond to :some_method") end - + end describe "should respond_to(message1, message2)" do - + it "should pass if target responds to both messages" do Object.new.should respond_to('methods', 'inspect') end - + it "should fail target does not respond to first message" do lambda { Object.new.should respond_to('method_one', 'inspect') }.should fail_with('expected target to respond to "method_one"') end - + it "should fail target does not respond to second message" do lambda { Object.new.should respond_to('inspect', 'method_one') }.should fail_with('expected target to respond to "method_one"') end - + it "should fail target does not respond to either message" do lambda { Object.new.should respond_to('method_one', 'method_two') @@ -40,15 +40,15 @@ describe "should respond_to(message1, message2)" do end describe "should_not respond_to(:sym)" do - + it "should pass if target does not respond to :sym" do Object.new.should_not respond_to(:some_method) end - + it "should fail target responds to :sym" do lambda { Object.new.should_not respond_to(:methods) }.should fail_with("expected target not to respond to :methods") end - + end rails_plugins/rspec/spec/spec/matchers/respond_to_spec.rb @@ -9,19 +9,19 @@ module Spec matcher.matches?("foo") actual.should == "foo" end - + it "should provide a stock failure message" do matcher = simple_matcher("thing") do end matcher.matches?("other") matcher.failure_message.should =~ /expected \"thing\" but got \"other\"/ end - + it "should provide a stock negative failure message" do matcher = simple_matcher("thing") do end matcher.matches?("other") matcher.negative_failure_message.should =~ /expected not to get \"thing\", but got \"other\"/ end - + it "should provide a description" do matcher = simple_matcher("thing") do end matcher.description.should =="thing" rails_plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb @@ -20,10 +20,10 @@ module Spec @matcher.negative_failure_message.should == "expected no Symbol, got :sym" end end - + describe ThrowSymbol, "(constructed with a Symbol)" do before(:each) { @matcher = ThrowSymbol.new(:sym) } - + it "should match if correct Symbol is thrown" do @matcher.matches?(lambda{ throw :sym }).should be_true end rails_plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Mocks - + describe "AnyNumberOfTimes" do before(:each) do @mock = Mock.new("test mock") @@ -19,7 +19,7 @@ module Spec @mock.should_receive(:random_call).any_number_of_times @mock.random_call end - + it "should pass if any number of times method is not called" do @mock.should_receive(:random_call).any_number_of_times end rails_plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb @@ -2,14 +2,14 @@ describe "Mock" do before do @mock = mock("test mock") end - + specify "when one example has an expectation (non-mock) inside the block passed to the mock" do @mock.should_receive(:msg) do |b| b.should be_true #this call exposes the problem end @mock.msg(false) rescue nil end - + specify "then the next example should behave as expected instead of saying" do @mock.should_receive(:foobar) @mock.foobar @@ -19,6 +19,6 @@ describe "Mock" do rescue Exception => e e.message.should == "Mock 'test mock' received unexpected message :foobar with (no args)" end - end + end end rails_plugins/rspec/spec/spec/mocks/bug_report_10263.rb @@ -4,17 +4,17 @@ class LiarLiarPantsOnFire def respond_to?(sym) true end - + def self.respond_to?(sym) true end end - + describe 'should_receive' do before(:each) do @liar = LiarLiarPantsOnFire.new end - + it "should work when object lies about responding to a method" do @liar.should_receive(:something) @liar.something @@ -24,7 +24,7 @@ describe 'should_receive' do LiarLiarPantsOnFire.should_receive(:something) LiarLiarPantsOnFire.something end - + it 'should cleanup after itself' do LiarLiarPantsOnFire.metaclass.instance_methods.should_not include("something") end rails_plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Mocks describe "mock failure" do - + it "should tell you when it receives the right message with the wrong args" do m = mock("foo") m.should_receive(:bar).with("message") rails_plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb @@ -14,6 +14,6 @@ module Bug7611 it "should" do Bar.new.class.should == Bar - end + end end end rails_plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb @@ -4,7 +4,7 @@ module Bug8302 class Foo def Foo.class_method(arg) end - + def instance_bar(arg) end end rails_plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb @@ -7,7 +7,7 @@ module Spec @mock = mock("test mock") @reporter = Mock.new("reporter", :null_object => true) end - + after(:each) do @mock.rspec_reset end @@ -25,14 +25,14 @@ module Spec @mock.random_call("1") end.should raise_error(MockExpectationError) end - + it "should reject non string" do @mock.should_receive(:random_call).with(an_instance_of(String)) lambda do @mock.random_call(123) end.should raise_error(MockExpectationError) end - + it "should reject goose when expecting a duck" do @mock.should_receive(:random_call).with(duck_type(:abs, :div)) lambda { @mock.random_call("I don't respond to :abs or :div") }.should raise_error(MockExpectationError) @@ -42,33 +42,33 @@ module Spec @mock.should_receive(:random_call).with(/bcd/) lambda { @mock.random_call("abc") }.should raise_error(MockExpectationError) end - + it "should fail if regexp does not match submitted regexp" do @mock.should_receive(:random_call).with(/bcd/) lambda { @mock.random_call(/bcde/) }.should raise_error(MockExpectationError) end - + it "should fail for a hash w/ wrong values" do @mock.should_receive(:random_call).with(:a => "b", :c => "d") lambda do @mock.random_call(:a => "b", :c => "e") end.should raise_error(MockExpectationError, /Mock 'test mock' expected :random_call with $\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}$ but received it with $\{(:a=>\"b\", :c=>\"e\"|:c=>\"e\", :a=>\"b\")\}$/) end - + it "should fail for a hash w/ wrong keys" do @mock.should_receive(:random_call).with(:a => "b", :c => "d") lambda do @mock.random_call("a" => "b", "c" => "d") end.should raise_error(MockExpectationError, /Mock 'test mock' expected :random_call with $\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}$ but received it with $\{(\"a\"=>\"b\", \"c\"=>\"d\"|\"c\"=>\"d\", \"a\"=>\"b\")\}$/) end - + it "should match against a Matcher" do lambda do @mock.should_receive(:msg).with(equal(3)) @mock.msg(37) end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (equal 3) but received it with (37)") end - + it "should fail no_args with one arg" do lambda do @mock.should_receive(:msg).with(no_args) @@ -76,7 +76,7 @@ module Spec end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (no args) but received it with (37)") end end - + describe "failing deprecated MockArgumentConstraints" do before(:each) do @mock = mock("test mock") @@ -94,21 +94,21 @@ module Spec @mock.random_call("false") end.should raise_error(MockExpectationError) end - + it "should reject non numeric" do @mock.should_receive(:random_call).with(:numeric) lambda do @mock.random_call("1") end.should raise_error(MockExpectationError) end - + it "should reject non string" do @mock.should_receive(:random_call).with(:string) lambda do @mock.random_call(123) end.should raise_error(MockExpectationError) end - + end end rails_plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb @@ -8,7 +8,7 @@ module Spec before do @mock = mock("test mock") end - + after do @mock.rspec_reset end @@ -48,7 +48,7 @@ module Spec @mock.three end.should raise_error(MockExpectationError, "Mock 'test mock' received :three out of order") end - + it "should fail if third call comes second" do @mock.should_receive(:one).ordered @mock.should_receive(:two).ordered @@ -78,7 +78,7 @@ module Spec @mock.ignored_1 @mock.rspec_verify end - + end end end rails_plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb @@ -51,4 +51,4 @@ module Spec end end end - + rails_plugins/rspec/spec/spec/mocks/mock_space_spec.rb @@ -7,11 +7,11 @@ module Spec before(:each) do @mock = mock("test mock") end - + after(:each) do @mock.rspec_reset end - + it "should report line number of expectation of unreceived message" do expected_error_line = __LINE__; @mock.should_receive(:wont_happen).with("x", 3) begin @@ -22,19 +22,19 @@ module Spec e.backtrace[0].should match(/#{File.basename(__FILE__)}:#{expected_error_line}/) end end - + it "should pass when not receiving message specified as not to be received" do @mock.should_not_receive(:not_expected) @mock.rspec_verify end - + it "should pass when receiving message specified as not to be received with different args" do @mock.should_not_receive(:message).with("unwanted text") @mock.should_receive(:message).with("other text") @mock.message "other text" @mock.rspec_verify end - + it "should fail when receiving message specified as not to be received" do @mock.should_not_receive(:not_expected) @mock.not_expected @@ -43,7 +43,7 @@ module Spec violated }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it once") end - + it "should fail when receiving message specified as not to be received with args" do @mock.should_not_receive(:not_expected).with("unexpected text") @mock.not_expected("unexpected text") @@ -52,31 +52,31 @@ module Spec violated }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (\"unexpected text\") 0 times, but received it once") end - + it "should pass when receiving message specified as not to be received with wrong args" do @mock.should_not_receive(:not_expected).with("unexpected text") @mock.not_expected "really unexpected text" @mock.rspec_verify end - + it "should allow block to calculate return values" do @mock.should_receive(:something).with("a","b","c").and_return { |a,b,c| c+b+a } @mock.something("a","b","c").should == "cba" @mock.rspec_verify end - + it "should allow parameter as return value" do @mock.should_receive(:something).with("a","b","c").and_return("booh") @mock.something("a","b","c").should == "booh" @mock.rspec_verify end - + it "should return nil if no return value set" do @mock.should_receive(:something).with("a","b","c") @mock.something("a","b","c").should be_nil @mock.rspec_verify end - + it "should raise exception if args dont match when method called" do @mock.should_receive(:something).with("a","b","c").and_return("booh") lambda { @@ -84,14 +84,14 @@ module Spec violated }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")") end - + it "should fail if unexpected method called" do lambda { @mock.something("a","b","c") violated }.should raise_error(MockExpectationError, "Mock 'test mock' received unexpected message :something with (\"a\", \"b\", \"c\")") end - + it "should use block for expectation if provided" do @mock.should_receive(:something) do | a, b | a.should == "a" @@ -101,14 +101,14 @@ module Spec @mock.something("a", "b").should == "booh" @mock.rspec_verify end - + it "should fail if expectation block fails" do @mock.should_receive(:something) {| bool | bool.should be_true} lambda { @mock.something false }.should raise_error(MockExpectationError, /Mock 'test mock' received :something but passed block failed with: expected true, got false/) end - + it "should fail right away when method defined as never is received" do pending "Used to pass (false positive). Which one is wrong, the spec or the actual behavior?" @@ -117,11 +117,11 @@ module Spec @mock.not_expected }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected 0 times, but received it 1 times") end - + it "should eventually fail when method defined as never is received" do @mock.should_receive(:not_expected).never @mock.not_expected - + lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it once") @@ -133,7 +133,7 @@ module Spec @mock.something end.should raise_error(RuntimeError) end - + it "should raise passed an Exception instance" do error = RuntimeError.new("error message") @mock.should_receive(:something).and_raise(error) @@ -141,28 +141,28 @@ module Spec @mock.something }.should raise_error(RuntimeError, "error message") end - + it "should raise RuntimeError with passed message" do @mock.should_receive(:something).and_raise("error message") lambda { @mock.something }.should raise_error(RuntimeError, "error message") end - + it "should not raise when told to if args dont match" do @mock.should_receive(:something).with(2).and_raise(RuntimeError) lambda { @mock.something 1 }.should raise_error(MockExpectationError) end - + it "should throw when told to" do @mock.should_receive(:something).and_throw(:blech) lambda { @mock.something }.should throw_symbol(:blech) end - + it "should raise when explicit return and block constrained" do lambda { @mock.should_receive(:fruit) do |colour| @@ -170,7 +170,7 @@ module Spec end.and_return :apple }.should raise_error(AmbiguousReturnError) end - + it "should ignore args on any args" do @mock.should_receive(:something).at_least(:once).with(any_args) @mock.something @@ -179,7 +179,7 @@ module Spec @mock.something [], {}, "joe", 7 @mock.rspec_verify end - + it "should fail on no args if any args received" do @mock.should_receive(:something).with(no_args()) lambda { @@ -193,7 +193,7 @@ module Spec @mock.something }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (1) but received it with (no args)") end - + it "should yield 0 args to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield a = nil @@ -201,7 +201,7 @@ module Spec a.should == [] @mock.rspec_verify end - + it "should yield 0 args multiple times to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield. and_yield @@ -211,7 +211,7 @@ module Spec b.should == [ [], [] ] @mock.rspec_verify end - + it "should yield one arg to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99) a = nil @@ -219,7 +219,7 @@ module Spec a.should == [99] @mock.rspec_verify end - + it "should yield one arg 3 times consecutively to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield(99). and_yield(43). @@ -230,7 +230,7 @@ module Spec b.should == [[99], [43], ["something fruity"]] @mock.rspec_verify end - + it "should yield many args to blocks that take a variable number of arguments" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99, 27, "go") a = nil @@ -249,7 +249,7 @@ module Spec b.should == [[99, :green, "go"], ["wait", :amber], ["stop", 12, :red]] @mock.rspec_verify end - + it "should yield single value" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99) a = nil @@ -257,7 +257,7 @@ module Spec a.should == 99 @mock.rspec_verify end - + it "should yield single value 3 times consecutively" do @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield(99). and_yield(43). @@ -268,7 +268,7 @@ module Spec b.should == [99, 43, "something fruity"] @mock.rspec_verify end - + it "should yield two values" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup') a, b = nil @@ -277,7 +277,7 @@ module Spec b.should == 'zup' @mock.rspec_verify end - + it "should yield two values 3 times consecutively" do @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield('wha', 'zup'). and_yield('not', 'down'). @@ -288,14 +288,14 @@ module Spec c.should == [['wha', 'zup'], ['not', 'down'], [14, 65]] @mock.rspec_verify end - + it "should fail when calling yielding method with wrong arity" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup') lambda { @mock.yield_back {|a|} }.should raise_error(MockExpectationError, "Mock 'test mock' yielded |\"wha\", \"zup\"| to block with arity of 1") end - + it "should fail when calling yielding method consecutively with wrong arity" do @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield('wha', 'zup'). and_yield('down'). @@ -306,32 +306,32 @@ module Spec @mock.yield_back {|a,b| c << [a, b]} }.should raise_error(MockExpectationError, "Mock 'test mock' yielded |\"down\"| to block with arity of 2") end - + it "should fail when calling yielding method without block" do @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup') lambda { @mock.yield_back }.should raise_error(MockExpectationError, "Mock 'test mock' asked to yield |[\"wha\", \"zup\"]| but no block was passed") end - + it "should be able to mock send" do @mock.should_receive(:send).with(any_args) @mock.send 'hi' @mock.rspec_verify end - + it "should be able to raise from method calling yielding mock" do @mock.should_receive(:yield_me).and_yield 44 - + lambda { @mock.yield_me do |x| raise "Bang" end }.should raise_error(StandardError, "Bang") - + @mock.rspec_verify end - + it "should clear expectations after verify" do @mock.should_receive(:foobar) @mock.foobar @@ -340,7 +340,7 @@ module Spec @mock.foobar }.should raise_error(MockExpectationError, "Mock 'test mock' received unexpected message :foobar with (no args)") end - + it "should restore objects to their original state on rspec_reset" do mock = mock("this is a mock") mock.should_receive(:blah) @@ -351,28 +351,28 @@ module Spec it "should work even after method_missing starts raising NameErrors instead of NoMethodErrors" do # Object#method_missing throws either NameErrors or NoMethodErrors. # - # On a fresh ruby program Object#method_missing: + # On a fresh ruby program Object#method_missing: # * raises a NoMethodError when called directly # * raises a NameError when called indirectly # # Once Object#method_missing has been called at least once (on any object) - # it starts behaving differently: + # it starts behaving differently: # * raises a NameError when called directly # * raises a NameError when called indirectly # # There was a bug in Mock#method_missing that relied on the fact # that calling Object#method_missing directly raises a NoMethodError. # This example tests that the bug doesn't exist anymore. - - + + # Ensures that method_missing always raises NameErrors. a_method_that_doesnt_exist rescue - - + + @mock.should_receive(:foobar) @mock.foobar @mock.rspec_verify - + lambda { @mock.foobar }.should_not raise_error(NameError) lambda { @mock.foobar }.should raise_error(MockExpectationError) end @@ -395,7 +395,7 @@ module Spec non_mock.msg.should equal(:stub_value) non_mock.rspec_verify end - + it "should assign stub return values" do mock = Mock.new('name', :message => :response) mock.message.should == :response @@ -407,11 +407,11 @@ module Spec @mock = mock("mock") @calls = 0 end - + def add_call @calls = @calls + 1 end - + it "should call the block after #should_receive" do @mock.should_receive(:foo) { add_call } @@ -439,7 +439,7 @@ module Spec it "should call the block after #times" do @mock.should_receive(:foo).exactly(10).times { add_call } - + (1..10).each { @mock.foo } @calls.should == 10 @@ -447,7 +447,7 @@ module Spec it "should call the block after #any_number_of_times" do @mock.should_receive(:foo).any_number_of_times { add_call } - + (1..7).each { @mock.foo } @calls.should == 7 @@ -455,7 +455,7 @@ module Spec it "should call the block after #with" do @mock.should_receive(:foo).with(:arg) { add_call } - + @mock.foo(:arg) @calls.should == 1 @@ -464,7 +464,7 @@ module Spec it "should call the block after #ordered" do @mock.should_receive(:foo).ordered { add_call } @mock.should_receive(:bar).ordered { add_call } - + @mock.foo @mock.bar rails_plugins/rspec/spec/spec/mocks/mock_spec.rb @@ -8,7 +8,7 @@ module Spec @return_values = ["1",2,Object.new] @mock.should_receive(:message).and_return(@return_values[0],@return_values[1],@return_values[2]) end - + it "should return values in order to consecutive calls" do @mock.message.should == @return_values[0] @mock.message.should == @return_values[1] @@ -69,7 +69,7 @@ module Spec @mock = Mock.new("mock") @mock.should_receive(:message).at_least(:twice).with(no_args).and_return(11, 22) end - + it "should use last return value for subsequent calls" do @mock.message.should equal(11) @mock.message.should equal(22) @@ -87,7 +87,7 @@ module Spec @mock = Mock.new("mock") @mock.should_receive(:message).exactly(3).times.and_return(11, 22) end - + it "should use last return value for subsequent calls" do @mock.message.should equal(11) @mock.message.should equal(22) rails_plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb @@ -23,7 +23,7 @@ module Spec @mock.rspec_verify end.should raise_error(MockExpectationError) end - + it "once should fail when not called" do @mock.should_receive(:random_call).once lambda do rails_plugins/rspec/spec/spec/mocks/once_counts_spec.rb @@ -21,7 +21,7 @@ module Spec mock.rspec_verify end example = example_group.new(example_definition) - + reporter.should_receive(:example_finished) do |spec, error| error.backtrace.detect {|line| line =~ /\/path\/to\/blah.ext:37/}.should_not be_nil end rails_plugins/rspec/spec/spec/mocks/options_hash_spec.rb @@ -6,20 +6,20 @@ module Spec before(:each) do @object = Object.new end - + it "should name the class in the failure message" do @object.should_receive(:foo) lambda do @object.rspec_verify end.should raise_error(Spec::Mocks::MockExpectationError, /Object/) end - + it "should not conflict with @options in the object" do @object.instance_eval { @options = Object.new } @object.should_receive(:blah) @object.blah end - + it "should_not_receive should mock out the method" do @object.should_not_receive(:fuhbar) @object.fuhbar @@ -27,44 +27,44 @@ module Spec @object.rspec_verify end.should raise_error(Spec::Mocks::MockExpectationError) end - + it "should_not_receive should return a negative message expectation" do @object.should_not_receive(:foobar).should be_kind_of(NegativeMessageExpectation) end - + it "should_receive should mock out the method" do @object.should_receive(:foobar).with(:test_param).and_return(1) @object.foobar(:test_param).should equal(1) end - + it "should_receive should handle a hash" do @object.should_receive(:foobar).with(:key => "value").and_return(1) @object.foobar(:key => "value").should equal(1) end - + it "should_receive should handle an inner hash" do hash = {:a => {:key => "value"}} @object.should_receive(:foobar).with(:key => "value").and_return(1) @object.foobar(hash[:a]).should equal(1) end - + it "should_receive should return a message expectation" do @object.should_receive(:foobar).should be_kind_of(MessageExpectation) @object.foobar end - + it "should_receive should verify method was called" do @object.should_receive(:foobar).with(:test_param).and_return(1) lambda do @object.rspec_verify end.should raise_error(Spec::Mocks::MockExpectationError) end - + it "should_receive should also take a String argument" do @object.should_receive('foobar') @object.foobar end - + it "should_not_receive should also take a String argument" do @object.should_not_receive('foobar') @object.foobar @@ -72,7 +72,7 @@ module Spec @object.rspec_verify end.should raise_error(Spec::Mocks::MockExpectationError) end - + it "should use report nil in the error message" do @this_will_resolve_to_nil.should_receive(:foobar) lambda do @@ -80,23 +80,23 @@ module Spec end.should raise_error(Spec::Mocks::MockExpectationError, /NilClass.*expected :foobar with/) end end - + describe "Partially mocking an object that defines ==, after another mock has been defined" do before(:each) do stub("existing mock", :foo => :foo) end - + class PartiallyMockedEquals attr_reader :val def initialize(val) @val = val end - + def ==(other) @val == other.val end end - + it "should not raise an error when stubbing the object" do o = PartiallyMockedEquals.new :foo lambda { o.stub!(:bar) }.should_not raise_error(NoMethodError) rails_plugins/rspec/spec/spec/mocks/partial_mock_spec.rb @@ -4,7 +4,7 @@ module Spec module Mocks describe "PartialMockUsingMocksDirectly" do before(:each) do - + klass=Class.new klass.class_eval do def existing_method @@ -12,9 +12,9 @@ describe "PartialMockUsingMocksDirectly" do end end @obj = klass.new - + end - + # See http://rubyforge.org/tracker/index.php?func=detail&aid=10263&group_id=797&atid=3149 # specify "should clear expectations on verify" do # @obj.should_receive(:msg) @@ -23,14 +23,14 @@ describe "PartialMockUsingMocksDirectly" do # lambda do # @obj.msg # end.should raise_error(NoMethodError) - # + # # end it "should fail when expected message is not received" do @obj.should_receive(:msg) lambda do @obj.rspec_verify end.should raise_error(MockExpectationError) - + end it "should fail when message is received with incorrect args" do @obj.should_receive(:msg).with(:correct_arg) @@ -38,19 +38,19 @@ describe "PartialMockUsingMocksDirectly" do @obj.msg(:incorrect_arg) end.should raise_error(MockExpectationError) @obj.msg(:correct_arg) - + end it "should pass when expected message is received" do @obj.should_receive(:msg) @obj.msg @obj.rspec_verify - + end it "should pass when message is received with correct args" do @obj.should_receive(:msg).with(:correct_arg) @obj.msg(:correct_arg) @obj.rspec_verify - + end it "should revert to original method if existed" do @obj.existing_method.should equal(:original_value) @@ -58,9 +58,9 @@ describe "PartialMockUsingMocksDirectly" do @obj.existing_method.should equal(:mock_value) @obj.rspec_verify @obj.existing_method.should equal(:original_value) - + end - + end end end rails_plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb @@ -7,12 +7,12 @@ module Spec @mock = Mock.new("test mock") Kernel.stub!(:warn) end - + after(:each) do @mock.rspec_verify end end - + describe Methods, "handling argument constraints with DEPRECATED symbols" do it_should_behave_like "mock argument constraints" @@ -20,7 +20,7 @@ module Spec @mock.should_receive(:random_call).with(:boolean) @mock.random_call(true) end - + it "should accept false as boolean" do @mock.should_receive(:random_call).with(:boolean) @mock.random_call(false) @@ -45,12 +45,12 @@ module Spec @mock.should_receive(:random_call).with(:string) @mock.random_call("a string") end - + it "should match no args against any_args" do @mock.should_receive(:random_call).with(:any_args) @mock.random_call("a string") end - + it "should match no args against no_args" do @mock.should_receive(:random_call).with(:no_args) @mock.random_call @@ -94,23 +94,23 @@ module Spec @mock.should_receive(:random_call).with(duck_type(:abs, :div)) @mock.random_call(1) end - + it "should match no args against any_args()" do @mock.should_receive(:random_call).with(any_args) @mock.random_call() end - + it "should match one arg against any_args()" do @mock.should_receive(:random_call).with(any_args) @mock.random_call("a string") end - + it "should match no args against no_args()" do @mock.should_receive(:random_call).with(no_args) @mock.random_call() end end - + describe Methods, "handling non-constraint arguments" do it "should match non special symbol (can be removed when deprecated symbols are removed)" do @@ -127,24 +127,24 @@ module Spec @mock.should_receive(:random_call).with(/bcd/) @mock.random_call(/bcd/) end - + it "should match against a hash submitted and received by value" do @mock.should_receive(:random_call).with(:a => "a", :b => "b") @mock.random_call(:a => "a", :b => "b") end - + it "should match against a hash submitted by reference and received by value" do opts = {:a => "a", :b => "b"} @mock.should_receive(:random_call).with(opts) @mock.random_call(:a => "a", :b => "b") end - + it "should match against a hash submitted by value and received by reference" do opts = {:a => "a", :b => "b"} @mock.should_receive(:random_call).with(:a => "a", :b => "b") @mock.random_call(opts) end - + it "should match against a Matcher" do @mock.should_receive(:msg).with(equal(37)) @mock.msg(37) rails_plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb @@ -44,7 +44,7 @@ module Spec @instance.rspec_verify end.should_not raise_error end - + it "should clear itself when verified" do @instance.stub!(:this_should_go).and_return(:blah) @instance.this_should_go.should == :blah @@ -79,7 +79,7 @@ module Spec @instance.rspec_verify @instance.existing_instance_method.should equal(:original_value) end - + it "should revert to original class method if there is one" do @class.existing_class_method.should equal(:original_value) @class.stub!(:existing_class_method).and_return(:mock_value) @@ -104,7 +104,7 @@ module Spec current_value.should == [:yielded_value, :another_value] @instance.rspec_verify end - + it "should yield a specified object and return another specified object" do yielded_obj = mock("my mock") yielded_obj.should_receive(:foo).with(:bar) @@ -118,12 +118,12 @@ module Spec @mock.something end.should throw_symbol(:up) end - + it "should override a pre-existing stub" do @stub.stub!(:existing_instance_method).and_return(:updated_stub_value) @stub.existing_instance_method.should == :updated_stub_value end - + it "should limit " do @stub.stub!(:foo).with("bar") @stub.should_receive(:foo).with("baz") @@ -131,7 +131,7 @@ module Spec @stub.foo("baz") end end - + describe "A method stub with args" do before(:each) do @stub = Object.new @@ -171,7 +171,7 @@ module Spec @stub.foo("other") end.should raise_error end - + it "should support options" do @stub.stub!(:foo, :expected_from => "bar") end rails_plugins/rspec/spec/spec/mocks/stub_spec.rb @@ -16,7 +16,7 @@ module Spec @mock.rspec_verify end.should raise_error(MockExpectationError) end - + it "twice should fail when call count is lower than expected" do @mock.should_receive(:random_call).twice @mock.random_call @@ -24,7 +24,7 @@ module Spec @mock.rspec_verify end.should raise_error(MockExpectationError) end - + it "twice should fail when called twice with wrong args on the first call" do @mock.should_receive(:random_call).twice.with("1", 1) lambda do @@ -32,7 +32,7 @@ module Spec end.should raise_error(MockExpectationError) @mock.rspec_reset end - + it "twice should fail when called twice with wrong args on the second call" do @mock.should_receive(:random_call).twice.with("1", 1) @mock.random_call("1", 1) @@ -41,21 +41,21 @@ module Spec end.should raise_error(MockExpectationError) @mock.rspec_reset end - + it "twice should pass when called twice" do @mock.should_receive(:random_call).twice @mock.random_call @mock.random_call @mock.rspec_verify end - + it "twice should pass when called twice with specified args" do @mock.should_receive(:random_call).twice.with("1", 1) @mock.random_call("1", 1) @mock.random_call("1", 1) @mock.rspec_verify end - + it "twice should pass when called twice with unspecified args" do @mock.should_receive(:random_call).twice @mock.random_call("1") rails_plugins/rspec/spec/spec/mocks/twice_counts_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../ruby_forker' describe "The bin/spec script" do include RubyForker - + it "should have no warnings" do pending "Hangs on JRuby" if PLATFORM =~ /java/ spec_path = "#{File.dirname(__FILE__)}/../../../bin/spec" rails_plugins/rspec/spec/spec/package/bin_spec_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' module Spec module Runner describe ClassAndArgumentsParser, ".parse" do - + it "should use a single : to separate class names from arguments" do ClassAndArgumentsParser.parse('Foo').should == ['Foo', nil] ClassAndArgumentsParser.parse('Foo:arg').should == ['Foo', 'arg'] @@ -17,7 +17,7 @@ module Spec lambda do ClassAndArgumentsParser.parse('') end.should raise_error("Couldn't parse \"\"") - end + end end end end rails_plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb @@ -107,7 +107,7 @@ module Spec ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options) options.reporter.should_receive(:add_example_group).with(example_group) - + Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out)) end rails_plugins/rspec/spec/spec/runner/command_line_spec.rb @@ -12,7 +12,7 @@ module Spec err.rewind err.read.should =~ /No server is running/ end - end + end end class DrbCommandLineSpec < ::Spec::Example::ExampleGroup @@ -23,7 +23,7 @@ module Spec exit Spec::Runner::CommandLine.run(OptionParser.parse(argv, stderr, stdout)) end end - + unless Config::CONFIG['ruby_install_name'] == 'jruby' before(:all) do DRb.start_service("druby://localhost:8989", CommandLineForSpec) rails_plugins/rspec/spec/spec/runner/drb_command_line_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb' describe "ExecutionContext" do - + it "should provide duck_type()" do dt = duck_type(:length) dt.should be_an_instance_of(Spec::Mocks::DuckTypeArgConstraint) @@ -21,7 +21,7 @@ describe "ExecutionContext" do it "should provide stub()" do thing_stub = stub("thing").should be_an_instance_of(Spec::Mocks::Mock) end - + it "should add method stubs to stub()" do thing_stub = stub("thing", :a => "A", :b => "B") thing_stub.a.should == "A" rails_plugins/rspec/spec/spec/runner/execution_context_spec.rb @@ -13,7 +13,7 @@ module Spec @formatter = FailingExampleGroupsFormatter.new(options, io) @example_group = Class.new(::Spec::Example::ExampleGroup) end - + it "should add example name for each failure" do formatter.add_example_group(Class.new(ExampleGroup).describe("b 1")) formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new)) @@ -22,7 +22,7 @@ module Spec formatter.example_failed("e 3", nil, Reporter::Failure.new(nil, RuntimeError.new)) io.string.should == "b 1\nb 2\n" end - + it "should delimit ExampleGroup superclass descriptions with :" do parent_example_group = Class.new(example_group).describe("Parent") child_example_group = Class.new(parent_example_group).describe("#child_method") rails_plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -197,7 +197,7 @@ a { <span class="linenum">12</span> mock = mock("poke me") <span class="offending"><span class="linenum">13</span> mock.should_receive(:poke)</span> <span class="linenum">14</span> end -<span class="linenum">15</span> +<span class="linenum">15</span> <span class="linenum">16</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre> </div> </dd> rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -236,7 +236,7 @@ a { <span class="failed_spec_name">has a bug we need to fix</span> <div class="failure" id="failure_4"> <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div> - + <pre class="ruby"><code><span class="linenum">31</span> <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">"</span><span class="string">has a bug we need to fix</span><span class="punct">"</span> <span class="keyword">do</span> <span class="offending"><span class="linenum">33</span> <span class="ident">pending</span> <span class="punct">"</span><span class="string">here is the bug</span><span class="punct">"</span> <span class="keyword">do</span></span> @@ -263,7 +263,7 @@ Diff: +behaviour driven development framework for Ruby </pre></div> - + <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span> <span class="linenum">12</span><span class="constant">EOF</span> <span class="offending"><span class="linenum">13</span> <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span> rails_plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html @@ -10,7 +10,7 @@ module Spec def jruby? PLATFORM == 'java' end - + it "should produce HTML identical to the one we designed manually with #{opt}" do root = File.expand_path(File.dirname(__FILE__) + '/../../../..') suffix = jruby? ? '-jruby' : '' rails_plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb @@ -12,19 +12,19 @@ module Spec options.stub!(:colour).and_return(true) @formatter = ProfileFormatter.new(options, io) end - + it "should print a heading" do formatter.start(0) io.string.should eql("Profiling enabled.\n") end - + it "should record the current time when starting a new example" do now = Time.now Time.stub!(:now).and_return(now) formatter.example_started('should foo') formatter.instance_variable_get("@time").should == now end - + it "should correctly record a passed example" do now = Time.now Time.stub!(:now).and_return(now) @@ -32,7 +32,7 @@ module Spec child_example_group = Class.new(parent_example_group).describe('Child') formatter.add_example_group(child_example_group) - + formatter.example_started('when foo') Time.stub!(:now).and_return(now+1) formatter.example_passed(stub('foo', :description => 'i like ice cream')) @@ -40,22 +40,22 @@ module Spec formatter.start_dump io.string.should include('Parent Child') end - + it "should sort the results in descending order" do formatter.instance_variable_set("@example_times", [['a', 'a', 0.1], ['b', 'b', 0.3], ['c', 'c', 0.2]]) formatter.start_dump formatter.instance_variable_get("@example_times").should == [ ['b', 'b', 0.3], ['c', 'c', 0.2], ['a', 'a', 0.1]] end - + it "should print the top 10 results" do example_group = Class.new(::Spec::Example::ExampleGroup).describe("ExampleGroup") formatter.add_example_group(example_group) formatter.instance_variable_set("@time", Time.now) - - 15.times do + + 15.times do formatter.example_passed(stub('foo', :description => 'i like ice cream')) end - + io.should_receive(:print).exactly(10) formatter.start_dump end rails_plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb @@ -22,7 +22,7 @@ module Spec @formatter.dump_summary(3, 2, 1, 0) @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n") end - + it "should produce standard summary" do @formatter.example_pending("example_group", ExampleGroup.new("example"), "message") @io.rewind @@ -82,14 +82,14 @@ EOE /tmp/x.rb:3: EOE end - + it "should dump pending" do @formatter.example_pending("example_group", ExampleGroup.new("example"), "message") @formatter.dump_pending @io.string.should =~ /Pending\:\nexample_group example $message$\n/ end end - + describe "ProgressBarFormatter outputting to custom out" do before(:each) do @out = mock("out") @@ -116,7 +116,7 @@ EOE options.stub!(:dry_run).and_return(true) @formatter = ProgressBarFormatter.new(options, @io) end - + it "should not produce summary on dry run" do @formatter.dump_summary(3, 2, 1, 0) @io.string.should eql("") rails_plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb @@ -36,7 +36,7 @@ module Spec Spec::Runner::CommandLine.run(options) yield(out.string) - end + end end # # Uncomment this spec temporarily in order to overwrite the expected with actual. rails_plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb @@ -11,7 +11,7 @@ module Spec @options = mock('options') @reporter = HtmlFormatter.new(@options, @out) end - + it "should just be poked at" do @reporter.run_started(1) @reporter.story_started('story_title', 'narrative') @@ -27,19 +27,19 @@ module Spec @reporter.scenario_started('story_title', 'failed_scenario_name') @reporter.step_failed('then', 'failed_step', 'en', 'to') @reporter.scenario_failed('story_title', 'failed_scenario_name', NameError.new('sup')) - + @reporter.scenario_started('story_title', 'scenario_with_given_scenario_name') @reporter.found_scenario('given scenario', 'succeeded_scenario_name') - + @reporter.story_ended('story_title', 'narrative') @reporter.run_ended end - + it "should create spans for params" do @reporter.step_succeeded('given', 'a $coloured $animal', 'brown', 'dog') @out.string.should == " <li class=\"passed\">Given a <span class=\"param\">brown</span> <span class=\"param\">dog</span></li>\n" end - + it 'should create spanes for params in regexp steps' do @reporter.step_succeeded :given, /a (pink|blue) (.*)/, 'brown', 'dog' @out.string.should == " <li class=\"passed\">Given a <span class=\"param\">brown</span> <span class=\"param\">dog</span></li>\n" rails_plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -188,8 +188,8 @@ a { <span class="failed_spec_name">should fail when expected message not received</span> <div class="failure" id="failure_1"> <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div> - <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=13">./failing_examples/mocking_example.rb:13</a> -<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> + <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=13">./failing_examples/mocking_example.rb:13</a> +<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> <a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div> <pre class="ruby"><code><span class="linenum">11</span> <span class="ident">it</span> <span class="punct">"</span><span class="string">should fail when expected message not received</span><span class="punct">"</span> <span class="keyword">do</span> <span class="linenum">12</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">("</span><span class="string">poke me</span><span class="punct">")</span> @@ -203,8 +203,8 @@ a { <span class="failed_spec_name">should fail when messages are received out of order</span> <div class="failure" id="failure_2"> <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div> - <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=22">./failing_examples/mocking_example.rb:22</a> -<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> + <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=22">./failing_examples/mocking_example.rb:22</a> +<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> <a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div> <pre class="ruby"><code><span class="linenum">20</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span> <span class="linenum">21</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span> @@ -218,8 +218,8 @@ a { <span class="failed_spec_name">should get yelled at when sending unexpected messages</span> <div class="failure" id="failure_3"> <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div> - <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=28">./failing_examples/mocking_example.rb:28</a> -<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> + <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=28">./failing_examples/mocking_example.rb:28</a> +<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> <a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div> <pre class="ruby"><code><span class="linenum">26</span> <span class="ident">it</span> <span class="punct">"</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">"</span> <span class="keyword">do</span> <span class="linenum">27</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">("</span><span class="string">don't talk to me</span><span class="punct">")</span> @@ -233,8 +233,8 @@ a { <span class="failed_spec_name">has a bug we need to fix</span> <div class="failure" id="failure_4"> <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div> - <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=33">./failing_examples/mocking_example.rb:33</a> -<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> + <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=33">./failing_examples/mocking_example.rb:33</a> +<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> <a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div> <pre class="ruby"><code><span class="linenum">31</span> <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">"</span><span class="string">has a bug we need to fix</span><span class="punct">"</span> <span class="keyword">do</span> @@ -262,8 +262,8 @@ Diff: +behaviour driven development framework for Ruby </pre></div> - <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/diffing_spec.rb&line=13">./failing_examples/diffing_spec.rb:13</a> -<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> + <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/diffing_spec.rb&line=13">./failing_examples/diffing_spec.rb:13</a> +<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> <a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div> <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span> <span class="linenum">12</span><span class="constant">EOF</span> @@ -292,8 +292,8 @@ Diff: +species=tortoise > </pre></div> - <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/diffing_spec.rb&line=34">./failing_examples/diffing_spec.rb:34</a> -<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> + <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/diffing_spec.rb&line=34">./failing_examples/diffing_spec.rb:34</a> +<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> <a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div> <pre class="ruby"><code><span class="linenum">32</span> <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">"</span><span class="string">bob</span><span class="punct">",</span> <span class="punct">"</span><span class="string">giraffe</span><span class="punct">"</span> <span class="linenum">33</span> <span class="ident">actual</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">"</span><span class="string">bob</span><span class="punct">",</span> <span class="punct">"</span><span class="string">tortoise</span><span class="punct">"</span> rails_plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html @@ -236,7 +236,7 @@ a { <span class="failed_spec_name">has a bug we need to fix</span> <div class="failure" id="failure_4"> <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div> - + <pre class="ruby"><code><span class="linenum">31</span> <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">"</span><span class="string">has a bug we need to fix</span><span class="punct">"</span> <span class="keyword">do</span> <span class="offending"><span class="linenum">33</span> <span class="ident">pending</span> <span class="punct">"</span><span class="string">here is the bug</span><span class="punct">"</span> <span class="keyword">do</span></span> @@ -263,7 +263,7 @@ Diff: +behaviour driven development framework for Ruby </pre></div> - + <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span> <span class="linenum">12</span><span class="constant">EOF</span> <span class="offending"><span class="linenum">13</span> <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span> rails_plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html @@ -59,7 +59,7 @@ unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} heckle_runner.heckle_with end end - + describe "Heckler" do it "should say yes to tests_pass? if specs pass" do options = mock("options", :null_object => true) rails_plugins/rspec/spec/spec/runner/heckle_runner_spec.rb @@ -7,7 +7,7 @@ module Spec @error = RuntimeError.new @tweaker = NoisyBacktraceTweaker.new end - + it "should leave anything in lib spec dir" do ["expectations", "mocks", "runner", "stubs"].each do |child| @error.set_backtrace(["/lib/spec/#{child}/anything.rb"]) @@ -33,13 +33,13 @@ module Spec @tweaker.tweak_backtrace(@error) end.should_not raise_error end - + it "should clean up double slashes" do @error.set_backtrace(["/a//b/c//d.rb"]) @tweaker.tweak_backtrace(@error) @error.backtrace.should include("/a/b/c/d.rb") end - + end end end rails_plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb @@ -12,7 +12,7 @@ describe "OptionParser" do @parser.parse(args) @parser.options end - + it "should accept files to include" do options = parse(["--pattern", "foo"]) options.filename_pattern.should == "foo" @@ -27,7 +27,7 @@ describe "OptionParser" do options = parse(["--format", "Custom::Formatter"]) options.formatters[0].class.should be(Custom::Formatter) end - + it "should support formatters with relative and absolute paths, even on windows" do options = parse([ "--format", "Custom::Formatter:C:\\foo\\bar", @@ -66,8 +66,8 @@ describe "OptionParser" do end it "should print instructions about how to require missing formatter" do - lambda do - options = parse(["--format", "Custom::MissingFormatter"]) + lambda do + options = parse(["--format", "Custom::MissingFormatter"]) options.formatters end.should raise_error(NameError) @err.string.should match(/Couldn't find formatter class Custom::MissingFormatter/n) @@ -78,7 +78,7 @@ describe "OptionParser" do @out.rewind @out.read.should match(/RSpec-\d+\.\d+\.\d+.*$build \d+$ - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n) end - + it "should require file when require specified" do lambda do parse(["--require", "whatever"]) @@ -118,10 +118,10 @@ describe "OptionParser" do it "should read several example names from file if --example is given an existing file name" do options = parse(["--example", File.dirname(__FILE__) + '/examples.txt']) options.examples.should eql([ - "Sir, if you were my husband, I would poison your drink.", + "Sir, if you were my husband, I would poison your drink.", "Madam, if you were my wife, I would drink it."]) end - + it "should read no examples if given an empty file" do options = parse(["--example", File.dirname(__FILE__) + '/empty_file.txt']) options.examples.should eql([]) @@ -303,7 +303,7 @@ describe "OptionParser" do options.colour.should be_true options.formatters.first.should be_instance_of(::Spec::Runner::Formatter::SpecdocFormatter) end - + it "should save config to file when --generate-options is specified" do FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts') options = parse(["--colour", "--generate-options", "test.spec.opts", "--diff"]) @@ -327,7 +327,7 @@ describe "OptionParser" do end parse(["some/spec.rb", "--diff", "--drb", "--colour"]) end - + it "should reverse spec order when --reverse is specified" do options = parse(["some/spec.rb", "--reverse"]) end rails_plugins/rspec/spec/spec/runner/option_parser_spec.rb @@ -18,21 +18,21 @@ module Spec @options.examples.should == [] end end - + describe "#include_pattern" do it "should default to '**/*_spec.rb'" do @options.filename_pattern.should == "**/*_spec.rb" end end - + describe "#files_to_load" do - + it "should load files not following pattern if named explicitly" do file = File.expand_path(File.dirname(__FILE__) + "/resources/a_bar.rb") @options.files << file @options.files_to_load.should include(file) end - + describe "with default --pattern" do it "should load files named _spec.rb" do dir = File.expand_path(File.dirname(__FILE__) + "/resources/") @@ -40,33 +40,33 @@ module Spec @options.files_to_load.should == ["#{dir}/a_spec.rb"] end end - + describe "with explicit pattern (single)" do before(:each) do @options.filename_pattern = "**/*_foo.rb" end - + it "should load files following pattern" do file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb") @options.files << file @options.files_to_load.should include(file) end - + it "should load files in directories following pattern" do dir = File.expand_path(File.dirname(__FILE__) + "/resources") @options.files << dir @options.files_to_load.should include("#{dir}/a_foo.rb") end - + it "should not load files in directories not following pattern" do dir = File.expand_path(File.dirname(__FILE__) + "/resources") @options.files << dir @options.files_to_load.should_not include("#{dir}/a_bar.rb") end end - + describe "with explicit pattern (comma,separated,values)" do - + before(:each) do @options.filename_pattern = "**/*_foo.rb,**/*_bar.rb" end @@ -77,16 +77,16 @@ module Spec @options.files_to_load.should include("#{dir}/a_foo.rb") @options.files_to_load.should include("#{dir}/a_bar.rb") end - + it "should support comma separated values with spaces" do dir = File.expand_path(File.dirname(__FILE__) + "/resources") @options.files << dir @options.files_to_load.should include("#{dir}/a_foo.rb") @options.files_to_load.should include("#{dir}/a_bar.rb") end - + end - + end describe "#backtrace_tweaker" do rails_plugins/rspec/spec/spec/runner/options_spec.rb @@ -45,7 +45,7 @@ module Spec @tweaker.tweak_backtrace(@error) @error.backtrace.should be_empty end - + it "should clean up double slashes" do @error.set_backtrace(["/a//b/c//d.rb"]) @tweaker.tweak_backtrace(@error) rails_plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb @@ -10,10 +10,10 @@ module Spec return @name == other.name end end - + class ClassWithMultiWordPredicate def multi_word_predicate? - true + true end end @@ -45,12 +45,12 @@ module Spec def add_to_collection_with_length_method(item) @items_in_collection_with_length_method.push(item) end - + def items_for(arg) return [1, 2, 3] if arg == 'a' [1] end - + def items @items_in_collection_with_size_method end @@ -75,11 +75,11 @@ module Spec @funny_called = true @return_val end - + def exists? @return_val end - + def multi_word_predicate? @return_val end @@ -102,7 +102,7 @@ module Custom require 'spec/runner/formatter/base_text_formatter' class Formatter < Spec::Runner::Formatter::BaseTextFormatter attr_reader :options, :where - + def initialize(options, where) @options = options @where = where @@ -111,7 +111,7 @@ module Custom class BadFormatter < Spec::Runner::Formatter::BaseTextFormatter attr_reader :where - + def initialize(options, where) bad_method end rails_plugins/rspec/spec/spec/spec_classes.rb @@ -5,39 +5,39 @@ module Spec @title = 'a story' @narrative = 'narrative' end - + def title(value) @title = value self end - + def narrative(value) @narrative = value self end - + def to_story(&block) block = lambda {} unless block_given? Story.new @title, @narrative, &block end end - + class ScenarioBuilder def initialize @name = 'a scenario' @story = StoryBuilder.new.to_story end - + def name(value) @name = value self end - + def story(value) @story = value self end - + def to_scenario(&block) Scenario.new @story, @name, &block end rails_plugins/rspec/spec/spec/story/builders.rb @@ -51,7 +51,7 @@ module Spec Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).and_return(runner) runner.should_receive(:run) @main.run_story - end + end end describe Main, "#steps_for" do @@ -114,7 +114,7 @@ module Spec describe Main, "#with_steps_for running a story" do it_should_behave_like "the main object extended with Main" - + before(:each) do @runner = mock("runner") @runner_step_group = StepGroup.new @@ -122,21 +122,21 @@ module Spec @runner.stub!(:run) Spec::Story::Runner::PlainTextStoryRunner.stub!(:new).and_return(@runner) end - + it "should create a PlainTextStoryRunner with a path" do Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).with('path/to/file',{}).and_return(@runner) @main.with_steps_for(:foo) do run 'path/to/file' end end - + it "should create a PlainTextStoryRunner with a path and options" do Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).with(anything,{:bar => :baz}).and_return(@runner) @main.with_steps_for(:foo) do run 'path/to/file', :bar => :baz end end - + it "should pass the group it creates to the runner's steps" do steps = @main.steps_for(:ice_cream) do Given("vanilla") {} @@ -146,7 +146,7 @@ module Spec end @runner_step_group.should have_step(:given, "vanilla") end - + it "should run a story" do @runner.should_receive(:run) Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).and_return(@runner) rails_plugins/rspec/spec/spec/story/extensions/main_spec.rb @@ -13,12 +13,12 @@ module Spec @scenario_ran = true end Runner::StoryRunner.should_receive(:scenario_from_current_story).with('scenario name').and_return(scenario) - + step = GivenScenario.new 'scenario name' - + # when step.perform(instance, nil) - + # then instance.scenario_ran.should be_true end rails_plugins/rspec/spec/spec/story/given_scenario_spec.rb @@ -12,24 +12,24 @@ module Spec it "should provide access to steps" do runner = PlainTextStoryRunner.new("path") - + runner.steps do |add| add.given("baz") {} end - + runner.steps.find(:given, "baz").should_not be_nil end - + it "should parse a story file" do runner = PlainTextStoryRunner.new("path") - + during { runner.run }.expect { @parser.should_receive(:parse).with(["this", "and that"]) } end - + it "should build up a mediator with its own steps and the singleton story_runner" do runner = PlainTextStoryRunner.new("path") Spec::Story::Runner.should_receive(:story_runner).and_return(story_runner = mock("story runner")) @@ -37,7 +37,7 @@ module Spec and_return(mediator = stub("mediator", :run_stories => nil)) runner.run end - + it "should build up a parser with the mediator" do runner = PlainTextStoryRunner.new("path") Spec::Story::Runner.should_receive(:story_runner).and_return(story_runner = mock("story runner")) @@ -45,7 +45,7 @@ module Spec Spec::Story::Runner::StoryParser.should_receive(:new).with(mediator).and_return(@parser) runner.run end - + it "should tell the mediator to run the stories" do runner = PlainTextStoryRunner.new("path") mediator = mock("mediator") @@ -53,7 +53,7 @@ module Spec mediator.should_receive(:run_stories) runner.run end - + it "should accept a block instead of a path" do runner = PlainTextStoryRunner.new do |runner| runner.load("path/to/story") @@ -61,14 +61,14 @@ module Spec File.should_receive(:read).with("path/to/story").and_return("this\nand that") runner.run end - + it "should tell you if you try to run with no path set" do runner = PlainTextStoryRunner.new lambda { runner.run }.should raise_error(RuntimeError, "You must set a path to the file with the story. See the RDoc.") end - + it "should pass options to the mediator" do runner = PlainTextStoryRunner.new("path", :foo => :bar) Spec::Story::Runner::StoryMediator.should_receive(:new). @@ -76,7 +76,7 @@ module Spec and_return(mediator = stub("mediator", :run_stories => nil)) runner.run end - + it "should provide access to its options" do runner = PlainTextStoryRunner.new("path") runner[:foo] = :bar @@ -85,7 +85,7 @@ module Spec and_return(mediator = stub("mediator", :run_stories => nil)) runner.run end - + end end end rails_plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb @@ -8,12 +8,12 @@ module Spec # given story = stub_everything('story') scenario_collector = ScenarioCollector.new(story) - + # when scenario_collector.Scenario 'scenario1' do end scenario_collector.Scenario 'scenario2' do end scenarios = scenario_collector.scenarios - + # then scenario_collector.should have(2).scenarios scenarios.first.name.should == 'scenario1' rails_plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb @@ -15,14 +15,14 @@ module Spec scenario = Scenario.new story, 'scenario' do $answer = @answer end - + # when scenario_runner.run(scenario, world) - + # then $answer.should == 42 end - + it 'should allow scenarios to share methods' do # given world = stub_everything @@ -39,15 +39,15 @@ module Spec shared() end scenario_runner = ScenarioRunner.new - + # when scenario_runner.run(scenario1, world) scenario_runner.run(scenario2, world) - + # then $shared_invoked.should == 2 end - + it 'should notify listeners when a scenario starts' do # given world = stub_everything @@ -60,17 +60,17 @@ module Spec mock_listener2 = stub_everything('listener2') scenario_runner.add_listener(mock_listener1) scenario_runner.add_listener(mock_listener2) - + # expect mock_listener1.should_receive(:scenario_started).with('story', 'scenario1') mock_listener2.should_receive(:scenario_started).with('story', 'scenario1') - + # when scenario_runner.run(scenario, world) - + # then end - + it 'should notify listeners when a scenario succeeds' do # given world = stub_everything('world') @@ -83,17 +83,17 @@ module Spec mock_listener2 = stub_everything('listener2') scenario_runner.add_listener(mock_listener1) scenario_runner.add_listener(mock_listener2) - + # expect mock_listener1.should_receive(:scenario_succeeded).with('story', 'scenario1') mock_listener2.should_receive(:scenario_succeeded).with('story', 'scenario1') - + # when scenario_runner.run(scenario, world) - + # then end - + it 'should notify listeners ONCE when a scenario raises an error' do # given error = RuntimeError.new('oops') @@ -104,17 +104,17 @@ module Spec mock_listener = stub_everything('listener') scenario_runner.add_listener(mock_listener) world = stub_everything - + # expect world.should_receive(:errors).twice.and_return([error, error]) mock_listener.should_receive(:scenario_failed).with('title', 'scenario1', error).once - + # when scenario_runner.run scenario, world - + # then end - + it 'should notify listeners when a scenario is pending' do # given pending_error = Spec::Example::ExamplePendingError.new('todo') @@ -125,15 +125,15 @@ module Spec mock_listener = mock('listener') scenario_runner.add_listener(mock_listener) world = stub_everything - + # expect world.should_receive(:errors).twice.and_return([pending_error, pending_error]) mock_listener.should_receive(:scenario_started).with('title', 'scenario1') mock_listener.should_receive(:scenario_pending).with('title', 'scenario1', 'todo').once - + # when scenario_runner.run scenario, world - + # then end end rails_plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../story_helper' module Spec module Story module Runner - + describe StoryMediator do before(:each) do $story_mediator_spec_value = nil @@ -11,38 +11,38 @@ module Spec @step_group.create_matcher(:given, "given") { $story_mediator_spec_value = "given matched" } @step_group.create_matcher(:when, "when") { $story_mediator_spec_value = "when matched" } @step_group.create_matcher(:then, "then") { $story_mediator_spec_value = "then matched" } - + @scenario_runner = ScenarioRunner.new @runner = StoryRunner.new @scenario_runner @mediator = StoryMediator.new @step_group, @runner end - + def run_stories @mediator.run_stories @runner.run_stories end - + it "should have no stories" do @mediator.stories.should be_empty end - + it "should create two stories" do @mediator.create_story "story title", "story narrative" @mediator.create_story "story title 2", "story narrative 2" run_stories - + @runner.should have(2).stories @runner.stories.first.title.should == "story title" @runner.stories.first.narrative.should == "story narrative" @runner.stories.last.title.should == "story title 2" @runner.stories.last.narrative.should == "story narrative 2" end - + it "should create a scenario" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario name" run_stories - + @runner.should have(1).scenarios @runner.scenarios.first.name.should == "scenario name" @runner.scenarios.first.story.should == @runner.stories.first @@ -55,20 +55,20 @@ module Spec @mediator.create_scenario "current scenario" @mediator.create_given_scenario "previous scenario" run_stories - + $story_mediator_spec_value.should == "previous scenario matched" end end - + it "should create a given step if one matches" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario" @mediator.create_given "given" run_stories - + $story_mediator_spec_value.should == "given matched" end - + it "should create a pending step if no given step matches" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario" @@ -78,16 +78,16 @@ module Spec @scenario_runner.add_listener mock_listener run_stories end - + it "should create a when step if one matches" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario" @mediator.create_when "when" run_stories - + $story_mediator_spec_value.should == "when matched" end - + it "should create a pending step if no when step matches" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario" @@ -97,16 +97,16 @@ module Spec @scenario_runner.add_listener mock_listener run_stories end - + it "should create a then step if one matches" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario" @mediator.create_then "then" run_stories - + $story_mediator_spec_value.should == "then matched" end - + it "should create a pending step if no 'then' step matches" do @mediator.create_story "title", "narrative" @mediator.create_scenario "scenario" @@ -116,18 +116,18 @@ module Spec @scenario_runner.add_listener mock_listener run_stories end - + it "should pass options to the stories it creates" do @mediator = StoryMediator.new @step_group, @runner, :foo => :bar @mediator.create_story "story title", "story narrative" run_stories - + @runner.stories.first[:foo].should == :bar end - + end - + end end end \ No newline at end of file rails_plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../story_helper' module Spec module Story module Runner - + describe StoryParser do before(:each) do @story_mediator = mock("story_mediator") @@ -13,7 +13,7 @@ module Spec it "should parse no lines" do @parser.parse([]) end - + it "should ignore text before the first Story: begins" do @story_mediator.should_not_receive(:create_scenario) @story_mediator.should_not_receive(:create_given) @@ -22,38 +22,38 @@ module Spec @story_mediator.should_receive(:create_story).with("simple addition", "") @parser.parse(["Here is a bunch of text", "about a calculator and all the things", "that it will do", "Story: simple addition"]) end - + it "should create a story" do @story_mediator.should_receive(:create_story).with("simple addition", "") @parser.parse(["Story: simple addition"]) end - + it "should create a story when line has leading spaces" do @story_mediator.should_receive(:create_story).with("simple addition", "") @parser.parse([" Story: simple addition"]) end - + it "should add a one line narrative to the story" do @story_mediator.should_receive(:create_story).with("simple addition","narrative") @parser.parse(["Story: simple addition","narrative"]) end - + it "should add a multi line narrative to the story" do @story_mediator.should_receive(:create_story).with("simple addition","narrative line 1\nline 2\nline 3") @parser.parse(["Story: simple addition","narrative line 1", "line 2", "line 3"]) end - + it "should exclude blank lines from the narrative" do @story_mediator.should_receive(:create_story).with("simple addition","narrative line 1\nline 2") @parser.parse(["Story: simple addition","narrative line 1", "", "line 2"]) end - + it "should exclude Scenario from the narrative" do @story_mediator.should_receive(:create_story).with("simple addition","narrative line 1\nline 2") @story_mediator.should_receive(:create_scenario) @parser.parse(["Story: simple addition","narrative line 1", "line 2", "Scenario: add one plus one"]) end - + end describe StoryParser, "in Story state" do @@ -62,18 +62,18 @@ module Spec @parser = StoryParser.new(@story_mediator) @story_mediator.stub!(:create_story) end - + it "should create a second Story for Story" do @story_mediator.should_receive(:create_story).with("number two","") @parser.parse(["Story: s", "Story: number two"]) end - + it "should include And in the narrative" do @story_mediator.should_receive(:create_story).with("s","And foo") @story_mediator.should_receive(:create_scenario).with("bar") @parser.parse(["Story: s", "And foo", "Scenario: bar"]) end - + it "should create a Scenario for Scenario" do @story_mediator.should_receive(:create_scenario).with("number two") @parser.parse(["Story: s", "Scenario: number two"]) @@ -84,25 +84,25 @@ module Spec @story_mediator.should_receive(:create_scenario).with("bar") @parser.parse(["Story: s", "Given foo", "Scenario: bar"]) end - + it "should include Given: in the narrative" do @story_mediator.should_receive(:create_story).with("s","Given: foo") @story_mediator.should_receive(:create_scenario).with("bar") @parser.parse(["Story: s", "Given: foo", "Scenario: bar"]) end - + it "should include When in the narrative" do @story_mediator.should_receive(:create_story).with("s","When foo") @story_mediator.should_receive(:create_scenario).with("bar") @parser.parse(["Story: s", "When foo", "Scenario: bar"]) end - + it "should include Then in the narrative" do @story_mediator.should_receive(:create_story).with("s","Then foo") @story_mediator.should_receive(:create_scenario).with("bar") @parser.parse(["Story: s", "Then foo", "Scenario: bar"]) end - + it "should include other in the story" do @story_mediator.should_receive(:create_story).with("s","narrative") @parser.parse(["Story: s", "narrative"]) @@ -116,12 +116,12 @@ module Spec @story_mediator.stub!(:create_story) @story_mediator.stub!(:create_scenario) end - + it "should create a Story for Story" do @story_mediator.should_receive(:create_story).with("number two","") @parser.parse(["Story: s", "Scenario: s", "Story: number two"]) end - + it "should create a Scenario for Scenario" do @story_mediator.should_receive(:create_scenario).with("number two") @parser.parse(["Story: s", "Scenario: s", "Scenario: number two"]) @@ -132,59 +132,59 @@ module Spec @parser.parse(["Story: s", "Scenario: s", "And second"]) }.should raise_error(IllegalStepError, /^Illegal attempt to create a And after a Scenario/) end - + it "should create a Given for Given" do @story_mediator.should_receive(:create_given).with("gift") @parser.parse(["Story: s", "Scenario: s", "Given gift"]) end - + it "should create a Given for Given:" do @story_mediator.should_receive(:create_given).with("gift") @parser.parse(["Story: s", "Scenario: s", "Given: gift"]) end - + it "should create a GivenScenario for GivenScenario" do @story_mediator.should_receive(:create_given_scenario).with("previous") @parser.parse(["Story: s", "Scenario: s", "GivenScenario previous"]) end - + it "should create a GivenScenario for GivenScenario:" do @story_mediator.should_receive(:create_given_scenario).with("previous") @parser.parse(["Story: s", "Scenario: s", "GivenScenario: previous"]) end - + it "should transition to Given state after GivenScenario" do @story_mediator.stub!(:create_given_scenario) @parser.parse(["Story: s", "Scenario: s", "GivenScenario previous"]) @parser.instance_eval{@state}.should be_an_instance_of(StoryParser::GivenState) end - + it "should transition to Given state after GivenScenario:" do @story_mediator.stub!(:create_given_scenario) @parser.parse(["Story: s", "Scenario: s", "GivenScenario: previous"]) @parser.instance_eval{@state}.should be_an_instance_of(StoryParser::GivenState) end - + it "should create a When for When" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "When ever"]) end - + it "should create a When for When:" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "When: ever"]) end - + it "should create a Then for Then" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Then and there"]) end - + it "should create a Then for Then:" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Then: and there"]) end - + it "should ignore other" do @parser.parse(["Story: s", "Scenario: s", "this is ignored"]) end @@ -198,12 +198,12 @@ module Spec @story_mediator.stub!(:create_scenario) @story_mediator.should_receive(:create_given).with("first") end - + it "should create a Story for Story" do @story_mediator.should_receive(:create_story).with("number two","") @parser.parse(["Story: s", "Scenario: s", "Given first", "Story: number two"]) end - + it "should create a Scenario for Scenario" do @story_mediator.should_receive(:create_scenario).with("number two") @parser.parse(["Story: s", "Scenario: s", "Given first", "Scenario: number two"]) @@ -213,37 +213,37 @@ module Spec @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given first", "Given second"]) end - + it "should create a second Given for And" do @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given: first", "And second"]) end - + it "should create a second Given for And:" do @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given first", "And: second"]) end - + it "should create a When for When" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given first", "When ever"]) end - + it "should create a When for When:" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given first", "When: ever"]) end - + it "should create a Then for Then" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Given first", "Then and there"]) end - + it "should create a Then for Then:" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Given first", "Then: and there"]) end - + it "should ignore other" do @parser.parse(["Story: s", "Scenario: s", "Given first", "this is ignored"]) end @@ -258,12 +258,12 @@ module Spec @story_mediator.should_receive(:create_given).with("first") @story_mediator.should_receive(:create_when).with("else") end - + it "should create a Story for Story" do @story_mediator.should_receive(:create_story).with("number two","") @parser.parse(["Story: s", "Scenario: s", "Given first", "When: else", "Story: number two"]) end - + it "should create a Scenario for Scenario" do @story_mediator.should_receive(:create_scenario).with("number two") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Scenario: number two"]) @@ -273,42 +273,42 @@ module Spec @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Given second"]) end - + it "should create Given for Given:" do @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Given: second"]) end - + it "should create a second When for When" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "When ever"]) end - + it "should create a second When for When:" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "When: ever"]) end - + it "should create a second When for And" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "And ever"]) end - + it "should create a second When for And:" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "And: ever"]) end - + it "should create a Then for Then" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then and there"]) end - + it "should create a Then for Then:" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: and there"]) end - + it "should ignore other" do @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "this is ignored"]) end @@ -324,12 +324,12 @@ module Spec @story_mediator.should_receive(:create_when).with("else") @story_mediator.should_receive(:create_then).with("what") end - + it "should create a Story for Story" do @story_mediator.should_receive(:create_story).with("number two","") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Story: number two"]) end - + it "should create a Scenario for Scenario" do @story_mediator.should_receive(:create_scenario).with("number two") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Scenario: number two"]) @@ -339,17 +339,17 @@ module Spec @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Given second"]) end - + it "should create Given for Given:" do @story_mediator.should_receive(:create_given).with("second") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "Given: second"]) end - + it "should create When for When" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "When ever"]) end - + it "should create When for When:" do @story_mediator.should_receive(:create_when).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "When: ever"]) @@ -359,7 +359,7 @@ module Spec @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Then and there"]) end - + it "should create a Then for Then:" do @story_mediator.should_receive(:create_then).with("and there") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "Then: and there"]) @@ -369,7 +369,7 @@ module Spec @story_mediator.should_receive(:create_then).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "And ever"]) end - + it "should create a second Then for And:" do @story_mediator.should_receive(:create_then).with("ever") @parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "And: ever"]) rails_plugins/rspec/spec/spec/story/runner/story_parser_spec.rb @@ -7,12 +7,12 @@ module Spec it 'should collect all the stories' do # given story_runner = StoryRunner.new(stub('scenario_runner')) - + # when story_runner.Story 'title1', 'narrative1' do end story_runner.Story 'title2', 'narrative2' do end stories = story_runner.stories - + # then story_runner.should have(2).stories stories.first.title.should == 'title1' @@ -20,11 +20,11 @@ module Spec stories.last.title.should == 'title2' stories.last.narrative.should == 'narrative2' end - + it 'should gather all the scenarios in the stories' do # given story_runner = StoryRunner.new(stub('scenario_runner')) - + # when story_runner.Story "story1", "narrative1" do Scenario "scenario1" do end @@ -34,14 +34,14 @@ module Spec Scenario "scenario3" do end end scenarios = story_runner.scenarios - + # then story_runner.should have(3).scenarios scenarios[0].name.should == 'scenario1' scenarios[1].name.should == 'scenario2' scenarios[2].name.should == 'scenario3' end - + # captures worlds passed into a ScenarioRunner class ScenarioWorldCatcher attr_accessor :worlds @@ -49,7 +49,7 @@ module Spec (@worlds ||= []) << world end end - + it 'should run each scenario in a separate object' do # given scenario_world_catcher = ScenarioWorldCatcher.new @@ -58,16 +58,16 @@ module Spec Scenario 'scenario1' do end Scenario 'scenario2' do end end - + # when story_runner.run_stories - + # then worlds = scenario_world_catcher.worlds scenario_world_catcher.should have(2).worlds worlds[0].should_not == worlds[1] end - + it 'should use the provided world creator to create worlds' do # given stub_scenario_runner = stub_everything @@ -77,16 +77,16 @@ module Spec Scenario 'scenario1' do end Scenario 'scenario2' do end end - + # expect mock_world_creator.should_receive(:create).twice - + # when story_runner.run_stories - + # then end - + it 'should notify listeners of the scenario count when the run starts' do # given story_runner = StoryRunner.new(stub_everything) @@ -94,7 +94,7 @@ module Spec mock_listener2 = stub_everything('listener2') story_runner.add_listener(mock_listener1) story_runner.add_listener(mock_listener2) - + story_runner.Story 'story1', 'narrative1' do Scenario 'scenario1' do end end @@ -102,17 +102,17 @@ module Spec Scenario 'scenario2' do end Scenario 'scenario3' do end end - + # expect mock_listener1.should_receive(:run_started).with(3) mock_listener2.should_receive(:run_started).with(3) - + # when story_runner.run_stories - + # then end - + it 'should notify listeners when a story starts' do # given story_runner = StoryRunner.new(stub_everything) @@ -120,7 +120,7 @@ module Spec mock_listener2 = stub_everything('listener2') story_runner.add_listener(mock_listener1) story_runner.add_listener(mock_listener2) - + story_runner.Story 'story1', 'narrative1' do Scenario 'scenario1' do end end @@ -128,19 +128,19 @@ module Spec Scenario 'scenario2' do end Scenario 'scenario3' do end end - + # expect mock_listener1.should_receive(:story_started).with('story1', 'narrative1') mock_listener1.should_receive(:story_ended).with('story1', 'narrative1') mock_listener2.should_receive(:story_started).with('story2', 'narrative2') mock_listener2.should_receive(:story_ended).with('story2', 'narrative2') - + # when story_runner.run_stories - + # then end - + it 'should notify listeners when the run ends' do # given story_runner = StoryRunner.new(stub_everything) @@ -151,17 +151,17 @@ module Spec story_runner.Story 'story1', 'narrative1' do Scenario 'scenario1' do end end - + # expect mock_listener1.should_receive(:run_ended) mock_listener2.should_receive(:run_ended) - + # when story_runner.run_stories - + # then end - + it 'should run a story in an instance of a specified class' do # given scenario_world_catcher = ScenarioWorldCatcher.new @@ -169,15 +169,15 @@ module Spec story_runner.Story 'title', 'narrative', :type => String do Scenario 'scenario' do end end - + # when story_runner.run_stories - + # then scenario_world_catcher.worlds[0].should be_kind_of(String) scenario_world_catcher.worlds[0].should be_kind_of(World) end - + it 'should pass initialization params through to the constructed instance' do # given scenario_world_catcher = ScenarioWorldCatcher.new @@ -185,20 +185,20 @@ module Spec story_runner.Story 'title', 'narrative', :type => Array, :args => [3] do Scenario 'scenario' do end end - + # when story_runner.run_stories - + # then scenario_world_catcher.worlds[0].should be_kind_of(Array) scenario_world_catcher.worlds[0].size.should == 3 end - + it 'should find a scenario in the current story by name' do # given story_runner = StoryRunner.new(ScenarioRunner.new) $scenario = nil - + story_runner.Story 'title', 'narrative' do Scenario 'first scenario' do end @@ -206,47 +206,47 @@ module Spec $scenario = StoryRunner.scenario_from_current_story 'first scenario' end end - + # when story_runner.run_stories - + # then $scenario.name.should == 'first scenario' end - + it "should clean the steps between stories" do #given story_runner = StoryRunner.new(ScenarioRunner.new) result = mock 'result' - + step1 = Step.new('step') do result.one end steps1 = StepGroup.new steps1.add :when, step1 - + story_runner.Story 'title', 'narrative', :steps => steps1 do Scenario 'first scenario' do When 'step' end end - + step2 = Step.new('step') do result.two end steps2 = StepGroup.new steps2.add :when, step2 - + story_runner.Story 'title2', 'narrative', :steps => steps2 do Scenario 'second scenario' do When 'step' end end - + #then result.should_receive(:one) result.should_receive(:two) - + #when story_runner.run_stories end rails_plugins/rspec/spec/spec/story/runner/story_runner_spec.rb @@ -10,7 +10,7 @@ module Spec end return io end - + before :each do Kernel.stub!(:at_exit) @stdout, $stdout = $stdout, dev_null @@ -19,24 +19,24 @@ module Spec @world_creator = World.dup @runner_module.module_eval { @run_options = @story_runner = @scenario_runner = @world_creator = nil } end - + after :each do $stdout = @stdout ARGV.replace @argv @runner_module.module_eval { @run_options = @story_runner = @scenario_runner = @world_creator = nil } end - + it 'should wire up a singleton StoryRunner' do @runner_module.story_runner.should_not be_nil end - + it 'should set its options based on ARGV' do # given ARGV << '--dry-run' - + # when options = @runner_module.run_options - + # then options.dry_run.should be_true end @@ -46,58 +46,58 @@ module Spec story_runner = mock('story runner', :null_object => true) scenario_runner = mock('scenario runner', :null_object => true) world_creator = mock('world', :null_object => true) - + @runner_module::class_eval { @world_creator = world_creator } @runner_module::StoryRunner.stub!(:new).and_return(story_runner) @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner) - + # expect world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter)) story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter)) scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter)) - + # when @runner_module.story_runner end - + it 'should add a documenter to the runner classes if one is specified' do # given ARGV << "--format" << "html" story_runner = mock('story runner', :null_object => true) scenario_runner = mock('scenario runner', :null_object => true) world_creator = mock('world', :null_object => true) - + @runner_module::class_eval { @world_creator = world_creator } @runner_module::StoryRunner.stub!(:new).and_return(story_runner) @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner) - + # expect world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter)) story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter)) scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter)) - + # when @runner_module.story_runner end - + it 'should add any registered listener to the runner classes' do # given ARGV << "--format" << "html" story_runner = mock('story runner', :null_object => true) scenario_runner = mock('scenario runner', :null_object => true) world_creator = mock('world', :null_object => true) - + @runner_module::class_eval { @world_creator = world_creator } @runner_module::StoryRunner.stub!(:new).and_return(story_runner) @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner) - + listener = Object.new - + # expect world_creator.should_receive(:add_listener).with(listener) story_runner.should_receive(:add_listener).with(listener) scenario_runner.should_receive(:add_listener).with(listener) - + # when @runner_module.register_listener listener end rails_plugins/rspec/spec/spec/story/runner_spec.rb @@ -6,12 +6,12 @@ module Spec it 'should not raise an error if no body is supplied' do # given story = StoryBuilder.new.to_story - + # when error = exception_from do Scenario.new story, 'name' end - + # then error.should be_nil end rails_plugins/rspec/spec/spec/story/scenario_spec.rb @@ -6,38 +6,38 @@ module Spec before(:each) do @step_group = StepGroup.new end - + it "should not find a matcher if empty" do @step_group.find(:given, "this and that").should be_nil end - + it "should create a given_scenario matcher" do step = @step_group.given_scenario("this and that") {} @step_group.find(:given_scenario, "this and that").should_not be_nil @step_group.find(:given_scenario, "this and that").should equal(step) end - + it "should create a given matcher" do step = @step_group.given("this and that") {} @step_group.find(:given, "this and that").should equal(step) end - + it "should create a when matcher" do step = @step_group.when("this and that") {} @step_group.find(:when, "this and that").should equal(step) end - + it "should create a them matcher" do step = @step_group.then("this and that") {} @step_group.find(:then, "this and that").should equal(step) end - + it "should add a matcher object" do step = Step.new("this and that") {} @step_group.add(:given, step) @step_group.find(:given, "this and that").should equal(step) end - + it "should add it matchers to another StepGroup (with one given)" do source = StepGroup.new target = StepGroup.new @@ -45,7 +45,7 @@ module Spec source.add_to target target.find(:given, "this and that").should equal(step) end - + it "should add it matchers to another StepGroup (with some of each type)" do source = StepGroup.new target = StepGroup.new @@ -65,14 +65,14 @@ module Spec target.find(:then, "2").should equal(then2) target.find(:then, "3").should equal(then3) end - + it "should append another collection" do matchers_to_append = StepGroup.new step = matchers_to_append.given("this and that") {} @step_group << matchers_to_append @step_group.find(:given, "this and that").should equal(step) end - + it "should append several other collections" do matchers_to_append = StepGroup.new more_matchers_to_append = StepGroup.new @@ -83,7 +83,7 @@ module Spec @step_group.find(:given, "this and that").should equal(first_matcher) @step_group.find(:given, "and the other").should equal(second_matcher) end - + it "should yield itself on initialization" do begin $step_group_spec_step = nil @@ -95,7 +95,7 @@ module Spec $step_group_spec_step = nil end end - + it "should support defaults" do class StepGroupSubclass < StepGroup steps do |add| @@ -104,25 +104,25 @@ module Spec end StepGroupSubclass.new.find(:given, "foo").should_not be_nil end - + it "should create a Given" do sub = Class.new(StepGroup).new step = sub.Given("foo") {} sub.find(:given, "foo").should == step end - + it "should create a When" do sub = Class.new(StepGroup).new step = sub.When("foo") {} sub.find(:when, "foo").should == step end - + it "should create a Then" do sub = Class.new(StepGroup).new step = sub.Then("foo") {} sub.find(:then, "foo").should == step end - + it "should create steps in a block" do sub = Class.new(StepGroup).new do Given("a given") {} @@ -133,22 +133,22 @@ module Spec sub.find(:when, "a when").should_not be_nil sub.find(:then, "a then").should_not be_nil end - + it "should clear itself" do step = @step_group.given("this and that") {} @step_group.clear @step_group.find(:given, "this and that").should be_nil end - + it "should tell you when it is empty" do @step_group.should be_empty end - + it "should tell you when it is not empty" do @step_group.given("this and that") {} @step_group.should_not be_empty end - + it "should handle << nil" do @step_group << nil end rails_plugins/rspec/spec/spec/story/step_group_spec.rb @@ -8,40 +8,40 @@ module Spec step_mother = StepMother.new step = Step.new("a given", &lambda {}) step_mother.store(:given, step) - + # when found = step_mother.find(:given, "a given") - + # then found.should == step end - + it 'should NOT raise an error if a step is missing' do # given step_mother = StepMother.new - + # then lambda do # when step_mother.find(:given, "doesn't exist") end.should_not raise_error end - + it "should create a default step which raises a pending error" do # given step_mother = StepMother.new - + # when step = step_mother.find(:given, "doesn't exist") - + # then step.should be_an_instance_of(Step) - + lambda do step.perform(Object.new, "doesn't exist") end.should raise_error(Spec::Example::ExamplePendingError, /Unimplemented/) end - + it 'should clear itself' do # given step_mother = StepMother.new @@ -50,20 +50,20 @@ module Spec # when step_mother.clear - + # then step_mother.should be_empty end - + it "should use assigned steps" do step_mother = StepMother.new - + step = Step.new('step') {} step_group = StepGroup.new step_group.add(:given, step) - + step_mother.use(step_group) - + step_mother.find(:given, "step").should equal(step) end rails_plugins/rspec/spec/spec/story/step_mother_spec.rb @@ -7,42 +7,42 @@ module Spec step = Step.new("this text") {} step.matches?("this text").should be_true end - + it "should not match a text string that does not start the same" do step = Step.new("this text") {} step.matches?("Xthis text").should be_false end - + it "should not match a text string that does not end the same" do step = Step.new("this text") {} step.matches?("this textX").should be_false end - + it "should match a text string with a param" do step = Step.new("this $param text") {} step.matches?("this anything text").should be_true end - + it "should not be greedy" do step = Step.new("enter $value for $key") {} step.parse_args("enter 3 for keys for a piano").should == ['3','keys for a piano'] end - + it "should match a text string with 3 params" do step = Step.new("1 $one 2 $two 3 $three 4") {} step.matches?("1 a 2 b 3 c 4").should be_true end - + it "should match a text string with a param at the beginning" do step = Step.new("$one 2 3") {} step.matches?("a 2 3").should be_true end - + it "should match a text string with a param at the end" do step = Step.new("1 2 $three") {} step.matches?("1 2 c").should be_true end - + it "should not match a different string" do step = Step.new("this text") {} step.matches?("other text").should be_false @@ -52,65 +52,65 @@ module Spec step = Step.new(/this text/) {} step.matches?("this text").should be_true end - + it "should match a regexp with a match group" do step = Step.new(/this (.*) text/) {} step.matches?("this anything text").should be_true end - + it "should match a regexp with a named variable" do step = Step.new(/this $variable text/) {} step.matches?("this anything text").should be_true end - + it "should not match a non matching regexp" do step = Step.new(/this (.*) text/) {} step.matches?("other anything text").should be_false end - + it "should not match a non matching regexp with a named variable" do step = Step.new(/this $variable text/) {} step.matches?("other anything text").should be_false end - + it "should not get bogged down by parens in strings" do step = Step.new("before () after") {} step.matches?("before () after").should be_true end - + it "should match any option of an alteration" do step = Step.new(/(he|she) is cool/) {} step.matches?("he is cool").should be_true step.matches?("she is cool").should be_true end - + it "should match alteration as well as a variable" do step = Step.new(/(he|she) is (.*)/) {} step.matches?("he is cool").should be_true step.parse_args("he is cool").should == ['he', 'cool'] end - + it "should match alteration as well as a named variable" do step = Step.new(/(he|she) is $adjective/) {} step.matches?("he is cool").should be_true step.parse_args("he is cool").should == ['he', 'cool'] end - + it "should match alteration as well as a anonymous and named variable" do step = Step.new(/(he|she) is (.*?) $adjective/) {} step.matches?("he is very cool").should be_true step.parse_args("he is very cool").should == ['he', 'very', 'cool'] end - + end - + describe Step do it "should make complain with no block" do lambda { step = Step.new("foo") }.should raise_error end - + it "should perform itself on an object" do # given $instance = nil @@ -118,14 +118,14 @@ module Spec $instance = self end instance = Object.new - + # when step.perform(instance, "step") - + # then $instance.should == instance end - + it "should perform itself with one parameter with match expression" do # given $result = nil @@ -133,15 +133,15 @@ module Spec $result = count end instance = Object.new - + # when args = step.parse_args("an account with 3 dollars") step.perform(instance, *args) - + # then $result.should == "3" end - + it "should perform itself with one parameter without a match expression" do # given $result = nil @@ -149,14 +149,14 @@ module Spec $result = amount end instance = Object.new - + # when step.perform(instance, 20) - + # then $result.should == 20 end - + it "should perform itself with 2 parameters" do # given $account_type = nil @@ -166,11 +166,11 @@ module Spec $amount = amount end instance = Object.new - + # when args = step.parse_args("a savings account with 3 dollars") step.perform(instance, *args) - + # then $account_type.should == "savings" $amount.should == "3" @@ -185,11 +185,11 @@ module Spec $adjective = adjective end instance = Object.new - + # when args = step.parse_args("he is cool") step.perform(instance, *args) - + # then $pronoun.should == "he" $adjective.should == "cool" rails_plugins/rspec/spec/spec/story/step_spec.rb @@ -10,37 +10,37 @@ module Spec $instance = self end object = Object.new - + # when story.run_in(object) - + # then $instance.should be(object) end - + it 'should not raise an error if no block is supplied' do # when error = exception_from do Story.new 'title', 'narrative' end - + # then error.should be_nil end - + it "should raise when error raised running in another object" do #given story = Story.new 'title', 'narrative' do raise "this is raised in the story" end object = Object.new - + # when/then lambda do story.run_in(object) end.should raise_error end - + it "should use the steps it is told to using a StepGroup" do story = Story.new("title", "narrative", :steps => steps = StepGroup.new) do end assignee = mock("assignee") @@ -53,27 +53,27 @@ module Spec orig_rspec_story_steps = $rspec_story_steps $rspec_story_steps = StepGroupHash.new $rspec_story_steps[:foo] = steps = Object.new - + story = Story.new("title", "narrative", :steps_for => :foo) do end assignee = mock("assignee") - + assignee.should_receive(:use).with(steps) story.assign_steps_to(assignee) ensure $rspec_story_steps = orig_rspec_story_steps end end - + it "should use the steps it is told to using multiple keys" do begin orig_rspec_story_steps = $rspec_story_steps $rspec_story_steps = StepGroupHash.new $rspec_story_steps[:foo] = foo_steps = Object.new $rspec_story_steps[:bar] = bar_steps = Object.new - + story = Story.new("title", "narrative", :steps_for => [:foo, :bar]) do end assignee = mock("assignee") - + assignee.should_receive(:use).with(foo_steps) assignee.should_receive(:use).with(bar_steps) story.assign_steps_to(assignee) rails_plugins/rspec/spec/spec/story/story_spec.rb @@ -5,7 +5,7 @@ describe "Translator" do before do @t = Spec::Translator.new end - + it "should translate files" do from = File.dirname(__FILE__) + '/..' to = "#{Dir.tmpdir}/translated_specs" @@ -27,7 +27,7 @@ describe "Translator" do "before(:all) {foo}\n" ) end - + it "should translate context ' to describe '" do @t.translate_line( "context 'Translator' do\n" @@ -51,7 +51,7 @@ describe "Translator" do ' describe "Translator"' ) end - + it "should not translate context=foo" do @t.translate_line(' context=foo').should eql(' context=foo') end @@ -63,7 +63,7 @@ describe "Translator" do it "should not translate context = foo" do @t.translate_line(' context = foo').should eql(' context = foo') end - + it "should translate should_be_close" do @t.translate_line('5.0.should_be_close(5.0, 0.5)').should eql('5.0.should be_close(5.0, 0.5)') end @@ -87,7 +87,7 @@ describe "Translator" do it "should leave should_receive" do @t.translate_line('@mock.should_receive(:not_expected).with("unexpected text")').should eql('@mock.should_receive(:not_expected).with("unexpected text")') end - + it "should translate multi word predicates" do @t.translate_line('foo.should_multi_word_predicate').should eql('foo.should be_multi_word_predicate') end @@ -123,7 +123,7 @@ describe "Translator" do it "should translate should_be_happy" do @t.translate_line("4.should_be_happy").should eql("4.should be_happy") end - + it "should translate custom method taking regexp with parenthesis" do @t.translate_line("@browser.should_contain_text(/Sn.rrunger og annet rusk/)").should eql("@browser.should be_contain_text(/Sn.rrunger og annet rusk/)") end @@ -131,16 +131,16 @@ describe "Translator" do it "should translate custom method taking regexp without parenthesis" do @t.translate_line("@browser.should_contain_text /Sn.rrunger og annet rusk/\n").should eql("@browser.should be_contain_text(/Sn.rrunger og annet rusk/)\n") end - + it "should translate should_not_be_nil" do @t.translate_line("foo.should_not_be_nil\n").should eql("foo.should_not be_nil\n") end - + it "should translate kind of" do @t.translate_line('@object.should_be_kind_of(MessageExpectation)').should( eql('@object.should be_kind_of(MessageExpectation)')) end - + it "should translate should_be_true" do @t.translate_line("foo.should_be_true\n").should eql("foo.should be_true\n") end @@ -151,7 +151,7 @@ describe "Translator" do @t.translate_line("collection.each { |c| c.should_match a_regexp_in_a_var }\n").should eql("collection.each { |c| c.should match(a_regexp_in_a_var) }\n") @t.translate_line("collection.each{|c| c.should_match a_regexp_in_a_var}\n").should eql("collection.each{|c| c.should match(a_regexp_in_a_var) }\n") end - + # From Rubinius specs it "should translate close_to without parens" do @t.translate_line("end.should_be_close 3.14159_26535_89793_23846, TOLERANCE\n").should eql("end.should be_close(3.14159_26535_89793_23846, TOLERANCE)\n") @@ -186,7 +186,7 @@ describe "Translator" do "@parslet.should_not eql(lambda { nil }.to_parseable)" ) end - + # [#9882] 0.9 Beta 1 - translator bugs # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149 it "should support fully qualified names" do @@ -196,7 +196,7 @@ describe "Translator" do "results.should be_kind_of(SimpleASTLanguage::Identifier)" ) end - + # [#9882] 0.9 Beta 1 - translator bugs # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149 # it "should leave whitespace between expression and comments" do rails_plugins/rspec/spec/spec/translator_spec.rb @@ -40,20 +40,20 @@ module Spec def pass Pass.new end - + class CorrectlyOrderedMockExpectation def initialize(&event) @event = event end - + def expect(&expectations) expectations.call @event.call end end - + def during(&block) - CorrectlyOrderedMockExpectation.new(&block) + CorrectlyOrderedMockExpectation.new(&block) end end end @@ -72,7 +72,7 @@ module Custom def run end - end + end end def exception_from(&block) rails_plugins/rspec/spec/spec_helper.rb @@ -11,6 +11,6 @@ module StoryHelper def cmdline(args, stderr) ruby("#{File.dirname(__FILE__) + '/../../resources/helpers/cmdline.rb'} #{args}", stderr) end - + Spec::Story::World.send :include, self end rails_plugins/rspec/stories/resources/helpers/story_helper.rb @@ -6,7 +6,7 @@ steps_for :running_rspec do raise "could not find file at #{@path}" end end - + When("I run it with the $interpreter") do |interpreter| stderr_file = Tempfile.new('rspec') stderr_file.close @@ -23,13 +23,13 @@ steps_for :running_rspec do @stderr = IO.read(stderr_file.path) @exit_code = $?.to_i end - + Then("the exit code should be $exit_code") do |exit_code| if @exit_code != exit_code.to_i raise "Did not exit with #{exit_code}, but with #{@exit_code}. Standard error:\n#{@stderr}" end end - + Then("the $stream should match $regex") do |stream, string_or_regex| written = case(stream) when 'stdout' then @stdout @@ -38,7 +38,7 @@ steps_for :running_rspec do end written.should smart_match(string_or_regex) end - + Then("the $stream should not match $regex") do |stream, string_or_regex| written = case(stream) when 'stdout' then @stdout rails_plugins/rspec/stories/resources/steps/running_rspec.rb @@ -25,7 +25,7 @@ class ATest < Test::Unit::TestCase def test_should_pass_with_assert assert true end - + def test_should_fail_with_assert assert false end @@ -33,7 +33,7 @@ class ATest < Test::Unit::TestCase def test_should_pass_with_should 1.should == 1 end - + def test_should_fail_with_should 1.should == 2 end rails_plugins/rspec/stories/resources/test/spec_and_test_together.rb @@ -15,7 +15,7 @@ class MySpec < Test::Unit::TestCase def should_pass_with_assert assert true end - + def should_fail_with_assert assert false end rails_plugins/rspec/stories/resources/test/test_case_with_should_methods.rb @@ -26,7 +26,7 @@ var Builder = { // due to a Firefox bug node: function(elementName) { elementName = elementName.toUpperCase(); - + // try innerHTML approach var parentTag = this.NODEMAP[elementName] || 'div'; var parentElement = document.createElement(parentTag); @@ -34,14 +34,14 @@ var Builder = { parentElement.innerHTML = "<" + elementName + "></" + elementName + ">"; } catch(e) {} var element = parentElement.firstChild || null; - + // see if browser added wrapping tags if(element && (element.tagName.toUpperCase() != elementName)) element = element.getElementsByTagName(elementName)[0]; - + // fallback to createElement approach if(!element) element = document.createElement(elementName); - + // abort if nothing could be created if(!element) return; @@ -62,13 +62,13 @@ var Builder = { // workaround firefox 1.0.X bug if(!element) { element = document.createElement(elementName); - for(attr in arguments[1]) + for(attr in arguments[1]) element[attr == 'class' ? 'className' : attr] = arguments[1][attr]; } if(element.tagName.toUpperCase() != elementName) element = parentElement.getElementsByTagName(elementName)[0]; } - } + } // text, or array of children if(arguments[2]) @@ -117,20 +117,20 @@ var Builder = { $(element).update(html.strip()); return element.down(); }, - dump: function(scope) { - if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope - + dump: function(scope) { + if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope + var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " + "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " + "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+ "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+ "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+ "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/); - - tags.each( function(tag){ - scope[tag] = function() { - return Builder.node.apply(Builder, [tag].concat($A(arguments))); - } + + tags.each( function(tag){ + scope[tag] = function() { + return Builder.node.apply(Builder, [tag].concat($A(arguments))); + } }); } } rails_plugins/rspec/story_server/prototype/javascripts/builder.js @@ -7,18 +7,18 @@ // Richard Livsey // Rahul Bhargava // Rob Wills -// +// // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ -// Autocompleter.Base handles all the autocompletion functionality +// Autocompleter.Base handles all the autocompletion functionality // that's independent of the data source for autocompletion. This // includes drawing the autocompletion menu, observing keyboard // and mouse events, and similar. // -// Specific autocompleters need to provide, at the very least, +// Specific autocompleters need to provide, at the very least, // a getUpdatedChoices function that will be invoked every time -// the text inside the monitored textbox changes. This method +// the text inside the monitored textbox changes. This method // should get the text for which to provide autocompletion by // invoking this.getToken(), NOT by directly accessing // this.element.value. This is to allow incremental tokenized @@ -32,8 +32,8 @@ // will incrementally autocomplete with a comma as the token. // Additionally, ',' in the above example can be replaced with // a token array, e.g. { tokens: [',', '\n'] } which -// enables autocompletion on multiple tokens. This is most -// useful when one of the tokens is \n (a newline), as it +// enables autocompletion on multiple tokens. This is most +// useful when one of the tokens is \n (a newline), as it // allows smart autocompletion after linebreaks. // // vim:expandtab ts=8 sw=2 @@ -46,12 +46,12 @@ Autocompleter.Base = function() { }; Autocompleter.Base.prototype = { baseInitialize: function(element, update, options) { element = $(element) - this.element = element; - this.update = $(update); - this.hasFocus = false; - this.changed = false; - this.active = false; - this.index = 0; + this.element = element; + this.update = $(update); + this.hasFocus = false; + this.changed = false; + this.active = false; + this.index = 0; this.entryCount = 0; this.oldElementValue = this.element.value; @@ -64,28 +64,28 @@ Autocompleter.Base.prototype = { this.options.tokens = this.options.tokens || []; this.options.frequency = this.options.frequency || 0.4; this.options.minChars = this.options.minChars || 1; - this.options.onShow = this.options.onShow || - function(element, update){ + this.options.onShow = this.options.onShow || + function(element, update){ if(!update.style.position || update.style.position=='absolute') { update.style.position = 'absolute'; Position.clone(element, update, { - setHeight: false, + setHeight: false, offsetTop: element.offsetHeight }); } Effect.Appear(update,{duration:0.15}); }; - this.options.onHide = this.options.onHide || + this.options.onHide = this.options.onHide || function(element, update){ new Effect.Fade(update,{duration:0.15}) }; - if(typeof(this.options.tokens) == 'string') + if(typeof(this.options.tokens) == 'string') this.options.tokens = new Array(this.options.tokens); // Force carriage returns as token delimiters anyway if (!this.options.tokens.include('\n')) this.options.tokens.push('\n'); this.observer = null; - + this.element.setAttribute('autocomplete','off'); Element.hide(this.update); @@ -96,10 +96,10 @@ Autocompleter.Base.prototype = { show: function() { if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); - if(!this.iefix && + if(!this.iefix && (Prototype.Browser.IE) && (Element.getStyle(this.update, 'position')=='absolute')) { - new Insertion.After(this.update, + new Insertion.After(this.update, '<iframe id="' + this.update.id + '_iefix" '+ 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + 'src="javascript:false;" frameborder="0" scrolling="no"></iframe>'); @@ -107,7 +107,7 @@ Autocompleter.Base.prototype = { } if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); }, - + fixIEOverlapping: function() { Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); this.iefix.style.zIndex = 1; @@ -155,15 +155,15 @@ Autocompleter.Base.prototype = { if(Prototype.Browser.WebKit) Event.stop(event); return; } - else - if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || + else + if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return; this.changed = true; this.hasFocus = true; if(this.observer) clearTimeout(this.observer); - this.observer = + this.observer = setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); }, @@ -175,35 +175,35 @@ Autocompleter.Base.prototype = { onHover: function(event) { var element = Event.findElement(event, 'LI'); - if(this.index != element.autocompleteIndex) + if(this.index != element.autocompleteIndex) { this.index = element.autocompleteIndex; this.render(); } Event.stop(event); }, - + onClick: function(event) { var element = Event.findElement(event, 'LI'); this.index = element.autocompleteIndex; this.selectEntry(); this.hide(); }, - + onBlur: function(event) { // needed to make click events working setTimeout(this.hide.bind(this), 250); this.hasFocus = false; - this.active = false; - }, - + this.active = false; + }, + render: function() { if(this.entryCount > 0) { for (var i = 0; i < this.entryCount; i++) - this.index==i ? - Element.addClassName(this.getEntry(i),"selected") : + this.index==i ? + Element.addClassName(this.getEntry(i),"selected") : Element.removeClassName(this.getEntry(i),"selected"); - if(this.hasFocus) { + if(this.hasFocus) { this.show(); this.active = true; } @@ -212,27 +212,27 @@ Autocompleter.Base.prototype = { this.hide(); } }, - + markPrevious: function() { if(this.index > 0) this.index-- else this.index = this.entryCount-1; this.getEntry(this.index).scrollIntoView(true); }, - + markNext: function() { if(this.index < this.entryCount-1) this.index++ else this.index = 0; this.getEntry(this.index).scrollIntoView(false); }, - + getEntry: function(index) { return this.update.firstChild.childNodes[index]; }, - + getCurrentEntry: function() { return this.getEntry(this.index); }, - + selectEntry: function() { this.active = false; this.updateElement(this.getCurrentEntry()); @@ -249,7 +249,7 @@ Autocompleter.Base.prototype = { if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); } else value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); - + var bounds = this.getTokenBounds(); if (bounds[0] != -1) { var newValue = this.element.value.substr(0, bounds[0]); @@ -262,7 +262,7 @@ Autocompleter.Base.prototype = { } this.oldElementValue = this.element.value; this.element.focus(); - + if (this.options.afterUpdateElement) this.options.afterUpdateElement(this.element, selectedElement); }, @@ -274,20 +274,20 @@ Autocompleter.Base.prototype = { Element.cleanWhitespace(this.update.down()); if(this.update.firstChild && this.update.down().childNodes) { - this.entryCount = + this.entryCount = this.update.down().childNodes.length; for (var i = 0; i < this.entryCount; i++) { var entry = this.getEntry(i); entry.autocompleteIndex = i; this.addObservers(entry); } - } else { + } else { this.entryCount = 0; } this.stopIndicator(); this.index = 0; - + if(this.entryCount==1 && this.options.autoSelect) { this.selectEntry(); this.hide(); @@ -303,7 +303,7 @@ Autocompleter.Base.prototype = { }, onObserverEvent: function() { - this.changed = false; + this.changed = false; this.tokenBounds = null; if(this.getToken().length>=this.options.minChars) { this.getUpdatedChoices(); @@ -357,16 +357,16 @@ Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.pro getUpdatedChoices: function() { this.startIndicator(); - - var entry = encodeURIComponent(this.options.paramName) + '=' + + + var entry = encodeURIComponent(this.options.paramName) + '=' + encodeURIComponent(this.getToken()); this.options.parameters = this.options.callback ? this.options.callback(this.element, entry) : entry; - if(this.options.defaultParams) + if(this.options.defaultParams) this.options.parameters += '&' + this.options.defaultParams; - + new Ajax.Request(this.url, this.options); }, @@ -389,7 +389,7 @@ Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.pro // - choices - How many autocompletion choices to offer // // - partialSearch - If false, the autocompleter will match entered -// text only at the beginning of strings in the +// text only at the beginning of strings in the // autocomplete array. Defaults to true, which will // match text at the beginning of any *word* in the // strings in the autocomplete array. If you want to @@ -406,7 +406,7 @@ Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.pro // - ignoreCase - Whether to ignore case when autocompleting. // Defaults to true. // -// It's possible to pass in a custom function as the 'selector' +// It's possible to pass in a custom function as the 'selector' // option, if you prefer to write your own autocompletion logic. // In that case, the other options above will not apply unless // you support them. @@ -435,20 +435,20 @@ Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), { var entry = instance.getToken(); var count = 0; - for (var i = 0; i < instance.options.array.length && - ret.length < instance.options.choices ; i++) { + for (var i = 0; i < instance.options.array.length && + ret.length < instance.options.choices ; i++) { var elem = instance.options.array[i]; - var foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase()) : + var foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase()) : elem.indexOf(entry); while (foundPos != -1) { - if (foundPos == 0 && elem.length != entry.length) { - ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + + if (foundPos == 0 && elem.length != entry.length) { + ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + elem.substr(entry.length) + "</li>"); break; - } else if (entry.length >= instance.options.partialChars && + } else if (entry.length >= instance.options.partialChars && instance.options.partialSearch && foundPos != -1) { if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" + @@ -458,8 +458,8 @@ Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), { } } - foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : + foundPos = instance.options.ignoreCase ? + elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : elem.indexOf(entry, foundPos + 1); } @@ -945,7 +945,7 @@ Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(opt }; -// Delayed observer, like Form.Element.Observer, +// Delayed observer, like Form.Element.Observer, // but waits for delay after last key input // Ideal for live-search fields @@ -956,7 +956,7 @@ Form.Element.DelayedObserver.prototype = { this.element = $(element); this.callback = callback; this.timer = null; - this.lastValue = $F(this.element); + this.lastValue = $F(this.element); Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); }, delayedListener: function(event) { rails_plugins/rspec/story_server/prototype/javascripts/controls.js @@ -2,7 +2,7 @@ // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) -// +// // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ @@ -34,7 +34,7 @@ var Droppables = { options._containers.push($(containment)); } } - + if(options.accept) options.accept = [options.accept].flatten(); Element.makePositioned(element); // fix IE @@ -42,34 +42,34 @@ var Droppables = { this.drops.push(options); }, - + findDeepestChild: function(drops) { deepest = drops[0]; - + for (i = 1; i < drops.length; ++i) if (Element.isParent(drops[i].element, deepest.element)) deepest = drops[i]; - + return deepest; }, isContained: function(element, drop) { var containmentNode; if(drop.tree) { - containmentNode = element.treeNode; + containmentNode = element.treeNode; } else { containmentNode = element.parentNode; } return drop._containers.detect(function(c) { return containmentNode == c }); }, - + isAffected: function(point, element, drop) { return ( (drop.element!=element) && ((!drop._containers) || this.isContained(element, drop)) && ((!drop.accept) || - (Element.classNames(element).detect( + (Element.classNames(element).detect( function(v) { return drop.accept.include(v) } ) )) && Position.within(drop.element, point[0], point[1]) ); }, @@ -89,12 +89,12 @@ var Droppables = { show: function(point, element) { if(!this.drops.length) return; var drop, affected = []; - + this.drops.each( function(drop) { if(Droppables.isAffected(point, element, drop)) affected.push(drop); }); - + if(affected.length>0) drop = Droppables.findDeepestChild(affected); @@ -103,7 +103,7 @@ var Droppables = { Position.within(drop.element, point[0], point[1]); if(drop.onHover) drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); - + if (drop != this.last_active) Droppables.activate(drop); } }, @@ -114,8 +114,8 @@ var Droppables = { if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) if (this.last_active.onDrop) { - this.last_active.onDrop(element, this.last_active.element, event); - return true; + this.last_active.onDrop(element, this.last_active.element, event); + return true; } }, @@ -128,20 +128,20 @@ var Droppables = { var Draggables = { drags: [], observers: [], - + register: function(draggable) { if(this.drags.length == 0) { this.eventMouseUp = this.endDrag.bindAsEventListener(this); this.eventMouseMove = this.updateDrag.bindAsEventListener(this); this.eventKeypress = this.keyPress.bindAsEventListener(this); - + Event.observe(document, "mouseup", this.eventMouseUp); Event.observe(document, "mousemove", this.eventMouseMove); Event.observe(document, "keypress", this.eventKeypress); } this.drags.push(draggable); }, - + unregister: function(draggable) { this.drags = this.drags.reject(function(d) { return d==draggable }); if(this.drags.length == 0) { @@ -150,24 +150,24 @@ var Draggables = { Event.stopObserving(document, "keypress", this.eventKeypress); } }, - + activate: function(draggable) { - if(draggable.options.delay) { - this._timeout = setTimeout(function() { - Draggables._timeout = null; - window.focus(); - Draggables.activeDraggable = draggable; - }.bind(this), draggable.options.delay); + if(draggable.options.delay) { + this._timeout = setTimeout(function() { + Draggables._timeout = null; + window.focus(); + Draggables.activeDraggable = draggable; + }.bind(this), draggable.options.delay); } else { window.focus(); // allows keypress events if window isn't currently focused, fails for Safari this.activeDraggable = draggable; } }, - + deactivate: function() { this.activeDraggable = null; }, - + updateDrag: function(event) { if(!this.activeDraggable) return; var pointer = [Event.pointerX(event), Event.pointerY(event)]; @@ -175,36 +175,36 @@ var Draggables = { // the same coordinates, prevent needless redrawing (moz bug?) if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; this._lastPointer = pointer; - + this.activeDraggable.updateDrag(event, pointer); }, - + endDrag: function(event) { - if(this._timeout) { - clearTimeout(this._timeout); - this._timeout = null; + if(this._timeout) { + clearTimeout(this._timeout); + this._timeout = null; } if(!this.activeDraggable) return; this._lastPointer = null; this.activeDraggable.endDrag(event); this.activeDraggable = null; }, - + keyPress: function(event) { if(this.activeDraggable) this.activeDraggable.keyPress(event); }, - + addObserver: function(observer) { this.observers.push(observer); this._cacheObserverCallbacks(); }, - + removeObserver: function(element) { // element instead of observer fixes mem leaks this.observers = this.observers.reject( function(o) { return o.element==element }); this._cacheObserverCallbacks(); }, - + notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' if(this[eventName+'Count'] > 0) this.observers.each( function(o) { @@ -212,7 +212,7 @@ var Draggables = { }); if(draggable.options[eventName]) draggable.options[eventName](draggable, event); }, - + _cacheObserverCallbacks: function() { ['onStart','onEnd','onDrag'].each( function(eventName) { Draggables[eventName+'Count'] = Draggables.observers.select( @@ -239,12 +239,12 @@ Draggable.prototype = { }, endeffect: function(element) { var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0; - new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, + new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, queue: {scope:'_draggable', position:'end'}, - afterFinish: function(){ - Draggable._dragging[element] = false + afterFinish: function(){ + Draggable._dragging[element] = false } - }); + }); }, zindex: 1000, revert: false, @@ -255,57 +255,57 @@ Draggable.prototype = { snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } delay: 0 }; - + if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) Object.extend(defaults, { starteffect: function(element) { element._opacity = Element.getOpacity(element); Draggable._dragging[element] = true; - new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); + new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); } }); - + var options = Object.extend(defaults, arguments[1] || { }); this.element = $(element); - + if(options.handle && Object.isString(options.handle)) this.handle = this.element.down('.'+options.handle, 0); - + if(!this.handle) this.handle = $(options.handle); if(!this.handle) this.handle = this.element; - + if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { options.scroll = $(options.scroll); this._isScrollChild = Element.childOf(this.element, options.scroll); } - Element.makePositioned(this.element); // fix IE + Element.makePositioned(this.element); // fix IE this.options = options; - this.dragging = false; + this.dragging = false; this.eventMouseDown = this.initDrag.bindAsEventListener(this); Event.observe(this.handle, "mousedown", this.eventMouseDown); - + Draggables.register(this); }, - + destroy: function() { Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); Draggables.unregister(this); }, - + currentDelta: function() { return([ parseInt(Element.getStyle(this.element,'left') || '0'), parseInt(Element.getStyle(this.element,'top') || '0')]); }, - + initDrag: function(event) { if(!Object.isUndefined(Draggable._dragging[this.element]) && Draggable._dragging[this.element]) return; - if(Event.isLeftClick(event)) { + if(Event.isLeftClick(event)) { // abort on form elements, fixes a Firefox issue var src = Event.element(event); if((tag_name = src.tagName.toUpperCase()) && ( @@ -314,26 +314,26 @@ Draggable.prototype = { tag_name=='OPTION' || tag_name=='BUTTON' || tag_name=='TEXTAREA')) return; - + var pointer = [Event.pointerX(event), Event.pointerY(event)]; var pos = Position.cumulativeOffset(this.element); this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); - + Draggables.activate(this); Event.stop(event); } }, - + startDrag: function(event) { this.dragging = true; if(!this.delta) this.delta = this.currentDelta(); - + if(this.options.zindex) { this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); this.element.style.zIndex = this.options.zindex; } - + if(this.options.ghosting) { this._clone = this.element.cloneNode(true); this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute'); @@ -341,7 +341,7 @@ Draggable.prototype = { Position.absolutize(this.element); this.element.parentNode.insertBefore(this._clone, this.element); } - + if(this.options.scroll) { if (this.options.scroll == window) { var where = this._getWindowScroll(this.options.scroll); @@ -352,28 +352,28 @@ Draggable.prototype = { this.originalScrollTop = this.options.scroll.scrollTop; } } - + Draggables.notify('onStart', this, event); - + if(this.options.starteffect) this.options.starteffect(this.element); }, - + updateDrag: function(event, pointer) { if(!this.dragging) this.startDrag(event); - + if(!this.options.quiet){ Position.prepare(); Droppables.show(pointer, this.element); } - + Draggables.notify('onDrag', this, event); - + this.draw(pointer); if(this.options.change) this.options.change(this); - + if(this.options.scroll) { this.stopScrolling(); - + var p; if (this.options.scroll == window) { with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } @@ -391,16 +391,16 @@ Draggable.prototype = { if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); this.startScrolling(speed); } - + // fix AppleWebKit rendering if(Prototype.Browser.WebKit) window.scrollBy(0,0); - + Event.stop(event); }, - + finishDrag: function(event, success) { this.dragging = false; - + if(this.options.quiet){ Position.prepare(); var pointer = [Event.pointerX(event), Event.pointerY(event)]; @@ -415,17 +415,17 @@ Draggable.prototype = { this._clone = null; } - var dropped = false; - if(success) { - dropped = Droppables.fire(event, this.element); - if (!dropped) dropped = false; + var dropped = false; + if(success) { + dropped = Droppables.fire(event, this.element); + if (!dropped) dropped = false; } if(dropped && this.options.onDropped) this.options.onDropped(this.element); Draggables.notify('onEnd', this, event); var revert = this.options.revert; if(revert && Object.isFunction(revert)) revert = revert(this.element); - + var d = this.currentDelta(); if(revert && this.options.reverteffect) { if (dropped == 0 || revert != 'failure') @@ -438,45 +438,45 @@ Draggable.prototype = { if(this.options.zindex) this.element.style.zIndex = this.originalZ; - if(this.options.endeffect) + if(this.options.endeffect) this.options.endeffect(this.element); - + Draggables.deactivate(this); Droppables.reset(); }, - + keyPress: function(event) { if(event.keyCode!=Event.KEY_ESC) return; this.finishDrag(event, false); Event.stop(event); }, - + endDrag: function(event) { if(!this.dragging) return; this.stopScrolling(); this.finishDrag(event, true); Event.stop(event); }, - + draw: function(point) { var pos = Position.cumulativeOffset(this.element); if(this.options.ghosting) { var r = Position.realOffset(this.element); pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; } - + var d = this.currentDelta(); pos[0] -= d[0]; pos[1] -= d[1]; - + if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; } - - var p = [0,1].map(function(i){ - return (point[i]-pos[i]-this.offset[i]) + + var p = [0,1].map(function(i){ + return (point[i]-pos[i]-this.offset[i]) }.bind(this)); - + if(this.options.snap) { if(Object.isFunction(this.options.snap)) { p = this.options.snap(p[0],p[1],this); @@ -489,16 +489,16 @@ Draggable.prototype = { return (v/this.options.snap).round()*this.options.snap }.bind(this)) } }} - + var style = this.element.style; if((!this.options.constraint) || (this.options.constraint=='horizontal')) style.left = p[0] + "px"; if((!this.options.constraint) || (this.options.constraint=='vertical')) style.top = p[1] + "px"; - + if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering }, - + stopScrolling: function() { if(this.scrollInterval) { clearInterval(this.scrollInterval); @@ -506,14 +506,14 @@ Draggable.prototype = { Draggables._lastScrollPointer = null; } }, - + startScrolling: function(speed) { if(!(speed[0] || speed[1])) return; this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; this.lastScrolled = new Date(); this.scrollInterval = setInterval(this.scroll.bind(this), 10); }, - + scroll: function() { var current = new Date(); var delta = current - this.lastScrolled; @@ -529,7 +529,7 @@ Draggable.prototype = { this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; } - + Position.prepare(); Droppables.show(Draggables._lastPointer, this.element); Draggables.notify('onDrag', this); @@ -543,10 +543,10 @@ Draggable.prototype = { Draggables._lastScrollPointer[1] = 0; this.draw(Draggables._lastScrollPointer); } - + if(this.options.change) this.options.change(this); }, - + _getWindowScroll: function(w) { var T, L, W, H; with (w.document) { @@ -581,11 +581,11 @@ SortableObserver.prototype = { this.observer = observer; this.lastValue = Sortable.serialize(this.element); }, - + onStart: function() { this.lastValue = Sortable.serialize(this.element); }, - + onEnd: function() { Sortable.unmark(); if(this.lastValue != Sortable.serialize(this.element)) @@ -595,11 +595,11 @@ SortableObserver.prototype = { var Sortable = { SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, - + sortables: { }, - + _findRootElement: function(element) { - while (element.tagName.toUpperCase() != "BODY") { + while (element.tagName.toUpperCase() != "BODY") { if(element.id && Sortable.sortables[element.id]) return element; element = element.parentNode; } @@ -610,22 +610,22 @@ var Sortable = { if(!element) return; return Sortable.sortables[element.id]; }, - + destroy: function(element){ var s = Sortable.options(element); - + if(s) { Draggables.removeObserver(s.element); s.droppables.each(function(d){ Droppables.remove(d) }); s.draggables.invoke('destroy'); - + delete Sortable.sortables[s.element.id]; } }, create: function(element) { element = $(element); - var options = Object.extend({ + var options = Object.extend({ element: element, tag: 'li', // assumes li children, override with tag: 'tagname' dropOnEmpty: false, @@ -639,17 +639,17 @@ var Sortable = { delay: 0, hoverclass: null, ghosting: false, - quiet: false, + quiet: false, scroll: false, scrollSensitivity: 20, scrollSpeed: 15, format: this.SERIALIZE_RULE, - - // these take arrays of elements or ids and can be + + // these take arrays of elements or ids and can be // used for better initialization performance elements: false, handles: false, - + onChange: Prototype.emptyFunction, onUpdate: Prototype.emptyFunction }, arguments[1] || { }); @@ -686,7 +686,7 @@ var Sortable = { if(options.zindex) options_for_draggable.zindex = options.zindex; - // build options for the droppables + // build options for the droppables var options_for_droppable = { overlap: options.overlap, containment: options.containment, @@ -694,7 +694,7 @@ var Sortable = { hoverclass: options.hoverclass, onHover: Sortable.onHover } - + var options_for_tree = { onHover: Sortable.onEmptyHover, overlap: options.overlap, @@ -703,7 +703,7 @@ var Sortable = { } // fix for gecko engine - Element.cleanWhitespace(element); + Element.cleanWhitespace(element); options.draggables = []; options.droppables = []; @@ -716,14 +716,14 @@ var Sortable = { (options.elements || this.findElements(element, options) || []).each( function(e,i) { var handle = options.handles ? $(options.handles[i]) : - (options.handle ? $(e).getElementsByClassName(options.handle)[0] : e); + (options.handle ? $(e).getElementsByClassName(options.handle)[0] : e); options.draggables.push( new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); Droppables.add(e, options_for_droppable); if(options.tree) e.treeNode = element; - options.droppables.push(e); + options.droppables.push(e); }); - + if(options.tree) { (Sortable.findTreeElements(element, options) || []).each( function(e) { Droppables.add(e, options_for_tree); @@ -745,7 +745,7 @@ var Sortable = { return Element.findChildren( element, options.only, options.tree ? true : false, options.tag); }, - + findTreeElements: function(element, options) { return Element.findChildren( element, options.only, options.tree ? true : false, options.treeTag); @@ -762,7 +762,7 @@ var Sortable = { var oldParentNode = element.parentNode; element.style.visibility = "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, dropon); - if(dropon.parentNode!=oldParentNode) + if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); Sortable.options(dropon.parentNode).onChange(element); } @@ -773,26 +773,26 @@ var Sortable = { var oldParentNode = element.parentNode; element.style.visibility = "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, nextElement); - if(dropon.parentNode!=oldParentNode) + if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); Sortable.options(dropon.parentNode).onChange(element); } } }, - + onEmptyHover: function(element, dropon, overlap) { var oldParentNode = element.parentNode; var droponOptions = Sortable.options(dropon); - + if(!Element.isParent(dropon, element)) { var index; - + var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); var child = null; - + if(children) { var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); - + for (index = 0; index < children.length; index += 1) { if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { offset -= Element.offsetSize (children[index], droponOptions.overlap); @@ -805,9 +805,9 @@ var Sortable = { } } } - + dropon.insertBefore(element, child); - + Sortable.options(oldParentNode).onChange(element); droponOptions.onChange(element); } @@ -820,34 +820,34 @@ var Sortable = { mark: function(dropon, position) { // mark on ghosting only var sortable = Sortable.options(dropon.parentNode); - if(sortable && !sortable.ghosting) return; + if(sortable && !sortable.ghosting) return; if(!Sortable._marker) { - Sortable._marker = + Sortable._marker = ($('dropmarker') || Element.extend(document.createElement('DIV'))). hide().addClassName('dropmarker').setStyle({position:'absolute'}); document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); - } + } var offsets = Position.cumulativeOffset(dropon); Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); - + if(position=='after') - if(sortable.overlap == 'horizontal') + if(sortable.overlap == 'horizontal') Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); else Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); - + Sortable._marker.show(); }, - + _tree: function(element, options, parent) { var children = Sortable.findElements(element, options) || []; - + for (var i = 0; i < children.length; ++i) { var match = children[i].id.match(options.format); if (!match) continue; - + var child = { id: encodeURIComponent(match ? match[1] : null), element: element, @@ -856,15 +856,15 @@ var Sortable = { position: parent.children.length, container: $(children[i]).down(options.treeTag) } - + /* Get the element containing the children and recurse over it */ if (child.container) this._tree(child.container, options, child) - + parent.children.push (child); } - return parent; + return parent; }, tree: function(element) { @@ -877,7 +877,7 @@ var Sortable = { name: element.id, format: sortableOptions.format }, arguments[1] || { }); - + var root = { id: null, parent: null, @@ -885,7 +885,7 @@ var Sortable = { container: element, position: 0 } - + return Sortable._tree(element, options, root); }, @@ -901,7 +901,7 @@ var Sortable = { sequence: function(element) { element = $(element); var options = Object.extend(this.options(element), arguments[1] || { }); - + return $(this.findElements(element, options) || []).map( function(item) { return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; }); @@ -910,14 +910,14 @@ var Sortable = { setSequence: function(element, new_sequence) { element = $(element); var options = Object.extend(this.options(element), arguments[2] || { }); - + var nodeMap = { }; this.findElements(element, options).each( function(n) { if (n.id.match(options.format)) nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; n.parentNode.removeChild(n); }); - + new_sequence.each(function(ident) { var n = nodeMap[ident]; if (n) { @@ -926,16 +926,16 @@ var Sortable = { } }); }, - + serialize: function(element) { element = $(element); var options = Object.extend(Sortable.options(element), arguments[1] || { }); var name = encodeURIComponent( (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); - + if (options.tree) { return Sortable.tree(element, arguments[1]).children.map( function (item) { - return [name + Sortable._constructIndex(item) + "[id]=" + + return [name + Sortable._constructIndex(item) + "[id]=" + encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); }).flatten().join('&'); } else { @@ -953,7 +953,7 @@ Element.isParent = function(child, element) { return Element.isParent(child.parentNode, element); } -Element.findChildren = function(element, only, recursive, tagName) { +Element.findChildren = function(element, only, recursive, tagName) { if(!element.hasChildNodes()) return null; tagName = tagName.toUpperCase(); if(only) only = [only].flatten(); rails_plugins/rspec/story_server/prototype/javascripts/dragdrop.js @@ -5,46 +5,46 @@ // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) // Martin Bialasinki -// +// // script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ +// For details, see the script.aculo.us web site: http://script.aculo.us/ -// converts rgb() and #xxx to #xxxxxx format, -// returns self (or first argument) if not convertable -String.prototype.parseColor = function() { +// converts rgb() and #xxx to #xxxxxx format, +// returns self (or first argument) if not convertable +String.prototype.parseColor = function() { var color = '#'; - if (this.slice(0,4) == 'rgb(') { - var cols = this.slice(4,this.length-1).split(','); - var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); - } else { - if (this.slice(0,1) == '#') { - if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); - if (this.length==7) color = this.toLowerCase(); - } - } - return (color.length==7 ? color : (arguments[0] || this)); + if (this.slice(0,4) == 'rgb(') { + var cols = this.slice(4,this.length-1).split(','); + var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); + } else { + if (this.slice(0,1) == '#') { + if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); + if (this.length==7) color = this.toLowerCase(); + } + } + return (color.length==7 ? color : (arguments[0] || this)); }; /*--------------------------------------------------------------------------*/ -Element.collectTextNodes = function(element) { +Element.collectTextNodes = function(element) { return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : + return (node.nodeType==3 ? node.nodeValue : (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); }).flatten().join(''); }; -Element.collectTextNodesIgnoreClass = function(element, className) { +Element.collectTextNodesIgnoreClass = function(element, className) { return $A($(element).childNodes).collect( function(node) { - return (node.nodeType==3 ? node.nodeValue : - ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? + return (node.nodeType==3 ? node.nodeValue : + ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? Element.collectTextNodesIgnoreClass(node, className) : '')); }).flatten().join(''); }; Element.setContentZoom = function(element, percent) { - element = $(element); - element.setStyle({fontSize: (percent/100) + 'em'}); + element = $(element); + element.setStyle({fontSize: (percent/100) + 'em'}); if (Prototype.Browser.WebKit) window.scrollBy(0,0); return element; }; @@ -84,16 +84,16 @@ var Effect = { wobble: function(pos) { return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5; }, - pulse: function(pos, pulses) { - pulses = pulses || 5; + pulse: function(pos, pulses) { + pulses = pulses || 5; return ( - ((pos % (1/pulses)) * pulses).round() == 0 ? - ((pos * pulses * 2) - (pos * pulses * 2).floor()) : + ((pos % (1/pulses)) * pulses).round() == 0 ? + ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 1 - ((pos * pulses * 2) - (pos * pulses * 2).floor()) ); }, - spring: function(pos) { - return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); + spring: function(pos) { + return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); }, none: function(pos) { return 0; @@ -114,14 +114,14 @@ var Effect = { tagifyText: function(element) { var tagifyStyle = 'position:relative'; if (Prototype.Browser.IE) tagifyStyle += ';zoom:1'; - + element = $(element); $A(element.childNodes).each( function(child) { if (child.nodeType==3) { child.nodeValue.toArray().each( function(character) { element.insertBefore( new Element('span', {style: tagifyStyle}).update( - character == ' ' ? String.fromCharCode(160) : character), + character == ' ' ? String.fromCharCode(160) : character), child); }); Element.remove(child); @@ -130,13 +130,13 @@ var Effect = { }, multiple: function(element, effect) { var elements; - if (((typeof element == 'object') || - Object.isFunction(element)) && + if (((typeof element == 'object') || + Object.isFunction(element)) && (element.length)) elements = element; else elements = $(element).childNodes; - + var options = Object.extend({ speed: 0.1, delay: 0.0 @@ -158,7 +158,7 @@ var Effect = { var options = Object.extend({ queue: { position:'end', scope:(element.id || 'global'), limit: 1 } }, arguments[2] || { }); - Effect[element.visible() ? + Effect[element.visible() ? Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); } }; @@ -170,20 +170,20 @@ Effect.DefaultOptions.transition = Effect.Transitions.sinoidal; Effect.ScopedQueue = Class.create(Enumerable, { initialize: function() { this.effects = []; - this.interval = null; + this.interval = null; }, _each: function(iterator) { this.effects._each(iterator); }, add: function(effect) { var timestamp = new Date().getTime(); - - var position = Object.isString(effect.options.queue) ? + + var position = Object.isString(effect.options.queue) ? effect.options.queue : effect.options.queue.position; - + switch(position) { case 'front': - // move unstarted effects after this effect + // move unstarted effects after this effect this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { e.startOn += effect.finishOn; e.finishOn += effect.finishOn; @@ -197,13 +197,13 @@ Effect.ScopedQueue = Class.create(Enumerable, { timestamp = this.effects.pluck('finishOn').max() || timestamp; break; } - + effect.startOn += timestamp; effect.finishOn += timestamp; if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) this.effects.push(effect); - + if (!this.interval) this.interval = setInterval(this.loop.bind(this), 15); }, @@ -216,7 +216,7 @@ Effect.ScopedQueue = Class.create(Enumerable, { }, loop: function() { var timePos = new Date().getTime(); - for(var i=0, len=this.effects.length;i<len;i++) + for(var i=0, len=this.effects.length;i<len;i++) this.effects[i] && this.effects[i].loop(timePos); } }); @@ -225,10 +225,10 @@ Effect.Queues = { instances: $H(), get: function(queueName) { if (!Object.isString(queueName)) return queueName; - + if (!this.instances[queueName]) this.instances[queueName] = new Effect.ScopedQueue(); - + return this.instances[queueName]; } }; @@ -253,11 +253,11 @@ Effect.Base.prototype = { this.fromToDelta = this.options.to-this.options.from; this.totalTime = this.finishOn-this.startOn; this.totalFrames = this.options.fps*this.options.duration; - + eval('this.render = function(pos){ '+ 'if (this.state=="idle"){this.state="running";'+ codeForEvent(this.options,'beforeSetup')+ - (this.setup ? 'this.setup();':'')+ + (this.setup ? 'this.setup();':'')+ codeForEvent(this.options,'afterSetup')+ '};if (this.state=="running"){'+ 'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+ @@ -266,10 +266,10 @@ Effect.Base.prototype = { (this.update ? 'this.update(pos);':'')+ codeForEvent(this.options,'afterUpdate')+ '}}'); - + this.event('beforeStart'); if (!this.options.sync) - Effect.Queues.get(Object.isString(this.options.queue) ? + Effect.Queues.get(Object.isString(this.options.queue) ? 'global' : this.options.queue.scope).add(this); }, loop: function(timePos) { @@ -278,9 +278,9 @@ Effect.Base.prototype = { this.render(1.0); this.cancel(); this.event('beforeFinish'); - if (this.finish) this.finish(); + if (this.finish) this.finish(); this.event('afterFinish'); - return; + return; } var pos = (timePos - this.startOn) / this.totalTime, frame = (pos * this.totalFrames).round(); @@ -292,7 +292,7 @@ Effect.Base.prototype = { }, cancel: function() { if (!this.options.sync) - Effect.Queues.get(Object.isString(this.options.queue) ? + Effect.Queues.get(Object.isString(this.options.queue) ? 'global' : this.options.queue.scope).remove(this); this.state = 'finished'; }, @@ -330,10 +330,10 @@ Effect.Parallel = Class.create(Effect.Base, { Effect.Tween = Class.create(Effect.Base, { initialize: function(object, from, to) { object = Object.isString(object) ? $(object) : object; - var args = $A(arguments), method = args.last(), + var args = $A(arguments), method = args.last(), options = args.length == 5 ? args[3] : null; this.method = Object.isFunction(method) ? method.bind(object) : - Object.isFunction(object[method]) ? object[method].bind(object) : + Object.isFunction(object[method]) ? object[method].bind(object) : function(value) { object[method] = value }; this.start(Object.extend({ from: from, to: to }, options || { })); }, @@ -397,7 +397,7 @@ Effect.Move = Class.create(Effect.Base, { // for backwards compatibility Effect.MoveBy = function(element, toTop, toLeft) { - return new Effect.Move(element, + return new Effect.Move(element, Object.extend({ x: toLeft, y: toTop }, arguments[3] || { })); }; @@ -419,15 +419,15 @@ Effect.Scale = Class.create(Effect.Base, { setup: function() { this.restoreAfterFinish = this.options.restoreAfterFinish || false; this.elementPositioning = this.element.getStyle('position'); - + this.originalStyle = { }; ['top','left','width','height','fontSize'].each( function(k) { this.originalStyle[k] = this.element.style[k]; }.bind(this)); - + this.originalTop = this.element.offsetTop; this.originalLeft = this.element.offsetLeft; - + var fontSize = this.element.getStyle('font-size') || '100%'; ['em','px','%','pt'].each( function(fontSizeType) { if (fontSize.indexOf(fontSizeType)>0) { @@ -435,9 +435,9 @@ Effect.Scale = Class.create(Effect.Base, { this.fontSizeType = fontSizeType; } }.bind(this)); - + this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; - + this.dims = null; if (this.options.scaleMode=='box') this.dims = [this.element.offsetHeight, this.element.offsetWidth]; @@ -514,7 +514,7 @@ Effect.ScrollTo = function(element) { var options = arguments[1] || { }, scrollOffsets = document.viewport.getScrollOffsets(), elementOffsets = $(element).cumulativeOffset(), - max = (window.height || document.body.scrollHeight) - document.viewport.getHeight(); + max = (window.height || document.body.scrollHeight) - document.viewport.getHeight(); if (options.offset) elementOffsets[1] += options.offset; @@ -534,9 +534,9 @@ Effect.Fade = function(element) { var options = Object.extend({ from: element.getOpacity() || 1.0, to: 0.0, - afterFinishInternal: function(effect) { + afterFinishInternal: function(effect) { if (effect.options.to!=0) return; - effect.element.hide().setStyle({opacity: oldOpacity}); + effect.element.hide().setStyle({opacity: oldOpacity}); } }, arguments[1] || { }); return new Effect.Opacity(element,options); @@ -552,15 +552,15 @@ Effect.Appear = function(element) { effect.element.forceRerendering(); }, beforeSetup: function(effect) { - effect.element.setOpacity(effect.options.from).show(); + effect.element.setOpacity(effect.options.from).show(); }}, arguments[1] || { }); return new Effect.Opacity(element,options); }; Effect.Puff = function(element) { element = $(element); - var oldStyle = { - opacity: element.getInlineOpacity(), + var oldStyle = { + opacity: element.getInlineOpacity(), position: element.getStyle('position'), top: element.style.top, left: element.style.left, @@ -568,10 +568,10 @@ Effect.Puff = function(element) { height: element.style.height }; return new Effect.Parallel( - [ new Effect.Scale(element, 200, - { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], - Object.extend({ duration: 1.0, + [ new Effect.Scale(element, 200, + { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], + Object.extend({ duration: 1.0, beforeSetupInternal: function(effect) { Position.absolutize(effect.effects[0].element) }, @@ -585,12 +585,12 @@ Effect.BlindUp = function(element) { element = $(element); element.makeClipping(); return new Effect.Scale(element, 0, - Object.extend({ scaleContent: false, - scaleX: false, + Object.extend({ scaleContent: false, + scaleX: false, restoreAfterFinish: true, afterFinishInternal: function(effect) { effect.element.hide().undoClipping(); - } + } }, arguments[1] || { }) ); }; @@ -598,15 +598,15 @@ Effect.BlindUp = function(element) { Effect.BlindDown = function(element) { element = $(element); var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, scaleX: false, scaleFrom: 0, scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, restoreAfterFinish: true, afterSetup: function(effect) { - effect.element.makeClipping().setStyle({height: '0px'}).show(); - }, + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, afterFinishInternal: function(effect) { effect.element.undoClipping(); } @@ -621,10 +621,10 @@ Effect.SwitchOff = function(element) { from: 0, transition: Effect.Transitions.flicker, afterFinishInternal: function(effect) { - new Effect.Scale(effect.element, 1, { + new Effect.Scale(effect.element, 1, { duration: 0.3, scaleFromCenter: true, scaleX: false, scaleContent: false, restoreAfterFinish: true, - beforeSetup: function(effect) { + beforeSetup: function(effect) { effect.element.makePositioned().makeClipping(); }, afterFinishInternal: function(effect) { @@ -642,16 +642,16 @@ Effect.DropOut = function(element) { left: element.getStyle('left'), opacity: element.getInlineOpacity() }; return new Effect.Parallel( - [ new Effect.Move(element, {x: 0, y: 100, sync: true }), + [ new Effect.Move(element, {x: 0, y: 100, sync: true }), new Effect.Opacity(element, { sync: true, to: 0.0 }) ], Object.extend( { duration: 0.5, beforeSetup: function(effect) { - effect.effects[0].element.makePositioned(); + effect.effects[0].element.makePositioned(); }, afterFinishInternal: function(effect) { effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); - } + } }, arguments[1] || { })); }; @@ -660,7 +660,7 @@ Effect.Shake = function(element) { var oldStyle = { top: element.getStyle('top'), left: element.getStyle('left') }; - return new Effect.Move(element, + return new Effect.Move(element, { x: 20, y: 0, duration: 0.05, afterFinishInternal: function(effect) { new Effect.Move(effect.element, { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) { @@ -681,9 +681,9 @@ Effect.SlideDown = function(element) { // SlideDown need to have the content of the element wrapped in a container element with fixed height! var oldInnerBottom = element.down().getStyle('bottom'); var elementDimensions = element.getDimensions(); - return new Effect.Scale(element, 100, Object.extend({ - scaleContent: false, - scaleX: false, + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, scaleFrom: window.opera ? 0 : 1, scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, restoreAfterFinish: true, @@ -691,11 +691,11 @@ Effect.SlideDown = function(element) { effect.element.makePositioned(); effect.element.down().makePositioned(); if (window.opera) effect.element.setStyle({top: ''}); - effect.element.makeClipping().setStyle({height: '0px'}).show(); + effect.element.makeClipping().setStyle({height: '0px'}).show(); }, afterUpdateInternal: function(effect) { effect.element.down().setStyle({bottom: - (effect.dims[0] - effect.element.clientHeight) + 'px' }); + (effect.dims[0] - effect.element.clientHeight) + 'px' }); }, afterFinishInternal: function(effect) { effect.element.undoClipping().undoPositioned(); @@ -709,8 +709,8 @@ Effect.SlideUp = function(element) { var oldInnerBottom = element.down().getStyle('bottom'); var elementDimensions = element.getDimensions(); return new Effect.Scale(element, window.opera ? 0 : 1, - Object.extend({ scaleContent: false, - scaleX: false, + Object.extend({ scaleContent: false, + scaleX: false, scaleMode: 'box', scaleFrom: 100, scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, @@ -720,7 +720,7 @@ Effect.SlideUp = function(element) { effect.element.down().makePositioned(); if (window.opera) effect.element.setStyle({top: ''}); effect.element.makeClipping().show(); - }, + }, afterUpdateInternal: function(effect) { effect.element.down().setStyle({bottom: (effect.dims[0] - effect.element.clientHeight) + 'px' }); @@ -733,15 +733,15 @@ Effect.SlideUp = function(element) { ); }; -// Bug in opera makes the TD containing this element expand for a instance after finish +// Bug in opera makes the TD containing this element expand for a instance after finish Effect.Squish = function(element) { - return new Effect.Scale(element, window.opera ? 1 : 0, { + return new Effect.Scale(element, window.opera ? 1 : 0, { restoreAfterFinish: true, beforeSetup: function(effect) { - effect.element.makeClipping(); - }, + effect.element.makeClipping(); + }, afterFinishInternal: function(effect) { - effect.element.hide().undoClipping(); + effect.element.hide().undoClipping(); } }); }; @@ -761,13 +761,13 @@ Effect.Grow = function(element) { width: element.style.width, opacity: element.getInlineOpacity() }; - var dims = element.getDimensions(); + var dims = element.getDimensions(); var initialMoveX, initialMoveY; var moveX, moveY; - + switch (options.direction) { case 'top-left': - initialMoveX = initialMoveY = moveX = moveY = 0; + initialMoveX = initialMoveY = moveX = moveY = 0; break; case 'top-right': initialMoveX = dims.width; @@ -792,11 +792,11 @@ Effect.Grow = function(element) { moveY = -dims.height / 2; break; } - + return new Effect.Move(element, { x: initialMoveX, y: initialMoveY, - duration: 0.01, + duration: 0.01, beforeSetup: function(effect) { effect.element.hide().makeClipping().makePositioned(); }, @@ -805,14 +805,14 @@ Effect.Grow = function(element) { [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), new Effect.Scale(effect.element, 100, { - scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) ], Object.extend({ beforeSetup: function(effect) { - effect.effects[0].element.setStyle({height: '0px'}).show(); + effect.effects[0].element.setStyle({height: '0px'}).show(); }, afterFinishInternal: function(effect) { - effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); + effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); } }, options) ) @@ -837,7 +837,7 @@ Effect.Shrink = function(element) { var dims = element.getDimensions(); var moveX, moveY; - + switch (options.direction) { case 'top-left': moveX = moveY = 0; @@ -854,19 +854,19 @@ Effect.Shrink = function(element) { moveX = dims.width; moveY = dims.height; break; - case 'center': + case 'center': moveX = dims.width / 2; moveY = dims.height / 2; break; } - + return new Effect.Parallel( [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) - ], Object.extend({ + ], Object.extend({ beforeStartInternal: function(effect) { - effect.effects[0].element.makePositioned().makeClipping(); + effect.effects[0].element.makePositioned().makeClipping(); }, afterFinishInternal: function(effect) { effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } @@ -881,7 +881,7 @@ Effect.Pulsate = function(element) { var transition = options.transition || Effect.Transitions.sinoidal; var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) }; reverser.bind(transition); - return new Effect.Opacity(element, + return new Effect.Opacity(element, Object.extend(Object.extend({ duration: 2.0, from: 0, afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } }, options), {transition: reverser})); @@ -895,12 +895,12 @@ Effect.Fold = function(element) { width: element.style.width, height: element.style.height }; element.makeClipping(); - return new Effect.Scale(element, 5, Object.extend({ + return new Effect.Scale(element, 5, Object.extend({ scaleContent: false, scaleX: false, afterFinishInternal: function(effect) { - new Effect.Scale(element, 1, { - scaleContent: false, + new Effect.Scale(element, 1, { + scaleContent: false, scaleY: false, afterFinishInternal: function(effect) { effect.element.hide().undoClipping().setStyle(oldStyle); @@ -915,7 +915,7 @@ Effect.Morph = Class.create(Effect.Base, { var options = Object.extend({ style: { } }, arguments[1] || { }); - + if (!Object.isString(options.style)) this.style = $H(options.style); else { if (options.style.include(':')) @@ -938,13 +938,13 @@ Effect.Morph = Class.create(Effect.Base, { } this.start(options); }, - + setup: function(){ function parseColor(color){ if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; color = color.parseColor(); return $R(0,2).map(function(i){ - return parseInt( color.slice(i*2+1,i*2+3), 16 ) + return parseInt( color.slice(i*2+1,i*2+3), 16 ) }); } this.transforms = this.style.map(function(pair){ @@ -964,9 +964,9 @@ Effect.Morph = Class.create(Effect.Base, { } var originalValue = this.element.getStyle(property); - return { - style: property.camelize(), - originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), + return { + style: property.camelize(), + originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), targetValue: unit=='color' ? parseColor(value) : value, unit: unit }; @@ -983,7 +983,7 @@ Effect.Morph = Class.create(Effect.Base, { update: function(position) { var style = { }, transform, i = this.transforms.length; while(i--) - style[(transform = this.transforms[i]).style] = + style[(transform = this.transforms[i]).style] = transform.unit=='color' ? '#'+ (Math.round(transform.originalValue[0]+ (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() + @@ -992,7 +992,7 @@ Effect.Morph = Class.create(Effect.Base, { (Math.round(transform.originalValue[2]+ (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() : (transform.originalValue + - (transform.targetValue - transform.originalValue) * position).toFixed(3) + + (transform.targetValue - transform.originalValue) * position).toFixed(3) + (transform.unit === null ? '' : transform.unit); this.element.setStyle(style, true); } @@ -1027,7 +1027,7 @@ Effect.Transform = Class.create({ }); Element.CSS_PROPERTIES = $w( - 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + + 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + @@ -1036,7 +1036,7 @@ Element.CSS_PROPERTIES = $w( 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + 'right textIndent top width wordSpacing zIndex'); - + Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; String.__parseStyleElement = document.createElement('div'); @@ -1048,11 +1048,11 @@ String.prototype.parseStyle = function(){ String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>'; style = String.__parseStyleElement.childNodes[0].style; } - + Element.CSS_PROPERTIES.each(function(property){ - if (style[property]) styleRules[property] = style[property]; + if (style[property]) styleRules[property] = style[property]; }); - + if (Prototype.Browser.IE && this.include('opacity')) styleRules.opacity = this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]; @@ -1101,7 +1101,7 @@ Effect.Methods = { $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ 'pulsate shake puff squish switchOff dropOut').each( - function(effect) { + function(effect) { Effect.Methods[effect] = function(element, options){ element = $(element); Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options); @@ -1110,7 +1110,7 @@ $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ } ); -$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( +$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( function(f) { Effect.Methods[f] = Element[f]; } ); rails_plugins/rspec/story_server/prototype/javascripts/effects.js @@ -6,7 +6,7 @@ Object.extend(Object.extend(InPlaceEditor.Local.prototype, Ajax.InPlaceEditor.pr onComplete: function() {}, handleFormSubmission: function(e) { var value = $F(this._controls.editor); - RSpec.addStockStep(value); + RSpec.addStockStep(value); this.element.innerHTML = value; this.leaveEditMode(); if (e) Event.stop(e); @@ -15,17 +15,17 @@ Object.extend(Object.extend(InPlaceEditor.Local.prototype, Ajax.InPlaceEditor.pr var RSpec = { stockSteps: function() { - return $('stock_steps').childElements().map(function(li){ + return $('stock_steps').childElements().map(function(li){ return li.innerHTML; }).sort(); }, - + addStockStep: function(stockStep) { if(!this.stockSteps().include(stockStep)) { $('stock_steps').appendChild(Builder.node('li', {}, stockStep)); } }, - + makeParamEditors: function() { $$('span.param').each(function(span) { span.removeClassName('param'); @@ -33,13 +33,13 @@ var RSpec = { new InPlaceEditor.Local(span, null, {}); }); }, - + setId: function(e) { if(!this.currentId) this.currentId = 0; this.currentId++; e.id = "id_" + this.currentId; }, - + applyUi: function() { this.setUpTogglers(); this.makeParamEditors(); @@ -51,24 +51,24 @@ var RSpec = { var addStepLink = document.createElement("a"); addStepLink.href = "#"; addStepLink.appendChild(document.createTextNode('Add step')); - footer.appendChild(addStepLink); + footer.appendChild(addStepLink); ul.parentNode.appendChild(footer); Sortable.create(ul, { scroll: window }); -/* Disable for now - it messes with the autocomplete's visibility (zIndex galore) +/* Disable for now - it messes with the autocomplete's visibility (zIndex galore) Droppables.add(footer, { hoverclass: 'wastebin', onDrop: function(li, droppable, evt) { li.remove(); } }); -*/ +*/ Event.observe(addStepLink, 'click', function() { var form = Builder.node('form', {}); - + var li = Builder.node('li', {className: 'new'}); var input = Builder.node('input', {}, 'New step here'); var autoComplete = Builder.node('div', {className: 'auto_complete'}, ''); @@ -93,7 +93,7 @@ var RSpec = { }); }) }, - + setUpTogglers: function() { $$('dt').each(function(dt) { var dd = dt.parentNode.getElementsByTagName('dd')[0]; @@ -114,11 +114,11 @@ var StoryDom = { } }).compact().join(""); }, - + stepText: function(s) { return s.gsub(/<span[^>]*>([^<]*)<\/span>/, "#{1}"); }, - + scenario: function(dl) { var scenario = ' Scenario: ' + dl.getElementsByTagName('dt')[0].innerHTML + '\n'; scenario += $A(dl.getElementsByTagName('li')).map(function(li){ @@ -126,7 +126,7 @@ var StoryDom = { }).join("\n") + "\n"; return scenario; }, - + story: function() { var dl = $$('dl.story')[0]; var story = 'Story: ' + dl.getElementsByTagName('dt')[0].innerHTML + '\n\n'; @@ -136,7 +136,7 @@ var StoryDom = { }).join("\n"); return story; }, - + save: function() { new Ajax.Request('stories', { postBody: this.story() rails_plugins/rspec/story_server/prototype/javascripts/rspec.js @@ -1,7 +1,7 @@ // script.aculo.us scriptaculous.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// +// // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the // "Software"), to deal in the Software without restriction, including @@ -9,7 +9,7 @@ // distribute, sublicense, and/or sell copies of the Software, and to // permit persons to whom the Software is furnished to do so, subject to // the following conditions: -// +// // The above copyright notice and this permission notice shall be // included in all copies or substantial portions of the Software. // @@ -35,15 +35,15 @@ var Scriptaculous = { var r = versionString.split('.'); return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]); } - - if((typeof Prototype=='undefined') || - (typeof Element == 'undefined') || + + if((typeof Prototype=='undefined') || + (typeof Element == 'undefined') || (typeof Element.Methods=='undefined') || - (convertVersionString(Prototype.Version) < + (convertVersionString(Prototype.Version) < convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE))) throw("script.aculo.us requires the Prototype JavaScript framework >= " + Scriptaculous.REQUIRED_PROTOTYPE); - + $A(document.getElementsByTagName("script")).findAll( function(s) { return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/)) }).each( function(s) { rails_plugins/rspec/story_server/prototype/javascripts/scriptaculous.js @@ -1,6 +1,6 @@ // script.aculo.us slider.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007 -// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs +// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs // // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ @@ -17,13 +17,13 @@ Control.Slider = Class.create(); Control.Slider.prototype = { initialize: function(handle, track, options) { var slider = this; - + if (Object.isArray(handle)) { this.handles = handle.collect( function(e) { return $(e) }); } else { this.handles = [$(handle)]; } - + this.track = $(track); this.options = options || { }; @@ -31,7 +31,7 @@ Control.Slider.prototype = { this.increment = this.options.increment || 1; this.step = parseInt(this.options.step || '1'); this.range = this.options.range || $R(0,1); - + this.value = 0; // assure backwards compat this.values = this.handles.map( function() { return 0 }); this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false; @@ -46,13 +46,13 @@ Control.Slider.prototype = { // Will be used to align the handle onto the track, if necessary this.alignX = parseInt(this.options.alignX || '0'); this.alignY = parseInt(this.options.alignY || '0'); - + this.trackLength = this.maximumOffset() - this.minimumOffset(); - this.handleLength = this.isVertical() ? - (this.handles[0].offsetHeight != 0 ? - this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : - (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : + this.handleLength = this.isVertical() ? + (this.handles[0].offsetHeight != 0 ? + this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : + (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : this.handles[0].style.width.replace(/px$/,"")); this.active = false; @@ -76,20 +76,20 @@ Control.Slider.prototype = { this.handles.each( function(h,i) { i = slider.handles.length-1-i; slider.setValue(parseFloat( - (Object.isArray(slider.options.sliderValue) ? - slider.options.sliderValue[i] : slider.options.sliderValue) || + (Object.isArray(slider.options.sliderValue) ? + slider.options.sliderValue[i] : slider.options.sliderValue) || slider.range.start), i); h.makePositioned().observe("mousedown", slider.eventMouseDown); }); - + this.track.observe("mousedown", this.eventMouseDown); document.observe("mouseup", this.eventMouseUp); document.observe("mousemove", this.eventMouseMove); - + this.initialized = true; }, dispose: function() { - var slider = this; + var slider = this; Event.stopObserving(this.track, "mousedown", this.eventMouseDown); Event.stopObserving(document, "mouseup", this.eventMouseUp); Event.stopObserving(document, "mousemove", this.eventMouseMove); @@ -102,12 +102,12 @@ Control.Slider.prototype = { }, setEnabled: function(){ this.disabled = false; - }, + }, getNearestValue: function(value){ if (this.allowedValues){ if (value >= this.allowedValues.max()) return(this.allowedValues.max()); if (value <= this.allowedValues.min()) return(this.allowedValues.min()); - + var offset = Math.abs(this.allowedValues[0] - value); var newValue = this.allowedValues[0]; this.allowedValues.each( function(v) { @@ -115,7 +115,7 @@ Control.Slider.prototype = { if (currentOffset <= offset){ newValue = v; offset = currentOffset; - } + } }); return newValue; } @@ -139,28 +139,28 @@ Control.Slider.prototype = { sliderValue = this.getNearestValue(sliderValue); this.values[handleIdx] = sliderValue; this.value = this.values[0]; // assure backwards compat - - this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = + + this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = this.translateToPx(sliderValue); - + this.drawSpans(); if (!this.dragging || !this.event) this.updateFinished(); }, setValueBy: function(delta, handleIdx) { - this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, + this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, handleIdx || this.activeHandleIdx || 0); }, translateToPx: function(value) { return Math.round( - ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * + ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * (value - this.range.start)) + "px"; }, translateToValue: function(offset) { - return ((offset/(this.trackLength-this.handleLength) * + return ((offset/(this.trackLength-this.handleLength) * (this.range.end-this.range.start)) + this.range.start); }, getRange: function(range) { - var v = this.values.sortBy(Prototype.K); + var v = this.values.sortBy(Prototype.K); range = range || 0; return $R(v[range],v[range+1]); }, @@ -168,12 +168,12 @@ Control.Slider.prototype = { return(this.isVertical() ? this.alignY : this.alignX); }, maximumOffset: function(){ - return(this.isVertical() ? + return(this.isVertical() ? (this.track.offsetHeight != 0 ? this.track.offsetHeight : - this.track.style.height.replace(/px$/,"")) - this.alignY : - (this.track.offsetWidth != 0 ? this.track.offsetWidth : + this.track.style.height.replace(/px$/,"")) - this.alignY : + (this.track.offsetWidth != 0 ? this.track.offsetWidth : this.track.style.width.replace(/px$/,"")) - this.alignY); - }, + }, isVertical: function(){ return (this.axis == 'vertical'); }, @@ -185,7 +185,7 @@ Control.Slider.prototype = { this.setSpan(this.options.startSpan, $R(0, this.values.length>1 ? this.getRange(0).min() : this.value )); if (this.options.endSpan) - this.setSpan(this.options.endSpan, + this.setSpan(this.options.endSpan, $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum)); }, setSpan: function(span, range) { @@ -205,14 +205,14 @@ Control.Slider.prototype = { if (Event.isLeftClick(event)) { if (!this.disabled){ this.active = true; - + var handle = Event.element(event); var pointer = [Event.pointerX(event), Event.pointerY(event)]; var track = handle; if (track==this.track) { - var offsets = Position.cumulativeOffset(this.track); + var offsets = Position.cumulativeOffset(this.track); this.event = event; - this.setValue(this.translateToValue( + this.setValue(this.translateToValue( (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2) )); var offsets = Position.cumulativeOffset(this.activeHandle); @@ -220,14 +220,14 @@ Control.Slider.prototype = { this.offsetY = (pointer[1] - offsets[1]); } else { // find the handle (prevents issues with Safari) - while((this.handles.indexOf(handle) == -1) && handle.parentNode) + while((this.handles.indexOf(handle) == -1) && handle.parentNode) handle = handle.parentNode; - + if (this.handles.indexOf(handle)!=-1) { this.activeHandle = handle; this.activeHandleIdx = this.handles.indexOf(this.activeHandle); this.updateStyles(); - + var offsets = Position.cumulativeOffset(this.activeHandle); this.offsetX = (pointer[0] - offsets[0]); this.offsetY = (pointer[1] - offsets[1]); @@ -262,14 +262,14 @@ Control.Slider.prototype = { } this.active = false; this.dragging = false; - }, + }, finishDrag: function(event, success) { this.active = false; this.dragging = false; this.updateFinished(); }, updateFinished: function() { - if (this.initialized && this.options.onChange) + if (this.initialized && this.options.onChange) this.options.onChange(this.values.length>1 ? this.values : this.value, this); this.event = null; } rails_plugins/rspec/story_server/prototype/javascripts/slider.js @@ -23,7 +23,7 @@ Sound = { var options = Object.extend({ track: 'global', url: url, replace: false }, arguments[1] || {}); - + if(options.replace && this.tracks[options.track]) { $R(0, this.tracks[options.track].id).each(function(id){ var sound = $('sound_'+options.track+'_'+id); @@ -32,14 +32,14 @@ Sound = { }) this.tracks[options.track] = null; } - + if(!this.tracks[options.track]) this.tracks[options.track] = { id: 0 } else this.tracks[options.track].id++; - + options.id = this.tracks[options.track].id; - $$('body')[0].insert( + $$('body')[0].insert( Prototype.Browser.IE ? new Element('bgsound',{ id: 'sound_'+options.track+'_'+options.id, src: options.url, loop: 1, autostart: true rails_plugins/rspec/story_server/prototype/javascripts/sound.js @@ -19,10 +19,10 @@ Event.simulateMouse = function(element, eventName) { metaKey: false }, arguments[2] || {}); var oEvent = document.createEvent("MouseEvents"); - oEvent.initMouseEvent(eventName, true, true, document.defaultView, - options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, + oEvent.initMouseEvent(eventName, true, true, document.defaultView, + options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element)); - + if(this.mark) Element.remove(this.mark); this.mark = document.createElement('div'); this.mark.appendChild(document.createTextNode(" ")); @@ -34,10 +34,10 @@ Event.simulateMouse = function(element, eventName) { this.mark.style.height = "5px;"; this.mark.style.borderTop = "1px solid red;" this.mark.style.borderLeft = "1px solid red;" - + if(this.step) alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options)); - + $(element).dispatchEvent(oEvent); }; @@ -55,7 +55,7 @@ Event.simulateKey = function(element, eventName) { }, arguments[2] || {}); var oEvent = document.createEvent("KeyEvents"); - oEvent.initKeyEvent(eventName, true, true, window, + oEvent.initKeyEvent(eventName, true, true, window, options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.keyCode, options.charCode ); $(element).dispatchEvent(oEvent); @@ -123,7 +123,7 @@ Test.Unit.Logger.prototype = { _toHTML: function(txt) { return txt.escapeHTML().replace(/\n/g,"<br/>"); }, - addLinksToResults: function(){ + addLinksToResults: function(){ $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log td.title = "Run only this test" Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;}); @@ -162,7 +162,7 @@ Test.Unit.Runner.prototype = { if(/^test/.test(testcase)) { this.tests.push( new Test.Unit.Testcase( - this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, + this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, testcases[testcase], testcases["setup"], testcases["teardown"] )); } @@ -203,7 +203,7 @@ Test.Unit.Runner.prototype = { }, postResults: function() { if (this.options.resultsURL) { - new Ajax.Request(this.options.resultsURL, + new Ajax.Request(this.options.resultsURL, { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false }); } }, @@ -240,9 +240,9 @@ Test.Unit.Runner.prototype = { errors += this.tests[i].errors; } return ( - (this.options.context ? this.options.context + ': ': '') + - this.tests.length + " tests, " + - assertions + " assertions, " + + (this.options.context ? this.options.context + ': ': '') + + this.tests.length + " tests, " + + assertions + " assertions, " + failures + " failures, " + errors + " errors"); } @@ -258,7 +258,7 @@ Test.Unit.Assertions.prototype = { }, summary: function() { return ( - this.assertions + " assertions, " + + this.assertions + " assertions, " + this.failures + " failures, " + this.errors + " errors" + "\n" + this.messages.join("\n")); @@ -284,55 +284,55 @@ Test.Unit.Assertions.prototype = { }, assert: function(expression) { var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"'; - try { expression ? this.pass() : + try { expression ? this.pass() : this.fail(message); } catch(e) { this.error(e); } }, assertEqual: function(expected, actual) { var message = arguments[2] || "assertEqual"; try { (expected == actual) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + '", actual "' + Test.Unit.inspect(actual) + '"'); } catch(e) { this.error(e); } }, assertInspect: function(expected, actual) { var message = arguments[2] || "assertInspect"; try { (expected == actual.inspect()) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + '", actual "' + Test.Unit.inspect(actual) + '"'); } catch(e) { this.error(e); } }, assertEnumEqual: function(expected, actual) { var message = arguments[2] || "assertEnumEqual"; - try { $A(expected).length == $A(actual).length && + try { $A(expected).length == $A(actual).length && expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ? - this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + + this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + ', actual ' + Test.Unit.inspect(actual)); } catch(e) { this.error(e); } }, assertNotEqual: function(expected, actual) { var message = arguments[2] || "assertNotEqual"; - try { (expected != actual) ? this.pass() : + try { (expected != actual) ? this.pass() : this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); } catch(e) { this.error(e); } }, - assertIdentical: function(expected, actual) { - var message = arguments[2] || "assertIdentical"; - try { (expected === actual) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } + assertIdentical: function(expected, actual) { + var message = arguments[2] || "assertIdentical"; + try { (expected === actual) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } }, - assertNotIdentical: function(expected, actual) { - var message = arguments[2] || "assertNotIdentical"; - try { !(expected === actual) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + - '", actual "' + Test.Unit.inspect(actual) + '"'); } - catch(e) { this.error(e); } + assertNotIdentical: function(expected, actual) { + var message = arguments[2] || "assertNotIdentical"; + try { !(expected === actual) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + '", actual "' + Test.Unit.inspect(actual) + '"'); } + catch(e) { this.error(e); } }, assertNull: function(obj) { var message = arguments[1] || 'assertNull' - try { (obj==null) ? this.pass() : + try { (obj==null) ? this.pass() : this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); } catch(e) { this.error(e); } }, @@ -353,38 +353,38 @@ Test.Unit.Assertions.prototype = { }, assertType: function(expected, actual) { var message = arguments[2] || 'assertType'; - try { - (actual.constructor == expected) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + try { + (actual.constructor == expected) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + '", actual "' + (actual.constructor) + '"'); } catch(e) { this.error(e); } }, assertNotOfType: function(expected, actual) { var message = arguments[2] || 'assertNotOfType'; - try { - (actual.constructor != expected) ? this.pass() : - this.fail(message + ': expected "' + Test.Unit.inspect(expected) + + try { + (actual.constructor != expected) ? this.pass() : + this.fail(message + ': expected "' + Test.Unit.inspect(expected) + '", actual "' + (actual.constructor) + '"'); } catch(e) { this.error(e); } }, assertInstanceOf: function(expected, actual) { var message = arguments[2] || 'assertInstanceOf'; - try { - (actual instanceof expected) ? this.pass() : + try { + (actual instanceof expected) ? this.pass() : this.fail(message + ": object was not an instance of the expected type"); } - catch(e) { this.error(e); } + catch(e) { this.error(e); } }, assertNotInstanceOf: function(expected, actual) { var message = arguments[2] || 'assertNotInstanceOf'; - try { - !(actual instanceof expected) ? this.pass() : + try { + !(actual instanceof expected) ? this.pass() : this.fail(message + ": object was an instance of the not expected type"); } - catch(e) { this.error(e); } + catch(e) { this.error(e); } }, assertRespondsTo: function(method, obj) { var message = arguments[2] || 'assertRespondsTo'; try { - (obj[method] && typeof obj[method] == 'function') ? this.pass() : + (obj[method] && typeof obj[method] == 'function') ? this.pass() : this.fail(message + ": object doesn't respond to [" + method + "]"); } catch(e) { this.error(e); } }, @@ -393,7 +393,7 @@ Test.Unit.Assertions.prototype = { try { var m = obj[method]; if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)]; - m() ? this.pass() : + m() ? this.pass() : this.fail(message + ": method returned false"); } catch(e) { this.error(e); } }, @@ -402,17 +402,17 @@ Test.Unit.Assertions.prototype = { try { var m = obj[method]; if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)]; - !m() ? this.pass() : + !m() ? this.pass() : this.fail(message + ": method returned true"); } catch(e) { this.error(e); } }, assertRaise: function(exceptionName, method) { var message = arguments[2] || 'assertRaise'; - try { + try { method(); this.fail(message + ": exception expected but none was raised"); } catch(e) { - ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); + ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); } }, assertElementsMatch: function() { @@ -434,7 +434,7 @@ Test.Unit.Assertions.prototype = { var startAt = new Date(); (iterations || 1).times(operation); var timeTaken = ((new Date())-startAt); - this.info((arguments[2] || 'Operation') + ' finished ' + + this.info((arguments[2] || 'Operation') + ' finished ' + iterations + ' iterations in ' + (timeTaken/1000)+'s' ); return timeTaken; }, @@ -444,7 +444,7 @@ Test.Unit.Assertions.prototype = { this.assertNotNull(element); if(element.style && Element.getStyle(element, 'display') == 'none') return false; - + return this._isVisible(element.parentNode); }, assertNotVisible: function(element) { @@ -457,7 +457,7 @@ Test.Unit.Assertions.prototype = { var startAt = new Date(); (iterations || 1).times(operation); var timeTaken = ((new Date())-startAt); - this.info((arguments[2] || 'Operation') + ' finished ' + + this.info((arguments[2] || 'Operation') + ' finished ' + iterations + ' iterations in ' + (timeTaken/1000)+'s' ); return timeTaken; } @@ -468,7 +468,7 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p initialize: function(name, test, setup, teardown) { Test.Unit.Assertions.prototype.initialize.bind(this)(); this.name = name; - + if(typeof test == 'string') { test = test.gsub(/(\.should[^$]+\()/,'#{0}this,'); test = test.gsub(/(\.should[^\(]+)\(this,$/,'#{1}(this)'); @@ -478,7 +478,7 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p } else { this.test = test || function() {}; } - + this.setup = setup || function() {}; this.teardown = teardown || function() {}; this.isWaiting = false; @@ -519,23 +519,23 @@ Test.setupBDDExtensionMethods = function(){ shouldNotBeAn: 'assertNotOfType', shouldBeNull: 'assertNull', shouldNotBeNull: 'assertNotNull', - + shouldBe: 'assertReturnsTrue', shouldNotBe: 'assertReturnsFalse', shouldRespondTo: 'assertRespondsTo' }; - var makeAssertion = function(assertion, args, object) { + var makeAssertion = function(assertion, args, object) { this[assertion].apply(this,(args || []).concat([object])); } - - Test.BDDMethods = {}; - $H(METHODMAP).each(function(pair) { - Test.BDDMethods[pair.key] = function() { - var args = $A(arguments); - var scope = args.shift(); - makeAssertion.apply(scope, [pair.value, args, this]); }; + + Test.BDDMethods = {}; + $H(METHODMAP).each(function(pair) { + Test.BDDMethods[pair.key] = function() { + var args = $A(arguments); + var scope = args.shift(); + makeAssertion.apply(scope, [pair.value, args, this]); }; }); - + [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each( function(p){ Object.extend(p, Test.BDDMethods) } ); @@ -543,7 +543,7 @@ Test.setupBDDExtensionMethods = function(){ Test.context = function(name, spec, log){ Test.setupBDDExtensionMethods(); - + var compiledSpec = {}; var titles = {}; for(specName in spec) { @@ -557,7 +557,7 @@ Test.context = function(name, spec, log){ var body = spec[specName].toString().split('\n').slice(1); if(/^\{/.test(body[0])) body = body.slice(1); body.pop(); - body = body.map(function(statement){ + body = body.map(function(statement){ return statement.strip() }); compiledSpec[testName] = body.join('\n'); rails_plugins/rspec/story_server/prototype/javascripts/unittest.js @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -12,15 +12,15 @@ <script src="javascripts/scriptaculous.js" type="text/javascript"></script> <script src="javascripts/rspec.js" type="text/javascript"></script> <script src="javascripts/unittest.js" type="text/javascript"></script> - + <link href="stylesheets/rspec.css" rel="stylesheet" type="text/css" /> <link href="stylesheets/test.css" rel="stylesheet" type="text/css" /> </head> <body> - <!-- + <!-- Classes and ids that are only used by the Story UI, which don't have to be present in the Example report: - + #nav #stock_steps dl.story @@ -84,7 +84,7 @@ 'should extract story narrative': function() { var narrative = StoryDom.narrativeText($$('p')[0].innerHTML); narrative.shouldEqual( - " As a savings account holder\n" + + " As a savings account holder\n" + " I want to transfer money from my savings account\n" + " So that I can get cash easily from an ATM\n" ); @@ -98,7 +98,7 @@ 'should extract scenario': function() { var scenario = StoryDom.scenario($$('dl')[1]); scenario.shouldEqual( - " Scenario: savings account is in credit\n" + + " Scenario: savings account is in credit\n" + " Given my savings account balance is 100 dollars\n" + " Given my cash account balance is 10 dollars\n" + " When I transfer 20 dollars\n" + @@ -110,20 +110,20 @@ 'should extract story from page': function() { var story = StoryDom.story(); story.shouldEqual( - "Story: transfer to cash account\n" + + "Story: transfer to cash account\n" + "\n" + " As a savings account holder\n" + " I want to transfer money from my savings account\n" + " So that I can get cash easily from an ATM\n" + "\n" + - " Scenario: savings account is in credit\n" + + " Scenario: savings account is in credit\n" + " Given my savings account balance is 100 dollars\n" + " Given my cash account balance is 10 dollars\n" + " When I transfer 20 dollars\n" + " Then my savings account balance should be 80 dollars\n" + " Then my cash account balance should be 30 dollars\n" + "\n" + - " Scenario: savings account is overdrawn\n" + + " Scenario: savings account is overdrawn\n" + " Given my savings account balance is -20 dollars\n" + " Given my cash account balance is 10 dollars\n" + " When I transfer 20 dollars\n" + rails_plugins/rspec/story_server/prototype/stories.html @@ -12,20 +12,20 @@ Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software Copyright (c) 2006 Assaf Arkin ==================================================================== -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do +of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. rails_plugins/rspec_on_rails/MIT-LICENSE @@ -1,2 +1,2 @@ ---exclude "spec/*,gems/*" +--exclude "spec/*,gems/*" --rails \ No newline at end of file rails_plugins/rspec_on_rails/generators/rspec/templates/rcov.opts @@ -23,7 +23,7 @@ module Spec active_connections.delete(name) end end - end + end if ActionController.const_defined?(:Dispatcher) dispatcher = ::ActionController::Dispatcher.new($stdout) rails_plugins/rspec_on_rails/generators/rspec/templates/script/spec_server @@ -8,7 +8,7 @@ Description: module, specify the controller name as 'module/controller'. The generator creates stubs for a controller (and spec), a view (and spec) - for each view in the argument list, plus a helper. + for each view in the argument list, plus a helper. Example: ./script/generate rspec_controller dog bark fetch rails_plugins/rspec_on_rails/generators/rspec_controller/USAGE @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper' describe <%= class_name %>Helper do - + #Delete this example and add some real ones or delete this file it "should include the <%= class_name %>Helper" do included_modules = self.metaclass.send :included_modules included_modules.should include(<%= class_name %>Helper) end - + end rails_plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb @@ -4,7 +4,7 @@ describe "/<%= class_name.underscore %>/<%= action %>" do before(:each) do render '<%= class_name.underscore %>/<%= action %>' end - + #Delete this example and add some real ones or delete this file it "should tell you where to find the file" do response.should have_tag('p', /Find me in app\/views\/<%= class_name.underscore %>\/<%= action %>/) rails_plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb @@ -1,6 +1,6 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase default_options :skip_migration => false - + attr_reader :controller_name, :controller_class_path, :controller_file_path, @@ -27,7 +27,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase else @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}" end - + if Rails::VERSION::STRING < "2.0.0" @resource_generator = "scaffold_resource" @default_file_extension = "rhtml" @@ -35,7 +35,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase @resource_generator = "scaffold" @default_file_extension = "html.erb" end - + if ActionController::Base.respond_to?(:resource_action_separator) @resource_edit_path = "/edit" else @@ -45,7 +45,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase def manifest record do |m| - + # Check for class naming collisions. m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper") m.class_collisions(class_path, "#{class_name}") @@ -60,7 +60,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase m.directory(File.join('spec/helpers', class_path)) m.directory File.join('spec/fixtures', class_path) m.directory File.join('spec/views', controller_class_path, controller_file_name) - + # Controller spec, class, and helper. m.template 'rspec_scaffold:routing_spec.rb', File.join('spec/controllers', controller_class_path, "#{controller_file_name}_routing_spec.rb") @@ -83,7 +83,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase File.join('app/views', controller_class_path, controller_file_name, "#{action}.#{default_file_extension}") ) end - + # Model class, unit test, and fixtures. m.template 'model:model.rb', File.join('app/models', class_path, "#{file_name}.rb") m.template 'model:fixtures.yml', File.join('spec/fixtures', class_path, "#{table_name}.yml") @@ -101,11 +101,11 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase unless options[:skip_migration] m.migration_template( - 'model:migration.rb', 'db/migrate', + 'model:migration.rb', 'db/migrate', :assigns => { :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}", :attributes => attributes - }, + }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" ) end @@ -124,7 +124,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase def add_options!(opt) opt.separator '' opt.separator 'Options:' - opt.on("--skip-migration", + opt.on("--skip-migration", "Don't generate a migration file for this model") { |v| options[:skip_migration] = v } end @@ -132,7 +132,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase %w[ index show new edit ] end - def model_name + def model_name class_name.demodulize end end @@ -152,7 +152,7 @@ module Rails when :boolean then "false" else "" - end + end end def input_type @@ -160,7 +160,7 @@ module Rails when :text then "textarea" else "input" - end + end end end end rails_plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb @@ -7,11 +7,11 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>) <%= class_name %>.stub!(:find).and_return([@<%= file_name %>]) end - + def do_get get :index end - + it "should be successful" do do_get response.should be_success @@ -21,12 +21,12 @@ describe <%= controller_class_name %>Controller do do_get response.should render_template('index') end - + it "should find all <%= table_name %>" do <%= class_name %>.should_receive(:find).with(:all).and_return([@<%= file_name %>]) do_get end - + it "should assign the found <%= table_name %> for the view" do do_get assigns[:<%= table_name %>].should == [@<%= file_name %>] @@ -39,12 +39,12 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>, :to_xml => "XML") <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) end - + def do_get @request.env["HTTP_ACCEPT"] = "application/xml" get :index end - + it "should be successful" do do_get response.should be_success @@ -54,7 +54,7 @@ describe <%= controller_class_name %>Controller do <%= class_name %>.should_receive(:find).with(:all).and_return([@<%= file_name %>]) do_get end - + it "should render the found <%= table_name %> as xml" do @<%= file_name %>.should_receive(:to_xml).and_return("XML") do_get @@ -68,7 +68,7 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>) <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) end - + def do_get get :show, :id => "1" end @@ -77,17 +77,17 @@ describe <%= controller_class_name %>Controller do do_get response.should be_success end - + it "should render show template" do do_get response.should render_template('show') end - + it "should find the <%= file_name %> requested" do <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>) do_get end - + it "should assign the found <%= file_name %> for the view" do do_get assigns[:<%= file_name %>].should equal(@<%= file_name %>) @@ -100,7 +100,7 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>, :to_xml => "XML") <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) end - + def do_get @request.env["HTTP_ACCEPT"] = "application/xml" get :show, :id => "1" @@ -110,12 +110,12 @@ describe <%= controller_class_name %>Controller do do_get response.should be_success end - + it "should find the <%= file_name %> requested" do <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>) do_get end - + it "should render the found <%= file_name %> as xml" do @<%= file_name %>.should_receive(:to_xml).and_return("XML") do_get @@ -129,7 +129,7 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>) <%= class_name %>.stub!(:new).and_return(@<%= file_name %>) end - + def do_get get :new end @@ -138,22 +138,22 @@ describe <%= controller_class_name %>Controller do do_get response.should be_success end - + it "should render new template" do do_get response.should render_template('new') end - + it "should create an new <%= file_name %>" do <%= class_name %>.should_receive(:new).and_return(@<%= file_name %>) do_get end - + it "should not save the new <%= file_name %>" do @<%= file_name %>.should_not_receive(:save) do_get end - + it "should assign the new <%= file_name %> for the view" do do_get assigns[:<%= file_name %>].should equal(@<%= file_name %>) @@ -166,7 +166,7 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>) <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) end - + def do_get get :edit, :id => "1" end @@ -175,17 +175,17 @@ describe <%= controller_class_name %>Controller do do_get response.should be_success end - + it "should render edit template" do do_get response.should render_template('edit') end - + it "should find the <%= file_name %> requested" do <%= class_name %>.should_receive(:find).and_return(@<%= file_name %>) do_get end - + it "should assign the found <%= class_name %> for the view" do do_get assigns[:<%= file_name %>].should equal(@<%= file_name %>) @@ -198,14 +198,14 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>, :to_param => "1") <%= class_name %>.stub!(:new).and_return(@<%= file_name %>) end - + describe "with successful save" do - + def do_post @<%= file_name %>.should_receive(:save).and_return(true) post :create, :<%= file_name %> => {} end - + it "should create a new <%= file_name %>" do <%= class_name %>.should_receive(:new).with({}).and_return(@<%= file_name %>) do_post @@ -215,21 +215,21 @@ describe <%= controller_class_name %>Controller do do_post response.should redirect_to(<%= table_name.singularize %>_url("1")) end - + end - + describe "with failed save" do def do_post @<%= file_name %>.should_receive(:save).and_return(false) post :create, :<%= file_name %> => {} end - + it "should re-render 'new'" do do_post response.should render_template('new') end - + end end @@ -239,7 +239,7 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>, :to_param => "1") <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) end - + describe "with successful update" do def do_put @@ -268,7 +268,7 @@ describe <%= controller_class_name %>Controller do end end - + describe "with failed update" do def do_put @@ -290,7 +290,7 @@ describe <%= controller_class_name %>Controller do @<%= file_name %> = mock_model(<%= class_name %>, :destroy => true) <%= class_name %>.stub!(:find).and_return(@<%= file_name %>) end - + def do_delete delete :destroy, :id => "1" end @@ -299,12 +299,12 @@ describe <%= controller_class_name %>Controller do <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>) do_delete end - + it "should call destroy on the found <%= file_name %>" do @<%= file_name %>.should_receive(:destroy) do_delete end - + it "should redirect to the <%= table_name %> list" do do_delete response.should redirect_to(<%= table_name %>_url) rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do include <%= controller_class_name %>Helper - + before do @<%= file_name %> = mock_model(<%= class_name %>) <% for attribute in attributes -%> @@ -13,7 +13,7 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do it "should render edit form" do render "/<%= table_name %>/edit.<%= default_file_extension %>" - + response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do <% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]") rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper' describe <%= controller_class_name %>Helper do - + #Delete this example and add some real ones or delete this file it "should include the <%= class_name %>Helper" do included_modules = self.metaclass.send :included_modules included_modules.should include(<%= controller_class_name %>Helper) end - + end rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_ describe "/<%= table_name %>/index.<%= default_file_extension %>" do include <%= controller_class_name %>Helper - + before(:each) do <% [98,99].each do |id| -%> <%= file_name %>_<%= id %> = mock_model(<%= class_name %>) rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_ describe "/<%= table_name %>/new.<%= default_file_extension %>" do include <%= controller_class_name %>Helper - + before(:each) do @<%= file_name %> = mock_model(<%= class_name %>) @<%= file_name %>.stub!(:new_record?).and_return(true) @@ -14,7 +14,7 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do it "should render new form" do render "/<%= table_name %>/new.<%= default_file_extension %>" - + response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do <% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]") rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb @@ -6,23 +6,23 @@ describe <%= controller_class_name %>Controller do it "should map { :controller => '<%= table_name %>', :action => 'index' } to /<%= table_name %>" do route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>" end - + it "should map { :controller => '<%= table_name %>', :action => 'new' } to /<%= table_name %>/new" do route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new" end - + it "should map { :controller => '<%= table_name %>', :action => 'show', :id => 1 } to /<%= table_name %>/1" do route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1" end - + it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => 1 } to /<%= table_name %>/1<%= resource_edit_path %>" do route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>" end - + it "should map { :controller => '<%= table_name %>', :action => 'update', :id => 1} to /<%= table_name %>/1" do route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1" end - + it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1" end @@ -33,27 +33,27 @@ describe <%= controller_class_name %>Controller do it "should generate params { :controller => '<%= table_name %>', action => 'index' } from GET /<%= table_name %>" do params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"} end - + it "should generate params { :controller => '<%= table_name %>', action => 'new' } from GET /<%= table_name %>/new" do params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"} end - + it "should generate params { :controller => '<%= table_name %>', action => 'create' } from POST /<%= table_name %>" do params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"} end - + it "should generate params { :controller => '<%= table_name %>', action => 'show', id => '1' } from GET /<%= table_name %>/1" do params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"} end - + it "should generate params { :controller => '<%= table_name %>', action => 'edit', id => '1' } from GET /<%= table_name %>/1;edit" do params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"} end - + it "should generate params { :controller => '<%= table_name %>', action => 'update', id => '1' } from PUT /<%= table_name %>/1" do params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"} end - + it "should generate params { :controller => '<%= table_name %>', action => 'destroy', id => '1' } from DELETE /<%= table_name %>/1" do params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"} end rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/routing_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_ describe "/<%= table_name %>/show.<%= default_file_extension %>" do include <%= controller_class_name %>Helper - + before(:each) do @<%= file_name %> = mock_model(<%= class_name %>) <% for attribute in attributes -%> rails_plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb @@ -29,9 +29,9 @@ Autotest.add_hook :initialize do |at| %w{^config/ ^coverage/ ^db/ ^doc/ ^log/ ^public/ ^script ^vendor/rails ^vendor/plugins previous_failures.txt}.each do |exception| at.add_exception(exception) end - + at.clear_mappings - + at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m| ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%) } @@ -77,5 +77,5 @@ class Autotest::RailsRspec < Autotest::Rspec def spec_command "script/spec" end - + end rails_plugins/rspec_on_rails/lib/autotest/rails_rspec.rb @@ -19,31 +19,31 @@ module Spec # Spec::Rails (a.k.a. RSpec on Rails) is a Ruby on Rails plugin that allows you to drive the development # of your RoR application using RSpec, a framework that aims to enable Example Driven Development # in Ruby. - # + # # == Features - # + # # * Use RSpec to independently specify Rails Models, Views, Controllers and Helpers # * Integrated fixture loading # * Special generators for Resources, Models, Views and Controllers that generate Specs instead of Tests. - # + # # == Vision - # + # # For people for whom TDD is a brand new concept, the testing support built into Ruby on Rails # is a huge leap forward. The fact that it is built right in is fantastic, and Ruby on Rails # apps are generally much easier to maintain than they might have been without such support. - # + # # For those of us coming from a history with TDD, and now BDD, the existing support presents some problems related to dependencies across specs. To that end, RSpec on Rails supports 4 types of specs. We’ve also built in first class mocking and stubbing support in order to break dependencies across these different concerns. - # + # # == More Information # # See Spec::Rails::Runner for information about the different kinds of contexts # you can use to spec the different Rails components - # + # # See Spec::Rails::Expectations for information about Rails-specific expectations # you can set on responses and models, etc. # # == License - # + # # RSpec on Rails is licensed under the same license as RSpec itself, # the MIT-LICENSE. module Rails rails_plugins/rspec_on_rails/lib/spec/rails.rb @@ -63,7 +63,7 @@ module Spec # end class ControllerExampleGroup < FunctionalExampleGroup class << self - + # Use this to instruct RSpec to render views in your controller examples (Integration Mode). # # describe ThingController do @@ -190,16 +190,16 @@ module Spec end end end - + private def matching_message_expectation_exists(options) expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options) end - + def matching_stub_exists(options) expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options) end - + public if self.respond_to?(:should_receive) && self.respond_to?(:stub!) self.send :alias_method, :orig_should_receive, :should_receive rails_plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb @@ -13,7 +13,7 @@ module Spec after(:each) do teardown_fixtures if self.respond_to?(:teardown_fixtures) end - + include Spec::Rails::Matchers @@model_id = 1000 rails_plugins/rspec_on_rails/lib/spec/rails/example/rails_example_gro