merb 0.0.8 → 0.0.9

data/examples/app_skeleton/dist/conf/merb.yml

@@ -1,11 +0,0 @@
---- 
-:host: 0.0.0.0
-:port: "4000"
-:allow_reloading: true
-#:sql_session: true
-#:basic_auth: 
-#  :username: ezra
-#  :password: test
-#  :domain: localhost
-#:daemonize: true
-#:cluster: 3

data/examples/app_skeleton/dist/conf/merb_init.rb

@@ -1,16 +0,0 @@
-puts "merb init called"
-
-# add your own ruby code here for app initialization and load path stuff
-
-require 'active_record'
-
-ActiveRecord::Base.logger = MERB_LOGGER
-ActiveRecord::Base.establish_connection(
-  :adapter => 'mysql',
-  :username => 'root',
-  :password => 'xxx',
-  :database => 'merb'
-)
-ActiveRecord::Base.verification_timeout = 14400
-
-Dir[DIST_ROOT+"/app/models/*.rb"].each { |m| require m } 

data/examples/app_skeleton/dist/conf/mup.conf

@@ -1,5 +0,0 @@
-# upload progress conf
---- 
-:drb: true
-:path_info: /files/upload
-:frequency: 2

data/examples/app_skeleton/dist/conf/router.rb

@@ -1,19 +0,0 @@
-# Merb::RouteMatcher is the request routing mapper for the merb framework.
-# You can define placeholder parts of the url with the :smbol notation.
-# so r.add '/foo/:bar/baz/:id', :class => 'Bar', :method => 'foo'
-# will match against a request to /foo/123/baz/456. It will then
-# use the class Bar as your merb controller and call the foo method on it. 
-# the foo method will recieve a hash with {:bar => '123', :id => '456'}
-# as the content. So the :placeholders sections of your routes become
-# a hash of arguments to your controller methods.
-# The default route is installed 
-
-
-puts "Compiling routes: \n"
-Merb::RouteMatcher.prepare do |r|
-  r.add '/:controller/:action/:id'
-  #r.add '', :controller => 'SomeController', :action =>'foo'
-end
-
-m = Merb::RouteMatcher.new
-puts m.compiled_statement

data/examples/app_skeleton/scripts/merb_stop

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-
-pids=[]
-
-port_or_star = ARGV[0] || '*'
-
-Dir[File.dirname(__FILE__)+"/../log/merb.#{port_or_star}.pid"].each do |f|
-  pid = IO.read(f).chomp.to_i
-  puts "killing PID: #{pid}"
-  Process.kill(9, pid)
-  FileUtils.rm f
-end

data/examples/app_skeleton/scripts/new_migration

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'merb'
-
-TMPL = <<EOF
-class <%= class_name.snake_case.camel_case %> < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-  end
-end
-EOF
-
-class_name = ARGV[0]
-highest_migration = Dir[Dir.pwd+'/dist/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
-filename = format("%03d_%s", (highest_migration.to_i+1), class_name.snake_case)
-
-File.open(Dir.pwd+"/dist/schema/migrations/#{filename}.rb", 'w+') do |file|
-  file.write Erubis::Eruby.new(TMPL).result(binding)
-end

data/examples/app_skeleton/test/test_helper.rb

@@ -1 +0,0 @@
-require 'test/unit'

data/examples/sample_app/Rakefile

@@ -1,82 +0,0 @@
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'code_statistics' 
-require 'fileutils'
-require 'rubygems'
-require 'merb'
-require MERB_FRAMEWORK_ROOT+'/merb_tasks'
-MERB_ROOT = File.dirname(__FILE__)
-include FileUtils
-
-
-#desc "Packages up Merb."
-#task :default => [:package]
-
-desc "load merb_init.rb"
-task :merb_init do
-  require 'merb'
-  require File.dirname(__FILE__)+'/dist/conf/merb_init.rb'
-end  
-
-desc "Load db schema"
-task :load_schema => [:merb_init] do
-  require File.dirname(__FILE__)+'/dist/schema/schema.rb'
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
-desc 'Run unit tests'
-Rake::TestTask.new('test_unit') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/unit/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run functional tests'
-Rake::TestTask.new('test_functional') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/functional/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run all tests'
-Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run all tests, specs and finish with rcov'
-task :aok do
-  sh %{rake rcov}
-  sh %{rake spec}
-end
-
-##############################################################################
-# Statistics
-##############################################################################
-
-STATS_DIRECTORIES = [
-  %w(Code               lib/),
-  %w(Unit\ tests        test/unit),
-  %w(Functional\ tests  test/functional)
-].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  #require 'extra/stats'
-  verbose = true
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
-
-##############################################################################
-# SVN
-##############################################################################
-
-desc "Add new files to subversion"
-task :svn_add do
-   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
-end

data/examples/sample_app/dist/app/controllers/files.rb

@@ -1,31 +0,0 @@
-class Files < Merb::Controller
-  
-  def start
-    render :layout => :none
-  end
-  
-  def index
-    @args = params
-    render :action => 'start'
-  end  
-  
-  def upload
-    puts params.inspect
-    
-    FileUtils.mv params[:data][:tempfile].path, 
-                 Merb::Server.config[:dist_root]+"/public/files/#{params[:data][:filename]}"
-    render_no_layout
-  end
-  
-  def progress
-    puts params.inspect
-    Mongrel::Uploads.debug = true
-    @upstatus = Mongrel::Uploads.check(params[:upload_id])
-    render_js 'progress'
-  end
-  
-  def file
-    send_file params[:file]
-  end
-
-end

data/examples/sample_app/dist/app/controllers/posts.rb

@@ -1,71 +0,0 @@
-
-class Posts < Merb::Controller
-  
-  def access_denied
-    render
-  end  
-    
-  def new
-    #session[:foo] = 'foo'
-    #puts session.session_id
-    render
-  end  
-  
-  def create
-    @post = Post.create( :title => params[:title], :body => params[:body])
-    redirect "/posts/show/#{@post.id}"
-  end
-    
-  def show
-    #puts session[:foo]
-    #session[:foo] = 'changed'
-    @post = Post.find params[:id]
-    @comments = @post.comments
-    render
-  end
-  
-  def test
-    puts "request.protocol: #{request.protocol}"
-    puts "request.ssl?: #{request.ssl?}"
-    puts "request.uri: #{request.uri}"
-    puts "request.path: #{request.path}"
-    puts "request.path_info: #{request.path_info}"
-    puts "request.port: #{request.port}"
-    puts "request.host: #{request.host}"
-    puts "request.domain: #{request.domain}"
-    puts "request.get?: #{request.get?}"
-    puts "request.post?: #{request.post?}"
-    puts "request.put?: #{request.put?}"
-    puts "request.delete?: #{request.delete?}"
-    puts "request.head?: #{request.head?}"
-    puts "request.xhr?: #{request.xhr?}"
-    puts request.inspect
-  end
-  
-  def xml_test
-    render_xml
-  end  
-  
-  def list
-    #session[:foo] = 'hi'
-    @posts = Post.find :all, :limit => 4
-    render
-  end  
-  
-  def add_comment
-    puts params.inspect
-    @post = Post.find params[:post_id]
-    @post.comments.create :name => params[:comment_name],
-                          :body => params[:comment_body]
-    @comments = @post.comments.reload
-    render_js 'comment'
-  end
-  
-  def delete_comment
-    @post = Post.find params[:post_id]
-    @post.comments.destroy params[:id]
-    @comments = @post.comments.reload
-    render_js 'comment'
-  end  
-
-end 

data/examples/sample_app/dist/app/controllers/test.rb

@@ -1,40 +0,0 @@
-class Test < Merb::Controller
-  
-  #before :authenticate
-  #before lambda{|c| puts 'lambda filter called'}
-  
-  def bfilter
-    puts "Filter Called!"
-    #throw :halt
-  end
-  
-  def hello
-    # Assign the parameter to an instance variable
-    @name = params[:id]
-    render
-  end
-  
-  def glob
-    "<html><body><h2>#{params[:rest]}</h2></body></html>"
-  end  
-  
-  def json
-    @post = Post.find :first
-    render_js
-  end  
-  
-  def rails
-    puts session.inspect
-    session[:foo]
-  end
-  
-  def foo
-    @args = params
-    render
-  end  
-  
-  def to_s
-    "<html><body>Test controller, no mathing action</body></html>"
-  end
-end
-   

data/examples/sample_app/dist/app/helpers/global_helper.rb

@@ -1,7 +0,0 @@
-module Merb
-  module GlobalHelper
-  end
-end    
-    
-    
-    

data/examples/sample_app/dist/app/helpers/posts_helper.rb

@@ -1,4 +0,0 @@
-module Merb
-  module PostsHelper 
-  end
-end    

data/examples/sample_app/dist/app/models/comment.rb

@@ -1,3 +0,0 @@
-class Comment < ActiveRecord::Base  
-  belongs_to :post
-end

data/examples/sample_app/dist/app/models/post.rb

@@ -1,4 +0,0 @@
-class Post < ActiveRecord::Base  
-  has_many :comments
-
-end

data/examples/sample_app/dist/app/views/files/progress.jerb

@@ -1,3 +0,0 @@
-<% if @upstatus %>
-UploadProgress.update(<%= @upstatus[:size] %>, <%= @upstatus[:received] %>);
-<% end %>

data/examples/sample_app/dist/app/views/files/start.herb

@@ -1,62 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <title>mongrel test</title>
-    <script src="/javascripts/prototype.js" type="text/javascript"></script>
-	<script src="/javascripts/effects.js" type="text/javascript"></script>
-	<script src="/javascripts/mup.js" type="text/javascript"></script>
-	
-<style type="text/css">
-#progress-bar {
-  width:500px;
-  height:25px;
-  margin:15px;
-  border:solid 1px #000;
-  position:relative;
-}
-
-#progress-bar #status-bar {
-  display:block;
-  height:25px;
-  width:0;
-  background-color:#00f;
-  border-right:solid 1px #000;
-  position:absolute;
-  top:0; left:0;
-}
-
-#progress-bar #status-text {
-  display:block;
-  padding: 0 15px;
-  line-height:25px;
-  position:absolute;
-  top:0; left:0;
-}
-</style>
-  </head>
-  <body>
-	
-<h2>Test file uploading.</h2>
-<%= @upid = Time.now.to_i.to_s %>
-<form action="/files/upload?upload_id=<%= @upid %>" 
-	enctype="multipart/form-data" target='upload' method="post"
-	onsubmit="UploadProgress.monitor('<%= escape_js @upid %>')">
-
-  <dl>
-    <dt><label>Select a file</label></dt>
-    <dd><input name="data" type="file" /></dd>
-  </dl>
-
-
-  <p>
-    <input name="commit" type="submit" value="Upload" />
-  </p>
-</form>
-
-<div id="results"></div>
-<div id="progress-bar"></div>
-
-<iframe id="upload" name="upload" src="about:blank"></iframe>
-
-  </body>
-</html>

data/examples/sample_app/dist/app/views/files/upload.herb

@@ -1,6 +0,0 @@
-<h2>File uploaded successfully</h2>
-
-"UPLOADED: <%= params.inspect %><script type='text/javascript'>window.parent.UploadProgress.finish();</script>"
-
-
-

data/examples/sample_app/dist/app/views/layout/application.herb

@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-	<title>Merb: Mongrel + Erb</title>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<%= css_include_tag :merb %>
-	<%= js_include_tag :prototype, :effects %>
-</head>
-
-<body>
-
-  <div id="blogtitle">
-	 <div id="small">Welcome to the land of Merb |  <a href="http://svn.devjavu.com/merb">SVN</a>  |  <a href="http://svn.devjavu.com/merb/README">README</a>  |   <a href="http://merb.devjavu.com/">Trac</a></div>
-  </div>
-
-<div id="border">
-
- <div id="container">
-
-  <div id="content">
-		
-	<div id="topmenu">
-     <ul>
-      <li><a href="#" title="/posts/list"><span>Blog</span></a></li>
-      <li><a href="#" title="Gallery"><span>Get Merb</span></a></li>
-	  <li><a href="#" title="Links"><span>Tutorial</span></a></li>
-	 </ul>
-   </div>
-
-   <div id="introduction">
-      <h3>Merb Mascot</h3>
-      <ul>
-      	<li><img src="/images/louiecon.gif" /></li>
-      </ul>
- <%= catch_content :sidebar %>
-   </div>
-
-<%= catch_content :layout %>
-
-		 <div class="maintext3">
-		   <div class="splitleft">
-		     <p>This is a split left box  in the split left class.</p>
-		   </div>
-		 
-		   <div class="splitright">		
-		     <p>This is a split right box<br /> you can also set the backround color in the class.</p>
-	       </div>
-         </div>
-	  </div>
-	</div>
-
-<div id="footer">Merb: Mongrel + Erb</div>
-
-</div>
-
-
-
-
-</body>
-</html>