typo 4.0.1 → 4.0.2

data/app/apis/blogger_service.rb

@@ -55,13 +55,13 @@ class BloggerService < TypoWebService
       :lastname => "",
       :nickname => username,
       :email => "",
-      :url => controller.url_for(:controller => "/")
+      :url => controller.url_for(:controller => "articles")
     )
   end
 
   def getUsersBlogs(appkey, username, password)
     [BloggerStructs::Blog.new(
-      :url      => controller.url_for(:controller => "/"),
+      :url      => controller.url_for(:controller => "articles"),
       :blogid   => 1,
       :blogName => this_blog.blog_name
     )]

data/app/apis/meta_weblog_service.rb

@@ -149,7 +149,7 @@ class MetaWeblogService < TypoWebService
     resource = Resource.create(:filename => data['name'], :mime => data['type'], :created_at => Time.now)
     resource.write_to_disk(data['bits'])
 
-    MetaWeblogStructs::Url.new("url" => controller.url_for(:controller => "/files/#{resource.filename}"))
+    MetaWeblogStructs::Url.new("url" => controller.url_for(:controller => "files", :action => "#{resource.filename}"))
   end
 
   def article_dto_from(article)
@@ -188,7 +188,7 @@ class MetaWeblogService < TypoWebService
   end
 
   def server_url
-    controller.url_for(:only_path => false, :controller => "/")
+    controller.url_for(:only_path => false, :controller => "articles")
   end
 
   def pub_date(time)

data/app/controllers/xml_controller.rb

@@ -107,7 +107,7 @@ class XmlController < ContentController
     tag = Tag.find_by_name(params[:id])
     fetch_items(tag.articles)
     @feed_title << ": Tag #{tag.display_name}"
-    @link = url_for({:controller => "articles_controller.rb", :action => 'tag', :tag => tag.name},
+    @link = url_for({:controller => "articles", :action => 'tag', :tag => tag.name},
                     {:only_path => false})
   end
 

data/app/helpers/admin/base_helper.rb

@@ -26,9 +26,9 @@ module Admin::BaseHelper
 
   def current_user_notice
     unless session[:user]
-      link_to "log in", :controller => "/accounts", :action=>"login"
+      link_to "log in", :controller => "accounts", :action=>"login"
     else
-      link_to "log out", :controller => "/accounts", :action=>"logout"
+      link_to "log out", :controller => "accounts", :action=>"logout"
     end
   end
 

data/app/helpers/application_helper.rb

@@ -6,6 +6,13 @@ module ApplicationHelper
     url_for options.update(:only_path => false)
   end
 
+  def url_for(options = { })
+    if options[:controller] && options[:controller] =~ /^\/?$/
+      options[:controller] = '/articles'
+    end
+    super(options)
+  end
+
   def config_value(name)
     this_blog[name]
   end
@@ -88,10 +95,10 @@ module ApplicationHelper
     page.html(@controller,:body)
   end
 
-  def strip_html(text) 
+  def strip_html(text)
     text.strip_html
   end
-    
+
   def markup_help_popup(markup, text)
     if markup and markup.commenthelp.size > 1
       "<a href=\"#{url_for :controller => '/articles', :action => 'markup_help', :id => markup.id}\" onClick=\"return popup(this, 'Typo Markup Help')\">#{text}</a>"

data/app/helpers/articles_helper.rb

@@ -9,7 +9,8 @@ module ArticlesHelper
           :confirm => "Are you sure you want to delete this #{type}?"
         }, :class => "admintools") <<
       link_to('edit', {
-        :controller => "admin/#{type.pluralize}/article/#{model.article.id}",
+        :controller => "admin/#{type.pluralize}",
+        :article_id => model.article.id,
         :action => "edit", :id => model
         }, :class => "admintools"),
       :id => "admin_#{type}_#{model.id}", :style => "display: none")
