ramaze 2011.07.25 → 2011.10.23

data/spec/ramaze/helper/layout.rb

@@ -5,6 +5,7 @@ require File.expand_path('../../../../spec/helper', __FILE__)
 
 class LayoutHelperOne < Ramaze::Controller
   map '/one'
+
   set_layout 'default'
 
   def laid_out1; end
@@ -14,16 +15,18 @@ end
 
 class LayoutHelperTwo < Ramaze::Controller
   map '/two'
-  set_layout 'default' => [:laid_out1, :laid_out2]
+
+  layout     'default'
+  set_layout 'alternative' => [:laid_out2, :laid_out3]
 
   def laid_out1; end
   def laid_out2; end
-
-  def not_laid_out; end
+  def laid_out3; end
 end
 
 class LayoutHelperThree < Ramaze::Controller
   map '/three'
+
   set_layout 'default' => [:laid_out1], 'alternative' => [:laid_out2]
   set_layout 'default' => [:laid_out3]
 
@@ -32,6 +35,19 @@ class LayoutHelperThree < Ramaze::Controller
   def laid_out3; end
 end
 
+class LayoutHelperFour < Ramaze::Controller
+  map '/four'
+
+  layout { |path| 'default' }
+
+  set_layout 'alternative' => [:laid_out2]
+  set_layout 'alternative' => [:laid_out3]
+
+  def laid_out1; end
+  def laid_out2; end
+  def laid_out3; end
+end
+
 describe Ramaze::Helper::Layout do
   behaves_like :rack_test
 
@@ -39,24 +55,28 @@ describe Ramaze::Helper::Layout do
     get '/one/laid_out1'
     last_response.status.should == 200
     last_response.body.should.match /laid out/
+
     get '/one/laid_out2'
     last_response.status.should == 200
     last_response.body.should.match /laid out/
+
     get '/one/laid_out3'
     last_response.status.should == 200
     last_response.body.should.match /laid out/
   end
 
-  it 'lays out only a whitelist of actions' do
+  it 'lays out only a whitelist of actions with layout() as a fallback' do
     get '/two/laid_out1'
     last_response.status.should == 200
     last_response.body.should.match /laid out/
+
     get '/two/laid_out2'
     last_response.status.should == 200
-    last_response.body.should.match /laid out/
-    get '/two/not_laid_out'
+    last_response.body.should.match /alternative/
+
+    get '/two/laid_out3'
     last_response.status.should == 200
-    last_response.body.should.not.match /laid out/
+    last_response.body.should.match /alternative/
   end
 
   it 'Define a set of method specific layouts' do
@@ -73,4 +93,17 @@ describe Ramaze::Helper::Layout do
     last_response.body.should.match /laid out/
   end
 
+  it 'lays out a whitelist with layout() as a fallback using a block' do
+    get '/four/laid_out1'
+    last_response.status.should == 200
+    last_response.body.should.match /laid out/
+
+    get '/four/laid_out2'
+    last_response.status.should == 200
+    last_response.body.should.match /alternative/
+
+    get '/four/laid_out3'
+    last_response.status.should == 200
+    last_response.body.should.match /alternative/
+  end
 end

data/spec/ramaze/helper/upload.rb

