nitro 0.10.0 → 0.11.0

data/lib/nitro/session/drb.rb

@@ -0,0 +1,31 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: drb.rb 264 2005-02-23 13:46:55Z gmosx $
+
+require 'drb'
+
+require 'glue/attribute'
+require 'nitro/session'
+
+Logger.debug 'Using Drb sessions.'
+
+module N
+
+class Session
+	
+	# The address of the Session DRb server.
+
+	cattr_accessor :drb_address, '127.0.0.1'
+	
+	# The port of the Session DRb server.
+
+	cattr_accessor :drb_port, 9069 
+
+end
+
+Session.store = DRbObject.new(
+	nil, 
+	"druby://#{Session.drb_address}:#{Session.drb_port}"
+) 
+
+end

data/lib/nitro/session/drbserver.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: drbserver.rb 264 2005-02-23 13:46:55Z gmosx $
+
+require 'drb'
+require 'optparse'
+
+require 'glue/hash'
+require 'nitro/session'
+
+# A distributes session store implemented as
+# a simple DRb server.
+
+address = '127.0.0.1'
+port = 9069
+debug = false
+
+parser = OptionParser.new do |opts|
+
+	opts.banner = 'Usage: drbserver.rb [options]'
+	opts.separator ''
+	opts.separator 'Specific options:'
+
+	opts.on('-a A', '--address A', 'Listening address.') do |a|
+		address = a
+	end
+
+	opts.on('-p P', '--port P', Integer, 'Listening port.') do |p|
+		port = p
+	end
+
+	opts.on('-D', '--debug', 'Run in debug mode.') do |p|
+		debug = true
+	end
+	
+	opts.on_tail('-h', '--help', 'Show this message.') do
+		puts opts
+		exit
+	end
+	
+end
+
+begin
+	parser.parse!(ARGV)
+rescue OptionParser::InvalidOption
+	puts 'Invalid option, pass the --help parameter to get help!' 
+	exit
+end
+
+sessions = N::SafeHash.new 
+
+if debug
+
+	class << sessions
+		def []=(k, v)
+			puts "WRITE: #{k} = #{v}"
+			super
+		end
+		
+		def [](k)
+			puts "READ: #{k}"
+			super
+		end
+	end
+	
+end
+
+DRb.start_service("druby://#{address}:#{port}", sessions)
+DRb.thread.join

data/lib/nitro/session/memory.rb

@@ -0,0 +1,13 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: memory.rb 264 2005-02-23 13:46:55Z gmosx $
+
+require 'glue/hash'
+
+Logger.debug 'Using In-Memory sessions.'
+
+module N
+
+Session.store = SafeHash.new
+
+end

data/lib/nitro/simple.rb

@@ -0,0 +1,7 @@
+require 'nitro/controller'
+
+# A simple controller, only handles templates.
+# Useful to implement php/asp/jsp style applications.
+# Dispatcher uses this as the default Controller.
+
+class SimpleController < N::Controller; end

data/lib/nitro/ui/date-select.rb

@@ -1,7 +1,5 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: select.rb 39 2004-09-29 12:40:53Z elathan $
 
 module N; module UI
@@ -68,5 +66,4 @@ module N; module UI
 		return str
 	end
 
-end; end # module
-
+end; end

data/lib/nitro/ui/pager.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: pager.rb 254 2005-02-10 12:44:05Z gmosx $
+# $Id: pager.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'nitro/uri'
 
@@ -17,9 +17,9 @@ module N; module UI
 #
 # === Example
 #
-#	@pager = N::UI::Pager.new('entries', @request, 5)
-#	@entries = N::BlogEntry.all("ORDER BY oid #{@pager.sql_limit}")
-#	@pager.set(N::BlogEntry.count)
+#	@pager = UI::Pager.new('entries', @request, 5)
+#	@entries = BlogEntry.all("ORDER BY oid #{@pager.sql_limit}")
+#	@pager.set(BlogEntry.count)
 #
 # default navigation (customize with css):
 #	<div class="pager">#{@pager.navigation}</div>

data/lib/nitro/ui/tabs.rb

@@ -1,8 +1,6 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: tabs.rb 101 2004-10-22 12:35:39Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: tabs.rb 266 2005-02-28 14:50:48Z gmosx $
 
 module N; module UI
 

data/lib/nitro/uri.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: uri.rb 254 2005-02-10 12:44:05Z gmosx $
+# $Id: uri.rb 263 2005-02-23 13:45:08Z gmosx $
 
 require "uri"
 require "cgi"
@@ -9,9 +9,9 @@ require "glue/string"
 
 module N
 
-# URI utilities collection
+# URI utilities collection.
 #
-# === Design:
+# === Design
 #
 # Implement as a module to avoid class polution. You can still
 # use Ruby's advanced features to include the module in your
@@ -19,11 +19,14 @@ module N
 # which isn't possible if you use self.
 #
 # The uris passed as parameters are typically strings.
+#--
+# gmosx, TODO: deprecate this.
+#++
 
 module UriUtils
 
 	# Decode the uri components.
