hobo 1.3.0.RC4 → 1.3.0.pre10

data/lib/generators/hobo/user_controller/templates/controller.rb.erb

@@ -4,14 +4,11 @@ class <%= class_name %>Controller < ApplicationController
 
   auto_actions :all, :except => [ :index, :new, :create ]
 
-  # Normally, users should be created via the user lifecycle, except
-  #  for the initial user created via the form on the front screen on
-  #  first run.  This method creates the initial user.
   def create
     hobo_create do
       if valid?
         self.current_user = this
-        flash[:notice] = t("hobo.messages.you_are_site_admin", :default=>"You are now the site administrator")
+        flash[:notice] = I18n.t("hobo.messages.you_are_site_admin", :default=>"You are now the site administrator")
         redirect_to home_page
       end
     end
@@ -20,10 +17,8 @@ class <%= class_name %>Controller < ApplicationController
 
   def do_accept_invitation
     do_transition_action :accept_invitation do
-      if this.valid?
-        self.current_user = this
-        flash[:notice] = t("hobo.messages.you_signed_up", :default=>"You have signed up")
-      end
+      self.current_user = this
+      flash[:notice] = I18n.t("hobo.messages.you_signed_up", :default=>"You have signed up")
     end
   end
 <% end -%>

data/lib/generators/hobo/user_mailer/templates/activation.erb

@@ -1,8 +1,8 @@
-<%%= @<%= name.underscore -%> %>,
+<%%= @user %>,
 
 To activate your account for <%%= @app_name %>, click on this link:
 
-  <%%= <%= name.underscore -%>_activate_url :id => @<%= name.underscore -%>, :key => @key %>
+  <%%= user_activate_url :id => @user, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/forgot_password.erb

@@ -1,9 +1,9 @@
-<%%= @<%= name.underscore -%> %>,
+<%%= @user %>,
 
 If you have forgotten your password for <%%= @app_name %>, you can choose
 a new one by clicking on this link:
 
-  <%%= <%= name.underscore -%>_reset_password_url :id => @<%= name.underscore -%>, :key => @key %>
+  <%%= <%= name.underscore -%>_reset_password_url :id => @user, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/invite.erb

@@ -1,8 +1,8 @@
-<%%= @<%= name.underscore %> %>,
+<%%= @user %>,
 
 You have been invited to join <%%= @app_name %>. If you wish to accept, please click on the following link
 
-  <%%= <%= name.underscore %>_accept_invitation_url :id => @<%= name.underscore %>, :key => @key %>
+  <%%= user_accept_invitation_url :id => @user, :key => @key %>
 
 Thank you,
 

data/lib/generators/hobo/user_mailer/templates/mailer.rb.erb

@@ -1,25 +1,32 @@
 class <%= class_name -%>Mailer < ActionMailer::Base
   default :from => "no-reply@#{host}"
 
-  def forgot_password(<%= name.underscore %>, key)
-    @<%= name.underscore %>, @key = <%= name.underscore %>, key
+  def forgot_password(user, key)
+    set_variables(user, key)
     mail( :subject => "#{app_name} -- forgotten password",
-          :to      => <%= name.underscore %>.email_address )
+          :to      => user.email_address )
   end
 
 <% if invite_only? -%>
-  def invite(<%= name.underscore %>, key)
-    @<%= name.underscore %>, @key = <%= name.underscore %>, key
+  def invite(user, key)
+    set_variables(user, key)
     mail( :subject => "Invitation to #{app_name}",
-          :to      => <%= name.underscore %>.email_address )
+          :to      => user.email_address )
   end
 
 <% elsif options[:activation_email] %>
-  def activation(<%= name.underscore %>, key)
-    @<%= name.underscore %>, @key = <%= name.underscore %>, key
-    mail( :subject => "#{app_name} -- activate",
-          :to      => <%= name.underscore %>.email_address )
+  def activation(user, key)
+    set_variables(user, key)
+    mail :subject => "#{app_name} -- activate",
+         :to      => user.email_address
   end
 
 <% end -%>
+private
+
+  def set_variables(user, key)
+    @user = user
+    @key = key
+  end
+
 end

data/lib/generators/hobo/user_mailer/user_mailer_generator.rb

@@ -12,7 +12,7 @@ module Hobo
       "rails generate hobo:user_mailer [NAME=user] [options]"
     end
 
-    # check_class_collision :suffix => 'Mailer'
+    check_class_collision :suffix => 'Mailer'
 
     def generate_mailer
       template 'mailer.rb.erb', File.join('app/mailers', "#{file_path}_mailer.rb")

