Skip to content

Commit

Permalink
Merge commit 'me/check_generators' into check_generators
Browse files Browse the repository at this point in the history
  • Loading branch information
drnic committed May 17, 2008
2 parents 0830ba7 + 5e2661f commit eb58431
Show file tree
Hide file tree
Showing 87 changed files with 199 additions and 87 deletions.
166 changes: 86 additions & 80 deletions hobo/Manifest
Original file line number Diff line number Diff line change
@@ -1,85 +1,5 @@
bin/hobo
CHANGES.txt
generators/hobo/hobo_generator.rb
generators/hobo/templates/application.dryml
generators/hobo/templates/dryml-support.js
generators/hobo/templates/guest.rb
generators/hobo_front_controller/hobo_front_controller_generator.rb
generators/hobo_front_controller/templates/controller.rb
generators/hobo_front_controller/templates/functional_test.rb
generators/hobo_front_controller/templates/helper.rb
generators/hobo_front_controller/templates/index.dryml
generators/hobo_front_controller/templates/search.dryml
generators/hobo_front_controller/USAGE
generators/hobo_model/hobo_model_generator.rb
generators/hobo_model/templates/fixtures.yml
generators/hobo_model/templates/model.rb
generators/hobo_model/templates/unit_test.rb
generators/hobo_model/USAGE
generators/hobo_model_controller/hobo_model_controller_generator.rb
generators/hobo_model_controller/templates/controller.rb
generators/hobo_model_controller/templates/functional_test.rb
generators/hobo_model_controller/templates/helper.rb
generators/hobo_model_controller/USAGE
generators/hobo_model_resource/hobo_model_resource_generator.rb
generators/hobo_model_resource/templates/controller.rb
generators/hobo_model_resource/templates/functional_test.rb
generators/hobo_model_resource/templates/helper.rb
generators/hobo_rapid/hobo_rapid_generator.rb
generators/hobo_rapid/templates/hobo-rapid.css
generators/hobo_rapid/templates/hobo-rapid.js
generators/hobo_rapid/templates/IE7.js
generators/hobo_rapid/templates/lowpro.js
generators/hobo_rapid/templates/reset.css
generators/hobo_rapid/templates/themes/clean/public/images/fieldbg.gif
generators/hobo_rapid/templates/themes/clean/public/images/pencil.png
generators/hobo_rapid/templates/themes/clean/public/images/small_close.png
generators/hobo_rapid/templates/themes/clean/public/images/spinner.gif
generators/hobo_rapid/templates/themes/clean/public/stylesheets/clean.css
generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid-ui.css
generators/hobo_rapid/templates/themes/clean/views/clean.dryml
generators/hobo_rapid/templates/themes/default/public/images/banner.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-bodytop.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-01.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-02.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-03.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-04.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-bottom.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-left.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-right.gif
generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-top.gif
generators/hobo_rapid/templates/themes/default/public/images/header-blue.gif
generators/hobo_rapid/templates/themes/default/public/images/header-dblue.gif
generators/hobo_rapid/templates/themes/default/public/images/header-green.gif
generators/hobo_rapid/templates/themes/default/public/images/header-purple.gif
generators/hobo_rapid/templates/themes/default/public/images/header-red.gif
generators/hobo_rapid/templates/themes/default/public/images/logo.gif
generators/hobo_rapid/templates/themes/default/public/images/plus.png
generators/hobo_rapid/templates/themes/default/public/images/spinner.gif
generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-dblue.gif
generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-green.gif
generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-purple.gif
generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-red.gif
generators/hobo_rapid/templates/themes/default/public/images/window-corner-01.gif
generators/hobo_rapid/templates/themes/default/public/images/window-corner-02.gif
generators/hobo_rapid/templates/themes/default/public/images/window-corner-03.gif
generators/hobo_rapid/templates/themes/default/public/images/window-corner-04.gif
generators/hobo_rapid/templates/themes/default/public/images/window-shadow-bottom.gif
generators/hobo_rapid/templates/themes/default/public/images/window-shadow-left.gif
generators/hobo_rapid/templates/themes/default/public/images/window-shadow-right.gif
generators/hobo_rapid/templates/themes/default/public/images/window-shadow-top.gif
generators/hobo_rapid/templates/themes/default/public/stylesheets/application.css
generators/hobo_rapid/templates/themes/default/views/application.dryml
generators/hobo_user_controller/hobo_user_controller_generator.rb
generators/hobo_user_controller/templates/controller.rb
generators/hobo_user_controller/templates/functional_test.rb
generators/hobo_user_controller/templates/helper.rb
generators/hobo_user_controller/USAGE
generators/hobo_user_model/hobo_user_model_generator.rb
generators/hobo_user_model/templates/fixtures.yml
generators/hobo_user_model/templates/model.rb
generators/hobo_user_model/templates/unit_test.rb
generators/hobo_user_model/USAGE
init.rb
lib/action_view_extensions/base.rb
lib/active_record/association_proxy.rb
Expand Down Expand Up @@ -134,7 +54,90 @@ lib/hobo/user_controller.rb
lib/hobo.rb
LICENSE.txt
Manifest
rails_generators/hobo/hobo_generator.rb
rails_generators/hobo/templates/application.dryml
rails_generators/hobo/templates/dryml-support.js
rails_generators/hobo/templates/guest.rb
rails_generators/hobo_front_controller/hobo_front_controller_generator.rb
rails_generators/hobo_front_controller/templates/controller.rb
rails_generators/hobo_front_controller/templates/functional_test.rb
rails_generators/hobo_front_controller/templates/helper.rb
rails_generators/hobo_front_controller/templates/index.dryml
rails_generators/hobo_front_controller/templates/search.dryml
rails_generators/hobo_front_controller/USAGE
rails_generators/hobo_model/hobo_model_generator.rb
rails_generators/hobo_model/templates/fixtures.yml
rails_generators/hobo_model/templates/model.rb
rails_generators/hobo_model/templates/unit_test.rb
rails_generators/hobo_model/USAGE
rails_generators/hobo_model_controller/hobo_model_controller_generator.rb
rails_generators/hobo_model_controller/templates/controller.rb
rails_generators/hobo_model_controller/templates/functional_test.rb
rails_generators/hobo_model_controller/templates/helper.rb
rails_generators/hobo_model_controller/templates/view.html.erb
rails_generators/hobo_model_controller/USAGE
rails_generators/hobo_model_resource/hobo_model_resource_generator.rb
rails_generators/hobo_model_resource/templates/controller.rb
rails_generators/hobo_model_resource/templates/functional_test.rb
rails_generators/hobo_model_resource/templates/helper.rb
rails_generators/hobo_rapid/hobo_rapid_generator.rb
rails_generators/hobo_rapid/templates/hobo-rapid.css
rails_generators/hobo_rapid/templates/hobo-rapid.js
rails_generators/hobo_rapid/templates/IE7.js
rails_generators/hobo_rapid/templates/lowpro.js
rails_generators/hobo_rapid/templates/reset.css
rails_generators/hobo_rapid/templates/themes/clean/public/images/fieldbg.gif
rails_generators/hobo_rapid/templates/themes/clean/public/images/pencil.png
rails_generators/hobo_rapid/templates/themes/clean/public/images/small_close.png
rails_generators/hobo_rapid/templates/themes/clean/public/images/spinner.gif
rails_generators/hobo_rapid/templates/themes/clean/public/stylesheets/clean.css
rails_generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid-ui.css
rails_generators/hobo_rapid/templates/themes/clean/views/clean.dryml
rails_generators/hobo_rapid/templates/themes/default/public/images/banner.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-bodytop.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-01.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-02.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-03.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-corner-04.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-bottom.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-left.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-right.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/bkg-shadow-top.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/header-blue.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/header-dblue.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/header-green.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/header-purple.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/header-red.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/logo.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/plus.png
rails_generators/hobo_rapid/templates/themes/default/public/images/spinner.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-dblue.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-green.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-purple.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/txt-list-img-red.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-corner-01.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-corner-02.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-corner-03.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-corner-04.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-shadow-bottom.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-shadow-left.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-shadow-right.gif
rails_generators/hobo_rapid/templates/themes/default/public/images/window-shadow-top.gif
rails_generators/hobo_rapid/templates/themes/default/public/stylesheets/application.css
rails_generators/hobo_rapid/templates/themes/default/views/application.dryml
rails_generators/hobo_user_controller/hobo_user_controller_generator.rb
rails_generators/hobo_user_controller/templates/controller.rb
rails_generators/hobo_user_controller/templates/functional_test.rb
rails_generators/hobo_user_controller/templates/helper.rb
rails_generators/hobo_user_controller/USAGE
rails_generators/hobo_user_model/hobo_user_model_generator.rb
rails_generators/hobo_user_model/templates/fixtures.yml
rails_generators/hobo_user_model/templates/model.rb
rails_generators/hobo_user_model/templates/unit_test.rb
rails_generators/hobo_user_model/USAGE
README
script/destroy
script/generate
taglibs/core.dryml
taglibs/rapid.dryml
taglibs/rapid_document_tags.dryml
Expand All @@ -151,4 +154,7 @@ tasks/environments.rake
tasks/fix_dryml.rake
tasks/generate_tag_reference.rb
tasks/hobo_tasks.rake
test/test_generator_helper.rb
test/test_helper.rb
test/test_hobo_model_controller_generator.rb
uninstall.rb
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ def manifest
File.join('app/helpers',
class_path,
"#{file_name}_helper.rb")

# View template for each action.
actions.each do |action|
path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
m.template 'view.rhtml', path,
:assigns => { :action => action, :path => path }
end
end
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h1><%= class_name %>#<%= action %></h1>
<p>Find me in <%= path %></p>
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions hobo/script/destroy
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env ruby
APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))

begin
require 'rubigen'
rescue LoadError
require 'rubygems'
require 'rubigen'
end
require 'rubigen/scripts/destroy'

ARGV.shift if ['--help', '-h'].include?(ARGV[0])
RubiGen::Base.use_component_sources! [:rubygems, :test_unit]
RubiGen::Scripts::Destroy.new.run(ARGV)
14 changes: 14 additions & 0 deletions hobo/script/generate
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env ruby
APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))

begin
require 'rubigen'
rescue LoadError
require 'rubygems'
require 'rubigen'
end
require 'rubigen/scripts/generate'

ARGV.shift if ['--help', '-h'].include?(ARGV[0])
RubiGen::Base.use_component_sources! [:rubygems, :test_unit]
RubiGen::Scripts::Generate.new.run(ARGV)
29 changes: 29 additions & 0 deletions hobo/test/test_generator_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
begin
require File.dirname(__FILE__) + '/test_helper'
rescue LoadError
require 'test/unit'
end
require 'fileutils'

