nitro 0.3.0 → 0.4.1

data/lib/xsl/base.xsl

@@ -54,20 +54,20 @@ author: gmosx
 		<xsl:apply-templates/>
 	</xsl:template>
 
-	<!-- create a new, nested output buffer -->
+	<!-- create a new, nested output buffer NOT WORKING -->
 	<xsl:template name="x:ob-start" match="x:ob-start">
-		<xsl:processing-instruction name='ruby'>
+		<ruby>
 		<![CDATA[__out_buffers = [] unless __out_buffers
 		__out_buffers.push(__out)
 		__out = ""]]>
-		</xsl:processing-instruction>
+		</ruby>
 	</xsl:template>
 	
-	<!-- close a nested output buffer -->
+	<!-- close a nested output buffer NOT WORKING -->
 	<xsl:template name="x:ob-end" match="x:ob-end">
-		<xsl:processing-instruction name='ruby'>
+		<ruby>
 		<![CDATA[__out == __out_buffers.pop()]]>
-		</xsl:processing-instruction>
+		</ruby>
 	</xsl:template>
 	
 	<!-- NOT WORKING YET -->
@@ -79,103 +79,26 @@ author: gmosx
 	
 	<!-- form errors temlate -->
 	<xsl:template name='x:form-errors' match='x:form-errors'>
-		<xsl:processing-instruction name='ruby'>
-			<![CDATA[if errors = request.errors_to_a()
-				__out << %{	<div class="errors"><b>ERRORS:</b><br />#{errors.join("<br />")}</div>}
-			end]]>
-		</xsl:processing-instruction>
+		<ruby>if errors = request.errors_to_a()</ruby>
+				<div class="errors"><b>ERRORS:</b><br />#{errors.join("<br />")}</div>
+		<ruby>end</ruby>
 	</xsl:template>
 
 	<xsl:template match='x:cell'>
 		<xsl:apply-templates/>
 	</xsl:template>
 
-	<!-- better use css :) -->
-	<xsl:template name="x:vblank" match="x:vblank">
-		<xsl:param name="height"><xsl:value-of select="@height"/></xsl:param>
-		<img src="d.gif" width="0" height="{$height}"/>
-	</xsl:template>
-
-	<xsl:template name="x:hblank" match="x:hblank">
-		<xsl:param name="width"><xsl:value-of select="@width"/></xsl:param>
-		<img src="d.gif" height="0" width="{$width}"/>
-	</xsl:template>
-
-	<!-- button links -->
-	
-	<!--
-	ex: 
-	<x:link class="m/delete.gif" title="Delete" href="r/glue/c/cmd.rb?oid=2" />
-	TODO: handle onclick too!
-	-->
-	<xsl:template match="x:link">
-		<xsl:param name="class"><xsl:value-of select="@class" /></xsl:param>
-		<xsl:param name="href"><xsl:value-of select="@href" /></xsl:param>
-		<xsl:param name="onclick"><xsl:value-of select="@onclick" /></xsl:param>
-		<a href="{$href}" class="{$class}">			
-			<span><xsl:value-of select="@title" /></span>
-			<xsl:apply-templates />
-		</a>
-	</xsl:template>
-	
-	<!--
-	ex: 
-	<x:link class="m/delete.gif" title="Delete" onclick="javascript: alert('3')" />
-	-->
-	<xsl:template match="x:jslink">
-		<xsl:param name="class"><xsl:value-of select="@class"/></xsl:param>
-		<xsl:param name="onclick"><xsl:value-of select="@onclick"/></xsl:param>
-		<a href="#" onclick="{$onclick}" class="{$class}">			
-			<span><xsl:value-of select="@title" /></span>
-			<xsl:apply-templates />
-		</a>
-	</xsl:template>
-		
-	<!-- 
-	emit some extra divs to allow greater flexibility in css styling.
-	use those divs to add extra pictures and fancy stuff!
-	
-	TODO:
-	find a better name.
-	-->
-	<xsl:template name="x:extra-divs" match="x:extra-divs">
-		<div id="extra0"><span></span></div>
-		<div id="extra1"><span></span></div>
-		<div id="extra2"><span></span></div>
-		<div id="extra3"><span></span></div>
-		<div id="extra4"><span></span></div>
-		<div id="extra5"><span></span></div>
-		<div id="extra6"><span></span></div>
-		<div id="extra7"><span></span></div>
-	</xsl:template>
-
 	<xsl:template match="x:clear" name="x:clear">
 		<div class="clear">.</div>			
 	</xsl:template>
 
-	<!-- check for admin rights, gmosx: not really usefull I think -->	
-	<xsl:template name='x:if-admin' match='x:if-admin'>
-		<xsl:processing-instruction name='ruby'>
-			<![CDATA[if admin]]>
-		</xsl:processing-instruction>
-		<xsl:apply-templates />
-		<xsl:processing-instruction name='ruby'>
-			<![CDATA[end]]>
-		</xsl:processing-instruction>
-	</xsl:template>
-	
-	
 	<!-- admin ui -->
 	<xsl:template name='x:admin-ui' match='x:admin-ui'>
-		<xsl:processing-instruction name='ruby'>
-			<![CDATA[if admin]]>
-		</xsl:processing-instruction>
+		<ruby>if admin</ruby>
 			<span class="admin">
 			<xsl:apply-templates />
 			</span>
-		<xsl:processing-instruction name='ruby'>
-			<![CDATA[end]]>
-		</xsl:processing-instruction>
+		<ruby>end</ruby>
 	</xsl:template>
 	
 	<!-- transaction form -->

data/test/n/server/tc_cookie.rb

@@ -2,7 +2,7 @@
 
 require "test/unit"
 
-require "n/server/cookie"
+require "nitro/server/cookie"
 
 include N
 

data/test/n/server/tc_filters.rb

@@ -1,6 +1,6 @@
 require "test/unit"
 
-require "n/server/filters"
+require "nitro/server/filters"
 
 class Filter1 < N::ServerFilter
 	# :nodoc: all

data/test/n/server/tc_request.rb

@@ -2,10 +2,10 @@
 
 require "test/unit"
 
-require "n/logger"; $log = Logger.new(STDERR) unless $log
+require "nitro/logger"; $log = Logger.new(STDERR) unless $log
 
-require "n/server/cookie"
-require "n/server/request"
+require "nitro/server/cookie"
+require "nitro/server/request"
 
 include N
 

data/test/n/server/tc_requestpart.rb

@@ -2,8 +2,8 @@
 
 require "test/unit"
 
-require "n/server/cookie"
-require "n/server/request"
+require "nitro/server/cookie"
+require "nitro/server/request"
 
 include N
 

data/test/n/server/tc_session.rb

@@ -2,7 +2,7 @@
 
 require "test/unit"
 
-require "n/server/session"
+require "nitro/server/session"
 
 include N
 

data/test/n/tc_events.rb

@@ -1,7 +1,7 @@
 # :nodoc: all
 
 require "test/unit"
-require "n/events"
+require "nitro/events"
 
 class TC_Events < Test::Unit::TestCase
 	# :nodoc: all

data/test/n/tc_og.rb

@@ -1,14 +1,14 @@
 require "test/unit"
 
-require "n/logger"; $log = Logger.new(STDERR) unless $log
-require "n/og"
+require "nitro/logger"; $log = Logger.new(STDERR) unless $log
+require "og"
 
 module Test # :nodoc: all
 
 # bug: creates a table that fucksup postgres if not
 # correctly escaped.
 class User
-	prop_accessor String, :name
+	prop_accessor :name, String
 	
 	def initialize(name = nil)
 		@name = name
@@ -18,10 +18,10 @@ end
 class Comment; end
 
 class Article
-	has_many Test::Comment, :comments
-	prop_accessor String, :title
-	prop_accessor String, :body
-	prop_accessor Hash, :options
+	prop_accessor :title, String
+	prop_accessor :body, String
+	prop_accessor :options, Hash
+	has_many :comments, Test::Comment
 	
 	def initialize(title = nil, body = nil)
 		@title = title
@@ -43,10 +43,10 @@ class Article
 end
 
 class Comment
-	belongs_to Test::Article, :article
-	belongs_to Test::User, :author
-	prop_accessor String, :body
-	prop_accessor Time, :create_time
+	belongs_to :article, Test::Article 
+	belongs_to :author, Test::User
+	prop_accessor :body, String
+	prop_accessor :create_time, Time
 	
 	def initialize(body = nil)
 		@create_time = Time.now
@@ -87,8 +87,8 @@ class TC_N_OG < Test::Unit::TestCase
 			}
 		end
 		
-		N::Og.drop_db!(config)
-		$og = N::Og.new(config)
+		Og::Database.drop_db!(config)
+		$og = Og::Database.new(config)
 	end
 
 	def teardown
