nitro 0.5.0 → 0.6.0

data/lib/nitro/l10n.rb

@@ -1,9 +1,11 @@
 # = L10N, Localization support
 #
-# code: tml
+# code: gmosx
 #
 # (c) 2002-2003 Navel, all rights reserved.
-# $Id: l10n.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: l10n.rb 185 2004-12-10 13:29:09Z gmosx $
+
+require 'nitro/filters'
 
 $lc_en = {}
 $lc_el = {}
@@ -12,7 +14,6 @@ $lc_el = {}
 #
 # Override as needed in your application.
 #
-
 $lc_map = {
 	"en" => $lc_en,
 	"el" => $lc_el
@@ -20,3 +21,10 @@ $lc_map = {
 
 # The locales to use for this application.
 $lc_use = %w{lc-en lc-el}
+
+module LocalizationFilter
+	def localize
+		@lc = @session[:LC] || $lc_en
+	end
+end
+	

data/lib/nitro/scaffold.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id$
+# $Id: scaffold.rb 175 2004-11-26 16:11:27Z gmosx $
 
 require 'glue/inflector'
 

data/lib/nitro/server/render.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: render.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: render.rb 185 2004-12-10 13:29:09Z gmosx $
 
 module N
 
@@ -105,7 +105,15 @@ module RenderUtils
 				@response.header['Content-Type'] = 'text/html'
 				@out ||= ''
 		}
+		
+		# call 'before' filter chain.
+		if klass.respond_to?(:before_filters)
+			code << %{
+					#{klass.gen_filters_call_code(klass.before_filters)}
+			}
+		end
 
+		# call the action
 		if klass.instance_methods.include?(meth)
 			valid = true
 			code << %{
@@ -113,6 +121,7 @@ module RenderUtils
 			}
 		end
 
+		# call the programmatically generated template if exists.
 		if klass.instance_methods.include?("#{meth}__xhtml")
 			valid = true
 			code << %{
@@ -120,6 +129,7 @@ module RenderUtils
 			}
 		end
 		
+		# call the template
 		if template = template_for_method(base, meth)
 			valid = true
 			code << %{
@@ -128,6 +138,13 @@ module RenderUtils
 		end
 		
 		raise "Invalid method '#{meth}' for service '#{klass}'!" unless valid
+
+		# call 'after' filter chain.
+		if klass.respond_to?(:after_filters)
+			code << %{
+				#{klass.gen_filters_call_code(klass.after_filters)}
+			}
+		end
 		
 		code << %{
 				redirect_referer if @out.empty?
@@ -142,6 +159,8 @@ module RenderUtils
 			}
 		end
 
+#		puts '++', code, '++'
+		
 		klass.class_eval(code)
 		
 		return "__#{meth}"
@@ -160,6 +179,14 @@ module RenderUtils
 				@out ||= ''
 		}
 
+		# call 'before' filter chain.
+		if klass.respond_to?(:before_filters)
+			code << %{
+					#{klass.gen_filters_call_code(klass.before_filters)}
+			}
+		end
+
+		# call the action
 		if klass.instance_methods.include?(meth)
 			valid = true
 			code << %{
@@ -167,6 +194,7 @@ module RenderUtils
 			}
 		end
 
+		# call the programmatically generated template if exists.
 		if klass.instance_methods.include?("#{meth}__xml")
 			valid = true
 			code << %{
@@ -174,6 +202,7 @@ module RenderUtils
 			}
 		end
 		
+		# call the template
 		if template = template_for_method(base, meth, 'xml')
 			valid = true
 			code << %{
@@ -182,7 +211,14 @@ module RenderUtils
 		end
 		
 		raise "Invalid method '#{meth}' for service #{klass}!" unless valid
-		
+
+		# call 'after' filter chain.
+		if klass.respond_to?(:after_filters)
+			code << %{
+				#{klass.gen_filters_call_code(klass.after_filters)}
+			}
+		end
+				
 		code << %{
 			end
 		}
@@ -200,6 +236,17 @@ module RenderUtils
 		return "__rest_#{meth}"
 	end
 
+	#
+	#
+	def load_statically_included(filename)
+		$log.debug "Statically including '#{filename}'" if $DBG
+		
+		text = File.read(filename)
+		text.gsub!(/<\?xml.*\?>/, '')
+		text.gsub!(/<\/?root(.*?)>/m, ' ');
+		
+		return text
+	end
 	
 end
 
@@ -234,6 +281,8 @@ module Render
 		@response = response
 		@session = session
 		@params = request.query
+		
+		@out_buffers = nil
 	end
 		
 	# Returns the output of the rendering as string.
@@ -268,6 +317,9 @@ module Render
 			if self.class == render_class
 				self.send(meth)
 			else
+			 	if $reload_scripts and defined?(render_class::SOURCE_FILE)
+					load(render_class::SOURCE_FILE)
+				end
 				r = render_class.new(base, @request, @response, @session)
 				r.send(meth)
 				@out = r.out
@@ -276,7 +328,7 @@ module Render
 			log_error "error while handling '#{path}'."
 			log_error pp_exception(e)
 			# more fault tolerant, only flags the erroneous box with 
-			# errorm not the full page.
+			# error not the full page.
 			@out << '(error)'
 		end
 
@@ -311,12 +363,57 @@ module Render
 	end
 
 	# Log a rendering error.
-	#
+	#--
+	# FIXME: find a better name
+	#++
 	def log_error(str)
 		@rendering_errors ||= []
 		@rendering_errors << str
 		$log.error str
 	end
+	
+	# --------------------------------------------------------------------
+	# Output buffering methods.
+	
+	# Start (push) a new output buffer.
+	#
+	def ob_start
+		@out_buffers = [] unless @out_buffers
+		@out_buffers.push(@out)
+		@out = ''
+	end
+	
+	# End (pop) the current output buffer.
+	#
+	def ob_end
+		@out = @out_buffers.pop
+	end
+	
+	# End (pop) the current output buffer and write to the parent.
+	#
+	def ob_write_end
+		nested_buffer = @out
+		@out = @out_buffers.pop
+		@out << nested_buffer
+	end
+	# --------------------------------------------------------------------
+	# Caching methods.
+	
+	#--
+	# FIXME: pseudocode, not working.
+	#++
+	def cache_start
+		valid?		
+		ob_start
+	end
+
+	#--
+	# FIXME: pseudocode, not working.
+	#++
+	def cache_end
+		save_fragment(@out)
+		ob_write_end
+	end	
 end
 
 end # module

data/lib/nitro/server/shaders.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: shaders.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: shaders.rb 188 2004-12-10 14:14:17Z gmosx $
 
 module N
 
@@ -66,6 +66,9 @@ class RubyShader < N::Shader
 		# strip the xml header! (interracts with the following gsub!)
 		text.gsub!(/<\?xml.*\?>/, "")
 
+		# statically include files.
+		# TODO: Add here!
+
 		# xform include instructions <include href="xxx" />
 		# must be transformed before the processinc instructions.
 		text.gsub!(/<include href="(.*?)"(.*)(.?)\/>/) { |match|
@@ -75,19 +78,28 @@ class RubyShader < N::Shader
 		# remove <root> elements. typically removed by xslt but lets
 		# play it safe.
 		text.gsub!(/<(\/)?root>/, '')
-				
+		
+		# runtime ruby code.
+		
 		# xform the processing instructions, use <?r as
 		# a marker.
 		text.gsub!(/\?>/, "\n@out << %^")
-		text.gsub!(/<\?r /, "^\n")
+		text.gsub!(/<\?r(\s?)/, "^\n")
 		
-		# xform alternative code tags (used in xsl stylesheets)
+		# xform alternative code tags (very useful in xsl stylesheets)
 		#
 		text.gsub!(/<\/ruby>/, "\n@out << %^")
 		text.gsub!(/<ruby>/, "^\n")
 		
-		text =  "@out << %^" + text + "^"
+		# compile time ruby code.
+		# Usefull for example to prevaluate localization.
 		
+		text.gsub!(/\#\[(.*?)\]/) { |match|
+			eval($1)
+		}
+		
+		text =  "@out << %^" + text + "^"
+
 		process_next(hash, text)
 	end
 

data/lib/nitro/service.rb

@@ -2,25 +2,25 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: service.rb 159 2004-11-18 10:18:30Z gmosx $
+# $Id: service.rb 185 2004-12-10 13:29:09Z gmosx $
 
 require 'nitro/server/render'
 require 'nitro/scaffold'
+require 'nitro/filters'
 
 module N
 
 # = Service
 #
-# An Application Server  service.
+# Defines an application service.
 #
 class Service
 	include N::Render
+	include N::Scaffolding
+	include N::Filtering		
 	
 	# The base path of the service, essentially the mount point.
 	attr :base_path
 end
 
-class Methods
-end
-
 end # module

data/lib/nitro/ui/pager.rb

@@ -2,7 +2,9 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: pager.rb 152 2004-11-13 20:02:35Z gmosx $
+# $Id: pager.rb 185 2004-12-10 13:29:09Z gmosx $
+
+require 'nitro/uri'
 
 module N; module UI
 
@@ -20,11 +22,28 @@ module N; module UI
 # The pager does not extend Array (it includes an Array instead) to
 # avoid a concat() in the initialization step. 
 #
-# TODO:
-# - Extend from array? (would be more elegant)
 #
 # === Example:
 #
+#	@pager = N::UI::Pager.new('entries', @request, 5)
+#	@entries = N::BlogEntry.all("ORDER BY oid #{@pager.sql_limit}")
+#	@pager.set(N::BlogEntry.count)
+#
+# default navigation (customize with css):
+#	<div class="pager">#{@pager.navigation}</div>
+#
+# custom navigation:
+#
+# <table cellspacing="0" width="100%" border="1">
+#		<tr>
+#			<td width="64"><x:pager-prev>Previous</x:pager-prev></td>
+#			<td width="100%"></td>
+#			<td width="64"><x:pager-next>Next</x:pager-next></td>
+#		</tr>
+# </table>
+#
+# === Investigate:
+#
 # INVESTIGATE:
 # mysql> SELECT SQL_CALC_FOUND_ROWS * FROM tbl_name
 #    -> WHERE id > 100 LIMIT 10;
@@ -39,11 +58,11 @@ class Pager < Array
 	# read needed variables from the request.
 	attr_accessor :request
 	
-	def initialize(name, request, items_per_page, items = nil)
+	def initialize(name, request, items_per_page = 10, items = nil)
 		raise "items_per_page should be > 0" unless items_per_page > 0
 	
 		@request, @name = request, name
-		@page = request.get("__pg#{@name}", 1)
+		@page = request.query.fetch("__pg#{@name}", 1).to_i
 		@items_per_page = items_per_page
 		@start_idx = (@page - 1) * items_per_page
 		
@@ -131,15 +150,15 @@ class Pager < Array
 		
 		unless @page == first_page()
 			nav << %{
-				<div class="first"><a href="#{target_uri(first_page())}">����</a></div>
-				<div class="previous"><a href="#{target_uri(previous_page())}">�����������</a></div>
+				<div class="first"><a href="#{target_uri(first_page())}">First</a></div>
+				<div class="previous"><a href="#{target_uri(previous_page())}">Previous</a></div>
 			}
 		end
 		
 		unless @page == last_page()
 			nav << %{
-				<div class="last"><a href="#{target_uri(last_page())}">�����</a></div>
-				<div class="next"><a href="#{target_uri(next_page())}">�������</a></div>
+				<div class="last"><a href="#{target_uri(last_page())}">Last</a></div>
+				<div class="next"><a href="#{target_uri(next_page())}">Next</a></div>
 			}
 		end
 
@@ -174,15 +193,20 @@ class Pager < Array
 		end
 	end
 	
+	# Returns the current offset. The offset is zero-based.
+	#
+	def offset
+		(@page-1) * @items_per_page
+	end
+	
 	# ------------------------------------------------------------------
 	
 	# Generate the target URI.
 	# 
 	def target_uri(page)
 		params = {"__pg#{@name}" => page}
-		return N::UriUtils.update_query_string(@request.uri, params)
+		return N::UriUtils.update_query_string(@request.request_uri.to_s, params)
 	end
-	private :target_uri
 
 end
 

data/lib/nitro/version.rb

@@ -2,10 +2,10 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: version.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: version.rb 185 2004-12-10 13:29:09Z gmosx $
 
 # The name of the server.
 $srv_name = 'Nitro'
 
 # The version of the server.
-$srv_version = '0.5.0'
+$srv_version = '0.6.0'

data/lib/og.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: og.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: og.rb 185 2004-12-10 13:29:09Z gmosx $
 
 require "glue/property"
 require "glue/array"
@@ -10,6 +10,24 @@ require "glue/hash"
 require "glue/time"
 require "glue/pool"
 
+# If true, only allow reading from the database. Usefull
+# for maintainance.
+#
+$og_read_only_mode = false
+
+# If true, the library automatically 'enchants' managed classes.
+# In enchant mode, special db aware methods are added to 
+# managed classes and instances.
+#
+$og_enchant_managed_classes = true
+
+# If true, use Ruby's advanced introspection capabilities to 
+# automatically manage classes tha define properties.
+$og_auto_manage_classes = true
+
+# If true, automatically include the Og meta-language into Module. 
+$og_include_meta_language = true
+
 require "og/meta"
 
 # = Og
@@ -93,21 +111,6 @@ require "og/meta"
 #
 module Og
 
-# If true, only allow reading from the database. Usefull
-# for maintainance.
-#
-$og_read_only_mode = false
-
-# If true, the library automatically 'enchants' managed classes.
-# In enchant mode, special db aware methods are added to 
-# managed classes and instances.
-#
-$og_enchant_managed_classes = true
-
-# If true, use Ruby's advanced introspection capabilities to 
-# automatically manage classes tha define properties.
-$og_auto_manage_classes = true
-
 # = Unmanageable
 #
 # Marker module. If included this in a class, the Og automanager
@@ -328,7 +331,11 @@ class Database
 			def self.all(extra_sql = nil)
 				$og.load_all(#{klass}, extra_sql)
 			end
-			
+
+			def self.count(sql = "SELECT COUNT(*) FROM #{klass::DBTABLE}")
+				$og.count(sql, #{klass})
+			end
+
 			def self.select(sql)
 				$og.select(sql, #{klass})
 			end
@@ -343,6 +350,7 @@ class Database
 			
 			def save
 				$og << self
+				return self
 			end
 			alias_method :save!, :save