manveru-innate 2009.02.21 → 2009.02.25

data/CHANGELOG

@@ -1,3 +1,115 @@
+[04201ef | Wed Feb 25 06:27:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * cleanup
+
+[295a241 | Wed Feb 25 06:27:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add Traited#class_trait and docs
+
+[6ed8499 | Wed Feb 25 06:04:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * rebuild middleware if block is passed to Innate.start
+
+[8ce86a7 | Wed Feb 25 06:04:01 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make the real failures on helper requires visible
+
+[232214e | Wed Feb 25 06:03:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove optimization for wrap_action_call, leads to really weird recursion
+
+[38d0a7b | Wed Feb 25 05:09:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Simplify setting of mode and compilation of middleware
+
+[8c02417 | Wed Feb 25 04:40:11 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Speed up wrap_action_call
+
+[cea8af5 | Wed Feb 25 04:37:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Speed up ancestral_trait
+
+[608a7eb | Tue Feb 24 13:45:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Innate::Setup, that goes into Ramaze
+
+[785b1e5 | Tue Feb 24 13:45:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove reference to Innate in log to avoid confusion
+
+[3df0612 | Tue Feb 24 13:28:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove the providing_hash example until we come up with a better way to show it
+
+[8309299 | Tue Feb 24 13:25:36 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * small cleanup
+
+[93be7ad | Tue Feb 24 13:25:25 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Spec the session example
+
+[7b39146 | Tue Feb 24 13:24:45 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add missing template for node spec
+
+[d8ccfce | Tue Feb 24 13:22:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add todolist example
+
+[fd73cef | Tue Feb 24 13:06:01 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't serve a view without method if params are given
+
+[58f9ecd | Tue Feb 24 12:05:27 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix spec for example/link
+
+[607fc72 | Tue Feb 24 12:05:16 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Provide shared multipart to enable easy POST specs
+
+[9b833f8 | Tue Feb 24 12:04:48 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Innate::Node, rename LIST to NODE_LIST and HELPERS to DEFAULT_HELPERS
+
+[397cff4 | Tue Feb 24 12:03:38 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * A little bit nicer each in retro games
+
+[0ab5dfe | Tue Feb 24 11:09:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * We don't provide error handling out of the box, remove example
+
+[9466549 | Tue Feb 24 11:06:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Clean up code of the whywiki
+
+[715371b | Tue Feb 24 10:58:44 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Bring examples up to date
+
+[378977c | Sun Feb 22 13:14:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some docs
+
+[566303c | Sun Feb 22 12:34:48 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make Innate::setup and Innate::sync available to Ramaze
+
+[6fa8645 | Sun Feb 22 12:16:33 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make it easier for Ramaze to set a default engine
+
+[dfe34cd | Sat Feb 21 12:54:34 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Correct usage of git tag
+
+[42d3883 | Sat Feb 21 03:28:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.02.21
+
 [374f218 | Sat Feb 21 03:26:55 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Bring retro games example back to life

data/MANIFEST

@@ -4,17 +4,19 @@ MANIFEST
 README.md
 Rakefile
 example/app/retro_games.rb
+example/app/todo/layout/default.erb
+example/app/todo/spec/todo.rb
+example/app/todo/start.rb
+example/app/todo/view/index.erb
 example/app/whywiki_erb/layout/wiki.html.erb
 example/app/whywiki_erb/spec/wiki.rb
 example/app/whywiki_erb/start.rb
 example/app/whywiki_erb/view/edit.html.erb
 example/app/whywiki_erb/view/index.html.erb
 example/custom_middleware.rb
-example/error_handling.rb
 example/hello.rb
 example/howto_spec.rb
 example/link.rb
-example/providing_hash.rb
 example/session.rb
 innate.gemspec
 lib/innate.rb
@@ -51,7 +53,6 @@ lib/innate/response.rb
 lib/innate/route.rb
 lib/innate/session.rb
 lib/innate/session/flash.rb
-lib/innate/setup.rb
 lib/innate/spec.rb
 lib/innate/state.rb
 lib/innate/state/accessor.rb
@@ -67,6 +68,7 @@ lib/rack/middleware_compiler.rb
 lib/rack/reloader.rb
 spec/example/hello.rb
 spec/example/link.rb
+spec/example/session.rb
 spec/helper.rb
 spec/innate/action/layout.rb
 spec/innate/action/layout/file_layout.erb
@@ -94,6 +96,7 @@ spec/innate/node.rb
 spec/innate/node/another_layout/another_layout.erb
 spec/innate/node/bar.html
 spec/innate/node/foo.html.erb
+spec/innate/node/only_view.html
 spec/innate/node/with_layout.erb
 spec/innate/options.rb
 spec/innate/parameter.rb

data/Rakefile

@@ -25,7 +25,7 @@ task :release => [:reversion, :gemspec] do
   sh('git add MANIFEST CHANGELOG innate.gemspec lib/innate/version.rb')
   puts "I added the relevant files, you can now run:", ''
   puts "git commit -m 'Version #{INNATE_VERSION}'"
-  puts "git tag -m '#{INNATE_VERSION}'"
+  puts "git tag -a -m '#{INNATE_VERSION}' '#{INNATE_VERSION}'"
   puts "git push"
   puts
 end
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/manveru/innate"
   s.require_path = "lib"
 
-  s.add_dependency('rack', '>= 0.4.0')
+  s.add_dependency('rack', '>= 0.9.1')
 
   s.files = [
 #{files}
@@ -173,9 +173,6 @@ end
 desc 'install dependencies'
 task :setup do
   GemSetup.new do
-    github = 'http://gems.github.com'
-    Gem.sources << github
-
     gem('rack', '>=0.9.1')
     gem('bacon', '>=1.1.0')
 

data/example/app/retro_games.rb

@@ -5,8 +5,8 @@ STORE = YAML::Store.new('games.yaml')
 
 def STORE.[](key) transaction{|s| super } end
 def STORE.[]=(key, value) transaction{|s| super } end
-def STORE.each
-  YAML.load_file('games.yaml').sort_by{|k,v| -v }.each{|(k,v)| yield(k, v) }
+def STORE.each(&block)
+  YAML.load_file('games.yaml').sort_by{|k,v| -v }.each(&block)
 end
 
 STORE['Pacman'] = 1

data/example/app/todo/layout/default.erb

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <title>Innate TodoList</title>
+  </head>
+  <body>
+    <h1>Organize your life and learn Innate</h1>
+    <%= @content %>
+  </body>
+</html>

data/example/app/todo/spec/todo.rb

@@ -0,0 +1,63 @@
+require 'innate/spec'
+
+FileUtils.rm_f('todo.pstore')
+
+require 'start'
+require 'hpricot'
+
+describe Todo do
+  behaves_like :mock, :multipart
+
+  it 'starts out without tasks' do
+    doc = Hpricot(get('/').body)
+    doc.at(:table).inner_text.strip.should.be.empty
+  end
+
+  it 'adds a task and redirects back' do
+    got = post('/create', multipart('title' => 'first task'))
+    got.status.should == 302
+    got['Location'].should == 'http://example.org/'
+  end
+
+  it 'shows the task as pending' do
+    doc = Hpricot(get('/').body)
+    doc.at('td/input[@name=title]')['value'].should == 'first task'
+    doc.at('td/input[@name=done]')['checked'].should.be.nil
+  end
+
+  it 'updates the task title and redirects back' do
+    got = post('/update', multipart('id' => 'first task', 'title' => 'wash dishes'))
+    got.status.should == 302
+    got['Location'].should == 'http://example.org/'
+  end
+
+  it 'shows the changed task title' do
+    doc = Hpricot(get('/').body)
+    doc.at('td/input[@name=title]')['value'].should == 'wash dishes'
+    doc.at('td/input[@name=done]')['checked'].should.be.nil
+  end
+
+  it 'marks the task as done and redirects back' do
+    mp = multipart('id' => 'wash dishes', 'title' => 'wash dishes', 'done' => 'on')
+    got = post('/update', mp)
+    got.status.should == 302
+    got['Location'].should == 'http://example.org/'
+  end
+
+  it 'shows the task as done' do
+    doc = Hpricot(get('/').body)
+    doc.at('td/input[@name=title]')['value'].should == 'wash dishes'
+    doc.at('td/input[@name=done]')['checked'].should == 'checked'
+  end
+
+  it 'deletes the task and redirects back' do
+    got = post('/delete', multipart('id' => 'wash dishes'))
+    got.status.should == 302
+    got['Location'].should == 'http://example.org/'
+  end
+
+  it 'shows no tasks' do
+    doc = Hpricot(get('/').body)
+    doc.at(:table).inner_text.strip.should.be.empty
+  end
+end

data/example/app/todo/start.rb

@@ -0,0 +1,51 @@
+require 'rubygems'
+require 'innate'
+require 'pstore'
+
+LIST = PStore.new('todo.pstore')
+
+class Todo
+  Innate.node '/'
+  layout 'default'
+
+  def index
+    @list = sync{|list| list.roots.map{|key| [key, list[key]] }}
+  end
+
+  def create
+    redirect_referer unless request.post? and title = request[:title]
+    title.strip!
+
+    sync{ LIST[title] = false } unless title.empty?
+    redirect_referer
+  end
+
+  def update
+    id, title, done = request[:id, :title, :done]
+    redirect_referer unless request.post? and id and title
+    done = !!done
+    title.strip!
+
+    if id == title
+      sync{ LIST[id] = done }
+    elsif title != ''
+      sync{ LIST.delete(id); LIST[title] = done }
+    end
+
+    redirect_referer
+  end
+
+  def delete
+    redirect_referer unless request.post? and id = request[:id]
+    sync{ LIST.delete(id) }
+    redirect_referer
+  end
+
+  private
+
+  def sync
+    Innate.sync{ LIST.transaction{ yield(LIST) }}
+  end
+end
+
+Innate.start

data/example/app/todo/view/index.erb

@@ -0,0 +1,39 @@
+<form method="post" action="<%= r :create %>">
+  <fieldset>
+    <legend>Create new task</legend>
+
+    <label for="form_title">Title:</label>
+    <input id="form_title" type="text" name="title" />
+
+    <input type="submit" value="Create" />
+  </fieldset>
+</form>
+
+<table>
+  <% @list.each do |title, done| %>
+    <tr>
+      <form method="post" action="<%= r :update %>">
+        <input type="hidden" name="id" value="<%= h title %>" />
+        <td>
+          <input type="text" name="title" value="<%= h title %>" />
+        </td>
+        <td>
+          <% if done %>
+            <input type="checkbox" name="done" checked="checked" />
+          <% else %>
+            <input type="checkbox" name="done" />
+          <% end %>
+        </td>
+        <td>
+          <input type="submit" value="Update" />
+        </td>
+      </form>
+      <form method="post" action="<%= r :delete %>">
+        <input type="hidden" name="id" value="<%= h title %>" />
+        <td>
+          <input type="submit" value="Delete" />
+        </td>
+      </form>
+    </tr>
+  <% end %>
+</table>

data/example/app/whywiki_erb/layout/wiki.html.erb

@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
   <head>
-    <title><%= "MicroWiki #{h @page}" %></title>
+    <title>MicroWiki <%= h @page %></title>
     <style type="text/css">
       a.exists{ color: #00f; }
       a.missing{ color: #f00; }

data/example/app/whywiki_erb/start.rb

@@ -1,13 +1,11 @@
-# The minimal _why wiki in Innate
+# The minimal _why wiki in Innate with ERB
 
 %w[rubygems innate erb maruku yaml/store].each{|l| require(l) }
 
 DB = YAML::Store.new('wiki.yaml') unless defined?(DB)
 
 class Wiki
-  include Innate::Node
-  map '/'
-  provide :html => :erb
+  Innate.node '/'
   layout 'wiki'
 
   def index(page = 'Home')
@@ -27,10 +25,8 @@ class Wiki
   end
 
   def save
-    redirect_referrer unless request.post?
-
     page, text = request[:page, :text]
-    sync{ DB[page] = text } if page and text
+    sync{ DB[page] = text } if request.post? and page and text
 
     redirect(r(page))
   end

data/example/app/whywiki_erb/view/edit.html.erb

@@ -1,4 +1,4 @@
-<a href="<%= r @page %>"><%= h "< #{@page}" %></a>
+<%= a("< #@page", @page) %>
 <form method="post" action="<%= r :save %>">
   <input type="hidden" name="page" value="<%= h @page %>" />
   <textarea name="text"><%= @text %></textarea>

data/example/app/whywiki_erb/view/index.html.erb

@@ -1,10 +1,12 @@
 <% unless @page == 'Home' %>
-<a href="<%= r 'Home' %>">&lt; Home</a>
+  <%= a('< Home', :Home) %>
 <% end %>
+
 <h1><%= h @page %></h1>
+
 <% if @text.empty? %>
-<a href="<%= r :edit, @page %>"><%= h "Create #{@page}" %></a>
+  <%= a("Create #@page", :edit, @page) %>
 <% else %>
-<a href="<%= r :edit, @page %>"><%= h "Edit #{@page}" %></a>
-<%= Maruku.new(@text).to_html %>
+  <%= a("Edit #@page", :edit, @page) %>
+  <%= Maruku.new(@text).to_html %>
 <% end %>

data/example/custom_middleware.rb

@@ -1,8 +1,8 @@
+require 'rubygems'
 require 'innate'
 
 class Demo
-  include Innate::Node
-  map '/'
+  Innate.node '/'
 
   def index
     'Hello, World!'
@@ -14,9 +14,7 @@ class Demo
   end
 end
 
-# Make sure you do this before Innate.start, otherwise you have to use
-# Innate.middleware! to force a rebuild in the MiddlewareCompiler.
-Innate.middleware :innate do |mw|
+Innate.start do |mw|
   # Makes sure all requests and responses conform to Rack protocol
   mw.use Rack::Lint
 
@@ -32,12 +30,6 @@ Innate.middleware :innate do |mw|
   # Reload modified files before request
   mw.use Rack::Reloader
 
-  # Initializes the Current objects: Request, Response, and Session
-  mw.use Innate::Current
-
-  # This will try to find a static file in /public first, and try DynaMap if
-  # Rack::File returns a 404 status.
-  mw.cascade Rack::File.new('public'), Innate::DynaMap
+  # Start up the application
+  mw.innate
 end
-
-Innate.start

data/example/hello.rb

@@ -1,8 +1,7 @@
 require 'innate'
 
 class Hello
-  include Innate::Node
-  map '/'
+  Innate.node '/'
 
   def index
     'Hello, World!'

data/example/howto_spec.rb

@@ -1,60 +1,35 @@
+require 'rubygems'
 require 'innate'
-require 'bacon'
 
 class SpecMe
-  include Innate::Node
-  map '/'
+  Innate.node '/'
 
   def index
     "I should be at /"
   end
 
   def foo
-    action.content_type = 'text/css'
+    response['Content-Type'] = 'text/css'
     "I should be at /foo"
   end
 end
 
-class SpecMeToo
-  include Innate::Node
-  map '/too'
-
-  def index
-    "I should be at /too"
-  end
-
-  def foo
-    action.content_type = 'text/css'
-    "I should be at /too/foo"
-  end
-end
-
-Innate.setup_middleware
-
-Bacon.summary_on_exit
-Bacon.extend(Bacon::TestUnitOutput)
+require 'innate/spec'
 
 describe 'An example spec' do
-  def assert(url, body, content_type)
-    response = Innate::Mock.get(url)
-    response.status.should == 200
-    response.body.should == body
-    response.content_type.should == content_type
-  end
+  behaves_like :mock
 
   should 'respond to /' do
-    assert('/', "I should be at /", 'text/html')
-  end
-
-  should 'respond to /foo' do
-    assert('/foo', "I should be at /foo", 'text/css')
+    got = get('/')
+    got.status.should == 200
+    got.body.should == "I should be at /"
+    got['Content-Type'].should == 'text/html'
   end
 
-  should 'respond to /too' do
-    assert('/too', "I should be at /too", 'text/html')
-  end
-
-  should 'respond to /too/foo' do
-    assert('/too/foo', "I should be at /too/foo", 'text/css')
+  should 'respond to /' do
+    got = get('/foo')
+    got.status.should == 200
+    got.body.should == "I should be at /foo"
+    got['Content-Type'].should == 'text/css'
   end
 end

data/example/link.rb

@@ -1,30 +1,22 @@
 require 'innate'
 
 class Linking
-  include Innate::Node
-  map '/'
+  Innate.node '/'
 
   def index
-    "simple link<br />" +
-      a('Help?', :help)
-  end
-
-  def new
-    "Something new!"
+    "Index links to " + a('Help?', :help)
   end
 
   def help
-    "You have help<br />" +
-      Different.a('A Different Node', :another)
+    "Help links to " + Different.a('A Different Node', :another)
   end
 end
 
 class Different
-  include Innate::Node
-  map '/link_to'
+  Innate.node '/link_to'
 
   def another
-    a('Even deeper', 'and/deeper')
+    a('Another links even deeper', 'and/deeper')
   end
 
   def and__deeper

data/example/session.rb

@@ -1,26 +1,22 @@
 require 'innate'
 
 class Hello
-  include Innate::Node
-  map '/'
-
-  helper :link, :cgi
-
-  provide :html => :haml
+  Innate.node '/'
 
   TEMPLATE = '
-!!! XML
-!!!
-%html
-  %head
-    %title Session example
-  %body
-    %h1 Session example
-    = "Value is #{session[:value]}"
-    %br/
-    = a :increment
-    %br/
-    = a :decrement
+<html>
+  <head>
+    <title>Session example</title>
+  </head>
+  <body>
+    <h1>Session example</h1>
+    <p>
+      Value is: <%= session[:value] %><br />
+      <%= a :increment %><br />
+      <%= a :decrement %>
+    </p>
+  </body>
+</html>
 '.strip
 
   def index
@@ -29,12 +25,12 @@ class Hello
   end
 
   def increment
-    session[:value] += 1 if session[:value]
+    session[:value] = session[:value].to_i + 1
     TEMPLATE
   end
 
   def decrement
-    session[:value] -= 1 if session[:value]
+    session[:value] = session[:value].to_i - 1
     TEMPLATE
   end
 end