mentawai 0.5.0 → 0.6.0

data/lib/mentawai/page/methods/messages.rb

@@ -0,0 +1,78 @@
+require 'mentawai/page/page_method'
+
+module Mentawai
+  module Page
+    module Method
+      
+      class Message < Mentawai::Page::PageMethod
+        
+        def initialize(action, parameters)
+          super
+          @errors = output['errors']
+          @messages = output['messages']
+          @fieldErrors = output['fieldErrors']
+          @fieldName = params[:field]
+        end
+        
+        attr_reader :errors, :messages, :fieldErrors
+        
+        def get_default_key
+          :field
+        end
+        
+        def hasErrors
+          return false if @errors.nil? || !@errors.is_a?(Array)
+          !@errors.empty?
+        end
+        
+        def hasError
+          if @fieldName
+            hasFieldError
+          else
+            hasErrors
+          end
+        end
+        
+        def hasMessages
+          return false if @messages.nil? || !@messages.is_a?(Array)
+          !@messages.empty?
+        end
+        
+        alias hasMessage hasMessages
+        
+        def hasFieldError
+          raise "Missing field for field error!" if @fieldName.nil?
+          return false if @fieldErrors.nil? || !@fieldErrors.is_a?(Hash)
+          @fieldErrors.key?(@fieldName)
+        end
+        
+        def hasFieldErrors
+          return false if @fieldErrors.nil? || !@fieldErrors.is_a?(Hash) || @fieldErrors.empty?
+          true
+        end
+          
+        def fieldError
+          raise "Missing field for field error!" if @fieldName.nil?
+          return nil if @fieldErrors.nil? || !@fieldErrors.is_a?(Hash)
+          @fieldErrors[@fieldName]
+        end
+        
+        def error
+          if @fieldName
+            fieldError
+          else
+            return nil if @errors.nil? || !@errors.is_a?(Array) || @errors.empty?
+            @errors[0]
+          end
+        end
+        
+        def message
+          return nil if @messages.nil? || !@messages.is_a?(Array) || @messages.empty?
+          @messages[0]
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/mentawai/page/page_method.rb

@@ -3,8 +3,9 @@ module Mentawai
     
     class PageMethod
       
-      def initialize(action, parameters)
-        @action = action
+      def initialize(controller, parameters)
+        @controller = controller
+        @action = controller.action
         @params = turn_to_hash(parameters)
       end
       
@@ -58,8 +59,20 @@ module Mentawai
         @action.page
       end
       
+      def controller
+        @controller
+      end
+      
+      def consequence
+        @controller.consequence
+      end
+      
       protected
       
+      def get_default_key
+        :value
+      end
+      
       def find_value(name)
         return nil if @action.nil?
         
@@ -126,7 +139,7 @@ module Mentawai
         elsif parameters.is_a?(Hash) then
           parameters
         else
-          { :value => parameters.to_s }
+          { get_default_key => parameters.to_s }
         end
       end
       

data/lib/mentawai/server.rb

@@ -1,6 +1,7 @@
 require 'rack' 
 require 'mentawai/loader'
 require 'mentawai/session/menta_session'
+require 'mentawai/handler/menta_handler'
 
 module Mentawai
 
@@ -11,7 +12,7 @@ module Mentawai
     def initialize(path = nil)
       
       @host = "127.0.0.1"
-      @port = 8080
+      @port = 8081
       
       @apps = Hash.new
       
@@ -21,12 +22,30 @@ module Mentawai
         @loader = Mentawai::Loader.new(path + '/Mentawai')
         @loader.reloadFiles
       end
+    end
 
+    attr_reader :apps
+    
+    def add_application(app_options)
+      
+      app = Application.new(app_options)
+      
+      raise "Context already exists: " + app.contextPath if @apps.has_key?(app.contextPath)
+      
+      # add /WEB-INF/src and lib directory to the load path...
+      $:.unshift(".#{app.contextPathDir}/WEB-INF/lib")
+      $:.unshift(".#{app.contextPathDir}/WEB-INF/src")
+      
+      @apps[app.contextPath] = app
+      
+      app.reloadAppManager
+      
     end
     
-    def application(contextPath, appManagerFilename, appManagerClass)
-      raise "Context already exists: " + contextPath if @apps.has_key?(contextPath)
-      @apps[contextPath] = Application.new(contextPath, appManagerFilename, appManagerClass)
+    alias add add_application
+    
+    def contexts
+      @apps.keys
     end
     
     def call(env)
@@ -37,8 +56,20 @@ module Mentawai
       req = Rack::Request.new(env)
       res = Rack::Response.new(env)
     
+      contextPath = find_context_path(req.fullpath)
+      
+      env['menta.contextPath'] = contextPath
+      
+      app = @apps[contextPath]
+      app.reloadAppManager(filesLoaded > 0)
+      
+      controller = Mentawai::Core::Controller.new(app)
+      controller.service(env, req, res)
+    end
+    
+    def find_context_path(fullpath)
       # Extract context path from URL...
