ramaze 0.3.0 → 0.3.5

data/doc/meta/announcement.txt

@@ -1,9 +1,9 @@
-This time we are proud to announce Version 0.3.0 of Ramaze, the light and
+This time we are proud to announce Version 0.3.5 of Ramaze, the light and
 modular open source web framework.
 
 This release features a lot of work directly from our community and we are
 really greatful for everybody who helped in testing, patching and contributing
-new exciting features.
+exciting new features.
 
 Our extensive set of specs and docs now covers almost every detail of
 implementation and usage. Ramaze is under development by a growing community
@@ -34,45 +34,54 @@ Simple example:
 
 Special (alphabetic) thanks go to:
 
-Aman 'tmm1' Gupta      - lots of patches and friendly support
-Antonio Cangiano       - Article: http://tiny.cc/tRLfm
-Carlo Zottmann         - First patch!
-Jonathan 'Kashia' Buch - patches for gettext and Og support
-Pistos                 - PR through awesome screencasts
+  Aman 'tmm1' Gupta         - patches and support
+  Carlo Zottmann            - first patch!
+  Chris 'celldee' Duncan    - first patch!
+  Gabriele 'riffraff' Renzi - patches for file dispatcher
+  jeedee                    - new Ramaze logo
+  Jonathan 'Kashia' Buch    - patches and support
+  Keita Yamaguchi           - first patch!
+  Pistos                    - lots of friendly support
+  skaar                     - first patch!
+
+
+Selected summary of the 62 patches from 0.3.0 to 0.3.5:
+
+  Core
+    - Ramaze::Contrib::Route made available by default as Ramaze::Route (backwards compatibility retained)
+    - Support added for ETag and If-Modified-Since in Dispatcher::File
+    - Adapter for LiteSpeed webserver added
+    - Added ability to set default session cookie options using Session::COOKIE
+    - Support added for Content-Language based localization and gettext
+
+  Templates
+    - Support added for passing in locals to render_template
+    - Added support for symbol argument to template_root
+    - render_template no longer requires template extensions
+    - Dots allowed in template extensions (template.html.erb)
+
+  Templating Engines
+    - Builder templating engine added to produce XML
+    - RedCloth templating engine added
+    - Amrita2 templating engine updated to latest release
+
+  Helpers
+    - Simple EmailHelper added
+    - IdentityHelper updated for latest ruby-openid
+    - MarukuHelper added
+    - AuthHelper cleaned up
+    - LinkHelper improved: A(), R(), Rs() and breadcrumbs
+
+  Examples
+    - All examples were standardized to include rubygems
+    - Simple file upload example added
+    - Search and diff functionality added to Rapaste
+
+  Misc
+    - Read and read/write issues fixed in Ramaze::Store
+    - Fix applied for running Ramaze apps within IDEs on Windows
 
 
-Selected summary of the 118 patches from 0.2.1 to 0.3.0:
-
-  - Specs switched from RSpec to bacon; Ramaze now runs on Ruby 1.9.
-
-  - /lib/proto (pregenerated base source code) updated to a new structure.
-
-  - Oddities in gem version of bin/ramaze fixed (hopefully? :) )
-
-  - Layouts fixed so the method on the right controller is called.
-
-  - contrib/facebook and simple facebook app example added.
-
-  - Lambda router support added to contrib/route.
-
-  - examples/rapaste added.
-
-  - gettext contrib added; localize ramaze via gettext.
-
-  - Adapter for Thin Ruby webserver added.
-
-  - Index files can now be put into public directories and subdirectories.
-
-  - examples/blog switched from Og to Sequel.
-
-  - view/ is now the subdirectory for templates; if not found, Ramaze falls
-    back to template/.
-
-  - Default error pages updated: colour gradient removed; textmate link added;
-    Javascript optimized; CSS tweaked.
-
-  - Templates are no longer searched for in public/.
-
 A complete Changelog is available at
 http://darcs.ramaze.net/ramaze/doc/CHANGELOG
 

data/doc/tutorial/todolist.mkd

@@ -50,16 +50,14 @@ Ramaze comes at the moment only with a simple wrapper of the YAML::Store.
 So we are going to base this on the tools available, you can just do the same
 with your ORM or database-library of choice.
 
-So first, edit the `src/model.rb` to fit better into our application:
+So first, create a `model/todolist.rb` for our application:
 
     TodoList = Store::Default.new('todolist.yaml')
 
 Let's add some items as well to have a base to start from.
 
-    {
-      'Laundry'     => {:done => false},
+    { 'Laundry'     => {:done => false},
       'Wash dishes' => {:done => false},
-
     }.each do |title, value|
       TodoList[title] = value
     end
@@ -69,7 +67,7 @@ Let's add some items as well to have a base to start from.
 
 Now let's get our hands dirty and just edit the templates for our to-do list.
 
-Start with editing `template/index.xhtml`, it is using the default templating
+Start with editing `view/index.xhtml`, it is using the default templating
 of Ramaze, called Ezamar.
 
 The index.xhtml currently contains a default welcome page, remove the contents.
@@ -142,7 +140,7 @@ application and secondly provides excellent ways of changing the complete
 Structure of the Model or View independent from each other.
 
 OK, enough of the theory, you will see the benefits in an instant. Go on and
-edit the file `src/controller/main.rb`.
+edit the file `controller/main.rb`.
 
 The contents of it are like following:
 
@@ -208,12 +206,12 @@ Some things you should know:
 We set out to build the ultimate to-do list, but there are still some things
 missing. First off, we want to add new tasks, so let's get that done.
 
-Add a link on the `template/index.xhtml` like this:
+Add a link on the `view/index.xhtml` like this:
 
     <h1>TodoList</h1>
     <a href="/new">New Task</a>
 
-Open a new file `template/new.xhtml` with a form to add a new task.
+Open a new file `view/new.xhtml` with a form to add a new task.
 
     <html>
       <head>
@@ -267,7 +265,7 @@ Now you can create as many tasks as you want, please don't get overworked ;)
 Since the nature of tasks is to be done eventually
 we will need some way to mark it as done or open tasks again.
 
-Jump into `template/index.xhtml` and do the following:
+Jump into `view/index.xhtml` and do the following:
 
 
     <?r @tasks.each do |title, status, toggle| ?>
@@ -369,7 +367,7 @@ and an corresponding method while we're at it:
       redirect Rs()
     end
 
-Now jumping to `template/index.xhtml` again, change it so it shows the link:
+Now jumping to `view/index.xhtml` again, change it so it shows the link:
 
     <?r @tasks.each do |title, status, toggle, delete| ?>
       <li>
@@ -459,7 +457,7 @@ Please note that instance variables reflecting the parameters are set.
 
 And let's change our templates as well.
 
-First the `template/index.xhtml`
+First the `view/index.xhtml`
 
     <Page title="TodoList">
       <a href="/new">New Task</a>
@@ -476,7 +474,7 @@ First the `template/index.xhtml`
       <?r end ?>
     </Page>
 
-and the `template/new.xhtml`
+and the `view/new.xhtml`
 
     <Page title="New Task">
       <a href="/">Back to TodoList</a>

data/examples/blog/start.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 require 'src/model'

data/examples/caching.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller

data/examples/element.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 class Page < Ezamar::Element
@@ -40,3 +41,5 @@ class MainController < Ramaze::Controller
     }
   end
 end
+
+Ramaze.start

data/examples/hello.rb

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-
+require 'rubygems'
 require 'ramaze'
 
 # you can access it now with http://localhost:7000/

data/examples/identity.rb

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-
+require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller
@@ -8,14 +6,13 @@ class MainController < Ramaze::Controller
 
   def index
     if session[:openid_identity]
-      %{
-        <h1>#{flash[:success]}</h1>
-        <p>You are logged in as #{session[:openid_identity]}</p>
-      }
+      %{<h1>#{flash[:success]}</h1>
+        <p>You are logged in as #{session[:openid_identity]}</p>}
     else
       openid_login_form
     end
   end
 end
 
-Ramaze.start
+Ramaze::Inform.loggers.each{|l| l.log_levels << :dev }
+Ramaze.start :adapter => :mongrel

data/examples/layout.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller

data/examples/linking.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 class LinkingController < Ramaze::Controller

data/examples/memleak_detector.rb

@@ -1,6 +1,7 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+require 'rubygems'
 require 'ramaze'
 
 # you can access it now with http://localhost:7000/

data/examples/nitro_form.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 gem 'facets', '=1.4.5'

data/examples/rammit/start.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 
 require 'src/model'

data/examples/rapaste/Rakefile

@@ -26,3 +26,10 @@ task :fill do
     end
   end
 end
+
+desc 'run specs'
+task :spec do
+  sh 'ruby spec/rapaste.rb'
+end
+
+task :default => :spec

data/examples/rapaste/{src/controller.rb → controller/paste.rb}

@@ -17,7 +17,16 @@ class PasteController < Ramaze::Controller
     @paginated = ordered.paginate(start.to_i, 10)
     @pager = paginator(@paginated, '/list/page')
     @pastes = @paginated
-    @style = session[ :theme ] || STYLE
+    @style = style
+  end
+
+  def search
+    if needle = request['substring'] and not needle.empty?
+      limit = 50
+      @pastes = Paste.where( "text LIKE '%' || ? || '%'", request[ 'substring' ] ).limit( limit ).order( :created.DESC ).all
+      @hit_limit = ( @pastes.size == limit )
+      @style = session[ :theme ] || STYLE
+    end
   end
 
   def save
@@ -40,8 +49,7 @@ class PasteController < Ramaze::Controller
   def view(id, format)
     @paste, @format = paste_for(id), format
     @syntax = @paste.syntax_name
-    @style = session[ :theme ] || STYLE
-    @formatted = @paste.view(format, @style)
+    @formatted = @paste.view(format, style)
 
     ordered = Paste.order(:created.DESC)
     @paginated = ordered.paginate(id.to_i, 1)
@@ -60,10 +68,27 @@ class PasteController < Ramaze::Controller
     session[ :theme ] = theme_name
   end
 
+  def diff(from, to)
+    paste1, paste2 = Paste[from], Paste[to]
+    cs1 = Digest::MD5.hexdigest(paste1.text)
+    cs2 = Digest::MD5.hexdigest(paste2.text)
+    File.open(f1 = Dir.tmpdir/cs1, 'w+'){|io| io.puts(paste1.text) }
+    File.open(f2 = Dir.tmpdir/cs2, 'w+'){|io| io.puts(paste2.text) }
+    diff = `diff -up #{f1} #{f2}`.strip
+    FileUtils.rm(f1)
+    FileUtils.rm(f2)
+
+    Uv.parse(diff, 'xhtml', 'diff', true, style)
+  end
+
   private
 
   def paste_for(id)
     redirect Rs() unless paste = Paste[:id => id.to_i]
     paste
   end
+
+  def style
+    @style ||= session[ :theme ] || STYLE
+  end
 end

data/examples/rapaste/{src/model.rb → model/paste.rb}

@@ -1,7 +1,3 @@
-require 'sequel'
-
-DB = Sequel('sqlite:///rapaste.sqlite')
-
 class Paste < Sequel::Model(:paste)
   set_schema do
     primary_key :id

data/examples/rapaste/public/css/display.css

@@ -81,6 +81,12 @@ div.item_meta span.syntax {
   border-right: 1px solid #ccc;
 }
 
+div.item_meta span.paste_id {
+  background: #fff;
+  padding: 0em 0.5em 0em 0.5em;
+  border-right: 1px solid #ccc;
+}
+
 div.item pre {
   margin: 0.5em;
   padding: 0.5em;
@@ -177,3 +183,14 @@ div#menu {
   background: #ddd;
   text-align: center;
 }
+
+form#search {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  font-size: 0.9em;
+}
+
+form#search input {
+  font-size: 0.9em;
+}

data/examples/rapaste/spec/rapaste.rb

@@ -9,7 +9,7 @@ require 'start'
 describe 'RaPaste' do
   behaves_like 'http'
   ramaze :public_root   => base/:public,
-         :template_root => base/:template
+         :template_root => base/:view
 
   it 'should show an empty list on the list page' do
     page = get('/list')
@@ -24,7 +24,7 @@ describe 'RaPaste' do
 
   it 'should show a new paste form' do
     page = get('/')
-    form = Hpricot(page.body).at(:form)
+    form = Hpricot(page.body).at('form#new_paste')
     form[:action].should == '/save'
     form[:method].should == 'POST'
     form.at(:textarea)[:name].should == 'text'

data/examples/rapaste/start.rb

@@ -1,4 +1,8 @@
+require 'rubygems'
+require 'tmpdir'
+
 require 'ramaze'
+require 'sequel'
 require 'uv'
 
 Ramaze::Inform.debug "Initializing UltraViolet..."
@@ -11,10 +15,11 @@ UV_PRIORITY_NAMES = %w[ ruby plain_text html css javascript yaml diff ]
 STYLE = 'iplastic'
 
 Ramaze::Inform.debug "done."
-
 Ramaze.contrib :route
 
-require 'src/model'
-require 'src/controller'
+DB = Sequel.sqlite
+
+require 'model/paste'
+require 'controller/paste'
 
-Ramaze.start :adapter => :mongrel, :port => 9952
+Ramaze.start

data/examples/rapaste/{template → view}/layout.xhtml

@@ -12,6 +12,9 @@
     <div id="menu">
       <a href="/">New</a>
       <a href="/list">List</a>
+      <form id="search" action="/search" method="GET">
+        Search: <input type="text" name="substring"/>
+      </form>
     </div>
     #@content
     <div id="footer">