hobo 0.8.3 → 0.8.4

data/lib/hobo/view_hints.rb

@@ -0,0 +1,58 @@
+module Hobo
+  
+  class ViewHints
+    
+    def self.enable
+      ActiveSupport::Dependencies.load_paths |= ["#{RAILS_ROOT}/app/viewhints"]
+    end
+  
+    def self.setter(name, default=nil, &block)
+      metaclass.send :define_method, name do |*args|
+        if args.empty?
+          instance_variable_get("@#{name}") || (default.is_a?(Proc) ? instance_eval(&default) : default)
+        else 
+          arg = if block
+                  block[*args] 
+                else
+                  args.first
+                end
+          instance_variable_set("@#{name}", arg)
+        end
+      end
+    end
+  
+    setter :model_name,  proc { name.sub(/Hints$/, "") }
+    
+    setter :field_names, {}
+    
+    setter :field_help,  {}
+    
+    setter :children,    proc { model.dependent_collections.sort_by(&:to_s) } do |*args|
+      args
+    end
+    
+    # Accessors
+    
+    class << self
+      
+      def model
+        model_name.constantize
+      end
+
+      def field_name(field)
+        field_names.fetch(field.to_sym, field.to_s.titleize)
+      end
+    
+      def primary_children
+        children.first
+      end
+      
+      def secondary_children
+        children.rest
+      end
+      
+    end
+    
+  end
+  
+end    

data/rails_generators/hobo/hobo_generator.rb

@@ -16,13 +16,17 @@ class HoboGenerator < Rails::Generator::Base
     record do |m|
       m.directory                     File.join("app/views/taglibs")
       m.directory                     File.join("app/views/taglibs/themes")
-      m.directory                     File.join("public/hobothemes")
       m.template "application.dryml", File.join("app/views/taglibs/application.dryml")
+      m.directory                     File.join("public/hobothemes")
+
+      m.directory                     File.join("app/models")
       m.file "guest.rb",              File.join("app/models/guest.rb")
-      m.file "dryml-support.js",      File.join("public/javascripts/dryml-support.js")
+
+      m.directory                     File.join("public/stylesheets")
       m.file "application.css",       File.join("public/stylesheets/application.css")
+      m.file "dryml-support.js",      File.join("public/javascripts/dryml-support.js")
+
       m.file "initializer.rb",        File.join("config/initializers/hobo.rb")
-      m.file "patch_routing.rb",      File.join("config/initializers/patch_routing.rb")
     end
   end
 

data/rails_generators/hobo/templates/guest.rb

@@ -1,19 +1,7 @@
 class Guest < Hobo::Guest
 
-  def can_update?(obj, field)
+  def administrator?
     false
   end
 
-  def can_delete?(obj)
-    false
-  end
-
-  def can_create?(obj)
-    false
-  end
-
-  def can_view?(obj, field)
-    true
-  end
-
 end

data/rails_generators/hobo_front_controller/hobo_front_controller_generator.rb

@@ -47,7 +47,7 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
     name = full_class_path
 
     route = ("  map.site_search  'search', :controller => '#{name}', :action => 'search'\n" +
-             "  map.homepage '', :controller => '#{name}', :action => 'index'")
+             "  map.root :controller => '#{name}', :action => 'index'")
 
     route_src = File.read(routes_path)
     return if route_src.include?(route)

data/rails_generators/hobo_model/hobo_model_generator.rb

@@ -9,10 +9,12 @@ class HoboModelGenerator < Rails::Generator::NamedBase
       m.directory File.join('app/models', class_path)
       m.directory File.join('test/unit', class_path)
       m.directory File.join('test/fixtures', class_path)
+      m.directory File.join("app/viewhints")
 
       # Model class, unit test, and fixtures.
-      m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
+      m.template 'model.rb',      File.join('app/models',    class_path, "#{file_name}.rb")
+      m.template 'hints.rb',      File.join('app/viewhints', class_path, "#{file_name}_hints.rb")
+      m.template 'unit_test.rb',  File.join('test/unit',     class_path, "#{file_name}_test.rb")
       m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
     end
   end

data/rails_generators/hobo_model/templates/hints.rb

@@ -0,0 +1,4 @@
+class <%= class_name %>Hints < Hobo::ViewHints
+
+
+end

data/rails_generators/hobo_model/templates/model.rb

@@ -10,21 +10,21 @@ class <%= class_name %> < ActiveRecord::Base
   end
 
 
-  # --- Hobo Permissions --- #
+  # --- Permissions --- #
 
-  def creatable_by?(user)
-    user.administrator?
+  def create_permitted?
+    acting_user.administrator?
   end
 
-  def updatable_by?(user, new)
-    user.administrator?
+  def update_permitted?
+    acting_user.administrator?
   end
 
-  def deletable_by?(user)
-    user.administrator?
+  def destroy_permitted?
+    acting_user.administrator?
   end
 
-  def viewable_by?(user, field)
+  def view_permitted?(field)
     true
   end
 

data/rails_generators/hobo_model_controller/hobo_model_controller_generator.rb

@@ -4,11 +4,20 @@ class HoboModelControllerGenerator < Rails::Generator::NamedBase
     args[0] = args[0].pluralize
     super(args, options)
   end
+  
+  attr_reader :subsite
 
   def manifest
     record do |m|
       # Check for class naming collisions.
       m.class_collisions class_path, "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
+      
+      if class_path.length == 1 and
+        subsite = class_path.first and
+        File.exist?(File.join('app/controllers', class_path, "#{subsite}_site_controller.rb"))
+        
+        @subsite = subsite.camelize
+      end
 
       # Controller, helper, views, and test directories.
       m.directory File.join('app/controllers', class_path)
@@ -33,4 +42,5 @@ class HoboModelControllerGenerator < Rails::Generator::NamedBase
                             "#{file_name}_helper.rb")
     end
   end
+
 end

data/rails_generators/hobo_model_controller/templates/controller.rb

@@ -1,4 +1,4 @@
-class <%= class_name %>Controller < ApplicationController
+class <%= class_name %>Controller < <%= subsite ? "#{subsite}::#{subsite}SiteController" : "ApplicationController" %>
 
   hobo_model_controller
 

data/rails_generators/hobo_rapid/templates/hobo-rapid.js

@@ -16,7 +16,7 @@ var Hobo = {
     searchRequest: null,
     uidCounter: 0,
     ipeOldValues: {},
-    spinnerMinTime: 1000, // milliseconds 
+    spinnerMinTime: 500, // milliseconds 
 
     uid: function() {
         Hobo.uidCounter += 1
@@ -101,9 +101,10 @@ var Hobo = {
             params.push(Form.serialize(form))
         }
 
-        Hobo.showSpinner(options.message, options.spinnerNextTo)
+        if (options.message != false) Hobo.showSpinner(options.message, options.spinnerNextTo)
+        
         var complete = function() {
-            Hobo.hideSpinner();
+            if (options.message != false) Hobo.hideSpinner();
             if (options.onComplete) options.onComplete.apply(this, arguments)
             if (form && options.refocusForm) Form.focusFirstElement(form)
             Event.addBehavior.reload()
@@ -154,15 +155,6 @@ var Hobo = {
         }
     },
     
-    getClassData: function(el, name) {
-        var match = el.className.match(new RegExp("(^| )" + name + ":(\\S+)($| )"))
-        return match && match[2]
-    },
-    
-    getModelId: function(el) {
-        return Hobo.getClassData(el, 'model')
-    },
-
     onFieldEditComplete: function(el, newValue) {
         el = $(el)
         var oldValue = Hobo.ipeOldValues[el.id]
@@ -203,7 +195,7 @@ var Hobo = {
                         old = val
                         return (Hobo.fieldSetParam(el, val) + "&" + updateParams)
                     },
-                    onFailure: function(resp) { 
+                    onFailure: function(_, resp) {
                         alert(resp.responseText); el.innerHTML = old
                     },
                     onEnterEditMode: function() {
@@ -260,13 +252,13 @@ var Hobo = {
 
 
     putUrl: function(el) {
-        var spec = Hobo.parseFieldId(el)
+        var spec = Hobo.modelSpecForElement(el)
         return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id + "?_method=PUT"
     },
 
     
     urlForId: function(id) {
-        var spec = Hobo.parseId(id)
+        var spec = Hobo.parseModelSpec(id)
         var url = urlBase + "/" + Hobo.pluralise(spec.name)
         if (spec.id) { url += "/" + spec.id }
         return url
@@ -274,7 +266,7 @@ var Hobo = {
 
         
     fieldSetParam: function(el, val) {
-        var spec = Hobo.parseFieldId(el)
+        var spec = Hobo.modelSpecForElement(el)
         var res = spec.name + '[' + spec.field + ']=' + encodeURIComponent(val)
         if (typeof(formAuthToken) != "undefined") {
             res = res + "&" + formAuthToken.name + "=" + formAuthToken.value
@@ -300,7 +292,7 @@ var Hobo = {
             var objEl = Hobo.objectElementFor(el)
             Hobo.showSpinner('Removing');
             function complete() {
-                if (options.fade) { Hobo.fadeObjectElement(el) }
+                if (options.fade) { Hobo.fadeObjectElement(objEl) }
                 Hobo.hideSpinner()
             }
             if (updates && updates.length > 0) {
@@ -319,7 +311,7 @@ var Hobo = {
     ajaxUpdateField: function(element, field, value, updates) {
         var objectElement = Hobo.objectElementFor(element)
         var url = Hobo.putUrl(objectElement)
-        var spec = Hobo.parseFieldId(objectElement)
+        var spec = Hobo.modelSpecForElement(objectElement)
         var params = spec.name + '[' + field + ']=' + encodeURIComponent(value)
         new Hobo.ajaxRequest(url, updates, { method:'put', message: "Saving...", params: params });
     },
@@ -333,16 +325,27 @@ var Hobo = {
             new Effect.Appear(empty, {delay:0.3})
         }
     },
+    
+
+    getClassData: function(el, name) {
+        var match = el.className.match(new RegExp("(^| )" + name + "::(\\S+)($| )"))
+        return match && match[2]
+    },
+    
+
+    getModelId: function(el) {
+        return Hobo.getClassData(el, 'model')
+    },
 
 
-    parseFieldId: function(el) {
+    modelSpecForElement: function(el) {
         var id = Hobo.getModelId(el)
-        return id && Hobo.parseId(id)
+        return id && Hobo.parseModelSpec(id)
     },
 
 
-    parseId: function(id) {
-        m = id.gsub('-', '_').match(/^([a-z_]+)(?:_([0-9]+))?(?:_([a-z_]+))?$/)
+    parseModelSpec: function(id) {
+        m = id.gsub('-', '_').match(/^([^:]+)(?::([^:]+)(?::([^:]+))?)?$/)
         if (m) return { name: m[1], id: m[2], field: m[3] }
     },
 
@@ -351,7 +354,7 @@ var Hobo = {
         var m
         while(el.getAttribute) {
             id = Hobo.getModelId(el)
-            if (id) m = id.match(/^([a-z0-9-]+)-([0-9]+)(-[a-z0-9-]*)?$/);
+            if (id) m = id.match(/^[^:]+:[^:]+$/);
             if (m) break;
             el = el.parentNode;
         }
@@ -367,12 +370,19 @@ var Hobo = {
     showSpinner: function(message, nextTo) {
         clearTimeout(Hobo.spinnerTimer)
         Hobo.spinnerHideAt = new Date().getTime() + Hobo.spinnerMinTime;
-        if(t = $('ajax-progress-text')) Element.update(t, message);
-        if(e = $('ajax-progress')) {
+        if (t = $('ajax-progress-text')) {
+            if (!message || message.length == 0) {
+                t.hide()
+            } else {
+                Element.update(t, message);
+                t.show()
+            }
+        }
+        if (e = $('ajax-progress')) {
             if (nextTo) {
                 var pos = $(nextTo).cumulativeOffset()
-                e.style.top = pos.top + "px"
-                e.style.left = (pos.left + nextTo.offsetWidth) + "px"
+                e.style.top = pos.top - nextTo.offsetHeight + "px"
+                e.style.left = (pos.left + nextTo.offsetWidth + 5) + "px"
             }
             e.style.display = "block";
         }
@@ -443,8 +453,13 @@ var Hobo = {
 	    var table= "<table cellpadding='0' cellspacing='0' border='0' style='border-collapse: collapse; border-spacing: 0'" + attrs + ">" + 
 	               rows + "</table>"
 	    e.outerHTML = table
+    },
+
+    makeHtmlEditor: function(textarea) {
+        // do nothing - plugins can overwrite this method
     }
 
+
 }
 
 Element.findContaining = function(el, tag) {
@@ -549,7 +564,7 @@ new HoboBehavior("ul.input-many", {
                     "</div></li>"
       var newItem = DOM.Builder.fromHTML(newItem)
       ul.appendChild(newItem);
-      $(newItem).select('input').each(function(input){ input.value="" })
+      this.clearInputs(newItem);
       
       this.updateButtons()
       this.updateInputNames()
@@ -561,21 +576,35 @@ new HoboBehavior("ul.input-many", {
       Event.stop(ev)
       var self = this;
       var li = el.up('li')
-      new Effect.BlindUp(li, { duration: 0.3, afterFinish: function (ef) {
-          li.remove() 
-          self.updateButtons()
-          self.updateInputNames()
-      } });
+      if (li.parentNode.childElements().length == 1) {
+          // It's the last one - don't remove it, just clear it
+          this.clearInputs(li)
+      } else {      
+          new Effect.BlindUp(li, { duration: 0.3, afterFinish: function (ef) {
+              li.remove() 
+              self.updateButtons()
+              self.updateInputNames()
+          } });
+      }
   },
   
+  clearInputs: function(item) {
+      $(item).select('input').each(function(input){
+          if (input.getAttribute('type').toLowerCase() == 'hidden') {
+              input.remove()
+          } else {
+              input.value = ""
+          }
+      })
+  },
+   
   updateButtons: function() {
       var removeButton = "<button class='remove-item'>-</button>"
-      var addButton = "<button class='add-item'>+</button>"
-      
-      
+      var addButton    = "<button class='add-item'>+</button>"
+
       var ul = this.element
       if (ul.childElements().length == 1) {
-          ul.down('li').down('div.buttons').innerHTML = addButton
+          ul.down('li').down('div.buttons').innerHTML = removeButton + ' ' + addButton
       } else {
           var add = ul.selectChildren('li').selectChildren('div.buttons').down('button.add-item')
           if (add) add.remove()
@@ -619,26 +648,32 @@ SelectManyInput = Behavior.create({
             selected.disabled = true
             select.value = ""
             Event.addBehavior.reload()
+            this.element.fire("rapid:add", { element: newItem })
+            this.element.fire("rapid:change", { element: newItem })
         }
     },
 
-    onclick : function(e) {
-        var el = Event.element(e);
-        Event.stop(e);
+    onclick : function(ev) {
+        var el = Event.element(ev);
         if (el.match(".remove-item")) { this.removeOne(el.parentNode) }
     },
 
     removeOne : function(el) {
+        var element = this.element
         new Effect.BlindUp(el, 
                            { duration: 0.3,
-                             afterFinish: function (ef) { ef.element.remove() } } ) 
+                             afterFinish: function (ef) { 
+                                 ef.element.remove() 
+                                 element.fire("rapid:remove", { element: el })
+                                 element.fire("rapid:change", { element: el })
+                                 } } ) 
         var label = el.down('span').innerHTML
-        var option = $A(this.element.getElementsByTagName('option')).find(function(o) { return o.innerHTML == label })
+        var option = $A(element.getElementsByTagName('option')).find(function(o) { return o.innerHTML == label })
         option.disabled = false
     },
 
     itemAdded: function(item, option) {
-        this.hiddenField(item).value = option.innerHTML
+        this.hiddenField(item).value = option.value
     },
 
     hiddenField: function(item) {
@@ -668,11 +703,12 @@ NameManyInput = Object.extend(SelectManyInput, {
                               
 AutocompleteBehavior = Behavior.create({
     initialize : function() {
-        var target    = this.element.className.match(/complete-on:([\S]+)/)[1].split(':')
-        var model     = target[0]
+        var match     = this.element.className.match(/complete-on::([\S]+)/)
+        var target    = match[1].split('::')
+        var typedId   = target[0]
         var completer = target[1]
 
-        var spec = Hobo.parseId(model)
+        var spec = Hobo.parseModelSpec(typedId)
         var url = urlBase + "/" + Hobo.pluralise(spec.name) +  "/complete_" + completer
         var parameters = spec.id ? "id=" + spec.id : ""
         new Ajax.Autocompleter(this.element, 
@@ -692,13 +728,12 @@ Event.addBehavior({
 
     'div.select-many.input' : SelectManyInput(),
 
-    '.association-count:click' : function(e) {
-	    new Effect.ScrollTo('primary-collection', {duration: 1.0, offset: -20, transition: Effect.Transitions.sinoidal});
-	    Event.stop(e);
+    'textarea.html' : function() {
+        Hobo.makeHtmlEditor(this)
     },
 
     'form.filter-menu select:change': function(event) {
-        var paramName = this.up('form').down('input[type=hidden]').value.gsub("-", "_")
+        var paramName = this.getAttribute('name')
         var params = {}
         var remove = [ 'page' ]
 	    if ($F(this) == '') { 
@@ -713,10 +748,11 @@ Event.addBehavior({
 
     '.string.in-place-edit, .datetime.in-place-edit, .date.in-place-edit, .integer.in-place-edit, .float.in-place.edit, big-integer.in-place-edit' :
      function (ev) {
-        var ipe = Hobo._makeInPlaceEditor(this)
-        ipe.getText = function() {
-            return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
-        }
+
+         var ipe = Hobo._makeInPlaceEditor(this)
+         ipe.getText = function() {
+             return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
+         }
     },
 
     '.text.in-place-edit, .markdown.in-place-edit, .textile.in-place-edit' : function (ev) {
@@ -773,7 +809,7 @@ ElementSet = Class.create(Enumerable, {
     select: function(selector) {
         return new ElementSet(this.items.invoke('select', selector).flatten())
     },
-    
+
     down: function(selector) {
         for (var i = 0; i < this.items.length; i++) {
             var match = this.items[i].down(selector)
@@ -801,4 +837,3 @@ Element.addMethods({
         return new ElementSet(Selector.matchElements(element.childElements(), selector))
     }
 })
-