utopia 0.9.39 → 0.9.40

data/lib/utopia/link.rb

@@ -15,6 +15,8 @@ module Utopia
 		def initialize(kind, path, info = nil)
 			path = Path.create(path)
 
+			@info = info ? info.symbolize_keys : {}
+			@locale = @info.delete(:locale) || path.locale(XNODE_EXT)
 			@kind = kind
 
 			case @kind
@@ -26,19 +28,11 @@ module Utopia
 				@path = path
 			when :virtual
 				@name = path.to_s
-				@path = nil
+				@path = @info[:path] ? Path.create(@info[:path]) : nil
 			end
 
 			@components = @name.split(".")
-			@locale = path.locale(XNODE_EXT)
-
 			@title = components[0]
-
-			if info
-				@info = info.symbolize_keys
-			else
-				@info = {}
-			end
 		end
 
 		attr :kind
@@ -103,6 +97,10 @@ module Utopia
 		def == other
 			return other && kind == other.kind && name == other.name && path == other.path
 		end
+		
+		def default_locale
+			@locale == ''
+		end
 	end
 	
 	module Links
@@ -143,6 +141,8 @@ module Utopia
 			options = DEFAULT_OPTIONS.merge(options)
 			path = File.join(root, top.components)
 			metadata = Links.metadata(path)
+			
+			virtual_metadata = metadata.dup
 
 			links = []
 
@@ -154,8 +154,8 @@ module Utopia
 				if File.directory?(fullpath) && options[:directories]
 					name = filename
 					indices_metadata = Links.metadata(fullpath)
-
 					directory_metadata = metadata.delete(name) || {}
+
 					indices = 0
 					Links.indices(fullpath) do |index|
 						index_name = File.basename(index, ".xnode")
@@ -195,6 +195,16 @@ module Utopia
 
 			if options[:virtual]
 				metadata.each do |name, details|
+					# Given a virtual named such as "welcome.cn", merge it with metadata 
+					# from "welcome" if it exists.
+					basename, locale = name.split(".", 2)
+
+					if virtual_metadata[basename]
+						details = virtual_metadata[basename].merge(details || {})
+						name = basename
+						details[:locale] = locale
+					end
+
 					links << Link.new(:virtual, name, details)
 				end
 			end
@@ -216,15 +226,18 @@ module Utopia
 				reduced = []
 
 				links.group_by(&:name).each do |name, links|
-					default = nil
-
-					link = links.select{|link|
-						link.locale == options[:locale] || link.locale == ''
-					}.sort_by{|link| link.locale.size}.last
-
-					if link
-						reduced << link
+					specific = nil
+
+					links.each do |link|
+						if link.locale == options[:locale]
+							specific = link
+							break
+						elsif link.default_locale
+							specific ||= link
+						end
 					end
+
+					reduced << specific if specific
 				end
 				
 				links = reduced

data/lib/utopia/middleware/filter.rb

@@ -2,12 +2,6 @@
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 require 'utopia/middleware'
-require 'utopia/path'
-
-require 'time'
-
-require 'digest/sha1'
-require 'mime/types'
 
 module Utopia
 	module Middleware

data/lib/utopia/middleware/localization.rb

@@ -33,42 +33,68 @@ module Utopia
 			end
 
 			def named_locale(resource_name)
-				Name.extract_locale(resource_name, @all_locales)
-			end
-			
-			def current_locale(env, resource_name)
-				Rack::Request.new(env).GET["locale"] || named_locale(resource_name) || @default_locale
+				if resource_name
+					Name.extract_locale(resource_name, @all_locales)
+				else
+					nil
+				end
 			end
 
 			attr :all_locales
 			attr :default_locale
+			
+			def check_resource(resource_name, resource_locale, env)
+				localized_name = Name.localized(resource_name, resource_locale, @all_locales).join(".")
+				localized_path = Path.create(env["PATH_INFO"]).dirname + localized_name
 
-			def call(env)
-				path = Path.create(env["PATH_INFO"])
+				localization_probe = env.dup
+				localization_probe["REQUEST_METHOD"] = "HEAD"
+				localization_probe["PATH_INFO"] = localized_path.to_s
 
-				request_locale = current_locale(env, path.basename)
-				resource_name = Name.nonlocalized(path.basename, @all_locales).join(".")
+				# Find out if a resource exists for the requested localization
+				return [localized_path, @app.call(localization_probe)]
+			end
 
-				env["utopia.current_locale"] = request_locale
+			def call(env)
+				path = Path.create(env["PATH_INFO"])
 				env["utopia.localization"] = self
 
-				localized_name = Name.localized(resource_name, request_locale, @all_locales).join(".")
-
-				localization_probe = env.dup
-				localization_probe["REQUEST_METHOD"] = "HEAD"
-				localization_probe["PATH_INFO"] = (path.dirname + localized_name).to_s
+				referer_locale = named_locale(env['HTTP_REFERER'])
+				request_locale = named_locale(path.basename)
+				resource_name = Name.nonlocalized(path.basename, @all_locales).join(".")
 
-				response = @app.call(localization_probe)
+				response = nil
+				if request_locale
+					env["utopia.current_locale"] = request_locale
+					resource_path, response = check_resource(resource_name, request_locale, env)
+				elsif referer_locale
+					env["utopia.current_locale"] = referer_locale
+					resource_path, response = check_resource(resource_name, referer_locale, env)
+				end
+				
+				# If the previous checks failed, i.e. there was no request/referer locale 
+				# or the response was 404 (i.e. no localised resource), we check for the
+				# @default_locale
+				if response == nil || response[0] >= 400
+					env["utopia.current_locale"] = @default_locale
+					resource_path, response = check_resource(resource_name, @default_locale, env)
+				end
 
+				# If the response is 2xx, we have a localised resource
 				if response[0] < 300
-					if path.basename == localized_name
+					# If the original request was the same as the localized request,
+					if path.basename == resource_path.basename
+						# The resource URI is correct.
 						return @app.call(env)
 					else
-						return [307, {"Location" => localization_probe["PATH_INFO"]}, []]
+						# Redirect to the correct resource URI.
+						return [307, {"Location" => resource_path.to_s}, []]
 					end
 				elsif response[0] < 400
+					# We have encountered a redirect while accessing the localized resource
 					return response
 				else
+					# A localized resource was not found, return the unlocalised resource path,
 					if path.basename == resource_name
 						return @app.call(env)
 					else

data/lib/utopia/version.rb

@@ -6,7 +6,7 @@ module Utopia
   module VERSION
     MAJOR = 0
     MINOR = 9
-    TINY  = 39
+    TINY  = 40
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 107
   prerelease: false
   segments: 
   - 0
   - 9
-  - 39
-  version: 0.9.39
+  - 40
+  version: 0.9.40
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +13:00
+date: 2010-11-03 00:00:00 +13:00
 default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency