app_generators/sinatra_app/templates/lib/app.rb.erb @@ -1,2 +1,4 @@ tmp/* -pkg* \ No newline at end of file +pkg* +_layouts +_site \ No newline at end of file .gitignore @@ -1,4 +1,4 @@ -%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f } +%w[rubygems rake rake/clean hoe fileutils newgem rubigen].each { |f| require f } require File.dirname(__FILE__) + '/lib/sinatra-gen' # Generate all the Rake tasks Rakefile @@ -49,7 +49,6 @@ class SinatraAppGenerator < RubiGen::Base end m.template 'config.ru.erb', 'config.ru' - m.template 'app.rb.erb' , "#{app_name}.rb" m.template 'Rakefile.erb' , 'Rakefile' test_dir = (tests_are_specs? ? 'spec' : 'test') @@ -58,12 +57,14 @@ class SinatraAppGenerator < RubiGen::Base BASEDIRS.each { |path| m.directory path } m.directory test_dir m.file 'config.yml', 'config.yml' - m.template 'lib/module.rb.erb', "lib/#{app_name}.rb" + m.template 'lib/app.rb.erb', "lib/#{app_name}.rb" m.template 'test/test_helper.rb.erb', "#{test_dir}/#{test_dir}_helper.rb" m.template "test/test_app_#{test_framework}.rb.erb", "#{test_dir}/#{(tests_are_specs? ? "#{app_name}_spec" : "test_#{app_name}")}.rb" m.template "views/#{view_framework}_index.erb", "views/index.#{view_framework}" m.template "views/#{view_framework}_layout.erb", "views/layout.#{view_framework}" unless view_framework == 'builder' + else + m.template "lib/app.rb.erb", "#{app_name}.rb" end if vendor @@ -137,6 +138,10 @@ class SinatraAppGenerator < RubiGen::Base app_name.classify end + def app_klass + tiny ? "Sinatra::Application" : klass_name + end + def parse_actions(*action_args) @actions = action_args.flatten.collect { |a| a.split(':', 2) } end app_generators/sinatra_app/sinatra_app_generator.rb @@ -1,8 +1,8 @@ # To use with thin # thin start -p PORT -R config.ru -require File.join(File.dirname(__FILE__), '<%= app_name %>.rb') +require File.join(File.dirname(__FILE__), <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb') disable :run set :environment, :production -run Sinatra::Application \ No newline at end of file +run <%= app_klass -%> \ No newline at end of file app_generators/sinatra_app/templates/config.ru.erb @@ -4,14 +4,14 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra', 'lib') require 'sinatra' require 'rack/test' -Sinatra::Default.set( +<%= app_klass -%>.set( :environment => :test, :run => false, :raise_errors => true, :logging => false ) -require File.join(File.dirname(__FILE__), '..', '<%= app_name %>.rb') +require File.join(File.dirname(__FILE__), '..', <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb') module TestHelper app_generators/sinatra_app/templates/test/test_helper.rb.erb @@ -115,10 +115,10 @@ class TestSinatraAppGenerator < Test::Unit::TestCase end end - def test_generate_app_with_views_haml_option + def test_generate_app_with_views_erb_option run_generator('sinatra_app', [APP_ROOT, '--views=erb'], sources) assert_basic_paths_and_files('spec') - assert_generated_file "#{app_name}.rb" do |app_contents| + assert_generated_file "lib/#{app_name}.rb" do |app_contents| assert_match(/erb \:index/, app_contents) end assert_generated_file 'views/layout.erb' @@ -128,7 +128,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase def test_generate_app_with_views_haml_option run_generator('sinatra_app', [APP_ROOT, '--views=haml'], sources) assert_basic_paths_and_files('spec') - assert_generated_file "#{app_name}.rb" do |app_contents| + assert_generated_file "lib/#{app_name}.rb" do |app_contents| assert_match(/haml \:index/, app_contents) end assert_generated_file 'views/layout.haml' @@ -138,7 +138,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase def test_generate_app_with_views_builder_option run_generator('sinatra_app', [APP_ROOT, '--views=builder'], sources) assert_basic_paths_and_files('spec') - assert_generated_file "#{app_name}.rb" do |app_contents| + assert_generated_file "lib/#{app_name}.rb" do |app_contents| assert_match(/builder \:index/, app_contents) end assert_generated_file 'views/index.builder' @@ -155,7 +155,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase def test_generate_app_with_actions_and_no_options run_generator('sinatra_app', [APP_ROOT, 'get:/', 'post:/users/:id', 'put:/users/*'], sources) assert_basic_paths_and_files('spec') - assert_generated_file "#{app_name}.rb" do |app_contents| + assert_generated_file "lib/#{app_name}.rb" do |app_contents| assert_match(/get '\/' do/, app_contents) assert_match(/post '\/users\/\:id' do/, app_contents) assert_match(/put '\/users\/\*' do/, app_contents) @@ -165,7 +165,6 @@ class TestSinatraAppGenerator < Test::Unit::TestCase def test_generate_app_with_actions_and_options run_generator('sinatra_app', [APP_ROOT, 'get:/', 'post:/users/:id', '--tiny', 'put:/users/*'], sources) assert_generated_file 'config.ru' - assert_generated_file "#{app_name}.rb" assert_generated_file 'Rakefile' assert_generated_file "#{app_name}.rb" do |app_contents| assert_match(/get '\/' do/, app_contents) @@ -181,10 +180,9 @@ class TestSinatraAppGenerator < Test::Unit::TestCase assert_directory_exists 'public' assert_directory_exists 'views' assert_generated_file 'config.ru' - assert_generated_file "#{app_name}.rb" assert_generated_file 'Rakefile' assert_generated_file 'config.yml' - assert_generated_module "lib/#{app_name}" + assert_generated_class "lib/#{app_name}" end test/test_sinatra_app_generator.rb app_generators/sinatra_app/templates/app.rb.erb app_generators/sinatra_app/templates/lib/module.rb.erb 06fd8892eae55f89a00951f3f9b0f0f070f44988 Aaron Quint aaron@quirkey.com http://github.com/quirkey/sinatra-gen/commit/d4056b705f0ce53b5a52a58654e21975fec342ed d4056b705f0ce53b5a52a58654e21975fec342ed 2009-08-13T12:51:17-07:00 2009-08-13T12:51:17-07:00 Unless --tiny is specified generate an app that < Sinatra::Application 754d2d8ff0f26e31229a32dfc0c3d143223d19fa Aaron Quint aaron@quirkey.com