mentawai 0.5.0 → 0.6.0

data/History.txt

@@ -1,7 +1,10 @@
-== 0.5.0 2008-03-17
-
-* 3 major enhancement:
-  * Using Rake instead of Merb
-  * menta script to create blank app
-  * Available as ruby gem 'mentawai'
+== 0.6.0 2008-04-30
 
+* MentaOnRuby is now a web container as well as a web server
+* Now supports directory listing, default page, and static file serving like a web server
+* No more /views or /actions directory. Now we have /WEB-INF/src and /WEB-INF/lib
+* ERB pages can be anywere now
+* Everything inside /WEB-INF directory is protected from external access
+* You can run different applications in the same instance of MentaOnRuby ('/' = /ROOT directory like Java servlets)
+* You can use the new page method content_type to set the content-type of a erb template (ex: text/xml)
+* Many other improvements and bug fixes

data/Manifest.txt

@@ -1,43 +1,50 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/menta
-config/hoe.rb
-config/requirements.rb
-lib/mentawai.rb
-lib/mentawai/core/action.rb
-lib/mentawai/core/action_config.rb
-lib/mentawai/core/app_context.rb
-lib/mentawai/core/app_manager.rb
-lib/mentawai/core/controller.rb
-lib/mentawai/core/cookies.rb
-lib/mentawai/core/forward.rb
-lib/mentawai/core/input.rb
-lib/mentawai/core/invocation_chain.rb
-lib/mentawai/core/output.rb
-lib/mentawai/core/session.rb
-lib/mentawai/loader.rb
-lib/mentawai/page/methods/out.rb
-lib/mentawai/page/page_method.rb
-lib/mentawai/server.rb
-lib/mentawai/session/menta_session.rb
-lib/mentawai/session/rack_session.rb
-lib/mentawai/util/string.rb
-lib/mentawai/version.rb
-log/debug.log
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
-test/test_helper.rb
-test/test_mentawai.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml
+History.txt
+License.txt
+Manifest.txt
+PostInstall.txt
+README.txt
+Rakefile
+bin/menta
+config/hoe.rb
+config/requirements.rb
+lib/mentawai.rb
+lib/mentawai/application.rb
+lib/mentawai/core/action.rb
+lib/mentawai/core/action_config.rb
+lib/mentawai/core/app_context.rb
+lib/mentawai/core/app_manager.rb
+lib/mentawai/core/controller.rb
+lib/mentawai/core/cookies.rb
+lib/mentawai/core/forward.rb
+lib/mentawai/core/input.rb
+lib/mentawai/core/invocation_chain.rb
+lib/mentawai/core/output.rb
+lib/mentawai/core/session.rb
+lib/mentawai/handler/menta_handler.rb
+lib/mentawai/i18n/loc_manager.rb
+lib/mentawai/loader.rb
+lib/mentawai/page/methods/content_type.rb
+lib/mentawai/page/methods/messages.rb
+lib/mentawai/page/methods/out.rb
+lib/mentawai/page/page_method.rb
+lib/mentawai/server.rb
+lib/mentawai/session/menta_session.rb
+lib/mentawai/session/rack_session.rb
+lib/mentawai/util/array.rb
+lib/mentawai/util/properties.rb
+lib/mentawai/util/string.rb
+lib/mentawai/version.rb
+script/console
+script/console.cmd
+script/destroy
+script/destroy.cmd
+script/generate
+script/generate.cmd
+script/txt2html
+script/txt2html.cmd
+setup.rb
+tasks/deployment.rake
+tasks/environment.rake
+tasks/website.rake
+test/test_helper.rb
+test/test_mentawai.rb

data/bin/menta

