hobo 1.3.0.RC4 → 1.3.0.pre10

data/lib/generators/hobo/model.rb

@@ -0,0 +1,13 @@
+require 'generators/hobo_support/model'
+module Generators
+  module Hobo
+    Model = classy_module do
+      include Generators::HoboSupport::Model
+
+      def generate_hint_file
+        invoke 'hobo:hints', [name]
+      end
+
+    end
+  end
+end

data/lib/generators/hobo/model/USAGE

@@ -10,10 +10,11 @@ Examples:
             Model:      app/models/account.rb
             Test:       test/unit/account_test.rb
             Fixtures:   test/fixtures/accounts.yml
+            Viewhints:  app/viewhints/account_hints.rb
 
     $ rails generate hobo:model post title:string body:text published:boolean
 
         creates a Post model with a string title, text body, and published flag.
 
-    After the model is created, and the fields are specified, use hobo:migration
-    to create the migrations incrementally.
+After the model is created, and the fields are specified, use hobo:migration
+to create the migrations incrementally.

data/lib/generators/hobo/model/model_generator.rb

@@ -1,11 +1,10 @@
 require 'rails/generators/active_record'
-require 'generators/hobo_support/model'
 
 module Hobo
   class ModelGenerator < ActiveRecord::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
-    include Generators::HoboSupport::Model
+    include Generators::Hobo::Model
 
   end
 end

data/lib/generators/hobo/rapid/rapid_generator.rb

@@ -16,8 +16,6 @@ module Hobo
       copy_file "hobo-rapid.css",     "public/stylesheets/hobo-rapid.css"
       directory "themes/clean/public","public/hobothemes/clean"
       directory "themes/clean/views", "app/views/taglibs/themes/clean"
-      directory "themes/clean-sidemenu/public","public/hobothemes/clean-sidemenu"
-      directory "themes/clean-sidemenu/views", "app/views/taglibs/themes/clean-sidemenu"
     end
 
   end

data/lib/generators/hobo/rapid/templates/hobo-rapid.js

