RubyGems - hobo - Versions diffs - 0.6.2 → 0.6.3 - Mend

hobo 0.6.2 → 0.6.3

Files changed (60) hide show

@@ -25,8 +25,8 @@ PLUGIN_DIR = File.dirname(__FILE__)
 rspec_base = File.expand_path(PLUGIN_DIR + '/spec/rails_root/vendor/plugins/rspec/lib')
 $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require 'spec/rake/spectask'
-require 'spec/translator'
+require '../hobo_spec/rails_root/vendor/plugins/rspec/lib/spec/rake/spectask'
+require '../hobo_spec/rails_root/vendor/plugins/rspec/lib/spec/translator'
 spec_prereq = :noop # File.exist?(File.join(PLUGIN_DIR, 'config', 'database.yml')) ? "db:test:prepare" : :noop
 task :noop do

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

@@ -1,9 +1,7 @@
 <Page title="<%= app_name %>">
-  <main>
-    <header>
-      <h1 class="front_page_title"><%= app_name %></h1>
-    </header>
+  <content_header>
+    <h1 class="front_page_title"><%= app_name %></h1>
     <panel>
       <div style="margin-left: 40px; ">
         <h3>Congratulations! Your Hobo Rails App is up and running</h3>
@@ -12,7 +10,10 @@
         </ul>
       </div>
     </panel>
+  </content_header>
+  <content_body>
     <repeat with="&Hobo.models">
       <panel>
         <header><h2><%%= this.name.titlecase.pluralize %></h2></header>
@@ -32,6 +33,6 @@
         </section>
       </panel>
     </repeat>
-  </main>
+  </content_body>
 </Page>

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

@@ -1,7 +1,7 @@
 <Page title="Search">
   <body onload="Hobo.applyEvents(); Hobo.doSearch('search_field')"/>
-  <main>
+  <content_body>
     <panel class="red" style="margin-top: 40px">
       <h2>Search</h2>
       <div class='search' style='margin:10px'>
@@ -14,6 +14,6 @@
       <h2>Results</h2>
       <section id="search_results">&nbsp;</section>
     </panel>
-  </main>
+  </content_body>
 </Page>

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

@@ -15,16 +15,18 @@ class HoboMigrationGenerator < Rails::Generator::Base
     # Force load of hobo models
     Hobo.models
-    ignore_tables = Hobo::Migrations.ignore_tables + Hobo::Migrations.ignore.every(:pluralize)
-    ignore_models = (Hobo::Migrations.ignore + Hobo::Migrations.ignore_models).every(:underscore)
+    ignore_model_names = Hobo::Migrations.ignore.every(:underscore)
-    db_tables = connection.tables - ignore_tables
+    all_models = ActiveRecord::Base.send(:subclasses).reject {|c| c.name.starts_with?("CGI::") }
+    models, ignore_models = all_models.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
-    models = ActiveRecord::Base.send(:subclasses).reject {|c| c.name.starts_with?("CGI::") }
-    models = models.reject {|m| m.name.underscore.in?(ignore_models) }
-    table_models = models.index_by {|m| m.table_name}
+    models_by_table_name = models.index_by {|m| m.table_name}
     model_table_names = models.every(:table_name)
+    db_tables = connection.tables - ignore_tables
     to_create = model_table_names - db_tables
     to_drop = db_tables - model_table_names - ['schema_info']
     to_change = db_tables & model_table_names
@@ -46,7 +48,7 @@ class HoboMigrationGenerator < Rails::Generator::Base
     end * "\n\n"
     creates = to_create.map do |t|
-      create_table(table_models[t])
+      create_table(models_by_table_name[t])
     end * "\n\n"
     undo_creates = to_create.map do |t|
       "drop_table :#{t}"
@@ -55,27 +57,30 @@ class HoboMigrationGenerator < Rails::Generator::Base
     changes = []
     undo_changes = []
     to_change.each do |t|
