hobo 0.7.0 → 0.7.1

data/hobo_files/plugin/lib/hobo/model.rb

@@ -2,6 +2,10 @@ module Hobo
 
   module Model
     
+    NAME_FIELD_GUESS      = %w(name title)
+    PRIMARY_CONTENT_GUESS = %w(description body content profile)
+    SEARCH_COLUMNS_GUESS  = %w(name title body content profile)
+    
     PLAIN_TYPES = { :boolean       => TrueClass,
                     :date          => Date,
                     :datetime      => Time,
@@ -18,10 +22,12 @@ module Hobo
       base.extend(ClassMethods)
       base.class_eval do
         alias_method_chain :attributes=, :hobo_type_conversion
+        default_scopes
       end
       class << base
         alias_method_chain :has_many, :defined_scopes
         alias_method_chain :belongs_to, :foreign_key_declaration
+        alias_method_chain :belongs_to, :hobo_metadata
         alias_method_chain :acts_as_list, :fields if defined?(ActiveRecord::Acts::List)
         def inherited(klass)
           fields do
@@ -37,6 +43,44 @@ module Hobo
       # include methods also shared by CompositeModel
       include ModelSupport::ClassMethods
       
+      attr_accessor :creator_attribute
+      attr_writer :name_attribute, :primary_content_attribute
+      
+      def default_scopes
+        def_scope :recent do |*args|
+          count = args.first || 3
+          { :limit => count, :order => "#{table_name}.created_at DESC" }
+        end
+      end
+      
+      def name_attribute
+        @name_attribute ||= begin
+                              cols = columns.every :name
+                              NAME_FIELD_GUESS.detect {|f| f.in? columns.every(:name) }
+                            end
+      end
+      
+
+      def primary_content_attribute
+        @description_attribute ||= begin
+                                     cols = columns.every :name
+                                     PRIMARY_CONTENT_GUESS.detect {|f| f.in? columns.every(:name) }
+                                   end
+      end
+      
+      def dependent_collections
+        reflections.values.select do |refl| 
+          refl.macro == :has_many && refl.options[:dependent]
+        end.every(:name)
+      end
+      
+      
+      def dependent_on
+        reflections.values.select do |refl| 
+          refl.macro == :belongs_to && (rev = reverse_reflection(refl.name) and rev.options[:dependent])
+        end.every(:name)
+      end
+      
       private
       
       def return_type(type)
@@ -75,6 +119,13 @@ module Hobo
         end
         res
       end
+      
+      
+      def belongs_to_with_hobo_metadata(name, *args, &block)
+        options = args.extract_options!
+        self.creator_attribute = name.to_sym if options.delete(:creator)
+        belongs_to_without_hobo_metadata(name, *args + [options], &block)
+      end
 
 
       def acts_as_list_with_fields(options = {})
@@ -125,12 +176,6 @@ module Hobo
       end
       public :never_show?
 
-      def set_creator_attr(attr)
-        @creator_attr = attr.to_sym
-      end 
-      attr_reader :creator_attr
-      public :creator_attr
-
       def set_search_columns(*columns)
         class_eval %{
           def self.search_columns
@@ -281,12 +326,12 @@ module Hobo
       end
 
       def creator_type
-        reflections[@creator_attr]._?.klass
+        reflections[creator_attribute]._?.klass
       end
 
       def search_columns
         cols = columns.every(:name)
-        %w{name title body content}.select{|c| c.in?(cols) }
+        SEARCH_COLUMNS_GUESS.select{|c| c.in?(cols) }
       end
       
       # This should really be a method on AssociationReflection
@@ -300,9 +345,9 @@ module Hobo
                           :has_many
                         end
         refl.klass.reflections.values.find do |r|
-          r.macro == reverse_macro and
-            r.klass == self and 
-            !r.options[:conditions] and
+          r.macro == reverse_macro &&
+            r.klass == self &&
+            !r.options[:conditions] &&
             r.primary_key_name == refl.primary_key_name
         end
       end
@@ -457,6 +502,11 @@ module Hobo
     end
     
     
+    def dependent_on
+      self.class.dependent_on.map { |assoc| send(assoc) }
+    end
+    
+    
     def attributes_with_hobo_type_conversion=(attributes, guard_protected_attributes=true)
       converted = attributes.map_hash { |k, v| convert_type_for_mass_assignment(self.class.field_type(k), v) }
       send(:attributes_without_hobo_type_conversion=, converted, guard_protected_attributes)
@@ -465,7 +515,17 @@ module Hobo
 
     
     def set_creator(user)
-      self.send("#{self.class.creator_attr}=", user) if (t = self.class.creator_type) && user.is_a?(t)
+      attr = self.class.creator_attribute
+      return unless attr
+      
+      # Is creator a string field or an association?
+      if self.class.reflections[attr]
+        # It's an association
+        self.send("#{attr}=", user) if (t = self.class.creator_type) && user.is_a?(t)
+      else
+        # Assume it's a string field -- set it to the name of the current user
+        self.send("#{attr}=", user.to_s) unless user.guest?
+      end
     end
 
 
@@ -487,11 +547,15 @@ module Hobo
 
 
     def same_fields?(other, *fields)
+      return true if other.nil?
+      
       fields = fields.flatten
       fields.all?{|f| self.send(f) == other.send(f)}
     end
     
     def only_changed_fields?(other, *changed_fields)
+      return true if other.nil?
+      
       changed_fields = changed_fields.flatten.every(:to_s)
       all_cols = self.class.columns.every(:name) - []
       all_cols.all?{|c| c.in?(changed_fields) || self.send(c) == other.send(c) }
@@ -514,12 +578,10 @@ module Hobo
     end
     
     def to_s
-      if respond_to? :title
-        title
-      elsif respond_to? :name
-        name
+      if self.class.name_attribute
+        send self.class.name_attribute
       else
-        "#{self.class.name.humanize} #{id}"
+        "#{self.class.name.titleize} #{id}"
       end
     end
     

data/hobo_files/plugin/lib/hobo/model_controller.rb

@@ -4,18 +4,10 @@ module Hobo
 
     include Hobo::Controller
 
-    class PermissionDeniedError < RuntimeError; end
-    class UserPermissionError < StandardError
-      attr :models
-      def initialize(models)
-        @models = models || []
-      end
-    end
-    
     VIEWLIB_DIR = "taglibs"
     
     PAGINATE_FORMATS = [ Mime::HTML, Mime::ALL ]
-
+    
     class << self
 
       def included(base)
@@ -23,38 +15,14 @@ module Hobo
           @auto_actions ||= {}
           
           extend ClassMethods
-          helper_method :find_partial, :model, :current_user
+          
+          helper_method :model, :current_user
           before_filter :set_no_cache_headers
         end
+        base.template_path_cache = {}        
 
         Hobo::Controller.included_in_class(base)
       end
-
-      def find_partial(klass, as)
-        find_model_template(klass, as, :is_parital => true)
-      end
-
-
-      def template_path(dir, name, is_partial)
-        fileRx = is_partial ? /^_#{name}\.[^.]+/ : /^#{name}\.[^.]+/
-        full_dir = "#{RAILS_ROOT}/app/views/#{dir}"
-        if File.exists?(full_dir) && Dir.entries(full_dir).grep(fileRx).any?
-          return "#{dir}/#{name}"
-        end
-      end
-
-
-      def find_model_template(klass, name, options={})
-        while klass and klass != ActiveRecord::Base
-          dir = klass.name.underscore.pluralize
-          dir = File.join(options[:subsite], dir) if options[:subsite]
-          path = template_path(dir, name, options[:is_partial])
-          return path if path
-
-          klass = klass.superclass
-        end
-        nil
-      end
       
     end
 
@@ -62,6 +30,8 @@ module Hobo
 
       attr_writer :model
       
+      attr_accessor :template_path_cache
+      
       def add_collection_actions(name)
         defined_methods = instance_methods
         
@@ -400,6 +370,24 @@ module Hobo
     end
     
     
+    def destination_after_create(record)
+      # The after_submit post parameter takes priority
+      params[:after_submit] || 
+        
+        # Then try the records show page
+        object_url(@this,       :if_available => true) || 
+        
+        # Then the show page of the 'owning' object if there is one
+        (@this.dependent_on.first && object_url(@this.dependent_on.first, :if_available => true)) ||
+        
+        # Last try - the index page for this model
+        object_url(@this.class, :if_available => true) ||
+        
+        # Give up
+        home_page
+    end
+    
+    
     # --- Action implementations --- #
 
     def hobo_index(*args, &b)
@@ -478,7 +466,7 @@ module Hobo
       response_block(&b) or
         if valid?
           respond_to do |wants|
-            wants.html { redirect_to(params[:after_submit] || object_url(@this)) }
+            wants.html { redirect_to(destination_after_create(@this)) }
             wants.js   { hobo_ajax_response || render(:text => "") }
           end
         elsif invalid?
@@ -510,14 +498,14 @@ module Hobo
       @this.send(:clear_aggregation_cache)
       @this.send(:clear_association_cache)
       
-      changes = params[model.name.underscore]
+      changes = params[@this.class.name.underscore]
       @this.attributes = changes 
       save_and_set_status!(@this, original)
 
       # Ensure current_user isn't out of date
       @current_user = @this if @this == current_user
       
-      flash[:notice] = "Changes to the #{model.name.titleize.downcase} were saved" if !request.xhr? && valid?
+      flash[:notice] = "Changes to the #{@this.class.name.titleize.downcase} were saved" if !request.xhr? && valid?
       
       set_named_this!
       response_block(&b) or 
@@ -671,32 +659,43 @@ module Hobo
       end
     end
     
+    
+    def hobo_template_exists?(dir, name)
+      self.class.template_path_cache.clear if RAILS_ENV == "development"
+      self.class.template_path_cache.fetch([dir, name], 
+                                           begin
+                                             full_dir = "#{RAILS_ROOT}/app/views/#{dir}"
+                                             !Dir["#{full_dir}/#{name}.*"].empty?
+                                           end)
+    end
+        
+
+    def find_model_template(klass, name)
+      while klass and klass != ActiveRecord::Base
+        dir = klass.name.underscore.pluralize
+        dir = File.join(subsite, dir) if subsite
+        if hobo_template_exists?(dir, name)
+          return "#{dir}/#{name}"
+        end
+        klass = klass.superclass
+      end
+      nil
+    end
 
+    
     def hobo_render(page_kind = nil, page_model=nil)
       page_kind ||= params[:action].to_sym
       page_model ||= model
-      
-      template = ModelController.find_model_template(page_model, page_kind, :subsite => subsite)
 
-      begin
-        if template
-          render :template => template
-          true
-        else
-          # This returns false if no such tag exists
-          render_tag("#{page_kind.to_s.dasherize}-page", :with => @this)
-        end
-      rescue ActionView::TemplateError => wrapper
-        e = wrapper.original_exception if wrapper.respond_to? :original_exception
-        if e.is_a? Hobo::ModelController::UserPermissionError
-          if current_user.guest?
-            redirect_to login_url(e.models.first || UserController.user_models.first)
-          else
-            permission_denied(:message => e.message)
-          end
-        else
-          raise
-        end
+      if hobo_template_exists?(controller_path, page_kind)
+        render :action => page_kind
+        true
+      elsif (template = find_model_template(page_model, page_kind))
+        render :template => template
+        true
+      else
+        # This returns false if no such tag exists
+        render_tag("#{page_kind.to_s.dasherize}-page", :with => @this)
       end
     end
 

data/hobo_files/plugin/lib/hobo/model_router.rb

@@ -1,13 +1,24 @@
+class ActionController::Routing::RouteSet
+  # Monkey patch this method so routes are reloaded on *every*
+  # request. Without this Rails checks the mtime of config/routes.rb
+  # which doesn't take into account Hobo's auto routing
+  def reload
+    load!
+  end
+end
+
 module Hobo
   
   class ModelRouter
     
-    @linkable = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = {} } }
-    
     APP_ROOT = "#{RAILS_ROOT}/app"
     
     class << self
       
+      def reset_linkables
+        @linkable = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = {} } }
+      end
+      
       def linkable(subsite, klass, action)
         @linkable[subsite][klass.name][action] = true
       end
@@ -17,6 +28,7 @@ module Hobo
       end
       
       def add_routes(map)
+        reset_linkables
         begin 
           ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
         rescue
@@ -25,8 +37,8 @@ module Hobo
         end
 
         require "#{APP_ROOT}/controllers/application" unless Object.const_defined? :ApplicationController
-        require "#{APP_ROOT}/assemble.rb" if File.exists? "#{APP_ROOT}/assemble.rb"
-        
+        load "#{APP_ROOT}/assemble.rb" if File.exists? "#{APP_ROOT}/assemble.rb"
+
         # Add non-subsite routes
         add_routes_for(map, nil)
 

data/hobo_files/plugin/lib/hobo/rapid_helper.rb

@@ -11,6 +11,7 @@ module Hobo::RapidHelper
     js_options['resultUpdate']  = js_result_updates(options[:result_update]) if options[:result_update]
     js_options['resetForm']     = options[:reset_form] if options.has_key?(:reset_form)
     js_options['refocusForm']   = options[:refocus_form] if options.has_key?(:refocus_form)
+    js_options['spinnerNextTo'] = options[:spinner_next_to] if options.has_key?(:spinner_next_to)
     
     js_options.empty? ? nil : options_for_javascript(js_options)
   end
@@ -97,7 +98,7 @@ module Hobo::RapidHelper
 
   AJAX_ATTRS = [:before, :success, :failure, :complete, :type, :method,
                 :script, :form, :params, :confirm,
-                :reset_form, :refocus_form, :result_update]
+                :reset_form, :refocus_form, :result_update, :spinner_next_to]
 
 
   def editor_class

data/hobo_files/plugin/lib/hobo/user.rb

@@ -41,7 +41,7 @@ module Hobo
       end
     end
 
-    # Additional classmethods for AuthenticatedUser
+    # Additional classmethods for authentication
     module ClassMethods
       
       # Validation of the plaintext password
@@ -49,22 +49,20 @@ module Hobo
         validates_length_of :password, :within => 4..40, :if => :password_required?
       end
       
-      def set_login_attr(attr)
+      def login_attribute=(attr, validate=true)
         @login_attr = attr = attr.to_sym
         unless attr == :login
           alias_attribute(:login, attr)
           set_field_type :login => field_type(attr)
         end
         
-        if block_given?
-          yield
-        else 
+        if validate
           validates_presence_of   attr
           validates_length_of     attr, :within => 3..100
           validates_uniqueness_of attr, :case_sensitive => false
         end
       end
-      def login_attr; @login_attr; end
+      attr_reader :login_attr
 
       # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
       def authenticate(login, password)
@@ -86,6 +84,11 @@ module Hobo
       def encrypt(password, salt)
         Digest::SHA1.hexdigest("--#{salt}--#{password}--")
       end
+      
+      
+      def set_admin_on_first_user
+        before_create { |user| user.administrator = true if count == 0 }
+      end
 
     end
 
@@ -121,7 +124,7 @@ module Hobo
     def guest?
       false
     end
-
+    
     protected
     # Before filter that encrypts the password before having it stored in the database.
     def encrypt_password