camping 1.4.2 → 1.5

data/examples/{blog/blog.rb → blog.rb}

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
 $:.unshift File.dirname(__FILE__) + "/../../lib"
-require 'rubygems'
-require_gem 'camping', '>=1.4'
+require 'camping'
 require 'camping/session'
   
 Camping.goes :Blog
@@ -12,35 +11,37 @@ module Blog
 end
 
 module Blog::Models
-    def self.schema(&block)
-        @@schema = block if block_given?
-        @@schema
-    end
-  
     class Post < Base; belongs_to :user; end
     class Comment < Base; belongs_to :user; end
     class User < Base; end
-end
 
-Blog::Models.schema do
-    create_table :blog_posts, :force => true do |t|
-      t.column :id,       :integer, :null => false
-      t.column :user_id,  :integer, :null => false
-      t.column :title,    :string,  :limit => 255
-      t.column :body,     :text
-    end
-    create_table :blog_users, :force => true do |t|
-      t.column :id,       :integer, :null => false
-      t.column :username, :string
-      t.column :password, :string
-    end
-    create_table :blog_comments, :force => true do |t|
-      t.column :id,       :integer, :null => false
-      t.column :post_id,  :integer, :null => false
-      t.column :username, :string
-      t.column :body,     :text
+    class CreateTheBasics < V 1.0
+      def self.up
+        create_table :blog_posts, :force => true do |t|
+          t.column :id,       :integer, :null => false
+          t.column :user_id,  :integer, :null => false
+          t.column :title,    :string,  :limit => 255
+          t.column :body,     :text
+        end
+        create_table :blog_users, :force => true do |t|
+          t.column :id,       :integer, :null => false
+          t.column :username, :string
+          t.column :password, :string
+        end
+        create_table :blog_comments, :force => true do |t|
+          t.column :id,       :integer, :null => false
+          t.column :post_id,  :integer, :null => false
+          t.column :username, :string
+          t.column :body,     :text
+        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
-    execute "INSERT INTO blog_users (username, password) VALUES ('admin', 'camping')"
 end
 
 module Blog::Controllers
@@ -60,9 +61,11 @@ module Blog::Controllers
             render :add
         end
         def post
-            post = Post.create :title => input.post_title, :body => input.post_body,
-                               :user_id => @state.user_id
-            redirect View, post
+            unless @state.user_id.blank?
+                post = Post.create :title => input.post_title, :body => input.post_body,
+                                   :user_id => @state.user_id
+                redirect View, post
+            end
         end
     end
 
@@ -70,7 +73,7 @@ module Blog::Controllers
         def get(*args)
             div do
                 code args.inspect; br; br
-                code ENV.inspect; br
+                code @env.inspect; br
                 code "Link: #{R(Info, 1, 2)}"
             end
         end
@@ -94,9 +97,11 @@ module Blog::Controllers
         end
      
         def post
-            @post = Post.find input.post_id
-            @post.update_attributes :title => input.post_title, :body => input.post_body
-            redirect View, @post
+            unless @state.user_id.blank?
+                @post = Post.find input.post_id
+                @post.update_attributes :title => input.post_title, :body => input.post_body
+                redirect View, @post
+            end
         end
     end
      
@@ -189,7 +194,7 @@ module Blog::Views
 
     def add
       if @user
-        _form(post, :action => R(Add))
+        _form(@post, :action => R(Add))
       else
         _login
       end
@@ -197,14 +202,14 @@ module Blog::Views
 
     def edit
       if @user
-        _form(post, :action => R(Edit))
+        _form(@post, :action => R(Edit))
       else
         _login
       end
     end
 
     def view
-        _post(post)
+        _post(@post)
 
         p "Comment for this post:"
         for c in @comments
@@ -217,7 +222,7 @@ module Blog::Views
           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 => 'hidden', :name => 'post_id', :value => @post.id
           input :type => 'submit'
         end
     end
@@ -239,16 +244,12 @@ module Blog::Views
       h1 post.title
       p post.body
       p do
-        a "Edit", :href => R(Edit, post)
-        a "View", :href => R(View, post)
+        [a("Edit", :href => R(Edit, post)), a("View", :href => R(View, post))].join " | "
       end
     end
 
     def _form(post, opts)
-      p do
-        text "You are logged in as #{@user.username} | "
-        a 'Logout', :href => R(Logout)
-      end
+      p { "You are logged in as #{@user.username} | #{a 'Logout', :href => R(Logout)}" }
       form({:method => 'post'}.merge(opts)) do
         label 'Title', :for => 'post_title'; br
         input :name => 'post_title', :type => 'text', 
@@ -265,21 +266,6 @@ end
  
 def Blog.create
     Camping::Models::Session.create_schema
-    unless Blog::Models::Post.table_exists?
-        ActiveRecord::Schema.define(&Blog::Models.schema)
-    end
+    Blog::Models.create_schema :assume => (Blog::Models::Post.table_exists? ? 1.0 : 0.0)
 end
 
-if __FILE__ == $0
-  require 'mongrel/camping'
-
-  Blog::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'blog.db'
-  Blog::Models::Base.logger = Logger.new('camping.log')
-  Blog::Models::Base.threaded_connections=false
-  Blog.create
-
-  server = Mongrel::Camping::start("0.0.0.0",3002,"/blog",Blog)
-  puts "** Blog example is running at http://localhost:3002/blog"
-  puts "** Default username is `admin', password is `camping'"
-  server.run.join
-end

data/examples/{campsh/campsh.rb → campsh.rb}

@@ -6,7 +6,7 @@ $:.unshift File.dirname(__FILE__) + "/../../lib"
 Camping.goes :CampSh
 
 module CampSh
-    NAME = 'CampCampSh'
+    NAME = 'CampSh'
     DESCRIPTION = %{
         Script your own URL commands, then run these commands through 
         the proxy with "cmd/CommandName".  All scripts are versioned 
@@ -22,19 +22,7 @@ module CampSh
     end
 
     def self.create
-        unless CampSh::Models::Command.table_exists?
-            ActiveRecord::Schema.define do
-                create_table :campsh_commands, :force => true do |t|
-                    t.column :id,         :integer, :null => false
-                    t.column :author,     :string,  :limit => 40
-                    t.column :name,       :string,  :limit => 255
-                    t.column :created_at, :datetime
-                    t.column :doc,        :text
-                    t.column :code,       :text
-                end
-                CampSh::Models::Command.create_versioned_table
-            end
-        end
+        Models.create_schema :assume => (Models::Command.table_exists? ? 1.0 : 0.0)
     end
 end
 
@@ -44,6 +32,24 @@ module CampSh::Models
         validates_presence_of :author
         acts_as_versioned
     end
+    class CreateBasics < V 1.0
+        def self.up
+            create_table :campsh_commands, :force => true do |t|
+                t.column :id,         :integer, :null => false
+                t.column :author,     :string,  :limit => 40
+                t.column :name,       :string,  :limit => 255
+                t.column :created_at, :datetime
+                t.column :doc,        :text
+                t.column :code,       :text
+            end
+            Command.create_versioned_table
+            Command.reset_column_information
+        end
+        def self.down
+            drop_table :campsh_commands
+            Command.drop_versioned_table
+        end
+    end
 end
 
 module CampSh::Controllers
@@ -101,7 +107,7 @@ module CampSh::Controllers
     class Show < R '/show/(\w+)', '/show/(\w+)/(\d+)', '/cancel_edit/(\w+)'
         def get(name, version = nil)
             unless @cmd = Command.find_by_name(name)
-                redirect(Edit, page_name)
+                redirect(Edit, name)
                 return
             end
             @version = (version.nil? or version == @cmd.version.to_s) ? @cmd : @cmd.versions.find_by_version(version)
@@ -127,13 +133,11 @@ module CampSh::Controllers
             @cmd = Command.find_by_name(name)
             @cmd = @cmd.versions.find_by_version(version) unless version.nil? or version == @cmd.version.to_s
             @title = "Editing #{name}"
-            @author = cookies.cmd_author or CampSh::ANON
+            @author = @cookies.cmd_author || CampSh::ANON
             render :edit
         end
         def post(name)
-            if input.author != CampSh::ANON
-                cookies.cmd_author = input.author
-            end
+            @cookies.cmd_author = input.command.author
             Command.find_or_create_by_name(name).update_attributes(input.command)
             redirect Show, name
         end
@@ -484,14 +488,13 @@ module CampSh::Views
 
     def _navigation
         form :id => "navigationForm", :class => "navigation", :style => "font-size: 10px" do  
-            a "Command List", :href => R(List), :title => "Alphabetical list of commands", :accesskey => "A"
-            text " | "
-            a "Recently Revised", :href => R(Recent), :title => "Pages sorted by when they were last changed", 
-                                  :accesskey => "U"
-            text " | "
-            a "Authors", :href => R(Authors), :title => "Who wrote what"
-            text " | "
-            a "How To", :href => R(HowTo), :title => "How to use CampShell", :accesskey => "H"
+            [["Command List", R(List), "Alphabetical list of commands", "A"],
+             ["Recently Revised", R(Recent), "Pages sorted by when they were last changed", "U"],
+             ["Authors", R(Authors), "Who wrote what", "W"],
+             ["How To", R(HowTo), "How to use CampShell", "H"]
+            ].map do |txt, link, title, key|
+                a txt, :href => link, :title => title, :accesskey => key
+            end.join(" | ")
         end
     end
 
@@ -522,11 +525,8 @@ module CampSh::Views
         ul.authorList! do
             @authors.each do |author, cmds|
                 li do
-                    strong author
-                    text " worked on: " +
-                        cmds.map { |cmd|
-                            capture { a cmd.name, :href => R(Show, cmd.name) }
-                        }.join(", ")
+                    strong(author) + " worked on: " +
+                        cmds.map { |cmd| a cmd.name, :href => R(Show, cmd.name) }.join(", ")
                 end
             end
         end
@@ -563,13 +563,18 @@ module CampSh::Views
             a "Edit Page", :href => R(Edit, @version.name, @version.version), 
                            :class => "navlink", :accesskey => "E"
             unless @version.version == 1
+                text " | "
                 a 'Back in time', :href => R(Show, @version.name, @version.version-1)
             end
             unless @version.version == @cmd.version
+                text " | "
                 a 'Next',    :href => R(Show, @version.name, @version.version+1)
+                text " | "
                 a 'Current', :href => R(Show, @version.name)
             end
-            small "(#{ @cmd.version.size } revisions)"
+            if @cmd.versions.size > 1
+                small "(#{ @cmd.versions.size } revisions)"
+            end
         end
     end
 
@@ -623,9 +628,3 @@ module CampSh::Views
     end
 end
 
-if __FILE__ == $0
-  CampSh::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'campsh.db'
-  CampSh::Models::Base.logger = Logger.new('camping.log')
-  CampSh.create
-  puts CampSh.run
-end

data/examples/tepee.rb

@@ -0,0 +1,242 @@
+#!/usr/bin/ruby
+$:.unshift File.dirname(__FILE__) + "/../../lib"
+%w(rubygems redcloth camping acts_as_versioned).each { |lib| require lib }
+
+Camping.goes :Tepee
+
+module Tepee::Models
+
+  class Page < Base
+    PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
+    validates_uniqueness_of :title
+    before_save { |r| r.title = r.title.underscore }
+    acts_as_versioned
+  end
+
+  class CreateTepee < V 1.0
+    def self.up
+      create_table :tepee_pages, :force => true do |t|
+        t.column :title, :string, :limit => 255
+        t.column :body, :text
+      end
+      Page.create_versioned_table
+      Page.reset_column_information
+    end
+    def self.down
+      drop_table :tepee_pages
+      Page.drop_versioned_table
+    end
+  end
+
+end
+
+module Tepee::Controllers
+  class Index < R '/'
+    def get
+      redirect Show, 'home'
+    end
+  end
+
+  class Show < R '/(\w+)', '/(\w+)/(\d+)'
+    def get page_name, version = nil
+      redirect(Edit, page_name, 1) and return unless @page = Page.find_by_title(page_name)
+      @version = (version.nil? or version == @page.version.to_s) ? @page : @page.versions.find_by_version(version)
+      render :show
+    end
+  end
+
+  class Edit < R '/(\w+)/edit', '/(\w+)/(\d+)/edit' 
+    def get page_name, version = nil
+      @page = Page.find_or_create_by_title(page_name)
+      @page = @page.versions.find_by_version(version) unless version.nil? or version == @page.version.to_s
+      render :edit
+    end
+    
+    def post page_name
+      Page.find_or_create_by_title(page_name).update_attributes :body => input.post_body and redirect Show, page_name
+    end
+  end
+
+  class Versions < R '/(\w+)/versions'
+    def get page_name
+      @page = Page.find_or_create_by_title(page_name)
+      @versions = @page.versions
+      render :versions
+    end
+  end
+
+  class List < R '/all/list'
+    def get
+      @pages = Page.find :all, :order => 'title'
+      render :list
+    end
+  end
+
+  class Stylesheet < R '/css/tepee.css'
+    def get
+@headers['Content-Type'] = 'text/css'
+File.read(__FILE__).gsub(/.*__END__/m, '')
+    end
+  end
+end
+
+module Tepee::Views
+  def layout
+    html do
+      head do
+        title 'test'
+        link :href=>R(Stylesheet), :rel=>'stylesheet', :type=>'text/css' 
+      end
+      style <<-END, :type => 'text/css'
+        body {
+          font-family: verdana, arial, sans-serif;
+        }
+        h1, h2, h3, h4, h5 {
+          font-weight: normal;
+        }
+        p.actions a {
+          margin-right: 6px;
+        }
+      END
+      body do
+        p do
+          small do
+            span "welcome to " ; a 'tepee', :href => "http://code.whytheluckystiff.net/svn/camping/trunk/examples/tepee.rb"
+            span '. go ' ;       a 'home',  :href => R(Show, 'home')
+            span '. list all ' ; a 'pages', :href => R(List)
+          end
+        end
+        div.content do
+          self << yield
+        end
+      end
+    end
+  end
+
+  def show
+    h1 @page.title
+    div { _markup @version.body }
+    p.actions do 
+      _button 'edit',      :href => R(Edit, @version.title, @version.version) 
+      _button 'back',      :href => R(Show, @version.title, @version.version-1) unless @version.version == 1 
+      _button 'next',      :href => R(Show, @version.title, @version.version+1) unless @version.version == @page.version 
+      _button 'current',   :href => R(Show, @version.title)                     unless @version.version == @page.version 
+      _button 'versions',  :href => R(Versions, @page.title) 
+    end
+  end
+
+  def edit
+    h1 @page.title 
+    form :method => 'post', :action => R(Edit, @page.title) do
+      p do
+        textarea @page.body, :name => 'post_body', :rows => 50, :cols => 100
+      end
+      input :type => 'submit', :value=>'change' 
+    end
+    _button 'cancel', :href => R(Show, @page.title, @page.version) 
+    a 'syntax', :href => 'http://hobix.com/textile/', :target=>'_blank' 
+  end
+
+  def list
+    h1 'all pages'
+    ul { @pages.each { |p| li { a p.title, :href => R(Show, p.title) } } }
+  end
+
+  def versions
+    h1 @page.title
+    ul do
+      @versions.each do |page|
+        li do
+          span page.version
+          _button 'show',   :href => R(Show, page.title, page.version)
+          _button 'edit',   :href => R(Edit, page.title, page.version)
+        end
+      end
+    end
+  end
+
+  def _button(text, options={})
+    form :method=>:get, :action=>options[:href] do
+      input :type=>'submit', :name=>'submit', :value=>text
+    end
+  end
+
+  def _markup body
+    return '' if body.blank?
+    body.gsub!(Tepee::Models::Page::PAGE_LINK) do
+      page = title = $1
+      title = $2 unless $2.empty?
+      page = page.gsub /\W/, '_'
+      if Tepee::Models::Page.find(:all, :select => 'title').collect { |p| p.title }.include?(page)
+        %Q{<a href="#{self/R(Show, page)}">#{title}</a>}
+      else
+        %Q{<span>#{title}<a href="#{self/R(Edit, page, 1)}">?</a></span>}
+      end
+    end
+    RedCloth.new(body, [ :hard_breaks ]).to_html
+  end
+end
+
+def Tepee.create
+  Tepee::Models.create_schema :assume => (Tepee::Models::Page.table_exists? ? 1.0 : 0.0)
+end
+__END__
+/** focus **/
+/*
+a:hover:active {
+  color: #10bae0;
+}
+
+a:not(:hover):active {
+  color: #0000ff;
+}
+
+*:focus {
+  -moz-outline: 2px solid #10bae0 !important;
+  -moz-outline-offset: 1px !important;
+  -moz-outline-radius: 3px !important;
+}
+
+button:focus,
+input[type="reset"]:focus,
+input[type="button"]:focus,
+input[type="submit"]:focus,
+input[type="file"] > input[type="button"]:focus {
+  -moz-outline-radius: 5px !important;
+}
+
+button:focus::-moz-focus-inner {
+  border-color: transparent !important;
+}
+
+button::-moz-focus-inner,
+input[type="reset"]::-moz-focus-inner,
+input[type="button"]::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner,
+input[type="file"] > input[type="button"]::-moz-focus-inner {
+  border: 1px dotted transparent !important;
+}
+textarea:focus, button:focus, select:focus, input:focus {
+  -moz-outline-offset: -1px !important;
+}
+input[type="radio"]:focus {
+  -moz-outline-radius: 12px;
+  -moz-outline-offset: 0px !important;
+}
+a:focus {
+  -moz-outline-offset: 0px !important;
+}
+*/
+form { display: inline; }
+
+/** Gradient **/
+small, pre, textarea, textfield, button, input, select {
+   color: #4B4B4C !important;
+   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAeCAMAAAAxfD/2AAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAtUExURfT09PLy8vHx8fv7+/j4+PX19fn5+fr6+vf39/z8/Pb29vPz8/39/f7+/v///0c8Y4oAAAA5SURBVHjaXMZJDgAgCMDAuouA/3+uHPRiMmlKzmhCFRorLOakVnpnDEpBBDHM8ODs/bz372+PAAMAXIQCfD6uIDsAAAAASUVORK5CYII=) !important;
+   background-color: #FFF !important;
+   background-repeat: repeat-x !important;
+   border: 1px solid #CCC !important;
+}
+
+button, input { margin: 3px; }
+