hobo 1.1.0 → 1.3.0.RC

data/lib/hobo/{model_controller.rb → controller/model.rb}

@@ -1,6 +1,6 @@
 module Hobo
-
-  module ModelController
+  module Controller
+	  module Model
 
     include Hobo::Controller
 
@@ -18,7 +18,7 @@ module Hobo
         base.class_eval do
           @auto_actions ||= {}
 
-          inheriting_cattr_reader :web_methods => [], :show_actions => [], :index_actions => [], 
+          inheriting_cattr_reader :web_methods => [], :show_actions => [], :index_actions => [],
                                   :owner_actions => {}
 
           extend ClassMethods
@@ -27,13 +27,13 @@ module Hobo
           helper_method :model, :current_user
           before_filter :set_no_cache_headers
 
-          rescue_from ActiveRecord::RecordNotFound, :with => :not_found
+          rescue_from ActiveRecord::RecordNotFound, :with => :not_found unless Rails.env.development?
 
           rescue_from Hobo::PermissionDeniedError,         :with => :permission_denied
-          rescue_from Hobo::Lifecycles::LifecycleKeyError, :with => :permission_denied
+          rescue_from Hobo::Model::Lifecycles::LifecycleKeyError, :with => :permission_denied
 
           alias_method_chain :render, :hobo_model
-          
+
         end
         register_controller(base)
 
@@ -41,49 +41,54 @@ module Hobo
       end
 
     end
-    
-    
+
+
     def self.register_controller(controller)
       @controller_names ||= Set.new
       @controller_names << controller.name
     end
-    
-    
+
+
     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]
-        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
+        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
           end
         end
         @controllers_loaded[subsite] = true
       end
-      
+
       # ...but only return the ones that registered themselves
       names = (@controller_names || []).select { |n| subsite ? n =~ /^#{subsite.camelize}::/ : n !~ /::/ }
-      
+
       names.map do |name|
         name.safe_constantize || (@controller_names.delete name; nil)
       end.compact
     end
-    
 
 
     module ClassMethods
 
       attr_writer :model
-      
+
       def model_name
-        name.demodulize.remove(/Controller$/).singularize
+        model.name.underscore
       end
-      
+
       def model
-        @model ||= model_name.constantize
+        @model ||= controller_name.camelcase.singularize.constantize
       end
 
 
@@ -227,8 +232,8 @@ module Hobo
           end
         end
       end
-      
-      
+
+
       def creator_page_action(name, options={}, &block)
         define_method(name) do
           creator_page_action name, options, &block
@@ -241,7 +246,7 @@ module Hobo
           do_creator_action name, options, &block
         end
       end
-      
+
 
       def transtion_page_action(name, options={}, &block)
         define_method(name) do
@@ -256,7 +261,7 @@ module Hobo
         end
       end
 
-      
+
       def auto_actions_for(owner, actions)
         name = model.reflections[owner].macro == :has_many ? owner.to_s.singularize : owner
 
@@ -355,17 +360,16 @@ module Hobo
 
     def re_render_form(default_action=nil)
       if params[:page_path]
-        @invalid_record = this        
-        controller, view = Controller.controller_and_view_for(params[:page_path])
-        view = default_action if view == Dryml::EMPTY_PAGE
+        @invalid_record = this
+        controller, action = controller_action_from_page_path
 
         # Hack fix for Bug 477.  See also bug 489.
-        if self.class.name == "#{controller.camelize}Controller" && view == "index"
+        if self.class.name == "#{controller.camelize}Controller" && action == "index"
           params['action'] = 'index'
           self.action_name = 'index'
           index
         else
-          render :template => "#{controller}/#{view}"
+          render :template => "#{controller}/#{action}"
         end
       else
         render :action => default_action
@@ -396,19 +400,8 @@ module Hobo
       method = @this.class.view_hints.parent
       method ? @this.send(method) : nil
     end
-    
-    
-    def url_for_page_path
-      controller, view = Controller.controller_and_view_for(params[:page_path])
-      url_for :controller => controller, :action => view
-    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]
@@ -425,7 +418,7 @@ module Hobo
         redirect_to destination_after_submit(*args)
       end
     end
-    
+
 
     def response_block(&b)
       if b
@@ -451,18 +444,17 @@ 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] = :default unless options[:order] || finder.send(:scope, :find)._?[:order]
+      options[:order] = finder.default_order unless options[:order] || finder.try.order_values.present?
 
       if do_pagination
         options.reverse_merge!(:page => params[:page] || 1)
-        options[:order] = :created_at if options[:order] == :default
         finder.paginate(options)
       else
         finder.all(options.except(*WILL_PAGINATE_OPTIONS))
       end
     end
-    
-    
+
+
     def find_owner_and_association(owner_association)
       owner_name = name_of_auto_action_for(owner_association)
       refl = model.reflections[owner_association]
@@ -484,8 +476,8 @@ module Hobo
       self.this = find_or_paginate(finder, options)
       response_block(&b)
     end
-    
-    
+
+
     def hobo_index_for(owner, *args, &b)
       options = args.extract_options!
       owner, association = find_owner_and_association(owner)
@@ -506,8 +498,8 @@ module Hobo
       self.this = record || model.user_new(current_user)
       response_block(&b)
     end
-    
-    
+
+
     def hobo_new_for(owner, record=nil, &b)
       owner, association = find_owner_and_association(owner)
       self.this = record || association.user_new(current_user)
@@ -517,7 +509,7 @@ module Hobo
 
     def hobo_create(*args, &b)
       options = args.extract_options!
-      attributes = options[:attributes] || attribute_parameters || {}      
+      attributes = options[:attributes] || attribute_parameters || {}
       if self.this ||= args.first
         this.user_update_attributes(current_user, attributes)
       else
@@ -526,8 +518,8 @@ module Hobo
       end
       create_response(:new, options, &b)
     end
-    
-    
+
+
     def hobo_create_for(owner_association, *args, &b)
       options = args.extract_options!
       owner, association = find_owner_and_association(owner_association)
@@ -538,7 +530,7 @@ module Hobo
         self.this = association.new(attributes)
         this.save
       end
-      create_response(:"new_for_#{name_of_auto_action_for(owner_association)}", options, &b)    
+      create_response(:"new_for_#{name_of_auto_action_for(owner_association)}", options, &b)
     end
 
 
@@ -552,20 +544,20 @@ module Hobo
       create_model = type_param ? type_param.constantize : model
       create_model.user_new(current_user, attributes)
     end
-    
-    
+
+
     def subtype_for_create
-      model.has_inheritance_column? && (t = params['type']) && t.in?(model.send(:subclasses).*.name) and
+      model.has_inheritance_column? && (t = params['type']) && t.in?(model.send(:descendants).*.name) and
         t
     end
-    
+
     def flash_notice(message)
       flash[:notice] = message unless request.xhr?
     end
 
 
     def create_response(new_action, options={}, &b)
-      flash_notice (ht( :"#{@this.class.name.pluralize.underscore}.messages.create.success", :default=>["The #{@this.class.view_hints.model_name.downcase} was created successfully"])) if valid?
+      flash_notice (ht( :"#{@this.class.to_s.underscore}.messages.create.success", :default=>["The #{@this.class.model_name.human} was created successfully"])) if valid?
 
       response_block(&b) or
         if valid?
@@ -579,7 +571,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.name.pluralize.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
+                                :text => ht( :"#{this.class.to_s.underscore}.messages.create.error", :errors=>errors,:default=>["Couldn't create the #{this.class.name.titleize.downcase}.\n #{errors}"])
                                )}
           end
         end
@@ -590,9 +582,9 @@ module Hobo
       options = args.extract_options!
 
       self.this ||= args.first || find_instance
-      changes = options[:attributes] || attribute_parameters or raise RuntimeError, ht(:"hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
-      
-      if this.user_update_attributes(current_user, changes)        
+      changes = options[:attributes] || attribute_parameters or raise RuntimeError, t("hobo.messages.update.no_attribute_error", :default=>["No update specified in params"])
+
+      if this.user_update_attributes(current_user, changes)
         # Ensure current_user isn't out of date
         @current_user = @this if @this == current_user
       end
@@ -603,8 +595,8 @@ module Hobo
 
 
     def update_response(in_place_edit_field=nil, options={}, &b)
-      
-      flash_notice (ht(:"#{@this.class.name.pluralize.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.view_hints.model_name.downcase} were saved"])) if valid?
+
+      flash_notice (ht(:"#{@this.class.to_s.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.model_name.human} were saved"])) if valid?
 
       response_block(&b) or
         if valid?
@@ -631,7 +623,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.name.pluralize.underscore}.messages.update.error",:default=>["There was a problem with that change.\n#{errors}"], :errors=>errors)
+                              :text => ht(:"#{@this.class.to_s.underscore}.messages.update.error",:default=>["There was a problem with that change.\n#{errors}"], :errors=>errors)
                              ) }
           end
         end
@@ -642,7 +634,7 @@ module Hobo
       options = args.extract_options!
       self.this ||= args.first || find_instance
       this.user_destroy(current_user)
-      flash_notice ht( :"#{model.name.pluralize.underscore}.messages.destroy.success", :default=>["The #{model.name.titleize.downcase} was deleted"])
+      flash_notice ht( :"#{model.to_s.underscore}.messages.destroy.success", :default=>["The #{model.name.titleize.downcase} was deleted"])
       destroy_response(options, &b)
     end
 
@@ -683,7 +675,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.name.pluralize.underscore}.messages.creator.error", :default=>["Couldn't do creator #{name}.\n#{errors}"], :name=>name, :errors=>errors)
+                                :text => ht(:"#{@this.class.to_s.underscore}.messages.creator.error", :default=>["Couldn't do creator #{name}.\n#{errors}"], :name=>name, :errors=>errors)
                                )}
           end
         end
@@ -725,7 +717,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.name.pluralize.underscore}.messages.transition.error", :default=>["Couldn't do transition #{name}.\n#{errors}"], :name=>name, :errors=>errors)
+                                :text => ht(:"#{@this.class.to_s.underscore}.messages.transition.error", :default=>["Couldn't do transition #{name}.\n#{errors}"], :name=>name, :errors=>errors)
                                )}
           end
         end
@@ -736,7 +728,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.send(:scope, :find, :limit)
+      finder = finder.limit(options[:limit]) unless finder.try.limit_value
 
       begin
         finder = finder.send(options[:query_scope], params[options[:param]])
@@ -747,7 +739,7 @@ module Hobo
           finder2 = finder.send(qscope, params[options[:param]])
           items += finder2.find(:all).select { |r| r.viewable_by?(current_user) }
         end
-      end       
+      end
       render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
     end
 
@@ -774,18 +766,18 @@ module Hobo
       logger.info "Hobo: Permission Denied!"
       @permission_error = error
       if self.class.superclass.method_defined?("permission_denied")
-        self.class.superclass.instance_method(:permission_denied).bind(self).call(error)
+        super
       else
         respond_to do |wants|
           wants.html do
-            if render_tag("permission-denied-page", { }, :status => 403)
+            if render :permission_denied, :status => 403
               # job done
             else
-              render :text => ht(:"hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
+              render :text => t("hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
             end
           end
           wants.js do
-            render :text => ht(:"hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
+            render :text => t("hobo.messages.permission_denied", :default=>["Permission Denied"]), :status => 403
           end
         end
       end
@@ -840,5 +832,5 @@ module Hobo
     end
 
   end
-
+  end
 end

data/lib/hobo/{user_controller.rb → controller/user.rb}

@@ -1,39 +1,38 @@
 module Hobo
-
-  module UserController
+  module Controller
+ 	 module User
 
     class << self
       def included(base)
         base.class_eval do
           extend ClassMethods
-          
+
           class << self
             alias_method_chain :available_auto_actions, :user_actions
             alias_method_chain :def_auto_actions, :user_actions
           end
-          
-          filter_parameter_logging "password"
-          skip_before_filter :login_required, :only => [:login, :signup, :do_signup, :forgot_password, :reset_password,
-                                                        :do_reset_password, :accept_invitation, :do_accept_invitation]
+
+          skip_before_filter :login_required, :only => [:login, :signup, :forgot_password, :reset_password, :do_reset_password,
+                                                        :accept_invitation, :do_accept_invitation]
 
           include_taglib "rapid_user_pages", :plugin => "hobo"
 
           alias_method_chain :hobo_update, :account_flash
         end
-        
+
       end
 
-          
+
     end
-    
+
     module ClassMethods
 
       def available_auto_actions_with_user_actions
-        available_auto_actions_without_user_actions + 
+        available_auto_actions_without_user_actions +
           [:login, :logout, :forgot_password, :reset_password, :account]
       end
 
-      
+
       def def_auto_actions_with_user_actions
         def_auto_actions_without_user_actions
 
@@ -53,7 +52,7 @@ module Hobo
 
     private
 
-    def hobo_login(options={})
+    def hobo_login(options={}, &block)
       if logged_in?
         respond_to do |wants|
           wants.html { redirect_to home_page }
@@ -62,9 +61,8 @@ module Hobo
         return
       end
 
-      login_attr = model.login_attribute.to_s.titleize.downcase
-      options.reverse_merge!(:success_notice => ht(:"users.messages.login.success", :default=>["You have logged in."]),
-                             :failure_notice => ht(:"users.messages.login.error", :login=>login_attr, :default=>["You did not provide a valid #{login_attr} and password."]))
+      login_attr = model.human_attribute_name(model.login_attribute)
+      options.reverse_merge!(:failure_notice => ht(:"#{model.to_s.underscore}.messages.login.error", :login=>login_attr, :default=>["You did not provide a valid #{login_attr} and password."]))
 
       if request.post?
         user = model.authenticate(params[:login], params[:password])
@@ -72,33 +70,7 @@ module Hobo
           flash[:error] = options[:failure_notice]
           hobo_ajax_response if request.xhr? && !performed?
         else
-          old_user = current_user
-          self.current_user = user
-          
-          yield if block_given?
-
-          if !user.account_active?
-            # account not activate - cancel this login
-            self.current_user = old_user
-            unless performed?
-              respond_to do |wants|
-                wants.html {render :action => :account_disabled}
-                wants.js {hobo_ajax_response}
-              end
-            end
-          else
-            if params[:remember_me].present?
-              current_user.remember_me
-              create_auth_cookie
-            end
-            flash[:notice] ||= options[:success_notice]
-            unless performed?
-              respond_to do |wants|
-                wants.html {redirect_back_or_default(options[:redirect_to] || home_page) }
-                wants.js {hobo_ajax_response}
-              end
-            end
-          end
+          self.sign_user_in(user, options){ yield if block_given?}
         end
       end
     end
@@ -114,7 +86,7 @@ module Hobo
     def hobo_do_signup(&b)
       do_creator_action(:signup) do
         if valid?
-          flash[:notice] = ht(:"users.messages.signup.success", :default=>["Thanks for signing up!"])
+          flash[:notice] = ht(:"#{model.to_s.underscore}.messages.signup.success", :default=>["Thanks for signing up!"])
         end
         response_block(&b) or if valid?
                                 self.current_user = this if this.account_active?
@@ -128,7 +100,7 @@ module Hobo
 
 
     def hobo_logout(options={})
-      options = options.reverse_merge(:notice => ht(:"users.messages.logout", :default=>["You have logged out."]),
+      options = options.reverse_merge(:notice => ht(:"#{model.to_s.underscore}.messages.logout", :default=>["You have logged out."]),
                                       :redirect_to => base_url)
 
       logout_current_user
@@ -145,7 +117,7 @@ module Hobo
           user.lifecycle.request_password_reset!(:nobody)
         end
         respond_to do |wants|
-          wants.html { render_tag :forgot_password_email_sent_page }
+          wants.html { render :forgot_password_email_sent }
           wants.js { hobo_ajax_response}
         end
       end
@@ -156,7 +128,7 @@ module Hobo
       do_transition_action :reset_password do
         response_block(&b) or if valid?
                                 self.current_user = this
-                                flash[:notice] = ht(:"users.messages.reset_password", :default=>["Your password has been reset"])
+                                flash[:notice] = ht(:"#{model.to_s.underscore}.messages.reset_password", :default=>["Your password has been reset"])
                                 respond_to do |wants|
                                   wants.html { redirect_to(home_page) }
                                   wants.js { hobo_ajax_response }
@@ -168,7 +140,7 @@ module Hobo
 
     def hobo_update_with_account_flash(*args)
       hobo_update_without_account_flash(*args) do
-        flash[:notice] = ht(:"users.messages.update.success", :default=>["Changes to your account were saved"]) if valid? && @this == current_user
+        flash[:notice] = ht(:"#{model.to_s.underscore}.messages.update.success", :default=>["Changes to your account were saved"]) if valid? && @this == current_user
         yield if block_given?
       end
     end
@@ -184,6 +156,44 @@ module Hobo
       end
     end
 
-  end
+    protected
+    # If you are authenticating user on your own call this method -
+    # hobo will remember signed-in user this way. Arguments:
+    # user - user that you want to sign in
+    # options - hash with messages (:success_notice, :redirect_to)
+    # block - (optional) will be called after assigning current_user
+    def sign_user_in(user, options={}, &block)
+      options.reverse_merge!(:success_notice => ht(:"#{model.to_s.underscore}.messages.login.success", :default=>["You have logged in."]))
+
+      old_user = current_user
+      self.current_user = user
+
+      yield if block_given?
 
+      if !user.account_active?
+        # account not activate - cancel this login
+        self.current_user = old_user
+        unless performed?
+          respond_to do |wants|
+            wants.html {render :action => :account_disabled}
+            wants.js {hobo_ajax_response}
+          end
+        end
+      else
+        if params[:remember_me].present?
+          current_user.remember_me
+          create_auth_cookie
+        end
+        flash[:notice] ||= options[:success_notice]
+        unless performed?
+          respond_to do |wants|
+            wants.html {redirect_back_or_default(options[:redirect_to] || home_page) }
+            wants.js {hobo_ajax_response}
+          end
+        end
+      end
+    end
+
+  end
+  end
 end