manveru-ramaze 2008.07 → 2008.08

data/ramaze.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ramaze"
-  s.version = "2008.07"
+  s.version = "2008.08"
 
   s.summary = "Ramaze is a simple and modular web framework"
   s.description = "Ramaze is a simple and modular web framework"
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
  "benchmark/test.rb",
  "bin",
  "bin/ramaze",
- "cache.yaml",
  "doc",
  "doc/AUTHORS",
  "doc/CHANGELOG",
@@ -416,6 +415,8 @@ Gem::Specification.new do |s|
  "lib/ramaze/helper/simple_captcha.rb",
  "lib/ramaze/helper/stack.rb",
  "lib/ramaze/helper/tagz.rb",
+ "lib/ramaze/helper/thread.rb",
+ "lib/ramaze/helper/ultraviolet.rb",
  "lib/ramaze/helper/user.rb",
  "lib/ramaze/helper/xhtml.rb",
  "lib/ramaze/helper.rb",
@@ -435,6 +436,7 @@ Gem::Specification.new do |s|
  "lib/ramaze/option/holder.rb",
  "lib/ramaze/option/merger.rb",
  "lib/ramaze/option.rb",
+ "lib/ramaze/reloader.rb",
  "lib/ramaze/route.rb",
  "lib/ramaze/setup.rb",
  "lib/ramaze/snippets",
@@ -445,6 +447,7 @@ Gem::Specification.new do |s|
  "lib/ramaze/snippets/blankslate.rb",
  "lib/ramaze/snippets/dictionary.rb",
  "lib/ramaze/snippets/divide.rb",
+ "lib/ramaze/snippets/fiber.rb",
  "lib/ramaze/snippets/kernel",
  "lib/ramaze/snippets/kernel/__dir__.rb",
  "lib/ramaze/snippets/kernel/acquire.rb",
@@ -458,7 +461,6 @@ Gem::Specification.new do |s|
  "lib/ramaze/snippets/object/instance_variable_defined.rb",
  "lib/ramaze/snippets/object/pretty.rb",
  "lib/ramaze/snippets/object/scope.rb",
- "lib/ramaze/snippets/object/thread_accessor.rb",
  "lib/ramaze/snippets/object/traits.rb",
  "lib/ramaze/snippets/ordered_set.rb",
  "lib/ramaze/snippets/proc",
@@ -467,7 +469,8 @@ Gem::Specification.new do |s|
  "lib/ramaze/snippets/ramaze/caller_info.rb",
  "lib/ramaze/snippets/ramaze/caller_lines.rb",
  "lib/ramaze/snippets/ramaze/deprecated.rb",
- "lib/ramaze/snippets/ramaze/thread_accessor.rb",
+ "lib/ramaze/snippets/ramaze/fiber.rb",
+ "lib/ramaze/snippets/ramaze/state.rb",
  "lib/ramaze/snippets/string",
  "lib/ramaze/snippets/string/camel_case.rb",
  "lib/ramaze/snippets/string/color.rb",
@@ -513,6 +516,7 @@ Gem::Specification.new do |s|
  "lib/ramaze/template/haml.rb",
  "lib/ramaze/template/liquid.rb",
  "lib/ramaze/template/markaby.rb",
+ "lib/ramaze/template/maruku.rb",
  "lib/ramaze/template/nagoro.rb",
  "lib/ramaze/template/none.rb",
  "lib/ramaze/template/redcloth.rb",
@@ -535,7 +539,6 @@ Gem::Specification.new do |s|
  "lib/ramaze.rb",
  "lib/vendor",
  "lib/vendor/bacon.rb",
- "pkg",
  "rake_tasks",
  "rake_tasks/conf.rake",
  "rake_tasks/coverage.rake",
@@ -601,6 +604,9 @@ Gem::Specification.new do |s|
  "spec/ramaze/controller/subclass.rb",
  "spec/ramaze/controller/template_resolving.rb",
  "spec/ramaze/controller/view",
+ "spec/ramaze/controller/view/bar.xhtml",
+ "spec/ramaze/controller/view/base",
+ "spec/ramaze/controller/view/base/another.xhtml",
  "spec/ramaze/controller/view/greet.xhtml",
  "spec/ramaze/controller/view/list.xhtml",
  "spec/ramaze/controller/view/other",

data/spec/ramaze/action/file_cache.rb

@@ -22,6 +22,18 @@ class TCOtherCache < Ramaze::Controller
   cache :index
 end
 
+class TCIndexCache < Ramaze::Controller
+  map '/withparams'
+  helper :cache
+
+  def index(somearg = nil)
+    rand + somearg.to_f
+  end
+  alias :nonindex :index
+
+  cache :index, :nonindex
+end
+
 describe 'Action rendering' do
   behaves_like 'http'
 
@@ -44,5 +56,15 @@ describe 'Action rendering' do
     File.file?(public_root/'other/index').should == true
   end
 
+  should 'cache action with params' do
+    lambda{ req('/withparams/nonindex/42') }.should.not.change{ req('/withparams/nonindex/42') }
+    File.file?(public_root/'withparams/nonindex/42').should == true
+  end
+
+  should 'cache index action with params' do
+    lambda{ req('/withparams/42') }.should.not.change{ req('/withparams/42') }
+    File.file?(public_root/'withparams/42').should == true
+  end
+
   FileUtils.rm_rf public_root
 end

data/spec/ramaze/controller/actionless_templates.rb

@@ -19,7 +19,7 @@ end
 describe "Testing Actionless Templates" do
   behaves_like 'http'
   ramaze :actionless_templates => false,
-         :view_root => __DIR__/:view
+         :view_root => __DIR__/:view, :error_page => true
 
   it "should not find template file for non existant method" do
     get('/non_existant_method').status.should == 404

data/spec/ramaze/controller/subclass.rb

@@ -4,6 +4,9 @@
 require 'spec/helper'
 
 class BaseController < Ramaze::Controller
+  template :foo, :bar
+  template :one, self, :another
+
   def test() 'test' end
 end
 
@@ -18,4 +21,16 @@ describe 'Controller' do
   it 'should allow sub-classing MainController' do
     get('/test').body.should == 'test'
   end
+
+  it 'should respect template mappings set in superclass, with no explicit controller' do
+    # The template file it should use is view/bar.xhtml, as the template mapping doesn't
+    # specify a controller, so it will be implicitly relative to MainController.
+    get('/foo').body.should == 'bar'
+  end
+
+  it 'should respect template mappings set in superclass, with an explicit controller' do
+    # Note that the template file it should use is view/base/another.xhtml, because
+    # BaseController explicitly specifies the template mapping in relation to self.
+    get('/one').body.should == 'another'
+  end
 end

data/spec/ramaze/controller/template_resolving.rb

@@ -44,7 +44,7 @@ class OtherController < MainController
 
 end
 
-class AnotherController < Ramaze::Controller
+class AnotherController < MainController
   Root = __DIR__/:view
   Absolute = lambda{|path| File.join Root, path}
   Relative = lambda{|path| path}

data/spec/ramaze/controller/view/bar.xhtml

@@ -0,0 +1 @@
+bar

data/spec/ramaze/controller/view/base/another.xhtml

@@ -0,0 +1 @@
+another

data/spec/ramaze/helper/aspect.rb

@@ -8,14 +8,14 @@ class TCAspectController < Ramaze::Controller
   trait :foo => :bar
   helper :aspect
 
-  def test_before() request[:before] += 2 end
-  before(:test_before){ request[:before] = 40 }
+  def test_before() $helper_aspect_spec_test_before += 2 end
+  before(:test_before){ $helper_aspect_spec_test_before = 40 }
 
-  def test_after() request[:after] = 40 end
-  after(:test_after){ request[:after] += 2 }
+  def test_after() $helper_aspect_spec_test_after = 40 end
+  after(:test_after){ $helper_aspect_spec_test_after += 2 }
 
   def test_wrap() end
-  wrap(:test_wrap){ request[:wrap] ||= 0; request[:wrap] += 21 }
+  wrap(:test_wrap){ $helper_aspect_spec_test_wrap ||= 0; $helper_aspect_spec_test_wrap += 21 }
 
   wrap(:test_template) { '<aspect>' }
 end
@@ -29,8 +29,8 @@ class TCAspectAllController < Ramaze::Controller
   def test_all_first() 'first' end
   def test_all_second() 'second' end
 
-  before_all{ request[:all] = 40 }
-  after_all{ request[:all] += 2 }
+  before_all{ $helper_aspect_spec_all = 40 }
+  after_all{ $helper_aspect_spec_all += 2 }
 
   def test_all_after() 'after' end
 
@@ -42,51 +42,60 @@ end
 describe "AspectHelper" do
   behaves_like 'http'
   ramaze :error_page => false
-  extend Ramaze::Trinity
 
   it "shouldn't overwrite traits on inclusion" do
     TCAspectController.trait[:foo].should == :bar
   end
 
   it 'should use before' do
+    $helper_aspect_spec_test_before = nil
     get('/test_before')
-    request[:before].should == 42
+    $helper_aspect_spec_test_before.should == 42
   end
 
   it 'should use after' do
+    $helper_aspect_spec_test_after = nil
     get('/test_after')
-    request[:after].should == 42
+    $helper_aspect_spec_test_after.should == 42
   end
 
   it 'should use wrap' do
+    $helper_aspect_spec_test_wrap = nil
     get('/test_wrap')
-    request[:wrap].should == 42
+    $helper_aspect_spec_test_wrap.should == 42
   end
 
   it 'should before_all and after_all' do
+    $helper_aspect_spec_all = nil
     get('/all/test_all_first')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
+
+    $helper_aspect_spec_all = nil
     get('/all/test_all_second')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should before_all and after_all for templates' do
+    $helper_aspect_spec_all = nil
     get('/all/test_template')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should before_all and after_all for all defined actions' do
+    $helper_aspect_spec_all = nil
     get('/all/test_all_after')
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should not apply aspects to render_template' do
+    $helper_aspect_spec_all = nil
     get('/all/loop').body.gsub(/\s/,'').should == '12345'
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 
   it 'should not apply aspects to layouts' do
+    $helper_aspect_spec_all = nil
     get('/all/loop_with_layout').body.gsub(/\s/,'').should == '<div>12345</div>'
-    request[:all].should == 42
+    $helper_aspect_spec_all.should == 42
   end
 end

data/spec/ramaze/route.rb

@@ -126,6 +126,6 @@ describe 'Route' do
   it 'should not recurse given a bad route' do
     Ramaze::Route[ %r!^/good/(.+)$! ] = "/bad/%s"
     r = get('/good/hi')
-    r.status.should == 404
+    r.status.should == 500
   end
 end

data/spec/ramaze/template/tagz.rb

@@ -57,6 +57,6 @@ describe "Tagz" do
 
   it "should not respond to tagz" do
     response = get('/tagz')
-    response.status.should == 404
+    response.status.should == 500
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-ramaze
 version: !ruby/object:Gem::Version 
-  version: "2008.07"
+  version: "2008.08"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -52,7 +52,6 @@ files:
 - benchmark/test.rb
 - bin
 - bin/ramaze
-- cache.yaml
 - doc
 - doc/AUTHORS
 - doc/CHANGELOG
@@ -430,6 +429,8 @@ files:
 - lib/ramaze/helper/simple_captcha.rb
 - lib/ramaze/helper/stack.rb
 - lib/ramaze/helper/tagz.rb
+- lib/ramaze/helper/thread.rb
+- lib/ramaze/helper/ultraviolet.rb
 - lib/ramaze/helper/user.rb
 - lib/ramaze/helper/xhtml.rb
 - lib/ramaze/helper.rb
@@ -449,6 +450,7 @@ files:
 - lib/ramaze/option/holder.rb
 - lib/ramaze/option/merger.rb
 - lib/ramaze/option.rb
+- lib/ramaze/reloader.rb
 - lib/ramaze/route.rb
 - lib/ramaze/setup.rb
 - lib/ramaze/snippets
@@ -459,6 +461,7 @@ files:
 - lib/ramaze/snippets/blankslate.rb
 - lib/ramaze/snippets/dictionary.rb
 - lib/ramaze/snippets/divide.rb
+- lib/ramaze/snippets/fiber.rb
 - lib/ramaze/snippets/kernel
 - lib/ramaze/snippets/kernel/__dir__.rb
 - lib/ramaze/snippets/kernel/acquire.rb
@@ -472,7 +475,6 @@ files:
 - lib/ramaze/snippets/object/instance_variable_defined.rb
 - lib/ramaze/snippets/object/pretty.rb
 - lib/ramaze/snippets/object/scope.rb
-- lib/ramaze/snippets/object/thread_accessor.rb
 - lib/ramaze/snippets/object/traits.rb
 - lib/ramaze/snippets/ordered_set.rb
 - lib/ramaze/snippets/proc
@@ -481,7 +483,8 @@ files:
 - lib/ramaze/snippets/ramaze/caller_info.rb
 - lib/ramaze/snippets/ramaze/caller_lines.rb
 - lib/ramaze/snippets/ramaze/deprecated.rb
-- lib/ramaze/snippets/ramaze/thread_accessor.rb
+- lib/ramaze/snippets/ramaze/fiber.rb
+- lib/ramaze/snippets/ramaze/state.rb
 - lib/ramaze/snippets/string
 - lib/ramaze/snippets/string/camel_case.rb
 - lib/ramaze/snippets/string/color.rb
@@ -527,6 +530,7 @@ files:
 - lib/ramaze/template/haml.rb
 - lib/ramaze/template/liquid.rb
 - lib/ramaze/template/markaby.rb
+- lib/ramaze/template/maruku.rb
 - lib/ramaze/template/nagoro.rb
 - lib/ramaze/template/none.rb
 - lib/ramaze/template/redcloth.rb
@@ -549,7 +553,6 @@ files:
 - lib/ramaze.rb
 - lib/vendor
 - lib/vendor/bacon.rb
-- pkg
 - rake_tasks
 - rake_tasks/conf.rake
 - rake_tasks/coverage.rake
@@ -615,6 +618,9 @@ files:
 - spec/ramaze/controller/subclass.rb
 - spec/ramaze/controller/template_resolving.rb
 - spec/ramaze/controller/view
+- spec/ramaze/controller/view/bar.xhtml
+- spec/ramaze/controller/view/base
+- spec/ramaze/controller/view/base/another.xhtml
 - spec/ramaze/controller/view/greet.xhtml
 - spec/ramaze/controller/view/list.xhtml
 - spec/ramaze/controller/view/other

data/lib/ramaze/snippets/object/thread_accessor.rb

@@ -1,5 +0,0 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), '../ramaze/thread_accessor')))
-
-class Object
-  include Ramaze::ThreadAccessor
-end

data/lib/ramaze/snippets/ramaze/thread_accessor.rb

@@ -1,58 +0,0 @@
-module Ramaze
-
-  # A alike of attr_accessor and friends, but for thread variables in
-  # Thread::current
-  module ThreadAccessor
-
-    # Iterate over the names and yield accordingly.
-    # names are either objects responding to #to_sym or hashes.
-    #
-    # It's only used within this module for abstractin-purposes.
-    # Usage below.
-    def self.each(*names)
-      names.each do |name|
-        if name.respond_to?(:to_hash)
-          name.to_hash.each do |key, meth|
-            key, meth = key.to_sym, meth.to_sym
-            yield key, meth
-          end
-        else
-          key = meth = name.to_sym
-          yield key, meth
-        end
-      end
-    end
-
-    # thread_writer and thread_reader, initializer is a block that may be given
-    # and its result will be the new value in case the reader was never called
-    # before or the value wasn't set before.
-    def thread_accessor(*names, &initializer)
-      thread_writer(*names)
-      thread_reader(*names, &initializer)
-    end
-
-    # Simple writer accessor to Thread::current[key]=
-    def thread_writer(*names)
-      ThreadAccessor.each(*names) do |key, meth|
-        define_method("#{meth}="){|obj| Thread.current[key] = obj }
-      end
-    end
-
-    # Reader accessor for Thread::current[key]
-    def thread_reader(*names, &initializer)
-      ThreadAccessor.each(*names) do |key, meth|
-        if initializer
-          define_method(meth) do
-            unless Thread.current.key?(key)
-              Thread.current[key] = instance_eval(&initializer)
-            else
-              Thread.current[key]
-            end
-          end
-        else
-          define_method(meth){ Thread.current[key] }
-        end
-      end
-    end
-  end
-end