@@ -1,122 +1,244 @@
-#!/usr/bin/env ruby
-
-def version
-  require 'mentawai/version'
-  puts "mentawai #{Mentawai::VERSION::STRING}" +
-  	   " - The Mentawai Web Framework implemented in Ruby"
-  puts "More information on http://www.mentaframework.org"
-end
-
-def help
-  version
-  puts
-  puts "-v,--version\t\tShow version"
-  puts "-h,--help\t\tShow this help"
-  puts "<appname>\t\tCreate blank menta app"
-end
-
-START_FILE = <<EOF
-require 'rubygems'
-require 'mentawai'
-
-server = Mentawai::Server.new
-server.host = '0.0.0.0'
-server.port = 8080
-
-# Setup the ROOT context (ROOT web application)
-server.application('/', 'app_manager.rb', 'AppManager')
-
-# You can setup as many applications as you want
-# Ex:
-# server.application('/myapp1', 'myapp1.rb', 'AppManager')
-# server.application('/myapp2', 'myapp2.rb', 'AppManager')
-
-# Start mongrel web server to server you mentawai app
-server.start
-EOF
-
-APP_MANAGER_FILE = <<EOF
-include Mentawai::Core
-
-class AppManager < ApplicationManager
-
-  def init(appContext)
-    action("Hello").on(:success => Forward.new("hello.erb"))
-    addPageMethod(:m_my_method, 'Mentawai::Page::Method::Out', 'print')
-  end
-  
-end
-EOF
-
-ACTION_FILE = <<EOF
-
-class Hello < Mentawai::Core::Action
-
-    def execute
-      
-      puts "Inside action Hello!"
-      
-      username = input['username']
-      
-      username = "NO USER" if username.nil?
-
-      output['username'] = username.upcase
-      
-      :success
-      
-    end
-end
-EOF
-
-VIEW_FILE = <<EOF
-<html>
-<body>
-<!-- using menta method m_out -->
-<h3>Hello1: <%= m_out('username') %></h3>
-<!-- using custom page method -->
-<h3>Hello2: <%= m_my_method('username') %></h3>
-</body>
-</html>
-EOF
-
-def create_app(app)
-  Dir.mkdir(app)
-  Dir.mkdir(app + '/actions')
-  Dir.mkdir(app + '/views')
-  f = File.open(app + '/start.rb', 'w')
-  f.print START_FILE
-  f.close
-  f = File.open(app + '/app_manager.rb', 'w')
-  f.print APP_MANAGER_FILE
-  f.close
-  f = File.open(app + '/actions/hello.rb', 'w')
-  f.print ACTION_FILE
-  f.close
-  f = File.open(app + '/views/hello.erb', 'w')
-  f.print VIEW_FILE
-  f.close
-  puts "Create menta app \"#{app}\""
-  puts "To run: ruby start.rb inside \"#{app}\""
-end
-
-if %w(-v --version).include? ARGV.first
-  version
-  exit(0)
-end
-
-if %w(-h --help).include?(ARGV.first) || ARGV.length == 0 then
-  help
-  exit(0)
-end
-
-if ARGV.length == 1
-  arg = ARGV[0]
-  if arg =~ /^\-\-?/
-  	puts "Unrecognized argument: #{arg}"
-  	exit(0)
-  end
-  create_app(arg)
-end
-
-  
-
+#!/usr/bin/env ruby
+
+def version
+  require 'mentawai/version'
+  puts "mentawai #{Mentawai::VERSION::STRING}" +
+  	   " - Mentawai Web Container, Server and Framework in Ruby"
+  puts "More information on http://www.mentaframework.org"
+end
+
+def help
+  version
+  puts
+  puts "-v,--version\t\tShow version"
+  puts "-h,--help\t\tShow this help"
+  puts "-c,--create <dirname>\tCreate web container (default dirname = 'mentawai')"
+end
+
+START_FILE = <<EOF
+require 'rubygems'
+require 'mentawai'
+
+include Mentawai
+
+server = Server.new
+server.host = '127.0.0.1'
+server.port = 8081
+
+# Configure the parameters of your web application... (ROOT context)
+
+root_app_options = {
+  :app_context => '/', # default = '/'
+  :app_manager_file => 'app_manager.rb', # default = 'app_manager.rb'
+  :app_manager_class => 'AppManager', # default = 'AppManager'
+  :action_extension => 'mtw', # default = 'mtw'
+  :listing_allowed => false, # default = false
+  :default_page => 'index.erb', # default = 'index.erb'
+  :dirs_allowed_for_listing => [] # default = []
+}
+
+server.add(root_app_options)
+
+# Configure the parameters of a second web application... (/myapp context)
+
+myapp_app_options = {
+  :app_context => '/myapp',
+  :action_extension => 'menta',
+  :listing_allowed => true,
+  :dirs_allowed_for_listing => ['img']
+}
+
+server.add(myapp_app_options)
+
+# Start mongrel server to serve your Mentawai applications...
+
+server.start
+
+
+EOF
+
+APP_MANAGER_FILE_1 = <<EOF
+include Mentawai::Core
+
+class AppManager < ApplicationManager
+
+  def init(appContext)
+  
+  	# Define an action...
+    action(:action_name => "/Hello", :class_name => "MyApp1::Hello").on(:success => fwd("hello.erb"))
+    
+    # Add a custom page method (like a tag, but this is for your ERB pages)
+    addPageMethod(:m_my_method, 'Mentawai::Page::Method::Out', 'print')
+  end
+  
+end
+EOF
+
+APP_MANAGER_FILE_2 = <<EOF
+include Mentawai::Core
+
+class AppManager < ApplicationManager
+
+  def init(appContext)
+  
+  	# Define an action...
+    action(:action_name => "/Hello", :class_name => "MyApp2::Hello").on(:success => fwd("hello.erb"))
+    
+  end
+  
+end
+EOF
+
+
+ACTION_FILE_1 = <<EOF
+
+module MyApp1
+
+	class Hello < Mentawai::Core::Action
+	
+	    def execute
+	      
+	      username = input['username']
+	      
+	      username = "NO USER" if username.nil?
+	
+	      output['username'] = username.upcase
+	      
+	      :success
+	      
+	    end
+	    
+	    def sayHi
+	   	  
+	   	  output['username'] = "Roger"
+	   	  
+	   	  :success
+	   	  
+	   	end
+	   	
+	   	def sayHello
+	   	
+	   	  output['username'] = "Rick"
+	   	  
+	   	  :success
+	   	  
+	   	end
+	end
+	
+end
+EOF
+
+ACTION_FILE_2 = <<EOF
+
+module MyApp2
+
+	class Hello < Mentawai::Core::Action
+	
+	    def sayHi
+	   	  
+	   	  output['username'] = "Sergio"
+	   	  
+	   	  :success
+	   	  
+	   	end
+	   	
+	   	def sayHello
+	   	
+	   	  output['username'] = "Rubem"
+	   	  
+	   	  :success
+	   	  
+	   	end
+	   	
+	end
+end	
+EOF
+
+VIEW_FILE_1 = <<EOF
+<html>
+<body>
+<title>ROOT ('/') Mentawai Application</title>
+<!-- using menta method m_out -->
+<h3>Hello1: <%= m_out('username') %></h3>
+<!-- using custom page method -->
+<h3>Hello2: <%= m_my_method('username') %></h3>
+</body>
+</html>
+EOF
+
+VIEW_FILE_2 = <<EOF
+<html>
+<body>
+<title>myapp ('/myapp') Mentawai Application</title>
+<!-- using menta method m_out -->
+<h3>Hi1: <%= m_out('username') %></h3>
+</body>
+</html>
+EOF
+
+
+def create_app(app)
+  Dir.mkdir(app)
+  
+  Dir.mkdir(app + '/ROOT')
+  Dir.mkdir(app + '/ROOT/WEB-INF')
+  Dir.mkdir(app + '/ROOT/WEB-INF/src')
+  Dir.mkdir(app + '/ROOT/WEB-INF/lib')
+  
+  Dir.mkdir(app + '/myapp')
+  Dir.mkdir(app + '/myapp/WEB-INF')
+  Dir.mkdir(app + '/myapp/WEB-INF/src')
+  Dir.mkdir(app + '/myapp/WEB-INF/lib')
+  
+  f = File.open(app + '/start.rb', 'w')
+  f.print START_FILE
+  f.close
+  
+  f = File.open(app + '/ROOT/WEB-INF/app_manager.rb', 'w')
+  f.print APP_MANAGER_FILE_1
+  f.close
+  
+  f = File.open(app + '/ROOT/WEB-INF/src/hello.rb', 'w')
+  f.print ACTION_FILE_1
+  f.close
+  
+  f = File.open(app + '/ROOT/hello.erb', 'w')
+  f.print VIEW_FILE_1
+  f.close
+  
+  f = File.open(app + '/myapp/WEB-INF/app_manager.rb', 'w')
+  f.print APP_MANAGER_FILE_2
+  f.close
+  
+  f = File.open(app + '/myapp/WEB-INF/src/hello.rb', 'w')
+  f.print ACTION_FILE_2
+  f.close
+  
+  f = File.open(app + '/myapp/hello.erb', 'w')
+  f.print VIEW_FILE_2
+  f.close
+  
+  puts "Mentawai web container created: #{app}"
+  puts "To run: ruby start.rb inside \"#{app}\""
+  puts 
+  puts "Successfuly created a mentawai server!"
+end
+
+if %w(-v --version).include? ARGV.first
+  version
+  exit(0)
+end
+
+if %w(-h --help).include?(ARGV.first) || ARGV.length == 0 then
+  help
+  exit(0)
+end
+
+if %w(-c --create).include?(ARGV.first)
+  arg = ARGV[1] || 'mentawai'
+  create_app(arg)
+  exit(0)
+end
+
+puts "Invalid argument!"
+  

data/config/hoe.rb

@@ -2,11 +2,14 @@ require 'mentawai/version'
 
 AUTHOR = 'Sergio Oliveira Jr.'  # can also be an array of Authors
 EMAIL = "sergio.oliveira.jr@gmail.com"
-DESCRIPTION = "A port of the Mentawai framework to Ruby + Mongrel + Rack"
+DESCRIPTION = "Mentawai Web Container, Server and Framework in Ruby"
 GEM_NAME = 'mentawai' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'mentawai' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+EXTRA_DEPENDENCIES = [
+#  ['activesupport', '>= 1.3.1']
+]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
 @config = nil
@@ -28,26 +31,26 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
 end
 
 
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
+REV = nil
+# UNCOMMENT IF REQUIRED:
+# REV = YAML.load(`svn info`)['Revision']
 VERS = Mentawai::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'mentawai documentation',
     "--opname", "index.html",
-    "--line-numbers", 
+    "--line-numbers",
     "--main", "README",
     "--inline-source"]
 
 class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
+  def extra_deps
+    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
     @extra_deps
-  end 
+  end
 end
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
+$hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.developer(AUTHOR, EMAIL)
   p.description = DESCRIPTION
   p.summary = DESCRIPTION
@@ -55,16 +58,16 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/**/test_*.rb"]
   p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
+
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
+  #p.extra_deps = EXTRA_DEPENDENCIES
+
+    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+  end
 
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
+CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-hoe.rsync_args = '-av --delete --ignore-errors'
+$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
+$hoe.rsync_args = '-av --delete --ignore-errors'
+$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -13,5 +13,3 @@ require 'rubygems'
 end
 
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require 'mentawai'

data/lib/mentawai/application.rb

@@ -0,0 +1,64 @@
+
+module Mentawai
+
+  class Application
+  
+    attr_reader :appContext, :contextPath, :appManagerFilename, :appManagerClass, :appManagerFile, :appManager, :extension, :default_page, :listing_allowed, :dirs_allowed_for_listing
+    
+    def initialize(params)
+      
+      @appContext = Hash.new
+      
+      @contextPath = params[:app_context] || '/'
+      
+      @appManagerFilename = params[:app_manager_file] || 'app_manager.rb'
+      @appManagerFilename = ".#{contextPathDir}/WEB-INF/#{@appManagerFilename.sub(/^\//, "")}"
+      raise "Application manager does not exist: " + @appManagerFilename if not File.exists?(@appManagerFilename)
+      
+      @appManagerClass = params[:app_manager_class] || 'AppManager'
+      
+      @appManagerFile = File.new(@appManagerFilename)
+      
+      @appManager = nil
+      
+      @extension = params[:action_extension] || 'mtw'
+      
+      @default_page = params[:default_page] || 'index.erb'
+      
+      @listing_allowed = params[:listing_allowed] || false
+      
+      @dirs_allowed_for_listing = params[:dirs_allowed_for_listing] || []
+      
+      @appManagerFileLastModified = 0
+      
+    end
+    
+    def contextPathDir
+      if contextPath == '/'
+        "/ROOT"
+      else
+        contextPath
+      end
+    end
+    
+    def to_s
+      "#{contextPath} (#{appManagerFilename}/#{appManagerClass})"
+    end
+    
+    def reloadAppManager(force = false)
+      if force || @appManagerFile.mtime != @appManagerFileLastModified then
+        if @appManagerFileLastModified == 0 then
+          puts "Loading app manager: " + @appManagerFilename
+        else
+          puts "Reloading app manager: " + @appManagerFilename
+        end
+        load @appManagerFilename
+        @appManager = eval(appManagerClass + ".new(self)")
+        @appManager.init(@appContext)
+        @appManagerFileLastModified = @appManagerFile.mtime
+      end
+    end
+    
+  end
+  
+end

data/lib/mentawai/core/action.rb

@@ -5,6 +5,33 @@ module Mentawai
       
       attr_accessor :input, :output, :session, :application, :locale, :cookies, :page
       
+      def messages
+        return nil if output.nil?
+        msgs = output['messages']
+        if not msgs
+          output['messages'] = msgs = Array.new
+        end
+        msgs
+      end
+      
+      def errors
+        return nil if output.nil?
+        errs = output['errors']
+        if not errs
+          output['errors'] = errs = Array.new
+        end
+        errs
+      end
+      
+      def fieldErrors
+        return nil if output.nil?
+        fieldErrs = output['fieldErrors']
+        if not fieldErrs
+          output['fieldErrors'] = fieldErrs = Hash.new
+        end
+        fieldErrs
+      end
+      
     end
     
   end

data/lib/mentawai/core/app_context.rb

@@ -40,6 +40,7 @@ module Mentawai
       
       alias [] get
       alias []= put
+      alias each values
       
     end