reststop 0.4.1 → 0.5.1

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.5.1 :: 2010-06-09 
+  * Update to align with the post 2.0 enhancements in Camping related to Tilt support.
+	Since Tilt support is now checking for the existing of view methods and Tilt views
+	RESTstop needs to ensure that view methods can be looked up in Views:HTML as opposed to Views.
+
+=== 0.5.0 :: 2010-04-07
+
+  * Major refactoring for compatibility with Camping 2.0. Thanks to Philippe Monnet
+    for completing the work.
+
 === 0.4.1 :: 2009-05-08
 
   * Custom actions should now work again (needed to make some more changes for

data/LICENSE.txt

@@ -1,165 +1,22 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+Copyright (c) 2010 the Contributors (see http://github.com/zuk/reststop/commits/master)
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -10,5 +10,3 @@ examples/blog.rb
 lib/reststop.rb
 lib/reststop/version.rb
 setup.rb
-test/reststop_test.rb
-test/test_helper.rb

data/README.txt

@@ -1,18 +1,18 @@
 = Reststop
 
 <b>Reststop makes it easy to write RESTful[http://en.wikipedia.org/wiki/Representational_State_Transfer] 
-applications in Camping[http://camping.rubyforge.org/files/README.html].</b>
+applications in Camping[http://github.com/camping/camping].</b>
 
-For info and downloads please see http://rubyforge.org/projects/reststop
+For info and downloads please see http://github.com/camping/reststop
 
 
-*Author*::    Matt Zukowski (matt at roughest dot net)
-*Copyright*:: Copyright (c) 2007 Urbacon Ltd.
-*License*::   GNU Lesser General Public License Version 3
+*Authors*::    Matt Zukowski and Philippe Monnet (see http://github.com/camping/reststop/commits/master)
+*Copyright*:: Copyright (c) 2010 Urbacon Ltd.
+*License*::   MIT License[http://en.wikipedia.org/wiki/MIT_License]
 
 
 For an example of a complete Reststop-based Camping app, have a look at 
-http://reststop.rubyforge.org/svn/trunk/examples/blog.rb
+http://github.com/zuk/reststop/blob/master/examples/blog.rb
 
 Reststop essentially gives you three things:
 
@@ -24,7 +24,7 @@ Reststop essentially gives you three things:
 * destroy (DELETE)
 * list (GET)
 
-Custom actions are also possible. See the Camping::Controllers#REST method documentation for usage info.
+Custom actions are also possible. See the Reststop::Controllers#REST method documentation for usage info.
 
 <b>2. Camping views grouped by output format:</b>
 
@@ -102,15 +102,25 @@ but here's a simple example of RESTful interaction with Restr:
 
 == License
 
-Reststop is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published 
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-Reststop is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Copyright (c) 2010 the Contributors (see http://github.com/camping/reststop/commits/master)
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
-require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
@@ -46,7 +45,6 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.summary = DESCRIPTION
   p.url = HOMEPATH
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/*_test.rb"]
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
   
   # == Optional

data/examples/blog.rb

@@ -1,345 +1,400 @@
 #!/usr/bin/env ruby
 
-#
-# This is a RESTful version of the Camping-based Blog application.
-#
-# The original version can be found here: 
-# http://code.whytheluckystiff.net/camping/browser/trunk/examples/blog.rb
-#
-
 require 'rubygems'
+#require 'ruby-debug'			# @techarch : commented out since only needed for local debugging
+
+require 'markaby'					# @techarch : added explicit require
+require 'camping'					# @techarch
+require 'camping/session'	# @techarch : added explicit require since session has changed in Camping 2.0
+
+gem 'RedCloth'						# @techarch : added since it is referenced in the Posts model
+require 'redcloth'				# @techarch : added
 
-gem 'camping', '~> 1.5'
-gem 'reststop', '~> 0.2'
+#gem 'camping', '~> 2.0'
+gem 'camping' , '>= 2.0'	# @techarch : updated version
 
-require 'camping'
-require 'camping/db'
+#gem 'reststop', '~> 0.3'
+
+=begin										# @techarch : commented out since only needed for local debugging
+$: << '../../camping/lib'
+$: << '../lib'
+require 'camping-unabridged'
+require 'camping/ar'
 require 'camping/session'
+=end
 
-begin
+#begin										# @techarch : commented out since only needed for local debugging
   # try to use local copy of library
-  require '../lib/reststop'
-rescue LoadError
-  # ... otherwise default to rubygem
-  require 'reststop'
-end
-  
+  #require '../lib/reststop2'
+  $: << '../lib/'
+  require 'reststop.rb'			# @techarch : adjusted so that it is located in the same current folder
+#rescue LoadError
+#  # ... otherwise default to rubygem
+#  require 'reststop'
+#end
+
 Camping.goes :Blog
 
 module Blog
-    include Camping::Session
+  include Camping::Session
+  include Reststop
+ 
+  Controllers.extend Reststop::Controllers
 end
 
-module Blog::Models
-    class Post < Base
-        belongs_to :user
-        has_many :comments
+module Blog::Base
+  alias camping_render render
+  alias camping_lookup lookup	# @techarch: required if camping > 2.0
+  alias camping_service service
+  include Reststop::Base
+  alias service reststop_service
+  alias render reststop_render
+  
+	# Overrides the new Tilt-centric lookup method In camping
+	# RESTstop needs to have a first try at looking up the view
+	# located in the Views::HTML module. 
+    def lookup(n)
+      T.fetch(n.to_sym) do |k|
+        t = Blog::Views::HTML.method_defined?(k) || camping_lookup(n)
+      end
     end
-    class Comment < Base
-        belongs_to :user
+end
+
+module Blog::Models
+  class Post < Base
+    belongs_to :user
+
+    before_save do |record|
+       cloth = RedCloth.new(record.body)
+       cloth.hard_breaks = false
+       record.html_body = cloth.to_html
     end
-    class User < Base; end
-
-    class CreateTheBasics < V 1.0
-      def self.up
-        create_table :blog_posts do |t|
-          t.column :user_id,  :integer, :null => false
-          t.column :title,    :string,  :limit => 255
-          t.column :body,     :text
-        end
-        create_table :blog_users do |t|
-          t.column :username, :string
-          t.column :password, :string
-        end
-        create_table :blog_comments do |t|
-          t.column :post_id,  :integer, :null => false
-          t.column :username, :string
-          t.column :body,     :text
-        end
-        User.create :username => 'admin', :password => 'camping'
+  end
+
+  class Comment < Base; belongs_to :user; end
+  class User < Base; end
+
+  class BasicFields < V 1.1
+    def self.up
+      create_table :blog_posts, :force => true do |t|
+        t.integer :user_id,          :null => false
+        t.string  :title,            :limit => 255
+        t.text    :body, :html_body
+        t.timestamps
+      end
+      create_table :blog_users, :force => true do |t|
+        t.string  :username, :password
       end
-      def self.down
-        drop_table :blog_posts
-        drop_table :blog_users
-        drop_table :blog_comments
+      create_table :blog_comments, :force => true do |t|
+        t.integer :post_id,          :null => false
+        t.string  :username
+        t.text    :body, :html_body
+        t.timestamps
       end
+      User.create :username => 'admin', :password => 'camping'
     end
+
+    def self.down
+      drop_table :blog_posts
+      drop_table :blog_users
+      drop_table :blog_comments
+    end
+  end
 end
 
 module Blog::Controllers
+  extend Reststop::Controllers
+    class Index
+		def get
+			redirect '/posts'
+		end
+	end
+	
+	class Login < R '/login'		# @techarch : added explicit login controller	
+		def get
+			render :_login
+		end
+	end
+	
     class Posts < REST 'posts'      
+      # POST /posts
+      def create
+        require_login!
+        @post = Post.create :title => (input.post_title || input.title),	# @techarch : allow for REST-client based update 
+		  :body => (input.post_body || input.body),								# @techarch : allow for REST-client based update
+          :user_id => @state.user_id
+        redirect R(@post)	
+      end
 
-        # POST /posts
-        def create
-            unless @state.user_id.blank?
-                post = Post.create :title => input.post_title, :body => input.post_body,
-                                   :user_id => @state.user_id
-                redirect R(Posts)
-            else
-              _error("Unauthorized", 401)
-            end
-        end
+      # GET /posts/1
+      # GET /posts/1.xml
+      def read(post_id)
+        @post = Post.find(post_id)
+        @comments = Models::Comment.find(:all, :conditions => ['post_id = ?', post_id])
+        render :view
+      end
 
-        # GET /posts/1
-        # GET /posts/1.xml
-        def read(post_id) 
-            @post = Post.find post_id
-            @comments = Models::Comment.find :all, :conditions => ['post_id = ?', post_id]
-            render :view
-        end
+      # PUT /posts/1
+      def update(post_id)
+        require_login!
+        @post = Post.find(post_id)
+        @post.update_attributes :title => (input.post_title || input.title),	# @techarch : allow for REST-client based update 
+			:body => (input.post_body || input.body)									# @techarch : allow for REST-client based update 
+        redirect R(@post)
+      end
 
-        # PUT /posts/1
-        def update(post_id)
-            unless @state.user_id.blank?
-                @post = Post.find post_id
-                @post.update_attributes :title => input.post_title, :body => input.post_body
-                redirect R(@post)
-            else
-              _error("Unauthorized", 401)
-            end
-        end
+      # DELETE /posts/1
+      def delete(post_id)
+        require_login!
+        @post = Post.find post_id
 
-        # DELETE /posts/1
-        def delete(post_id)
-            unless @state.user_id.blank?
-                @post = Post.find post_id
-                
-                if @post.destroy
-                  redirect R(Posts)
-                else
-                  _error("Unable to delete post #{@post.id}", 500)
-                end
-            else
-              _error("Unauthorized", 401)
-            end
+        if @post.destroy
+          redirect R(Posts)
+        else
+          _error("Unable to delete post #{@post.id}", 500)
         end
+      end
 
-        # GET /posts
-        # GET /posts.xml
-        def list
-            @posts = Post.find :all
-            render :index
-        end
-        
-        
-        # GET /posts/new
-        def new
-            unless @state.user_id.blank?
-                @user = User.find @state.user_id
-                @post = Post.new
-            end
-            render :add
-        end
+      # GET /posts
+      # GET /posts.xml
+      def list
+        @posts = Post.all(:order => 'updated_at DESC')
+        s=render :index
+		s
+      end
 
-        # GET /posts/1/edit
-        def edit(post_id) 
-            unless @state.user_id.blank?
-                @user = User.find @state.user_id
-            end
-            @post = Post.find post_id
-            render :edit
-        end
-        
-        # GET /posts/info
-        def info
-            div do
-                code args.inspect; br; br
-                code @env.inspect; br
-                code "Link: #{R(Info, 1, 2)}"
-            end
-        end
+      # GET /posts/new
+      def new
+        #@state.user_id = 1		# @techarch : commented out as was probably hard-coded for testing purpose
+        require_login!
+		@user = User.find @state.user_id	# @techarch : added since we need the user info
+        @post = Post.new
+        render :add
+      end
+
+      # GET /posts/1/edit
+      def edit(post_id)
+        require_login!
+ 		@user = User.find @state.user_id	# @techarch : added since we need the user info
+        @post = Post.find(post_id)
+        render :edit
+      end
     end
      
     class Comments < REST 'comments'
-        # POST /comments
-        def create
-            Models::Comment.create(:username => input.post_username,
-                       :body => input.post_body, :post_id => input.post_id)
-            redirect R(Posts, input.post_id)
-        end
+      # POST /comments
+      def create
+        Models::Comment.create(:username => (input.post_username || input.username),	# @techarch : allow for REST-client based		update 
+			:body => (input.post_body || input.body),	# @techarch : allow for REST-client based update  
+			:post_id => input.post_id)
+        redirect R(Posts, input.post_id)
+      end
     end
-    
+
     class Sessions < REST 'sessions'
         # POST /sessions
         def create
-            @user = User.find :first, :conditions => ['username = ? AND password = ?', input.username, input.password]
-     
-            if @user
-                @login = 'login success !'
-                @state.user_id = @user.id
-            else
-                @login = 'wrong user name or password'
-            end
-            render :login
+          @user = User.find_by_username_and_password(input.username, input.password)
+
+          if @user
+            @state.user_id = @user.id
+            redirect R(Posts)
+          else
+            @info = 'Wrong username or password.'
+          end
+          render :login
         end   
 
         # DELETE /sessions
         def delete
-            @state.user_id = nil
-            render :logout
+          @state.user_id = nil
+          redirect R(Posts) 		# @techarch : changed redirect from Index (does not exist) to Posts
         end
     end
     
     # You can use old-fashioned Camping controllers too!
     class Style < R '/styles.css'
-        def get
-            @headers["Content-Type"] = "text/css; charset=utf-8"
-            @body = %{
-                body {
-                    font-family: Utopia, Georga, serif;
-                }
-                h1.header {
-                    background-color: #fef;
-                    margin: 0; padding: 10px;
-                }
-                div.content {
-                    padding: 10px;
-                }
-            }
-        end
+      def get
+        @headers["Content-Type"] = "text/css; charset=utf-8"
+        @body = %{
+          body {
+              font-family: Utopia, Georga, serif;
+          }
+          h1.header {
+              background-color: #fef;
+              margin: 0; padding: 10px;
+          }
+          div.content {
+              padding: 10px;
+          }
+        }
+      end
     end
 end
 
+module Blog::Helpers
+  alias_method :_R, :R
+  remove_method :R
+  include Reststop::Helpers
+
+  def logged_in?
+    !!@state.user_id
+  end
+
+  def require_login!
+    unless logged_in?
+      redirect(R(Blog::Controllers::Login))	# @techarch: add explicit route
+      throw :halt
+    end
+  end
+end
 
-Markaby::Builder.set(:indent, 2)
 
 module Blog::Views
-    module HTML
-        include Blog::Controllers 
-      
-        def layout
-          html do
-            head do
-              title 'blog'
-              link :rel => 'stylesheet', :type => 'text/css', 
-                   :href => self/'/styles.css', :media => 'screen'
-            end
-            body do
-              h1.header { a 'blog', :href => R(Posts) }
-              div.content do
-                self << yield
-              end
-            end
-          end
-        end
-    
-        def index
-          if @posts.empty?
-            p 'No posts found.'
-          else
-            for post in @posts
-              _post(post)
-            end
-          end
-          p { a 'Add', :href => R(Posts, 'new') }
-        end
-    
-        def login
-          p { b @login }
-          p { a 'Continue', :href => R(Posts, 'new') }
-        end
-    
-        def logout
-          p "You have been logged out."
-          p { a 'Continue', :href => R(Posts) }
-        end
-    
-        def add
-          if @user
-            _form(@post, :action => R(Posts))
-          else
-            _login
-          end
-        end
-    
-        def edit
-          if @user
-            _form(@post, :action => R(@post), :method => :put)
-          else
-            _login
-          end
-        end
-    
-        def view
-            _post(@post)
-    
-            p "Comment for this post:"
-            for c in @comments
-              h1 c.username
-              p c.body
-            end
-    
-            form :action => R(Comments), :method => 'post' do
-              label 'Name', :for => 'post_username'; br
-              input :name => 'post_username', :type => 'text'; br
-              label 'Comment', :for => 'post_body'; br
-              textarea :name => 'post_body' do; end; br
-              input :type => 'hidden', :name => 'post_id', :value => @post.id
-              input :type => 'submit'
-            end
-        end
-    
-        # partials
-        def _login
-          form :action => R(Sessions), :method => 'post' do
-            label 'Username', :for => 'username'; br
-            input :name => 'username', :type => 'text'; br
-    
-            label 'Password', :for => 'password'; br
-            input :name => 'password', :type => 'text'; br
-    
-            input :type => 'submit', :name => 'login', :value => 'Login'
-          end
+  extend Reststop::Views
+  
+  module HTML
+    include Blog::Controllers
+    include Blog::Views
+
+    def layout
+      html do
+        head do
+          title 'blog'
+          link :rel => 'stylesheet', :type => 'text/css',
+               :href => self/'/styles.css', :media => 'screen'
         end
-    
-        def _post(post)
-          h1 post.title
-          p post.body
-          p do
-            [a("Edit", :href => R(Posts, post.id, 'edit')), a("View", :href => R(Posts, post.id, 'edit'))].join " | "
+        body do
+          h1.header { a 'blog', :href => R(Posts) }
+          div.content do
+            self << yield
           end
         end
-    
-        def _form(post, opts)
-          form(:action => R(Sessions), :method => 'delete') do
-          p do 
-            span "You are logged in as #{@user.username}"
-            span " | "
-            button(:type => 'submit') {'Logout'}
-          end
-          end
-          form({:method => 'post'}.merge(opts)) do
-            label 'Title', :for => 'post_title'; br
-            input :name => 'post_title', :type => 'text', 
-                  :value => post.title; br
-    
-            label 'Body', :for => 'post_body'; br
-            textarea post.body, :name => 'post_body'; br
-    
-            input :type => 'hidden', :name => 'post_id', :value => post.id
-            input :type => 'submit'
-          end
+      end
+    end
+
+    def index
+      if @posts.empty?
+        p 'No posts found.'
+      else
+        for post in @posts
+          _post(post)
         end
+      end
+      p { a 'Add', :href => R(Posts, 'new') }
+    end
+
+    def login
+      p { b @login }
+      p { a 'Continue', :href => R(Posts, 'new') }
     end
-    default_format :HTML
 
-    module XML
-      def layout
-        yield
+    def logout
+      p "You have been logged out."
+      p { a 'Continue', :href => R(Posts) }
+    end
+
+    def add
+      if @user
+        _form(@post, :action => R(Posts))
+      else
+        _login
+      end
+    end
+
+    def edit
+      if @user
+        _form(@post, :action => R(@post), :method => :put) 
+      else
+        _login
+      end
+    end
+
+    def view
+      _post(@post)
+
+      p "Comment for this post:"
+      for c in @comments
+        h1 c.username
+        p c.body
+      end
+
+      form :action => R(Comments), :method => 'post' do
+        label 'Name', :for => 'post_username'; br
+        input :name => 'post_username', :type => 'text'; br
+        label 'Comment', :for => 'post_body'; br
+        textarea :name => 'post_body' do; end; br
+        input :type => 'hidden', :name => 'post_id', :value => @post.id
+        input :type => 'submit'
+      end
+    end
+
+    # partials
+    def _login
+      p do
+        "(default: admin/camping)"
+      end
+      form :action => R(Sessions), :method => 'post' do
+        label 'Username', :for => 'username'; br
+        input :name => 'username', :type => 'text'; br
+
+        label 'Password', :for => 'password'; br
+        input :name => 'password', :type => 'text'; br
+
+        input :type => 'submit', :name => 'login', :value => 'Login'
+      end
+    end
+
+    def _post(post)
+      h1 post.title
+      p post.body
+      p do
+        [a("Edit", :href => R(Posts, post.id, 'edit')), a("View", :href => R(Posts, post.id, 'edit'))].join " | "
+      end
+    end
+
+    def _form(post, opts)
+      form(:action => R(Sessions), :method => 'delete') do
+      p do
+        span "You are logged in as #{@user.username}"
+        span " | "
+        button(:type => 'submit') {'Logout'}
       end
-      
-      def index
-        @posts.to_xml(:root => 'blog')
       end
-      
-      def view
-        @post.to_xml(:root => 'post')
+      form({:method => 'post'}.merge(opts)) do
+        label 'Title', :for => 'post_title'; br
+        input :name => 'post_title', :type => 'text',
+              :value => post.title; br
+
+        label 'Body', :for => 'post_body'; br
+        textarea post.body, :name => 'post_body'; br
+
+        input :type => 'hidden', :name => 'post_id', :value => post.id
+        input :type => 'submit'
       end
     end
+  end
+  default_format :HTML
+
+  module XML
+    def layout
+      yield
+    end
+
+    def index
+      @posts.to_xml(:root => 'blog')
+    end
+
+    def view
+      @post.to_xml(:root => 'post')
+    end
+  end
 end
  
 def Blog.create
-    Camping::Models::Session.create_schema
-    Blog::Models.create_schema :assume => (Blog::Models::Post.table_exists? ? 1.0 : 0.0)
-end
+  raise "You must configure the database first in 'config/database.yml'!" unless File.exist?('config/database.yml')
+ 	dbconfig = YAML.load(File.read('config/database.yml'))								# @techarch
+	Camping::Models::Base.establish_connection  dbconfig['development']		# @techarch
 
+	Blog::Models.create_schema :assume => (Blog::Models::Post.table_exists? ? 1.0 : 0.0)
+end