added note mode

added inline editing

app/controllers/application_controller.rb

@@ -18,8 +18,12 @@ def user_info
 
   def login_required
       if session[:user_id]
-        @user ||= User.find(session[:user_id])
-        @access_token ||= OAuth::AccessToken.new(get_consumer, @user.oauth_token, @user.oauth_secret)
+        begin
+          @user ||= User.find(session[:user_id])
+          @access_token ||= OAuth::AccessToken.new(get_consumer, @user.oauth_token, @user.oauth_secret)
+        rescue
+          redirect_to :controller => 'session', :action => 'new'
+        end
       else
         redirect_to :controller => 'session', :action => 'new'
       end

app/controllers/note_controller.rb

@@ -0,0 +1,68 @@
+class NoteController < ApplicationController
+
+  before_filter :login_required
+  before_filter :user_info
+  before_filter :notebooks_info
+
+  before_filter :notebook_info
+  before_filter :note_info, :except => [:index, :new, :create]
+
+  def notebook_info 
+    @notebook = Notebook.find(params[:notebook_id])
+  end
+
+  def note_info 
+    @note = Note.find(params[:id])
+  end
+
+  def show
+    respond_to do |format|
+      format.html { render :text => @note.display }# show.html.erb
+      format.xml  { render :xml => @notebook }
+    end
+  end
+
+  def new
+    @note = Note.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @note }
+    end    
+  end
+
+  def create
+    @note = Note.new(params[:note])
+    @note.notebook = @notebook
+
+    respond_to do |format|
+      if @note.save
+        flash[:notice] = 'Note was successfully created.'
+        format.html { redirect_to :action => "show", :id => @note.id }
+        format.xml  { render :xml => @note, :status => :created, :location => @note }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @note.errors, :status => :unprocessable_entity }
+      end
+    end
+
+  end
+
+  def edit
+  end
+
+  def update
+    respond_to do |format|
+      if @note.update_attributes(params[:note])
+        flash[:notice] = 'Panel was successfully updated.'
+        format.html { redirect_to :action => "show", :id => @note.id}
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @note.errors, :status => :unprocessable_entity }
+      end
+    end    
+  end
+
+
+end

app/helpers/note_helper.rb

@@ -0,0 +1,2 @@
+module NoteHelper
+end

app/models/note.rb

@@ -0,0 +1,20 @@
+class Note < ActiveRecord::Base
+
+  belongs_to  :notebook
+
+  validates_presence_of :notebook_id
+
+  def display
+    "<div class='note' id='note_#{self.id}'><h3>#{self.name}</h3> #{self.content}</div>"
+  end
+
+  def before_create
+    if self.notebook.notes.length > 0
+      self.rank = self.notebook.notes.maximum(:rank) + 1
+    else
+      self.rank = 0
+    end
+  end
+
+end
+

app/models/notebook.rb

@@ -9,11 +9,17 @@ class Notebook < ActiveRecord::Base
   has_many :readers, :through => :annoters, :source => :user, :conditions => "status = 'READER' "
   has_many :writers, :through => :annoters, :source => :user, :conditions => "status = 'WRITER' "
 
+  has_many  :notes
+
   validates_presence_of :name, :creator_id
 
   def after_create
     # create the notebook_user entry
     self.writers << self.creator
   end
+
+  def display
+    self.notes.find(:all, :order => "rank DESC ").collect{ |n| n.display }.join
+  end
 
 end

app/views/layouts/main.haml

@@ -6,6 +6,7 @@
     = javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js'
     = javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.1/jquery-ui.min.js'
     = javascript_include_tag 'jquery.editinplace.packed'
+    = javascript_include_tag 'jquery.form'
     = javascript_include_tag 'main'
     = stylesheet_link_tag 'main'
 
@@ -14,6 +15,9 @@
     #container
 
       #header
+        #logo
+          %h1 Simple Notebook
+
         #account
           %a{:href => "/account"}=@user.name
 

app/views/note/edit.haml

@@ -0,0 +1,13 @@
+-form_for @note, :url => { :action => "update" }, :html => { :id => "note_form" }  do |f|
+
+  = f.error_messages
+
+  %p
+    =f.text_field :name
+
+  %p
+    =f.text_area :content, :rows => 4
+
+  %p
+    = submit_tag 'save'
+

app/views/note/new.haml

@@ -0,0 +1,13 @@
+-form_for @note, :url => { :action => "create" }, :html => { :id => "note_form" }  do |f|
+
+  = f.error_messages
+
+  %p
+    =f.text_field :name
+
+  %p
+    =f.text_area :content, :rows => 4
+
+  %p
+    = submit_tag 'save'
+

app/views/notebook/edit.haml

@@ -6,9 +6,6 @@
   %p
     =f.text_field :name
 
-  %p
-    =f.text_area :content
-
   %p
     = submit_tag 'save'
 

app/views/notebook/new.haml

@@ -5,9 +5,6 @@
   %p
     =f.text_field :name
 
-  %p
-    =f.text_area :content
-
   %p
     = submit_tag 'save'
 

app/views/notebook/show.haml

@@ -1,6 +1,13 @@
-%h2=@notebook.name
+#notebook_header
+  %h2=@notebook.name
 
-%a{:href => "/notebook/edit/#{@notebook.id}"} edit
+  %a{:href => "/notebook/edit/#{@notebook.id}"} edit
 
 #notebook_content
-  =@notebook.content
+
+  %button#new_note new note
+
+  #messages
+
+  .content
+    =@notebook.display

config/routes.rb

@@ -1,7 +1,11 @@
 ActionController::Routing::Routes.draw do |map|
   # The priority is based upon order of creation: first created -> highest priority.
 
-  map.resources :notebooks, :controller => 'notebook'
+  map.resources :notebooks, :controller => 'notebook' do |notebook|
+
+    notebook.resources :notes, :controller => :note
+
+  end
 
   # Sample of regular route:
   #   map.connect 'products/:id', :controller => 'catalog', :action => 'view'

db/migrate/20090406100933_create_notebooks.rb

@@ -3,7 +3,6 @@ def self.up
     create_table :notebooks do |t|
       t.string  :name
       t.integer :creator_id
-      t.text :content
 
       t.timestamps
     end

db/migrate/20090408074311_create_notes.rb

@@ -0,0 +1,16 @@
+class CreateNotes < ActiveRecord::Migration
+  def self.up
+    create_table :notes do |t|
+      t.integer :notebook_id
+      t.string  :name
+      t.text    :content
+      t.integer :rank, :default => 0
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :notes
+  end
+end