utopia 0.11.2 → 0.11.3

data/lib/utopia/link.rb

@@ -150,7 +150,7 @@ module Utopia
 			:locale => nil
 		}
 		
-		def self.index(root, top, options = {})
+		def self.index(root, top = Path.new, options = {})
 			options = DEFAULT_OPTIONS.merge(options)
 			path = File.join(root, top.components)
 			metadata = Links.metadata(path)

data/lib/utopia/middleware/content/processor.rb

@@ -38,14 +38,19 @@ module Utopia
 						@start_position = start_position
 						@current_tag = current_tag
 						@closing_tag = closing_tag
-				
-						@starting_line = @scanner.calculate_line_number(@start_pos)
-						@ending_line = @scanner.calculate_line_number
+						
+						@starting_line = Trenni::Parser.line_at_offset(@scanner.string, @start_position)
+						@ending_line = Trenni::Parser.line_at_offset(@scanner.string, @scanner.pos)
 					end
 
+					attr :scanner
+					attr :start_position
+					attr :current_tag
+					attr :closing_tag
+
 					def to_s
-						"Unbalanced Tag #{@current_tag}. " \
-						"Line #{@starting_line[0]}: #{@starting_line[4]} has been closed by #{@closing_tag} on line #{@ending_line[0]}: #{@ending_line[4]}"
+						"Unbalanced Tag Error. " \
+						"Line #{@starting_line[:line_number]}: #{@current_tag} has been closed by #{@closing_tag} on line #{@ending_line[:line_number]}!"
 					end
 				end
 

data/lib/utopia/path.rb

@@ -25,7 +25,7 @@ module Utopia
 
 		include Comparable
 
-		def initialize(components)
+		def initialize(components = [])
 			# To ensure we don't do anything stupid we freeze the components
 			@components = components.dup.freeze
 		end

data/lib/utopia/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -176,18 +176,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 312881169205834825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 312881169205834825
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24