typo 5.4.1 → 5.4.2

data/spec/models/trackback_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe 'With the various trackback filters loaded and DNS mocked out appropriately' do
+describe Trackback, 'With the various trackback filters loaded and DNS mocked out appropriately' do
   before(:each) do
     IPSocket.stub!(:getaddress).and_return { raise SocketError.new("getaddrinfo: Name or service not known") }
     @blog = Blog.default

data/spec/models/user_spec.rb

@@ -106,17 +106,14 @@ describe 'With a new user' do
   end
 end
 
-describe 'With a user, "bob" in the database' do
+describe 'With a user in the database' do
   before(:each) do
-    User.delete_all
-    u = User.new(:login => 'bob')
-    u.password = u.password_confirmation = 'secure password'
-    u.email = 'typo@typo.com' #Email needed
-    u.save!
+    @olduser = Factory.create(:user)
   end
 
   it 'should not be able to create another user with the same login' do
-    u = User.new(:login => 'bob') {|u| u.password = u.password_confirmation = 'secure password'}
+    login = @olduser.login
+    u = User.new(:login => login) {|u| u.password = u.password_confirmation = 'secure password'}
 
     u.should_not be_valid
     u.errors.should be_invalid('login')
@@ -125,9 +122,7 @@ end
 
 describe 'Updating an existing user' do
   before(:each) do
-    User.delete_all
-    @user = User.new :login => 'bob'
-    @user.email = 'typo@typo.com'
+    @user = Factory.create(:user)
     set_password 'a secure password'
     @user.save!
   end
@@ -162,8 +157,8 @@ describe 'Updating an existing user' do
     it "is not actually changed when set to empty" do
       set_password ''
       @user.save!
-      User.authenticate('bob', '').should be_nil
-      User.authenticate('bob', 'a secure password').should == @user
+      User.authenticate(@user.login, '').should be_nil
+      User.authenticate(@user.login, 'a secure password').should == @user
     end
   end
 

data/spec/spec_helper.rb

@@ -92,7 +92,7 @@ end
 
 def assert_feedvalidator(rss, todo=nil)
   unless $validator_installed
-    puts 'not test of validating feed because no validator (feedvalidator in python) installed'
+    puts 'Not validating feed because no validator (feedvalidator in python) is installed'
     return
   end
 

data/test/fixtures/users.yml

@@ -5,9 +5,10 @@ tobi:
   password: ea0f5fd4398054c1c7aa0fbc7aaea30914a14441 # whatever
   name: Tobi
   email: tobi@example.com
-  notify_via_email: true
+  notify_via_email: false
   notify_on_new_articles: false
-  notify_on_comments: true
+  notify_on_comments: false
+  notify_watch_my_articles: false
   profile: admin
   text_filter: markdown_filter
   state: active
@@ -19,8 +20,9 @@ bob:
   name: Bob
   email: bob@example.com
   notify_via_email: false
-  notify_on_new_articles: true
+  notify_on_new_articles: false
   notify_on_comments: false
+  notify_watch_my_articles: false
   profile: admin
   text_filter: none_filter
   state: active
@@ -31,9 +33,10 @@ existingbob:
   password: 9a91e1d8d95b6315991a88121bb0aa9f03ba0dfc # test
   name: Also Bob
   email: alsobob@example.com
-  notify_via_email: true
+  notify_via_email: false
   notify_on_new_articles: false
   notify_on_comments: false
+  notify_watch_my_articles: false
   profile: admin
   text_filter: markdown_filter
   state: active
@@ -47,6 +50,7 @@ longbob:
   notify_via_email: false
   notify_on_new_articles: false
   notify_on_comments: false
+  notify_watch_my_articles: false
   profile: admin
   text_filter: markdown_filter
   state: active
@@ -57,9 +61,10 @@ randomuser:
   password: 8e9b1a9a38e66ca572a5e8fdac8e256848842dfa # longtest
   name: Random User
   email: randomuser@example.com
-  notify_via_email: true
-  notify_on_new_articles: true
-  notify_on_comments: true
+  notify_via_email: false
+  notify_on_new_articles: false
+  notify_on_comments: false
+  notify_watch_my_articles: false
   profile: admin
   text_filter: none_filter
   state: active
@@ -73,6 +78,7 @@ user_publisher:
   notify_via_email: false
   notify_on_new_articles: false
   notify_on_comments: false
+  notify_watch_my_articles: false
   profile: publisher
   text_filter: markdown_filter
   state: active
@@ -86,8 +92,9 @@ inactive_user:
   notify_via_email: false
   notify_on_new_articles: false
   notify_on_comments: false
+  notify_watch_my_articles: false
   profile: publisher
   text_filter: markdown_filter
   state: inactive
   last_connection: 2009-11-21 12:15:58
-  
+  

data/vendor/plugins/easy-ckeditor/lib/ckeditor.rb

@@ -76,8 +76,7 @@ module Ckeditor
     alias_method :ckeditor_form_remote_for, :ckeditor_remote_form_for
 
     def ckeditor_element_id(object, field)
-      id = eval("@#{object}.id")
-      "#{object}_#{id}_#{field}_editor"
+      "#{object}__#{field}_editor"
     end
 
     def ckeditor_div_id(object, field)

data/vendor/plugins/easy-ckeditor/lib/ckeditor_file_utils.rb

@@ -49,10 +49,10 @@ module CkeditorFileUtils
       unless File.symlink?(config_symlink)
         FileUtils.rm(backup_config) if File.exist?(backup_config)
         FileUtils.mv(config_symlink,backup_config)
-        FileUtils.ln_s(dest, config_symlink)
+        FileUtils.cp(dest, config_symlink)
       end
     else
-      FileUtils.ln_s(dest, config_symlink)
+      FileUtils.cp(dest, config_symlink)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 +01:00
+date: 2010-01-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -231,6 +231,7 @@ files:
 - app/models/web_notifier.rb
 - app/views/accounts/confirm.html.erb
 - app/views/accounts/login.html.erb
+- app/views/accounts/recover_password.html.erb
 - app/views/accounts/signup.html.erb
 - app/views/admin/base/_recent_comments.html.erb
 - app/views/admin/base/_recent_trackbacks.html.erb
@@ -250,6 +251,7 @@ files:
 - app/views/admin/content/_attachment.html.erb
 - app/views/admin/content/_drafts.html.erb
 - app/views/admin/content/_form.html.erb
+- app/views/admin/content/_images.html.erb
 - app/views/admin/content/_show_resources.html.erb
 - app/views/admin/content/_simple_editor.html.erb
 - app/views/admin/content/_visual_editor.html.erb
@@ -287,8 +289,10 @@ files:
 - app/views/admin/resources/_metadata_edit.html.erb
 - app/views/admin/resources/_mime_edit.html.erb
 - app/views/admin/resources/_pages.html.erb
-- app/views/admin/resources/_resources.html.erb
+- app/views/admin/resources/_upload.html.erb
 - app/views/admin/resources/destroy.html.erb
+- app/views/admin/resources/get_thumbnails.html.erb
+- app/views/admin/resources/images.html.erb
 - app/views/admin/resources/index.html.erb
 - app/views/admin/settings/_submit.html.erb
 - app/views/admin/settings/feedback.html.erb
@@ -576,8 +580,10 @@ files:
 - public/images/prevlabel.gif
 - public/images/spinner-blue.gif
 - public/images/spinner.gif
+- public/images/thumb_blank.jpg
 - public/javascripts/administration.js
 - public/javascripts/application.js
+- public/javascripts/base_packaged.js
 - public/javascripts/builder.js
 - public/javascripts/calendar_date_select/calendar_date_select.js
 - public/javascripts/calendar_date_select/format_db.js
@@ -857,9 +863,11 @@ files:
 - public/javascripts/scriptaculous.js
 - public/javascripts/slider.js
 - public/javascripts/typo.js
+- public/javascripts/typo_carousel.js
 - public/robots.txt
 - public/stylesheets/administration.css
 - public/stylesheets/administration_rtl.css
+- public/stylesheets/base_packaged.css
 - public/stylesheets/border-radius-ie8.htc
 - public/stylesheets/calendar_date_select/default.css
 - public/stylesheets/codecollapse.css
@@ -877,7 +885,6 @@ files:
 - README
 - script/about
 - script/autospec
-- script/benchmarker
 - script/breakpointer
 - script/console
 - script/dbconsole
@@ -888,18 +895,11 @@ files:
 - script/migrate
 - script/performance/benchmarker
 - script/performance/profiler
-- script/performance/request
 - script/plugin
-- script/process/inspector
-- script/process/reaper
-- script/process/spawner
-- script/process/spinner
-- script/profiler
 - script/runner
 - script/server
 - script/spacecheck
 - script/spec
-- script/spec_server
 - spec/controllers/accounts_controller_spec.rb
 - spec/controllers/admin/blacklist_controller_spec.rb
 - spec/controllers/admin/cache_controller_spec.rb

data/app/views/admin/resources/_resources.html.erb

@@ -1,41 +0,0 @@
-<table>
-<tr>
-  <th><%= _("Filename")%> <small>(<%= _('right-click for link')%>)</small></th>
-  <th><%= _("Content Type")%></th>
-  <th><%= _("MetaData")%></th>
-  <th><%= _("File Size")%></th>
-  <th><%= _("Date")%></th>
-  <th><%= _("Delete")%></th>
-</tr>
-<%= render_void_table(@resources.size, 6) %>
-<% for upload in resources -%>
-<tr <%= alternate_class -%>>
-  <td><%= link_to ("#{upload.filename}", "#{this_blog.base_url}/files/#{upload.filename}", {:rel => 'lightbox'}) -%></td>
-  <td>
-    <%= task_edit_resource_mime(upload.mime, upload.id) %>
-    <div id="edit-resource-mime-<%= upload.id %>" style="display:none;position:absolute;">
-      <%= render :partial => "mime_edit", :locals => {:id => upload.id, :mime => upload.mime} %>
-    </div>
-  </td>
-  <% if upload.itunes_metadata? %>
-  <td>
-    <%= task_edit_resource_metadata(_("Edit MetaData") + ' (+/-)', upload.id) %>
-    <div id="edit-resource-metadata-<%= upload.id%>" style="display:none;position:absolute;">
-      <%= render :partial => "metadata_edit" , :locals => {:id => upload.id, :resource => upload}%>
-    </div>
-  </td>
-  <% else -%>
-  <td>
-    <%= task_add_resource_metadata(_("Add MetaData") + ' (+/-)', upload.id) %>
-    <div id="add-resource-metadata-<%= upload.id%>" style="display:none;position:absolute;">
-      <%= render :partial => "metadata_add", :locals => {:id => upload.id} %>
-    </div>
-  </td>
-  <% end -%>
-  <td><%=h upload.size rescue 0 -%> bytes</td>
-  <td><%=h upload.created_at.strftime('%Y-%m-%d %H:%M:%S') -%></td>
-  <td class="operation"><%= link_to _("delete"), {:action => 'destroy', :id => upload.id, :search => params[:search], :page => params[:page] },  :confirm => _("Are you sure?"), :method => :post %></td>
-</tr>  
-<% end -%>
-  <%= display_pagination(resources, 6)%>
-</table>

data/script/benchmarker

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-if ARGV.empty?
-  puts "Usage: benchmarker times 'Person.expensive_way' 'Person.another_expensive_way' ..."
-  exit 
-end
-
-require File.dirname(__FILE__) + '/../config/environment'
-require 'benchmark'
-include Benchmark
-
-# Don't include compilation in the benchmark
-ARGV[1..-1].each { |expression| eval(expression) }
-
-bm(6) do |x|
-  ARGV[1..-1].each_with_index do |expression, idx|
-    x.report("##{idx + 1}") { ARGV[0].to_i.times { eval(expression) } }
-  end
-end 

data/script/performance/request

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/performance/request'

data/script/process/inspector

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/inspector'

data/script/process/reaper

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/reaper'

data/script/process/spawner

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/spawner'

data/script/process/spinner

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/spinner'

data/script/profiler

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-if ARGV.empty?
-  $stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times]"
-  exit(1)
-end
-
-# Keep the expensive require out of the profile.
-$stderr.puts 'Loading Rails...'
-require File.dirname(__FILE__) + '/../config/environment'
-
-# Define a method to profile.
-if ARGV[1] and ARGV[1].to_i > 1
-  eval "def profile_me() #{ARGV[1]}.times { #{ARGV[0]} } end"
-else
-  eval "def profile_me() #{ARGV[0]} end"
-end
-
-# Use the ruby-prof extension if available.  Fall back to stdlib profiler.
-begin
-  require 'prof'
-  $stderr.puts 'Using the ruby-prof extension.'
-  Prof.clock_mode = Prof::GETTIMEOFDAY
-  Prof.start
-  profile_me
-  results = Prof.stop
-  require 'rubyprof_ext'
-  Prof.print_profile(results, $stderr)
-rescue LoadError
-  $stderr.puts 'Using the standard Ruby profiler.'
-  Profiler__.start_profile
-  profile_me
-  Profiler__.stop_profile
-  Profiler__.print_profile($stderr)
-end

data/script/spec_server

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-
-puts "Loading Rails environment"
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
-
-require 'optparse'
-require 'spec/rails/spec_server'