ramaze 2011.12.28 → 2012.03.07

data/spec/ramaze/action/render.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/app.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 File.expand_path('../../../spec/helper', __FILE__)
 

data/spec/ramaze/app/location.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/cache/localmemcache.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/cache/lru.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/cache/memcache.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 File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'dalli'

data/spec/ramaze/cache/redis.rb

@@ -1,5 +1,5 @@
 #          Copyright (c) 2011 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 File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'redis'

data/spec/ramaze/cache/sequel.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 File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'sequel'

data/spec/ramaze/controller/actionless_templates.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/controller/lonely_mapping.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/controller/mapping.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/controller/provide_inheritance.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/controller/resolve.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/controller/subclass.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/controller/template_resolving.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/dispatcher/directory.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/dispatcher/file.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/error.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 File.expand_path('../../../spec/helper', __FILE__)
 require 'rexml/document'

data/spec/ramaze/files.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 File.expand_path('../../../spec/helper', __FILE__)
 

data/spec/ramaze/gestalt.rb

@@ -1,7 +1,7 @@
 # * Encoding: UTF-8
 #
 #          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 File.expand_path('../../../spec/helper', __FILE__)
 require 'ramaze/gestalt'

data/spec/ramaze/helper/auth.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/bench.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/bench'

data/spec/ramaze/helper/cache.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/csrf.rb

@@ -1,14 +1,6 @@
 require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/csrf'
 
-##
-# A quick note on this controller.
-# I decided to user global variables ($foo) instead of sending
-# certain data to the "browser", this makes it much easier to compare
-# certain values.
-#
-# - Yorick Peterse
-#
 class SpecHelperCSRF < Ramaze::Controller
 
   engine :none
@@ -20,23 +12,19 @@ class SpecHelperCSRF < Ramaze::Controller
     end
   end
 
-  # Generate a new csrf token
   def index
     generate_csrf_token
   end
 
-  # Retrieve the current value of the CSRF token
   def get
     return get_csrf_token
   end
 
-  # Check if the token isn't regenerated
-  def dont_regenerate
+  def regenerate
     $token_sess   = session[:_csrf][:token]
     $token_method = get_csrf_token
   end
 
-  # Check the TTL
   def check_ttl
     generate_csrf_token :ttl => 3
     $old_token = get_csrf_token
@@ -44,11 +32,13 @@ class SpecHelperCSRF < Ramaze::Controller
     $new_token = get_csrf_token
   end
 
-  # Check if the before_all block works
   def check_post
     "POST allowed."
   end
 
+  def get_token
+    get_csrf_token
+  end
 end
 
 describe Ramaze::Helper::CSRF do
@@ -68,11 +58,11 @@ describe Ramaze::Helper::CSRF do
     got.body.length.should.equal 128
   end
 
-  it 'do not generate a new token' do
-    got = get '/dont_regenerate'
+  it 'generate a new token if the previous one is valid' do
+    got = get '/regenerate'
 
-    got.status.should.equal 200
-    $token_sess.should.equal $token_method
+    got.status.should.equal      200
+    $token_sess.should.not.equal $token_method
   end
 
   it 'expire token after 3 seconds' do
@@ -86,8 +76,9 @@ describe Ramaze::Helper::CSRF do
     methods = [:get, :post, :put, :delete]
 
     methods.each do |method|
+      token       = get('/get_token').body
       got_invalid = self.send(method, '/check_post', :name => "Yorick Peterse")
-      got_valid   = self.send(method, '/check_post', :csrf_token => $new_token)
+      got_valid   = self.send(method, '/check_post', :csrf_token => token)
 
       got_invalid.status.should.equal 401
       got_invalid.body.should.equal "The specified CSRF token is incorrect."

data/spec/ramaze/helper/flash.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/formatting.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/formatting'

data/spec/ramaze/helper/gestalt.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/gestalt'

data/spec/ramaze/helper/gravatar.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/gravatar'

data/spec/ramaze/helper/layout.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/link.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/localize.rb

@@ -1,6 +1,6 @@
 # * Encoding: UTF-8
 #          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.
 
 $KCODE = 'u' if /regexp/.respond_to?(:kcode)
 require File.expand_path('../../../../spec/helper', __FILE__)

data/spec/ramaze/helper/maruku.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 File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'maruku'

data/spec/ramaze/helper/paginate.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 File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'hpricot'

data/spec/ramaze/helper/request_accessor.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/simple_captcha.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/stack.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/user.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/helper/xhtml.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/helper/xhtml'

data/spec/ramaze/log/informer.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/log/informer'

data/spec/ramaze/log/logging.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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/log/syslog.rb

@@ -1,5 +1,5 @@
 #          Copyright (c) 2008 rob@rebeltechnologies.nl
-# 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 File.expand_path('../../../../spec/helper', __FILE__)
 

data/spec/ramaze/params.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 File.expand_path('../../../spec/helper', __FILE__)
 

data/spec/ramaze/request.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 File.expand_path('../../../spec/helper', __FILE__)
 

data/spec/ramaze/session/memcache.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 File.expand_path('../../../../spec/helper', __FILE__)
 require 'dalli'

data/spec/ramaze/struct.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 File.expand_path('../../../spec/helper', __FILE__)