@@ -79,14 +80,14 @@ module ArticlesHelper
 
   def category_links(article)
     "Posted in " + article.categories.collect { |c| link_to h(c.name),
-    { :controller => "articles", :action => "category", :id => c.permalink },
+    { :controller => "/articles", :action => "category", :id => c.permalink },
       :rel => "tag"
     }.join(", ")
   end
 
   def tag_links(article)
     "Tags " + article.tags.collect { |tag| link_to tag.display_name,
-      { :controller => "articles", :action => "tag", :id => tag.name },
+      { :controller => "/articles", :action => "tag", :id => tag.name },
       :rel => "tag"
     }.sort.join(", ")
   end
@@ -144,7 +145,7 @@ module ArticlesHelper
   end
 
   def urlspec_for_grouping(grouping)
-    { :controller => "articles", :action => grouping.class.to_prefix, :id => grouping.permalink }
+    { :controller => "/articles", :action => grouping.class.to_prefix, :id => grouping.permalink }
   end
 
   def title_for_grouping(grouping)

data/app/helpers/xml_helper.rb

@@ -18,9 +18,9 @@ module XmlHelper
   def blog_title
     this_blog.blog_name || "Unnamed blog"
   end
-  
+
   def tag_link(tag)
-    url_for :controller => "articles", :action => 'tag', :id => tag.name, :only_path => false
+    url_for :controller => "/articles", :action => 'tag', :id => tag.name, :only_path => false
   end
 
   def collection_lastmod(collection)
@@ -39,6 +39,6 @@ module XmlHelper
   end
 
   def category_link(category)
-    url_for :controller => "articles", :action => 'category', :id => category.permalink, :only_path => false
+    url_for :controller => "/articles", :action => 'category', :id => category.permalink, :only_path => false
   end
 end

data/app/models/blog.rb

@@ -159,12 +159,13 @@ class Blog < ActiveRecord::Base
             :month => sprintf("%.2d", article.published_at.month),
             :day => sprintf("%.2d", article.published_at.day),
             :title => article.permalink, :anchor => anchor,
-            :only_path => only_path)
+            :only_path => only_path,
+            :controller => '/articles')
   end
 
   def server_url
     if controller
-      controller.send :url_for, :only_path => false, :controller => "/"
+      controller.send :url_for, :only_path => false, :controller => "/articles"
     else
       settings[:canonical_server_url]
     end

data/app/views/accounts/logout.rhtml

@@ -3,10 +3,10 @@
 
     <p>
       You are now logged out of the system.
-      <%= link_to "Do you want to go to your blog?", :controller => "/" %>
+      <%= link_to "Do you want to go to your blog?", :controller => "articles" %>
     </p>
-      
+
     <%= link_to "&#171; login", :action => "login" %><br />
-      
+
 </div>
 

data/app/views/layouts/administration.rhtml

@@ -18,10 +18,10 @@
           <div id="info">
             <%= link_to "settings", :controller=>"/admin/general", :action => 'index' %> |
             <%= current_user_notice rescue nil %> |
-            <%= link_to 'your blog &raquo;', :controller => "/" %>
+            <%= link_to 'your blog &raquo;', :controller => "/articles" %>
 
           </div>
-            <h1><%= link_to "Typo admin - #{this_blog.blog_name rescue nil}", :controller => "/admin/" %></h1>
+            <h1><%= link_to "Typo admin - #{this_blog.blog_name rescue nil}", :controller => "/admin/general" %></h1>
           </div>
         <!-- /HEADER -->
 

data/app/views/notification_mailer/_mail_footer.rhtml

@@ -1,7 +1,7 @@
 </div>
 
 <p><em>This is being sent to <%=h @user.name %> because you asked to be notified via email whenever
-new content is posted to  <%= link_to @blog_name, @controller.url_for(:controller => 'articles', :action => 'index') %>
+new content is posted to  <%= link_to @blog_name, @controller.url_for(:controller => '/articles', :action => 'index') %>
 To unsubscribe, go to
-<a href="<%= @link_url = @controller.url_for(:controller => 'admin/users', :action => 'edit', :id => @user.id) %>"><%=h @link_url%></a>
+<a href="<%= @link_url = @controller.url_for(:controller => '/admin/users', :action => 'edit', :id => @user.id) %>"><%=h @link_url%></a>
 and change your user settings.</p>

data/app/views/notification_mailer/comment.rhtml

@@ -1,5 +1,5 @@
 <p>A new comment has been posted on
-    <%= link_to @blog_name, @controller.url_for(:controller => 'articles', :action => 'index') %>, responding to
+    <%= link_to @blog_name, @controller.url_for(:controller => '/articles', :action => 'index') %>, responding to
     <%= link_to h(@comment.article.title), article_url(@controller, @comment.article) %>.</p>
 
 <%= render :partial => './mail_header' %>

data/bin/typo

@@ -5,7 +5,7 @@ require 'rails-installer'
 class TypoInstaller < RailsInstaller
   application_name 'typo'
   support_location 'the Typo mailing list'
-  rails_version '1.1.5'
+  rails_version '1.1.6'
   
   def install_post_hook
     sweep_cache

data/config/routes.rb

@@ -24,7 +24,7 @@ ActionController::Routing::Routes.draw do |map|
   map.xml 'xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'
   map.xml 'xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'
   map.xml 'sitemap.xml', :controller => 'xml', :action => 'feed', :format => 'googlesitemap', :type => 'sitemap'
- 
+
   # allow neat perma urls
   map.connect 'articles',
     :controller => 'articles', :action => 'index'
@@ -77,17 +77,24 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'images/theme/:filename',
     :controller => 'theme', :action => 'images'
 
+  # For the tests
+  map.connect 'theme/static_view_test', :controller => 'theme', :action => 'static_view_test'
+
   map.connect 'plugins/filters/:filter/:public_action',
     :controller => 'textfilter', :action => 'public_action'
 
-  # Kill attempts to connect directly to the theme controller.
-  # Ideally we'd disable these by removing the default route (below),
-  # but that breaks too many things for Typo 2.5.
-  map.connect 'theme/*stuff',
-    :controller => 'theme', :action => 'error'
+  # Work around the Bad URI bug
+  %w{ accounts articles backend files live sidebar textfilter xml }.each do |i|
+    map.connect "#{i}", :controller => "#{i}", :action => 'index'
+    map.connect "#{i}/:action", :controller => "#{i}"
+    map.connect "#{i}/:action/:id", :controller => i, :id => nil
+  end
 
-  # Allow legacy urls to still work
-  map.connect ':controller/:action/:id'
+  %w{blacklist cache categories comments content feedback general pages
+     resources sidebar textfilters themes trackbacks users}.each do |i|
+    map.connect "/admin/#{i}", :controller => "admin/#{i}", :action => 'index'
+    map.connect "/admin/#{i}/:action/:id", :controller => "admin/#{i}", :action => nil, :id => nil
+  end
 
   map.connect '*from', :controller => 'redirect', :action => 'redirect'
 end

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "4.0.1"
+PKG_VERSION = "4.0.2"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -30,11 +30,11 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY 
   s.executables = ['typo']
   
-  s.add_dependency("rails", "= 1.1.5")
+  s.add_dependency("rails", "= 1.1.6")
   s.add_dependency("mongrel", ">= 0.3.13.3")
   s.add_dependency("mongrel_cluster", ">= 0.2.0")
   s.add_dependency("sqlite3-ruby", ">= 1.1.0")
-  s.add_dependency("rails-app-installer", ">= 0.1.1")
+  s.add_dependency("rails-app-installer", ">= 0.1.2")
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '4.0.1'
+TYPO_VERSION = '4.0.2'

data/public/javascripts/typo.js

