ramaze 0.3.0 → 0.3.5

data/lib/ramaze/template/bijou.rb

@@ -0,0 +1,39 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'bijou'
+
+module Ramaze
+  module Template
+
+    # Is responsible for compiling a template using the Bijou templating engine.
+    # Can be found at: http://bijou.rubyforge.org/
+
+    class Bijou < Template
+
+      ENGINES[self] = %w[ bijou rbb ]
+
+      class << self
+
+        # Transform via Haml templating engine
+
+        def transform action
+          compiled = wrap_compile(action)
+          context = ::Bijou::Context.new(::Bijou::Config.new)
+          # context.container_callback = method(:container_callback)
+          # context.component_callback = method(:component_callback)
+          ::Bijou::Processor.execute(context, compiled, 'GeneralView', {})
+        end
+
+        # Instantiates Haml::Engine with the template and haml_options trait from
+        # the controller.
+
+        def compile(action, template)
+          parser = ::Bijou::Parser.new
+          parser.parse('GeneralView', template)
+        end
+      end
+    end
+  end
+end
+

data/lib/ramaze/template/builder.rb

@@ -0,0 +1,28 @@
+require 'builder'
+
+module Ramaze
+  module Template
+
+      class Builder < Template
+        ENGINES[self] = %w[ builder rxml ]
+
+        class << self
+          def transform action
+            if response = Response.current
+              response['Content-Type'] = "application/xml"
+            end
+
+            template = wrap_compile(action)
+            action.instance.instance_eval(template, action.template || __FILE__)
+          end
+
+          def compile action, template
+            "xml = ::Builder::XmlMarkup.new(:indent => 2)\n" +
+            template +
+            "\nxml.target!\n"
+          end
+        end
+      end
+
+  end
+end

data/lib/ramaze/template/redcloth.rb

@@ -0,0 +1,24 @@
+require 'redcloth'
+
+module Ramaze
+  module Template
+
+    # Is responsible for compiling a template using the RedCloth templating engine.
+    # Can be found at: http://whytheluckystiff.net/ruby/redcloth/
+
+    class RedCloth < Erubis
+      ENGINES[self] = %w[ redcloth ]
+
+      class << self
+        def transform(action)
+          restrictions = action.controller.trait[:redcloth_options] || []
+          rules = action.controller.trait[:redcloth_options] || []
+
+          # Erubis -> RedCloth -> HTML
+          redcloth = ::RedCloth.new(super, restrictions)
+          redcloth.to_html(*rules)
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/template/sass.rb

@@ -18,7 +18,9 @@ module Ramaze
         # Transform via Sass templating engine
 
         def transform action
-          Response.current['Content-Type'] = "text/css"
+          if response = Response.current
+            response['Content-Type'] = "text/css"
+          end
           sass = wrap_compile(action)
           sass.to_css()
         end

data/lib/ramaze/tool/create.rb

@@ -43,7 +43,8 @@ module Ramaze
           directories, files =
             Dir[@basedir / '**' / '*'].partition{ |f| File.directory?(f) }
 
-          create_dirs(*directories)
+          # gem packaging removes empty model directory, so add it in ourselves
+          create_dirs(*Array[ @basedir/'model', *directories ].uniq)
           copy_files(*files)
 
           puts "\nStart your new ramaze app: ruby #{project}/start.rb"

data/lib/ramaze/tool/localize.rb

@@ -59,7 +59,12 @@ class Ramaze::Tool::Localize
     # `localize` for more information.
 
     def localize_body(body, options)
-      locale = (session[:LOCALE] || set_session_locale).to_s
+      locale =
+        if trait[:languages].include?(response["Content-Language"])
+          response["Content-Language"]
+        else
+          (session[:LOCALE] || set_session_locale).to_s
+        end
 
       body.gsub!(trait[:regex]) do
         localize($1, locale) unless $1.to_s.empty?

data/lib/ramaze/trinity/request.rb

@@ -69,6 +69,14 @@ module Ramaze
       Array[value, *params.values_at(*keys)]
     end
 
+    def to_ivs(*args)
+      instance = Action.current.instance
+      args.each do |arg|
+        next unless value = self[arg]
+        instance.instance_variable_set("@#{arg}", value)
+      end
+    end
+
     unless method_defined?(:rack_params)
       alias rack_params params
 

data/lib/ramaze/trinity/session.rb

@@ -70,6 +70,10 @@ module Ramaze
 
     IP_COUNT_LIMIT = 1000 unless defined?(IP_COUNT_LIMIT)
 
+    # Holds the default cookie used for sessions
+
+    COOKIE = { :path => '/' }
+
     class << self
 
       # called from Ramaze::startup and adds Cache.sessions if cookies are
@@ -95,11 +99,10 @@ module Ramaze
     def initialize request
       @session_id = (request.cookies[SESSION_KEY] || random_key)
 
-      ip = request.remote_addr
-      IP_COUNT[ip] << @session_id
-
-      if IP_COUNT[ip].size > IP_COUNT_LIMIT
-        sessions.delete(IP_COUNT[ip].shift)
+      unless IP_COUNT.nil?
+        ip = request.remote_addr
+        IP_COUNT[ip] << @session_id
+        sessions.delete(IP_COUNT[ip].shift) if IP_COUNT[ip].size > IP_COUNT_LIMIT
       end
 
       @flash = Ramaze::SessionFlash.new

data/lib/ramaze/version.rb

@@ -5,7 +5,7 @@ module Ramaze #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rake_tasks/gem.rake

@@ -17,7 +17,6 @@ spec =
         s.post_install_message = POST_INSTALL_MESSAGE
 
         s.add_dependency('rake', '>=0.7.3')
-        s.add_dependency('rspec', '>=1.0.2')
         s.add_dependency('rack', '>=0.2.0')
         # s.required_ruby_version = '>= 1.8.5'
 

data/rake_tasks/maintenance.rake

@@ -209,11 +209,14 @@ def authors
     'clive@crous.co.za'                       => 'Clive Crous',
     'comp.lang.zenix+ramaze@gmail.com'        => 'zenix',
     'jesuswasramazing.10.pistos@geoshell.com' => 'Pistos',
+    'jesusisramazing.10.pistos@geoshell.com'  => 'Pistos',
     'manveru@weez-int.com'                    => 'Michael Fellinger',
     'm.fellinger@gmail.com'                   => 'Michael Fellinger',
-    'outtenr@gmail.com'                       => 'Carlo Zottmann',
+    'outtenr@gmail.com'                       => 'Richard Outten',
     'rff.rff@gmail.com'                       => 'Gabriele Renzi',
+    'skaar@waste.org'                         => 'skaar',
     'stephan@spaceboyz.net'                   => 'Stephan Maka',
+    'keita.yamaguchi@gmail.com'               => 'Keita Yamaguchi',
   }
 
   mapping = {}

data/spec/contrib/route.rb

@@ -3,20 +3,12 @@ require 'spec/helper'
 Ramaze.contrib :route
 
 class MainController < Ramaze::Controller
-  def float(flt)
-    "Float: #{flt}"
+  def text(num)
+    "text: #{num}"
   end
 
-  def string(str)
-    "String: #{str}"
-  end
-
-  def price(p)
-    "Price: \$#{p}"
-  end
-
-  def sum(a, b)
-    a.to_i + b.to_i
+  def bar
+    "bar"
   end
 end
 
@@ -25,61 +17,20 @@ describe 'Route' do
   ramaze
   @route = Ramaze::Contrib::Route
 
-  it 'should take custom lambda routers' do
-    @route['string'] = lambda {|path, req| path if path =~ %r!^/string! }
-    @route['string'].class.should == Proc
-
-    @route['calc sum'] = lambda do |path, req|
-      if req[:do_calc]
-        lval, rval = req[:a, :b]
-        rval = rval.to_i * 10
-        "/sum/#{lval}/#{rval}"
-      end
-    end
-  end
-
-  it 'should be possible to define routes' do
-    @route[%r!^/(\d+\.\d{2})$!] = "/price/%.2f"
-    @route[%r!^/(\d+\.\d{2})$!].should == "/price/%.2f"
-
-    @route[%r!^/(\d+\.\d+)!] = "/float/%.3f"
-    @route[%r!^/(\d+\.\d+)!].should == "/float/%.3f"
-
-    @route[%r!^/(\w+)!] = "/string/%s"
-    @route[%r!^/(\w+)!].should == "/string/%s"
-  end
-
-  it 'should be used - /float' do
-    r = get('/123.123')
-    r.status.should == 200
-    r.body.should == 'Float: 123.123'
-  end
-
-  it 'should be used - /string' do
-    r = get('/foo')
-    r.status.should == 200
-    r.body.should == 'String: foo'
-  end
-
-  it 'should use %.3f' do
-    r = get('/123.123456')
-    r.status.should == 200
-    r.body.should == 'Float: 123.123'
-  end
-
-  it 'should resolve in the order added' do
-    r = get('/12.84')
-    r.status.should == 200
-    r.body.should == 'Price: $12.84'
+  it 'should provide backwards compat wrapper to Ramaze::Route' do
+    @route[ %r!^/(\d+)\.te?xt$! ] = "/text/%d"
+    @route[ 'foobar' ] = lambda{ |path, request|
+      '/bar' if path == '/foo' and request[:bar] == '1'
+    }
   end
 
-  it 'should use lambda routers' do
-    r = get('/string/abc')
+  it 'should work' do
+    r = get('/123.txt')
     r.status.should == 200
-    r.body.should == 'String: abc'
+    r.body.should == 'text: 123'
 
-    r = get('/', 'do_calc=1&a=2&b=6')
+    r = get('/foo', 'bar=1')
     r.status.should == 200
-    r.body.should == '62'
+    r.body.should == 'bar'
   end
 end

data/spec/examples/linking.rb

@@ -9,10 +9,10 @@ describe 'Linking' do
     r = get('/').body
     r.should.include('<a href="/help">Help?</a>')
   end
-  
+
   it 'should provide a link to another controller' do
     r = get('/help').body
     r.should.include('<a href="/link_to/another">A Different Controller</a>')
   end
 
-end
+end

data/spec/examples/templates/template_redcloth.rb

@@ -0,0 +1,28 @@
+require 'spec/helper'
+
+spec_require 'redcloth'
+require 'examples/templates/template_redcloth'
+
+describe 'Template RedCloth' do
+  behaves_like 'http'
+  ramaze
+
+  it '/' do
+    html = get('/').body.strip
+    html.should =~ %r(<a href=\"/\">Home</a>)
+    html.should =~ %r(<a href=\"/internal\">internal</a>)
+    html.should =~ %r(<a href=\"/external\">external</a>)
+  end
+
+  %w[/internal /external].each do |url|
+    it url do
+      name = url.gsub(/^\//, '')
+      response = get(url)
+      response.status.should == 200
+      html = response.body
+      html.should.not == nil
+      html.should =~ %r(<title>Template::RedCloth #{name}</title>)
+      html.should =~ %r(<h1>The #{name} Template for RedCloth</h1>)
+    end
+  end
+end

data/spec/ramaze/controller/subclass.rb

@@ -0,0 +1,21 @@
+#          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 BaseController < Ramaze::Controller
+  def test() 'test' end
+end
+
+class MainController < BaseController
+  engine :None
+end
+
+describe 'Controller' do
+  behaves_like 'http'
+  ramaze
+
+  it 'should allow sub-classing MainController' do
+    get('/test').body.should == 'test'
+  end
+end

data/spec/ramaze/dispatcher/file.rb

@@ -21,4 +21,35 @@ describe 'Dispatcher::File' do
     end
     get('/favicon.ico').body.should == original
   end
+
+  it 'should send ETag' do
+    res = get '/test_download.css'
+    res.headers['ETag'].should.not.be == nil
+    res.headers['ETag'].length.should == 34  # "32 hash" 
+  end
+
+  it 'should send Last-Modified' do
+    res = get '/test_download.css'
+    res.headers['Last-Modified'].should.not.be == nil
+    res.headers['Last-Modified'].should == File.stat(@public_root/'test_download.css').mtime.httpdate
+  end
+
+  it 'should respect ETag with IF_NONE_MATCHES' do
+    res = get '/test_download.css'
+    etag = res.headers['ETag']
+    etag.should.not.be == nil
+    res = get '/test_download.css', :if_none_match=>etag
+    res.status.should == 304
+    res.body.should == ''
+  end
+
+  it 'should respect If-Modified' do
+    res = get '/test_download.css'
+    mtime = res.headers['Last-Modified']
+    mtime.should.not.be == nil
+    res = get '/test_download.css', :if_modified_since=>mtime
+    res.status.should == 304
+    res.body.should == ''
+  end
+
 end

data/spec/ramaze/helper/link.rb

@@ -6,11 +6,24 @@ require 'ramaze/helper/link'
 
 class TCLink < Ramaze::Controller
   map '/'
+  def index; end
 end
 
+class TCLink2 < Ramaze::Controller
+  map '/2'
+  def index; end
+end
+
+ramaze
+
 describe "A" do
   extend Ramaze::LinkHelper
 
+  before do
+    # initialize Ramaze::Controller.current for Rs()
+    Ramaze::Controller.handle('/')
+  end
+
   it 'should build links' do
     A('title', :href => '/').should == %(<a href="/">title</a>)
     A('title', :href => '/foo').should == %(<a href="/foo">title</a>)
@@ -21,6 +34,10 @@ describe "A" do
     a.should =~ /class="none"/
     a.should =~ /href="\/foo"/
   end
+
+  it 'should build position independend links' do
+    A(TCLink, :foo).should == %(<a href="/foo">foo</a>)
+  end
 end
 
 describe 'R' do
@@ -34,6 +51,24 @@ describe 'R' do
   end
 end
 
+describe 'Rs' do
+  extend Ramaze::LinkHelper
+
+  it 'should build links for current controller' do
+    Ramaze::Controller.handle('/2')
+    Rs(:index).should == '/2/index'
+
+    Ramaze::Controller.handle('/')
+    Rs(:index).should == '/index'
+  end
+
+  it 'should treat Rs() like R() when Controller given' do
+    Ramaze::Controller.handle('/2')
+    Rs(TCLink, :index).should == '/2/index'
+  end
+
+end
+
 describe 'breadcrumbs' do
   extend Ramaze::LinkHelper
 
@@ -47,4 +82,15 @@ describe 'breadcrumbs' do
       "<a href=\"/file/dir/listing/is/cool\">cool</a>"
     ].join('/')
   end
+
+  it 'should lay out breadcrumbs with href prefix' do
+    breadcrumbs('/file/dir/listing/is/cool', '/', '/', '/prefix/path').
+      should == [
+      "<a href=\"/prefix/path/file\">file</a>",
+      "<a href=\"/prefix/path/file/dir\">dir</a>",
+      "<a href=\"/prefix/path/file/dir/listing\">listing</a>",
+      "<a href=\"/prefix/path/file/dir/listing/is\">is</a>",
+      "<a href=\"/prefix/path/file/dir/listing/is/cool\">cool</a>"
+    ].join('/')
+  end
 end