nitro 0.19.0 → 0.20.0

data/lib/nitro/simple.rb

@@ -1,11 +0,0 @@
-require 'nitro/controller'
-
-# A simple controller, only handles templates.
-# Useful to implement php/asp/jsp style applications.
-# Dispatcher uses this as the default Controller.
-#--
-# gmosx, FIXME: this is a nasty hack, remove!
-#++
-
-class SimpleController < Nitro::Controller; 
-end

data/lib/nitro/ui/popup.rb

@@ -1,41 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: popup.rb 1 2005-04-11 11:04:30Z gmosx $
-
-module Nitro
-
-# Display a popup window.
-
-class Popup
-
-	#  Emit the needed javascript.
-	#  Alternatively use this code: <script src="/r/js/std.js">#{}</script>
-	 
-	def self.script
-%[
-function newWin(url, name, w, h, scroll) {
-	var pleft = (screen.width - w) / 2;
-	var ptop = (screen.height - h) / 2;
-	var settings = 'height=' + h + ',width=' + w + ',top=' + ptop + ',left=' + pleft + ',scrollbars=' + scroll + ',resizable';
-
-	win = window.open(url, name, settings);
-
-	return false;
-}
-]
-	end
-
-	# gmosx: keep the leading / to be IE friendly.
-	
-	def self.onclick(uri, width, height, title = "Popup", type="PAGE", options = "scrollbars=yes,resizable", container = "/p/glue/popup.sx")
-		%[javascript: var pwl = (screen.width - #{width}) / 2; var pwt = (screen.height - #{height}) / 2; window.open('#{container}?uri=#{uri};type=#{type}', '#{title}', 'width=#{width},height=#{height},top='+pwt+',left='+pwl+', #{options}'); return false"]		
-	end	
-	
-	# gmosx: keep the leading / to be IE friendly.
-	
-	def self.link(uri, width, height, link = "link", title = "Popup", type="PAGE", options = "scrollbars=yes,resizable", container = "/p/glue/popup.sx")
-		%[<a href="#" onclick="#{self.onclick(uri, width, height, title, type, options, container)}">#{link}</a>]
-	end
-end
-
-end 

data/lib/nitro/ui/tabs.rb

@@ -1,25 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: tabs.rb 1 2005-04-11 11:04:30Z gmosx $
-
-module Nitro
-
-	# Render a tabs bar
-
-	def self.tabs(request, options, param)
-		tabs = []
-	
-		selected = request.get(param, 0)
-		
-		options.each_with_index { |opt, idx|
-			if idx == selected
-				tabs << %|<strong>#{opt}</strong>|
-			else
-				tabs << %|<a href="#{request.expand_uri(param => idx)}">#{opt}</a>|
-			end
-		}
-		
-		return %|<div class="tabs">#{tabs.join('<span class="sep">|</span>')}</div>| 
-	end
-	
-end

data/lib/nitro/uri.rb

@@ -1,193 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: uri.rb 1 2005-04-11 11:04:30Z gmosx $
-
-require 'uri'
-require 'cgi'
-
-require 'glue/string'
-
-module Nitro
-
-# URI utilities collection.
-#
-# === Design
-#
-# Implement as a module to avoid class polution. You can still
-# use Ruby's advanced features to include the module in your
-# class. Passing the object to act upon allows to check for nil,
-# 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 
-		# spaces uploaded by users
-		escaped_uri = uri.gsub(/ /, "+")
-
-		if md = URI::REGEXP::REL_URI.match(escaped_uri)
-
-			path = "#{md[5]}#{md[6]}"
-			type = File.extname(path)
-			query_string = md[7]
-
-#			real_path = "#{$root_dir}/#{path}"
-
-			parameters = UriUtils.query_string_to_hash(query_string)
-			path.gsub!(/\+/, " ")
-
-			return [path, type, parameters, query_string]
-
-		end # match
-
-		# this is usefull for uncovering bugs!
-		raise ArgumentError.new("the parameter '#{uri}' is not a valid uri")
-	end
-
-	# Extend the basic query string parser provided by the cgi module.
-	# converts single valued params (the most common case) to
-	# objects instead of arrays
-	#
-	# Input:
-	# the query string
-	#
-	# Output:
-	# hash of parameters, contains arrays for multivalued parameters
-	# (multiselect, checkboxes , etc)
-	# If no query string is provided (nil or "") returns an empty hash.
-	
-	def self.query_string_to_hash(query_string)
-		return {} unless query_string
-
-		query_parameters = CGI::parse(query_string)
-
-		query_parameters.each { |key, val|
-			# replace the array with an object
-			query_parameters[key] = val[0] if 1 == val.length
-		}
-
-		# set default value to nil! cgi sets this to []
-		query_parameters.default = nil
-
-		return query_parameters
-	end
-
-	# Given a hash with parameter/value pairs construct a
-	# standard query string. This method only encodes simple
-	# types (Numeric, String) to avoid query string polution
-	# with marshal, etc.
-	#
-	# gmosx, FIXME: only numeric and strings are passed to
-	# the latest code, so update old code and optimize this!
-	#
-	# Input:
-	# the parameter hash
-	#
-	# Output:
-	# the query string
-
-	def self.hash_to_query_string(parameters)
-		return nil unless parameters
-		pairs = []
-		parameters.each { |param, value|
-			# only encode simple classes !
-
-			if value.is_a?(Numeric) or value.is_a?(String)
-				pairs << "#{param}=#{value}"
-			end
-		}
-		return pairs.join(";")
-	end
-
-	# This method returns the query string of a uri
-	#
-	# Input:
-	# the uri
-	#
-	# Output:
-	# the query string.
-	# returns nil if no query string
-
-	def self.get_query_string(uri)
-		return nil unless uri
-		# gmosx: INVESTIGATE ruby's URI seems to differently handle
-		# abs and rel uris.
-		if md = URI::REGEXP::ABS_URI.match(uri)
-			return md[8]
-		elsif md = URI::REGEXP::REL_URI.match(uri)
-			return md[7]
-		end
-		return nil
-	end
-
-	# Removes the query string from a uri
-	#
-	# Input:
-	# the uri
-	#
-	# Output:
-	# the chomped uri.
-
-	def self.chomp_query_string(uri)
-		return nil unless uri
-		query_string = self.get_query_string(uri)
-		return uri.dup.chomp("?#{query_string}")
-	end
-
-	# Get a uri and a hash of parameters. Inject the hash values
-	# as parameters in the query sting path. Returns the full
-	# uri.
-	#
-	# Input:
-	# the uri to filter (String)
-	# hash of parameters to update
-	#
-	# Output:
-	# the full updated query string
-	#
-	# === TODO:
-	# optimize this a litle bit.
-	
-	def self.update_query_string(uri, parameters)
-		query_string = self.get_query_string(uri)
-		rest = uri.dup.gsub(/\?#{query_string}/, "")
-
-		hash = self.query_string_to_hash(query_string)
-		hash.update(parameters)
-		query_string = self.hash_to_query_string(hash)
-
-		if Glue::StringUtils.valid?(query_string)
-			return "#{rest}?#{query_string}"
-		else
-			return rest
-		end
-	end
-	
-	# TODO: find a better name.
-	# Gets the request uri, injects extra parameters in the query string
-	# and returns a new uri. The request object is not modified.
-	# There is always a qs string so an extra test is skipped.
-	
-	def self.update_request_uri(request, parameters)
-		hash = request.parameters.dup()
-		hash.update(parameters)
-
-		# use this in hash_to_querystring.		
-		query_string = hash.collect { |k, v|
-			"#{k}=#{v}"
-		}.join(";")
-		
-		return "#{request.translated_uri}?#{query_string}"
-	end
-
-end
-
-end

data/test/nitro/builder/tc_atom.rb

@@ -1,24 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'test/unit'
-require 'nitro/builder/atom'
-
-class TestCaseBuildersAtom < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	
-	Blog = Struct.new(:title, :body, :view_uri, :author)
-
-	def test_render
-=begin
-		blogs = []
-		blogs << Blog.new('Hello1', 'World1', 'uri1', 'George');
-		blogs << Blog.new('Hello2', 'World2', 'uri2', 'Stella');
-		blogs << Blog.new('Hello3', 'World3', 'uri3', 'Renos');
-
-		rss = AtomBuilder.build(blogs, :link => 'http://www.navel.gr')
-=end
-		# assert_match %r{<link>http://www.navel.gr/uri1</link>}, rss
-		# assert_match %r{<link>http://www.navel.gr/uri2</link>}, rss
-	end
-
-end

data/test/nitro/tc_uri.rb

@@ -1,97 +0,0 @@
-require 'test/unit'
-require 'nitro/uri'
-
-class Dummy # :nodoc: all
-	attr_accessor :test1, :test2
-end
-
-class TC_Uri < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-
-	def test_query_string_to_hash
-		# bad query string
-
-		assert_equal(0, UriUtils.query_string_to_hash("").length)
-		assert_equal(0, UriUtils.query_string_to_hash(nil).length)
-
-		# single valued
-
-		parameters = UriUtils.query_string_to_hash("koko=2&lala=3")
-		assert_equal("2", parameters["koko"])
-		assert_equal("3", parameters["lala"])
-
-		parameters = UriUtils.query_string_to_hash("koko=2;lala=3")
-		assert_equal("2", parameters["koko"])
-		assert_equal("3", parameters["lala"])
-
-		# multivalued
-
-		parameters = UriUtils.query_string_to_hash("koko=2;lala=3&koko=5")
-		assert_equal(2, parameters["koko"].length)
-		assert_equal("2", parameters["koko"][0])
-		assert_equal("3", parameters["lala"])
-		assert_equal("5", parameters["koko"][1])
-
-		# non existing value
-		assert_equal(nil, parameters["non-existing-value"])
-	end
-
-	def test_hash_to_query_string
-		hash = { "koko" => 1, "lala" => 2}
-		qs = "koko=1;lala=2"
-		assert_equal(qs, UriUtils.hash_to_query_string(hash))
-
-		assert_equal(nil, UriUtils.hash_to_query_string(nil))
-
-		# bug: dont encode complex objects
-		hash = { "a" => 2, "b" => 3, "c" => Dummy.new }
-		qs = "a=2;b=3"
-		assert_equal(qs, UriUtils.hash_to_query_string(hash))
-	end
-
-	def test_get_query_string
-		uri = "people/gmosx.sx?koko=1;lala=2"
-		assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
-
-		uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
-		assert_equal("koko=1&lala=2", UriUtils.get_query_string(uri))
-
-		uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
-		assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
-	end
-
-	def test_chomp_query_string
-		uri = "people/gmosx.sx"
-		assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
-
-		uri = "people/gmosx.sx?koko=1;lala=2"
-		assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
-
-		uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
-		assert_equal("http://www.navel.gr/people/gmosx.sx", UriUtils.chomp_query_string(uri))
-
-		uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
-		assert_equal("http://www.navel.gr:8080/people/gmosx.sx", UriUtils.chomp_query_string(uri))
-
-		assert_equal(nil, UriUtils.chomp_query_string(nil))
-	end
-
-	def test_update_query_string
-		uri = "ko/index.sx?koko=1"
-		hash = {"lala" => 2, "kaka" => 3}
-		assert_equal("ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
-
-		uri = "http://www.navel.gr:8080/ko/index.sx?koko=1"
-		hash = {"lala" => 2, "kaka" => 3}
-		assert_equal("http://www.navel.gr:8080/ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
-
-		uri = "http://www.navel.gr"
-		hash = {"lala" => 2, "kaka" => 3}
-		assert_equal("http://www.navel.gr?lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
-
-		# bug: no ? when passed an empty hash
-		uri = "http://www.navel.gr"
-		assert_equal("http://www.navel.gr", UriUtils.update_query_string(uri, {}))
-	end
-
-end

data/test/nitro/ui/tc_pager.rb

@@ -1,49 +0,0 @@
-# :nodoc: all
-
-require 'test/unit'
-
-require 'glue/logger'
-
-require 'og'
-require 'nitro/ui/pager'
-
-class RequestMock < Hash
-	attr_accessor :query
-	
-	def initialize
-		@query = {}
-	end
-	
-	def get(k, default)
-		return self[k] || default
-	end
-end
-
-class TC_N_UI_Pager < Test::Unit::TestCase
-	include Nitro
-	
-	def setup
-	end
-
-	def teardown
-	end
-
-	def test_all
-		items = [1, 2, 3, 4, 5, 6, 7, 8, 9]
-		count = items.size()
-		
-		request = RequestMock.new()
-		pager = UI::Pager.new('tst', request, 2, items)
-		
-		assert_equal(pager.total_count, count)
-		
-		# bug: bad rounding.
-		
-		assert_equal(5, pager.page_count)
-		
-		# bug: FIXME
-		# assert_equal(2, items.size())
-		
-	end
-	
-end