typo 3.99.3 → 3.99.4

data/test/functional/admin/feedback_controller_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'admin/feedback_controller'
+
+# Re-raise errors caught by the controller.
+class Admin::FeedbackController; def rescue_action(e) raise e end; end
+
+class Admin::FeedbackControllerTest < Test::Unit::TestCase
+  fixtures :contents, :users, :resources, :text_filters,
+           :blogs, :articles_categories
+
+  def setup
+    @controller = Admin::FeedbackController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session = { :user => users(:tobi) }
+  end
+
+  def test_index
+    get :index
+    
+    assert_success
+    assert_rendered_file 'list'
+  end
+end

data/test/mocks/test/http_mock.rb

@@ -9,7 +9,8 @@ module Net
   end
 
   class Net::HTTP
-
+    def initialize(*args)
+    end
 
     def self.start(host, port)
       request = Request.new

data/test/unit/article_test.rb

@@ -119,6 +119,12 @@ class ArticleTest < Test::Unit::TestCase
 
     assert_kind_of Article,b
     assert_equal 0, b.tags.size
+    
+    c = Article.new(:title => 'Foo', :keywords => 'test "tag test" web2.0')
+    c.keywords_to_tags
+    
+    assert_equal 3, c.tags.size
+    assert_equal ['test', 'tagtest', 'web2.0'].sort, c.tags.collect(&:name).sort
   end
 
   def test_find_published_by_tag_name

data/test/unit/comment_test.rb

@@ -33,10 +33,7 @@ class CommentTest < Test::Unit::TestCase
     c.url = "http://buy-computer.us"
     c.ip = "212.42.230.206"
 
-    assert ! c.save
-    assert c.errors.invalid?('body')
-    assert c.errors.invalid?('url')
-    assert c.errors.invalid?('ip')
+    assert_equal true, c.is_spam?
   end
 
   def test_not_spam_but_rbl_lookup_succeeds
@@ -46,7 +43,7 @@ class CommentTest < Test::Unit::TestCase
     c.url    = "http://www.bofh.org.uk"
     c.ip     = "10.10.10.10"
 
-    assert c.save
+    assert_equal false, c.is_spam?
   end
 
   def test_reject_spam_pattern
@@ -55,8 +52,7 @@ class CommentTest < Test::Unit::TestCase
     c.body = "Texas hold-em poker crap"
     c.url = "http://texas.hold-em.us"
 
-    assert ! c.save
-    assert c.errors.invalid?('body')
+    assert_equal true, c.is_spam?
   end
 
   def test_reject_spam_uri_limit
@@ -66,8 +62,7 @@ class CommentTest < Test::Unit::TestCase
     c.url = "http://www.uri-limit.com"
     c.ip = "123.123.123.123"
 
-    assert ! c.save
-    assert c.errors.invalid?('body')
+    assert_equal true, c.is_spam?
   end
 
   def test_reject_article_age
@@ -114,4 +109,12 @@ class CommentTest < Test::Unit::TestCase
       assert c.body_html !~ /<script>/
     end
   end
+
+  def test_withdraw
+    c = Comment.find(contents(:comment2).id)
+    assert c.withdraw!
+    assert ! c.published?
+    assert c.reload
+    assert ! c.published?
+  end
 end

data/test/unit/ping_test.rb

@@ -77,7 +77,7 @@ class PingTest < Test::Unit::TestCase
     assert_equal "anotherblog.org", ping.host
     assert_equal 80, ping.port
     assert_equal "/a-post/trackback", ping.query
-    assert_equal "title=Article%201!&excerpt=body&url=http://myblog.net/referring-post&blog_name=test%20blog", ping.post_data
+    assert_equal "title=Article+1%21&excerpt=body&url=http://myblog.net/referring-post&blog_name=test+blog", ping.post_data
   end
 
   def test_send_weblogupdatesping

data/test/unit/trackback_test.rb

@@ -18,6 +18,7 @@ class TrackbackTest < Test::Unit::TestCase
     assert tb.save
     assert tb.errors.empty?
     assert tb.guid.size > 15
+    assert_equal false, tb.is_spam?
   end
 
   def test_reject_spam_rbl
@@ -28,9 +29,7 @@ class TrackbackTest < Test::Unit::TestCase
     tb.url = "http://buy-computer.us"
     tb.ip = "212.42.230.206"
 
-    assert ! tb.save
-    assert tb.errors.invalid?('excerpt')
-    assert tb.errors.invalid?('url')
+    assert_equal true, tb.is_spam?
   end
 
   def test_reject_spam_pattern
@@ -39,7 +38,6 @@ class TrackbackTest < Test::Unit::TestCase
     tb.title = "Spammy trackback"
     tb.excerpt = "Texas hold-em poker crap"
 
-    assert ! tb.save
-    assert tb.errors.invalid?('excerpt')
+    assert_equal true, tb.is_spam?
   end
 end

data/themes/azure/stylesheets/azure.css

@@ -181,6 +181,13 @@ body {
   	float: right;
   	padding: 0 5px;
   	}
+
+  .spamwarning {
+	margin: 0.5em;
+	background: red;
+	font-weight: bold;
+	font-style: italic;
+  }
  /*+-------------------------------------------+
   |   			SIDEBAR 						               |
   +-------------------------------------------+*/

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

@@ -6,7 +6,7 @@
 
   <p class="author">
     Posted by <cite><%= author_link(article) %></cite>
-    <abbr class="published" title="<%= article.created_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.created_at %></abbr>
+    <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
   </p>
 
   <div class="content">

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

@@ -11,7 +11,7 @@
   <p>
     <label>Name:<br /> 
       <%= text_field "comment", "author" %>
-      <small>(<%= link_to_function("leave url/email &#187;", "new Effect.toggle('extra_fields', 'blind', {duration: .3})") %></small>)
+      <small>(<%= link_to_function("leave url/email &#187;", "new Effect.toggle('extra_fields', 'blind', {duration: .3})") %>)</small>
     </label>
   </p>
   

data/vendor/akismet/Akismet.rb

@@ -3,13 +3,16 @@
 # Author:: David Czarnecki
 # Copyright:: Copyright (c) 2005 - David Czarnecki
 # License:: BSD
+#
+# Heavily modified for Typo by Scott Laird
+#
 class Akismet
 
-  require 'net/HTTP'
+  require 'net/http'
   require 'uri'
   
   STANDARD_HEADERS = {
-    'User-Agent' => 'Akismet Ruby API/1.0',
+    'User-Agent' => "Typo/#{TYPO_VERSION} | Akismet Ruby API/1.0",
     'Content-Type' => 'application/x-www-form-urlencoded'
   }
   
@@ -83,19 +86,35 @@ class Akismet
   #    The content that was submitted.
   # Other server enviroment variables
   #    In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible.  
