Hobo Hobo → Hobo 1.3 (Rails 3)

I use Hobo 1.3pre6 + Rails 3.0.

Here is a patch for

uninitialized constant Dryml::Parser::TreeParser::Instruction

and

undefined method `default_user_model' for Hobo::Controller::User:Module

diff --git a/dryml/lib/dryml/parser/tree_parser.rb b/dryml/lib/dryml/parser/tree_parser.rb
index 00e3039..e2036e1 100644
--- a/dryml/lib/dryml/parser/tree_parser.rb
+++ b/dryml/lib/dryml/parser/tree_parser.rb
@@ -54,7 +54,7 @@ module Dryml::Parser
             c = REXML::CData.new( event[1] )
             @build_context.add( c )
           when :processing_instruction
-            @build_context.add( Instruction.new( event[1], event[2] ) )
+            @build_context.add( REXML::Instruction.new( event[1], event[2] ) )
           end
         end
       rescue REXML::Validation::ValidationException
diff --git a/hobo/lib/hobo/controller/authentication_support.rb b/hobo/lib/hobo/controller/authentication_support.rb
index e359c39..ce7da92 100644
--- a/hobo/lib/hobo/controller/authentication_support.rb
+++ b/hobo/lib/hobo/controller/authentication_support.rb
@@ -38,7 +38,7 @@ module Hobo
       #   skip_before_filter :login_required
       #
       def login_required(user_model=nil)
-        auth_model = user_model || User.default_user_model
+        auth_model = user_model || Hobo::Model::User.default_user_model
         if current_user.guest?
           username, passwd = get_auth_data
           self.current_user = auth_model.authenticate(username, passwd) || nil if username && passwd && auth_model