-	#
+	
 	def self.decode(uri)		
 		# gmosx: hmm is this needed?
 		# guard against invalid filenames for example pictures with 

data/lib/og.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: og.rb 259 2005-02-15 08:54:54Z gmosx $
+# $Id: og.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -89,7 +89,7 @@ require 'glue/validation'
 # * Deserialize to OpenStruct.
 # * Better documentation.
 
-class Og
+module Og
 
 	# The name.
 
@@ -97,7 +97,7 @@ class Og
 
 	# The version.
 
-	Version = '0.10.0'
+	Version = '0.11.0'
 
 	# Library path.
 
@@ -106,37 +106,45 @@ class Og
 	# If true, only allow reading from the database. Usefull
 	# for maintainance.
 	
-	cattr_accessor :read_only_mode, false
+	mattr_accessor :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.
+	# If false, Og enchants only classes that define properties.
 	
-	cattr_accessor :enchant_managed_classes, true
+	mattr_accessor :enchant_managed_classes, true
 	
 	# If true, use Ruby's advanced introspection capabilities to 
 	# automatically manage classes tha define properties.
 	
-	cattr_accessor :auto_manage_classes, true
+	mattr_accessor :auto_manage_classes, true
 
 	# If true, automatically include the Og meta-language into Module. 
-	#
-	# By default this is FALSE, to avoid polution of the Module object.
-	# However if you include a prop_accessor or a managed Mixin in your
+	# If false, the polution of the Module object is avoided. However 
+	# if you include a prop_accessor or a managed Mixin in your
 	# object MetaLanguage gets automatically extended in the class.
 	
-	cattr_accessor :include_meta_language, true
+	mattr_accessor :include_meta_language, true
 	
 	# Attach the following prefix to all generated SQL table names.
 	# Usefull on hosting scenarios where you have to run multiple
 	# web applications/sites on a single database.
 	
-	cattr_accessor :table_prefix, nil
+	mattr_accessor :table_prefix, nil
 
+	# If true, Og tries to create/update the schema in the
+	# data store. For production/live environments set this to false
+	# and only set to true when the object model is upadated.
+	# For debug/development environments this should stay true
+	# for convienience.
+	
+	mattr_accessor :create_schema, true
+	
 	# The active database. Og allows you to access multiple
 	# databases from a single application.
 	
-	cattr_accessor :db
+	mattr_accessor :db
 
 	# Set the active database.
 

data/lib/og/adapter.rb

@@ -1,13 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: adapter.rb 255 2005-02-10 12:45:32Z gmosx $
+# $Id: adapter.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'yaml'
 require 'singleton'
 
 require 'og/connection'
 
-class Og
+module Og
 
 # An adapter communicates with the backend datastore. 
 # The adapters for all supported datastores extend this 
@@ -74,6 +74,7 @@ class Adapter
 	# TODO: Optimize this
 	
 	def self.parse_timestamp(str)
+		return nil unless str
 		return Time.parse(str)		
 	end
 	
@@ -108,7 +109,7 @@ class Adapter
 	end
 
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-	# :section: OR mapping methods and utilities. 
+	# :section: O->R mapping methods and utilities. 
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Encode the name of the klass as an sql safe string.
@@ -121,24 +122,40 @@ class Adapter
 	end
 
 	# The name of the SQL table where objects of this class 
-	# are stored.
+	# are stored. A prefix is needed to avoid colision with
+	# reserved prefices (for example User maps to user which
+	# is reserved in postgresql). The prefix should start
+	# with an alphanumeric character to be compatible with
+	# all RDBMS (most notable Oracle).
+	#
+	# You may want to override this method to map an existing
+	# database schema using Og.
 	
 	def self.table(klass)
-		"_#{Og.table_prefix}#{encode(klass)}"
+		"og_#{Og.table_prefix}#{encode(klass)}"
 	end
 
 	# The name of the join table for the two given classes.
+	# A prefix is needed to avoid colision with reserved 
+	# prefices (for example User maps to user which
+	# is reserved in postgresql). The prefix should start
+	# with an alphanumeric character to be compatible with
+	# all RDBMS (most notable Oracle).
+	#
+	# You may want to override this method to map an existing
+	# database schema using Og.
 	
 	def self.join_table(klass1, klass2)
-		"_#{Og.table_prefix}j_#{encode(klass1)}_#{encode(klass2)}"
+		"og_#{Og.table_prefix}j_#{encode(klass1)}_#{encode(klass2)}"
 	end
-	
+
 	# Return an sql string evaluator for the property.
 	# No need to optimize this, used only to precalculate code.
 	# YAML is used to store general Ruby objects to be more 
 	# portable.
-	#
+	#--
 	# FIXME: add extra handling for float.
+	#++
 	
 	def write_prop(p)
 		if p.klass.ancestors.include?(Integer)
@@ -146,7 +163,7 @@ class Adapter
 		elsif p.klass.ancestors.include?(Float)
 			return "#\{@#{p.symbol} || 'NULL'\}"		
 		elsif p.klass.ancestors.include?(String)
-			return "'#\{#{self.class}.escape(@#{p.symbol})\}'"
+			return %|#\{@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(Time)
 			return %|#\{@#{p.symbol} ? "'#\{#{self.class}.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(Date)
@@ -154,6 +171,7 @@ class Adapter
 		elsif p.klass.ancestors.include?(TrueClass)
 			return "#\{@#{p.symbol} ? \"'t'\" : 'NULL' \}"
 		else 
+			# gmosx: keep the '' for nil symbols.
 			return %|#\{@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
 	end		
@@ -197,9 +215,18 @@ class Adapter
 				field << " #{p.meta[:sql]}"
 			else
 				field << " #{@typemap[p.klass]}"
-				# attach extra sql
-				if p.meta and extra_sql = p.meta[:extra_sql]
-					field << " #{extra_sql}"
+				
+				if p.meta
+					# set default value (gmosx: not that useful in the
+					# current implementation).
+					if default = p.meta[:default]
+						field << " DEFAULT #{default.inspect} NOT NULL"
+					end
+					
+					# attach extra sql
+					if extra_sql = p.meta[:extra_sql]
+						field << " #{extra_sql}"
+					end
 				end
 			end
 			
@@ -235,7 +262,7 @@ class Adapter
 	# object properties.
 	
 	def calc_field_index(klass, og)
-		raise 'Not implemented!'
+		# Implement if needed.
 	end
 
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 

data/lib/og/adapters/filesys.rb

@@ -0,0 +1,121 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: filesys.rb 264 2005-02-23 13:46:55Z gmosx $
+
+require 'fileutils'
+
+require 'og/adapter'
+require 'og/connection'
+require 'glue/attribute'
+
+module Og
+
+# The Filesys adapter. This adapter stores Og objectes in
+# the filesystem. This adapter is a proof of concept and
+# at the moment severely limited. For extra documentation 
+# see lib/og/adapter.rb
+
+class FilesysAdapter < Adapter
+
+	# Creates the name of the database root dir.
+
+	def self.dir(database)
+		"#{database}_db"
+	end
+
+	def create_db(database, user = nil, password = nil)
+		begin
+			FileUtils.mkdir_p(self.class.dir(database))
+		rescue
+			Logger.error "Cannot create '#{database}'!"
+		end
+	end
+
+	def drop_db(database, user = nil, password = nil)
+		begin
+			FileUtils.rmdir(self.class.dir(database))	
+			super
+		rescue
+			Logger.error "Cannot drop '#{database}'!"
+		end
+	end
+
+	def insert_code(klass, db, pre_cb, post_cb)
+		props = props_for_insert(klass)
+		values = props.collect { |p| write_prop(p) }.join(',') 
+		
+		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
+
+		%{
+			#{pre_cb}
+			conn.store.query("#{sql}").close
+			@oid = conn.store.last_insert_row_id
+			#{post_cb}
+		}
+	end
+
+	def new_connection(db)
+		return FilesysConnection.new(db)
+	end
+
+	# A 'table' is emulated by using a directory to store
+	# one file per table row. Each file contains an object
+	# marshaled in YAML format. A special file called
+	# '_sequence' stores the sequence for this 'table'.
+	
+	def create_table(klass, db)
+		class_dir = File.join(self.class.dir(db.config[:database]), klass::DBTABLE)
+		FileUtils.mkdir_p(class_dir)
+		
+		seq_file = File.join(class_dir, 'seq')
+		File.open(seq_file, 'w') { |f| f << '1' }
+	rescue => ex
+		Logger.error "Cannot create directory to store '#{klass}' classes!"
+	end
+
+end
+
+# The Filesys adapter connection.
+
+class FilesysConnection < Connection
+
+	def initialize(db)
+		super
+		config = db.config
+
+		begin
+			raise unless File.directory?(FilesysAdapter.dir(config[:database]))
+		rescue => ex 
+			if true # ex.to_s =~ /database .* does not exist/i
+				Logger.info "Database '#{config[:database]}' not found!"
+				@db.adapter.create_db(config[:database], config[:user])
+				retry
+			end
+			raise
+		end
+	end
+
+	def save(obj)
+		seq = nil
+		class_dir = File.join(FilesysAdapter.dir(@db.config[:database]), obj.class::DBTABLE)
+		File.open(File.join(class_dir, 'seq'), 'r') { |f| seq = f.read.to_i }
+		obj.oid = seq
+		File.open(File.join(class_dir, "#{seq}.yml"), 'w') { |f| f << obj.to_yaml }
+		seq += 1
+		File.open(File.join(class_dir, 'seq'), 'w') { |f| f << seq }
+	end
+
+	def load(oid, klass)
+		obj = nil
+		class_dir = File.join(FilesysAdapter.dir(@db.config[:database]), klass::DBTABLE)
+		File.open(File.join(class_dir, "#{oid}.yml"), 'r') { |f| obj = YAML::load(f.read) }
+		return obj
+	end
+
+	def close
+		Logger.debug "Closed DB connection." if $DBG
+	end
+
+end
+
+end