jarrett-quarto 1.6.0 → 1.6.1

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/lib/quarto/generator.rb

@@ -76,6 +76,14 @@ module Quarto
 			@console = @options[:console]
 		end
 		
+		def self.current_output_file_path
+			@current_output_file_path
+		end
+		
+		def self.current_output_file_path=(path)
+			@current_output_file_path = path
+		end
+		
 		def urls_file_path # :nodoc:
 			@project_path + '/urls.rb'
 		end
@@ -115,17 +123,20 @@ module Quarto
 			
 			if directory.nil? or directory.empty?
 				path = "#{@output_path}/#{filename}"
+				self.class.current_output_file_path = filename
 			else
 				subdir = "#{@output_path}/#{directory}"
 				if !File.exists? subdir
 					FileUtils::mkdir_p subdir
 				end
 				path = "#{subdir}/#{filename}"
+				self.class.current_output_file_path = "#{directory}/#{filename}"
 			end
 			
 			File.open(path, 'w') do |file|
 				file.print render_to_s(template, locals, options)
 			end
+			self.class.current_output_file_path = nil
 		end
 		
 		# Renders +template+ to a string. Sets local variables within the template to the values given

data/lib/quarto/rendering.rb

@@ -1,6 +1,6 @@
 module Quarto
 	class Rendering # :nodoc: all
-		def initialize(__erb_template, __locals, __mixins, __output_file_path)
+		def initialize(__erb_template, __locals, __mixins)
 			unless __erb_template.is_a?(ERB)
 				raise ArgumentError, "Expected ERB but got #{__erb_template.inspect}"
 			end
@@ -29,19 +29,12 @@ module Quarto
 			end
 			
 			@result = __erb_template.result(__b)
-			@output_file_path = __output_file_path
 		end
 		
-		def self.render(erb_template, locals, mixins = [], output_file_path = '', &block)
-			new(erb_template, locals, mixins, output_file_path, &block).result
+		def self.render(erb_template, locals, mixins = [], &block)
+			new(erb_template, locals, mixins, &block).result
 		end
 		
 		attr_reader :result
-		
-		protected
-		
-		def output_file_path
-			@output_file_path
-		end
 	end
 end

data/lib/quarto/url_helper.rb

@@ -31,7 +31,12 @@ module Quarto
 		# the current output file is in <tt>output/employees</tt>, and you call
 		# <tt>relative_path('images/foo.jpg')</tt>, the result will be <tt>../images/foo.jpg</tt>.
 		def relative_path(path)
-			current_hierarchy = output_file_path.split('/')
+			current_hierarchy = Quarto::Generator.current_output_file_path
+			unless current_hierarchy.is_a?(String)
+				raise "Expected Quarto::Generator.current_output_file_path to be a String, but got #{current_hierarchy.inspect}"
+			end
+			current_hierarchy = current_hierarchy.split('/')
+			current_hierarchy.pop # remove the filename
 			target_hierarchy = path.split('/')
 			while current_hierarchy[0] == target_hierarchy[0]
 				current_hierarchy.shift
@@ -40,14 +45,13 @@ module Quarto
 			rel_path = current_hierarchy.inject('') do |result, dir|
 				result + '../'
 			end
-			#puts target_hierarchy.inspect
 			rel_path << target_hierarchy.join('/')
 		end
 		
 		def url_for_with_element_wrapper(options = {})
 			if options.is_a?(Quarto::ElementWrapper::Base)
 				if options.respond_to?(:to_path)
-					return options.to_path
+					return relative_path(options.to_path)
 				else
 					raise "#{options.class} must define to_path if you want to pass an instance into link_to or url_for"
 				end

data/quarto.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quarto}
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jarrett Colby"]
-  s.date = %q{2009-06-19}
+  s.date = %q{2009-06-22}
   s.default_executable = %q{quarto}
   s.description = %q{Quarto is a Ruby framework for generating collections of documents from XML. It steps in where XSLT just won't cut it. Potential applications include web sites and e-books. It's built on top of ERB and REXML.}
   s.email = %q{jarrett@uchicago.edu}

data/spec/rendering_spec.rb

@@ -42,11 +42,4 @@ describe Quarto::Rendering do
 			end
 		end
 	end