@@ -102,8 +102,6 @@ class TC_N_OG < Test::Unit::TestCase
 
 		$og.get_connection()
 		
-		$og.manage_classes(Article, Comment, User)
-		
 		article = Article.new("Title", "Here comes the body")
 		$og << article
 		
@@ -112,7 +110,7 @@ class TC_N_OG < Test::Unit::TestCase
 		
 		$og.pupdate("body='Hello'", article)
 
-		article.pupdate! "body='Hello'"
+		article.update_properties "body='Hello'"
 		
 		another = Article[1]
 		assert_equal(1, another.oid)
@@ -133,9 +131,9 @@ class TC_N_OG < Test::Unit::TestCase
 		user = User.new("gmosx")
 		user.save!
 		
-		another = User["gmosx"]
+		user = User["gmosx"]
 		
-		assert_equal("gmosx", another.name)
+		assert_equal("gmosx", user.name)
 		
 		users1 = $og.select("name='gmosx' ORDER BY oid", User)
 		

data/test/n/tc_properties.rb

@@ -1,18 +1,20 @@
 require "test/unit"
 
-require "n/logger"; $log = Logger.new(STDERR) unless $log
+require "nitro/logger"; $log = Logger.new(STDERR) unless $log
 
-require "n/properties"
+require "nitro/properties"
 
 module Test # :nodoc: all
 
-class Message
-	prop_accessor Fixnum, :owner_oid
-	prop_accessor Fixnum, "smallint", :val1, :val2, :val3
-	prop_accessor String, :title, :body
-	prop_accessor String, "char(10) NOT NULL", :test
-	prop_accessor Fixnum, :count
-	prop_accessor Time, :create_time	
+class Msg
+	include Og::Unmanageable
+	
+	prop Fixnum, :owner_oid
+	prop_accessor :val1, :val2, :val3, Fixnum, :sql => "smallint"
+	prop_accessor :title, :body, String
+	prop_accessor :test, String, :sql => "char(10) NOT NULL"
+	prop_accessor :count, Fixnum
+	prop_accessor :create_time, Time	
 
 	# a marshaled property
 	prop_accessor Array, :options
@@ -24,16 +26,19 @@ class Message
 
 end
 
-class SubMessage < Message
+class SubMsg < Msg
+	# to avoid conflicts with tc_og.rb
+	include Og::Unmanageable
+	
 	inherit_meta(superclass)
-	# duplicate definition
-	prop_accessor Float, :count
+	# duplicate definition with different type!
+	prop_accessor :count, Float
 end
 
 class TC_N_Properties < Test::Unit::TestCase
 
 	def setup
-		@msg1 = Message.new
+		@msg1 = Msg.new
 	end
 
 	def teardown
@@ -42,15 +47,14 @@ class TC_N_Properties < Test::Unit::TestCase
 
 	def test_props
 		
-
 		# bug: props for subclasses.
 
-		assert(SubMessage.__props)
-		assert_equal(Message.__props.size(), SubMessage.__props.size())
+		assert(SubMsg.__props)
+		assert_equal(Msg.__props.size(), SubMsg.__props.size())
 
 		# bug: duplicate definition 			
-	
-		assert_equal(Float, SubMessage.__props.find { |p| :count == p.symbol }.klass)
+		
+		assert_equal(Float, SubMsg.__props.find { |p| :count == p.symbol }.klass)
 
 		# dont force conversion
 		

data/test/n/tc_sitemap.rb

@@ -2,9 +2,9 @@
 
 require "test/unit"
 
-require "n/logger"; $log = Logger.new(STDERR) unless $log
+require "nitro/logger"; $log = Logger.new(STDERR) unless $log
 
-require "n/sitemap"
+require "nitro/sitemap"
 
 class TC_N_SiteMap < Test::Unit::TestCase
 	include N

data/test/n/ui/tc_pager.rb

@@ -2,10 +2,10 @@
 
 require "test/unit"
 
-require "n/logger"; $log = Logger.new(STDERR) unless $log
+require "nitro/logger"; $log = Logger.new(STDERR) unless $log
 
-require "n/og"
-require "n/ui/pager"
+require "og"
+require "nitro/ui/pager"
 
 class RequestMock < Hash
 	def get(k, default)
@@ -17,7 +17,7 @@ class TC_N_UI_Pager < Test::Unit::TestCase
 
 	def setup
 =begin
