utopia 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ace1eb6c636da91d00f8eee84b9dcaf839f817
-  data.tar.gz: 27d8124f0df0d66189d9230cce119db1a39901cd
+  metadata.gz: e53e0a1f210f0c4e8e14ff4f7e1cf21bbc705f18
+  data.tar.gz: 3756ebee30e3b76f4712d7f129aecdf943d60931
 SHA512:
-  metadata.gz: 1ccc85d249b116d20fcba8403244b8d466aecfe527cf0a13aa79b19ee78e162c6acd9e458a40bf5064dae17b2108c0b4bd851ca2e4fc06a7e84990db148abeac
-  data.tar.gz: 5e95784314d4c28253714caac80b9efec859f988bf908784da15d65c2d460623ee2607505a93b931b392558b7bbfe41c328814cd1631a6979a024016931dd062
+  metadata.gz: f751489f085bf36b52d6a0b842e127f56d1061d0050f1452ae9798d2deadd2fdef426c254a1ec15a7f06715ef01e56a5c78c2e5abea095f7cbd89c925d136776
+  data.tar.gz: 679a51d33577028c5fdc27a66498617e9b5e4f764a483a387f9b005df33c6ded2439cebb8ba6f30be0a6c9d670694407289d22681553b916816328517dfa47e3

data/lib/utopia/content.rb

@@ -42,10 +42,18 @@ module Utopia
 			end
 			
 			@tags = options.fetch(:tags, {})
+			
+			self.freeze
+		end
+
+		def freeze
+			@root.freeze
+			@tags.freeze
+			
+			super
 		end
 
 		attr :root
-		attr :passthrough
 
 		def fetch_xml(path)
 			if @templates

data/lib/utopia/controller/base.rb

@@ -36,6 +36,15 @@ module Utopia
 			end
 			
 			class << self
+				def freeze
+					# This ensures that all class variables are frozen.
+					self.instance_variables.each do |name|
+						self.instance_variable_get(name).freeze
+					end
+					
+					super
+				end
+				
 				def direct?(path)
 					path.dirname == uri_path
 				end

data/lib/utopia/controller/rewrite.rb

@@ -35,6 +35,15 @@ module Utopia
 				def initialize(arguments, block)
 					@arguments = arguments
 					@block = block
+					
+					self.freeze
+				end
+				
+				def freeze
+					@arguments.freeze
+					@block.freeze
+					
+					super
 				end
 				
 				attr :arguments
@@ -48,9 +57,19 @@ module Utopia
 			end
 			
 			class ExtractPrefixRule < Rule
-				def apply(context, request, path)
-					@matcher ||= Path::Matcher.new(@arguments)
+				def initialize(arguments, block)
+					@matcher = Path::Matcher.new(arguments)
 					
+					super
+				end
+				
+				def freeze
+					@matcher.freeze
+					
+					super
+				end
+				
+				def apply(context, request, path)
 					if match_data = @matcher.match(path)
 						apply_match_to_context(match_data, context)
 						

data/lib/utopia/controller.rb

@@ -57,6 +57,12 @@ module Utopia
 		
 		attr :app
 		
+		def freeze
+			@root.freeze
+			
+			super
+		end
+		
 		def lookup_controller(path)
 			if @controllers
 				@controllers.fetch_or_store(path.to_s) do
@@ -90,6 +96,10 @@ module Utopia
 				# Give the controller a useful name:
 				# Controllers.define(klass)
 				
+				# We lock down the controller class to prevent unsafe modifications:
+				klass.freeze
+				
+				# Create an instance of the controller:
 				return klass.new
 			else
 				return nil

data/lib/utopia/exception_handler.rb

@@ -26,8 +26,16 @@ module Utopia
 	class ExceptionHandler
 		def initialize(app, location)
 			@app = app
-
+			
 			@location = location
+			
+			self.freeze
+		end
+
+		def freeze
+			@location.freeze
+			
+			super
 		end
 
 		def fatal_error(env, exception)

data/lib/utopia/localization.rb

@@ -86,8 +86,20 @@ module Utopia
 			@nonlocalized = options.fetch(:nonlocalized, [])
 			
 			# puts "All:#{@all_locales.inspect} defaults:#{@default_locales.inspect} default:#{default_locale}"
+			
+			self.freeze
 		end
-
+		
+		def freeze
+			@all_locale.freeze
+			@default_locales.freeze
+			@default_locale.freeze
+			@hosts.freeze
+			@nonlocalized.freeze
+			
+			super
+		end
+		
 		attr :all_locales
 		attr :default_locale
 		

data/lib/utopia/redirector.rb

@@ -37,7 +37,7 @@ module Utopia
 
 	class Redirector
 		# This redirects directories to the directory + 'index' 
-		DIRECTORY_INDEX = [/^(.*)\/$/, lambda{|prefix| [307, {HTTP::LOCATION => "#{prefix}index"}, []]}]
+		DIRECTORY_INDEX = [/^(.*)\/$/, lambda{|prefix| [307, {HTTP::LOCATION => "#{prefix}index"}, []]}].freeze
 		
 		# Redirects a whole source tree to a destination tree, given by the roots.
 		def self.moved(source_root, destination_root)
@@ -76,9 +76,9 @@ module Utopia
 			normalized = []
 			
 			patterns.each do |pattern|
-				uri = pattern.pop
+				*keys, uri = *pattern
 				
-				pattern.each do |key|
+				keys.each do |key|
 					normalized.push([key, uri])
 				end
 			end
@@ -106,6 +106,16 @@ module Utopia
 			@patterns = normalize_patterns(@patterns)
 
 			@errors = options[:errors]
+			
+			self.freeze
+		end
+
+		def freeze
+			@strings.freeze
+			@patterns.freeze
+			@errors.freeze
+			
+			super
 		end
 
 		def redirect(uri, match_data)

data/lib/utopia/static.rb

@@ -196,7 +196,7 @@ module Utopia
 
 		def initialize(app, **options)
 			@app = app
-			@root = options[:root] || Utopia::default_root
+			@root = (options[:root] || Utopia::default_root).freeze
 
 			if options[:types]
 				@extensions = load_mime_types(options[:types])
@@ -204,7 +204,17 @@ module Utopia
 				@extensions = load_mime_types(MIME_TYPES[:default])
 			end
 
-			@cache_control = options[:cache_control] || "public, max-age=3600"
+			@cache_control = (options[:cache_control] || "public, max-age=3600")
+			
+			self.freeze
+		end
+
+		def freeze
+			@root.freeze
+			@extensions.freeze
+			@cache_control.freeze
+			
+			super
 		end
 
 		def fetch_file(path)

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "1.2.0"
+	VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni