RubyGems - nitro - Versions diffs - 0.19.0 → 0.20.0 - Mend

nitro 0.19.0 → 0.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

data/CHANGELOG +187 -0
data/INSTALL +5 -0
data/README +11 -5
data/doc/AUTHORS +11 -1
data/doc/RELEASES +217 -0
data/doc/tutorial.txt +1 -2
data/lib/nitro.rb +9 -6
data/lib/nitro/adapter/webrick.rb +13 -2
data/lib/nitro/builder/form.rb +11 -9
data/lib/nitro/builder/rss.rb +2 -2
data/lib/nitro/builder/xhtml.rb +15 -0
data/lib/nitro/caching.rb +15 -10
data/lib/nitro/conf.rb +0 -5
data/lib/nitro/controller.rb +118 -81
data/lib/nitro/cookie.rb +6 -6
data/lib/nitro/dispatcher.rb +62 -18
data/lib/nitro/element.rb +4 -1
data/lib/nitro/element/java_script.rb +15 -0
data/lib/nitro/localization.rb +3 -4
data/lib/nitro/markup.rb +4 -4
data/lib/nitro/mixin/debug.rb +30 -0
data/lib/nitro/mixin/helper.rb +14 -0
data/lib/nitro/mixin/javascript.rb +137 -0
data/lib/nitro/{ui → mixin}/pager.rb +110 -82
data/lib/nitro/render.rb +20 -8
data/lib/nitro/request.rb +6 -0
data/lib/nitro/routing.rb +6 -5
data/lib/nitro/runner.rb +21 -9
data/lib/nitro/server.rb +95 -0
data/lib/nitro/service.rb +0 -1
data/lib/nitro/session.rb +4 -5
data/lib/nitro/shaders.rb +2 -2
data/lib/nitro/template.rb +1 -1
data/lib/nitro/testing/assertions.rb +2 -4
data/lib/nitro/testing/context.rb +4 -6
data/proto/public/js/behaviour.js +254 -0
data/proto/public/js/controls.js +446 -0
data/proto/public/js/dragdrop.js +537 -0
data/proto/public/js/effects.js +612 -0
data/proto/public/js/prototype.js +644 -370
data/proto/public/settings.xhtml +64 -0
data/test/nitro/adapter/tc_cgi.rb +2 -2
data/test/nitro/builder/tc_rss.rb +1 -1
data/test/nitro/mixin/tc_pager.rb +35 -0
data/test/nitro/tc_controller.rb +1 -1
data/test/nitro/tc_cookie.rb +14 -0
data/test/nitro/tc_dispatcher.rb +11 -6
data/test/nitro/tc_server.rb +35 -0
metadata +20 -15
data/lib/nitro/builder/atom.rb +0 -74
data/lib/nitro/part.rb +0 -22
data/lib/nitro/simple.rb +0 -11
data/lib/nitro/ui/popup.rb +0 -41
data/lib/nitro/ui/tabs.rb +0 -25
data/lib/nitro/uri.rb +0 -193
data/test/nitro/builder/tc_atom.rb +0 -24
data/test/nitro/tc_uri.rb +0 -97
data/test/nitro/ui/tc_pager.rb +0 -49

data/doc/tutorial.txt CHANGED Viewed

@@ -3,8 +3,7 @@
 Nitro is an elegant and efficient web application framework.
 In the spirit of Ruby, Nitro supports multiple programming paradigms
 and does not force design decisions to the developer. Nitro
-provides an elegant solution to all problems. In essence,
-Nitro is Ruby Web Development 'off rails'!
+provides an elegant solution to all problems.
 This tutorial presents a step by step guide for building
 a simple blog using Nitro.

data/lib/nitro.rb CHANGED Viewed

@@ -1,12 +1,11 @@
 # = Nitro
 #
 # Nitro is an efficient, yet simple engine for developing
-# professional Web Applications using the Ruby language.
-# Nitro aims to provide a robust infrastructure for scalable
-# web applications that can be distributed over a server
+# professional Web Applications using Ruby and Javascript.
+# Nitro provides a robust infrastructure for scalable
+# applications that can be distributed over a server
 # cluster. However, Nitro can also power simple web