-      if req.fullpath =~ /(\/[^\/]*)/ then
+      if fullpath =~ /(\/[^\/]*)/ then
         contextPath = $1
       else
         raise "Cannot get context path: " + env.fullpath
@@ -46,61 +77,22 @@ module Mentawai
       
       # Decide about context path...
       if @apps.has_key?(contextPath) then
-        # context path was found! (NOOP)
+        contextPath
       elsif @apps.has_key?('/') then
-        contextPath = '/'
+        '/'
       else
         raise "Cannot find context: " + contextPath
       end
-      
-      env['menta.contextPath'] = contextPath
-      
-      app = @apps[contextPath]
-      app.reloadAppManager(filesLoaded > 0)
-      
-      controller = Mentawai::Core::Controller.new(app.contextPath, app.appContext, app.appManager)
-      controller.service(env, req, res)
     end
     
     def start
       
       session_config = { :cookie_expire_after => 0, :session_expire_after => 10 }
       session_server = Mentawai::Session::MentaSession.new(self, session_config)
-      config = {:Host => @host, :Port => @port}
-      Rack::Handler::Mongrel.run(session_server, config)      
-    end
-    
-    class Application
-    
-      attr_reader :contextPath, :appContext, :appManagerFilename, :appManagerClass, :appManagerFile, :appManager
-    
-      def initialize(contextPath, appManagerFilename, appManagerClass)
-        raise "Application manager does not exist: " + appManagerFilename if not File.exists?(appManagerFilename)
-        @appContext = Hash.new
-        @contextPath = contextPath
-        @appManagerFilename = appManagerFilename
-        @appManagerClass = appManagerClass
-        @appManagerFile = File.new(appManagerFilename)
-        @appManagerFileLastModified = 0
-        reloadAppManager
-      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")
-          @appManager.init(@appContext)
-          @appManagerFileLastModified = @appManagerFile.mtime
-        end
-      end
-      
+      config = {:Host => @host, :Port => @port }
+      Mentawai::Handler::MentaHandler.run(self, session_server, config)
     end
     
   end
 
-end
+end

data/lib/mentawai/util/array.rb

@@ -0,0 +1,12 @@
+
+class Array
+  
+  alias add push
+  alias remove pop
+  alias del pop
+  
+  alias add_first unshift
+  alias remove_first shift
+  alias del_first shift
+  
+end

data/lib/mentawai/util/properties.rb

@@ -0,0 +1,51 @@
+
+module Mentawai
+  module Util
+
+    class Properties
+  
+     def self.load(filename)
+        return nil if not File.exists?(filename)
+        properties = {}
+        
+        value = key = ''
+        multiline = false
+        
+        File.open(filename, 'r') do |file|
+          file.each do |line|
+            extra_space = line =~ /\\ +\n?$/
+            line.strip!
+            line.chop! if extra_space
+            if multiline then
+              value += "\n" + line
+              value += " " if extra_space
+              if value =~ /\\$/ then
+                value.chop!
+                next
+              else
+                multiline = false
+              end
+            else
+              next if line =~ /^\#/ || line == ''
+              index = line.index('=')
+              next if not index
+              key = line[0..index - 1].strip
+              value = line[index + 1..-1].strip
+              value += " " if extra_space
+            end
+            
+            if value =~ /\\$/ then
+              multiline = true
+              value.chop!
+              next
+            end
+            properties[key] = value
+          end
+        end
+        properties
+      end
+      
+    end
+    
+  end
+end

data/lib/mentawai/version.rb

@@ -1,9 +1,9 @@
 module Mentawai #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
-end
+end

data/lib/mentawai.rb

@@ -6,6 +6,7 @@ root = File.expand_path(File.dirname(__FILE__))
 
 require root + '/mentawai/loader'
 require root + '/mentawai/server'
+require root + '/mentawai/application'
 
 # Now loop and load everything inside '/mentawai/**'
 

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs =  " -r irb/completion"
+# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/mentawai.rb'}"
+puts "Loading mentawai gem"
+exec "#{irb} #{libs} --simple-prompt"

data/script/console.cmd

@@ -0,0 +1 @@
+@ruby script/console %*

data/script/destroy.cmd

@@ -0,0 +1 @@
+@ruby script/destroy %*

data/script/generate.cmd

@@ -0,0 +1 @@
+@ruby script/generate %*

data/script/txt2html

@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 
+GEM_NAME = 'mentawai' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'mentawai'
+
 require 'rubygems'
 begin
   require 'newgem'
+  require 'rubyforge'
 rescue LoadError
   puts "\n\nGenerating the website requires the newgem RubyGem"
   puts "Install: gem install newgem\n\n"
@@ -11,10 +15,14 @@ end
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + '/../lib/mentawai/version.rb'
+require File.dirname(__FILE__) + "/../lib/#{GEM_NAME}/version.rb"
 
 version  = Mentawai::VERSION::STRING