-  def callAkismet(akismet_function, user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+  #options[:user_ip] = user_ip
+  #options[:user_agent] = user_agent
+  #options[:referrer] = referrer
+  #options[:permalink] = permalink
+  #options[:comment_type] = comment_type
+  #options[:comment_author] = comment_author
+  #options[:comment_author_email] = comment_author_email
+  #options[:comment_author_url] = comment_author_url
+  #options[:comment_content] = comment_content
+  
+  def callAkismet(akismet_function, options = {})
     http = Net::HTTP.new("#{@apiKey}.rest.akismet.com", 80, @proxyHost, @proxyPort)
-    path = "/1.1/#{akismet_function}"        
+    path = "/1.1/#{akismet_function}"
+    
+    options[:blog] = @blog
+    params=[]
     
-    data = "user_ip=#{user_ip}&user_agent=#{user_agent}&referrer=#{referrer}&permalink=#{permalink}&comment_type=#{comment_type}&comment_author=#{comment_author}&comment_author_email=#{comment_author_email}&comment_author_url=#{comment_author_url}&comment_content=#{comment_content}"
-    if (other != nil) 
-      other.each_pair {|key, value| data.concat("&#{key}=#{value}")}
+    options.each_key do |key|
+      params.push "#{key}=#{CGI.escape(options[key].to_s)}"
     end
-    data = URI.escape(data)
-            
+    
+    data = params.join('&')
     resp, data = http.post(path, data, STANDARD_HEADERS)
-        
-    return (data != "false")
+    
+    unless data == 'true' or data == 'false' or data == ''
+      STDERR.puts "AKISMET error: #{data}"
+    end
+
+    return (data == "true" or data == '')
   end
   
   protected :callAkismet
@@ -122,19 +141,19 @@ class Akismet
   #    The content that was submitted.
   # Other server enviroment variables
   #    In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible.
-  def commentCheck(user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
-    return callAkismet('comment-check', user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+  def commentCheck(options = {})
+    return callAkismet('comment-check', options)
   end
   
   # This call is for submitting comments that weren't marked as spam but should have been. It takes identical arguments as comment check.
   # The call parameters are the same as for the #commentCheck method.
-  def submitSpam(user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
-    callAkismet('submit-spam', user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+  def submitSpam(options = {})
+    callAkismet('submit-spam', options)
   end
   
   # This call is intended for the marking of false positives, things that were incorrectly marked as spam. It takes identical arguments as comment check and submit spam.
   # The call parameters are the same as for the #commentCheck method.
-  def submitHam(user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
-    callAkismet('submit-ham', user_ip, user_agent, referrer, permalink, comment_type, comment_author, comment_author_email, comment_author_url, comment_content, other)
+  def submitHam(options = {})
+    callAkismet('submit-ham', options)
   end
 end

data/vendor/plugins/expiring_action_cache/lib/actionparamcache.rb

@@ -79,6 +79,7 @@ module ActionController
             cached_time = meta[:cached_at] rescue nil
             controller.response.headers['Cache-Control'] = 'max-age=1'
             controller.response.headers['Last-Modified'] = meta[:cached_at].httpdate rescue nil
+            controller.response.headers['Content-Type'] = meta[:content_type]
                         
             if request_time and cached_time <= (request_time + 1)
               controller.render(:text => "", :status => 304)
@@ -94,7 +95,7 @@ module ActionController
         end
 
         def after(controller)
-          return true if not @actions.include?(controller.action_name.intern) || controller.rendered_action_cache
+          return true if !@actions.include?(controller.action_name.intern) || controller.rendered_action_cache
           return true if controller.response.headers['Status'] != "200 OK" # without this, we cache errors.  grr
 
           meta = Hash.new
@@ -102,6 +103,7 @@ module ActionController
             meta[:expires] = Time.now + controller.response.lifetime
           end
           meta[:cached_at] = Time.now.utc
+          meta[:content_type] = controller.response.headers['Content-Type']
           controller.response.headers['Cache-Control'] = 'max-age=1'
           controller.response.headers['Last-Modified'] = meta[:cached_at].httpdate
           controller.write_meta_fragment(cache_key(controller), meta, controller.response.body)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 3.99.3
-date: 2006-07-09 00:00:00 -07:00
+  version: 3.99.4
+date: 2006-07-21 00:00:00 -07:00
 summary: Modern weblog engine.
 require_paths: 
 - .
@@ -76,6 +76,7 @@ files:
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/comments_controller.rb
 - app/controllers/admin/content_controller.rb
+- app/controllers/admin/feedback_controller.rb
 - app/controllers/admin/general_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/admin/resources_controller.rb
@@ -103,6 +104,7 @@ files:
 - app/helpers/admin/cache_helper.rb
 - app/helpers/admin/comments_helper.rb
 - app/helpers/admin/content_helper.rb
+- app/helpers/admin/feedback_helper.rb
 - app/helpers/admin/general_helper.rb
 - app/helpers/admin/pages_helper.rb
 - app/helpers/admin/resources_helper.rb
@@ -180,6 +182,7 @@ files:
 - app/views/admin/categories
 - app/views/admin/comments
 - app/views/admin/content
+- app/views/admin/feedback
 - app/views/admin/general
 - app/views/admin/pages
 - app/views/admin/resources
@@ -225,6 +228,8 @@ files:
 - app/views/admin/content/new.rhtml
 - app/views/admin/content/preview.rhtml
 - app/views/admin/content/show.rhtml
+- app/views/admin/feedback/_item.rhtml
+- app/views/admin/feedback/list.rhtml
 - app/views/admin/general/index.rhtml
 - app/views/admin/general/update_database.rhtml
 - app/views/admin/pages/_form.rhtml
@@ -413,6 +418,7 @@ files:
 - config/lighttpd.conf
 - config/mail.yml
 - config/mail.yml.example
+- config/mongrel.conf
 - config/routes.rb
 - config/environments/development.rb
 - config/environments/production.rb
@@ -437,6 +443,7 @@ files:
 - db/converters/s9y.rb
 - db/converters/textpattern.rb
 - db/converters/wordpress.rb
+- db/converters/wordpress2.rb
 - db/migrate/001_initial_schema.rb
 - db/migrate/002_add_user_email.rb
 - db/migrate/003_add_article_user_id.rb
@@ -487,6 +494,7 @@ files:
 - db/updates/update.168.to.200.mysql.sql
 - db/updates/update.168.to.200.psql.sql
 - doc/Installer.txt
+- doc/typo-4.0-release-notes.txt
 - installer/apache13.conf.example.template
 - installer/apache20.conf.example.template
 - installer/lighttpd.conf.example.template
@@ -494,7 +502,6 @@ files:
 - installer/rails-installer.rb
 - installer/rails_installer_defaults.yml
 - installer/rails-installer/commands.rb
-- installer/rails-installer/web-server.rb
 - installer/rails-installer/web-servers.rb
 - lib/backpack_api.rb
 - lib/bare_migration.rb
@@ -655,6 +662,7 @@ files:
 - test/functional/admin/categories_controller_test.rb
 - test/functional/admin/comments_controller_test.rb
 - test/functional/admin/content_controller_test.rb
+- test/functional/admin/feedback_controller_test.rb
 - test/functional/admin/general_controller_test.rb
 - test/functional/admin/pages_controller_test.rb
 - test/functional/admin/resources_controller_test.rb
@@ -766,45 +774,6 @@ files:
 - tmp/cache
 - tmp/sessions
 - tmp/sockets
-- tmp/cache/META
-- tmp/cache/META/DATA
-- tmp/cache/META/META
-- tmp/cache/META/DATA/ACTION_PARAM
-- tmp/cache/META/DATA/ACTION_PARAM/10.1.0.181
-- tmp/cache/META/DATA/ACTION_PARAM/localhost
-- tmp/cache/META/DATA/ACTION_PARAM/localhost.3000
-- tmp/cache/META/DATA/ACTION_PARAM/10.1.0.181/articles
-- tmp/cache/META/DATA/ACTION_PARAM/10.1.0.181/articles/index
-- tmp/cache/META/DATA/ACTION_PARAM/10.1.0.181/articles/index/.cache
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/articles
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/xml
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/articles/index
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/articles/index/.cache
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/xml/feed
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/xml/feed/format=atom&type=feed.cache
-- tmp/cache/META/DATA/ACTION_PARAM/localhost/xml/feed/format=rss20&type=feed.cache
-- tmp/cache/META/DATA/ACTION_PARAM/localhost.3000/articles
-- tmp/cache/META/DATA/ACTION_PARAM/localhost.3000/articles/find_by_date
-- tmp/cache/META/DATA/ACTION_PARAM/localhost.3000/articles/index
-- tmp/cache/META/DATA/ACTION_PARAM/localhost.3000/articles/read
-- tmp/cache/META/META/ACTION_PARAM
-- tmp/cache/META/META/ACTION_PARAM/10.1.0.181
-- tmp/cache/META/META/ACTION_PARAM/localhost
-- tmp/cache/META/META/ACTION_PARAM/localhost.3000
-- tmp/cache/META/META/ACTION_PARAM/10.1.0.181/articles
-- tmp/cache/META/META/ACTION_PARAM/10.1.0.181/articles/index
-- tmp/cache/META/META/ACTION_PARAM/10.1.0.181/articles/index/.cache
-- tmp/cache/META/META/ACTION_PARAM/localhost/articles
-- tmp/cache/META/META/ACTION_PARAM/localhost/xml
-- tmp/cache/META/META/ACTION_PARAM/localhost/articles/index
-- tmp/cache/META/META/ACTION_PARAM/localhost/articles/index/.cache
-- tmp/cache/META/META/ACTION_PARAM/localhost/xml/feed
-- tmp/cache/META/META/ACTION_PARAM/localhost/xml/feed/format=atom&type=feed.cache
-- tmp/cache/META/META/ACTION_PARAM/localhost/xml/feed/format=rss20&type=feed.cache
-- tmp/cache/META/META/ACTION_PARAM/localhost.3000/articles
-- tmp/cache/META/META/ACTION_PARAM/localhost.3000/articles/find_by_date
-- tmp/cache/META/META/ACTION_PARAM/localhost.3000/articles/index
-- tmp/cache/META/META/ACTION_PARAM/localhost.3000/articles/read
 - vendor/akismet
 - vendor/bluecloth
 - vendor/flickr

data/installer/rails-installer/web-server.rb

@@ -1,108 +0,0 @@
-class RailsInstaller
-  
-  # Parent class for webserver plugins for the installer.  To create a new 
-  # webserver handler, subclass this class and define a 'start' and 'stop'
-  # class method.
-  class WebServer
-    @@server_map = {}
-    
-    def self.start(installer, foreground)
-      raise "Not Implemented"
-    end
-  
-    def self.stop(installer, foreground)
-      raise "Not Implemented"
-    end
-
-    def self.inherited(sub)
-      name = sub.to_s.gsub(/^.*::/,'').gsub(/([A-Z])/) do |match|
-        "_#{match.downcase}"
-      end.gsub(/^_/,'')
-
-      @@server_map[name] = sub
-    end
-    
-    def self.servers
-      @@server_map
-    end
-
-    class Mongrel < RailsInstaller::WebServer
-      def self.start(installer, foreground)
-        args = {}
-        args['-p'] = installer.config['port-number']
-        args['-a'] = installer.config['bind-address']
-        args['-e'] = installer.config['rails-environment']
-        args['-d'] = foreground
-        args['-P'] = pid_file(installer)
-
-        # Remove keys with nil values
-        args.delete_if {|k,v| v==nil}
-
-        args_array = args.to_a.flatten.map {|e| e.to_s}
-        args_array = ['mongrel_rails', 'start', installer.install_directory] + args_array
-        installer.message "Starting #{installer.app_name.capitalize} on port #{installer.config['port-number']}"
-        in_directory installer.install_directory do
-          system(args_array.join(' '))
-        end
-      end
-  
-      def self.stop(installer)
-        args = {}
-        args['-P'] = pid_file(installer)
-
-        args_array = args.to_a.flatten.map {|e| e.to_s}
-        args_array = ['mongrel_rails', 'stop', installer.install_directory] + args_array
-        installer.message "Stopping #{installer.app_name.capitalize}"
-        in_directory installer.install_directory do
-          system(args_array.join(' '))
-        end
-        
-      end
-      
-      def self.pid_file(installer)
-        File.join(installer.install_directory,'tmp','pid.txt')
-      end
-    end
-    
-    class MongrelCluster < RailsInstaller::WebServer
-      def self.start(installer, foreground)
-        args = {}
-        args['-p'] = installer.config['port-number']
-        args['-a'] = installer.config['bind-address']
-        args['-e'] = installer.config['rails-environment']
-        args['-N'] = installer.config['threads']
-
-        # Remove keys with nil values
-        args.delete_if {|k,v| v==nil}
-
-        args_array = args.to_a.flatten.map {|e| e.to_s}
-        args_array = ['mongrel_rails', 'cluster::configure'] + args_array
-        installer.message "Configuring mongrel_cluster for #{installer.app_name.capitalize}"
-        in_directory installer.install_directory do
-          system(args_array.join(' '))
-        end
-        installer.message "Starting #{installer.app_name.capitalize} on port #{installer.config['port-number']}"
-        in_directory installer.install_directory do
-          system('mongrel_rails cluster::start')
-        end
-        
-      end
-  
-      def self.stop(installer)
-        installer.message "Stopping #{installer.app_name.capitalize}"
-        in_directory installer.install_directory do
-          system('mongrel_rails cluster::stop')
-        end
-      end
-    end
-
-    # Do-nothing webserver class.  Used when the installer doesn't control the web server.
-    class External < RailsInstaller::WebServer
-      def self.start(installer, foreground)
-      end
-      
-      def self.stop(installer)
-      end
-    end
-  end
-end