nitro 0.20.0 → 0.21.0

data/lib/nitro/request.rb

@@ -1,163 +1,163 @@
 module Nitro
-	
+  
 # Encapsulates a request. This is an abstract request
 # typically extended by sub-classes. This module
 # is included in Context
 
 module Request
 
-	# The request input stream.
+  # The request input stream.
 
-	attr_accessor :in
+  attr_accessor :in
 
-	# The request headers collection. Also called
-	# the request environment (env).
+  # The request headers collection. Also called
+  # the request environment (env).
 
-	attr_accessor :headers
-	alias_method :env, :headers
-	alias_method :env=, :headers=
-	# for compatibility with cgi.rb
-	alias_method :env_table, :headers
+  attr_accessor :headers
+  alias_method :env, :headers
+  alias_method :env=, :headers=
+  # for compatibility with cgi.rb
+  alias_method :env_table, :headers
 
-	# The parsed query parameters collection.
+  # The parsed query parameters collection.
 
-	attr_accessor :params
-	alias_method :query, :params
+  attr_accessor :params
+  alias_method :query, :params
 
-	# The request cookies.
+  # The request cookies.
 
-	attr_accessor :cookies
+  attr_accessor :cookies
 
-	# The request protocol.
+  # The request protocol.
 
-	def protocol
-		443 == port ? 'https://' : 'http://'
-	end
+  def protocol
+    443 == port ? 'https://' : 'http://'
+  end
 
-	# Is this an ssl request?
+  # Is this an ssl request?
 
-	def ssl?
-		443 == port
-	end
-		
-	# The request uri.
-
-	def uri
-		@headers['REQUEST_URI']
-	end
-
-	# The path is the uri without the query string.
+  def ssl?
+    443 == port
+  end
+    
+  # The request uri.
+
+  def uri
+    @headers['REQUEST_URI']
+  end
+
+  # The path is the uri without the query string.
 
-	def path
-		path = uri ? uri.split('?').first : ''
-	end
+  def path
+    path = uri ? uri.split('?').first : ''
+  end
 
-	def path_info
-		@headers['PATH_INFO']
-	end
-
-	# The request query string.
-
-	def query_string 
-		@headers['QUERY_STRING']
-	end
-	
-	# The request method.
-
-	def method
-		@headers['REQUEST_METHOD'].downcase.intern
-	end
-
-	# Is this a post method?
-	
-	def post?
-		method == :post
-	end
-		
-	# Return the referer. For the initial page in the
-	# clickstream there is no referer, set "/" by default.
-		
-	def referer
-		return @headers['HTTP_REFERER'] || '/'
-	end
-
-	# The content_length
-	
-	def content_length
-		return @headers['CONTENT_LENGTH'].to_i
-	end
-
-	# The remote IP address. REMOTE_ADDR is the standard
-	# but will fail if the user is behind a proxy.  
-	# HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR are set by 
-	# proxies so check for these before falling back to 
-	# REMOTE_ADDR. HTTP_X_FORWARDED_FOR may be a comma-delimited 
-	# list in the case of multiple chained proxies; the first 
-	# is the originating IP.
-													
-	def remote_ip
-		return @headers['HTTP_CLIENT_IP'] if @headers.include?('HTTP_CLIENT_IP')
-
-		if @headers.include?('HTTP_X_FORWARDED_FOR') then
-			remote_ips = @headers['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip|
-				ip =~ /^unknown$|^(10|172\.16|192\.168)\./i
-			end
-
-			return remote_ips.first.strip unless remote_ips.empty?
-		end
-
-		return @headers['REMOTE_ADDR']
-	end
-
-	# The server port.
-
-	def port
-		@headers['SERVER_PORT'].to_i
-	end
-
-	# The server host name.
-	# Also handles proxy forwarding.
-
-	def host
-		@headers['HTTP_X_FORWARDED_HOST'] || @headers['HTTP_HOST'] 
-	end
-
-	def host_url
-		"http://#{host}"
-	end
-
-	# The raw data of the request.
-	# Useful to implement Webservices.
-	#--
-	# FIXME: better name and implementation.
-	#++
-
-	def raw_body
-		unless @raw_body
-			@in.rewind
-			@raw_body = @in.read(content_length)
-		end
-
-		@raw_body
-	end
-	
-	# Lookup a query parameter.
-
-	def [](param)
-		@params[param]
-	end
-
-	# Set a query parameter.
-
-	def []=(param, value)
-		@params[param] = value
-	end
-	
-	# Fetch a parameter with default value.
-	
-	def fetch(param, default = nil)
-		@params.fetch(param, default)
-	end
+  def path_info
+    @headers['PATH_INFO']
+  end
+
+  # The request query string.
+
+  def query_string 
+    @headers['QUERY_STRING']
+  end
+  
+  # The request method.
+
+  def method
+    @headers['REQUEST_METHOD'].downcase.intern
+  end
+
+  # Is this a post method?
+  
+  def post?
+    method == :post
+  end
+    
+  # Return the referer. For the initial page in the
+  # clickstream there is no referer, set "/" by default.
+    
+  def referer
+    return @headers['HTTP_REFERER'] || '/'
+  end
+
+  # The content_length
+  
+  def content_length
+    return @headers['CONTENT_LENGTH'].to_i
+  end
+
+  # The remote IP address. REMOTE_ADDR is the standard
+  # but will fail if the user is behind a proxy.  
+  # HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR are set by 
+  # proxies so check for these before falling back to 
+  # REMOTE_ADDR. HTTP_X_FORWARDED_FOR may be a comma-delimited 
+  # list in the case of multiple chained proxies; the first 
+  # is the originating IP.
+                          
+  def remote_ip
+    return @headers['HTTP_CLIENT_IP'] if @headers.include?('HTTP_CLIENT_IP')
+
+    if @headers.include?('HTTP_X_FORWARDED_FOR') then
+      remote_ips = @headers['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip|
+        ip =~ /^unknown$|^(10|172\.16|192\.168)\./i
+      end
+
+      return remote_ips.first.strip unless remote_ips.empty?
+    end
+
+    return @headers['REMOTE_ADDR']
+  end
+
+  # The server port.
+
+  def port
+    @headers['SERVER_PORT'].to_i
+  end
+
+  # The server host name.
+  # Also handles proxy forwarding.
+
+  def host
+    @headers['HTTP_X_FORWARDED_HOST'] || @headers['HTTP_HOST'] 
+  end
+
+  def host_url
+    "http://#{host}"
+  end
+
+  # The raw data of the request.
+  # Useful to implement Webservices.
+  #--
+  # FIXME: better name and implementation.
+  #++
+
+  def raw_body
+    unless @raw_body
+      @in.rewind
+      @raw_body = @in.read(content_length)
+    end
+
+    @raw_body
+  end
+  
+  # Lookup a query parameter.
+
+  def [](param)
+    @params[param]
+  end
+
+  # Set a query parameter.
+
+  def []=(param, value)
+    @params[param] = value
+  end
+  
+  # Fetch a parameter with default value.
+  
+  def fetch(param, default = nil)
+    @params.fetch(param, default)
+  end
 end
 
 end

data/lib/nitro/response.rb

@@ -1,42 +1,42 @@
 module Nitro
-	
+  
 # HTTP Response. This module is included in Context.
 
 module Response
 
-	# The Response status.
+  # The Response status.
 
-	attr_accessor :status
+  attr_accessor :status
 
-	# The Response headers.
+  # The Response headers.
 
-	attr_accessor :response_headers
+  attr_accessor :response_headers
 
-	# The Response cookies.
+  # The Response cookies.
 
-	attr_accessor :response_cookies
+  attr_accessor :response_cookies
 
-	def content_type=(ctype)
-		@response_headers['Content-Type'] = ctype
-	end
+  def content_type=(ctype)
+    @response_headers['Content-Type'] = ctype
+  end
 
-	# Add a cookie to the response. Better use this
-	# method to avoid precreating the cookies array
-	# for every request.
-	#
-	# === Examples
-	#
-	# add_cookie('nsid', 'gmosx')
-	# add_cookie(Cookie.new('nsid', 'gmosx')
-	
-	def add_cookie(cookie, value = nil)
-		if value
-			(@response_cookies ||= []) << Cookie.new(cookie, value)
-		else 
-			(@response_cookies ||= []) << cookie
-		end
-	end
-	alias_method :send_cookie, :add_cookie
+  # Add a cookie to the response. Better use this
+  # method to avoid precreating the cookies array
+  # for every request.
+  #
+  # === Examples
+  #
+  # add_cookie('nsid', 'gmosx')
+  # add_cookie(Cookie.new('nsid', 'gmosx')
+  
+  def add_cookie(cookie, value = nil)
+    if value
+      (@response_cookies ||= []) << Cookie.new(cookie, value)
+    else 
+      (@response_cookies ||= []) << cookie
+    end
+  end
+  alias_method :send_cookie, :add_cookie
 
 end
 

data/lib/nitro/routing.rb

@@ -3,28 +3,28 @@ module Nitro
 # Router mixin. Typically used to generate 'nice' urls.
 # Nice urls are considered (?) more Search Engine 
 # friendly.
-	
+  
 module Router
-	
-	# The route table maps 'nice URLs' to real URLs that
-	# can be handled by the Dispatcher.
-
-	attr_accessor :routes
-
-	# Apply routing rules to the path.
-
-	def route(path, context)
-		for rule, real_path, *params in @routes
-			if md = path.match(rule)
-				params.each_with_index do |p, idx|
-					context[p] = md.captures[idx]
-				end
-				return real_path
-			end
-		end
-
-		return path
-	end
+  
+  # The route table maps 'nice URLs' to real URLs that
+  # can be handled by the Dispatcher.
+
+  attr_accessor :routes
+
+  # Apply routing rules to the path.
+
+  def route(path, context)
+    for rule, real_path, *params in @routes
+      if md = path.match(rule)
+        params.each_with_index do |p, idx|
+          context[p] = md.captures[idx]
+        end
+        return real_path
+      end
+    end
+
+    return path
+  end
 
 end
 

data/lib/nitro/scaffold.rb

@@ -2,9 +2,13 @@ require 'facet/string/singular'
 require 'facet/string/demodulize'
 require 'facet/string/underscore'
 
+require 'nitro/compiler'
+
 module Nitro
 
 # The scaffolder adds default actions to a Controller.
+#
+# WARNING: This code is slightly outdated.
 #--
 # FIXME: handle controller base in generated routes.
 # FIXME: better handle templates (check if action exists).
@@ -12,124 +16,126 @@ module Nitro
 
 module Scaffolding
 
-	def self.append_features(base) # :nodoc: 
-		super
-		base.extend(ClassMethods)
-	end
-
-	module ClassMethods 
-
-		# Enchant the caller with a number of default methods.
-		# Override the automatically generated methods as needed.
-		
-		def scaffold(klass, options = {})
-			
-			oid = options[:oid] || 'oid'
-			name = options[:name] || klass.to_s.demodulize.underscore.downcase
-			list_name = options[:list_name] || name.plural
-			options[:nosuffix] ? suffix = nil : suffix = "_#{name}"
-
-			# Add methods to the scaffolded class.
-	
-			klass.module_eval %{ 
-				def to_href 
-					"view#{suffix}?oid=\#\{@oid\}"
-					# "view#{suffix}/\#\{@oid\}"
-				end
-			}
-			
-			# Add methods to the service.
-
-			code = ''
-
-			if options[:index]
-				code << %{ 
-					def index
-						list#{suffix}
-					end
-				}
-			end
-		
-			code << %{
-				def new#{suffix}
-					@#{name} = #{klass}.new
-					render '/form#{suffix}'
-				end
-
-				def edit#{suffix}
-					@#{name} = #{klass}[request['oid']] 
-					render '/form#{suffix}'
-				end
-			}
-	
-			unless Rendering.template_for_action(self.template_root, "form#{suffix}")
-				code << %{
-					def form#{suffix}
-						o << %|
-						<html>
-							<form action="save#{suffix}" method="post">
-						|
-						if @#{name}.oid
-							o << %|
-									<input type="hidden" name="oid" value="\#\{@#{name}\}" />
-							|
-						end
-						o.build_form(@#{name})
-						o << %|
-								<input type="submit" value="Save" />
-							</form>
-						</html>
-						|
-					end
-				}
-			end
-
-			code << %{
-				# TODO: add pager support here!
-
-				def list#{suffix}
-					@#{list_name} = #{klass}.all('ORDER BY oid')
-			}
-			unless Rendering.template_for_action(self.template_root, "list#{suffix}")
-				code << %{
-					o.ul {
-						for item in @#{list_name}
-							o.li(item.to_s)
-						end
-					}
-				}
-			end
-			code << %{
-				end
-				
-				def view#{suffix}
-					# @#{name} = #{klass}[@context['#{oid}']]
-					@#{name} = #{klass}[@#{oid}]
-				end
-				action :view#{suffix}, :route => \%r\{#{@base}/view#{suffix}/(.*)\}, 'oid' => 1
-				
-				def save#{suffix}
-					if oid = request['oid']
-						@#{name} = request.fill(#{klass}[oid])
-					else
-						@#{name} = request.fill(#{klass}.new)
-					end
-
-					@#{name}.save
-
-					redirect 'list#{suffix}'
-				end
-				
-				def del#{suffix}
-					#{klass}.delete(@context['#{oid}'])
-				end
-				alias_method :delete#{suffix}, :del#{suffix}
-			}		
-
-			class_eval(code)
-		end
-
-	end
+  def self.append_features(base) # :nodoc: 
+    super
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods 
+
+    # Enchant the caller with a number of default methods.
+    # Override the automatically generated methods as needed.
+    
+    def scaffold(klass, options = {})
+      compiler = Compiler.new
+      
+      oid = options[:oid] || 'oid'
+      name = options[:name] || klass.to_s.demodulize.underscore.downcase
+      list_name = options[:list_name] || name.plural
+      options[:nosuffix] ? suffix = nil : suffix = "_#{name}"
+
+      # Add methods to the scaffolded class.
+  
+      klass.module_eval %{ 
+        def to_href 
+          "view#{suffix}?oid=\#\{@oid\}"
+          # "view#{suffix}/\#\{@oid\}"
+        end
+      }
+      
+      # Add methods to the service.
+
+      code = ''
+
+      if options[:index]
+        code << %{ 
+          def index
+            list#{suffix}
+          end
+        }
+      end
+    
+      code << %{
+        def new#{suffix}
+          @#{name} = #{klass}.new
+          render '/form#{suffix}'
+        end
+
+        def edit#{suffix}
+          @#{name} = #{klass}[request['oid']] 
+          render '/form#{suffix}'
+        end
+      }
+  
+      unless compiler.template_for_action("form#{suffix}", self.template_root)
+        code << %{
+          def form#{suffix}
+            o << %|
+            <html>
+              <form action="save#{suffix}" method="post">
+            |
+            if @#{name}.oid
+              o << %|
+                  <input type="hidden" name="oid" value="\#\{@#{name}\}" />
+              |
+            end
+            o.build_form(@#{name})
+            o << %|
+                <input type="submit" value="Save" />
+              </form>
+            </html>
+            |
+          end
+        }
+      end
+
+      code << %{
+        # TODO: add pager support here!
+
+        def list#{suffix}
+          @#{list_name} = #{klass}.all('ORDER BY oid')
+      }
+      unless compiler.template_for_action("list#{suffix}", self.template_root)
+        code << %{
+          o.ul {
+            for item in @#{list_name}
+              o.li(item.to_s)
+            end
+          }
+        }
+      end
+      code << %{
+        end
+        
+        def view#{suffix}
+          # @#{name} = #{klass}[@context['#{oid}']]
+          @#{name} = #{klass}[@#{oid}]
+        end
+        action :view#{suffix}, :route => \%r\{#{@base}/view#{suffix}/(.*)\}, 'oid' => 1
+        
+        def save#{suffix}
+          if oid = request['oid']
+            @#{name} = request.fill(#{klass}[oid])
+          else
+            @#{name} = request.fill(#{klass}.new)
+          end
+
+          @#{name}.save
+
+          redirect 'list#{suffix}'
+        end
+        
+        def del#{suffix}
+          #{klass}.delete(@context['#{oid}'])
+          redirect_referer
+        end
+        alias_method :delete#{suffix}, :del#{suffix}
+      }    
+
+      class_eval(code)
+    end
+
+  end
 
 end