ramaze 0.1.1 → 0.1.2

data/spec/ramaze/action/basics.rb

@@ -0,0 +1,19 @@
+require 'spec/helper'
+
+describe 'Action() basics' do
+  it 'should have useful defaults' do
+    action = Ramaze::Action()
+
+    action.params.should == []
+    action.method.should be_nil
+    action.template.should be_nil 
+  end
+
+  it 'should sanitize parameters' do
+    action = Ramaze::Action :params => [[1],[2],nil,'%20'],
+                            :method => :foo
+
+    action.params.should == ['1', '2', ' ']
+    action.method.should == 'foo'
+  end
+end

data/spec/ramaze/action/render.rb

@@ -0,0 +1,18 @@
+require 'spec/helper'
+
+class TCActionOne < Ramaze::Controller
+  def index
+    'Hello, World!'
+  end
+end
+
+describe 'Action rendering' do
+  before :all do
+    ramaze
+  end
+
+  it 'should render' do
+    action = Ramaze::Action(:method => :index, :controller => TCActionOne)
+    action.render.should == 'Hello, World!'
+  end
+end

data/spec/ramaze/controller.rb

@@ -37,7 +37,7 @@ describe "Controller" do
   end
 
   def values(*url)
-    resolve(*url).last.values_at(:method, :params, :template)
+    resolve(*url).values_at(:method, :params, :template)
   end
 
   before :all do

data/spec/ramaze/controller/template_resolving.rb

@@ -11,7 +11,7 @@ class MainController < Ramaze::Controller
   end
 
   def list
-    @obj = @action.method
+    @obj = Ramaze::Action.current.method
   end
   alias_method :index, :list
   template :index, 'list'

data/spec/ramaze/dispatcher/file.rb

@@ -0,0 +1,24 @@
+require 'spec/helper'
+
+describe 'Dispatcher::File' do
+  before :all do
+    ramaze
+  end
+
+  it 'should serve from proto/public' do
+  end
+
+  it 'should serve from Global.public_root' do
+    dir = Ramaze::Global.public_root = 'spec/ramaze/public'
+    css = File.read(dir/'test_download.css')
+    re_css = get('/test_download.css')
+    re_css.body.should == css
+    re_css.status.should == 200
+  end
+
+  it 'should serve from Global.public_proto' do
+    file = (Ramaze::Global.public_proto/'error.zmr')
+    original = File.read(file)
+    get('/error.zmr').body.should == original
+  end
+end

data/spec/ramaze/error.rb

@@ -6,7 +6,6 @@ require 'open-uri'
 
 class TCErrorController < Ramaze::Controller
   map :/
-  public_root 'spec/ramaze/public'
 
   def index
     self.class.name
@@ -18,46 +17,46 @@ class TCErrorController < Ramaze::Controller
 end
 
 describe "Error" do
-  ramaze :error_page => true
+  ramaze :error_page => true, :public_root => 'spec/ramaze/public'
 
-  describe "Throwing Error" do
-    it 'erroring' do
-      response = get('/erroring')
-      response.status.should == 500
-      regex = %r(undefined local variable or method `blah' for .*?TCErrorController)
-      response.body.should =~ regex
-    end
+  before :all do
+    require 'ramaze/dispatcher/error'
+    @handle_error = Ramaze::Dispatcher::Error::HANDLE_ERROR
   end
 
-  describe "No Action" do
-    it 'default' do
-      response = get('/foobar')
-      response.status.should == 404
-      response.body.should =~ %r(No Action found for `/foobar' on TCErrorController)
-    end
+  it 'should throw errors from rendering' do
+    response = get('/erroring')
+    response.status.should == 500
+    regex = %r(undefined local variable or method `blah' for .*?TCErrorController)
+    response.body.should =~ regex
+  end
+
+  it 'should give 404 when no action is found' do
+    response = get('/illegal')
+    response.status.should == 404
+    response.body.should =~ %r(No Action found for `/foobar' on TCErrorController)
+  end
 
-    it "No Action custom" do
-      Ramaze::Dispatcher.trait[:handle_error] = { Exception => [500, '/error'] }
+  it "should give custom status when no action is found" do
+    @handle_error.should_receive(:[]).twice.
+      with(Ramaze::Error::NoAction).and_return{ [707, '/error'] }
 
-      response = get('/illegal')
-      response.status.should == 500
-      response.body.should =~ %r(No Action found for `/illegal' on TCErrorController)
-    end
+    response = get('/illegal')
+    response.status.should == 707
+    response.body.should =~ %r(No Action found for `/illegal' on TCErrorController)
   end
 
-  it "No Controller" do
-    Ramaze::Global.should_receive(:mapping).twice.and_return{ {} }
-    Ramaze::Dispatcher.trait[:handle_error].should_receive(:[]).twice.
-      with(Ramaze::Error::NoController).and_return{ [500, '/error'] }
+  it "should give 404 when no controller is found" do
+    Ramaze::Global.should_receive(:mapping).once.and_return{ {} }
     response = get('/illegal')
-    response.status.should == 500
+    response.status.should == 404
     response.body.should =~ %r(No Controller found for `/error')
   end
 
-  it "Custom Static" do
-    Ramaze::Dispatcher.trait[:handle_error].should_receive(:[]).twice.
+  it "should return custom error page" do
+    @handle_error.should_receive(:[]).twice.
       with(Ramaze::Error::NoAction).and_return{ [404, '/error404'] }
-    response = get('/foo')
+    response = get('/illegal')
     response.status.should == 404
     response.body.should == '404 - not found'
   end

data/spec/ramaze/helper/cgi.rb

@@ -0,0 +1,43 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+require 'ramaze/helper/cgi'
+
+class TCLink < Ramaze::Controller
+  map '/'
+end
+
+describe "url encode" do
+  include Ramaze::CgiHelper
+
+  it 'should url_encode strings' do
+    # ok, I believe that the web is dumb for this
+    # but this probably is a SHOULD thingy in the HTTP RFC
+    url_encode('title with spaces').should == 'title+with+spaces'
+    url_encode('[foo]').should == '%5Bfoo%5D'
+    u('//').should == '%2F%2F'
+  end
+  it 'should url_decode strings' do
+    url_decode('title%20with%20spaces').should == 'title with spaces'
+    url_decode('title+with+spaces').should == 'title with spaces'
+  end
+  it 'should be reversible' do
+    url_decode(u('../ etc/passwd')).should == '../ etc/passwd'
+  end
+end
+
+describe 'html escape' do
+  include Ramaze::CgiHelper
+
+  it 'should escape html' do
+    html_escape('& < >').should == '&amp; &lt; &gt;'
+    h('<&>').should == '&lt;&amp;&gt;'
+  end
+  it 'should unescape html' do
+    html_unescape('&lt; &amp; &gt;').should == '< & >'
+  end
+  it 'should be reversible' do
+    html_unescape(html_escape('2 > b && b <= 0')).should == '2 > b && b <= 0'
+  end
+end

data/spec/ramaze/helper/pager.rb

@@ -0,0 +1,27 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+
+class TC_PagerController < Ramaze::Controller
+  map '/'
+  helper :pager
+
+  def page
+    stuff = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+
+    items, pager = paginate(stuff, :limit => 2)
+
+    items.inspect
+  end
+
+end
+
+describe "StackHelper" do
+  before(:all){ ramaze }
+
+  it "conventional login" do
+    get('/page').body.should == '[1, 2]'
+    get("/page", Ramaze::Pager.trait[:key] => '2').body.should == '[3, 4]'
+  end
+end

data/spec/ramaze/helper/partial.rb

@@ -0,0 +1,38 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'spec/helper'
+
+class TCPartialHelperController < Ramaze::Controller
+  map '/'
+  helper :partial
+  template_root(File.dirname(__FILE__)/:template)
+
+  def index
+    '<http><head><title>#{render_partial("/title")}</title></head></http>'
+  end
+
+  def title
+    "Title"
+  end
+
+  def composed
+    @here = 'there'
+    'From Action | ' +
+    render_template("partial.xhtml")
+  end
+end
+
+describe "PartialHelper" do
+  before :all do
+    ramaze
+  end
+
+  it "should render partials" do
+    get('/').body.should == '<http><head><title>Title</title></head></http>'
+  end
+
+  it 'should be able to render a template in the current scope' do
+    get('/composed').body.should == 'From Action | From Partial there'
+  end
+end

data/spec/ramaze/helper/template/partial.xhtml

@@ -0,0 +1 @@
+From Partial #@here

data/spec/ramaze/inform/informer.rb

@@ -4,8 +4,8 @@ describe 'Informer' do
   before(:each) do
     @out = []
     def @out.puts(*args) push(*args) end
+    Ramaze::Informer.trait[:colorize] = false
     @inform = Ramaze::Informer.new(@out)
-    @inform.colorize = false
   end
 
   def format(tag, string)

data/spec/ramaze/localize.rb

@@ -9,7 +9,7 @@ Ramaze::Tool::Localize.trait :enable    => true,
                              :file      => 'spec/ramaze/conf/locale_%s.yaml'.freeze,
                              :languages => %w[en de]
 
-Ramaze::Dispatcher::Action.trait[:filter] << Ramaze::Tool::Localize
+Ramaze::Dispatcher::Action::FILTER << Ramaze::Tool::Localize
 
 class TCLocalize < Ramaze::Controller
   map '/'

data/spec/ramaze/morpher.rb

@@ -53,9 +53,9 @@ end
 describe "Morpher" do
   before :all do
     ramaze
-    Ramaze::Template::Ezamar.trait[:transform_pipeline] = [
-      Ezamar::Element, Ezamar::Morpher, Ezamar::Template
-    ]
+    pipeline = Ramaze::Template::Ezamar::TRANSFORM_PIPELINE
+    pipeline.clear
+    pipeline.push(Ezamar::Element, Ezamar::Morpher)
   end
 
   def clean_get(*url)

data/spec/ramaze/request.rb

@@ -6,8 +6,6 @@ require 'spec/helper'
 class TCRequestController < Ramaze::Controller
   map '/'
 
-  trait :public => 'spec/ramaze/public'
-
   def is_post()   request.post?.to_s end
   def is_get()    request.get?.to_s end
   def is_put()    request.put?.to_s end
@@ -50,7 +48,7 @@ end
 
 describe "Request" do
   options = ramaze_options rescue {}
-  ramaze options.merge(:mapping => {'/' => TCRequestController})
+  ramaze options.merge(:public_root => 'spec/ramaze/public')
 
   describe "POST" do
     it "give me the result of request.post?" do

data/spec/ramaze/template.rb

@@ -4,13 +4,15 @@
 require 'spec/helper'
 require 'ramaze/template'
 
-module Ramaze::Template
-  class TestTemplate < Template
-    Ramaze::Controller.register_engine self, %w[ test ]
-
-    class << self
-      def transform action
-        action.values_at(:method, :params, :template).to_yaml
+module Ramaze
+  module Template
+    class TestTemplate < Template
+      ENGINES[self] = %w[ test ]
+
+      class << self
+        def transform action
+          action.values_at(:method, :params, :template).to_yaml
+        end
       end
     end
   end

data/spec/ramaze/template/haml.rb

@@ -6,6 +6,7 @@ require 'spec/helper'
 testcase_requires 'ramaze/template/haml'
 
 class TCTemplateHamlController < Ramaze::Controller
+  map '/'
   template_root 'spec/ramaze/template/haml/'
   trait :engine => Ramaze::Template::Haml
 
@@ -20,7 +21,7 @@ class TCTemplateHamlController < Ramaze::Controller
 end
 
 describe "Simply calling" do
-  ramaze(:mapping => {'/' => TCTemplateHamlController})
+  ramaze(:compile => true)
 
   it "index" do
     get('/').body.strip.should ==

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
+rubygems_version: 0.9.4
 specification_version: 1
 name: ramaze
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-05-27 00:00:00 +09:00
+  version: 0.1.2
+date: 2007-06-17 00:00:00 +09:00
 summary: Ramaze tries to be a very simple Webframework without the voodoo
 require_paths: 
 - lib
@@ -35,7 +35,7 @@ post_install_message: |-
       ramaze --create yourproject
   
   * Browse and try the Examples in
-      /usr/lib/ruby/gems/1.8/gems/ramaze-0.1.1/examples
+      /usr/lib/ruby/gems/1.8/gems/ramaze-0.1.2/examples
   
   ============================================================
 authors: 
@@ -62,6 +62,7 @@ files:
 - examples/blog/public/styles/blog.css
 - examples/nitro_form.rb
 - examples/caching.rb
+- examples/memleak_detector.rb
 - examples/todolist
 - examples/todolist/src
 - examples/todolist/src/element
@@ -80,8 +81,6 @@ files:
 - examples/todolist/public/css
 - examples/todolist/public/favicon.ico
 - examples/todolist/public/ramaze.png
-- examples/todolist/public/error.xhtml
-- examples/todolist/public/404.jpg
 - examples/identity.rb
 - examples/element.rb
 - examples/simple.rb
@@ -189,13 +188,21 @@ files:
 - spec/ramaze/template/amrita2/data.amrita
 - spec/ramaze/template/amrita2.rb
 - spec/ramaze/cache.rb
+- spec/ramaze/action
+- spec/ramaze/action/basics.rb
+- spec/ramaze/action/render.rb
 - spec/ramaze/template.rb
 - spec/ramaze/tidy.rb
 - spec/ramaze/helper
+- spec/ramaze/helper/pager.rb
 - spec/ramaze/helper/link.rb
+- spec/ramaze/helper/template
+- spec/ramaze/helper/template/partial.xhtml
 - spec/ramaze/helper/cache.rb
+- spec/ramaze/helper/partial.rb
 - spec/ramaze/helper/feed.rb
 - spec/ramaze/helper/file.rb
+- spec/ramaze/helper/cgi.rb
 - spec/ramaze/helper/redirect.rb
 - spec/ramaze/helper/form.rb
 - spec/ramaze/helper/flash.rb
@@ -226,6 +233,8 @@ files:
 - spec/ramaze/public/ramaze.png
 - spec/ramaze/public/test_download.css
 - spec/ramaze/public/error404.xhtml
+- spec/ramaze/dispatcher
+- spec/ramaze/dispatcher/file.rb
 - spec/ramaze/gestalt.rb
 - spec/ramaze/session.rb
 - spec/ramaze/element.rb
@@ -291,6 +300,7 @@ files:
 - lib/ramaze/template/liquid.rb
 - lib/ramaze/template/remarkably.rb
 - lib/ramaze/template/ezamar
+- lib/ramaze/template/ezamar/render_partial.rb
 - lib/ramaze/template/ezamar/engine.rb
 - lib/ramaze/template/ezamar/element.rb
 - lib/ramaze/template/ezamar/morpher.rb
@@ -298,14 +308,18 @@ files:
 - lib/ramaze/template/amrita2.rb
 - lib/ramaze/cache.rb
 - lib/ramaze/snippets.rb
+- lib/ramaze/action
+- lib/ramaze/action/render.rb
 - lib/ramaze/template.rb
 - lib/ramaze/global
 - lib/ramaze/global/globalstruct.rb
 - lib/ramaze/global/dsl.rb
 - lib/ramaze/helper
 - lib/ramaze/helper/markaby.rb
+- lib/ramaze/helper/pager.rb
 - lib/ramaze/helper/link.rb
 - lib/ramaze/helper/cache.rb
+- lib/ramaze/helper/partial.rb
 - lib/ramaze/helper/feed.rb
 - lib/ramaze/helper/file.rb
 - lib/ramaze/helper/cgi.rb
@@ -324,6 +338,7 @@ files:
 - lib/ramaze/inform/xosd.rb
 - lib/ramaze/inform/syslog.rb
 - lib/ramaze/inform/growl.rb
+- lib/ramaze/inform/knotify.rb
 - lib/ramaze/inform/hub.rb
 - lib/ramaze/inform/informing.rb
 - lib/ramaze/inform/analogger.rb
@@ -340,7 +355,6 @@ files:
 - lib/ramaze/controller
 - lib/ramaze/controller/resolve.rb
 - lib/ramaze/controller/error.rb
-- lib/ramaze/controller/render.rb
 - lib/ramaze/controller.rb
 - lib/ramaze/sourcereload.rb
 - lib/ramaze/dispatcher.rb