cheat 1.2.1 → 1.3.0

data/lib/ambition/test/types_test.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/helper'
+
+##
+# Once dynamically, once hardcoded
+context "Different types" do
+  types_hash = {
+    'string' => "'string'",
+    :symbol  => "'--- :symbol\n'",
+    1        => '1',
+    1.2      => '1.2',
+    nil      => 'NULL',
+    true     => '1',
+    false    => '0',
+    Time.now     => "'#{Time.now.to_s(:db)}'",
+    DateTime.now => "'#{DateTime.now.to_s(:db)}'",
+    Date.today   => "'#{Date.today.to_s(:db)}'"
+  }
+
+  types_hash.each do |type, translation|
+    specify "simple using #{type}" do
+      sql = User.select { |m| m.name == type }.to_sql
+      sql.should == "SELECT * FROM users WHERE users.`name` = #{translation}"
+    end
+  end
+
+  specify "float" do
+    sql = User.select { |m| m.name == 1.2 }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = 1.2"
+  end
+
+  specify "integer" do
+    sql = User.select { |m| m.name == 1 }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = 1"
+  end
+
+  specify "true" do
+    sql = User.select { |m| m.name == true }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = 1"
+  end
+
+  specify "false" do
+    sql = User.select { |m| m.name == false }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = 0"
+  end
+
+  specify "nil" do
+    sql = User.select { |m| m.name == nil }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = NULL"
+  end
+
+  xspecify "Time" do
+    # TODO: nothing but variables inside blocks for now
+    sql = User.select { |m| m.name == Time.now }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = NULL"
+  end
+end

data/lib/ambition/test/where_test.rb

@@ -0,0 +1,131 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Where (using select)" do
+  specify "simple ==" do
+    sql = User.select { |m| m.name == 'jon' }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = 'jon'"
+  end
+
+  specify "simple !=" do
+    sql = User.select { |m| m.name != 'jon' }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` <> 'jon'"
+  end
+
+  specify "simple == && ==" do
+    sql = User.select { |m| m.name == 'jon' && m.age == 21 }.to_sql
+    sql.should == "SELECT * FROM users WHERE (users.`name` = 'jon' AND users.`age` = 21)"
+  end
+
+  specify "simple == || ==" do
+    sql = User.select { |m| m.name == 'jon' || m.age == 21 }.to_sql
+    sql.should == "SELECT * FROM users WHERE (users.`name` = 'jon' OR users.`age` = 21)"
+  end
+
+  specify "mixed && and ||" do
+    sql = User.select { |m| m.name == 'jon' || m.age == 21 && m.password == 'pass' }.to_sql
+    sql.should == "SELECT * FROM users WHERE (users.`name` = 'jon' OR (users.`age` = 21 AND users.`password` = 'pass'))"
+  end
+
+  specify "grouped && and ||" do
+    sql = User.select { |m| (m.name == 'jon' || m.name == 'rick') && m.age == 21 }.to_sql
+    sql.should == "SELECT * FROM users WHERE ((users.`name` = 'jon' OR users.`name` = 'rick') AND users.`age` = 21)"
+  end
+
+  specify "simple >/<" do
+    sql = User.select { |m| m.age > 21 }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`age` > 21"
+
+    sql = User.select { |m| m.age < 21 }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`age` < 21"
+  end
+
+  specify "array.include? item" do
+    sql = User.select { |m| [1, 2, 3, 4].include? m.id }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`id` IN (1, 2, 3, 4)"
+  end
+
+  specify "simple == with variables" do
+    me = 'chris'
+    sql = User.select { |m| m.name == me }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = '#{me}'"
+  end
+
+  specify "simple == with method arguments" do
+    def test_it(name)
+      sql = User.select { |m| m.name == name }.to_sql
+      sql.should == "SELECT * FROM users WHERE users.`name` = '#{name}'"
+    end
+
+    test_it('chris')
+  end
+
+  specify "simple == with instance variables" do
+    @me = 'chris'
+    sql = User.select { |m| m.name == @me }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = '#{@me}'"
+  end
+
+  xspecify "simple == with instance variable method call" do
+    require 'ostruct'
+    @person = OpenStruct.new(:name => 'chris')
+
+    sql = User.select { |m| m.name == @person.name }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = '#{@person.name}'"
+  end
+
+  specify "simple == with global variables" do
+    $my_name = 'boston'
+    sql = User.select { |m| m.name == $my_name }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = '#{$my_name}'"
+  end
+
+  specify "simple == with method call" do
+    def band
+      'megadeth'
+    end
+
+    sql = User.select { |m| m.name == band }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = '#{band}'"
+  end
+
+  specify "simple =~ with string" do
+    sql = User.select { |m| m.name =~ 'chris' }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` LIKE 'chris'"
+
+    sql = User.select { |m| m.name =~ 'chri%' }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` LIKE 'chri%'"
+  end
+
+  specify "simple !~ with string" do
+    sql = User.select { |m| m.name !~ 'chris' }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` NOT LIKE 'chris'"
+
+    sql = User.select { |m| !(m.name =~ 'chris') }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` NOT LIKE 'chris'"
+  end
+
+  specify "simple =~ with regexp" do
+    sql = User.select { |m| m.name =~ /chris/ }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
+  end
+
+  xspecify "simple == with inline ruby" do
+    # TODO: implement this
+    sql = User.select { |m| m.created_at == 2.days.ago.to_s(:db) }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`created_at` = #{2.days.ago.to_s(:db)}"
+  end
+end
+
+context "Where (using detect)" do
+  specify "simple ==" do
+    conditions = { :conditions => "users.`name` = 'chris'", :limit => '1' }
+    User.expects(:find).with(:first, conditions)
+    User.detect { |m| m.name == 'chris' }
+  end
+
+  specify "nothing found" do
+    conditions = { :conditions => "users.`name` = 'chris'", :limit => '1' }
+    User.expects(:find).with(:first, conditions).returns(nil)
+    User.detect { |m| m.name == 'chris' }.should.be.nil
+  end
+end

data/lib/cheat.rb

@@ -1,5 +1,5 @@
-$:.unshift File.dirname(__FILE__)
-%w[rubygems tempfile fileutils net/http yaml open-uri wrap].each { |f| require f }
+%w( tempfile fileutils net/http yaml open-uri cheat/wrap ).each { |f| require f }
+RUBY_PLATFORM = PLATFORM unless defined? RUBY_PLATFORM   # Ruby 1.8 compatibility
 
 module Cheat
   extend self
@@ -19,10 +19,10 @@ module Cheat
 
     if %w[sheets all recent].include? @sheet
       uri = uri.sub('/y/', @sheet == 'recent' ? '/yr/' : '/ya/')
-      return open(uri) { |body| show(body.read) } 
+      return open(uri, headers) { |body| process(body.read) }
     end
 
-    return show(File.read(cache_file)) if File.exists?(cache_file) rescue clear_cache if cache_file 
+    return process(File.read(cache_file)) if File.exists?(cache_file) rescue clear_cache if cache_file 
 
     fetch_sheet(uri + @sheet) if @sheet
   end
@@ -30,7 +30,8 @@ module Cheat
   def fetch_sheet(uri, try_to_cache = true)
     open(uri, headers) do |body|
       sheet = body.read
-      File.open(cache_file, 'w') { |f| f.write(sheet) } if try_to_cache && cache_file && !@edit 
+      FileUtils.mkdir_p(cache_dir) unless File.exists?(cache_dir)
+      File.open(cache_file, 'w') { |f| f.write(sheet) } if try_to_cache && has_content(sheet) && cache_file && !@edit 
       @edit ? edit(sheet) : show(sheet)
     end 
     exit
@@ -53,10 +54,12 @@ module Cheat
     show_versions(args.first) if args.delete('--versions')
 
     add(args.shift) and return if args.delete('--add')
-    clear_cache if @edit = args.delete('--edit')
-
+    incoming_file = true if @edit = args.delete('--edit')
+    
+    @execute = true if args.delete("--execute") || args.delete("-x")
     @sheet = args.shift
 
+    clear_cache_file if incoming_file
     true
   end
 
@@ -76,6 +79,13 @@ module Cheat
     fetch_sheet(uri, false) 
   end
 
+  def has_content(sheet)
+    if sheet.is_a?(String)
+      return (sheet.length > 15) && !sheet[0,14].include?("Error!")
+    end
+    return true
+  end
+
   def cache_file
     "#{cache_dir}/#{@sheet}.yml" if cache_dir
   end
@@ -83,18 +93,46 @@ module Cheat
   def headers
     { 'User-Agent' => 'cheat!', 'Accept' => 'text/yaml' } 
   end
-
+  
   def cheat_uri
     "#{HOST}:#{PORT}#{SUFFIX}"
   end
 
+  def execute(sheet_yaml)
+    sheet_body = YAML.load(sheet_yaml).to_a.flatten.last
+    puts "\n  " + sheet_body.gsub("\r",'').gsub("\n", "\n  ").wrap
+    puts "\nWould you like to execute the above sheet? (Y/N)"
+    answer = STDIN.gets
+    case answer.chomp
+    when "Y" then system YAML.load(sheet_yaml).to_a.flatten.last
+    when "N" then puts "Not executing sheet."
+    else
+      puts "Must be Y or N!"
+    end
+  rescue Errno::EPIPE
+    # do nothing
+  rescue
+    puts "That didn't work.  Maybe try `$ cheat cheat' for help?" # Fix Emacs ruby-mode highlighting bug: `"
+  end
+
+  def process(sheet_yaml)
+    if @execute
+      execute(sheet_yaml)
+    else
+      show(sheet_yaml)
+    end
+  end
+
   def show(sheet_yaml)
     sheet = YAML.load(sheet_yaml).to_a.first
     sheet[-1] = sheet.last.join("\n") if sheet[-1].is_a?(Array)
