Merge branch 'drnic'

Fixed conflicts in:

	hobo/lib/hobo/dryml.rb
	hobo/lib/hobo/model_controller.rb

doctest/lifecycles.rdoctest

@@ -100,7 +100,7 @@ We can test which transitions are available:
 	>> f.lifecycle.available_transitions_for(tom).*.name
 	=> []
 	>> f.lifecycle.available_transitions_for(bob).*.name
-	["accept", "reject"]
+	=> ["accept", "reject"]
 	>> f.lifecycle.can_accept?(tom)
 	=> false
 	>> f.lifecycle.can_reject?(tom)

hobo/bin/hobo

@@ -64,7 +64,7 @@ end
 puts "\nGenerating Rails app...\n"
 opts = []
 opts << "-d #{database_type}" if database_type
-system("rails #{opts * ' '} #{app_path}")
+system("rails _2.0.2_ #{opts * ' '} #{app_path}")
 
 
 Dir.chdir(app_path) do

hobo/lib/hobo.rb

@@ -6,6 +6,9 @@
 rescue MissingSourceFile
   # OK, Hobo won't do pagination then
 end
+require "active_record"
+require "action_controller"
+require "action_view"
 
 Dependencies.load_paths |= [ File.dirname(__FILE__) ]
 

hobo/lib/hobo/lifecycles.rb

@@ -1,3 +1,5 @@
+%w[lifecycle actions creator state transition].each { |lib| require "hobo/lifecycles/#{lib}" }
+
 module Hobo
 
   module Lifecycles

hobo/lib/hobo/model_controller.rb

@@ -143,12 +143,6 @@ def reorder; hobo_reorder end if include_action?(:reorder)
       end
 
 
-      def def_auto_action(name, &block)
-        define_method name, &block if name.not_in?(instance_methods) && include_action?(name)
-      end
-
-
-
       def def_auto_action(name, &block)
         define_method name, &block if name.not_in?(instance_methods) && include_action?(name)
       end

hobo/rails_generators/hobo_model_controller/templates/controller.rb

@@ -2,6 +2,7 @@ class <%= class_name %>Controller < ApplicationController
 
   hobo_model_controller
 
+  # changes require server restart
   auto_actions :all
 
 end

hobo/rails_generators/hobo_model_resource/templates/controller.rb

@@ -2,6 +2,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   hobo_model_controller
 
+  # changes require server restart
   auto_actions :all
 
 end

hobo/tasks/hobo_tasks.rake

@@ -2,9 +2,9 @@ namespace :hobo do
 
   desc "Replace commonly used hobo assets with symlinks into the plugin so that they stay up to date"
   task :symlink_assets do
-    
+
     Dir.chdir("#{RAILS_ROOT}/public") do
-      Dir.chdir("javascripts") do 
+      Dir.chdir("javascripts") do
         puts "hobo-rapid.js"
         `rm -f hobo-rapid.js`
         `ln -s ../../vendor/plugins/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js`
@@ -16,8 +16,8 @@ namespace :hobo do
         `ln -s ../../vendor/plugins/hobo/rails_generators/hobo_rapid/templates/themes/clean/public clean`
       end
     end
-    
+
   end
-  
+
 end
-  
+