-      change, undo = change_table(table_models[t])
+      change, undo = change_table(models_by_table_name[t])
       changes << change
       undo_changes << undo
     end
     up = [renames, drops, creates, changes].flatten.select{|s|!s.blank?} * "\n\n"
     down = [undo_renames, undo_drops, undo_creates, undo_changes].flatten.select{|s|!s.blank?} * "\n\n"
+    if up.blank?
+      puts "Database and models match -- nothing to change"
+      return record {|m| }
+    end
     puts "\n---------- Up Migration ----------", up, "----------------------------------"
     puts "\n---------- Down Migration --------", down, "----------------------------------"
-    return record {|m| } if up.blank?
     action = input("What now: [g]enerate migrations, generate and [m]igrate now or [c]ancel?", %w(g m c))
     if action == 'c'
       # record nothing to keep the generator happy
       record {|m| }
     else
-      puts "\n(you can type spaces instead of '_' -- every little helps)"
-      migration_name = input("Migration filename [#@migration_name]:").strip.gsub(' ', '_')
+      puts "\nMigration filename:", "(you can type spaces instead of '_' -- every little helps)"
+      migration_name = input("Filename [#@migration_name]:").strip.gsub(' ', '_')
       migration_name = @migration_name if migration_name.blank?
       at_exit { system "rake db:migrate" } if action == 'm'
@@ -189,7 +194,7 @@ class HoboMigrationGenerator < Rails::Generator::Base
         change_spec[:precision] = spec.precision if !spec.precision.nil?
         change_spec[:scale]     = spec.scale if !spec.scale.nil?
         change_spec[:null]      = false unless spec.null
-        change_spec[:default]   = spec.default if !spec.default.nil?
+        change_spec[:default]   = spec.default
         changes << "change_column :#{table_name}, :#{c}, " +
           ([":#{spec.sql_type}"] + format_options(change_spec, spec.sql_type)).join(", ")

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

@@ -6,6 +6,7 @@ class <%= class_name %> < ActiveRecord::Base
 <% for attribute in attributes -%>
     <%= attribute.name %> :<%= attribute.type %>
 <% end -%>
+    timestamps
   end

data/hobo_files/plugin/generators/hobo_model_controller/templates/controller.rb CHANGED

@@ -2,4 +2,6 @@ class <%= class_name %>Controller < ApplicationController
   hobo_model_controller
+  auto_actions :all
 end

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

@@ -52,8 +52,7 @@ blockquote, q {
 	quotes: "" "";
 }