-download = 'http://rubyforge.org/projects/mentawai'
+download = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+
+def rubyforge_project_id
+  RubyForge.new.autoconfig["group_ids"][RUBYFORGE_PROJECT]
+end
 
 class Fixnum
   def ordinal
@@ -42,10 +50,9 @@ end
 
 if ARGV.length >= 1
   src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
-  
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
 else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
   exit!
 end
 
@@ -55,7 +62,8 @@ title = nil
 body = nil
 File.open(src) do |fsrc|
   title_text = fsrc.readline
-  body_text = fsrc.read
+  body_text_template = fsrc.read
+  body_text = ERB.new(body_text_template).result(binding)
   syntax_items = []
   body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
     ident = syntax_items.length

data/script/txt2html.cmd

@@ -0,0 +1 @@
+@ruby script/txt2html %*

data/tasks/deployment.rake

@@ -1,5 +1,6 @@
 desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
+#task :deploy => [:check_version, :website, :release] do
+task :deploy => [:check_version, :release] do
   puts "Remember to create SVN tag:"
   puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
     "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
@@ -23,12 +24,18 @@ end
 
 desc 'Install the package as a gem, without generating documentation(ri/rdoc)'
 task :install_gem_no_doc => [:clean, :package] do
-  sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
+  if Hoe::WINDOZE
+    suf = 'cmd.exe /c'
+  else
+    suf = 'sudo'
+  end
+  
+  sh "#{suf} gem install pkg/*.gem --no-rdoc --no-ri"
 end
 
 namespace :manifest do
   desc 'Recreate Manifest.txt to include ALL files'
   task :refresh do
-    `rake check_manifest | patch -p0 > Manifest.txt`
+    `rake check_manifest | patch -p0`
   end
 end

data/tasks/website.rake

@@ -10,8 +10,8 @@ task :website_upload do
   host = "#{rubyforge_username}@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/#{PATH}/"
   local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
+  sh %{cmd.exe /c rsync.exe -aCv #{local_dir}/ #{host}:#{remote_dir}}
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
+task :website => [:website_generate, :website_upload, :publish_docs]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mentawai
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Sergio Oliveira Jr.
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-17 00:00:00 -08:00
+date: 2008-04-30 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
-description: A port of the Mentawai framework to Ruby + Mongrel + Rack
+description: Mentawai Web Container, Server and Framework in Ruby
 email: 
 - sergio.oliveira.jr@gmail.com
 executables: 
@@ -24,18 +24,20 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
+- PostInstall.txt
 - README.txt
-- website/index.txt
 files: 
 - 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
@@ -47,32 +49,37 @@ files:
 - 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
-- log/debug.log
+- 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
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
 has_rdoc: true
 homepage: http://mentawai.rubyforge.org
-post_install_message: 
+post_install_message: ""
 rdoc_options: 
 - --main
 - README.txt
@@ -93,10 +100,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mentawai
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: A port of the Mentawai framework to Ruby + Mongrel + Rack
+summary: Mentawai Web Container, Server and Framework in Ruby
 test_files: 
-- test/test_mentawai.rb
 - test/test_helper.rb
+- test/test_mentawai.rb

data/website/index.html

@@ -1,93 +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" xml:lang="en" lang="en">
-<head>
-  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-      mentawai
-  </title>
-  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
-
-</style>
-  <script type="text/javascript">
-    window.onload = function() {
-      settings = {
-          tl: { radius: 10 },
-          tr: { radius: 10 },
-          bl: { radius: 10 },
-          br: { radius: 10 },
-          antiAlias: true,
-          autoPad: true,
-          validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
-    }
-  </script>
-</head>
-<body>
-<div id="main">
-
-    <h1>mentawai</h1>
-    <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/mentawai"; return false'>
-      <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/mentawai" class="numbers">0.5.0</a>
-    </div>
-    <h1>&#x2192; &#8216;mentawai&#8217;</h1>
-
-
-	<h2>What</h2>
-
-
-	<h2>Installing</h2>
-
-
-	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">mentawai</span></pre></p>
-
-
-	<h2>The basics</h2>
-
-
-	<h2>Demonstration of usage</h2>
-
-
-	<h2>Forum</h2>
-
-
-	<p><a href="http://groups.google.com/group/mentawai">http://groups.google.com/group/mentawai</a></p>
-
-
-	<p><span class="caps">TODO</span> &#8211; create Google Group &#8211; mentawai</p>
-
-
-	<h2>How to submit patches</h2>
-
-
-	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-
-
-	<p>The trunk repository is <code>svn://rubyforge.org/var/svn/mentawai/trunk</code> for anonymous access.</p>
-
-
-	<h2>License</h2>
-
-
-	<p><span class="caps">LGPL</span></p>
-
-
-	<h2>Contact</h2>
-
-
-	<p>Comments are welcome. Send an email to &#8220;Sergio Oliveira Jr.&#8221; (sergio.oliveira.jr at gmail.com)</p>
-    <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, 17th March 2008<br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
-    </p>
-</div>
-
-<!-- insert site tracking codes here, like Google Urchin -->
-
-</body>
-</html>