utopia 0.9.22 → 0.9.23

data/lib/utopia/link.rb

@@ -21,6 +21,8 @@ module Utopia
 		XNODE_EXT = ".xnode"
 
 		def initialize(kind, path, info = nil)
+			path = Path.create(path)
+
 			@kind = kind
 
 			case @kind
@@ -36,7 +38,8 @@ module Utopia
 			end
 
 			@components = @name.split(".")
-			@locale = components[1..-1].join(".")
+			@locale = path.locale(XNODE_EXT)
+
 			@title = components[0]
 
 			if info
@@ -211,8 +214,8 @@ module Utopia
 				links.group_by(&:name).each do |name, links|
 					default = nil
 
-					link = links.reject{|link|
-						!(link.locale == options[:locale] || link.locale == "")
+					link = links.select{|link|
+						link.locale == options[:locale] || link.locale == ''
 					}.sort_by{|link| link.locale.size}.last
 
 					if link

data/lib/utopia/path.rb

@@ -188,6 +188,28 @@ module Utopia
 		def hash
 			@components.hash
 		end
+
+		def last
+			if directory?
+				components[-2]
+			else
+				components[-1]
+			end
+		end
+
+		def self.locale(name, extension = false)
+			if String === extension
+				name = File.basename(name, extension)
+			elsif extension
+				name = name.split
+			end
+			
+			name.split(".")[1..-1].join(".")
+		end
+		
+		def locale (extension = false)
+			return Path.locale(last, extension)
+		end
 	end
 	
 end

data/lib/utopia/version.rb

@@ -17,7 +17,7 @@ module Utopia
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 22
+    TINY  = 23
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 23
+  version: 0.9.23
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +13:00
+date: 2010-04-15 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency