merb-gen/spec/fixtures/results/no_modules.test merb-gen/spec/fixtures/results/some_modules.test merb-gen/spec/fixtures/templates/no_modules.test merb-gen/spec/fixtures/templates/some_modules.test merb-gen/spec/generator_spec.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') +require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb') describe <%= full_class_name %>, "index action" do before(:each) do merb-gen/lib/generators/templates/component/controller/spec/controllers/%file_name%_spec.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "test_helper") +require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "test_helper") # Re-raise errors caught by the controller. class <%= full_class_name %>; def rescue_action(e) raise e end; end merb-gen/lib/generators/templates/component/controller/test/controllers/%file_name%_test.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') +require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb') describe Merb::<%= full_class_name %>Helper do merb-gen/lib/generators/templates/component/helper/spec/helpers/%file_name%_helper_spec.rb @@ -1,4 +1,4 @@ -require File.join( File.dirname(__FILE__), "..", "spec_helper" ) +require File.join( File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "spec_helper" ) describe <%= class_name %> do merb-gen/lib/generators/templates/component/model/spec/models/%file_name%_spec.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), '..', 'test_helper' ) +require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'test_helper' ) class <%= test_class_name %> < Test::Unit::TestCase merb-gen/lib/generators/templates/component/model/test/models/%file_name%_test.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') +require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb') describe <%= full_class_name %>, "index action" do before(:each) do merb-gen/lib/generators/templates/component/resource_controller/spec/controllers/%file_name%_spec.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "test_helper") +require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, "test_helper") # Re-raise errors caught by the controller. class <%= full_class_name %>; def rescue_action(e) raise e end; end merb-gen/lib/generators/templates/component/resource_controller/test/controllers/%file_name%_test.rb @@ -19,7 +19,9 @@ module Merb end # Inside a template, wraps a block of code properly in modules, keeping the indentation correct - # TODO: spec me + # + # @param modules<Array[#to_s]> an array of modules to use for nesting + # @option indent<Integer> number of integers to indent the modules by def with_modules(modules, options={}, &block) indent = options[:indent] || 0 text = capture(&block) @@ -32,6 +34,15 @@ module Merb concat((" " * (indent + modules.size - i - 1)) + "end # #{mod}\n", block.binding) end end + + # Returns a string of num times '..', useful for example in tests for namespaced generators + # to find the spec_helper higher up in the directory structure. + # + # @param num<Integer> number of directories up + # @return <String> concatenated string + def go_up(num) + (["'..'"] * num).join(', ') + end def self.source_root File.join(File.dirname(__FILE__), '..', 'generators', 'templates') merb-gen/lib/merb-gen/generator.rb 48f7e61b84a363c16bf7ca3be23886fa8c08e136 913ebcd3d3390bd8935121bfa2cece18ecb1b9a2 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/0232f1c07806a756e22b4a2488fe35101376020c 0232f1c07806a756e22b4a2488fe35101376020c 2008-08-08T14:35:02-07:00 2008-08-08T14:35:02-07:00 Merge branch 'go_up' * go_up: removed migration invocation from model added some documentation added go up method and specced with_modules method 20ea8a4cd47bcfe2cdbd431858e6ba45fbd02169 Michael S. Klishin michael@novemberain.com