RubyGems - nitro - Versions diffs - 0.6.0 → 0.7.0 - Mend

nitro 0.6.0 → 0.7.0

Files changed (59) hide show

data/ChangeLog +175 -0
data/README +41 -7
data/RELEASES +24 -0
data/Rakefile +5 -7
data/bin/new_app.rb +26 -4
data/bin/new_form.rb +54 -0
data/bin/proto/config.rb +3 -3
data/bin/proto/root/index.xhtml +2 -34
data/bin/proto/root/style.css +4 -70
data/bin/proto/root/style.xsl +8 -39
data/doc/tutorial.txt +5 -0
data/examples/blog/app.rb +2 -1
data/examples/blog/config.rb +7 -2
data/examples/blog/root/style.xsl +1 -2
data/examples/flash/README +34 -0
data/examples/flash/app.rb +20 -0
data/examples/flash/config.rb +38 -0
data/examples/flash/lib/flash.rb +40 -0
data/examples/flash/root/index.xhtml +25 -0
data/examples/flash/root/show_inline_text.xhtml +12 -0
data/examples/flash/tmp.swf +0 -0
data/examples/og/README +7 -0
data/examples/og/mock_example.rb +58 -0
data/examples/og/run.rb +9 -5
data/examples/tiny/root/include.xhtml +3 -0
data/examples/tiny/root/index.xhtml +2 -1
data/lib/glue/property.rb +166 -107
data/lib/glue/property.rb.old +307 -0
data/lib/nitro/builders/form.rb +26 -17
data/lib/nitro/events.rb +1 -1
data/lib/nitro/markup.rb +120 -0
data/lib/nitro/server/cookie.rb +1 -1
data/lib/nitro/server/dispatcher.rb +5 -6
data/lib/nitro/server/filters.rb +1 -1
data/lib/nitro/server/render.rb +33 -29
data/lib/nitro/server/shaders.rb +32 -3
data/lib/nitro/server/user.rb +1 -1
data/lib/nitro/server/webrick.rb +9 -4
data/lib/nitro/ui/popup.rb +1 -1
data/lib/nitro/ui/select.rb +1 -1
data/lib/nitro/ui/tabs.rb +1 -1
data/lib/nitro/version.rb +2 -2
data/lib/og.rb +17 -6
data/lib/og/backend.rb +34 -4
data/lib/og/backends/mysql.rb +3 -17
data/lib/og/backends/psql.rb +5 -17
data/lib/og/meta.rb +41 -26
data/lib/og/mock.rb +223 -0
data/lib/og/version.rb +2 -2
data/lib/parts/content.rb +61 -0
data/test/glue/{tc_properties.rb → tc_property.rb} +0 -1
data/test/glue/tc_property_mixins.rb +62 -0
data/test/og/tc_lifecycle.rb +107 -0
data/test/tc_og.rb +31 -4
data/vendor/README +6 -0
data/vendor/binding_of_caller.rb +81 -0
data/vendor/breakpoint.rb +526 -0
data/vendor/breakpoint_client.rb +157 -0
metadata +135 -95

data/examples/flash/lib/flash.rb ADDED Viewed

@@ -0,0 +1,40 @@
+# code:
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: flash.rb 189 2004-12-13 21:38:05Z gmosx $
+require 'nitro/service'
+require 'ming/ming'
+module N
+# = FlashService
+#
+class FlashService < N::Service
+	include Ming
+	SOURCE_FILE = __FILE__
+	def show_text
+		create_flash
+	end
+private
+	def create_flash
+		m = SWFMovie.new
+		f = SWFBrowserFont.new('_serif')
+		t = SWFTextField.new
+		t.set_font(f)
+		t.add_string(@params['text'])
+		m.add(t)
+		@response.header['Content-Type'] = 'application/x-shockwave-flash'
+		m.save('tmp.swf')
+		@out = File.read('tmp.swf')
+	end
+end
+end # module

data/examples/flash/root/index.xhtml ADDED Viewed

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<html>
+<h1>Dynamic flash generation.</h1>
+<p>
+	<h3>Implemented as an action</h3>
+	<form name="t1" action="show_text">
+		Enter some text here:<br />
+		<input type="text" name="text" /><br />
+		<input type="submit" />
+	</form>
+</p>
+<p>
+	<h3>Implemented inline in the template action</h3>
+	<form name="t1" action="show_inline_text">
+		Enter some text here:<br />
+		<input type="text" name="text" /><br />
+		<input type="submit" />
+	</form>
+</p>
+</html>

data/examples/flash/root/show_inline_text.xhtml ADDED Viewed

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+	This template is transormed to a template inside the FlashService.
+-->
+<root>
+<?r
+	# just call the method in the service.
+	create_flash
+?>
+</root>

data/examples/flash/tmp.swf ADDED Viewed

Binary file

data/examples/og/README CHANGED Viewed

@@ -1,4 +1,11 @@
 = Og Example
+== run.rb
 A simple example that demonstrates some Og features. The example
 automatically creates a 'test' database.
+== mock_example.rb
+Demonstrates how easily the Og infrastructure can be mocked,
+for easy test unit writing.

data/examples/og/mock_example.rb ADDED Viewed

@@ -0,0 +1,58 @@
+# = Og Mocking Example
+#
+# A simple example to demonstrate how to mock Og.
+# Very useful in test units.
+#
+# code:
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
+$LOAD_PATH.unshift '../../lib'
+require 'rubygems'
+require 'flexmock'
+require 'og'
+require 'og/mock'
+require 'logger'
+$log = Logger.new($stderr)
+class Article
+	prop_accessor :body, String
+	def initialize(body = nil)
+		@body = body
+	end
+end
+class SimpleTest < Test::Unit::TestCase
+	def setup
+		$og = Og::MockDatabase.new
+	end
+	def teardown
+		$og = nil
+	end
+	def test_me
+		mocks = [
+			Article.new('body1'),
+			Article.new('body2'),
+			Article.new('body3')
+		]
+		$og.mock_handle(:load_all) { |klass, extrasql| mocks }
+		# differnt ways to call the mocked method...
+		puts 'Here are the articles:', Article.all
+		puts 'Here are the articles:', Article.load_all
+		puts 'Here are the articles:', $og.load_all(Article)
+		# 3 times called
+		assert_equal(3, $og.mock_count(:load_all))
+	end
+end

data/examples/og/run.rb CHANGED Viewed

@@ -6,7 +6,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: run.rb 198 2004-12-22 11:26:59Z gmosx $
 $:.unshift "../../lib"
@@ -103,7 +103,7 @@ class Category
 	prop_accessor :body, String
 	# define a 'many to many' relation.
-	many_to_many Article
+	many_to_many :articles, Article
 	def initialize(title = nil)
 		@title = title