+    run_pager
     puts sheet.first + ':'
     puts '  ' + sheet.last.gsub("\r",'').gsub("\n", "\n  ").wrap
+  rescue Errno::EPIPE
+    # do nothing
   rescue
-    puts "That didn't work.  Maybe try `$ cheat cheat' for help?"
+    puts "That didn't work.  Maybe try `$ cheat cheat' for help?" # Fix Emacs ruby-mode highlighting bug: `"
   end
 
   def edit(sheet_yaml)
@@ -138,7 +176,7 @@ module Cheat
       puts "Here's what you wrote, so it isn't lost in the void:" 
       puts text
     else
-      puts "Success!  Try it!", "$ cheat #{title} --new"
+      puts "Success!  Try it!", "$ cheat #{title}"
     end
   end
 
@@ -147,7 +185,7 @@ module Cheat
   end
 
   def cache_dir
-    PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".cheat")
+    RUBY_PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".cheat")
   end
 
   def win32_cache_dir
@@ -163,6 +201,38 @@ module Cheat
   def clear_cache
     FileUtils.rm_rf(cache_dir) if cache_dir
   end
+
+  def clear_cache_file
+    FileUtils.rm(cache_file) if File.exists?(cache_file) 
+  end
+
+  def run_pager
+    return if RUBY_PLATFORM =~ /win32/
+    return unless STDOUT.tty?
+
+    read, write = IO.pipe
+
+    unless Kernel.fork # Child process
+      STDOUT.reopen(write)
+      STDERR.reopen(write) if STDERR.tty?
+      read.close
+      write.close
+      return
+    end
+
+    # Parent process, become pager
+    STDIN.reopen(read)
+    read.close
+    write.close
+
+    ENV['LESS'] = 'FSRX' # Don't page if the input is short enough
+
+    # wait until we have input before we start the pager
+    Kernel.select [STDIN]
+    pager = ENV['PAGER'] || 'less'
+    exec pager rescue exec "/bin/sh", "-c", pager
+  rescue
+  end
 end
 
 Cheat.sheets(ARGV) if __FILE__ == $0

data/lib/{diffr.rb → cheat/diffr.rb}

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'diff/lcs'
 require 'diff/lcs/hunk'
 

data/lib/{responder.rb → cheat/responder.rb}

@@ -1,6 +1,6 @@
 # class Something < R 'route'
 #   include Responder
-#   
+#
 #   def get
 #    ... important code ...
 #
@@ -24,7 +24,7 @@ module Cheat::Controllers
       attr_reader :body, :content_type
       def initialize(accept) @accept = accept end
 
