ramaze 2011.12.28 → 2012.03.07

data/.gems

@@ -0,0 +1,34 @@
+# .gems generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator
+bacon -v1.1.0
+dalli -v1.1.4
+erector -v0.8.3
+erubis -v2.7.0
+ezamar -v2009.06
+haml -v3.1.4
+hpricot -v0.8.5
+innate -v2011.12
+liquid -v2.3.0
+locale -v2.0.5
+localmemcache -v0.4.4
+lokar -v0.2.1
+maruku -v0.6.0
+mustache -v0.99.4
+nagoro -v2009.05
+nokogiri -v1.5.0
+polyglot -v0.3.3
+rack -v1.4.0
+rack-contrib -v1.1.0
+rack-test -v0.6.1
+ramaze -v2011.12.28
+rdiscount -v1.6.8
+redis -v2.2.2
+Remarkably -v0.6.1
+sass -v3.1.12
+sequel -v3.30.0
+slippers -v0.0.14
+sqlite3 -v1.3.5
+syntax -v1.0.0
+tagz -v9.0.0
+tenjin -v0.7.1
+treetop -v1.4.10
+yard -v0.7.4

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - rbx
-  - rbx-2.0
   - ree
 
 notifications:

data/.yardopts

@@ -9,5 +9,6 @@
 --asset ./guide/css/common.css:css/common.css
 -
 ./guide/**/*.md
-./guide/GPL_LICENSE
-./guide/RUBY_LICENSE
+./guide/AUTHORS
+./guide/CHANGELOG
+./guide/LICENSE

data/README.md

@@ -37,12 +37,6 @@ Installing Ramaze is as easy as the following command:
 
 For more information see the chapter {file:installation Installation}.
 
-Ramaze is dual licensed under the GPL/Ruby license and is copyrighted 2009 -
-2011 by Michael Fellinger (m.fellinger@gmail.com). A copy of the Ruby license
-can be found in the file "guide/RUBY_LICENSE", a copy of the GPL license can be
-found in the file "guide/GPL_LICENSE". Both these files can be displayed by
-clicking the "Files" button at the top right.
-
 <div class="note todo">
     <p>
         <strong>Note:</strong> if you spot any mistakes made such as spelling
@@ -84,6 +78,14 @@ This starts a WEBRick server listening on localhost:7000.
 * A Rack server such as Thin or Unicorn.
 * Basic knowledge of Ruby.
 
+## License
+
+Ramaze is licensed under the MIT license, a copy of this license can be found in
+``guide/LICENSE``. If you happen to view this README using YARD (this is what
+you see on <http://ramaze.net/documentation/index.html>) you can also view this
+license by clicking the "Files" button at the top right and then clicking on the
+"LICENSE" item.
+
 ## Community
 
 * \#ramaze on the Freenode IRC network

data/examples/app/blog/controller/init.rb

@@ -2,7 +2,6 @@
 # Base controller that provides a few things used by sub controllers throughout
 # this example application.
 #
-# @author Yorick Peterse
 # @since  26-09-2011
 #
 class BaseController < Ramaze::Controller

data/examples/app/blog/controller/posts.rb

@@ -2,7 +2,6 @@
 # The Posts controller is used to display a list of all the posts that have been
 # added as well as providing a way of adding, removing and updating posts.
 #
-# @author Yorick Peterse
 # @since  26-09-2011
 #
 class Posts < BaseController
@@ -41,7 +40,6 @@ class Posts < BaseController
   # Shows an overview of all the posts that have been added. These posts are
   # paginated using the Paginate helper.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   #
   def index
@@ -52,7 +50,6 @@ class Posts < BaseController
   ##
   # Returns a list of all posts as either an RSS feed or an Atom feed.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def feed
@@ -64,7 +61,6 @@ class Posts < BaseController
   ##
   # Shows a single post along with all it's comments.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @param  [Fixnum] id The ID of the post to view.
   #
@@ -84,7 +80,6 @@ class Posts < BaseController
   ##
   # Allows users to create a new post, given the user is logged in.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   #
   def new
@@ -97,7 +92,6 @@ class Posts < BaseController
   ##
   # Allows a user to edit an existing blog post.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @param  [Fixnum] id The ID of the blog post to edit.
   #
@@ -119,7 +113,6 @@ class Posts < BaseController
   # Adds a new comment to an existing post and redirects the user back to the
   # post.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def add_comment
@@ -151,7 +144,6 @@ class Posts < BaseController
   # methods could have their own methods for saving the data the entire process
   # is almost identical and thus this would be somewhat useless.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   #
   def save
@@ -211,7 +203,6 @@ class Posts < BaseController
   ##
   # Removes a single post from the database.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @param  [Fixnum] id The ID of the post to remove.
   #

data/examples/app/blog/controller/users.rb

@@ -2,7 +2,6 @@
 # The Users controller is used for managing users and allowing existing users to
 # log in.
 #
-# @author Yorick Peterse
 # @since  26-09-2011
 #
 class Users < BaseController
@@ -20,7 +19,6 @@ class Users < BaseController
   ##
   # Shows an overview of all the users that have been added to the database.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def index
@@ -31,7 +29,6 @@ class Users < BaseController
   ##
   # Allows users to add another user to the database.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def new
@@ -45,7 +42,6 @@ class Users < BaseController
   # Edits an existing user. If the specified user ID is invalid the user is
   # redirected back to the previous page.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   # @param  [Fixnum] id The ID of the user to edit.
   #
@@ -67,7 +63,6 @@ class Users < BaseController
   # Posts#save() this method is used for both methods since the actions required
   # for adding/updating the data is pretty much identical.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def save
@@ -109,7 +104,6 @@ class Users < BaseController
   ##
   # Deletes a single user and redirects the user back to the overview.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   # @param  [Fixnum] id The ID of the user to delete.
   #
@@ -129,7 +123,6 @@ class Users < BaseController
   # Allows a user to log in. Once logged in the user is able to manage existing
   # users and edit posts.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def login
@@ -148,7 +141,6 @@ class Users < BaseController
   ##
   # Logs the user out and destroys the session.
   #
-  # @author Yorick Peterse
   # @since  27-09-2011
   #
   def logout

data/examples/app/blog/model/comment.rb

@@ -1,7 +1,6 @@
 ##
 # The Comment model is used for creating and managing comments.
 #
-# @author Yorick Peterse
 # @since  26-09-2011
 #
 class Comment < Sequel::Model
@@ -14,7 +13,6 @@ class Comment < Sequel::Model
   ##
   # Validates a comment before saving it to the database.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   #
   def validate
@@ -31,7 +29,6 @@ class Comment < Sequel::Model
   # Gets the name of the author from either an associated user or the "name"
   # field.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @return [String]
   #

data/examples/app/blog/model/post.rb

@@ -3,7 +3,6 @@
 # table is called "posts". For more information on how Sequel works see the
 # following page: http://sequel.rubyforge.org/documentation.html
 #
-# @author Yorick Peterse
 # @since  26-09-2011
 #
 class Post < Sequel::Model
@@ -26,7 +25,6 @@ class Post < Sequel::Model
   # these validation methods can't be used in a model's class declaration, they
   # have to be placed inside the #validate() method.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   #
   def validate

data/examples/app/blog/model/user.rb

@@ -7,7 +7,6 @@
 # * http://yorickpeterse.com/articles/use-bcrypt-fool/
 # * https://github.com/codahale/bcrypt-ruby
 #
-# @author Yorick Peterse
 # @since  26-09-2011
 #
 class User < Sequel::Model
@@ -22,7 +21,6 @@ class User < Sequel::Model
   # object in case the specified details were correct or something that
   # evaluates to false if this wasn't the case.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @param  [Hash] creds A hash containing the username and password of the
   #  currently logged in user.
@@ -42,7 +40,7 @@ class User < Sequel::Model
     # compared as plain text this is not the case. The bcrypt class
     # automatically converts the given password to a bcrypt hash. If these
     # hashes are the same the specified password is correct.
-    if !user.nil? or user.password == password
+    if !user.nil? and user.password == password
       return user
     else
       return false
@@ -54,7 +52,6 @@ class User < Sequel::Model
   # password() methods to return a correct bcrypt hash/object rather than
   # whatever was stored in the database as a String instance.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @param  [String] password The new password of a user.
   #
@@ -77,7 +74,6 @@ class User < Sequel::Model
   # containing the bcrypt hash and thus wouldn't be able to properly compare it
   # to other passwords.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   # @return [BCrypt::Password|NilClass]
   #
@@ -95,7 +91,6 @@ class User < Sequel::Model
   # Validates an instance of this model. See Post#validate() for some extra
   # details on how this works.
   #
-  # @author Yorick Peterse
   # @since  26-09-2011
   #
   def validate

data/examples/app/wikore/spec/wikore.rb

@@ -1,5 +1,5 @@
 require 'ramaze'
-require 'ramaze/spec'
+require 'ramaze/spec/bacon'
 
 spec_requires 'hpricot', 'sequel'
 
@@ -7,7 +7,7 @@ $LOAD_PATH.unshift base = __DIR__('..')
 require 'start'
 
 describe 'Wikore' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   def check_redirect(to = '/')
     response = yield

data/examples/app/wikore/src/model.rb

@@ -10,7 +10,7 @@ end
 Sequel::Model.plugin :schema
 
 module Model
-  PAGE_SCHEMA = lambda{
+  PAGE_SCHEMA = lambda{|db|
     primary_key :id
     boolean :active, :default => true
     text    :text
@@ -45,12 +45,6 @@ module Model
   end
 
   [Page, OldPage].each do |klass|
-    begin
-      klass.create_table
-    rescue Sequel::DatabaseError => e
-      if e.message !~ /table.*already exists/
-        raise e
-      end
-    end
+    klass.create_table?
   end
 end

data/examples/app/wikore/start.rb

@@ -3,7 +3,7 @@ require 'ramaze'
 
 $wikore = {}
 
-require 'src/model'
-require 'src/controller'
+require_relative 'src/model'
+require_relative 'src/controller'
 
 Ramaze.start :file => __FILE__

data/examples/misc/memleak_detector.rb

@@ -1,5 +1,5 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+# All files in this distribution are subject to the terms of the MIT license.
 
 require 'ramaze'
 

data/guide/AUTHORS

@@ -1,9 +1,9 @@
 Following persons have contributed to ramaze.
 (Sorted by number of submitted patches, then alphabetically)
 
-  2730 Michael Fellinger <m.fellinger@gmail.com>
+  2732 Michael Fellinger <m.fellinger@gmail.com>
    216 Aman Gupta <aman@ramaze.net>
-   146 Yorick Peterse <yorickpeterse@gmail.com>
+   164 Yorick Peterse <yorickpeterse@gmail.com>
     89 Jonathan Buch <jonathan.buch@gmail.com>
     77 Pistos <gitsomegrace.5.pistos@geoshell.com>
     69 Clive Crous <clive@crous.co.za>
@@ -24,6 +24,7 @@ Following persons have contributed to ramaze.
      5 mwlang <mwlang@cybrains.net>
      4 Andreas Karlsson <andreas@proxel.se>
      4 James Tucker <jftucker@gmail.com>
+     4 John Pagonis <john@pagonis.org>
      4 Masahiro Nakagawa <repeatedly@gmail.com>
      4 mig <mig@mypeplum.com>
      3 Chris Duncan <celldee@gmail.com>
@@ -31,6 +32,7 @@ Following persons have contributed to ramaze.
      3 Riku Raisaenen <riku@helloit.fi>
      3 starapor <me@sarahtaraporewalla.com>
      3 Stas SUȘCOV <stas@net.utcluj.ro>
+     3 Yorick Peterse <yorick@isset.nl>
      2 Andrew Farmer <xichekolas@gmail.com>
      2 jShaf <joshua.shaffner@gmail.com>
      2 Yutaka HARA <yutaka.hara+github@gmail.com>
@@ -52,6 +54,7 @@ Following persons have contributed to ramaze.
      1 Jean-Francois Chevrette <jfchevrette@iweb.ca>
      1 Jeremy Evans <code@jeremyevans.net>
      1 kez <kdobson@gmail.com>
+     1 Marc Weber <marco-oweber@gmx.de>
      1 Martin Hilbig <blueonyx@dev-area.net>
      1 Matt Rubens <mrubens@goldencookie.localdomain>
      1 Pistos <github.pistos@purepistos.net>

data/guide/CHANGELOG

@@ -1,3 +1,206 @@
+[aa5d48f | Mon Mar 05 19:08:01 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Updated the list of authors and the changelog.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[8040c21 | Mon Mar 05 19:04:17 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Ramaze is now licensed under the MIT license.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[b1e5d5c | Fri Mar 02 15:21:37 UTC 2012] John Pagonis <john@pagonis.org>
+
+  * Explains how to reuse the existing middlewares stack with own middleware.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[556597f | Fri Mar 02 12:41:53 UTC 2012] John Pagonis <john@pagonis.org>
+
+  * Added a reference to the popular default Innate helpers to ramaze, to stop us wasting time looking for them.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[df6bd77 | Fri Mar 02 11:01:37 UTC 2012] Yorick Peterse <yorick@isset.nl>
+
+  * Added a general Git workflow link.
+
+    As suggested by @pagojo I've added a link to a guide that describes the various
+    steps of contributing to Github projects.
+    
+    Issue: #33
+    
+    Signed-off-by: Yorick Peterse <yorick@isset.nl>
+
+[5ecdb93 | Thu Mar 01 19:05:56 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Woops, YARD can't resolve to Ramaze.start.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[3f6168a | Thu Mar 01 18:58:17 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Expanded the sessions guide.
+
+    It now includes a list of the available drivers (copied from the caching guide)
+    as well as some instructions on how to change the adapter to use for session
+    data.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[7d5f8a0 | Thu Mar 01 18:48:42 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Describe how to write/test documentation.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[d8a3cc4 | Thu Mar 01 13:46:44 UTC 2012] Yorick Peterse <yorick@isset.nl>
+
+  * Small formatting changes for the middlewares guide
+
+    See #33
+    
+    Signed-off-by: Yorick Peterse <yorick@isset.nl>
+
+[346a202 | Thu Mar 01 13:45:02 UTC 2012] Yorick Peterse <yorick@isset.nl>
+
+  * Removed trailing whitespace.
+
+    See #33 for more information.
+    
+    Signed-off-by: Yorick Peterse <yorick@isset.nl>
+
+[e125277 | Thu Mar 01 12:17:21 UTC 2012] John Pagonis <john@pagonis.org>
+
+  * Clarified the middlewares documentation a bit.
+
+    Signed-off-by: Yorick Peterse <yorick@isset.nl>
+
+[5e9f80d | Wed Feb 29 20:12:54 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Updated the list of authors.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[cd11c7f | Mon Feb 20 20:45:12 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Fixed the formatting of the User helper docs.
+
+    See #32 for more information.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[e9225b4 | Fri Feb 17 13:31:21 UTC 2012] John Pagonis <john@pagonis.org>
+
+  * Corrected the user_login documentation.
+
+    Signed-off-by: Yorick Peterse <yorick@isset.nl>
+
+[846a4b3 | Thu Feb 16 19:22:14 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Improved the docs for the User helper a bit.
+
+    See #30 for more information.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[2475a04 | Sat Feb 04 13:04:04 UTC 2012] Michael Fellinger <m.fellinger@gmail.com>
+
+  * update travis config
+
+[4cfea2b | Wed Jan 25 14:35:19 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Re-generate CSRF tokens for valid requests.
+
+    Re-generating the CSRF tokens on each valid request fixes the annoying issue of
+    the tokens *always* expiring after 15 minutes. This is very annoying if you're
+    trying to edit some content and all of a sudden you're unable to submit a form
+    as the token has expired.
+    
+    See #27 for more information.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[2e98ff1 | Wed Jan 25 14:29:20 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Removed a few more useless comments.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[5cdc51c | Wed Jan 25 14:28:44 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * No need to brush my ego that much.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[b24669f | Wed Jan 25 14:26:27 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Removed some useless code.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[e435ceb | Wed Jan 25 14:10:21 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Use Ramaze.setup for the view adapters.
+
+    Using Ramaze.setup() for installing and loading the gems required for various
+    view adapters should make it easier for developers to get started as they no
+    longer have to deal with errors related to certain Gems not being installed.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[17c909e | Wed Jan 25 14:03:37 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Added a few specifications for Slim.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[969a02c | Wed Jan 25 13:42:20 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Docs for the Slim engine and cleaned it up a bit.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[023d6cd | Wed Jan 25 13:35:36 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Removed a tab.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[37f0f73 | Thu Jan 19 05:52:52 UTC 2012] Marc Weber <marco-oweber@gmx.de>
+
+  * adding support for slim template engine
+
+    thanks to yorickpeterse, manveru
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[561d528 | Tue Jan 17 18:23:19 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Fixed a small statement bug in the blog example.
+
+    This bug would cause an exception to be raised whenever a user would try to log
+    in with invalid details. Thanks to MarcWeber for reporting the issue.
+    
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[e8b3786 | Tue Jan 17 17:14:52 UTC 2012] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * No need to boost my ego that much.
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
+[b33c13c | Tue Jan 17 17:04:10 UTC 2012] Michael Fellinger <m.fellinger@gmail.com>
+
+  * fix some wikore bugs
+
+[fb84aea | Wed Dec 28 17:29:21 UTC 2011] Yorick Peterse <yorickpeterse@gmail.com>
+
+  * Release 2011.12.28
+
+    Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
+
 [4553e0b | Wed Dec 28 05:13:22 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
 
   * Wrap Rack::File so we can continue to use Rack::Cascade