-# applications for deployment on intranets or even personal
-# computers.
+# applications for deployment on intranets or desktops.
 #
 # Nitro integrates the powerful Og Object-Relational mapping
 # library.
@@ -25,7 +24,7 @@ module Nitro
 	# The version.
-	Version = '0.19.0'
+	Version = '0.20.0'
 	# Library path.
@@ -33,12 +32,16 @@ module Nitro
 end
+#--
 # gmosx: leave them here.
+#++
 require 'nitro/context'
 require 'nitro/controller'
 require 'nitro/dispatcher'
 require 'nitro/render'
+require 'nitro/server'
 require 'nitro/conf'
 require 'nitro/runner'

data/lib/nitro/adapter/webrick.rb CHANGED Viewed

@@ -51,6 +51,15 @@ class Webrick
 end
+# A special handler for Xhtml files.
+class XhtmlFileHandler < WEBrick::HTTPServlet::DefaultFileHandler
+	def do_GET(req, res)
+    res['content-type'] = 'text/html'
+    res.body = '<html><body>Permission denied</body></html>'
+	end
+end
 # A Webrick Adapter for Nitro.
 #--
 # TODO: optimize the conversion from WEBrick's
@@ -64,11 +73,13 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 	def initialize(server, conf)
 		@conf = conf
+		@conf.webrick_options ||= {}
+		@conf.webrick_options[:HandlerTable] = { 'xhtml' => XhtmlFileHandler }
 		# Handles static resources. Useful when running
 		# a stand-alone webrick server.
-		@file_handler = WEBrick::HTTPServlet::FileHandler.new(server, conf.dispatcher.public_root, conf.webrick_options || {})
+		@file_handler = WEBrick::HTTPServlet::FileHandler.new(server, conf.dispatcher.public_root, @conf.webrick_options)
 	end
 	# Handle a static file. Also handles cached pages.

data/lib/nitro/builder/form.rb CHANGED Viewed

@@ -29,14 +29,14 @@ module FormBuilderMixin
 			if p.klass.ancestors.include?(Integer) or
 					p.klass.ancestors.include?(Float)
 				str << %{
-	<dt><label for="#{p.name}">#{p.name}</label></dt>
+	<dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
 	<dd>
-		<input type="text" id="#{p.name}" name="#{p.name}" value="#{obj.send(p.symbol)}" />
+		<input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" />
 	</dd>
 				}
 			elsif p.klass.ancestors.include?(String)
 				str << %{
-	<dt><label for="#{p.name}">#{p.name}</label></dt>
+	<dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
 	<dd>
 				}
 				if p.meta[:markup]
@@ -46,11 +46,11 @@ module FormBuilderMixin
 				end
 				if :textarea == p.meta[:ui]
 					str << %{
-		<textarea id="#{p.name}" name="#{p.name}">#{val}</textarea>
+		<textarea id="#{p.symbol}" name="#{p.symbol}">#{val}</textarea>
 					}
 				else
 					str << %{
-		<input type="text" id="#{p.name}" name="#{p.name}" value="#{val}" />
+		<input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{val}" />
 					}
 				end
 				str << %{
@@ -58,16 +58,16 @@ module FormBuilderMixin
 				}
 			elsif p.klass.ancestors.include?(TrueClass)
 				str << %{
-	<dt><label for="#{p.name}">#{p.name}</label></dt>
+	<dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
 	<dd>
-		<input type="checkbox" id="#{p.name}" name="#{p.name}" />
+		<input type="checkbox" id="#{p.symbol}" name="#{p.symbol}" />
 	</dd>
 				}
 			elsif p.klass.ancestors.include?(Time)
 				str << %{
-	<dt><label for="#{p.name}">#{p.name}</label></dt>
+	<dt><label for="#{p.symbol}">#{p.symbol}</label></dt>
 	<dd>
-		<input type="text" id="#{p.name}" name="#{p.name}" value="#{obj.send(p.symbol)}" />
+		<input type="text" id="#{p.symbol}" name="#{p.symbol}" value="#{obj.send(p.symbol)}" />
 	</dd>
 				}
 =begin
@@ -100,3 +100,5 @@ class FormBuilder
 end
 end
+# * George Moschovitis

data/lib/nitro/builder/rss.rb CHANGED Viewed

@@ -44,8 +44,8 @@ module RssBuilderMixin
 		for obj in objects
 			item = RSS::Rss::Channel::Item.new
 			item.title = obj.title if obj.respond_to?(:title)
-			item.description = Glue::StringUtils.head(obj.body, 256) if obj.respond_to?(:body)
-			item.link = "#{c[:base]}/#{obj.view_uri}" if obj.respond_to?(:view_uri)
+#			item.description = CGI.escape(Glue::StringUtils.head(obj.body, 256)) if obj.respond_to?(:body)
+			item.link = "#{c[:base]}/#{obj.to_href}" if obj.respond_to?(:to_href)
 			channel.items << item
 		end

data/lib/nitro/builder/xhtml.rb CHANGED Viewed

@@ -115,3 +115,18 @@ end
 end
 # * George Moschovitis <gm@navel.gr>
+__END__
+	<?r
+		labels = []
+		values = []
+	?>
+	<select name="apis">
+		<option>-- Please select --</option>
+		#{build :options, labels, values, request['selected']}
+		#{b.options labels, values, request['selected']}
+	</select>
+	{

data/lib/nitro/caching.rb CHANGED Viewed

@@ -9,27 +9,32 @@ require 'nitro/caching/fragments'
 module Nitro
 # Adds support for caching.
+#--
+# TODO: add per controller caching_enabled.
+#++
 module Caching
 	# Globaly enable/disable caching.
-	mattr_accessor :caching_enabled, true
+	setting :caching_enabled, :default => true, :doc => 'Globaly enable/disable caching'
 	def self.append_features(base) #:nodoc:
 		super
 		base.send :include, Output, Actions, Fragments
-		base.class_eval do
-			cattr_accessor :caching_enabled, true
+		base.module_eval do
+#			@caching_enabled = true
+			def self.caching_enabled?
+				Caching.caching_enabled # and @caching_enabled
+			end
+			private
+			def caching_enabled?
+				Caching.caching_enabled # and self.class.get_instance_variable(:caching_enabled)
+			end
 		end
 	end
-private
-	def caching_enabled?
-		Caching.caching_enabled and self.class.caching_enabled
-	end
 end
 end

data/lib/nitro/conf.rb CHANGED Viewed

@@ -29,11 +29,6 @@ class Conf < Flexob
 		super(hash)
 	end
-	def mount(name, options = {})
-		$nitro_mount_options = options
-		require_part(name)
-	end
 end
 end

data/lib/nitro/controller.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require 'glue/aspects'
+require 'glue/helper'
 require 'nitro'
 require 'nitro/render'
@@ -20,8 +21,10 @@ module Nitro
 #	[+required+]
 #		Is this parameter required?
-ActionParam = Struct.new(:default, :format, :required)
+unless const_defined? :ActionParam
+	ActionParam = Struct.new(:default, :format, :required)
+end
 # Encapsulates metadata that describe an action.
 class ActionMeta < Hash
@@ -71,105 +74,139 @@ class ActionMeta < Hash
 end
-# The Controller part in the MVC paradigm.
-# A Controller encpsulates a set of actions.
-class Controller
-	include Render
-	include Glue::Aspects
-	include Scaffolding
-	include Caching
-	include Flashing
+# Include this Mixin to a class to make objects of this class
+# publishable, ie accessible through a standard web (REST)
+# interface.
-	# A hash containing metadata for the action
-	# methods.
+module Publishable
+	def self.append_features(base)
-	def self.action_metadata
-		# FIXME: improve this.
-		@action_metadata ||= {}
-		@action_metadata
-	end
-	# The directory where the templates for this controller
-	# reside.
-	@template_root = File.join(Nitro::LibPath, '..', 'proto', 'public')
-	def initialize(context, base = nil)
-		super
-#		self.class.template_root ||= "#{@context.dispatcher.template_root}#{base}"
-	end
-	# Use the method_missing hook to compile the actions
-	# for this controller.
-	def method_missing(action, *args)
-		if Rendering.compile_action(self.class, action)
-			send(action, *args)
-		else
-			super
+		base.module_eval do
+			include Render
+			include Glue::Aspects
+			include Flashing
+			include Glue::Helpers
+			class << self
+				attr_accessor :template_root
+			end
+			@template_root = 'public'
 		end
-	end
-	class << self
-		attr_accessor :template_root
+		# Define metadata for an action. This is a helper
+		# macro.
-		alias __old_inherited inherited
-		#--
-		# gmosx, FIXME: the template_root hack is temporary.
-		# this should be moved to the render.
-		#++
-		def inherited(child)
-#			child.template_root = template_root
-			child.template_root = 'public'
-			# Calculate the name of the file where this controller
-			# is defined. Currently used for reloading.
-			child.class_eval %{
-				if caller[2].to_s.split(':').last =~ /[0-9]+/
-					DEF_FILE = caller[2].to_s.strip.gsub( /:[0-9]+$/ , '')
+		base.module_eval do
+			def self.action(name, options)
+				if meta = action_metadata[name]
+					meta.update(options)
 				else
-					DEF_FILE = caller[3].to_s.strip.gsub( /:[0-9]+$/ , '')
+					action_metadata[name] = ActionMeta.new(options)
 				end
-			}
-			__old_inherited(child)
+			end
 		end
-		# Define metadata for an action. This is a helper
-		# macro.
+		# Aliases an action
+		#--
+		# gmosx, FIXME: better implementation needed.
+		#++
-		def action(name, options)
-			if meta = action_metadata[name]
-				meta.update(options)
-			else
-				action_metadata[name] = ActionMeta.new(options)
+		base.module_eval do
+			def self.alias_action(new, old)
+				alias_method new, old
+				md = action_metadata[old] || ActionMetadata.new
+				md[:view] = old
+				action_metadata[new] = md
 			end
 		end
 		# Return the 'action' methods for this Controller.
 		# Some dangerous methods from ancestors are removed.
+		# All private methods are ignored.
-		def action_methods
-			classes = self.ancestors.reject do |a|
-				[Object, Kernel, Render, Controller, Caching].include?(a)
-			end
+		base.module_eval do
+			def self.action_methods
+				classes = self.ancestors.reject do |a|
+					[Object, Kernel, Render, Controller, Caching].include?(a)
+				end
-			classes.delete(PP::ObjectMixin) if defined?(PP::ObjectMixin)
-			methods =  classes.inject([]) do |action_methods, klass|
-				action_methods + klass.public_instance_methods(false)
+				classes.delete(PP::ObjectMixin) if defined?(PP::ObjectMixin)
+				methods =  classes.inject([]) do |action_methods, klass|
+					action_methods + klass.public_instance_methods(false)
+				end
+				# gmosx: add the default action (leave this?)
+				# methods << 'index'
+				return methods
 			end
-			# methods.delete('method_missing')
-			return methods
 		end
+		# A hash containing metadata for the action
+		# methods.
+		base.module_eval do
+			def self.action_metadata
+				# FIXME: improve this.
+				@action_metadata ||= {}
+				@action_metadata
+			end
+		end
+		base.module_eval do
+			def initialize(context, base = nil)
+				super
+				self.class.template_root ||= 'public'
+			end
+		end
+		# Use the method_missing hook to compile the actions
+		# for this controller.
+		base.module_eval do
+			def method_missing(action, *args)
+				if Rendering.compile_action(self.class, action)
+					send(action, *args)
+				else
+					super
+				end
+			end
+		end
+	end
+end
+# The Controller part in the MVC paradigm. The controller's
+# published methods are called actrions. The controller class
+# contains the Publishable mixin and additional helper mixins.
+class Controller
+	include Publishable
+	include Scaffolding
+	include Caching
+	# The default action.
+=begin
+	def index
+		print %{
+			This is the placeholder action is provided as a default for #{self.class.name}.<br />
+			You probably want to <b>implement your custom action</b> here.
+		}
+	end
+=end
+end
+# A simple controller, only handles templates.
+# Useful to implement php/asp/jsp style applications.
+# The Dispatcher uses this as the default Controller.
+#--
+# gmosx: At the moment used to have a separate
+# template_root.
+#++
-	end
+class SimpleController < Controller
 end
 end