@@ -141,7 +141,6 @@ end
 # Initialize a logger.
 $log = Logger.new(STDERR);
 # Og configuration.
 config = {
 	:address => "localhost",
@@ -199,9 +198,11 @@ c2.article_oid = a1.oid
 # managed objects).
 $og << c2
+# an alternative (easier and cooler) way to add children in a
+# has_many relation:
 c3 = ArticleComment.new("Comment 3")
-c3.article = a1
-c3.save!
+# add_comment is automatically added by Og.
+a1.add_comment(c3)
 puts "\n\n"
 puts "* Print all all comments for article 1:"
@@ -287,4 +288,7 @@ puts '---'
 article.categories.each { |c| puts c.title }
+# create and save the article in one step.
+article = Article.create("title", "body")
+puts '--', article.oid

data/examples/tiny/root/include.xhtml ADDED Viewed

@@ -0,0 +1,3 @@
+<p>
+	this is a <b>statically</b> included file.
+</p>

data/examples/tiny/root/index.xhtml CHANGED Viewed

@@ -33,6 +33,7 @@
 <p>
 	Counter: #{session[:counter]}
 </p>
+<br />
+<?include href="include.xhtml"?>
 </html>

data/lib/glue/property.rb CHANGED Viewed

@@ -2,10 +2,9 @@
 # * George Moschovitis  <gm@navel.gr>
 # design:
 # * Anastastios Koutoumanos  <ak@navel.gr>
-# * Elias Karakoulakis  <ekarak@ktismata.com>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: property.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: property.rb 200 2004-12-27 11:24:41Z gmosx $
 require "glue/array"
 require "glue/hash"
@@ -25,10 +24,8 @@ module G
 #
 #--
 # TODO:
-# Inject only the really needd methods into Module.
 # Perhaps a sync is needed in evals (!!!!)
 #++
-#
 class Property
 	# the symbol of the property
 	attr_accessor :symbol
@@ -36,7 +33,7 @@ class Property
 	attr_accessor :name
 	# the class of the property
 	attr_accessor :klass
-	# additional metadata (like sql declaratio, sql index, etc)
+	# additional metadata (like sql declaration, sql index, etc)
 	attr_accessor :meta
 	def initialize(symbol, klass, meta = {})
@@ -52,6 +49,119 @@ class Property
 	def to_s
 		return name
 	end
+end
+# = PropertyUtils
+#
+# A collection of Property related utility methods.
+#
+module PropertyUtils
+	# Add accessors to the properties to the given target
+	# (Module or Class). For simplicity also create the
+	# meta accessors.
+	#--
+	# gmosx: Perhaps we 'll optimize this in the future.
+	#++
+	def self.enchant(target)
+		unless target.singleton_methods.include?('__props')
+			target.module_eval <<-"end_eval", __FILE__, __LINE__
+				@@__meta = G::SafeHash.new
+				@@__props = G::SafeArray.new
+				def self.__props
+					@@__props
+				end
+				def self.__props=(props)
+					@@__props = props
+				end
+				def self.__meta
+					@@__meta
+				end
+				def self.__meta=(meta)
+					@@__meta = meta
+				end
+			end_eval
+		end
+	end
+	# Copy properties from src (Module or Class) to dest.
+	#
+	def self.copy_props(src, dest)
+		src.__props.each do |p|
+			add_prop(dest, p)
+		end
+		# copy the metadata.
+		src.__meta.each do |k, val|
+			val.each { |v| dest.meta(k, v) } if val
+		end
+	end
+	# Add the property to the target (Class or Module)
+	#
+	def self.add_prop(target, prop)
+		if idx = target.__props.index(prop)
+			# override in case of duplicates. Keep the order of the props.
+			target.__props[idx] = prop
+		else
+			target.__props << prop
+		end
+		# Precompile the property read/write methods
+		s, klass = prop.symbol, prop.klass
+		if prop.meta[:reader]
+			target.module_eval %{
+				def #{s}
+					return @#{s}
+				end
+			}
+		end
+		# gmosx: __force_xxx reuses xxx= to allow for easier
+		# overrides.
+		if prop.meta[:writer]
+			target.module_eval %{
+				#{prop_setter(prop)}
+				def __force_#{s}(val)
+						self.#{s}=(} + case klass.name
+													when Fixnum.name
+														"val.to_i()"
+													when String.name
+														"val.to_s()"
+													when Float.name
+														"val.to_f()"
+													when Time.name
+														"Time.parse(val.to_s())"
+													when TrueClass.name, FalseClass.name
+														"val.to_i() > 0"
+													else
+														"val"
+												end + %{)
+				end
+			}
+		end
+	end
+	# Generates the property setter code. Can be overriden
+	# to support extra functionality (example: markup)
+	#
+	def self.prop_setter(prop)
+		s = prop.symbol
+		%{
+			def #{s}=(val)
+				@#{s} = val
+			end
+		}
+	end
 end
 end # module
@@ -90,36 +200,55 @@ class Module
 			end
 		end
-		unless self.methods.include?("__props")
-			eval %{
-				# Properties
-				# An array is used to enforce order.
-				def __props
-					@__props
-				end
+		G::PropertyUtils.enchant(self)
-				def __props=(props)
-					@__props = props
+		if self.is_a?(Class)
+			# Add some extra code to append features to
+			# subclasses.
+			self.module_eval <<-"end_eval", __FILE__, __LINE__
+				def self.inherited(sub)
+					G::PropertyUtils.enchant(sub)
+					G::PropertyUtils.copy_props(self, sub)
+					# gmosx: We have to define @@__props first to avoid reusing
+					# the hash from the module. super must stay at the end.
+					super
 				end
-				def __meta
-					@__meta
+			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__
+				def self.append_features(base)
+					G::PropertyUtils.enchant(base)
+					G::PropertyUtils.copy_props(self, base)
+					# gmosx: We have to define @@__props first to avoid reusing
+					# the hash from the module. super must stay at the end.
+					super
 				end
-				def __meta=(meta)
-					@__meta = meta
-				end
-			}
+			end_eval
 		end
-		@__props = G::SafeArray.new() unless @__props
 		property = G::Property.new(symbol, klass, meta)
 		reader = meta[:reader] || true
 		writer = writer || meta[:writer] || false
-		__add_prop(property, reader, writer)
+		meta[:reader] = true if meta[:reader].nil?
+		if defined?(writer)
+			meta[:writer] = writer
+		else
+			meta[:writer] = true if meta[:writer].nil?
+		end
+		G::PropertyUtils.add_prop(self, property)
 	end
 	# Helper method. Accepts a collection of symbols and generates
@@ -218,90 +347,20 @@ class Module
 		end
 	end
-	# Add the property
-	#
-	def __add_prop(prop, reader = true, writer = true)
-		if idx = @__props.index(prop)
-			# override in case of duplicates. Keep the order of the props.
-			@__props[idx] = prop
-		else
-			@__props << prop
-		end
-		# Precompile the property read/write methods
-		s, klass = prop.symbol, prop.klass
-		if reader
-			module_eval %{
-				def #{s}
-					return @#{s}
-				end
-			}
-		end
-		# gmosx: __force_xxx reuses xxx= to allow for easier
-		# overrides.
-		if writer
-			module_eval %{
-				def #{s}=(val)
-					@#{s} = val
-				end
-				def __force_#{s}(val)
-						self.#{s}=(} + case klass.name
-													when Fixnum.name
-														"val.to_i()"
-													when String.name
-														"val.to_s()"
-													when Float.name
-														"val.to_f()"
-													when Time.name
-														"Time.parse(val.to_s())"
-													when TrueClass.name, FalseClass.name
-														"val.to_i() > 0"
-													else
-														"val"
-												end + %{)
-				end
-			}
-		end
-	end
-	# Attach metadata
-	#
+	# Attach metadata.
+	# Guard against duplicates, no need to keep order.
+	# This method uses closures :)
+	#--
+	# gmosx: crappy implementation, recode.
+	#++
 	def meta(key, val)
-		@__meta = G::SafeHash.new unless @__meta
-		@__meta[key] = [] unless @__meta[key]
-		# guard against duplicates, no need to keep order.
-		@__meta[key].delete_if { |v| val == v }
-		@__meta[key] << val
+		self.module_eval <<-"end_eval", __FILE__, __LINE__
+			@@__meta[key] ||= []
+			@@__meta[key].delete_if { |v| val == v }
+			@@__meta[key] << val
+		end_eval
 	end
-	# This method is typically called before including other
-	# modules to preserve properties order.
-	#
-	def inherit_meta(mod = superclass)
-		# concat props.
-		if mod.__props
-			@__props = G::SafeArray.new unless @__props
-			mod.__props.each { |p|
-				__add_prop(p)
-			}
-		end
-		# concat metadata
-		if mod.__meta
-			mod.__meta.each { |k, val|
-				val.each { |v|
-					meta(k, v)
-				} if val
-			}
-		end
-	end
 end