hobo 0.6.4 → 0.7.0

data/bin/hobo

@@ -57,10 +57,13 @@ end
 puts "\nGenerating Rails app...\n"
 system("rails #{app_path}")
 
+
 Dir.chdir(app_path) do
   gen = "ruby #{File.join('script', 'generate')}"
   plugin = "ruby #{File.join('script', 'plugin')}"
-  
+
+  FileUtils.touch("public/stylesheets/application.css")
+
   puts "\nInstalling classic_pagination\n"
   command(plugin, "install svn://errtheblog.com/svn/plugins/classic_pagination")
   
@@ -93,8 +96,3 @@ Dir.chdir(app_path) do
   end
 end
 
-puts <<-END
-NOTE: If you intend to use the in-place-editors, the new form authenticity
-features (CSRF protection) are not supported. You'll need to comment out the 
-'protect_from_forgery' declaration in app/controllers/application.rb
-END

data/hobo_files/plugin/CHANGES.txt

@@ -1,3 +1,173 @@
+=== Release 0.7 ===
+
+Hobo 0.7 is tested against Rails 1.99.1 (aka Rais 2.0 RC2)
+
+DRYML
+
+  Switched to dashes instead of underscores for tag and attributes
+  names. These are converted to underscores in the underlying ruby
+  code.
+
+  Unification of tempalte tags and non-template tags. There is now
+  only one type of tag and two different ways to call a tag:
+
+    <my-tag>content directly inside the tag</my-tag>
+
+    <my-tag>
+      <a-parameter:>Content inside a named parameter (note the colon)</a-parameter>
+      <another-parameter:>Some more content</another-parameter>
+    </my-tag>
+
+    Note that these styles cannot be mixed. If there is a parameter
+    inside a tag call, there must be only parameters (and whitespace,
+    which is not output)
+
+    In the first style, the call is implicitly equivalent to:
+
+        <my-tag>
+          <default:>content directly inside the tag</default>
+        </my-tag>
+
+    And by the same token, <tagbody/> is now written:
+
+      <do param="default"/>
+
+    The tagbody local variable is gone too. "if tagbody" is now
+    "if all_parameters.default?" and "tagbody.call" is now
+    "all_parameters.default"
+
+
+  A rake task hobo:fixdryml has been added which does a pretty good
+  job of converting Hobo 0.6 DRYML source-code to the new style. It
+  will change every file in app/views/**/*.dryml, and keeps a backup
+  copy of app/views in app_views_before_fixdryml. If you pass it CSS=y
+  and ID=y it will 'dasherize' css classes and IDs too, which is the
+  new Hobo concention. You can also pass DIR=... if you want to point
+  it somewhere other than app/views. It won't fix anything in erb
+  scriptlets, e.g. use of the tagbody local variable. Expect to do
+  some manual fixes after running the task (good job you've got that
+  thourough test suite eh?)
+
+  The add_classes helper now automatically dasherizes all class names.
+
+  New helper 'element'. Use in place of Rails' tag and content_tag
+  helper. It dasherizes attributes given as symbols.
+
+  
+Migration generator
+
+  Better support for STI. It no longer wants to generate tables for
+  the subclasses. Stil needed: a way of integrating fields declared in
+  the subclasses -- they are currently ignored by the generator.
+
+
+Hobo Rapid
+
+  In place editiing (and Ajax in general) will now provide the form
+  authentication token (CSRF protection) if available. No need to
+  disable protect_from_forgery any more.
+
+
+  Stylesheets:
+
+    Removed list-style: none from hobo_abse.css
+
+
+  Javascript:
+
+    Dasherized all css classes and dom IDs used.
+
+    Upgraded to latest low_pro.js
+
+  
+  New theme 'Clean'
+
+  New helper 'linkable?' can be given a record or class, and tells you
+  if Hobo has a route for it. Only works for 'show' and 'index'
+  actions so far.
+
+  Tag library
+
+    \\'/;p <a> now automatically knows not to generate (broken) links to
+    things that are not 'linkable?'. Outputs just the link content
+    instead.
+
+    We used to have <FieldList> and <field_list>. We now have
+    <field-list> and <labelled-item-list>
+
+    <UL> is now <ul>, and only has the iteration behaviour if you give
+    a <li:> parameter. Otherwise it's just like a static tag.
+
+    <Table> is now <table> and only has the special behaviour if you
+    give a 'fields' attribute or '<tr:>' parameter. Otherwise it's
+    just like a static tag.
+
+    <view> for dates and times no longer break when the context is
+    nil.
+
+    <count> - unless-none attribute is gone. user if-any
+
+    <theme-stylesheet> now takes a 'name' attribute
+
+    <delete-button> takes a 'subsite' attribute
+    
+
+Rake tasks
+
+  New task hobo:fixdryml (see DRYML section above)
+
+  dump_fixtures is now hobo:fixtures:dump
+
+
+
+
+Hobo models
+
+  Automatically declares the field 'position :integer' if the model
+  acts_as_list.
+
+  never_show declarations are now inherited
+
+  Fix: def_scope was broken when the scope name ended '?'
+
+  Fix: Hobo broke the 'guard_protected_attributes' optional parameter
+  to attributes=. (this was breaking attachment_fu)
+
+  Fix: assigning Date and Time objects in mass-assignment was broken.
+
+
+User model
+
+  Newly generated user models (hobo_user_model generator) now give
+  create permission to all by default (to enable signup).
+
+  logins_count renamed to login_count (Hobo manages this feild for you
+  if it exists).
+
+
+Core extensions
+
+  Module#alias_tag_chain, which never should have been there is
+  gone. (It's not needed now that camel-case tags have gone).
+
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 === Release 0.6.4 ===
 
 Fix: In-place-editors were not working with the new version of

data/hobo_files/plugin/generators/hobo_front_controller/templates/index.dryml

@@ -1,26 +1,26 @@
-<Page title="<%= app_name %>">
+<page title="<%= app_name %>">
 
-  <content_header>
-    <h1 class="front_page_title"><%= app_name %></h1>
+  <content-header:>
+    <h1 class="front-page-title"><%= app_name %></h1>
     <panel>
-      <div style="margin-left: 40px; ">
+      <div>
         <h3>Congratulations! Your Hobo Rails App is up and running</h3>
         <ul>
           <li>To customise this page: edit app/views/<%= file_name %>/index.dryml </li>
         </ul>
       </div>
     </panel>
-  </content_header>
+  </content-header>
 
 
-  <content_body>
+  <content-body:>
     <repeat with="&Hobo.models">
       <panel>
         <header><h2><%%= this.name.titlecase.pluralize %></h2></header>
         <section>
           <if test="&this.count == 0">
             <p>There are no <%%= this.name.titleize.pluralize %></p>
-            <if test="&can_create?(this)">
+            <if test="&can_create?">
               <p>Create a <a to="&this" action="new"/>.</p>
             </if>
           </if>
@@ -33,6 +33,6 @@
         </section>
       </panel>
     </repeat>
-  </content_body>
+  </content-body>
   
-</Page>
+</page>

data/hobo_files/plugin/generators/hobo_front_controller/templates/search.dryml

@@ -1,19 +1,19 @@
-<Page title="Search">
-  <body onload="Hobo.applyEvents(); Hobo.doSearch('search_field')"/>
+<page title="Search">
+  <body: onload="Hobo.applyEvents(); Hobo.doSearch('search-field')"/>
 
-  <content_body>
+  <content-body:>
     <panel class="red" style="margin-top: 40px">
       <h2>Search</h2>
-      <div class='search' style='margin:10px'>
-        <input type='text' id="search_field" class="search_bhv" style="width: 90%"/>
+      <div class="search">
+        <input type="text" id="search-field" class="search-bhv" style="width: 90%"/>
         <spinner id="search_spinner"/>
       </div>
     </panel>
 
-    <panel class="hidden" id="search_results_panel">
+    <panel class="hidden" id="search-results-panel">
       <h2>Results</h2>
-      <section id="search_results">&nbsp;</section>
+      <section id="search-results">&nbsp;</section>
     </panel>
-  </content_body>
+  </content-body>
 
-</Page>
+</page>

data/hobo_files/plugin/generators/hobo_migration/hobo_migration_generator.rb

@@ -7,6 +7,12 @@ class HoboMigrationGenerator < Rails::Generator::Base
                                               "hobo_migration_#{i+1}"
                                             end
   end
+  
+  def table_model_classes
+    ActiveRecord::Base.send(:subclasses).
+      reject {|c| c.name.starts_with?("CGI::") }.
+      select {|c| c.superclass == ActiveRecord::Base}
+  end
 
   def manifest
     connection = ActiveRecord::Base.connection
@@ -17,8 +23,7 @@ class HoboMigrationGenerator < Rails::Generator::Base
     
     ignore_model_names = Hobo::Migrations.ignore.every(:underscore)
     
-    all_models = ActiveRecord::Base.send(:subclasses).reject {|c| c.name.starts_with?("CGI::") }
-    models, ignore_models = all_models.partition do |m|
+    models, ignore_models = table_model_classes.partition do |m|
       m.name.underscore.not_in?(ignore_model_names) && m < Hobo::Model
     end
     ignore_tables = ignore_models.every(:table_name) | Hobo::Migrations.ignore_tables

data/hobo_files/plugin/generators/hobo_rapid/hobo_rapid_generator.rb

@@ -10,10 +10,10 @@ class HoboRapidGenerator < Hobo::Generator
     end
     
     record do |m|
-      m.file "hobo_rapid.js", "public/javascripts/hobo_rapid.js"
+      m.file "hobo-rapid.js", "public/javascripts/hobo-rapid.js"
       m.file "lowpro.js", "public/javascripts/lowpro.js"
-      m.file "hobo_base.css", "public/stylesheets/hobo_base.css"
-      m.file "hobo_rapid.css", "public/stylesheets/hobo_rapid.css"
+      m.file "reset.css", "public/stylesheets/reset.css"
+      m.file "hobo-rapid.css", "public/stylesheets/hobo-rapid.css"
       create_all(m, "themes/default/public", "public/hobothemes/default")
       create_all(m, "themes/default/views", "app/views/taglibs/themes/default")
     end
@@ -22,7 +22,7 @@ class HoboRapidGenerator < Hobo::Generator
   def import_tags
     path = File.join(RAILS_ROOT, "app/views/taglibs/application.dryml")
 
-    tag = "<include src=\"plugins/hobo/tags/rapid\"/>\n\n<set_theme name=\"default\"/>\n"
+    tag = "<include src=\"plugins/hobo/tags/rapid\"/>\n\n<set-theme name=\"default\"/>\n"
       
     src = File.read(path)
     return if src.include?(tag)

data/hobo_files/plugin/generators/hobo_rapid/templates/{hobo_rapid.js → hobo-rapid.js}

@@ -24,19 +24,19 @@ var Hobo = {
 
     updatesForElement: function(el) {
         el = $(el)
-        var updates = el.getAttribute("hobo_update")
+        var updates = el.getAttribute("hobo-update")
         return updates ? updates.split(/\s*,\s*/) : []
     },
 
     ajaxSetFieldForElement: function(el, val, options) {
         var updates = Hobo.updatesForElement(el)
         var params = Hobo.fieldSetParam(el, val)
-        var p = el.getAttribute("hobo_ajax_params")
+        var p = el.getAttribute("hobo-ajax-params")
         if (p) params = params + "&" + p
 
         var opts = Object.merge(options || {}, { params: params})
         Hobo.ajaxRequest(Hobo.putUrl(el),
-                         el.getAttribute("hobo_ajax_message") || "Changing...",
+                         el.getAttribute("hobo-ajax-message") || "Changing...",
                          updates,
                          opts)
     },
@@ -48,11 +48,11 @@ var Hobo = {
             updates.each(function(id_or_el) {
                 var el = $(id_or_el)
                 if (el) { // ignore update of parts that do not exist
-                    var dom_id
-                    dom_id = el.id
-                    if (!hoboParts[dom_id]) { throw "Update of dom-id that is not a part: " + dom_id }
-                    params.push("render["+i+"][part_context]=" + encodeURIComponent(hoboParts[dom_id]))
-                    params.push("render["+i+"][id]=" + dom_id)
+                    var partDomId
+                    partDomId = el.id
+                    if (!hoboParts[partDomId]) { throw "Update of dom-id that is not a part: " + partDomId }
+                    params.push("render["+i+"][part_context]=" + encodeURIComponent(hoboParts[partDomId]))
+                    params.push("render["+i+"][id]=" + partDomId)
                     i += 1
                 }
             })
@@ -86,6 +86,10 @@ var Hobo = {
             var url = form.action
         }
         var params = []
+
+        if (typeof(formAuthToken) != "undefined") {
+            params.push(formAuthToken.name + "=" + formAuthToken.value)
+        }
         
         updateParams = Hobo.ajaxUpdateParams(updates, options.resultUpdate)
         if (updateParams != "") { params.push(updateParams) }
@@ -155,16 +159,16 @@ var Hobo = {
         var oldValue = Hobo.ipeOldValues[el.id]
         delete Hobo.ipeOldValues[el.id]
 
-        var blank = el.getAttribute("hobo_blank_message")
+        var blank = el.getAttribute("hobo-blank-message")
         if (blank && newValue.strip().length == 0) {
             el.update(blank)
         } else {
             el.update(newValue)
         }
 
-        var modelId = el.getAttribute('hobo_model_id')
+        var modelId = el.getAttribute('hobo-model-id')
         if (oldValue) {
-            $$("*[hobo_model_id=" + modelId + "]").each(function(e) {
+            $$("*[hobo-model-id=" + modelId + "]").each(function(e) {
                 if (e != el && e.innerHTML == oldValue) e.update(newValue)
             })
         }
@@ -182,28 +186,29 @@ var Hobo = {
         opts = {okButton: false,
                 cancelLink: false,
                 submitOnBlur: true,
-                callback: function(form, val) {
-                    old = val
-                    return (Hobo.fieldSetParam(el, val) + "&" + updateParams)
-                },
-                onFailure: function(resp) { alert(resp.responseText); el.innerHTML = old },
                 evalScripts: true,
                 htmlResponse: false,
                 ajaxOptions: { method: "put" },
                 onEnterHover: null,
-                onLeaveHover: null
+                onLeaveHover: null,
+                callback: function(form, val) {
+                    old = val
+                    return (Hobo.fieldSetParam(el, val) + "&" + updateParams)
+                },
+                onFailure: function(resp) { 
+                    alert(resp.responseText); el.innerHTML = old
+                },
+                onEnterEditMode: function() {
+                    var blank_message = el.getAttribute("hobo-blank-message")
+                    if (el.innerHTML.gsub(" ", " ") == blank_message) {
+                        el.innerHTML = "" 
+                    } else {
+                        Hobo.ipeOldValues[el.id] = el.innerHTML
+                    }
+                }
                }
         Object.extend(opts, options)
-        var ipe = new Ajax.InPlaceEditor(el, Hobo.putUrl(el), opts)
-        ipe.onEnterEditMode = function() {
-            var blank_message = el.getAttribute("hobo_blank_message")
-            if (el.innerHTML.gsub(" ", " ") == blank_message) {
-                el.innerHTML = "" 
-            } else {
-                Hobo.ipeOldValues[el.id] = el.innerHTML
-            }
-        }
-        return ipe
+        return new Ajax.InPlaceEditor(el, Hobo.putUrl(el), opts)
     },
 
     applyEvents: function(root) {
@@ -212,21 +217,21 @@ var Hobo = {
             return new Selector(p).findElements(root)
         }
 
-        select(".in_place_textfield_bhv").each(function (el) {
+        select(".in-place-textfield-bhv").each(function (el) {
             ipe = Hobo._makeInPlaceEditor(el)
             ipe.getText = function() {
                 return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
             }
         })
 
-        select(".in_place_textarea_bhv").each(function (el) {
+        select(".in-place-textarea-bhv").each(function (el) {
             ipe = Hobo._makeInPlaceEditor(el, {rows: 2})
             ipe.getText = function() {
                 return this.element.innerHTML.gsub(/<br\s*\/?>/, "\n").unescapeHTML()
             }
         })
 
-        select(".in_place_html_textarea_bhv").each(function (el) {
+        select(".in-place-html-textarea-bhv").each(function (el) {
             var options = {rows: 2, handleLineBreaks: false}
             if (typeof(tinyMCE) != "undefined") options["submitOnBlur"] = false
             var ipe = Hobo._makeInPlaceEditor(el, options) 
@@ -250,22 +255,22 @@ var Hobo = {
             }
         })
 
-        select("select.number_editor_bhv").each(function(el) {
+        select("select.number-editor-bhv").each(function(el) {
             el.onchange = function() {
                 Hobo.ajaxSetFieldForElement(el, el.value)
             }
         })
                                                 
-        select(".autocomplete_bhv").each(function (el) {
+        select(".autocomplete-bhv").each(function (el) {
             options = {paramName: "query", minChars: 3, method: 'get' }
             if (el.hasClassName("autosubmit")) {
                 options.afterUpdateElement = function(el, item) { el.form.onsubmit(); }
             }
-            new Ajax.Autocompleter(el, el.id + "_completions", el.getAttribute("autocomplete_url"),
+            new Ajax.Autocompleter(el, el.id + "-completions", el.getAttribute("autocomplete-url"),
                                    options);
         });
 
-        select(".search_bhv").each(function(el) {
+        select(".search-bhv").each(function(el) {
             new Form.Element.Observer(el, 1.0, function() { Hobo.doSearch(el) })
         });
     },
@@ -273,10 +278,10 @@ var Hobo = {
 
     doSearch: function(el) {
         el = $(el)
-        var spinner = $(el.getAttribute("search_spinner") || "search_spinner")
-        var search_results = $(el.getAttribute("search_results") || "search_results")
-        var search_results_panel = $(el.getAttribute("search_results_panel") || "search_results_panel")
-        var url = el.getAttribute("search_url") || (urlBase + "/search")
+        var spinner = $(el.getAttribute("search-spinner") || "search-spinner")
+        var search_results = $(el.getAttribute("search-results") || "search-results")
+        var search_results_panel = $(el.getAttribute("search-results-panel") || "search-results-panel")
+        var url = el.getAttribute("search-url") || (urlBase + "/search")
 
         el.focus();
         var value = $F(el)
@@ -311,7 +316,11 @@ var Hobo = {
         
     fieldSetParam: function(el, val) {
         spec = Hobo.parseFieldId(el)
-        return spec.name + '[' + spec.field + ']=' + encodeURIComponent(val)
+        res = spec.name + '[' + spec.field + ']=' + encodeURIComponent(val)
+        if (typeof(formAuthToken) != "undefined") {
+            res = res + "&" + formAuthToken.name + "=" + formAuthToken.value
+        }
+        return res
     },
 
     fadeObjectElement: function(el) {
@@ -343,7 +352,7 @@ var Hobo = {
 
 
     parseFieldId: function(el) {
-        id = el.getAttribute("hobo_model_id")
+        id = el.getAttribute("hobo-model-id")
         if (!id) return
         m = id.match(/^([a-z_]+)_([0-9]+)_([a-z_]+)$/)
         if (m) return { name: m[1], id: m[2], field: m[3] }
@@ -360,7 +369,7 @@ var Hobo = {
     objectElementFor: function(el) {
         var m
         while(el.getAttribute) {
-            id = el.getAttribute("hobo_model_id");
+            id = el.getAttribute("hobo-model-id");
             if (id) m = id.match(/^([a-z_]+)_([0-9]+)(_[a-z0-9_]*)?$/);
             if (m) break;
             el = el.parentNode;
@@ -370,13 +379,13 @@ var Hobo = {
 
 
     showSpinner: function(message) {
-        if(t = $('ajax_progress_text')) Element.update(t, message);
-        if(e = $('ajax_progress')) e.style.display = "block";
+        if(t = $('ajax-progress-text')) Element.update(t, message);
+        if(e = $('ajax-progress')) e.style.display = "block";
     },
 
 
     hideSpinner: function() {
-        if(e = $('ajax_progress')) e.style.display = "none";
+        if(e = $('ajax-progress')) e.style.display = "none";
     },
 
 
@@ -426,6 +435,7 @@ Element.findContaining = function(el, tag) {
     return null;
 }
 
+// Add an afterEnterEditMode hook to in-place-editor
 origEnterEditMode = Ajax.InPlaceEditor.prototype.enterEditMode
 Ajax.InPlaceEditor.prototype.enterEditMode = function(evt) {
     origEnterEditMode.bind(this)(evt)
@@ -433,6 +443,15 @@ Ajax.InPlaceEditor.prototype.enterEditMode = function(evt) {
     return false
 }
 
+// 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) {}}    
+    this._form = null;
+    this._controls = { };
+}
+
 // Silence errors from IE :-(
 Field.scrollFreeActivate = function(field) {
   setTimeout(function() {
@@ -460,7 +479,7 @@ HasManyThroughInput = Behavior.create({
         var select = this.element.down('select')
         var selected = select.options[select.selectedIndex]
         if (selected.style.display != "none" & selected.value != "") {
-            var newItem = strToDom(this.element.down('.item_proto').innerHTML)
+            var newItem = strToDom(this.element.down('.item-proto').innerHTML)
             this.element.down('.items').appendChild(newItem);
             newItem.down('span').innerHTML = selected.innerHTML
             newItem.down('input[type=hidden]').value = selected.innerHTML
@@ -472,7 +491,7 @@ HasManyThroughInput = Behavior.create({
     onclick : function(e) {
         var el = Event.element(e);
         Event.stop(e);
-        if (el.match(".remove_item")) { this.removeOne(el.parentNode) }
+        if (el.match(".remove-item")) { this.removeOne(el.parentNode) }
     },
 
     removeOne : function(el) {
@@ -487,5 +506,5 @@ HasManyThroughInput = Behavior.create({
 })
 
 Event.addBehavior({
-    'div.has_many_through.input' : HasManyThroughInput()
+    'div.has-many-through.input' : HasManyThroughInput()
 });