# Must set before requiring generator libs.
TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
app_root = File.join(TMP_ROOT, PROJECT_NAME)
if defined?(APP_ROOT)
APP_ROOT.replace(app_root)
else
APP_ROOT = app_root
end
if defined?(RAILS_ROOT)
RAILS_ROOT.replace(app_root)
else
RAILS_ROOT = app_root
end

begin
require 'rubigen'
rescue LoadError
require 'rubygems'
require 'rubigen'
end
require 'rubigen/helpers/generator_test_helper'
1 change: 1 addition & 0 deletions hobo/test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require 'test/unit'
53 changes: 53 additions & 0 deletions hobo/test/test_hobo_model_controller_generator.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
require File.join(File.dirname(__FILE__), "test_generator_helper.rb")

require 'rails_generator'

class TestHoboModelControllerGenerator < Test::Unit::TestCase
include RubiGen::GeneratorTestHelper

def setup
bare_setup
end

def teardown
bare_teardown
end

# Some generator-related assertions:
# assert_generated_file(name, &block) # block passed the file contents
# assert_directory_exists(name)
# assert_generated_class(name, &block)
# assert_generated_module(name, &block)
# assert_generated_test_for(name, &block)
# The assert_generated_(class|module|test_for) &block is passed the body of the class/module within the file
# assert_has_method(body, *methods) # check that the body has a list of methods (methods with parentheses not supported yet)
#
# Other helper methods are:
# app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
# bare_setup - place this in setup method to create the APP_ROOT folder for each test
# bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test

def test_generator_without_options
name = "MyModel"
run_generator('hobo_model_controller', [name], sources)
assert_directory_exists 'app/controllers'
assert_directory_exists 'app/helpers'
assert_directory_exists 'app/views'
assert_directory_exists 'test/functional'

assert_generated_file 'app/controllers/my_models_controller.rb'
assert_generated_class 'app/controllers/my_models_controller'
assert_generated_file 'app/helpers/my_models_helper.rb'
assert_generated_file 'test/functional/my_models_controller_test.rb'
end

private
def sources
[RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
]
end

def generator_path
"rails_generators"
end
end

0 comments on commit eb58431

Please sign in to comment.