@@ -16,7 +16,7 @@ var Hobo = {
     searchRequest: null,
     uidCounter: 0,
     ipeOldValues: {},
-    spinnerMinTime: 500, // milliseconds
+    spinnerMinTime: 500, // milliseconds 
 
     uid: function() {
         Hobo.uidCounter += 1
@@ -34,7 +34,6 @@ var Hobo = {
         var params = Hobo.fieldSetParam(el, val)
         var p = el.getAttribute("hobo-ajax-params")
         if (p) params = params + "&" + p
-        params = params + '&_method=PUT'
 
         var opts = Object.merge(options || {}, { params: params, message: el.getAttribute("hobo-ajax-message")})
         Hobo.ajaxRequest(Hobo.putUrl(el), updates, opts)
@@ -54,7 +53,7 @@ var Hobo = {
                     i += 1
                 }
             })
-            params.push("page_path=" + encodeURIComponent(hoboPagePath))
+            params.push("page_path=" + hoboPagePath)
         }
 
         if (resultUpdates) {
@@ -89,7 +88,7 @@ var Hobo = {
         if (typeof(formAuthToken) != "undefined") {
             params.push(formAuthToken.name + "=" + formAuthToken.value)
         }
-
+        
         updateParams = Hobo.ajaxUpdateParams(updates, options.resultUpdate)
         if (updateParams != "") { params.push(updateParams) }
 
@@ -103,7 +102,7 @@ var Hobo = {
         }
 
         if (options.message != false) Hobo.showSpinner(options.message, options.spinnerNextTo)
-
+        
         var complete = function() {
             if (options.message != false) Hobo.hideSpinner();
             if (options.onComplete) options.onComplete.apply(this, arguments)
@@ -112,7 +111,7 @@ var Hobo = {
         }
         var success = function() {
             if (options.onSuccess) options.onSuccess.apply(this, arguments)
-            if (form && options.resetForm) form.reset();
+            if (form && options.resetForm) form.reset();            
         }
         if (options.method && options.method.toLowerCase() == "put") {
             delete options.method
@@ -155,7 +154,7 @@ var Hobo = {
             }
         }
     },
-
+    
     onFieldEditComplete: function(el, newValue) {
         el = $(el)
         var oldValue = Hobo.ipeOldValues[el.id]
@@ -207,7 +206,7 @@ var Hobo = {
                             el.innerHTML = editable_text
                         }
                         if (el.innerHTML.gsub(" ", " ") == blank_message) {
-                            el.innerHTML = ""
+                            el.innerHTML = "" 
                         } else {
                             Hobo.ipeOldValues[el.id] = el.innerHTML
                         }
@@ -228,7 +227,7 @@ var Hobo = {
         var clear = function() { Hobo.hide(search_results_panel); el.clear() }
 
         // Close window on [Escape]
-        Event.observe(el, 'keypress', function(ev) {
+        Event.observe(el, 'keypress', function(ev) { 
             if (ev.keyCode == 27) clear()
         });
 
@@ -258,12 +257,11 @@ var Hobo = {
 
 
     putUrl: function(el) {
-        /* we used to append _method=put here, but it doesn't work in Rails 3 */
         var spec = Hobo.modelSpecForElement(el)
-        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id
+        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id + "?_method=PUT"
     },
 
-
+    
     urlForId: function(id) {
         var spec = Hobo.parseModelSpec(id)
         var url = urlBase + "/" + Hobo.pluralise(spec.name)
@@ -271,7 +269,7 @@ var Hobo = {
         return url
     },
 
-
+        
     fieldSetParam: function(el, val) {
         var spec = Hobo.modelSpecForElement(el)
         var res = spec.name + '[' + spec.field + ']=' + encodeURIComponent(val)
@@ -284,8 +282,8 @@ var Hobo = {
 
     fadeObjectElement: function(el) {
         var fadeEl = Hobo.objectElementFor(el)
-        new Effect.Fade(fadeEl, { duration: 0.5, afterFinish: function (ef) {
-            ef.element.remove()
+        new Effect.Fade(fadeEl, { duration: 0.5, afterFinish: function (ef) { 
+            ef.element.remove() 
         } });
         Hobo.showEmptyMessageAfterLastRemove(fadeEl)
     },
@@ -332,13 +330,13 @@ 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')
@@ -444,7 +442,24 @@ var Hobo = {
 
         return window.location.href.sub(/(\?.*|$)/, "?" + params.toQueryString())
     },
-
+    
+    
+    fixSectionGroup: function(e) {
+	    rows = e.childElements().map(function(e, i) {
+    	    cells = e.childElements().map(function(e, i) {
+        	    return e.outerHTML.sub("<DIV", "<td  valign='top'").sub(/<\/DIV>$/i, "</td>")
+            }).join('')
+
+            var attrs = e.outerHTML.match(/<DIV([^>]+)/)[1]
+            return "<tr" + attrs + ">" + cells + "</tr>"
+	    }).join("\n")
+
+        var attrs = e.outerHTML.match(/<DIV([^>]+)/)[1]
+
+	    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
@@ -485,8 +500,8 @@ Ajax.InPlaceEditor.prototype.enterEditMode = function(evt) {
 // Fix Safari in-place-editor bug
 Ajax.InPlaceEditor.prototype.removeForm = function() {
     if (!this._form) return;
-
-    if (this._form.parentNode) { try { Element.remove(this._form); } catch (e) {}}
+    
+    if (this._form.parentNode) { try { Element.remove(this._form); } catch (e) {}}    
     this._form = null;
     this._controls = { };
 }
@@ -507,7 +522,7 @@ Element.Methods.$$ = function(e, css) {
 
 
 HoboBehavior = Class.create({
-
+    
     initialize: function(mainSelector, features) {
         this.mainSelector = mainSelector
         this.features = features
@@ -516,10 +531,10 @@ HoboBehavior = Class.create({
             document.observe("dom:loaded", features.initialize);
         }
     },
-
+    
     addEvents: function(parentSelector, events) {
         var self = this
-
+        
         for (selector in events) {
             fullSelector = parentSelector + ' ' + selector
             var rhs = events[selector]
@@ -529,9 +544,9 @@ HoboBehavior = Class.create({
                 this.addEvents(fullSelector, rhs)
             }
         }
-
+        
     },
-
+    
     addBehavior: function(selector, handler) {
         var self = this
         behavior = {}
@@ -541,12 +556,12 @@ HoboBehavior = Class.create({
         }
         Event.addBehavior(behavior)
     }
-
+    
 })
 
 
 HoboInputMany = {
-
+  
   events: {
       "> li > div.buttons": {
           ".add-item:click":    'addOne',
@@ -556,21 +571,17 @@ HoboInputMany = {
 
   initialize: function(ev) {
       /* the second clause should be sufficient, but it isn't in IE7.  See bug 603  */
-      Element.select(ev.target, ".input-many-template").each(function  (templ) {
-          templ.select("input:hidden,select:hidden,textarea:hidden,button:hidden").each(function(input) {
-              if(!input.disabled) {
-                  input.disabled = true;
-                  input.addClassName("input_many_template_input");
-              }
-          })
+      Element.select(ev.target, ".input-many-template input:hidden, .input-many-template select:hidden, .input-many-template textarea:hidden, .input-many-template button:hidden").each(function(input) {
+          if(!input.disabled) {
+              input.disabled = true;
+              input.addClassName("input_many_template_input");
+          }
       });
 
       // disable all elements inside our template, and mark them so we can find them later.
-      Element.select(ev.target, ".input-many-template").each(function (templ) {
-          templ.select("input:enabled,select:enabled,textarea:enabled,button:enabled").each(function(input) {
-              input.disabled = true;
-              input.addClassName("input_many_template_input");
-          });
+      Element.select(ev.target, ".input-many-template input:enabled, .input-many-template select:enabled, .input-many-template textarea:enabled, .input-many-template button:enabled").each(function(input) {
+          input.disabled = true;
+          input.addClassName("input_many_template_input");
       });
 
       Element.select(ev.target, ".sortable-input-many").each(function(el) {
@@ -587,12 +598,12 @@ HoboInputMany = {
 
   createSortable: function() {
       Sortable.create(this.id, {
-          constraint: 'vertical',
-          handle: 'ordering-handle',
-          overlap: 'vertical',
+          constraint: 'vertical', 
+          handle: 'ordering-handle', 
+          overlap: 'vertical', 
           scroll: 'window',
           onUpdate: function(list) {
-              HoboInputMany.fixIndices.call(list);
+              HoboInputMany.fixIndices.call(list);                
           }
       });
   },
@@ -607,7 +618,7 @@ HoboInputMany = {
       var id_sub = id_prefix + '_' + new_index.toString();
       var class_re = RegExp(RegExp.escape(name_prefix)+ "\[\-?[0-9]+\]");
       var class_sub = name_sub;
-
+      
       return function() {
           if(this.name) {
               this.name = this.name.replace(name_re, name_sub);
@@ -634,9 +645,9 @@ HoboInputMany = {
       return Number(this.id.match(/_([-0-9]+)$/)[1]);
   },
 
-    /* For some reason, select() and down() and all those useful functions aren't working for us.  Roll our own replacement.
+    /* For some reason, select() and down() and all those useful functions aren't working for us.  Roll our own replacement.   
 
-      this: element to recurse on.
+      this: element to recurse on.   
       klass: class to filter on
       f: function to invoke
     */
@@ -680,7 +691,7 @@ HoboInputMany = {
       Event.stop(ev);
       var ul = el.up('ul.input-many'), li = el.up('li.input-many-li');
 
-      if(li.id.search(/_-1$/)>=0 && ul.immediateDescendants().length>2) {
+      if(li.id.search(/_-1$/ && ul.immediateDescendants().length>2)>=0) {
           /* if(console) console.log("IE7 messed up again (bug 605)"); */
           return;
       }
@@ -726,7 +737,7 @@ HoboInputMany = {
           li.childWithClass("buttons").childWithClass("remove-item").removeClassName("hidden");
           li.childWithClass("buttons").childWithClass("add-item").addClassName("hidden");
       }
-
+      
       return;
   },
 
@@ -746,10 +757,10 @@ HoboInputMany = {
       // rename everybody from me onwards
       var i=this.getIndex.call(li)
       var n=li.next();
-      for(; n; i+=1, n=n.next()) {
+      for(; n; i+=1, n=n.next()) {          
           var name_updater = this.getNameUpdater.call(ul, i);
           HoboInputMany.recurse_elements_with_class.call(n, null, function(el) {name_updater.call(el);});
-      }
+      } 
 
       // adjust +/- buttons on the button element as appropriate
       var last=ul.childElements()[ul.childElements().length-1];
@@ -772,7 +783,7 @@ HoboInputMany = {
 
       new Effect.BlindUp(li, { duration: 0.3, afterFinish: function (ef) {
           ul.fire("rapid:change")
-          li.remove()
+          li.remove() 
       } });
 
   }
@@ -780,7 +791,7 @@ HoboInputMany = {
 
 
 }
-
+  
 new HoboBehavior("ul.input-many", HoboInputMany);
 
 
@@ -792,7 +803,7 @@ SelectManyInput = Behavior.create({
     },
 
     addOne : function() {
-        var select = this.element.down('select')
+        var select = this.element.down('select') 
         var selected = select.options[select.selectedIndex]
         if ($F(select) != "") {
             var newItem = $(DOM.Builder.fromHTML(this.element.down('.item-proto').innerHTML.strip()))
@@ -816,13 +827,13 @@ SelectManyInput = Behavior.create({
 
     removeOne : function(el) {
         var element = this.element
-        new Effect.BlindUp(el,
+        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 optgroup = element.down("optgroup[label="+label+"]")
         var option = new Element("option", {value:optgroup.readAttribute("alt")})
@@ -835,7 +846,7 @@ SelectManyInput = Behavior.create({
     },
 
     hiddenField: function(item) {
-        return item.down('input[type=hidden]')
+        return item.down('input[type=hidden]') 
         //return item.getElementsByClassName("hidden-field")[0]
     }
 
@@ -844,7 +855,7 @@ SelectManyInput = Behavior.create({
 
 NameManyInput = Object.extend(SelectManyInput, {
     addOne : function() {
-        var select = this.element.down('select')
+        var select = this.element.down('select') 
         var selected = select.options[select.selectedIndex]
         if (selected.value != "") {
             var newItem = $(DOM.Builder.fromHTML(this.element.down('.item-proto').innerHTML.strip()))
@@ -858,10 +869,10 @@ NameManyInput = Object.extend(SelectManyInput, {
     }
 })
 
-
+             
 AutocompleteBehavior = Behavior.create({
     initialize : function() {
-        this.minChars  = parseInt(Hobo.getClassData(this.element, "min-chars"));
+        this.minChars  = parseInt(Hobo.getClassData(this.element, "min-chars")); 
         var match     = this.element.className.match(/complete-on::([\S]+)/)
         var target    = match[1].split('::')
         var typedId   = target[0]
@@ -870,9 +881,9 @@ AutocompleteBehavior = Behavior.create({
         var spec = Hobo.parseModelSpec(typedId)
         var url = urlBase + "/" + Hobo.pluralise(spec.name) +  "/complete_" + completer
         var parameters = spec.id ? "id=" + spec.id : ""
-        this.autocompleter = new Ajax.Autocompleter(this.element,
-            this.element.next('.completions-popup'),
-            url,
+        this.autocompleter = new Ajax.Autocompleter(this.element, 
+            this.element.next('.completions-popup'), 
+            url, 
             {paramName:'query', method:'get', parameters: parameters, minChars: this.minChars,
             afterUpdateElement: this.afterUpdateElement});
     },
@@ -882,7 +893,7 @@ AutocompleteBehavior = Behavior.create({
             this.element.value = '';
             this.element.removeClassName("nil-value");
         }
-        if(this.minChars==0) {
+        if(this.minChars==0) { 
             this.autocompleter.activate();
         }
     },
@@ -890,13 +901,17 @@ AutocompleteBehavior = Behavior.create({
     afterUpdateElement: function(input, li) {
         input.fire("rapid:autocomplete-assigned");
     }
-
+        
 })
 
 
 
 Event.addBehavior.reassignAfterAjax = true;
 Event.addBehavior({
+    
+    'div.section-group' : function() {
+        if (Prototype.Browser.IE) Hobo.fixSectionGroup(this);
+    },
 
     'div.select-many.input' : SelectManyInput(),
 
@@ -908,7 +923,7 @@ Event.addBehavior({
         var paramName = this.getAttribute('name')
         var params = {}
         var remove = [ 'page' ]
-	    if ($F(this) == '') {
+	    if ($F(this) == '') { 
             remove.push(paramName)
         } else {
             params[paramName] = $F(this)
@@ -938,10 +953,10 @@ Event.addBehavior({
         if (Hobo.makeInPlaceHtmlEditor) {
             Hobo.makeInPlaceHtmlEditor(this)
         } else {
-            var options = {
+            var options = { 
                 rows: 2, handleLineBreaks: false, okButton: true, cancelLink: true, okText: "Save", submitOnBlur: false
             }
-            var ipe = Hobo._makeInPlaceEditor(this, options)
+            var ipe = Hobo._makeInPlaceEditor(this, options) 
             ipe.getText = function() {
                 // Be careful!  we're not calling unescapeHTML() here!
                 return this.element.innerHTML
@@ -955,7 +970,7 @@ Event.addBehavior({
             Hobo.ajaxSetFieldForElement(el, $F(el))
         }
     },
-
+                                            
     "input.live-search[type=search]" : function(e) {
         var element = this
         new Form.Element.Observer(element, 1.0, function() { Hobo.doSearch(element) })
@@ -965,23 +980,23 @@ Event.addBehavior({
 });
 
 ElementSet = Class.create(Enumerable, {
-
+    
     initialize: function(array) {
         this.items = array
     },
-
+    
     _each: function(fn) {
         return this.items.each(fn)
     },
-
+    
     selectChildren: function(selector) {
         return new ElementSet(this.items.invoke('selectChildren', selector).pluck('items').flatten())
     },
-
+    
     child: function(selector) {
         return this.selectChildren(selector).first()
     },
-
+    
     select: function(selector) {
         return new ElementSet(this.items.invoke('select', selector).flatten())
     },
@@ -993,11 +1008,11 @@ ElementSet = Class.create(Enumerable, {
         }
         return null
     },
-
+    
     size: function() {
         return this.items.length
     },
-
+    
     first: function() {
         return this.items.first()
     },
@@ -1005,7 +1020,7 @@ ElementSet = Class.create(Enumerable, {
     last: function() {
         return this.items.last()
     }
-
+    
 })
 
 Element.addMethods({