-      TYPES = { 
+      TYPES = {
         :yaml => %w[application/yaml text/yaml],
         :text => %w[text/plain],
         :html => %w[text/html */* application/html],
@@ -33,7 +33,7 @@ module Cheat::Controllers
 
       def method_missing(method, *args)
         if TYPES[method] && @accept =~ Regexp.union(*TYPES[method])
-          @content_type = TYPES[method].first 
+          @content_type = TYPES[method].first
           @body = yield if block_given?
         end
       end

data/lib/cheat/rv_harness.rb

@@ -0,0 +1,41 @@
+
+# Example mongrel harness for camping apps with rv
+#
+# author: Evan Weaver
+# url: http://blog.evanweaver.com/articles/2006/12/19/rv-a-tool-for-luxurious-camping
+# license: AFL 3.0
+
+require 'mongrel'
+require 'mongrel/camping'
+LOGFILE = 'mongrel.log'
+PIDFILE = 'mongrel.pid'
+
+# or whatever else you want passed in
+PORT = ARGV[0].to_i
+ADDR = ARGV[1]
+
+# this is your camping app
+require 'site'
+app = Cheat
+
+# custom database configuration
+app::Models::Base.establish_connection :adapter => 'mysql', :user => 'root', :database => 'camping', :host => 'localhost'
+
+app::Models::Base.logger = nil
+app::Models::Base.threaded_connections = false
+app.create
+
+config = Mongrel::Configurator.new :host => ADDR, :pid_file => PIDFILE do
+  listener :port => PORT do
+    uri '/', :handler => Mongrel::Camping::CampingHandler.new(app)
+    # use the mongrel static server in production instead of the camping controller
+    uri '/static/', :handler => Mongrel::DirHandler.new("static/")
+    uri '/favicon.ico', :handler => Mongrel::Error404Handler.new('')
+    setup_signals
+    run
+    write_pid_file
+    log "#{app} available at #{ADDR}:#{PORT}"
+    join
+  end
+end
+

data/lib/{site.rb → cheat/site.rb}

@@ -1,6 +1,6 @@
 #
 # According to Wikipedia, Cheat can refer to:
-#   Cheating, to take advantage of a situation by the breaking of accepted rules 
+#   Cheating, to take advantage of a situation by the breaking of accepted rules
 #     or standards
 #   Cheating (casino)
 #   Cheating in poker
@@ -10,30 +10,38 @@
 #   Cheating, parasitic abuse of symbiotic relationships
 #   The Cheat, a character in the cartoon series Homestar Runner
 #   Cheat!, a television show on the G4 network
-#   The Cheat, a 1915 Cecil B. DeMille movie about a wealthy and domineering 
+#   The Cheat, a 1915 Cecil B. DeMille movie about a wealthy and domineering
 #     Asian gentleman taking advantage of an American female
 #   Cheats, a 2002 comedy, starring Matthew Lawrence and Mary Tyler Moore
-#   Cheat, a song by The Clash from the UK version of their album The Clash 
+#   Cheat, a song by The Clash from the UK version of their album The Clash
 #   Bullshit, sometimes known as "Cheat," a card game
 #   An alternate term for defection in the prisoner's dilemma in game theory
-#   Cheat River, a tributary of the Monongahela River in Appalachia; the Cheat 
+#   Cheat River, a tributary of the Monongahela River in Appalachia; the Cheat
 #     starts in West Virginia, and flows westward
 #   Cheat Lake, a nearby resevoir
 #   Cheat Mountain, one of the highest mountains in the Alleghenies
 #
-%w[rubygems camping camping/db erb open-uri acts_as_versioned wrap diffr responder].each { |f| require f }
-require_gem 'camping', '>=1.4.152'
+%w[rubygems camping camping/db erb open-uri acts_as_versioned wrap diffr responder ambition].each { |f| require f }
+gem 'camping', '>=1.4.152'
 
 Camping.goes :Cheat
 
-URL  = ARGV.include?('debug') ? 'http://localhost:3001' : 'http://cheat.errtheblog.com' 
+# for defunkt. campistrano.
+if ARGV.include? '--update'
+  ssh = 'ssh deploy@errtheblog.com'
+  puts `#{ssh} 'cd /var/www/cheat; svn up'`
+  system "#{ssh} 'sudo /etc/init.d/rv restart'"
+  exit
+end
+
+URL  = ARGV.include?('debug') ? 'http://localhost:8020' : 'http://cheat.errtheblog.com'
 FEED = 'http://feeds.feedburner.com/cheatsheets' # rss feed
 
 module Cheat::Models
   class Sheet < Base
     validates_uniqueness_of :title
-    validates_format_of :title, :with => /^[a-z]+[a-z0-9_]*$/i
-    validates_presence_of :title, :body    
+    validates_format_of     :title, :with => /^[a-z]+[a-z0-9_]*$/i
+    validates_presence_of   :title, :body
     before_save { |r| r.title = r.title.gsub(' ', '_').underscore.downcase }
     acts_as_versioned
   end
@@ -62,7 +70,7 @@ module Cheat::Controllers
     def get(title)
       @headers['Content-Type'] = 'text/plain'
 
-      sheet = Sheet.find_by_title(title)
+      sheet = Sheet.detect { |s| s.title == title }
       return { 'Error!' => "Cheat sheet `#{title}' not found." }.to_yaml unless sheet
 
       return { sheet.title => sheet.body }.to_yaml
@@ -73,7 +81,8 @@ module Cheat::Controllers
     def get
       @headers['Content-Type'] = 'text/plain'
 
-      return { 'Recent Cheat Sheets' => Sheet.find(:all, :order => 'created_at DESC', :limit => 15).map(&:title) }.to_yaml
+      sheets = Sheet.sort_by { |s| -s.created_at }.first(15).map(&:title)
+      return { 'Recent Cheat Sheets' => sheets }.to_yaml
     end
   end
 
@@ -81,7 +90,8 @@ module Cheat::Controllers
     def get
       @headers['Content-Type'] = 'text/plain'
 
-      return { 'All Cheat Sheets' => Sheet.find(:all, :order => 'title ASC').map(&:title) }.to_yaml
+      sheets = Sheet.sort_by(&:title).map(&:title)
+      return { 'All Cheat Sheets' => sheets }.to_yaml
     end
   end
 
@@ -97,30 +107,30 @@ module Cheat::Controllers
       render :index
     end
   end
-  
+
   class Add < R '/a'
     def get
       @sheet = Sheet.new
       render :add
     end
   end
-  
+
   class Edit < R '/e/(\w+)/(\d+)', '/e/(\w+)'
     def get(title, version = nil)
-      @sheet = Sheet.find_by_title(title)
+      @sheet = Sheet.detect { |s| s.title == title }
+
       @error = "Cheat sheet not found." unless @sheet
-      unless version.nil? || version == @sheet.version.to_s        
+      unless version.nil? || version == @sheet.version.to_s
         @sheet = @sheet.find_version(version)
       end
       render @error ? :error : :edit
     end
   end
-  
+
   class Write < R '/w', '/w/(\w+)'
     def post(title = nil)
       @sheet = title ? Sheet.find_by_title(title) : Sheet.new
-  
-      @error = input.sheet_body =~ /<a\s*href=/
+      @sheet = title ? Sheet.detect { |s| s.title == title } : Sheet.new
 
       check_captcha! unless input.from_gem
 
@@ -137,21 +147,21 @@ module Cheat::Controllers
     end
 
     def captcha_pass?(session, answer)
-      open("http://captchator.ruby-forum.com/captcha/check_answer/#{session}/#{answer}").read.to_i.nonzero? rescue false
+      open("http://captchator.com/captcha/check_answer/#{session}/#{answer}").read.to_i.nonzero? rescue false
     end
   end
-  
+
   class Browse < R '/b'
     def get
-      @sheets = Sheet.find(:all, :order => 'title ASC')
+      @sheets = Sheet.sort_by(&:title)
       render :browse
     end
   end
-  
+
   class Show < R '/s/(\w+)', '/s/(\w+)/(\d+)'
     def get(title, version = nil)
-      @sheet = Sheet.find_by_title(title)
-      @sheet = @sheet.find_version(version) if version && @sheet    
+      @sheet = Sheet.detect { |s| s.title == title }
+      @sheet = @sheet.find_version(version) if version && @sheet
 
       @sheet ? render(:show) : redirect("#{URL}/b/")
     end
@@ -165,7 +175,7 @@ module Cheat::Controllers
     def get(title, old_version, new_version = nil)
       redirect "#{URL}/b/" and return unless old_version.to_i.nonzero?
 
-      @sheet = Sheet.find_by_title(title)
+      @sheet = Sheet.detect { |s| s.title == title }
       @old_sheet = @sheet.find_version(old_version)
       @new_sheet = (new_version ? @sheet.find_version(new_version) : @sheet)
 
@@ -182,11 +192,13 @@ module Cheat::Controllers
     include Responder
 
     def get(title)
-      @sheets = Sheet.find_by_title(title).find_versions(:order => 'version DESC')
+      if sheets = Sheet.detect { |s| s.title == title }
+        @sheets = sheets.find_versions(:order => 'version DESC')
+      end
 
       respond_to do |wants|
         wants.html { render :history }
-        wants.yaml { { @sheets.first.title => @sheets.map { |s| s.version } }.to_yaml }
+        wants.yaml { { @sheets.first.title => @sheets.map(&:version) }.to_yaml }
       end
     end
   end
@@ -202,26 +214,31 @@ module Cheat::Views
       }
       body {
         div.main {
-          div.header { 
-            h1 { logo_link 'cheat sheets.' } 
+          div.header {
+            h1 { logo_link 'cheat sheets.' }
             code.header @sheet_title ? "$ cheat #{@sheet_title}" : "$ command line ruby cheat sheets"
             }
-          div.content { self << yield }         
+          div.content { self << yield }
           div.side { _side }
-          div.clear { '' }          
+          div.clear { '' }
           div.footer { _footer }
         }
+        _clicky
       }
     }
   end
-  
+
+  def _clicky
+    text '<script src="http://getclicky.com/1070.js"> </script><noscript><img height=0 width=0 src="http://getclicky.com/1070ns.gif"></noscript>'
+  end
+
   def error
     @page_title = "error"
     p "An error:"
     code.version @error
     p ":("
   end
-  
+
   def show
     @page_title = @sheet.title
     @sheet_title = @sheet.title
@@ -236,27 +253,29 @@ module Cheat::Views
       text ". o 0 ( "
       if @sheet.version == current_sheet.version
         a "edit", :href => R(Edit, @sheet.title)
-        text " | "
       end
       if @sheet.version > 1
-        a "previous", :href => R(Show, @sheet.title, @sheet.version - 1)
         text " | "
+        a "previous", :href => R(Show, @sheet.title, @sheet.version - 1)
       end
+      text " | "
       a "history", :href => R(History, @sheet.title)
-      text " | "        
       unless @sheet.version == current_sheet.version
+        text " | "
         a "revert to", :href => R(Edit, @sheet.title, @sheet.version)
-        text " | "        
-        a "current", :href => R(Show, @sheet.title)
         text " | "
+        a "current", :href => R(Show, @sheet.title)
       end
-      diff_version = 
-        if @sheet.version == current_sheet.version 
+      diff_version =
+        if @sheet.version == current_sheet.version
           @sheet.version == 1 ? nil : @sheet.version - 1
         else
           @sheet.version
         end
-      a "diff", :href => R(Diff, @sheet.title, diff_version) if diff_version
+      if diff_version
+        text " | "
+        a "diff", :href => R(Diff, @sheet.title, diff_version)
+      end
       text " )"
      }
   end
@@ -264,7 +283,7 @@ module Cheat::Views
   def diff
     @page_title = @sheet.title
     @sheet_title = @sheet.title
-    pre.sheet { color_diff(@diffed) if @diffed }
+    pre.sheet { color_diff(h(@diffed)) if @diffed }
     div.version {
       text ". o 0 ("
       if @old_sheet.version > 1
@@ -277,9 +296,10 @@ module Cheat::Views
       text " )"
     }
   end
-  
+
   def browse
     @page_title = "browse"
+    p { "Wowzers, we've got <strong>#{@sheets.size}</strong> cheat sheets hereabouts." }
     ul {
       @sheets.each do |sheet|
         li { sheet_link sheet.title }
@@ -298,7 +318,7 @@ module Cheat::Views
     h2 @sheets.first.title
     ul {
       @sheets.each_with_index do |sheet, i|
-        li { 
+        li {
           a "version #{sheet.version}", :href => R(Show, sheet.title, sheet.version)
           text " - created "
           text last_updated(sheet)
@@ -310,7 +330,7 @@ module Cheat::Views
       end
     }
   end
-  
+
   def add
     @page_title = "add"
     p {
@@ -321,26 +341,26 @@ module Cheat::Views
      }
     _form
   end
-  
+
   def edit
     @page_title = "edit"
     _form
   end
-  
+
   def _form
     if @error
       p.error {
         strong "HEY!  "
-        text "Something is wrong!  You can't give your cheat sheet the same name 
-              as another, alphanumeric titles only, and you need to make sure 
+        text "Something is wrong!  You can't give your cheat sheet the same name
+              as another, alphanumeric titles only, and you need to make sure
               you filled in all (two) of the fields.  Okay?"
       }
     end
     form :method => 'post', :action => R(Write, @sheet.title) do
       p {
-        p { 
+        p {
           text 'Cheat Sheet Title: '
-          input :value => @sheet.title, :name => 'sheet_title', :size => 30, 
+          input :value => @sheet.title, :name => 'sheet_title', :size => 30,
                 :type => 'text'
           small " [ no_spaces_alphanumeric_only ]"
         }
@@ -351,13 +371,13 @@ module Cheat::Views
           unless @cookies[:passed]
             random = rand(10_000)
             br
-            img :src => "http://captchator.ruby-forum.com/captcha/image/#{random}"
+            img :src => "http://captchator.com/captcha/image/#{random}"
             input :name => 'chunky', :type => 'hidden', :value => random
             input :name => 'bacon', :size => 10, :type => 'text'
           end
         }
       }
-      p "Your cheat sheet will be editable (fixable) by anyone.  Each cheat 
+      p "Your cheat sheet will be editable (fixable) by anyone.  Each cheat
          sheet is essentially a wiki page.  It may also be used by millions of
          people for reference purposes from the comfort of their command line.
          If this is okay with you, please save."
@@ -369,22 +389,22 @@ module Cheat::Views
     p {
       text "Welcome.  You've reached the central repository for "
       strong "cheat"
-      text ", the RubyGem which puts Ruby-centric cheat sheets right into your 
+      text ", the RubyGem which puts Ruby-centric cheat sheets right into your
             terminal.  The inaugural blog entry "
       a "is here", :href => "http://errtheblog.com/post/23"
       text "."
     }
     p "Get started:"
-    code "$ sudo gem install cheat"
+    code "$ gem install cheat"
     br
     code "$ cheat strftime"
-    p "A magnificent cheat sheet for Ruby's strftime method will be printed to 
+    p "A magnificent cheat sheet for Ruby's strftime method will be printed to
        your terminal."
     p "To get some help on cheat itself:"
     code "$ cheat cheat"
     p "How meta."
     p {
-      text "Cheat sheets are basically wiki pages accessible from the command 
+      text "Cheat sheets are basically wiki pages accessible from the command
             line.  You can "
       a 'browse', :href => R(Browse)
       text ', '
@@ -393,13 +413,13 @@ module Cheat::Views
       a 'edit', :href => R(Edit, 'cheat')
       text ' cheat sheets.  Try to keep them concise.  For a style guide, check
             out the '
-      a 'cheat', :href => R(Edit, 'cheat')            
+      a 'cheat', :href => R(Edit, 'cheat')
       text ' cheat sheet.'
     }
-    p "To access a cheat sheet, simply pass the program the desired sheet's 
+    p "To access a cheat sheet, simply pass the program the desired sheet's
        name:"
     code "$ cheat <sheet name>"
-    p 
+    p
   end
 
   def self.feed
@@ -412,7 +432,7 @@ module Cheat::Views
       xml.id URL + '/'
       xml.link "rel" => "self", "href" => FEED
 
-      sheets = Cheat::Models::Sheet.find(:all, :order => 'updated_at DESC', :limit => 20)
+      sheets = Cheat::Models::Sheet.sort_by { |s| -s.updated_at }.first(20)
       xml.updated sheets.first.updated_at.xmlschema
 
       sheets.each do |sheet|
@@ -423,14 +443,14 @@ module Cheat::Views
           xml.updated sheet.updated_at.xmlschema
           xml.link "rel" => "alternate", "href" => URL + '/s/' + sheet.title
           xml.summary "A cheat sheet about #{sheet.title}.  Run it: `$ cheat #{sheet.title}'"
-          xml.content 'type' => 'html' do 
-            xml.text! sheet.body.gsub("\n", '<br/>').gsub("\r", '') 
+          xml.content 'type' => 'html' do
+            xml.text! sheet.body.gsub("\n", '<br/>').gsub("\r", '')
           end
         end
-      end   
+      end
     end
   end
-  
+
   def _side
     text '( '
     a 'add new', :href => R(Add)
@@ -441,7 +461,7 @@ module Cheat::Views
       li { strong "updated sheets" }
       li do
         a :href => FEED do
-          img(:border => 0, :alt => "Recently Updated Cheat Sheets Feed", :src => "http://errtheblog.com/images/theme/feed.png")
+          img(:border => 0, :alt => "Recently Updated Cheat Sheets Feed", :src => "http://errtheblog.com/images/feed.png")
         end
       end
       recent_sheets.each do |sheet|
@@ -449,13 +469,13 @@ module Cheat::Views
       end
     }
   end
-  
+
   def _footer
     text "Powered by "
     a 'Camping', :href => "http://code.whytheluckystiff.net/camping"
     text ", "
-    a 'Mongrel', :href => "http://mongrel.rubyforge.org/"            
-    text " and, to a lesser extent, " 
+    a 'Mongrel', :href => "http://mongrel.rubyforge.org/"
+    text " and, to a lesser extent, "
     a 'Err the Blog', :href => "http://errtheblog.com/"
     text "."
   end
@@ -465,24 +485,24 @@ module Cheat::Views
     h1    = "#4fa3da"
     link  = h1
     hover = "#f65077"
-    dash  = hover    
+    dash  = hover
     version = "#fcf095"
     style :type => "text/css" do
       text %[
         body { font-family: verdana, sans-serif; background-color: #{bg};
                line-height: 20px; }
-        a:link, a:visited { color: #{link}; }                
+        a:link, a:visited { color: #{link}; }
         a:hover { text-decoration: none; color: #{hover}; }
-        div.header { border-bottom: 1px dashed #{dash}; } 
-        code.header { margin-left: 30px; font-weight: bold; 
-                      background-color: #{version}; }       
-        h1 { font-size: 5em; margin: 0; padding-left: 30px; color: #{h1}; 
+        div.header { border-bottom: 1px dashed #{dash}; }
+        code.header { margin-left: 30px; font-weight: bold;
+                      background-color: #{version}; }
+        h1 { font-size: 5em; margin: 0; padding-left: 30px; color: #{h1};
              clear: both; font-weight: bold; letter-spacing: -5px; }
         h1 a { text-decoration: none; }
         div.main    { float: left; width: 100%; }
         div.content { float: left; width: 70%; padding: 15px 0 15px 30px;
                       line-height: 20px; }
-        div.side    { float: left; padding: 10px; text-align: right; 
+        div.side    { float: left; padding: 10px; text-align: right;
                       width: 20%; }
         div.footer  { text-align: center; border-top: 1px dashed #{dash};
                       padding-top: 10px; font-size: small; }
@@ -490,9 +510,9 @@ module Cheat::Views
                     font-family: courier, fixed-width; background-color: #e8e8e8; }
         pre.sheet { line-height: 15px; }
         li { list-style: none; }
-        div.version { background-color: #{version}; padding: 5px; 
+        div.version { background-color: #{version}; padding: 5px;
                        width: 450px; margin-top: 50px; }
-        p.error { background-color: #{version}; padding: 5px; }               
+        p.error { background-color: #{version}; padding: 5px; }
         div.clear    { clear: both; }
         div.clear_10 { clear: both; font-size: 10px; line-height: 10px; }
         textarea { font-family: courier; }
@@ -520,19 +540,20 @@ module Cheat::Helpers
       a title, :href => R(ctr::Index)
     end
   end
-  
+
   def current_sheet
-    @current_sheet ||= Cheat::Models::Sheet.find_by_title(@sheet.title)
+    title = @sheet.title
+    @current_sheet ||= Cheat::Models::Sheet.detect { |s| s.title == title }
   end
-  
+
   def recent_sheets
-    Cheat::Models::Sheet.find(:all, :order => 'updated_at DESC', :limit => 15)
+    Cheat::Models::Sheet.sort_by { |s| -s.updated_at }.first(15)
   end
-  
+
   def sheet_link(title, version = nil)
     a title, :href => R(Cheat::Controllers::Show, title, version)
   end
-  
+
   def last_updated(sheet)
     from = sheet.updated_at.to_i
     to = Time.now.to_i
@@ -540,12 +561,12 @@ module Cheat::Helpers
     to = to.to_time if to.respond_to?(:to_time)
     distance = (((to - from).abs)/60).round
     case distance
-      when 0..1      : return (distance==0) ? 'less than a minute' : '1 minute'
-      when 2..45     : "#{distance} minutes"
-      when 46..90    : 'about 1 hour'
-      when 90..1440  : "about #{(distance.to_f / 60.0).round} hours"
-      when 1441..2880: '1 day'
-      else             "#{(distance / 1440).round} days"
+      when 0..1       then return (distance==0) ? 'less than a minute' : '1 minute'
+      when 2..45      then "#{distance} minutes"
+      when 46..90     then 'about 1 hour'
+      when 90..1440   then "about #{(distance.to_f / 60.0).round} hours"
+      when 1441..2880 then '1 day'
+      else                 "#{(distance / 1440).round} days"
     end
   end
 
@@ -584,7 +605,7 @@ if __FILE__ == $0
   Cheat::Models::Base.threaded_connections = false
   Cheat.create
 
-  server = Mongrel::Camping.start("0.0.0.0", 3001, "/", Cheat)
-  puts "** Cheat is running at http://0.0.0.0:3001/"
+  server = Mongrel::Camping.start("0.0.0.0", 8020, "/", Cheat)
+  puts "** Cheat is running at http://0.0.0.0:8020/"
   server.run.join
 end