hobo 0.5.3 → 0.6

data/hobo_files/plugin/generators/hobo_migration/templates/migration.rb

@@ -0,0 +1,9 @@
+class <%= migration_name %> < ActiveRecord::Migration
+  def self.up
+    <%= up %>
+  end
+
+  def self.down
+    <%= down %>
+  end
+end

data/hobo_files/plugin/generators/hobo_model/USAGE

@@ -9,8 +9,8 @@ Description:
     You don't have to think up all attributes up front, but it's a good idea of adding just the baseline of what's 
     needed to start really working with the resource.
 
-    The generator creates a model class in app/models, a test suite in test/unit, test fixtures in
-    test/fixtures/singular_name.yml, and a migration in db/migrate.
+    The generator creates a model class in app/models, a test suite in test/unit and test fixtures in
+    test/fixtures/singular_name.yml.
 
 Examples:
     ./script/generate model account
@@ -19,7 +19,6 @@ Examples:
             Model:      app/models/account.rb
             Test:       test/unit/account_test.rb
             Fixtures:   test/fixtures/accounts.yml
-            Migration:  db/migrate/XXX_add_accounts.rb
 
     ./script/generate model post title:string created_on:date body:text published:boolean
     

data/hobo_files/plugin/generators/hobo_model/hobo_model_generator.rb

@@ -1,5 +1,4 @@
 class HoboModelGenerator < Rails::Generator::NamedBase
-  default_options :skip_migration => false
 
   def manifest
     record do |m|
@@ -15,24 +14,12 @@ class HoboModelGenerator < Rails::Generator::NamedBase
       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 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
-
-      unless options[:skip_migration]
-        m.migration_template 'migration.rb', 'db/migrate', :assigns => {
-          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
-        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
-      end
     end
   end
 
   protected
     def banner
-      "Usage: #{$0} generate ModelName [field:type, field:type]"
+      "Usage: #{$0} #{spec.name} ModelName [field:type, field:type]"
     end
 
-    def add_options!(opt)
-      opt.separator ''
-      opt.separator 'Options:'
-      opt.on("--skip-migration",
-             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
-    end
 end

data/hobo_files/plugin/generators/hobo_model/templates/fixtures.yml

@@ -1,11 +1,6 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   id: 1
-<% for attribute in attributes -%>
-  <%= attribute.name %>: <%= attribute.default %>
-<% end -%>
+
 two:
   id: 2
-<% for attribute in attributes -%>
-  <%= attribute.name %>: <%= attribute.default %>
-<% end -%>

data/hobo_files/plugin/generators/hobo_model/templates/model.rb

@@ -2,22 +2,28 @@ class <%= class_name %> < ActiveRecord::Base
 
   hobo_model
 
+  fields do
+<% for attribute in attributes -%>
+    <%= attribute.name %> :<%= attribute.type %>
+<% end -%>
+  end
+
 
   # --- Hobo Permissions --- #
 
-  def creatable_by?(creator)
+  def creatable_by?(user)
     false
   end
 
-  def updatable_by?(updater, new)
+  def updatable_by?(user, new)
     false
   end
 
-  def deletable_by?(deleter)
+  def deletable_by?(user)
     false
   end
 
-  def viewable_by?(viewer, field)
+  def viewable_by?(user, field)
     true
   end
 

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

@@ -11,16 +11,17 @@ class HoboRapidGenerator < Hobo::Generator
     
     record do |m|
       m.file "hobo_rapid.js", "public/javascripts/hobo_rapid.js"
-      m.file "themes/default/default_mapping.rb", "app/views/hobolib/default_mapping.rb"
+      m.file "hobo_base.css", "public/stylesheets/hobo_base.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/hobolib/themes/default")
+      create_all(m, "themes/default/views", "app/views/taglibs/themes/default")
     end
   end
   
   def import_tags
-    path = File.join(RAILS_ROOT, "app/views/hobolib/application.dryml")
+    path = File.join(RAILS_ROOT, "app/views/taglibs/application.dryml")
 
-    tag = "<taglib 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)
@@ -37,14 +38,14 @@ class HoboRapidGenerator < Hobo::Generator
 
   protected
     def banner
-      "Usage: #{$0} generate [--import-tags]"
+      "Usage: #{$0} #{spec.name} [--import-tags]"
     end
 
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'
       opt.on("--import-tags",
-             "Modify hobolib/application.dryml to import hobo-rapid and theme tags ") do |v|
+             "Modify taglibs/application.dryml to import hobo-rapid and theme tags ") do |v|
         options[:import_tags] = true
       end
     end

data/hobo_files/plugin/generators/hobo_rapid/templates/hobo_base.css

@@ -0,0 +1,68 @@
+/******** Reset default browser CSS styles. *********/
+/* Based on Blueprint */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+
+/* Remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+body {
+	line-height: 1;
+	color: black;
+	background: white;
+}
+ol, ul {
+	list-style: none;
+}
+
+/* Tables still need 'cellspacing="0"' in the markup. */
+table {
+	border-collapse: separate;
+	border-spacing: 0;
+}
+caption, th, td {
+	text-align: left;
+	font-weight: normal;
+}
+
+/* Remove possible quote marks (") from <q>, <blockquote>. */
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: "";
+}
+blockquote, q {
+	quotes: "" "";
+}
+
+body,ul,ol,dl,h1,h2,h3,h4,h5,h6,td,th,
+caption,pre,p,blockquote,input,textarea {
+  font-family: "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
+  font-size: 12px;
+}
+h1,h2,h3,h4,h5,h6 { font-weight: bold; }
+h1 { font-size: 36px;}
+h2 { font-size: 28px;}
+h3 { font-size: 18px;}
+h4 { font-size: 14px;}
+h5 { font-size: 12px;}
+h6 { font-size: 10px;}
+
+ul, ol { list-style: none;}

data/hobo_files/plugin/generators/hobo_rapid/templates/hobo_rapid.css

