utopia 0.9.56 → 0.9.57

data/lib/utopia.rb

@@ -14,3 +14,8 @@
 #
 #	You should have received a copy of the GNU Affero General Public License along with this
 #	program. If not, see <http://www.gnu.org/licenses/>.
+
+require 'utopia/version'
+
+module Utopia
+end

data/lib/utopia/extensions/date.rb

@@ -2,19 +2,66 @@
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 
+# These amendments allow for Date <=> DateTime <=> Time, and so on.
+# Use only if required. This implementation works for Ruby 1.9.2.
+
 require 'date'
 
 class Date
-	alias_method :old_cmp, :<=>
+	alias_method :old_compare, :<=>
+	
+	def <=>(other)
+		if other.class == Date
+			old_compare(other)
+		else
+			if Time === other
+				other = other.to_datetime
+			end
+			
+		 	if DateTime === other
+				result = old_compare(other.to_date)
+				if result == 0 && other.day_fraction > 0
+					-1
+				else
+					result
+				end
+			end
+		end
+	end
+end
+
+class Time
+	alias_method :old_compare, :<=>
 	
-	def <=> (other)
-		# Comparing a Date with something that has a time component truncates the time
-		# component, thus we need to check if the other object has a more exact comparison
-		# function.
-		if other.respond_to?(:hour)
-			return (other <=> self) * -1
+	def <=>(other)
+		if other.class == Date
+			(other <=> self) * -1
+		elsif Time === other
+			old_compare(other)
 		else
-			old_cmp(other)
+			if DateTime === other
+				other = other.to_time
+			end
+			
+			old_compare(other)
 		end
-	end	
+	end
 end
+
+class DateTime
+	alias_method :old_compare, :<=>
+	
+	def <=>(other)
+		if other.class == Date
+			(other <=> self) * -1
+		elsif DateTime === other
+			old_compare(other)
+		else
+			if Time === other
+				other = other.to_datetime
+			end
+			
+			old_compare(other)
+		end
+	end
+end

data/lib/utopia/link.rb

@@ -4,7 +4,6 @@
 
 require 'yaml'
 
-require 'utopia/extensions/date'
 require 'utopia/extensions/string'
 require 'utopia/extensions/hash'
 require 'utopia/extensions/array'

data/lib/utopia/middleware/all.rb

@@ -4,7 +4,9 @@
 
 require 'pathname'
 
-Pathname.new(__FILE__).dirname.entries.grep(/\.rb$/).each do |path|
+Pathname.new(__FILE__).dirname.entries.each do |path|
+	next unless /\.rb$/ === path.to_s
+
 	name = File.basename(path.to_s, ".rb")
 	
 	if name != "all"

data/lib/utopia/middleware/requester.rb

@@ -98,6 +98,11 @@ module Utopia
 				}
 				request(env.merge(path_env))
 			end
+
+			# Avoid a huge amount of junk being printed when inspecting +env+.
+			def inspect
+				to_s
+			end
 		end
 
 	end

data/lib/utopia/middleware/static.rb

@@ -175,6 +175,7 @@ module Utopia
 					
 					# Fix a problem if the browser request has multiple @rel@
 					# This normally indicates a browser bug.. :(
+					name = name.dup
 					name.delete("@rel@")
 				else
 					path = path.dirname

data/lib/utopia/tags.rb

@@ -11,7 +11,7 @@ module Utopia
 		end
 		
 		def self.create(name, &block)
-			@@all[name] = Proc.new(&block)
+			@@all[name] = block
 		end
 		
 		def self.all

data/lib/utopia/tags/all.rb

@@ -4,7 +4,9 @@
 
 require 'pathname'
 
-Pathname.new(__FILE__).dirname.entries.grep(/\.rb$/).each do |path|
+Pathname.new(__FILE__).dirname.entries.each do |path|
+	next unless /\.rb$/ === path.to_s
+	
 	name = File.basename(path.to_s, ".rb")
 	
 	if name != "all"

data/lib/utopia/tags/google_analytics.rb

@@ -6,19 +6,14 @@ require 'utopia/tags'
 
 Utopia::Tags.create("google_analytics") do |transaction, state|
 	html = <<EOF
-<!-- Google Analytics -->
-
 <script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+	var _gaq = _gaq || []; _gaq.push(['_setAccount', #{state[:id].to_quoted_string}]); _gaq.push(['_trackPageview']);
+	(function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	})();
 </script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker(#{state[:id].dump});
-pageTracker._trackPageview();
-} catch(err) {}</script>
-
-<!-- Google Analytics -->
 EOF
 
 

data/lib/utopia/time_store.rb

@@ -35,7 +35,7 @@ module Utopia
 				@header = []
 			end
 
-			diff = (Set.new(header) + "time") - @header
+			diff = (Set.new(header) + ["time"]) - @header
 
 			if diff.size
 				@header += diff.to_a.sort

data/lib/utopia/version.rb

@@ -3,11 +3,11 @@
 #	See <utopia.rb> for licensing details.
 
 module Utopia
-  module VERSION
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 56
+	module VERSION
+		MAJOR = 0
+		MINOR = 9
+		TINY  = 57
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
+		STRING = [MAJOR, MINOR, TINY].join('.')
+	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: 
   segments: 
   - 0
   - 9
-  - 56
-  version: 0.9.56
+  - 57
+  version: 0.9.57
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +12:00
-default_executable: utopia
+date: 2011-08-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -156,7 +155,6 @@ files:
 - lib/utopia/xnode.rb
 - lib/utopia.rb
 - bin/utopia
-has_rdoc: true
 homepage: http://www.oriontransfer.co.nz/software/utopia
 licenses: []
 
@@ -186,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Utopia is a framework for building websites.