@@ -0,0 +1,149 @@
+require File.expand_path('../../../../spec/helper', __FILE__)
+require 'fileutils'
+require 'tempfile'
+
+class SpecUploadHelper < Ramaze::Controller
+  map '/'
+
+  helper :upload
+
+  handle_uploads_for :auto_upload
+  handle_uploads_for [:auto_upload_pattern, /file_2/]
+
+  def empty
+    if get_uploaded_files.empty?
+      return 'empty'
+    else
+      return 'not empty'
+    end
+  end
+
+  def upload
+    get_uploaded_files.each_pair do |k, v|
+      v.save(File.join('/tmp/ramaze_uploads', v.filename))
+
+      return 'not uploaded' unless v.saved?
+    end
+
+    return 'uploaded'
+  end
+
+  # If all goes well this should behave exactly the same as upload() with the
+  # difference that the uploads are processed in handle_uploads_for() and then
+  # just returned.
+  def auto_upload
+    return upload
+  end
+
+  def auto_upload_pattern
+    return upload
+  end
+end
+
+describe('Ramaze::Helper::Upload') do
+  behaves_like :rack_test
+
+  before { Dir.mkdir('/tmp/ramaze_uploads') }
+  after  { FileUtils.rm_rf('/tmp/ramaze_uploads') }
+
+  it('No files should be uploaded') do
+    get('/empty').body.strip.should === 'empty'
+  end
+
+  it('Upload a text file') do
+    file = Rack::Test::UploadedFile.new(
+      __DIR__('uploads/text_1.txt'),
+      'text/plain'
+    )
+
+    body = post('/upload', :file_1 => file).body.strip
+
+    body.should === 'uploaded'
+
+    File.exist?('/tmp/ramaze_uploads/text_1.txt').should     === true
+    File.read('/tmp/ramaze_uploads/text_1.txt').strip.should === 'Hello world'
+  end
+
+  it('Upload multiple files') do
+    file_1 = Rack::Test::UploadedFile.new(
+      __DIR__('uploads/text_1.txt'),
+      'text/plain'
+    )
+
+    file_2 = Rack::Test::UploadedFile.new(
+      __DIR__('uploads/text_2.txt'),
+      'text/plain'
+    )
+
+    body = post('/upload', :file_1 => file_1, :file_2 => file_2).body.strip
+
+    body.should === 'uploaded'
+
+    File.exist?('/tmp/ramaze_uploads/text_1.txt').should     === true
+    File.read('/tmp/ramaze_uploads/text_1.txt').strip.should === 'Hello world'
+
+    File.exist?('/tmp/ramaze_uploads/text_2.txt').should     === true
+    File.read('/tmp/ramaze_uploads/text_2.txt').strip.should === 'Hello Ramaze'
+  end
+
+  it('Automatically handle uploads') do
+    file_1 = Rack::Test::UploadedFile.new(
+      __DIR__('uploads/text_1.txt'),
+      'text/plain'
+    )
+
+    body = post('/auto_upload', :file_1 => file_1).body.strip
+
+    body.should === 'uploaded'
+
+    File.exist?('/tmp/ramaze_uploads/text_1.txt').should     === true
+    File.read('/tmp/ramaze_uploads/text_1.txt').strip.should === 'Hello world'
+  end
+
+  it('Automatically handle uploads using a pattern') do
+    file_1 = Rack::Test::UploadedFile.new(
+      __DIR__('uploads/text_1.txt'),
+      'text/plain'
+    )
+
+    file_2 = Rack::Test::UploadedFile.new(
+      __DIR__('uploads/text_2.txt'),
+      'text/plain'
+    )
+
+    body = post(
+      '/auto_upload_pattern',
+      :file_1 => file_1,
+      :file_2 => file_2
+    ).body.strip
+
+    body.should === 'uploaded'
+
+    File.exist?('/tmp/ramaze_uploads/text_1.txt').should     === true
+    File.exist?('/tmp/ramaze_uploads/text_2.txt').should     === false
+    File.read('/tmp/ramaze_uploads/text_1.txt').strip.should === 'Hello world'
+  end
+end
+
+describe('Ramaze::Helper::Upload::UploadedFile') do
+  before { Dir.mkdir('/tmp/ramaze_uploads') }
+  after  { FileUtils.rm_rf('/tmp/ramaze_uploads') }
+
+  it('Create a new file') do
+    path = __DIR__('uploads/text_1.txt')
+    file = Ramaze::Helper::Upload::UploadedFile.new(
+      path,
+      'text/plain',
+      Tempfile.new('text_1.txt'),
+      Ramaze::Helper::Upload::ClassMethods.trait[:default_upload_options]
+    )
+
+    file.filename.should  === 'text_1.txt'
+    file.type.should      === 'text/plain'
+    file.path.nil?.should === true
+
+    file.save('/tmp/ramaze_uploads/text_1.txt')
+
+    file.path.nil?.should === false
+  end
+end

data/spec/ramaze/helper/uploads/text_1.txt

@@ -0,0 +1 @@
+Hello world

data/spec/ramaze/helper/uploads/text_2.txt

@@ -0,0 +1 @@
+Hello Ramaze

data/spec/ramaze/log/growl.rb

@@ -1,13 +1,11 @@
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-spec_precondition 'ruby-growl is installed' do
-  if !RUBY_PLATFORM.include?('darwin')
-    should.flunk 'Growl can only be installed on Mac OS'
-  else
-    spec_require 'ruby-growl'
-  end
+spec_precondition 'ruby-growl should be supported' do
+  should.flunk if Ramaze::UNSUPPORTED_GEMS.include?('ruby-growl')
 end
 
+spec_require 'ruby-growl'
+
 spec_precondition 'Growl should be running' do
   begin
     growl = Ramaze::Logger::Growl.new

data/spec/ramaze/log/syslog.rb

@@ -3,6 +3,12 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
+spec_precondition 'Syslog should be supported' do
+  if Ramaze::UNSUPPORTED_GEMS.include?('syslog')
+    should.flunk 'Forking/Syslog is not supported'
+  end
+end
+
 require 'ramaze/log/syslog'
 
 describe 'Syslog' do

data/spec/ramaze/view/lokar.rb

@@ -2,6 +2,11 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require File.expand_path('../../../../spec/helper', __FILE__)
+
+spec_precondition 'Lokar should be supported' do
+  should.flunk if Ramaze::UNSUPPORTED_GEMS.include?('lokar')
+end
+
 spec_require 'lokar'
 
 Ramaze::App.options.views = 'lokar'

data/spec/ramaze/view/nagoro.rb

@@ -2,6 +2,11 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require File.expand_path('../../../../spec/helper', __FILE__)
+
+spec_precondition 'Nagoro should be supported' do
+  should.flunk if Ramaze::UNSUPPORTED_GEMS.include?('nagoro')
+end
+
 spec_require 'nagoro'
 
 Ramaze::App.options.views = 'nagoro'

data/tasks/authors.rake

@@ -6,7 +6,7 @@ task :authors do
     authors[[name, email]] += count.to_i
   end
 
-  File.open('doc/AUTHORS', 'w+') do |io|
+  File.open('guide/AUTHORS', 'w+') do |io|
     io.puts "Following persons have contributed to #{GEMSPEC.name}."
     io.puts '(Sorted by number of submitted patches, then alphabetically)'
     io.puts ''

data/tasks/bacon.rake

@@ -3,12 +3,21 @@ task :bacon => :setup do
   require 'open3'
   require 'scanf'
   require 'matrix'
+  require 'pathname'
 
-  specs = PROJECT_SPECS
-
+  specs       = PROJECT_SPECS
   some_failed = false
+  root_path   = Pathname.new(File.expand_path('../../', __FILE__))
+
+  # Generate a hash of relative and absolute paths for all the specs.
+  specs_relative = {}
+
+  specs.each do |spec|
+    specs_relative[spec] = Pathname.new(spec).relative_path_from(root_path).to_s
+  end
+
   specs_size  = specs.size
-  len         = specs.map{|s| s.size }.sort.last
+  len         = specs_relative.map { |abs, rel| rel.size }.sort.last
   total_tests = total_assertions = total_failures = total_errors = 0
   totals      = Vector[0, 0, 0, 0]
 
@@ -19,9 +28,9 @@ task :bacon => :setup do
   load_path = File.expand_path('../../lib', __FILE__)
 
   specs.each_with_index do |spec, idx|
-    print(left_format % [idx + 1, specs_size, spec])
+    print(left_format % [idx + 1, specs_size, specs_relative[spec]])
 
-    Open3.popen3(RUBY, '-I', load_path, spec) do |sin, sout, serr|
+    Open3.popen3(FileUtils::RUBY, '-I', load_path, spec) do |sin, sout, serr|
       out = sout.read.strip
       err = serr.read.strip
 

data/tasks/changelog.rake

@@ -1,6 +1,6 @@
 desc 'update changelog'
 task :changelog do
-  File.open('doc/CHANGELOG', 'w+') do |changelog|
+  File.open('guide/CHANGELOG', 'w+') do |changelog|
     `git log -z --abbrev-commit`.split("\0").each do |commit|
       next if commit =~ /^Merge: \d*/
       ref, author, time, _, title, _, message = commit.split("\n", 7)

data/tasks/yard.rake

@@ -1,5 +1,13 @@
-desc 'Generate YARD documentation'
-task :yard do
-  readme = File.expand_path('../../README.md', __FILE__)
-  sh("yardoc -o ydoc -r #{readme}")
+desc 'Generate YARD documentation of Ramaze (optionally including Innate)'
+task :yard, :innate do |task, args|
+  path   = File.expand_path('../../doc', __FILE__)
+  innate = nil
+
+  # Include Innate
+  if args[:innate] and File.directory?(args[:innate])
+    innate = File.join(File.expand_path(args[:innate]), '**', '*')
+  end
+
+  sh("rm -rf #{path}")
+  sh("yard doc #{innate}")
 end

metadata

@@ -1,346 +1,361 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ramaze
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2011.10.23
   prerelease: 
-  version: 2011.07.25
 platform: ruby
-authors: 
+authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-25 00:00:00 +02:00
+date: 2011-10-23 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: innate
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153832700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2010.03"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2010.03'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153832700
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &2153832240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dalli
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153832240
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: &2153831820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.5
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: erector
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153831820
+- !ruby/object:Gem::Dependency
+  name: erector
+  requirement: &2153831400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153831400
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &2153830980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ezamar
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153830980
+- !ruby/object:Gem::Dependency
+  name: ezamar
+  requirement: &2153830560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2009.06"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2009.06'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sass
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153830560
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &2153830140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.4
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2153830140
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2153829720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2153829720
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: &2153845680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.4
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: liquid
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2153845680
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: &2153845260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: locale
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2153845260
+- !ruby/object:Gem::Dependency
+  name: locale
+  requirement: &2153844840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.5
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: lokar
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.1
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153844840
+- !ruby/object:Gem::Dependency
   name: maruku
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &2153844420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: mustache
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *2153844420
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: &2153844000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.99.4
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: nagoro
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2009.05"
-  type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153844000
+- !ruby/object:Gem::Dependency
   name: rack-contrib
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &2153843580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *2153843580
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2153843160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: Remarkably
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: *2153843160
+- !ruby/object:Gem::Dependency
+  name: Remarkably
+  requirement: &2153842740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: sequel
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: *2153842740
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &2153842320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.25.0
   type: :development
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: slippers
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: *2153842320
+- !ruby/object:Gem::Dependency
+  name: slippers
+  requirement: &2153841900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.14
   type: :development
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  version_requirements: *2153841900
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2153841480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  version_requirements: *id021
-- !ruby/object:Gem::Dependency 
-  name: tagz
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  version_requirements: *2153841480
+- !ruby/object:Gem::Dependency
+  name: tagz
+  requirement: &2153841060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 9.0.0
   type: :development
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
-  name: tenjin
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  version_requirements: *2153841060
+- !ruby/object:Gem::Dependency
+  name: tenjin
+  requirement: &2153840640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id023
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  version_requirements: *2153840640
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153840220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
-  version_requirements: *id024
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153840220
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &2153839800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *2153839800
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &2153839380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+  type: :development
+  prerelease: false
+  version_requirements: *2153839380
+- !ruby/object:Gem::Dependency
+  name: lokar
+  requirement: &2153838960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :development
+  prerelease: false
+  version_requirements: *2153838960
+- !ruby/object:Gem::Dependency
   name: ruby-growl
+  requirement: &2153838540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  version_requirements: *2153838540
+- !ruby/object:Gem::Dependency
+  name: nagoro
+  requirement: &2153838120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2009.05'
   type: :development
-  version_requirements: *id025
+  prerelease: false
+  version_requirements: *2153838120
 description: Ramaze is a simple and modular web framework
 email: m.fellinger@gmail.com
-executables: 
+executables:
 - ramaze
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .mailmap
 - .rvmrc
+- .travis.yml
+- .yardopts
 - README.md
 - Rakefile
 - bin/ramaze
-- doc/AUTHORS
-- doc/CHANGELOG
-- doc/COPYING
-- doc/GPL
-- doc/LEGAL
 - examples/app/auth/layout/auth.xhtml
 - examples/app/auth/start.rb
 - examples/app/auth/view/index.xhtml
 - examples/app/auth/view/login.xhtml
 - examples/app/auth/view/secret.xhtml
-- examples/app/blog/README
 - examples/app/blog/app.rb
 - examples/app/blog/config.ru
-- examples/app/blog/controller/comment.rb
-- examples/app/blog/controller/entry.rb
 - examples/app/blog/controller/init.rb
-- examples/app/blog/controller/main.rb
-- examples/app/blog/controller/tag.rb
-- examples/app/blog/layout/default.nag
+- examples/app/blog/controller/posts.rb
+- examples/app/blog/controller/users.rb
+- examples/app/blog/layout/default.xhtml
+- examples/app/blog/migrations/01_create_schema.rb
 - examples/app/blog/model/comment.rb
-- examples/app/blog/model/entry.rb
 - examples/app/blog/model/init.rb
-- examples/app/blog/model/tag.rb
-- examples/app/blog/public/css/screen.css
-- examples/app/blog/spec/blog.rb
+- examples/app/blog/model/post.rb
+- examples/app/blog/model/user.rb
+- examples/app/blog/public/.htaccess
+- examples/app/blog/public/css/grid.css
+- examples/app/blog/public/css/layout.css
+- examples/app/blog/public/css/reset.css
+- examples/app/blog/public/css/text.css
+- examples/app/blog/public/dispatch.fcgi
+- examples/app/blog/public/favicon.ico
+- examples/app/blog/public/images/bg.png
 - examples/app/blog/start.rb
-- examples/app/blog/view/comment/form.nag
-- examples/app/blog/view/comment/show.nag
-- examples/app/blog/view/entry/edit.nag
-- examples/app/blog/view/entry/feed.atom.nag
-- examples/app/blog/view/entry/feed.rss.nag
-- examples/app/blog/view/entry/index.nag
-- examples/app/blog/view/entry/new.nag
-- examples/app/blog/view/entry/show.nag
-- examples/app/blog/view/feed.atom.nag
-- examples/app/blog/view/feed.rss.nag
-- examples/app/blog/view/index.nag
-- examples/app/blog/view/tag/index.nag
+- examples/app/blog/view/feed.xhtml
+- examples/app/blog/view/form.xhtml
+- examples/app/blog/view/index.xhtml
+- examples/app/blog/view/users/form.xhtml
+- examples/app/blog/view/users/index.xhtml
+- examples/app/blog/view/users/login.xhtml
+- examples/app/blog/view/view.xhtml
 - examples/app/chat/layout/default.xhtml
 - examples/app/chat/model/history.rb
 - examples/app/chat/model/message.rb
@@ -440,6 +455,31 @@ files:
 - examples/templates/view/external.rhtml
 - examples/templates/view/external.tenjin
 - examples/templates/view/external.zmr
+- guide/AUTHORS
+- guide/CHANGELOG
+- guide/GPL_LICENSE
+- guide/RUBY_LICENSE
+- guide/_static/logo.png
+- guide/_static/logo.svg
+- guide/_static/ramaze_console.png
+- guide/css/common.css
+- guide/general/cache.md
+- guide/general/configuration.md
+- guide/general/contributing.md
+- guide/general/controllers.md
+- guide/general/helpers.md
+- guide/general/installation.md
+- guide/general/logging.md
+- guide/general/middlewares.md
+- guide/general/models.md
+- guide/general/principles.md
+- guide/general/ramaze_command.md
+- guide/general/routes.md
+- guide/general/sessions.md
+- guide/general/special_thanks.md
+- guide/general/testing.md
+- guide/general/views.md
+- guide/tutorials/introduction.md
 - lib/proto/app.rb
 - lib/proto/config.ru
 - lib/proto/controller/init.rb
@@ -454,7 +494,6 @@ files:
 - lib/proto/public/dispatch.fcgi
 - lib/proto/public/favicon.ico
 - lib/proto/public/images/bg.png
-- lib/proto/public/ramaze.png
 - lib/proto/spec/main.rb
 - lib/proto/start.rb
 - lib/proto/view/index.xhtml
@@ -473,6 +512,7 @@ files:
 - lib/ramaze/cache/localmemcache.rb
 - lib/ramaze/cache/lru.rb
 - lib/ramaze/cache/memcache.rb
+- lib/ramaze/cache/redis.rb
 - lib/ramaze/cache/sequel.rb
 - lib/ramaze/controller.rb
 - lib/ramaze/controller/default.rb
@@ -508,6 +548,7 @@ files:
 - lib/ramaze/helper/tagz.rb
 - lib/ramaze/helper/thread.rb
 - lib/ramaze/helper/ultraviolet.rb
+- lib/ramaze/helper/upload.rb
 - lib/ramaze/helper/user.rb
 - lib/ramaze/helper/xhtml.rb
 - lib/ramaze/log.rb
@@ -528,7 +569,6 @@ files:
 - lib/ramaze/reloader/watch_stat.rb
 - lib/ramaze/request.rb
 - lib/ramaze/response.rb
-- lib/ramaze/rest.rb
 - lib/ramaze/setup.rb
 - lib/ramaze/snippets.rb
 - lib/ramaze/snippets/array/put_within.rb
@@ -620,6 +660,7 @@ files:
 - spec/ramaze/cache/localmemcache.rb
 - spec/ramaze/cache/lru.rb
 - spec/ramaze/cache/memcache.rb
+- spec/ramaze/cache/redis.rb
 - spec/ramaze/cache/sequel.rb
 - spec/ramaze/controller/actionless_templates.rb
 - spec/ramaze/controller/lonely_mapping.rb
@@ -664,6 +705,9 @@ files:
 - spec/ramaze/helper/request_accessor.rb
 - spec/ramaze/helper/simple_captcha.rb
 - spec/ramaze/helper/stack.rb
+- spec/ramaze/helper/upload.rb
+- spec/ramaze/helper/uploads/text_1.txt
+- spec/ramaze/helper/uploads/text_2.txt
 - spec/ramaze/helper/user.rb
 - spec/ramaze/helper/view/locals.xhtml
 - spec/ramaze/helper/view/loop.xhtml
@@ -683,7 +727,6 @@ files:
 - spec/ramaze/public/ramaze.png
 - spec/ramaze/public/test_download.css
 - spec/ramaze/request.rb
-- spec/ramaze/rest.rb
 - spec/ramaze/rewrite/file.css
 - spec/ramaze/session/memcache.rb
 - spec/ramaze/struct.rb
@@ -751,7 +794,6 @@ files:
 - tasks/bacon.rake
 - tasks/changelog.rake
 - tasks/gem.rake
-- tasks/rcov.rake
 - tasks/release.rake
 - tasks/setup.rake
 - tasks/todo.rake
@@ -759,30 +801,26 @@ files:
 has_rdoc: yard
 homepage: http://ramaze.net/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ramaze is a simple and modular web framework
 test_files: []
-