ramaze 2012.12.08b → 2012.12.08

data/README.md

@@ -104,6 +104,7 @@ table of contents isn't rendered. You can find all these files in the ``guide/``
 directory.
 
 * {file:general/installation Installation}
+* {file:general/upgrading Upgrading}
 * {file:general/principles Principles}
 * {file:general/special_thanks Special Thanks}
 * {file:general/contributing Contributing To Ramaze}

data/guide/AUTHORS

@@ -2,7 +2,7 @@ Following persons have contributed to ramaze.
 (Sorted by number of submitted patches, then alphabetically)
 
   2740 Michael Fellinger <m.fellinger@gmail.com>
-   231 Yorick Peterse <yorickpeterse@gmail.com>
+   238 Yorick Peterse <yorickpeterse@gmail.com>
    216 Aman Gupta <aman@ramaze.net>
     89 Jonathan Buch <jonathan.buch@gmail.com>
     77 Pistos <gitsomegrace.5.pistos@geoshell.com>

data/guide/CHANGELOG

@@ -1,3 +1,52 @@
+[679c415 | Sat Dec 08 18:16:36 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Added a note about upgrading.
+
+    [ci skip]
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[6191bdf | Sat Dec 08 17:35:15 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Disable syslog tests on jruby.
+
+    The Syslog tests can not be executed on jruby due to the use of Process.fork.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[5be0d61 | Sat Dec 08 17:27:21 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Enable syslog and disable localmemcache for jruby.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[d8fdd3d | Sat Dec 08 17:16:47 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Don't install C extensions for jruby.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[8c271b7 | Sat Dec 08 17:08:22 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Replaced hpricot with Nokogiri.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[c35a729 | Sat Dec 08 01:21:43 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Don't install localmemcache for jruby.
+
+    Localmemcache is a C extension and these don't work reliably on Jruby. C
+    extension support is also disabled on Travis CI.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[aad4e3e | Fri Dec 07 23:28:01 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Release 2012.12.08b
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
 [d94938b | Fri Dec 07 23:27:39 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
 
   * Switch back to dates for versions.

data/guide/general/upgrading.md

@@ -0,0 +1,85 @@
+# @title Upgrading
+# Upgrading
+
+Ramaze strives to be backwards compatible between each release. However, some
+releases may contain changes that are *not* backwards compatible. This document
+describes the steps required to upgrade between these releases.
+
+## Upgrading to Ramaze 2012.12.08
+
+Ramaze 2012.12.08 is **not** backwards compatible with previous releases due
+to changes made in Innate 2012.12.
+
+### Middleware
+
+In previous versions one could add Rack middleware using `Ramaze.middleware!`.
+This method has been renamed to `Ramaze.middleware` (without the `!`) and its
+use has been changed. Instead of calling `run Ramaze.middleware` one now has to
+use `run Ramaze.core`.
+
+An example of the old way of defining middleware:
+
+    Ramaze.middleware! :dev do |m|
+      m.use Rack::Lint
+      m.run Ramaze.middleware
+    end
+
+The new way of defining middleware:
+
+    Ramaze.middleware :dev do
+      use Rack::Lint
+      run Ramaze.core
+    end
+
+### Commands
+
+Various executable commands such as `ramaze start` and `ramaze console` have
+been removed in favour of the use of Rake tasks. For existing projects that do
+not have these Rake tasks you'll have to import them manually, new projects
+will have these tasks automatically. These tasks are located [here][rake
+tasks].
+
+These commands were removed as they contained a lot of old and rotting code
+without any tests. Some of them, such as `ramaze start` weren't very useful
+either as most people will use the commands for their webservers (e.g. Thin)
+instead. The use of Rake tasks also makes it possible for people to customize
+these to their liking.
+
+### Snippets
+
+Ramaze ships with various snippets that extend various core Ruby classes. In
+Ramaze 2012.12.08 a lot of these snippets have been removed. A list of all the
+removed snippets can be found [here][removed snippets].
+
+### Loggers
+
+The following logging classes are no longer available:
+
+* Ramaze::Logger::Growl
+* Ramaze::Logger::Analogger
+* Ramaze::Logger::Knotify
+* Ramaze::Logger::Xosd
+
+### Helpers
+
+The following helpers have been removed:
+
+* Ramaze::Helper::Disqus
+* Ramaze::Helper::Ultraviolet
+
+### Core classes
+
+The following core classes have been removed:
+
+* Ramaze::AppGraph
+* Ramaze::Plugin
+* Ramaze::MiddlewareCompiler (alias of Innate::MiddlewareCompiler)
+
+### Prototypes
+
+The prototype generated by `ramaze create` has been changed. It contains a set
+of Rake tasks, a README, a Gemfile and some other small changes compared to the
+previous prototype. Existing projects are not affected.
+
+[rake tasks]: https://github.com/Ramaze/ramaze/blob/master/lib/proto/task/ramaze.rake
+[removed snippets]: https://github.com/Ramaze/ramaze/commit/7e966dcdec50d490eb828f7673f101b1a6b087b3

data/lib/ramaze/version.rb

@@ -1,3 +1,3 @@
 module Ramaze
-  VERSION = '2012.12.08b'
+  VERSION = '2012.12.08'
 end

data/ramaze.gemspec

@@ -27,29 +27,34 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'erubis'
   s.add_development_dependency 'ezamar'
   s.add_development_dependency 'haml'
-  s.add_development_dependency 'hpricot'
   s.add_development_dependency 'liquid'
   s.add_development_dependency 'locale'
   s.add_development_dependency 'maruku'
   s.add_development_dependency 'mustache'
   s.add_development_dependency 'rack-contrib'
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'rdiscount'
   s.add_development_dependency 'redis'
   s.add_development_dependency 'sass'
   s.add_development_dependency 'sequel'
   s.add_development_dependency 'slim'
   s.add_development_dependency 'slippers'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'tagz'
   s.add_development_dependency 'tenjin'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'localmemcache'
 
   if RUBY_VERSION.to_f >= 1.9
     s.add_development_dependency 'lokar'
   end
 
+  # C extensions don't work reliably on jruby and Travis CI doesn't have them
+  # enabled.
+  if !RUBY_DESCRIPTION.include?('jruby')
+    s.add_development_dependency 'localmemcache'
+    s.add_development_dependency 'nokogiri'
+    s.add_development_dependency 'rdiscount'
+    s.add_development_dependency 'sqlite3'
+  end
+
   # Nagoro doesn't seem to work on Rbx
   if !RUBY_DESCRIPTION.include?('rubinius')
     s.add_development_dependency 'nagoro'

data/spec/ramaze/cache/sequel.rb

@@ -2,6 +2,8 @@
 # All files in this distribution are subject to the terms of the MIT license.
 
 require File.expand_path('../../../../spec/helper', __FILE__)
+
+spec_require 'sqlite3'
 spec_require 'sequel'
 
 DB = Sequel.sqlite(':memory:')

data/spec/ramaze/dispatcher/directory.rb

@@ -3,7 +3,7 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-spec_require 'hpricot'
+spec_require 'nokogiri'
 
 Ramaze.middleware(:spec) do
   run Rack::ETag.new(
@@ -38,23 +38,25 @@ describe 'Directory listing' do
 
   def check(url, title, list)
     got = get(url)
-    got.status.should == 200
+
+    got.status.should          == 200
     got['Content-Type'].should == 'text/html; charset=utf-8'
 
-    doc = Hpricot(got.body)
+    doc = Nokogiri::HTML(got.body)
+
     doc.at(:title).inner_text.should == title
 
-    (doc/'td.name/a').map{|a| [a[:href], a.inner_text] }.should == list
+    doc.css('td.name a').map{|a| [a[:href], a.inner_text] }.should == list
   end
 
   should 'dry serve root directory' do
-   files = [
-     ["../", "Parent Directory"],
-     ["/favicon.ico", "favicon.ico"],
-     ["/file+name.txt", "file name.txt"],
-     ["/test/", "test/"],
-     ["/test_download.css", "test_download.css"]
-   ]
+    files = [
+      ["../", "Parent Directory"],
+      ["/favicon.ico", "favicon.ico"],
+      ["/file+name.txt", "file name.txt"],
+      ["/test/", "test/"],
+      ["/test_download.css", "test_download.css"]
+    ]
 
     check '/', '/', files
   end
@@ -66,6 +68,7 @@ describe 'Directory listing' do
       ["/test/five.txt", "five.txt"],
       ["/test/six.txt", "six.txt"]
     ]
+
     check '/test', '/test', files
   end
 

data/spec/ramaze/helper/paginate.rb

@@ -2,7 +2,8 @@
 # All files in this distribution are subject to the terms of the MIT license.
 
 require File.expand_path('../../../../spec/helper', __FILE__)
-spec_require 'hpricot'
+
+spec_require 'nokogiri'
 
 class SpecHelperPaginateArray < Ramaze::Controller
   map '/array'
@@ -38,8 +39,9 @@ describe Ramaze::Helper::Paginate do
     behaves_like :rack_test
 
     it 'shows navigation for page 1' do
-      doc = Hpricot(get("/array/navigation").body)
-      (doc/:a).map{|a| [a.inner_text, a[:href]] }.
+      doc = Nokogiri::HTML(get("/array/navigation").body)
+
+      doc.css('a').map{|a| [a.inner_text, a[:href]] }.
         should == [
           ['1', '/array/navigation?pager=1'],
           ['2', '/array/navigation?pager=2'],
@@ -49,8 +51,9 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'shows navigation for page 2' do
-      doc = Hpricot(get("/array/navigation?pager=2").body)
-      (doc/:a).map{|a| [a.inner_text, a[:href]] }.
+      doc = Nokogiri::HTML(get("/array/navigation?pager=2").body)
+
+      doc.css('a').map{|a| [a.inner_text, a[:href]] }.
         should == [
           ['<<', '/array/navigation?pager=1'],
           ['<', '/array/navigation?pager=1'],
@@ -62,8 +65,8 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'shows navigation for page 3' do
-      doc = Hpricot(get("/array/navigation?pager=3").body)
-      (doc/:a).map{|a| [a.inner_text, a[:href]] }.
+      doc = Nokogiri::HTML(get("/array/navigation?pager=3").body)
+      doc.css('a').map{|a| [a.inner_text, a[:href]] }.
         should == [
           ['<<', '/array/navigation?pager=1'],
           ['<', '/array/navigation?pager=2'],
@@ -78,7 +81,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets default css elements on page 1' do
-      doc = Hpricot(get('/array/navigation').body)
+      doc = Nokogiri::HTML(get('/array/navigation').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the first page, the first two
       # elements are spans, then a's
@@ -109,7 +112,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets default css elements on page 2' do
-      doc = Hpricot(get('/array/navigation?pager=2').body)
+      doc = Nokogiri::HTML(get('/array/navigation?pager=2').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the second page, none are disabled
       # Note that this is only valid for the second page since
@@ -140,7 +143,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets default css elements on page 3' do
-      doc = Hpricot(get('/array/navigation?pager=3').body)
+      doc = Nokogiri::HTML(get('/array/navigation?pager=3').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the last page, last and next will be disabled
       # Note that this is only valid for the third page
@@ -173,7 +176,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets our custom css elements for page 1' do
-      doc = Hpricot(get('/array/custom_navigation').body)
+      doc = Nokogiri::HTML(get('/array/custom_navigation').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the first page, the first two
       # elements are spans, then a's
@@ -209,7 +212,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets our custom css elements on page 2' do
-      doc = Hpricot(get('/array/custom_navigation?pager=2').body)
+      doc = Nokogiri::HTML(get('/array/custom_navigation?pager=2').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the second page, none are disabled
       # Note that this is only valid for the second page since
@@ -240,7 +243,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets our custom css elements on page 3' do
-      doc = Hpricot(get('/array/custom_navigation?pager=3').body)
+      doc = Nokogiri::HTML(get('/array/custom_navigation?pager=3').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the last page, last and next will be disabled
       # Note that this is only valid for the third page

data/spec/ramaze/log/syslog.rb

@@ -4,9 +4,9 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-spec_precondition 'Syslog should be supported' do
+spec_precondition 'Process.fork should be supported' do
   if RUBY_DESCRIPTION.include?('jruby')
-    should.flunk 'Forking/Syslog is not supported'
+    should.flunk 'These tests use Process.fork which does not work on jruby'
   end
 end
 
@@ -14,70 +14,73 @@ require 'ramaze/log/syslog'
 
 describe 'Syslog' do
 
-	# close the syslog, if it was open for some reason before we
-	# start a test.
-	before do
-		if ( Syslog.opened? )
-			::Syslog.close
-		end
-	end
+  # close the syslog, if it was open for some reason before we
+  # start a test.
+  before do
+    Syslog.close if Syslog.opened?
+  end
+
+  it 'should default initialize correctly' do
+    syslog = Ramaze::Logger::Syslog.new
+    ::Syslog.opened?.should == true
+    ::Syslog.ident.should   == $0
+    ::Syslog.options.should == ( ::Syslog::LOG_PID | ::Syslog::LOG_CONS )
+    ::Syslog.facility.should == ::Syslog::LOG_USER
+  end
+
+  it 'should handle non default initialization' do
+    syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
+                                                   ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT,
+                                                   ::Syslog::LOG_DAEMON )
+    ::Syslog.opened?.should == true
+    ::Syslog.ident.should   == 'ramaze_syslog_test'
+    ::Syslog.options.should == ( ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT )
+    ::Syslog.facility.should == ::Syslog::LOG_DAEMON
+  end
 
-	it 'should default initialize correctly' do
-		syslog = Ramaze::Logger::Syslog.new
-		::Syslog.opened?.should == true
-		::Syslog.ident.should   == $0
-		::Syslog.options.should == ( ::Syslog::LOG_PID | ::Syslog::LOG_CONS )
-		::Syslog.facility.should == ::Syslog::LOG_USER
-	end
+  # We test the actual logging using a trick found in te test code of the
+  # syslog module.  We create a pipe, fork a child, reroute the childs
+  # stderr to the pipe. Then we open the logging using LOG_PERROR, so all
+  # log messages are written to stderror.  In the parent we read the messages
+  # from the pipe and compare them to what we expected.
+  def test_log_msg( type, priority, msg )
+    logpipe = IO::pipe
+    child = fork {
+      logpipe[0].close
+      STDERR.reopen(logpipe[1])
+      syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
+                                                    ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR,
+                              ::Syslog::LOG_USER )
+      syslog.send priority, msg
+      Process.exit!( 0 )
+    }
+    logpipe[1].close
+    Process.waitpid(child)
 
-	it 'should handle non default initialization' do
-		syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
-		                                               ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT,
-		                                               ::Syslog::LOG_DAEMON )
-		::Syslog.opened?.should == true
-		::Syslog.ident.should   == 'ramaze_syslog_test'
-		::Syslog.options.should == ( ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT )
-		::Syslog.facility.should == ::Syslog::LOG_DAEMON
-	end
+    logpipe[0].gets.should == "ramaze_syslog_test[#{child}]: #{msg}\n"
+  end
 
-    # We test the actual logging using a trick found in te test code of the
-    # syslog module.  We create a pipe, fork a child, reroute the childs
-    # stderr to the pipe. Then we open the logging using LOG_PERROR, so all
-    # log messages are written to stderror.  In the parent we read the messages
-    # from the pipe and compare them to what we expected.
-	def test_log_msg( type, priority, msg )
-		logpipe = IO::pipe
-		child = fork {
-			logpipe[0].close
-			STDERR.reopen(logpipe[1])
-			syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
-			                                              ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR,
-														  ::Syslog::LOG_USER )
-			syslog.send priority, msg
-			Process.exit!( 0 )
-		}
-		logpipe[1].close
-		Process.waitpid(child)
+  it 'should handle debug' do
+    test_log_msg :direct, :debug, "Hello Debug World"
+  end
 
-		logpipe[0].gets.should == "ramaze_syslog_test[#{child}]: #{msg}\n"
-	end
+  it 'should handle dev' do
+    test_log_msg :direct, :dev, "Hello Dev World"
+  end
 
-	it 'should handle debug' do
-		test_log_msg :direct, :debug, "Hello Debug World"
-	end
-	it 'should handle dev' do
-		test_log_msg :direct, :dev, "Hello Dev World"
-	end
-	it 'should handle info' do
-		test_log_msg :direct, :info, 'Hello Info World!'
-	end
-	it 'should handle warn' do
-		test_log_msg :direct, :warn, 'Hello Warn World!'
-	end
-	it 'should handle error' do
-		test_log_msg :direct, :error, 'Hello Error World!'
-	end
-	it 'should escape % sequences' do
-		test_log_msg :direct, :info, "Hello Cruel |évil| 戈 REAL %s World"
-	end
+  it 'should handle info' do
+    test_log_msg :direct, :info, 'Hello Info World!'
+  end
+
+  it 'should handle warn' do
+    test_log_msg :direct, :warn, 'Hello Warn World!'
+  end
+
+  it 'should handle error' do
+    test_log_msg :direct, :error, 'Hello Error World!'
+  end
+
+  it 'should escape % sequences' do
+    test_log_msg :direct, :info, "Hello Cruel |évil| 戈 REAL %s World"
+  end
 end

data/spec/ramaze/session/localmemcache.rb

@@ -1,4 +1,6 @@
 require File.expand_path('../../../../spec/helper', __FILE__)
+
+spec_require 'localmemcache'
 spec_require 'sequel'
 
 class SpecSession < Ramaze::Controller

data/spec/ramaze/session/sequel.rb

@@ -1,4 +1,6 @@
 require File.expand_path('../../../../spec/helper', __FILE__)
+
+spec_require 'sqlite3'
 spec_require 'sequel'
 
 class SpecSession < Ramaze::Controller

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ramaze
 version: !ruby/object:Gem::Version
-  version: 2012.12.08b
-  prerelease: 10
+  version: 2012.12.08
+  prerelease: 
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
@@ -157,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -173,7 +173,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: locale
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -189,7 +189,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: locale
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -205,7 +205,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: mustache
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mustache
+  name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -237,7 +237,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-contrib
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -253,7 +253,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -269,7 +269,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -285,7 +285,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -301,7 +301,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -317,7 +317,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: slippers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -333,7 +333,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: tagz
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -349,7 +349,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slippers
+  name: tenjin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -365,7 +365,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -381,7 +381,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tagz
+  name: lokar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -397,7 +397,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tenjin
+  name: localmemcache
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -413,7 +413,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -429,7 +429,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: localmemcache
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -445,7 +445,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: lokar
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -647,6 +647,7 @@ files:
 - guide/general/sessions.md
 - guide/general/special_thanks.md
 - guide/general/testing.md
+- guide/general/upgrading.md
 - guide/general/views.md
 - lib/proto/Gemfile
 - lib/proto/README.md