og 0.9.5 → 0.10.0

data/examples/og/mock_example.rb

@@ -7,8 +7,6 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
 
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
 require 'rubygems'
 require 'flexmock'
 require 'og'

data/examples/og/mysql_to_psql.rb

@@ -14,8 +14,6 @@
 raise 'WARNING, this example does not work yet, for the moment ' + 
 			'just have a look at the source code.'
 
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
 require 'og'
 
 # An example managed object.

data/examples/og/run.rb

@@ -1,22 +1,17 @@
-# = Og Example 
-#
 # A simple example to demonstrate the Og library.
 #
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 202 2005-01-17 10:44:13Z gmosx $
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+# $Id: run.rb 256 2005-02-11 16:22:33Z gmosx $
 
 require 'og'
 
 # Full debug information.
+
 $DBG = true
 
-# = A child class
-#
+# A child class.
+
 class Comment
 	prop_accessor :body, String
 	
@@ -55,8 +50,8 @@ class User
 end
 
 
-# = A parent class
-#
+# A parent class.
+
 class Article
 	prop_accessor :title, String
 	prop_accessor :body, String
@@ -95,8 +90,8 @@ class Article
 	end
 end
 
-# = A parent class
-#
+# A parent class.
+
 class Category
 	prop_accessor :title, String
 	prop_accessor :body, String
@@ -110,20 +105,20 @@ class Category
 end
 
 
-# = Article comment
-#
+# Article comment.
+
 class ArticleComment < Comment
 	belongs_to :article, Article
 end
 
-# = User comment
-#
+# User comment.
+
 class UserComment < Comment
 	belongs_to :author, User
 end
 
-# = Another child class
-#
+# Another child class.
+
 class Part
 	prop_accessor :name, String
 	belongs_to :article, Article
@@ -139,14 +134,20 @@ end
 
 # Og configuration.
 config = {
-	:address => "localhost",
 	:database => "test",
-	:backend => "psql",
+	:adapter => "sqlite",
+	:connection_count => 2
+}
+=begin
+config = {
+#	:address => "localhost",
+	:database => "test",
+	:adapter => "psql",
 	:user => "postgres",
 	:password => "navelrulez",
 	:connection_count => 1
 }
-=begin
+
 config = {
 	:address => "localhost",
 	:database => "test",

data/install.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id$
+
+require 'rbconfig'
+require 'ftools'
+
+dst_dir = Config::CONFIG['sitelibdir']
+
+Dir.chdir('lib') do
+	Dir['**/*.rb'].each do |file|
+		File.mkpath File.join(dst_dir, File.dirname(file)), true
+		File.install file, File.join(dst_dir, file), 0644, true
+	end
+end
+
+# gmosx: this is potentially dangerous, rethink.
+
+Dir.chdir('vendor') do
+	Dir['**/*.rb'].each do |file|
+		File.mkpath File.join(dst_dir, File.dirname(file)), true
+		File.install file, File.join(dst_dir, file), 0644, true
+	end
+end
+
+puts %{
+
+
+---
+Congratulations, you have successfully installed Nitro + Og!
+The libraries where installed in '#{dst_dir}'. 
+
+To verify that everything works correctly, try to run the tiny 
+example by issuing:
+
+$ cd exampes/tiny
+$ ruby ctl
+
+at the command line.
+
+Enjoy the magic of Nitro!
+}

data/lib/glue/array.rb

@@ -1,26 +1,22 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2002-2003 Navel, all rights reserved.
-# $Id: array.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2002-2005 Navel, all rights reserved.
+# $Id: array.rb 259 2005-02-15 08:54:54Z gmosx $
 
-require "sync"
+require 'sync'
 
 module N
 
-# == SafeArray
-#
 # A thread-safe array. We use a sync object instead of a mutex,
 # because it is re-entrant.
 # An exclusive lock is needed when writing, a shared lock IS NEEDED
 # when reading
-#
+
 class SafeArray < Array
 	
 	attr :sync
 
 	# gmosx: delegator is not used.
-	#
+	
 	def initialize(delegator = nil)
 		@sync = ::Sync.new()
 	end
@@ -81,4 +77,4 @@ class SafeArray < Array
 		
 end
 
-end # module
+end 

data/lib/glue/attribute.rb

@@ -1,9 +1,6 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
 # Original code from Rails distribution.
 # http://www.rubyonrails.com
-#
 # $Id$
 
 #--

data/lib/glue/cache.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Anastasios Koutoumanos  <ak@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: cache.rb 202 2005-01-17 10:44:13Z gmosx $
+# $Id: cache.rb 249 2005-02-04 14:03:00Z gmosx $
 
 module N
 

data/lib/glue/inflector.rb

@@ -1,12 +1,12 @@
-# Code from RubyOnRailes (http://www.rubyonrails.com)
+# Code from RubyOnRails (http://www.rubyonrails.com)
 # Copyright (c) 2004 David Heinemeier Hansson.
-#
 
 module N
 
-# The Inflector transforms words from singular to plural, class names to table names, modulized class names to ones without,
+# The Inflector transforms words from singular to plural, 
+# class names to table names, modulized class names to ones without,
 # and class names to foreign keys.
-#
+
 module Inflector 
   extend self
 
@@ -88,4 +88,4 @@ module Inflector
     end
 end
 
-end # module
+end

data/lib/glue/mixins.rb

@@ -1,20 +1,11 @@
-# = Mixins 
-#
-# A collection of useful mixins. Use these to synthesize your 
-# entities.
-#
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 module N
 
-# = Expirable
-#
 # Generic expiring functionality mixin. 
-#
+
 module Expirable
 	attr_accessor :expires
 
@@ -42,4 +33,4 @@ module Expirable
 	end
 end
 
-end # module
+end

data/lib/glue/number.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: number.rb 202 2005-01-17 10:44:13Z gmosx $
+# $Id: number.rb 249 2005-02-04 14:03:00Z gmosx $
 
 module N;
 

data/lib/glue/object.rb

@@ -1,4 +1,8 @@
-# $Id$
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: object.rb 259 2005-02-15 08:54:54Z gmosx $
+
+# Code from RubyOnRails (http://www.rubyonrails.com)
 
 class Object #:nodoc:
   def remove_subclasses_of(superclass)
@@ -15,6 +19,8 @@ class Object #:nodoc:
   end
 end
 
+# Code from RubyOnRails (http://www.rubyonrails.com)
+
 class Class #:nodoc:
   def remove_subclasses
     Object.remove_subclasses_of(self)

data/lib/glue/property.rb

@@ -1,8 +1,9 @@
 # * George Moschovitis  <gm@navel.gr>
 # * Michael Neumann  <mneumann@ntecs.de>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: property.rb 248 2005-01-31 13:38:34Z gmosx $
+# $Id: property.rb 254 2005-02-10 12:44:05Z gmosx $
 
+require 'glue/attribute'
 require 'glue/array'
 require 'glue/hash'
 
@@ -17,7 +18,6 @@ module N
 #
 # The default = methods do not force the  types. A special 
 # __force_set method should be used instead.
-#
 #--
 # TODO:
 # Perhaps a sync is needed in evals (!!!!)
@@ -25,6 +25,11 @@ module N
 
 class Property
 
+	# If set to true, perform type checking on property set. 
+	# Useful when debugging.
+
+	cattr_accessor :type_checking, false
+
 	# the symbol of the property
 	
 	attr_accessor :symbol
@@ -57,8 +62,6 @@ class Property
 
 end
 
-# = PropertyUtils
-#
 # A collection of Property related utility methods.
 
 module PropertyUtils
@@ -75,7 +78,7 @@ module PropertyUtils
 
 	def self.enchant(target, force = false)
 		unless target.singleton_methods.include?('__props')
-			target.module_eval <<-"end_eval", __FILE__, __LINE__ 
+			target.module_eval %{  
 				@@__meta = N::SafeHash.new
 				@@__props = N::SafeArray.new
 				
@@ -94,7 +97,7 @@ module PropertyUtils
 				def self.__meta=(meta)
 					@@__meta = meta
 				end
-			end_eval
+			}
 		end
 	end
 
@@ -166,11 +169,25 @@ module PropertyUtils
 	
 	def self.prop_setter(prop)
 		s = prop.symbol
-		%{
+
+		code = %{
 			def #{s}=(val)
+		}
+	
+		if N::Property.type_checking
+			code << %{
+				unless #{prop.klass} == val.class
+					raise "Invalid type, expected '#{prop.klass}', is '\#\{val.class\}'."
+				end
+			}
+		end
+
+		code << %{
 				@#{s} = val
 			end
 		}
+
+		return code
 	end
 
 	# Get the property metadata for the given symbol.
@@ -243,17 +260,15 @@ class Module
 	def prop(*params)
 		meta, klass, symbols = N::PropertyUtils.resolve_prop_params(params) 	
 		symbol = symbols.first
-
 		
 		N::PropertyUtils.enchant(self)
 
 		if self.is_a?(Class)
-			
+
 			# Add some extra code to append features to 
 			# subclasses.
 
-			self.module_eval <<-"end_eval", __FILE__, __LINE__
-
+			self.module_eval %{ 
 				def self.inherited(sub)
 					N::PropertyUtils.enchant(sub)
 					N::PropertyUtils.copy_props(self, sub)
@@ -261,16 +276,13 @@ class Module
 					# the hash from the module. super must stay at the end.
 					super
 				end
-
-			end_eval
-
+			}
 		else
-			
+
 			# Add some extra code for modules to append
 			# their features to classes that include it.
 			
-			self.module_eval <<-"end_eval", __FILE__, __LINE__
-
+			self.module_eval %{ 
 				def self.append_features(base)
 					N::PropertyUtils.enchant(base)
 					N::PropertyUtils.copy_props(self, base)
@@ -282,9 +294,7 @@ class Module
 					
 					super
 				end
-
-			end_eval
-			
+			}
 		end
 		
 		property = N::Property.new(symbol, klass, meta)
@@ -366,11 +376,11 @@ class Module
 	#++
 	
 	def meta(key, val)
-		self.module_eval <<-"end_eval", __FILE__, __LINE__ 
+		self.module_eval %{  
 			@@__meta[key] ||= [] 
 			@@__meta[key].delete_if { |v| val == v }
 			@@__meta[key] << val			
-		end_eval
+		}
 	end
 
 end

data/lib/glue/string.rb

@@ -1,17 +1,13 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
 # * Anastasios Koutoumanos  <ak@navel.gr>
 # * Elias Karakoulakis  <ekarak@ktismata.com>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: string.rb 202 2005-01-17 10:44:13Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: string.rb 259 2005-02-15 08:54:54Z gmosx $
 
 require "uri"
 
 module N;
 
-# = StringUtils
-#
 # General string utilities collection.
 #
 # === Design:
@@ -26,51 +22,8 @@ module N;
 # - implement a method that returns easy to remember
 #   pseudo-random strings
 # - add aliases for those methods in Kernel.
-#
-module StringUtils
 
-	@@map_to_greeklish = {
-		"�" => "a", "�" => "A", "�" => "a", "�" => "A",
-		"�" => "b", "�" => "B",
-		"�" => "g", "�" => "G",
-		"�" => "d", "�" => "D",
-		"�" => "e", "�" => "E", "�" => "e", "�" => "E",
-		"�" => "z", "�" => "Z",
-		"�" => "h", "�" => "H", "�" => "h", "�" => "H",
-		"�" => "8", "�" => "8",
-		"�" => "i", "�" => "I", "�" => "i", "�" => "I",
-		"�" => "k", "�" => "K",
-		"�" => "l", "�" => "L",
-		"�" => "m", "�" => "M",
-		"�" => "n", "�" => "N",
-		"�" => "3", "�" => "3",
-		"�" => "o", "�" => "O", "�" => "o", "�" => "O",
-		"�" => "p", "�" => "P",
-		"�" => "r", "�" => "R",
-		"�" => "s", "�" => "s", "�" => "S",
-		"�" => "t", "�" => "T",
-		"�" => "y", "�" => "Y", "�" => "y", "�" => "Y",
-		"�" => "f", "�" => "F",
-		"�" => "x", "�" => "X",
-		"�" => "ps","�" => "PS",
-		"�" => "w", "�" => "W", "�" => "w", "�"=>"W"
-	}
-
-	# Convert the input string to greeklish.
-	#--
-	# gmosx, TODO: remove from public distribution
-	#++
-	#
-	def self.to_greeklish(input)
-		return nil unless input
-		output = ""
-		# gmosx: also parse new lines
-		input.scan(/./m) { |w|
-			c = @@map_to_greeklish[w]
-			output << (c.nil?? w: c)
-		}
-		return output
-	end
+module StringUtils
 
 	# Move this in String class?
 	#
@@ -84,7 +37,7 @@ module StringUtils
 	# characters, chopped at the nearest word, appended by '...')
 	# force_cutoff: break forcibly at 'count' chars. Does not accept
 	# count < 2.
-	#
+	
 	def self.head(string, count = 128, force_cutoff = false, ellipsis="...")
 		return nil unless string
 		return nil if count < 2
@@ -120,7 +73,7 @@ module StringUtils
 		return nil unless string
 
 		# gmosx: helps to find bugs
-		raise ArgumentError.new("the rules parameter is nil") unless rules
+		raise ArgumentError.new('The rules parameter is nil') unless rules
 
 		rewritten_string = string.dup
 
@@ -152,7 +105,7 @@ module StringUtils
 	#  p text # => "1111111111 1111111111 1111111111"
 	#
 	# See the test cases to better understand the behaviour!
-	#
+	
 	def self.wrap(string, width = 20, separator = " ")
 		return nil unless string
 
@@ -163,7 +116,7 @@ module StringUtils
 	end
 
 	# Replace dangerours chars in filenames
-	#
+=begin
 	def self.rationalize_filename(filename)
 		return nil unless filename
 		# gmosx: rationalize a copy!!! (add unit test)
@@ -174,10 +127,11 @@ module StringUtils
 		xfilename.gsub!(/'/, "")
 		xfilename.gsub!(/\(/, "")
 		xfilename.gsub!(/\)/, "")
-		xfilename = self.to_greeklish(xfilename)
+		# xfilename = self.to_greeklish(xfilename)
 		return xfilename
 	end
-
+=end
+	
 	# Returns a random string. one possible use is
 	# password initialization.
 	#
@@ -186,12 +140,12 @@ module StringUtils
 	#
 	# === Output:
 	# the random string
-	#
+	
 	def self.random(max_length = 8, char_re = /[\w\d]/)
     # gmosx: this is a nice example of input parameter checking.
 		# this is NOT a real time called method so we can add this
 		# check. Congrats to the author.
-		raise ArgumentError.new("char_re must be a regular expression!") unless char_re.is_a?(Regexp)
+		raise ArgumentError.new('char_re must be a regular expression!') unless char_re.is_a?(Regexp)
 		
 		string = ""
 
@@ -203,22 +157,6 @@ module StringUtils
 		return string
 	end
 
-	# Screen an IP address
-	#--
-	# gmosx: copied this method from n1, check how it works!
-	# probably deprecate?
-	#++
-	def self.screen_ip_address(address)
-		if address
-			return address.split(',').collect { |hostip|
-				hostip.gsub(/\.[^\.]*$/, ".*")
-			}.join(', ')
-		else
-			return "*.*.*.*"
-		end
-	end
-	
 end
 
-end # module
-
+end