@@ -0,0 +1,93 @@
+/**** Default styling for Rapid ****/
+
+#ajax_progress {
+    color: grey;
+    float: right;
+    margin: 20px;
+    position: fixed;
+    background: white;
+    font-family: Tahoma "sans serif";
+    display: none;
+	z-index: 10;
+}
+
+#ajax_progress div {
+    border: 1px dashed grey;
+    margin: 10px;
+    padding: 3px;
+/*    padding-top: -15px;*/
+}
+
+#ajax_progress img {
+    padding-left: 6px;
+    vertical-align: middle;
+}
+
+
+/* Scriptaculous Autocompleter ---*/
+
+div.completions_popup {
+    position:absolute;
+    width:250px;
+    background-color:white;
+    border:1px solid #888;
+    margin:0px;
+    padding:0px;
+}
+div.completions_popup ul {
+    list-style-type:none;
+    margin:0px;
+    padding:0px;
+}
+div.completions_popup ul li.selected { background-color: #ffb;}
+div.completions_popup ul li {
+    list-style-type:none;
+    display:block;
+    margin:0;
+    padding:2px;
+    cursor:pointer;
+}
+
+
+.field_list   { width:95%; }
+.field_list td { padding: 5px; vertical-align: middle; }
+.field_list td.field_label {
+    text-align: left; width: 1px; white-space: nowrap; vertical-align: top;
+    padding-top: 10px; padding-bottom: 10px;
+}
+.field_list input[type=text] { width: 100%; }
+.field_list input, .field_list textarea { margin: -2px 0 0 0; }
+.field_list textarea { width: 100%; margin: 0; }
+/*
+td span.in_place_textfield_bhv, td span.in_place_textarea_bhv, td span.in_place_html_textarea_bhv {
+    display: block; border: 1px solid #ddd;
+    padding: 4px; background: #fafafa;
+}
+*/
+table.login-table, table.login-table td {border: none;}
+.login_table td.field_label { vertical-align: middle; }
+/*table.login-table input {font-size: 16px; color: black;}*/
+
+input[type=text].wide { width: 100%; }
+textarea { height: 200px; }
+textarea.wide { width: 100%; }
+textarea.tall { height: 350px; }
+
+
+/* rails error message */
+.errorExplanation {
+	font-family: "Lucida Grande", arial, sans-serif;
+	background: #9d0018;
+	border: 1px solid #7a0013;
+	padding: 20px;
+	color: white;
+	margin-bottom: 20px;
+}
+.errorExplanation h2 {
+	text-transform: none;
+	letter-spacing: normal;
+	color: white;
+}
+.errorExplanation li {
+	margin-left: 20px;
+}

data/hobo_files/plugin/generators/hobo_rapid/templates/hobo_rapid.js

@@ -47,6 +47,7 @@ var Hobo = {
         var i = 0
         if (updates.length > 0) {
             updates.each(function(dom_id) {
+                if (!hoboParts[dom_id]) { throw "Update of dom-id that is not a part: " + dom_id }
                 params.push("render["+i+"][part]=" + hoboParts[dom_id][0])
                 params.push("render["+i+"][id]=" + dom_id)
                 params.push("render["+i+"][object]=" + hoboParts[dom_id][1])
@@ -71,8 +72,8 @@ var Hobo = {
     ajaxRequest: function(url_or_form, message, updates, options) {
         options = Object.merge({ asynchronous:true,
                                  evalScripts:true,
-                                 resetForm: true,
-                                 refocusForm: true
+                                 resetForm: false,
+                                 refocusForm: false
                                }, options)
         if (typeof url_or_form == "string") {
             var url = url_or_form
@@ -102,7 +103,7 @@ var Hobo = {
 
             if (options.onComplete)
                 options.onComplete.apply(this, arguments)
-            if (form && options) Form.focusFirstElement(form)
+            if (form && options.refocusForm) Form.focusFirstElement(form)
         }
         if (options.method && options.method.toLowerCase() == "put") {
             delete options.method
@@ -221,7 +222,9 @@ var Hobo = {
         })
 
         select(".in_place_html_textarea_bhv").each(function (el) {
-            var ipe = Hobo._makeInPlaceEditor(el, {rows: 2, handleLineBreaks: false})
+            var options = {rows: 2, handleLineBreaks: false}
+            if (typeof(tinyMCE) != "undefined") options["submitOnBlur"] = false
+            var ipe = Hobo._makeInPlaceEditor(el, options) 
             if (typeof(tinyMCE) != "undefined") {
                 ipe.afterEnterEditMode = function() {
                     var id = this.form.id = Hobo.uid()
@@ -283,8 +286,10 @@ var Hobo = {
                                                         if (spinner) Hobo.hide(spinner)
                                                         if (search_results_panel) {
                                                             Hobo.show(search_results_panel)
-                                                         }
+                                                        }
+                                                        setTimeout(function() {Hobo.applyEvents(search_results)}, 1)
                                                     },
+                                                    method: "get",
                                                     parameters:"query=" + value });
         } else {
             Hobo.updateElement(search_results, '')
@@ -301,7 +306,7 @@ var Hobo = {
         
     fieldSetParam: function(el, val) {
         spec = Hobo.parseFieldId(el)
-        return spec.name + '[' + spec.field + ']=' + escape(val)
+        return spec.name + '[' + spec.field + ']=' + encodeURIComponent(val)
     },
 
     fadeObjectElement: function(el) {

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/stylesheets/application.css

@@ -1,6 +1,6 @@
 form.button-to { margin: 0; padding: 0; }
 
-.object_card { padding: 5px; margin: 5px; border: 1px dashed #ddd; background: #fbfbfb; }
+.card { padding: 5px; margin: 5px; border: 1px dashed #ddd; background: #fbfbfb; }
 
 /* Todo: Big cleanup of this stylesheet */
 
@@ -37,22 +37,31 @@ a:hover.no_hover { background: transparent; }
 
 /* Main Page Body Window */
 
-#header .logo { margin: 20px 10px 5px 20px; float: left; }
+#header .logo { position: absolute; top: 15px; left: 20px; }
 #header .logo a { background: transparent; }
 
-.nav_bars { margin: 20px 12px 5px 10px; float: right; padding: 0; }
-.nav a { font-size: 110%; }
-.nav_bars a { text-decoration: none; }
+#header { 
+    position: relative;
+    height: 80px;
+}
+
+.nav { 
+    padding: 20px 15px 0 0;
+}
+
+.nav ul { margin: 0; padding: 0; float: right; }
+ul.account_nav { font-size: 80%; clear:right; }
 
-.nav_item { display: inline; padding: 0 4px; margin: 0; }
+.nav li { list-style: none; margin: 0; padding: 0; float: left; padding: 5px; font-size: 130%; }
+.nav a { text-decoration: none;}
 
-.account_nav { margin-top: 5px; text-align: right; font-size: 95%; }
+.main_nav li { text-transform: uppercase; }
 
 .flash { margin: 10px 30px; background: white; border: 2px solid #aaf; padding: 10px; text-align: center; }
 
 #page {
     width:800px;
-    background-color:#FFFFFF;
+    background-color: white;
     margin-left:auto;
     margin-right:auto;
 }
@@ -157,6 +166,7 @@ img.nav_main.current { border-top: 1px solid grey; border-bottom: 1px solid grey
     font-size: 10px;
     text-align:center;
     margin:21px;
+    background-color:#D2D2D2;
 }
 
 
@@ -209,15 +219,15 @@ div.completions_popup ul li {
 
 th { text-align: left; padding: 5px; }
 
-.object_table { width:95%; }
-.object_table td { padding: 5px; vertical-align: middle; }
-.object_table td.field_label {
+.field_list { width:95%; }
+.field_list td { padding: 5px; vertical-align: middle; }
+.field_list th {
     text-align: left; width: 1px; white-space: nowrap; vertical-align: top;
     padding-top: 10px; padding-bottom: 10px;
 }
-.object_table input[type=text] { width: 100%; }
-.object_table input, .object_table textarea { margin: -2px 0 0 0; }
-.object_table textarea { width: 100%; margin: 0; }
+.field_list input[type=text] { width: 100%; }
+.field_list input, .field_list textarea { margin: -2px 0 0 0; }
+.field_list textarea { width: 100%; margin: 0; }
 
 td span.in_place_textfield_bhv, td span.in_place_textarea_bhv, td span.in_place_html_textarea_bhv {
     display: block; border: 1px solid #ddd;

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views/application.dryml

@@ -1,23 +1,19 @@
-<taglib src="plugins/hobo/tags/rapid"/>
+<include src="plugins/hobo/tags/rapid"/>
 
-<def tag="page" attrs="title_prefix, title">
-  <% title ||= human_type + ": " + display_name(:no_span => true) %>
-  <%= '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' %>
+<def tag="Page" attrs="title_prefix, title">
+  <% title ||= human_type + ": " + name(:no_wrapper => true) %>
+  <doctype version="HTML 4.01 Transitional"/>
   <html>
-    <head content_option="head">
+    <head param="head">
       <title><%= title_prefix %><%= title %></title>
       <theme_stylesheet/>
       <%= javascript_include_tag :defaults %>
-      <hobo_rapid_javascripts replace_option="rapid_javascripts"/>
+      <hobo_rapid_javascripts param="rapid_javascripts"/>
     </head>
 
-    <body onload="Hobo.applyEvents()" content_option="body">
+    <body onload="Hobo.applyEvents()" param="body">
 
-      <div id='ajax_progress'>
-        <div>
-          <span id="ajax_progress_text"></span><theme_img src="spinner.gif"/>
-        </div>
-      </div>
+      <ajax_progress/>
 
       <div id="page">
 
@@ -31,26 +27,20 @@
         <div id="page_corner01">
         <div id="page_inner_top">
 
-          <div id='header' content_option="header">
-            <div class="logo" content_option="logo"><theme_img src="logo.gif"/></div>
-            
-            <div class="nav_bars" content_option="navigation">
-              <div class="nav" content_option="main_nav"><application_nav/></div>
-              <if q="#login_url rescue false">
-                <div class="account_nav" content_option="account_nav"><application_account_nav/></div>
-              </if>
-            </div>
-            <clearer/>
+          <div id='header' param="header">
+            <div class="logo" param="logo"><theme_image src="logo.gif"/></div>
+            <nav param>
+              <magic_nav class="main_nav" param="main_nav"/>
+              <if test="&defined_route? :login"><account_nav param/></if>
+            </nav>
           </div>
 
-          <if q="#flash[:notice]">
-            <div class="flash"><%= flash[:notice] %></div>
-          </if>
+          <flash_message/>
 
-          <div content_option="intro"></div>
-          <div content_option="main">
-            <div class="maincol" content_option="maincol"/>
-            <div class="sidecol" content_option="sidecol"/>
+          <div param="intro"></div>
+          <div param="main">
+            <div class="maincol" param="maincol"/>
+            <div class="sidecol" param="sidecol"/>
           </div>
 
           <clearer/>
@@ -58,14 +48,13 @@
         </div></div></div></div></div></div></div></div></div>
       </div>
 
-      <div id="footer" content_option="footer"/>
     </body>
   </html>
 </def>
 
 
 <def tag="panel">
-  <div class="panel" xattrs="">
+  <div class="panel" merge_attrs="&true">
     <div class="panel_top"><div class="panel_right">
     <div class="panel_bottom"><div class="panel_left">
     <div class="panel_corner02"><div class="panel_corner04">
@@ -76,29 +65,24 @@
     </div></div></div></div></div></div></div></div>
   </div>
 </def>
-
+<!-->
 <def tag="section">
-  <div class="section" xattrs=""><tagbody/></div>
+  <div class="section" merge_attrs="&true"><tagbody/></div>
 </def>
-
+-->
 
 <def tag="navbar" attrs="items,current">
-  <repeat obj="#items">
+  <repeat with="&items">
     <div class='nav_item <%= "current" if current == this[0] %>'><%= link_to this[0].upcase, this[1] %></div>
   </repeat>
   <clearer/>
 </def>
 
-
+<!--
 <def tag="application_nav">
-  <% items = [['Home', urlb + '/']] +
+  <% items = [['Home', base_url + '/']] +
              Hobo.models[0..2].map{|m| [m.name.pluralize.titlecase, object_url(m)]} +
              [['Search', (search_url rescue "")]] %>
-  <navbar items="#items"/>
+  <navbar items="&items"/>
 </def>
-
-
-<def tag="application_logo">
-  <theme_img src="logo.gif"/>
-</def>
-
+-->