-body,ul,ol,dl,h1,h2,h3,h4,h5,h6,td,th,
-caption,pre,p,blockquote,input,textarea {
+body {
   font-family: "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
   font-size: 12px;
 }

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

@@ -73,9 +73,10 @@ textarea { height: 200px; }
 textarea.wide { width: 100%; }
 textarea.tall { height: 350px; }
+.field_list input.percentage {width: 25px; display: inline; margin-right: 5px; padding: 1px 3px;}
 /* rails error message */
-.errorExplanation {
+.error_messages {
 	font-family: "Lucida Grande", arial, sans-serif;
 	background: #9d0018;
 	border: 1px solid #7a0013;
@@ -83,11 +84,11 @@ textarea.tall { height: 350px; }
 	color: white;
 	margin-bottom: 20px;
 }
-.errorExplanation h2 {
+.error_messages h2 {
 	text-transform: none;
 	letter-spacing: normal;
 	color: white;
 }
-.errorExplanation li {
+.error_messages li {
 	margin-left: 20px;
 }

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

@@ -1,4 +1,3 @@
 Object.extend = function(destination) {
     $A(arguments).slice(1).each(function (src) {
         for (var property in src) {
@@ -46,13 +45,18 @@ var Hobo = {
         var params = []
         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_context]=" + encodeURIComponent(hoboParts[dom_id]))
-                params.push("render["+i+"][id]=" + dom_id)
-                i += 1
+            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)
+                    i += 1
+                }
             })
-            params.push("part_page=" + hoboPartPage)
+            params.push("page_path=" + hoboPagePath)
         }
         if (resultUpdates) {
@@ -299,7 +303,7 @@ var Hobo = {
     putUrl: function(el) {
         spec = Hobo.parseFieldId(el)
-        return urlBase + "/" + controllerNames[spec.name] + "/" + spec.id + "?_method=PUT"
+        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id + "?_method=PUT"
     },
@@ -314,13 +318,15 @@ var Hobo = {
                           afterFinish: function (ef) { ef.element.remove() } });
     },
-    removeButton: function(el, url, updates, fade) {
-        if (fade == null) { fade = true; }
-        if (confirm("Are you sure?")) {
+    removeButton: function(el, url, updates, options) {
+        if (options.fade == null) { options.fade = true; }
+        if (options.confirm == null) { options.fade = "Are you sure?"; }
+        if (options.confirm == false || confirm(options.confirm)) {
             objEl = Hobo.objectElementFor(el)
             Hobo.showSpinner('Removing');
             function complete() {
-                if (fade) { Hobo.fadeObjectElement(el) }
+                if (options.fade) { Hobo.fadeObjectElement(el) }
                 Hobo.hideSpinner()
             }
             if (updates && updates.length > 0) {
@@ -400,8 +406,26 @@ var Hobo = {
     backgroundColor: function(el) {
         return Hobo.rgbColorToHex(Hobo.getStyle(el, 'background-color'))
+    },
+    partFor: function(el) {
+        while (el) {
+            if (el.id && hoboParts[el.id]) { return el }
+            el = el.parentNode
+        }
+        return null
+    },
+    pluralise: function(s) {
+        return pluralisations[s] || s + "s"
+    },
+    addUrlParams: function(params) {
+        params = $H(window.location.search.toQueryParams()).merge(params)
+        return window.location.href.sub(/(\?.*|$)/, "?" + params.toQueryString())
     }
 }
 Element.findContaining = function(el, tag) {
@@ -430,6 +454,16 @@ Ajax.InPlaceEditor.prototype.enterEditMode = function(evt) {
     return false
 }
+// Fix Safari in-place-editor bug
+Ajax.InPlaceEditor.prototype.removeForm = function() {
+    if(this.form) {
+        if (this.form.parentNode) {
+            try { Element.remove(this.form); } catch (e) {}
+        }
+        this.form = null;
+    }
+}
 // Silence errors from IE :-(
 Field.scrollFreeActivate = function(field) {
   setTimeout(function() {
@@ -438,3 +472,51 @@ Field.scrollFreeActivate = function(field) {
       } catch(e) {}
   }, 1);
 }
+Element.Methods.$$ = function(e, css) {
+    return new Selector(css).findElements(e)
+}
+// --- has_many_through_input --- //
+HasManyThroughInput = Behavior.create({
+    initialize : function() {
+        // onchange doesn't bubble in IE6 so...
+        Event.observe(this.element.down('select'), 'change', this.addOne.bind(this))
+    },
+    addOne : function() {
+        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)
+            this.element.down('.items').appendChild(newItem);
+            newItem.down('span').innerHTML = selected.innerHTML
+            newItem.down('input[type=hidden]').value = selected.innerHTML
+            selected.style.display = 'none'
+            select.value = ""
+        }
+    },
+    onclick : function(e) {
+        var el = Event.element(e);
+        Event.stop(e);
+        if (el.match(".remove_item")) { this.removeOne(el.parentNode) }
+    },
+    removeOne : function(el) {
+        new Effect.BlindUp(el,
+                           { duration: 0.3,
+                             afterFinish: function (ef) { ef.element.remove() } } )
+        var label = el.down('span').innerHTML
+        var option = $A(this.element.getElementsByTagName('option')).find(function(o) { return o.innerHTML == label })
+        option.style.display = 'block'
+    }
+})
+Event.addBehavior({
+    'div.has_many_through.input' : HasManyThroughInput()
+});

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

@@ -1,30 +1,11 @@
 LowPro = {};
-LowPro.Version = '0.4.1';
+LowPro.Version = '0.5';
 if (!Element.addMethods)
   Element.addMethods = function(o) { Object.extend(Element.Methods, o) };
 // Simple utility methods for working with the DOM
 DOM = {
-  insertAfter : function(element, node, otherNode) {
-    element = $(element);
-    if (otherNode.nextSibling)
-      return element.insertBefore(node, otherNode.nextSibling);
-    else
-      return element.appendChild(node);
-  },
-  addBefore : function(element, node) {
-    element = $(element);
-    return element.parentNode.insertBefore(node, element);
-  },
-  addAfter : function(element, node) {
-    element = $(element);
-    return $(element.parentNode).insertAfter(node, element);
-  },
-  replaceElement : function(element, node) {
-    $(element).parentNode.replaceChild(node, element);
-    return node;
-  },
   prependChild : function(element, node) {
     $(element).insertBefore(node, element.firstChild);
   },
@@ -42,24 +23,6 @@ Element.addMethods(DOM);
 // DOMBuilder for prototype
 DOM.Builder = {
-  IE_TRANSLATIONS : {
-    'class' : 'className',
-    'for' : 'htmlFor'
-  },
-  cache: {},
-  ieAttrSet : function(attrs, attr, el) {
-    var trans;
-    if (trans = this.IE_TRANSLATIONS[attr]) el[trans] = attrs[attr];
-    else if (attr == 'style') el.style.cssText = attrs[attr];
-    else if (attr.match(/^on/)) el[attr] = new Function(attrs[attr]);
-    else el.setAttribute(attr, attrs[attr]);
-  },
-  getElement : function(tag) {
-    var element = DOM.Builder.cache[tag];
-    if (element == null)
-      element = DOM.Builder.cache[tag] = document.createElement(tag);
-    return element.cloneNode(false);
-  },
 	tagFunc : function(tag) {
 	  return function() {
 	    var attrs, children;
@@ -77,20 +40,7 @@ DOM.Builder = {
   },
 	create : function(tag, attrs, children) {
 		attrs = attrs || {}; children = children || []; tag = tag.toLowerCase();
-		var isIE = navigator.userAgent.match(/MSIE/);
-		var el = (isIE && attrs.name) ?
-		  document.createElement("<" + tag + " name=" + attrs.name + ">") :
-		  DOM.Builder.getElement(tag);
-		for (var attr in attrs) {
-		  if (attrs[attr] === true) attrs[attr] = attr;
-		  if (typeof attrs[attr] != 'function') {
-		    if (isIE) this.ieAttrSet(attrs, attr, el);
-		    else el.setAttribute(attr, attrs[attr].toString());
-		  } else if (attr.match(/^on(.+)$/)) {
-		    Event.observe(el, RegExp.$1, attrs[attr]);
-		  };
-	  }
+		var el = new Element(tag, attrs);
 		for (var i=0; i<children.length; i++) {
 			if (typeof children[i] == 'string')
@@ -121,141 +71,16 @@ DOM.Builder.fromHTML = function(html) {
   return root.childNodes[0];
 };
-String.prototype.toElement = function() {
-  return DOM.Builder.fromHTML(this);
-};
-(function() {
-  var old$ = $;
-  $ = function(element) {
-    if (element && element.toElement && element.match(/^<(.+)>$/))
-      return $(element.toElement());
-    return old$.apply(this, arguments);
-  }
-})();
-// Adapted from DOM Ready extension by Dan Webb
-// http://www.vivabit.com/bollocks/2006/06/21/a-dom-ready-extension-for-prototype
-// which was based on work by Matthias Miller, Dean Edwards and John Resig
+// Wraps the 1.6 contentloaded event for backwards compatibility
 //
 // Usage:
 //
 // Event.onReady(callbackFunction);
 Object.extend(Event, {
-  _domReady : function() {
-    if (arguments.callee.done) return;
-    arguments.callee.done = true;
-    if (Event._timer)  clearInterval(Event._timer);
-    Event._readyCallbacks.each(function(f) { f() });
-    Event._readyCallbacks = null;
-  },
   onReady : function(f) {
-    if (!this._readyCallbacks) {
-      var domReady = this._domReady;
-      if (domReady.done) return f();
-      if (document.addEventListener)
-        document.addEventListener("DOMContentLoaded", domReady, false);
-        /*@cc_on @*/
-        /*@if (@_win32)
-            var dummy = location.protocol == "https:" ?  "https://javascript:void(0)" : "javascript:void(0)";
-            document.write("<script id=__ie_onload defer src='" + dummy + "'><\/script>");
-            document.getElementById("__ie_onload").onreadystatechange = function() {
-                if (this.readyState == "complete") { domReady(); }
-            };
-        /*@end @*/
-        if (/WebKit/i.test(navigator.userAgent)) {
-          this._timer = setInterval(function() {
-            if (/loaded|complete/.test(document.readyState)) domReady();
-          }, 10);
-        }
-        Event.observe(window, 'load', domReady);
-        Event._readyCallbacks =  [];
-    }
-    Event._readyCallbacks.push(f);
-  }
-});
-// Extend Element with observe and stopObserving.
-if (typeof Element.Methods.observe == 'undefined') Element.addMethods({
-  observe : function(el, event, callback) {
-    Event.observe(el, event, callback);
-  },
-  stopObserving : function(el, event, callback) {
-    Event.stopObserving(el, event, callback);
-  }
-});
-// Replace out existing event observe code with Dean Edwards' addEvent
-// http://dean.edwards.name/weblog/2005/10/add-event/
-Object.extend(Event, {
-  _observeAndCache : function(el, type, func) {
-    if (!func.$$guid) func.$$guid = Event._guid++;
-  	if (!el.events) el.events = {};
-  	var handlers = el.events[type];
-  	if (!handlers) {
-  		handlers = el.events[type] = {};
-  		if (el["on" + type]) {
-  			handlers[0] = el["on" + type];
-  		}
-  	}
-  	handlers[func.$$guid] = func;
-  	el["on" + type] = Event._handleEvent;
-  	if (!Event.observers) Event.observers = [];
-  	Event.observers.push([el, type, func, false]);
-	},
-	stopObserving : function(el, type, func) {
-	  el = $(el);
-    if (el.events && el.events[type]) delete el.events[type][func.$$guid];
-    for (var i = 0; i < Event.observers.length; i++) {
-      if (Event.observers[i] &&
-          Event.observers[i][0] == el &&
-          Event.observers[i][1] == type &&
-          Event.observers[i][2] == func) delete Event.observers[i];
-    }
-  },
-  _handleEvent : function(e) {
-    var returnValue = true;
-    e = e || Event._fixEvent(window.event);
-    var handlers = this.events[e.type], el = $(this);
-    for (var i in handlers) {
-    	el.$$handleEvent = handlers[i];
-    	if (el.$$handleEvent(e) === false) returnValue = false;
-    }
-    if (returnValue == false) e.preventDefault();
-  	return returnValue;
-  },
-  _fixEvent : function(e) {
-    e.preventDefault = Event._preventDefault;
-    e.stopPropagation = Event._stopPropagation;
-    return e;
-  },
-  _preventDefault : function() { this.returnValue = false },
-  _stopPropagation : function() { this.cancelBubble = true },
-  _guid : 1
-});
-// Allows you to trigger an event element.
-Object.extend(Event, {
-  trigger : function(element, event, fakeEvent) {
-    element = $(element);
-    fakeEvent = fakeEvent || { type :  event };
-    if(element.events && element.events[event]) {
-      $H(element.events[event]).each(function(cache) {
-        cache[1].call(element, fakeEvent);
-    	});
-    }
+    document.observe('contentloaded', f);
   }
 });
@@ -366,9 +191,7 @@ Behavior = {
     var behavior = function() {
       var behavior = arguments.callee;
       if (this == window || $H(this).values().include(behavior)) {
-        var args = [];
-        for (var i = 0; i < arguments.length; i++)
-          args.push(arguments[i]);
+        var args = $A(arguments);
         return function() {
           var initArgs = [this].concat(args);
@@ -402,4 +225,3 @@ Behavior = {
   }
 };