test/example_site/pages/partials/common/_footer.html.erb @@ -12,15 +12,14 @@ class Bones end # Path to the root of the bones project - # Defaults to current directory def root - @root ||= File.expand_path(File.dirname(__FILE__) + '/../../') + @root ||= Pathname.new(__FILE__).dirname.dirname.expand_path.to_s end # Path to the bones system files - # Defaults to the directory containing this file + # Defaults to the lib def system_path - @system_path ||= File.expand_path(File.dirname(File.dirname(__FILE__))) + @system_path ||= Pathname.new(__FILE__).dirname.dirname.expand_path.to_s end # Path to the directory containing the page templates lib/bones/bones.rb @@ -1,8 +1,9 @@ require 'rubygems' require 'activesupport' require 'rack' -require File.join(File.dirname(__FILE__), 'bones.rb') -require File.join(File.dirname(__FILE__), 'extensions.rb') +require 'pathname' +require Pathname.new(__FILE__).dirname.join('bones.rb') +require Pathname.new(__FILE__).dirname.join('extensions.rb') ActiveSupport::Dependencies.load_paths.push Bones.system_path $:.push Bones.system_path lib/bones/boot.rb @@ -85,7 +85,7 @@ class Bones src = ERB.new(File.read(filename)).src src = (local_assigns_source || '') + (src || '') - @content_for_layout = eval(src) # erb.result(binding) + @content_for_layout = eval(src) if layout && File.file?(layout_filename) erb = ERB.new(File.read(layout_filename)) @@ -118,7 +118,7 @@ class Bones # the '_footer.html.erb' template. def partial(name, options={}) path = name.to_s.split('/') - path[-1] = '_' + path.last unless path.last.starts_with?('_') + path.last.gsub!(/^([^_])/, '_\1') name = path.join('/') template = Template.new(name, false, options) template.request = request lib/bones/template.rb @@ -53,7 +53,8 @@ Gem::Specification.new do |s| 'test/example_site/pages/about.html.erb', 'test/example_site/pages/index.html.erb', 'test/example_site/pages/partials', - 'test/example_site/pages/partials/_footer.html.erb', + 'test/example_site/pages/partials/common', + 'test/example_site/pages/partials/common/_footer.html.erb', 'test/example_site/pages/things', 'test/example_site/pages/things/a.html.erb', 'test/example_site/public', scharfie-bones.gemspec @@ -1,3 +1,4 @@ Example Layout <%= yield %> <%= yield :name %> +<%= partial 'partials/common/footer' %> \ No newline at end of file test/example_site/layouts/example_layout.html.erb @@ -4,6 +4,6 @@ </head> <body> <a href="/things/a">Thing A</a> - <form action="/comment"></form> + <form action="/comment"></form> </body> </html> \ No newline at end of file test/example_site/pages/index.html.erb @@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/test_helper' context 'Bones' do test "should have proper paths" do - assert_equal relative_path('../..'), Bones.root - assert_equal relative_path('../lib'), Bones.system_path - assert_equal relative_path('../../pages'), Bones.pages_path - assert_equal relative_path('../../layouts'), Bones.layouts_path + assert_equal relative_path('../lib'), Bones.root + assert_equal relative_path('../lib'), Bones.system_path + assert_equal relative_path('../lib/pages'), Bones.pages_path + assert_equal relative_path('../lib/layouts'), Bones.layouts_path end test "should allow getting/setting Bones.base" do test/test_bones.rb @@ -14,6 +14,23 @@ context "Bones::Cache with default options" do assert_include @page, 'href="/things/a.html"' end end + +context 'Bones::Cache with default options, layout' do + uses_example_site + + setup do + @cache = Bones::Cache.new + @page = @cache.process_page('about') + end + + test "should have layout" do + assert_include @page, 'Example Layout' + end + + test "should have footer" do + assert_include @page, 'Footer text' + end +end context "Bones::Cache with custom base" do uses_example_site test/test_cache.rb @@ -1,5 +1,5 @@ $:.unshift(File.dirname(__FILE__) + '/../') -require 'lib/boot' +require 'lib/bones/boot' require 'test/unit' class String @@ -18,8 +18,7 @@ end def context(name, &block) Object.const_set(name.to_s.to_test_class_name, Class.new(Test::Unit::TestCase, &block)) -end - +end class Test::Unit::TestCase class << self; attr_accessor :bones_root; end @@ -38,7 +37,7 @@ class Test::Unit::TestCase # end def self.uses_example_site - self.bones_root = File.expand_path(File.dirname(__FILE__) / 'example_site') + self.bones_root = Pathname.new(__FILE__).dirname.join('example_site').expand_path.to_s end def run_with_bones_root(*args, &block) @@ -56,10 +55,11 @@ class Test::Unit::TestCase end def relative_path(path) - File.expand_path(File.dirname(__FILE__) / path) + Pathname.new(__FILE__).dirname.join(path).expand_path.to_s end def assert_include(collection, obj, message=nil) + message ||= "expected #{collection.inspect} to include #{obj.inspect}" assert collection.include?(obj), message end end test/test_helper.rb @@ -31,8 +31,9 @@ context "Bones Template" do assert_include @template.some_custom_helper, 'Some custom helper' end - test "should render partial partials/footer" do - assert_include @template.partial('partials/footer'), 'Footer text' + test "should render partial partials/common/footer" do + # @template.layout = 'example_layout' + assert_include @template.partial('partials/common/footer'), 'Footer text' end end test/test_template.rb test/example_site/pages/partials/_footer.html.erb 5da4769c7a50d6bf12e5413a11c85d23ad15c44a Chris Scharf scharfie@gmail.com http://github.com/scharfie/bones/commit/a5579ed2f9f3417b152625b6bdce044f78ac8920 a5579ed2f9f3417b152625b6bdce044f78ac8920

2009-10-25T03:37:06-07:00

testing 8335669af1f8a981c5dc238b68d0124906649d4c Chris Scharf scharfie@gmail.com