@@ -45,8 +45,8 @@ function commentAdded(request) {
   Element.cleanWhitespace('commentList');
   new Effect.BlindDown($('commentList').lastChild);
   if ($('dummy_comment')) { Element.remove('dummy_comment'); }
-  $('commentform').elements[3].value = '';
-  $('commentform').elements[3].focus();
+  $('commentform').elements["comment_body"].value = '';
+  $('commentform').elements["comment_body"].focus();
 }
 
 function failure(request) {

data/test/mocks/themes/azure/layouts/default.rhtml

@@ -16,7 +16,7 @@
           <h2 id="subtitle"><%= this_blog.blog_subtitle %></h2>
         </div>
       </div>
-      
+
       <div id="search"> <%= render :partial => "shared/search" %></div>
       <% benchmark "BENCHMARK: layout/content" do %>
 
@@ -27,12 +27,12 @@
         </div>
         <% end %>
         <div id="sidebar">
-          
+
             <div id="search-results"></div>
             <% benchmark "BENCHMARK: layout/sidebars" do %>
               <%= render_sidebars %>
             <% end %>
-            
+
             <%= link_to image_tag("powered.gif"),  "http://www.typosphere.org/", {:class => "powered" } %>
             </div>
 

data/themes/azure/layouts/default.rhtml

@@ -16,7 +16,7 @@
           <h2 id="subtitle"><%= this_blog.blog_subtitle %></h2>
         </div>
       </div>
-      
+
       <div id="search"> <%= render :partial => "shared/search" %></div>
       <% benchmark "BENCHMARK: layout/content" do %>
 
@@ -27,12 +27,12 @@
         </div>
         <% end %>
         <div id="sidebar">
-          
+
             <div id="search-results"></div>
             <% benchmark "BENCHMARK: layout/sidebars" do %>
               <%= render_sidebars %>
             <% end %>
-            
+
             <%= link_to image_tag("powered.gif"),  "http://www.typosphere.org/", {:class => "powered" } %>
             </div>
 
@@ -41,7 +41,7 @@
       <div id="footer">
         <ul>
           <li><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0</a></li>
-          <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=<%= server_url_for :controller => 'articles' %>">Valid CSS</a></li>
+          <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=<%= server_url_for :controller => '/' %>">Valid CSS</a></li>
         </ul>
       </div>
   </div>

data/themes/scribbish/views/articles/read.rhtml

@@ -5,9 +5,9 @@
   xmlns:dc="http://purl.org/dc/elements/1.1/">
 <rdf:Description
   rdf:about=""
-  trackback:ping="<%= server_url_for :controller=>"articles", :action=>"trackback", :id=>@article %>"
+  trackback:ping="<%= server_url_for :controller=>"/articles", :action=>"trackback", :id=>@article %>"
   dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
-  dc:identifier="<%= server_url_for :controller=>"articles", :action=>"read", :id=>@article %>"
+  dc:identifier="<%= server_url_for :controller=>"/articles", :action=>"read", :id=>@article %>"
   dc:description="<%=h strip_html(article_html(@article)[0..255]).gsub(/-+/, '-') %>"
   dc:creator="<%= h @article.author %>"
   dc:date="<%= @article.updated_at.xmlschema %>" />
@@ -20,20 +20,20 @@
   <h5><a name="trackbacks">Trackbacks</a></h5>
   <p>
     Use the following link to trackback from your own site:<br />
-    <%= server_url_for :controller => 'articles', :action => 'trackback', :id => @article %>
-  </p>    
+    <%= server_url_for :controller => '/articles', :action => 'trackback', :id => @article %>
+  </p>
 
   <% unless @article.trackbacks.blank? -%>
   <ol id="trackbacks" class="trackbacks">
     <%= render(:partial => "trackback", :collection => @article.trackbacks) %>
-  </ol>  
-  <% end -%>  
+  </ol>
+  <% end -%>
 <% end -%>
 
 <% if @article.allow_comments? or @article.comments.size > 0 -%>
-  <h5><a name="comments">Comments</a></h5> 
+  <h5><a name="comments">Comments</a></h5>
   <p><a href="#commentform">Leave a response</a></p>
-  
+
   <div id="comments_div">
     <%= render :partial => "comment" %>
   </div>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 4.0.1
-date: 2006-08-09 00:00:00 -07:00
+  version: 4.0.2
+date: 2006-08-10 00:00:00 -07:00
 summary: Modern weblog engine.
 require_paths: 
 - .
@@ -29,6 +29,7 @@ post_install_message:
 authors: 
 - Tobias Luetke
 files: 
+- .DS_Store
 - app
 - bin
 - components
@@ -1013,7 +1014,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.5
+        version: 1.1.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -1049,5 +1050,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: