jarrett-quarto 1.2.1 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/lib/quarto.rb

@@ -10,6 +10,7 @@ require 'quarto/config'
 require 'quarto/xml_doc'
 require 'quarto/inheritable_attributes'
 require 'quarto/url_helper'
+require 'quarto/rails_helper'
 require 'quarto/element_wrapper'
 require 'quarto/children'
 require 'quarto/rendering'

data/lib/quarto/generator.rb

@@ -130,9 +130,11 @@ module Quarto
 		def render_to_s(template, locals, options = {})
 			require urls_file_path
 			
+			mixins = [Quarto::ProjectUrls, Quarto::RailsHelper, Quarto::UrlHelper]
+			
 			page_template_path = "#{@project_path}/pages/#{template}"
 			page_template = ERB.new(File.read(page_template_path))
-			page_content = Rendering.render(page_template, locals, [Quarto::ProjectUrls])
+			page_content = Rendering.render(page_template, locals, mixins)
 			
 			if options.has_key?(:layout)
 				layout = options[:layout]
@@ -149,7 +151,7 @@ module Quarto
 				layout_template_path = "#{@project_path}/layouts/#{layout}"
 				raise ArgumentError, "Template doesn't exist: #{layout_template_path}" unless File.exists?(layout_template_path)
 				layout_template = ERB.new(File.read(layout_template_path))
-				Rendering.render(layout_template, locals, [Quarto::ProjectUrls]) do
+				Rendering.render(layout_template, locals, mixins) do
 					page_content
 				end
 			else

data/lib/quarto/rails_helper.rb

@@ -0,0 +1,7 @@
+module Quarto
+	module RailsHelper
+		def rails?
+			defined? RAILS_GEM_VERSION
+		end
+	end
+end

data/lib/quarto/rendering.rb

@@ -1,7 +1,5 @@
 module Quarto
 	class Rendering # :nodoc: all
-		include Quarto::UrlHelper
-		
 		def initialize(__erb_template, __locals, __mixins)
 			unless __erb_template.is_a?(ERB)
 				raise ArgumentError, "Expected ERB but got #{__erb_template.inspect}"

data/quarto.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quarto}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jarrett Colby"]
-  s.date = %q{2009-06-09}
+  s.date = %q{2009-06-10}
   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}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/quarto/generator.rb",
      "lib/quarto/inheritable_attributes.rb",
      "lib/quarto/init_project.rb",
+     "lib/quarto/rails_helper.rb",
      "lib/quarto/rendering.rb",
      "lib/quarto/url_helper.rb",
      "lib/quarto/xml_doc.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarrett-quarto
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jarrett Colby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-06-10 00:00:00 -07:00
 default_executable: quarto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - lib/quarto/generator.rb
 - lib/quarto/inheritable_attributes.rb
 - lib/quarto/init_project.rb
+- lib/quarto/rails_helper.rb
 - lib/quarto/rendering.rb
 - lib/quarto/url_helper.rb
 - lib/quarto/xml_doc.rb