data/lib/generators/hobo/user_model/USAGE

@@ -1,5 +1,12 @@
 Description:
+    The model generator creates stubs for a new user model.
 
-    This generator is used by the user_resource generator to generate a
-    user model file into app/models.
+    The generator takes a model name as its argument.  The
+    model name may be given in CamelCase or under_score and
+    should not be suffixed with 'Model'.
 
+    The generator creates a model class in app/models, invokes
+    the hobo:user_mailer andgenerator the test framework.
+
+Examples:
+    $ rails generate hobo:user_model User

data/lib/generators/hobo/user_model/user_model_generator.rb

@@ -1,4 +1,3 @@
-require 'generators/hobo_support/model'
 module Hobo
   class UserModelGenerator < Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)
@@ -6,7 +5,7 @@ module Hobo
     # overrides the default
     argument :name, :type => :string, :default => 'user', :optional => true
 
-    include Generators::HoboSupport::Model
+    include Generators::Hobo::Model
     include Generators::Hobo::InviteOnly
     include Generators::Hobo::ActivationEmail
 

data/lib/hobo.rb

@@ -5,19 +5,18 @@ require 'will_paginate'
 require 'hobo/extensions/enumerable'
 require 'hobo/extensions/array'
 
-ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
-ActiveSupport::Dependencies.autoload_once_paths |= [File.dirname(__FILE__)]
+ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
+
 
 module Hobo
 
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
-  @@root = Pathname.new File.expand_path('../..', __FILE__)
+  @@root = Pathname.new File.expand_path(File.dirname(__FILE__) + "/..")
   def self.root; @@root; end
 
   class Error < RuntimeError; end
   class PermissionDeniedError < RuntimeError; end
   class UndefinedAccessError < RuntimeError; end
-  class I18nError < RuntimeError; end
 
   # Empty class to represent the boolean type.
   class Boolean; end
@@ -25,7 +24,7 @@ module Hobo
 
   class << self
 
-    attr_accessor :current_theme, :engines
+    attr_accessor :current_theme
 
     def raw_js(s)
       RawJs.new(s)
@@ -64,18 +63,13 @@ module Hobo
 
     def subsites
       # Any directory inside app/controllers defines a subsite
-      app_dirs = ["#{Rails.root}/app"] + Hobo.engines.map { |e| "#{e}/app" }
-      @subsites ||= app_dirs.map do |app|
-                      Dir["#{app}/controllers/*"].map do |f|
-                        File.basename(f) if File.directory?(f)
-                      end.compact
-                    end.flatten
+      @subsites ||= Dir["#{Rails.root}/app/controllers/*"].map do |f|
+                      File.basename(f) if File.directory?(f)
+                    end.compact
     end
 
   end
 
-  self.engines = []
-
 end
 
 require 'hobo/engine'

data/lib/hobo/controller.rb

@@ -27,7 +27,7 @@ module Hobo
           end
           before_filter :set_mailer_default_url_options
           @included_taglibs = []
-          rescue_from ActionController::RoutingError, :with => :not_found unless Rails.env.development?
+          rescue_from ActionController::RoutingError, :with => :not_found
         end
         Hobo::Helper.add_to_controller(klass)
       end
@@ -49,7 +49,7 @@ module Hobo
 
     def redirect_to_with_object_url(destination, *args)
       if destination.is_one_of?(String, Hash, Symbol)
-        redirect_to_without_object_url(destination, *args)
+        redirect_to_without_object_url(destination)
       else
         redirect_to_without_object_url(object_url(destination, *args))
       end
@@ -58,9 +58,10 @@ module Hobo
 
     def hobo_ajax_response(*args)
       results = args.extract_options!
+      page_path = params[:page_path]
       r = params[:render]
       if r
-        ajax_update_response(r.values, results)
+        ajax_update_response(page_path, r.values, results)
         true
       else
         false
@@ -68,16 +69,12 @@ module Hobo
     end
 
 
-    def ajax_update_response(render_specs, results={}, options={})
-      controller, action = controller_action_from_page_path
-      identifier = view_context.view_paths.find( action,
-                                                 controller,
-                                                 false,
-                                                 view_context.lookup_context.instance_variable_get('@details')).identifier
-      renderer = Dryml.page_renderer(view_context, identifier, [], controller)
+    def ajax_update_response(page_path, render_specs, results={})
+      @template.send(:_evaluate_assigns_and_ivars)
+      renderer = Dryml.page_renderer(@template, [], page_path) if page_path
 
       render :update do |page|
-        page << (options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;")
+        page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
         for spec in render_specs
           function = spec[:function] || "_update"
           dom_id = spec[:id]
@@ -93,17 +90,10 @@ module Hobo
           end
         end
         page << renderer.part_contexts_storage if renderer
-        page << options[:postamble] if options[:postamble]
       end
     end
 
 
-    # dryml does not use layouts
-    def action_has_layout?
-      false
-    end
-
-
     def dryml_context
       @this
     end
@@ -123,7 +113,10 @@ module Hobo
 
 
     def tag_renderer
-      @tag_renderer ||= Dryml.empty_page_renderer(view_context)
+      @tag_renderer ||= begin
+        @template.send(:_evaluate_assigns_and_ivars)
+        Dryml.empty_page_renderer(@template)
+      end
     end
 
 
@@ -135,7 +128,7 @@ module Hobo
       results_hash = Hobo.find_by_search(query)
       all_results = results_hash.values.flatten.select { |r| r.viewable_by?(current_user) }
       if all_results.empty?
-        render :text => "<p>"+ t("hobo.live_search.no_results", :default=>["Your search returned no matches."]) + "</p>"
+        render :text => "<p>"+ I18n.t("hobo.live_search.no_results", :default=>["Your search returned no matches."]) + "</p>"
       else
         # TODO: call one tag that renders all the search results with headings for each model
         render_tags(all_results, :search_card, :for_type => true)
@@ -160,7 +153,7 @@ module Hobo
       elsif render :not_found, :status => 404
         # cool
       else
-        render(:text => t("hobo.messages.not_found", :default=>["The page you requested cannot be found."]) , :status => 404)
+        render(:text => I18n.t("hobo.messages.not_found", :default=>["The page you requested cannot be found."]) , :status => 404)
       end
     end
 

data/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 || Hobo::Model::UserBase.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
@@ -50,6 +50,28 @@ module Hobo
         end
       end
 
+      # Redirect as appropriate when an access request fails.
+      #
+      # The default action is to redirect to the login screen.
+      #
+      # Override this method in your controllers if you want to have special
+      # behavior in case the user is not authorized
+      # to access the requested action.  For example, a popup window might
+      # simply close itself.
+      def access_denied(user_model)
+        respond_to do |accepts|
+          accepts.html do
+            store_location
+            redirect_to(login_url(user_model))
+          end
+          accepts.xml do
+            headers["Status"]           = "Unauthorized"
+            headers["WWW-Authenticate"] = %(Basic realm="Web Password")
+            render :text => I18n.t("hobo.messages.unauthenticated", :default=>["Couldn't authenticate you"]), :status => '401 Unauthorized'
+          end
+        end
+        false
+      end
 
       # Store the URI of the current request in the session.
       #

data/lib/hobo/controller/model.rb

@@ -27,7 +27,7 @@ module Hobo
           helper_method :model, :current_user
           before_filter :set_no_cache_headers
 
-          rescue_from ActiveRecord::RecordNotFound, :with => :not_found unless Rails.env.development?
+          rescue_from ActiveRecord::RecordNotFound, :with => :not_found
 
           rescue_from Hobo::PermissionDeniedError,         :with => :permission_denied
           rescue_from Hobo::Model::Lifecycles::LifecycleKeyError, :with => :permission_denied
@@ -50,21 +50,15 @@ module Hobo
 
 
     def self.all_controllers(subsite=nil, force=false)
-      controller_dirs = ["#{Rails.root}/app/controllers"] + Hobo.engines.map { |e| "#{e}/app/controllers" }
-
       # Load every controller in app/controllers/<subsite>...
       @controllers_loaded ||= {}
       if force || !@controllers_loaded[subsite]
-        controller_dirs.each do |controller_dir|
-          dir = "#{controller_dir}#{'/' + subsite if subsite}"
-          if File.directory?(dir)
-            Dir.entries(dir).each do |f|
-              if f =~ /^[a-zA-Z_][a-zA-Z0-9_]*_controller\.rb$/
-                name = f.remove(/.rb$/).camelize
-                name = "#{subsite.camelize}::#{name}" if subsite
-                name.constantize
-              end
-            end
+        dir = "#{Rails.root}/app/controllers#{'/' + subsite if subsite}"
+        Dir.entries(dir).each do |f|
+          if f =~ /^[a-zA-Z_][a-zA-Z0-9_]*_controller\.rb$/
+            name = f.remove(/.rb$/).camelize
+            name = "#{subsite.camelize}::#{name}" if subsite
+            name.constantize
           end
         end
         @controllers_loaded[subsite] = true
@@ -79,6 +73,7 @@ module Hobo
     end
 
 
+
     module ClassMethods
 
       attr_writer :model
@@ -129,15 +124,13 @@ module Hobo
       def auto_actions(*args)
         options = args.extract_options!
 
-        @auto_actions = args.map do |arg|
-                          case arg
+        @auto_actions = case args.first
                           when :all        then available_auto_actions
-                          when :write_only then available_auto_write_actions
-                          when :read_only  then available_auto_read_actions
-                          when :lifecycle  then available_auto_lifecycle_actions
-                          else arg
-                          end
-                        end.flatten.uniq
+                          when :write_only then available_auto_write_actions     + args.rest
+                          when :read_only  then available_auto_read_actions      + args.rest
+                          when :lifecycle  then available_auto_lifecycle_actions + args.rest
+                          else args
+                        end
 
         except = Array(options[:except])
         except_actions = except.map do |arg|
@@ -145,9 +138,9 @@ module Hobo
             when :lifecycle   then available_auto_lifecycle_actions
             else arg
           end
-        end.flatten.uniq
+        end
 
-        @auto_actions -= except_actions
+        @auto_actions -= except_actions.flatten
 
         def_auto_actions
       end
@@ -363,15 +356,18 @@ module Hobo
     def re_render_form(default_action=nil)
       if params[:page_path]
         @invalid_record = this
-        controller, action = controller_action_from_page_path
+        opt = ActionController::Routing::Routes.recognize_path(params[:page_path])
+        controller = opt[:controller]
+        view = opt[:action]
+        view = default_action if view == Dryml::EMPTY_PAGE
 
         # Hack fix for Bug 477.  See also bug 489.
-        if self.class.name == "#{controller.camelize}Controller" && action == "index"
+        if self.class.name == "#{controller.camelize}Controller" && view == "index"
           params['action'] = 'index'
           self.action_name = 'index'
           index
         else
-          render :template => "#{controller}/#{action}"
+          render :template => "#{controller}/#{view}"
         end
       else
         render :action => default_action
@@ -404,6 +400,16 @@ module Hobo
     end
 
 
+    def url_for_page_path
+      url_for ActionController::Routing::Routes.recognize_path(params[:page_path])
+    end
+
+    # TODO: Get rid of this joke of an idea that fails miserably if you open another browser window.
+    def previous_page_path
+      session[:previous_page_path]
+    end
+
+
     def redirect_after_submit(*args)
       options = args.extract_options!
       o = options[:redirect]
@@ -446,7 +452,7 @@ module Hobo
       do_pagination = options.delete(:paginate) && finder.respond_to?(:paginate)
       finder = Array.wrap(options.delete(:scope)).inject(finder) { |a, v| a.send(*Array.wrap(v).flatten) }
 
-      options[:order] = finder.default_order unless options[:order] || finder.try.order_values.present?
+      options[:order] = :default unless options[:order] || finder.send(:scope, :find)._?[:order]
 
       if do_pagination
         options.reverse_merge!(:page => params[:page] || 1)
@@ -516,7 +522,7 @@ module Hobo
         this.user_update_attributes(current_user, attributes)
       else
         self.this = new_for_create(attributes)
-        this.user_save(current_user)
+        this.save
       end
       create_response(:new, options, &b)
     end
@@ -559,7 +565,7 @@ module Hobo
 
 
     def create_response(new_action, options={}, &b)
-      flash_notice (ht( :"#{@this.class.to_s.underscore}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
+      flash_notice (ht( :"#{@this.class.name.tableize}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
 
       response_block(&b) or
         if valid?
@@ -573,7 +579,7 @@ module Hobo
 			errors = this.errors.full_messages.join("\n")
             wants.html { re_render_form(new_action) }
             wants.js   { render(:status => 500,
-                                :text => ht( :"#{this.class.to_s.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
+                                :text => ht( :"#{this.class.name.pluralize.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
                                )}
           end
         end
@@ -584,12 +590,11 @@ module Hobo
       options = args.extract_options!
 
       self.this ||= args.first || find_instance
-      changes = options[:attributes] || attribute_parameters or raise RuntimeError, t("hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
+      changes = options[:attributes] || attribute_parameters or raise RuntimeError, I18n.t("hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
+      this.user_update_attributes(current_user, changes)
 
-      if this.user_update_attributes(current_user, changes)
-        # Ensure current_user isn't out of date
-        @current_user = @this if @this == current_user
-      end
+      # Ensure current_user isn't out of date
+      @current_user = @this if @this == current_user
 
       in_place_edit_field = changes.keys.first if changes.size == 1 && params[:render]
       update_response(in_place_edit_field, options, &b)
@@ -598,7 +603,7 @@ module Hobo
 
     def update_response(in_place_edit_field=nil, options={}, &b)
 
-      flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
+      flash_notice (ht(:"#{@this.class.name.pluralize.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
 
       response_block(&b) or
         if valid?
@@ -625,7 +630,7 @@ module Hobo
             errors = @this.errors.full_messages.join("\n")
             wants.html { re_render_form(:edit) }
             wants.js { render(:status => 500,
-                              :text => ht(:"#{@this.class.to_s.underscore}.messages.update.error",:default=>["There was a problem with that change.\n#{errors}"], :errors=>errors)
+                              :text => ht(:"#{@this.class.name.pluralize.underscore}.messages.update.error",:default=>["There was a problem with that change.\n#{errors}"], :errors=>errors)
                              ) }
           end
         end
@@ -636,7 +641,7 @@ module Hobo
       options = args.extract_options!
       self.this ||= args.first || find_instance
       this.user_destroy(current_user)
-      flash_notice ht( :"#{model.to_s.underscore}.messages.destroy.success", :default=>["The #{model.name.titleize.downcase} was deleted"])
+      flash_notice ht( :"#{model.name.pluralize.underscore}.messages.destroy.success", :default=>["The #{model.name.titleize.downcase} was deleted"])
       destroy_response(options, &b)
     end
 
@@ -677,7 +682,7 @@ module Hobo
 			errors = this.errors.full_messages.join("\n")
             wants.html { re_render_form(name) }
             wants.js   { render(:status => 500,
-                                :text => ht(:"#{@this.class.to_s.underscore}.messages.creator.error", :default=>["Couldn't do creator #{name}.\n#{errors}"], :name=>name, :errors=>errors)
+                                :text => ht(:"#{@this.class.name.pluralize.underscore}.messages.creator.error", :default=>["Couldn't do creator #{name}.\n#{errors}"], :name=>name, :errors=>errors)
                                )}
           end
         end
@@ -719,7 +724,7 @@ module Hobo
 			errors = this.errors.full_messages.join("\n")
             wants.html { re_render_form(name) }
             wants.js   { render(:status => 500,
-                                :text => ht(:"#{@this.class.to_s.underscore}.messages.transition.error", :default=>["Couldn't do transition #{name}.\n#{errors}"], :name=>name, :errors=>errors)
+                                :text => ht(:"#{@this.class.name.pluralize.underscore}.messages.transition.error", :default=>["Couldn't do transition #{name}.\n#{errors}"], :name=>name, :errors=>errors)
                                )}
           end
         end
@@ -730,7 +735,7 @@ module Hobo
 
     def hobo_completions(attribute, finder, options={})
       options = options.reverse_merge(:limit => 10, :param => :query, :query_scope => "#{attribute}_contains")
-      finder = finder.limit(options[:limit]) unless finder.try.limit_value
+      finder = finder.limit(options[:limit]) unless finder.send(:scope, :find, :limit)
 
       begin
         finder = finder.send(options[:query_scope], params[options[:param]])
@@ -775,11 +780,11 @@ module Hobo
             if render :permission_denied, :status => 403
               # job done
             else
-              render :text => t("hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
+              render :text => I18n.t("hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
             end
           end
           wants.js do
-            render :text => t("hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
+            render :text => I18n.t("hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
           end
         end
       end
@@ -787,16 +792,16 @@ module Hobo
 
 
     def this
-      @this ||= (instance_variable_get("@#{model.name.demodulize.underscore}") ||
-                 instance_variable_get("@#{model.name.demodulize.underscore.pluralize}"))
+      @this ||= (instance_variable_get("@#{model.name.underscore}") ||
+                 instance_variable_get("@#{model.name.underscore.pluralize}"))
     end
 
 
     def this=(object)
-      ivar = if object.is_a?(Array) || object.respond_to?(:member_class)
-               (object.try.member_class || model).name.demodulize.underscore.pluralize
+      ivar = if object.is_a?(Array)
+               (object.try.member_class || model).name.underscore.pluralize
              else
-               object.class.name.demodulize.underscore
+               object.class.name.underscore
              end
       @this = instance_variable_set("@#{ivar}", object)
     end