-	
-	context '#output_file_path' do
-		it 'should return the path' do
-			rendering = Quarto::Rendering.new(ERB.new('foo'), {}, [], 'bar/baz')
-			rendering.send(:output_file_path).should == 'bar/baz'
-		end
-	end
 end

data/spec/sample_project/urls.rb

@@ -3,7 +3,7 @@ module Quarto
 		include Quarto::UrlHelper
 		
 		def companies_url
-			abs_path('companies.html')
+			relative_path('companies.html')
 		end
 	end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,6 @@ Dir.glob(SPEC_DIR + '/matchers/*.rb').each do |matcher_lib|
 	require matcher_lib
 end
 
-def puts(str)
-	raise "puts('#{str}') called"
-end
+#def puts(str)
+#	raise "puts('#{str}') called"
+#end

data/spec/url_helper_spec.rb

@@ -118,12 +118,16 @@ describe Quarto::UrlHelper do
 				class TemplateOutsideRails
 					include Quarto::UrlHelper
 				end
+				
+				Quarto::Generator.current_output_file_path = ''
 			end
 			
 			after :each do
 				Object.class_eval do
 					remove_const :TemplateOutsideRails
 				end
+				
+				Quarto::Generator.current_output_file_path = nil
 			end
 			
 			it 'should be defined' do
@@ -179,6 +183,8 @@ describe Quarto::UrlHelper do
 					
 					include Quarto::UrlHelper
 				end
+				
+				Quarto::Generator.current_output_file_path = ''
 			end
 			
 			after :each do
@@ -186,6 +192,8 @@ describe Quarto::UrlHelper do
 					remove_const :RAILS_GEM_VERSION
 					remove_const :RailsTemplate
 				end
+				
+				Quarto::Generator.current_output_file_path = nil
 			end
 			
 			it 'should pass the parameter through to the Rails url_for if the parameter is not an ElementWrapper::Base' do
@@ -210,12 +218,6 @@ describe Quarto::UrlHelper do
 		before :all do
 			class MockRendering
 				include Quarto::UrlHelper
-				
-				def initialize(output_file_path)
-					@output_file_path = output_file_path
-				end
-				
-				attr_accessor :output_file_path
 			end
 		end
 		
@@ -225,25 +227,25 @@ describe Quarto::UrlHelper do
 			end
 		end
 		
-		it 'should call output_file_path' do
-			rendering = MockRendering.new('employees')
-			rendering.should_receive('output_file_path').and_return('employees')
+		it 'should call Generator.output_file_path' do
+			Quarto::Generator.current_output_file_path = 'employees'
+			Quarto::Generator.should_receive(:current_output_file_path).and_return('employees')
+			rendering = MockRendering.new
 			rendering.relative_path('images/foo.jpg')
+			Quarto::Generator.current_output_file_path = nil
 		end
 		
 		it 'should derive the correct relative path from output_file_path to the given file' do
-			rendering = MockRendering.new('employees')
-			rendering.relative_path('images/foo.jpg').should == '../images/foo.jpg'
-		end
-		
-		it 'should work for complex directory structures' do
 			[
-				['countries/companies/employees', 'assets/images/foo.jpg', '../../../assets/images/foo.jpg'],
-				['a/b/c/d/e/f', 'a/b/z', '../../../../z'],
-				['a/b/z', 'a/b/c/d/e/f', '../c/d/e/f']
+				['employees.html', 'images/foo.jpg', 'images/foo.jpg'],
+				['countries/companies/employees.html', 'assets/images/foo.jpg', '../../assets/images/foo.jpg'],
+				['a/b/c/d/e/f/g.html', 'a/b/z.html', '../../../../z.html'],
+				['a/b/y/z.html', 'a/b/c/d/e/f.gif', '../c/d/e/f.gif']
 			].each do |output_file_path, target, expected|
-				rendering = MockRendering.new(output_file_path)
+				Quarto::Generator.current_output_file_path = output_file_path
+				rendering = MockRendering.new
 				rendering.relative_path(target).should == expected
+				Quarto::Generator.current_output_file_path = nil
 			end
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarrett-quarto
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Jarrett Colby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: quarto
 dependencies: 
 - !ruby/object:Gem::Dependency