-		$og = N::Og.new(
+		$og = Og::Database.new(
 			:addres => "localhost",
 			:database => "testdb",
 			:user => "root",

data/test/n/utils/tc_cache.rb

@@ -1,7 +1,7 @@
 # :nodoc: all
 
 require "test/unit"
-require "n/utils/cache"
+require "nitro/utils/cache"
 
 class TC_N_Utils_Cache < Test::Unit::TestCase
 	# :nodoc: all

data/test/n/utils/tc_hash.rb

@@ -1,7 +1,7 @@
 # :nodoc: all
 
 require "test/unit"
-require "n/utils/cache"
+require "nitro/utils/cache"
 
 class TC_N2_Utils_Cache < Test::Unit::TestCase
 	# :nodoc: all

data/test/n/utils/tc_html.rb

@@ -1,6 +1,6 @@
 
 require "test/unit"
-require "n/utils/html"
+require "nitro/utils/html"
 
 include N
 

data/test/n/utils/tc_http.rb

@@ -1,5 +1,5 @@
 require "test/unit"
-require "n/utils/http"
+require "nitro/utils/http"
 
 class TC_HttpUtils < Test::Unit::TestCase
 	# :nodoc: all

data/test/n/utils/tc_number.rb

@@ -1,7 +1,7 @@
 # :nodoc: all
 
 require "test/unit"
-require "n/utils/number"
+require "nitro/utils/number"
 
 class TC_N_NumberUtils < Test::Unit::TestCase
 	# :nodoc: all

data/test/n/utils/tc_strings.rb

@@ -1,7 +1,7 @@
 # :nodoc: all
 
 require "test/unit"
-require "n/utils/string"
+require "nitro/utils/string"
 
 class TC_StringUtilsUtils < Test::Unit::TestCase
 	# :nodoc: all
@@ -77,45 +77,6 @@ class TC_StringUtilsUtils < Test::Unit::TestCase
 		assert_equal("", StringUtils::wrap("", 4, " "))
 		assert_equal(nil, StringUtils::wrap(nil, 4, " "))
 	end
-
-	def test_extension_from_path
-		assert_equal(nil, StringUtils.extension_from_path(nil))
-		assert_equal(nil, StringUtils.extension_from_path("this is a dymy text!"))
-		assert_equal("gif", StringUtils.extension_from_path("gmosx.gif"))
-		assert_equal("gif", StringUtils.extension_from_path("/n/images/gmosx.gif"))
-		assert_equal(nil, StringUtils.extension_from_path("/n/images/gmosx."))
-		assert_equal("rx", StringUtils.extension_from_path("/n/images/gmosx.gif.rx"))
-		assert_equal("rx", StringUtils.extension_from_path("*parts/polls/poll-box.rx"))
-		assert_equal("rx", StringUtils.extension_from_path("../n1/web/parts/polls/poll-box.rx"))
-	end
-
-	def test_filename_from_path
-		assert_equal("gmosx", StringUtils.filename_from_path("gmosx.gif"))
-		filename = StringUtils.filename_from_path("/n/images/gmosx.gif")
-		assert_equal("/n/images/gmosx", filename)
-		filename = StringUtils.filename_from_path(nil)
-		assert_equal("", filename)
-		filename = StringUtils.filename_from_path("/n/images/gmosx")
-		assert_equal("/n/images/gmosx", filename)
-	end
-
-	def test_file_from_path
-		file = StringUtils.file_from_path("/n/images/gmosx.gif")
-		assert_equal("gmosx.gif", file)
-		file = StringUtils.file_from_path(nil)
-		assert_equal("", file)
-		file = StringUtils.file_from_path("/n/images/gmosx")
-		assert_equal("gmosx", file)
-	end
-
-	def test_directory_from_path
-		directory = StringUtils.directory_from_path("/n/images/gmosx.gif")
-		assert_equal("/n/images", directory)
-		directory = StringUtils.directory_from_path(nil)
-		assert_equal("", directory)
-		directory = StringUtils.directory_from_path("/n/images/gmosx")
-		assert_equal("/n/images", directory)
-	end	
 	
 	def test_rationalize_filename
 		filename = StringUtils.rationalize_filename("hello my friend!.gif")
@@ -137,12 +98,6 @@ class TC_StringUtilsUtils < Test::Unit::TestCase
 		assert(s1.size == s2.size)
 	end
 
-	def test_unicode_to_iso88597
-		# check that dup works.
-		s = "Original"
-		assert_equal("Original", StringUtils.unicode_to_iso88597(s))
-	end
-
 	def teardown
 		@s = nil
 	end