togo 0.3.1 → 0.4.0

data/bin/togo-admin

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-files_to_require = []
+files_to_require = %w( dm-core dm-serializer )
 
 config = {
   :environment => :development,
@@ -18,9 +18,10 @@ OptionParser.new{|opt|
     puts "Usage: togo-admin [options]"
     puts "Options: "
     puts "\t-p [port]: which port to run on"
-    puts "\t-p [host]: which host to run on"
+    puts "\t-h [host]: which host to run on"
     puts "\t-e [environment]: which environment to boot in"
-    puts "\t-r [file]: which file to require before running."
+    puts "\t-r [file]: specify a file to require before running"
+    puts "\t-a [handler]: which handler to run the server with (e.g. Thin, Webrick, etc)"
     puts "\t--help: what you're seeing"
     puts "TIP: To load code automatically before running togo-admin, create a file called togo-admin-config.rb."
     exit
@@ -42,5 +43,4 @@ config.merge!({
   :reloader => Togo::TogoReloader
 })
 
-Togo::Admin.configure(config)
-Togo::Admin.run!
+Togo::Admin.run!(config)

data/lib/togo/admin/admin.rb

@@ -1,9 +1,30 @@
-%w(dm-core rack).each{|l| require l}
-Dir.glob(File.join('models','*.rb')).each{|f| require f}
+module Helpers
+  
+  def paging_links(page, count, qs = {})
+    prev_link, next_link = 'Previous', 'Next'
+    if not qs.blank?
+      qs = qs.keys.collect{|k|
+        [k,escape(qs[k])].join('=') if not qs[k].blank?
+      }.compact.join('&')
+      qs = nil if qs.blank?
+    end
+      
+    if not page == 1
+      prev_link = "<a href=\"?p=#{[page-1, qs].compact.join('&')}\" rel=\"previous\">#{prev_link}</a>"
+    end
+    if not page == count and count > 1
+      next_link = "<a href=\"?p=#{[page+1, qs].compact.join('&')}\" rel=\"next\">#{next_link}</a>"
+    end
+    [prev_link, next_link]
+  end
+
+end
 
 module Togo
   class Admin < Dispatch
 
+    include Helpers
+
     before do
       @model = Togo.const_get(params[:model]) if params[:model]
     end
@@ -13,7 +34,14 @@ module Togo
     end
 
     get '/:model' do
-      @content = params[:q] ? @model.search(:q => params[:q]) : @model.all
+      @q = params[:q] || ''
+      @p = (params[:p] || 1).to_i
+      @limit = 50
+      @offset = @limit*(@p-1)
+      @count = (@q.blank? ? @model.all : @model.search(:q => @q)).size
+      @page_count = @count == 0 ? 1 : (@count.to_f/@limit.to_f).ceil
+      @criteria = {:limit => @limit, :offset => @offset}
+      @content = @q.blank? ? @model.all(@criteria) : @model.search(@criteria.merge(:q => @q))
       erb :index
     end
 
@@ -63,6 +91,20 @@ module Togo
       end
     end
 
+    get '/search/:model' do
+      @limit = params[:limit] || 10
+      @offset = params[:offset] || 0
+      @q = params[:q] || ''
+      @count = (@q.blank? ? @model.all : @model.search(:q => @q)).size
+      @criteria = {:offset => @offset, :limit => @limit}
+      if params[:ids]
+        @items = @model.all(@criteria.merge(:id => params[:ids].split(',').map(&:to_i)))
+      else
+        @items = @model.search(@criteria.merge(:q => @q))
+      end
+      {:count => @count, :results => @items}.to_json
+    end
+
   end
 
   # Subclass Rack Reloader to call DataMapper.auto_upgrade! on file reload

data/lib/togo/admin/public/css/screen.css

@@ -71,7 +71,7 @@ body {
     position: absolute;
     right: 0;
     z-index: 3;
-    width: 270px;
+    width: 220px;
     top: 0;
 }
 #main #search-form fieldset {
@@ -80,6 +80,12 @@ body {
 #main #search-form input[type=text] {
     width: 190px;
 }
+#main #paging {
+    position: absolute;
+    right: 240px;
+    z-index: 3;
+    top: 22px;
+}
 #main h1 a {
     text-decoration: none;
     color: #4076c7;
@@ -105,7 +111,8 @@ body {
     border-bottom: 1px solid #CECECE;
     background: #FFF;
 }
-#main table td.checkbox {
+#main table td.checkbox,
+#main table th.checkbox {
     width: 10px;
     text-align: center;
     padding-right: 0;
@@ -154,11 +161,44 @@ body {
 #main form fieldset.has_n  {
     padding-right: 20px;
 }
+#main form fieldset.belongs_to input[type=text],
+#main form fieldset.has_n input[type=text] {
+    width: 190px;
+}
+#main form fieldset.belongs_to label,
+#main form fieldset.has_n label {
+    float: left;
+}
+#main form fieldset.belongs_to div.search,
+#main form fieldset.has_n div.search {
+    display: none;
+    width: 100%;
+    text-align: right;
+}
+#main form fieldset.belongs_to div.paging,
+#main form fieldset.has_n div.paging {
+    float: right;
+    margin-left: 10px;
+    line-height: 30px;
+}
+#main form fieldset.belongs_to .checkbox,
+#main form fieldset.has_n .checkbox {
+    display: none;
+}
+#main form fieldset.belongs_to .active,
+#main form fieldset.has_n .active {
+    display: table-cell;
+}
 #main form fieldset table th,
 #main form fieldset table td {
     padding: 5px;
 }
-
+#main form fieldset table tfoot td {
+    background: #DDD;
+}
+#main form fieldset table tfoot td button {
+    float: right;
+}
 div.actions {
     position: absolute;
     bottom: 0;

data/lib/togo/admin/public/js/edit.js

@@ -0,0 +1,35 @@
+var hasModified = false;
+function saveBeforeLeaving(e) {
+    return 'You have made changes to this item. Are you sure you want to leave before saving?';
+}
+function checkForModifiedText(e) {
+    if ((e.target.nodeName == 'INPUT' && e.target.getAttribute('type') == 'text') ||
+        e.target.nodeName == 'TEXTAREA') {
+        console.log('modified');
+        hasModified = (e.target.value != e.target.defaultValue);
+        setBeforeLeaving();
+    }
+}
+function checkForModifiedInputs(e) {
+    if (e.target.nodeName == 'SELECT' ||
+        (e.target.nodeName == 'INPUT' && e.target.getAttribute('type') == 'checkbox') ||
+        (e.target.nodeName == 'INPUT' && e.target.getAttribute('type') == 'radio')) {
+        console.log('modified');
+        hasModified = true;
+        setBeforeLeaving();
+    }
+}
+function setBeforeLeaving() {
+    if (hasModified) {
+        listen('beforeunload', window, saveBeforeLeaving);
+    } else {
+        unlisten('beforeunload', window, saveBeforeLeaving);
+    }
+}
+
+listen('keyup', window, checkForModifiedText);
+listen('click', window, checkForModifiedInputs);
+listen('submit', el('edit-form'), function() {
+    hasModified = false;
+    setBeforeLeaving();
+});

data/lib/togo/admin/public/js/index.js

@@ -1,6 +1,20 @@
 var app = (function() {
 
     var selectedItems = [];
+    var searchInput = el('search-form').getElementsByTagName('input')[0];
+    var searchInputDefaultValue = 'Search...';
+
+    var searchInputHandler = function(action) {
+        return function(e) {
+            console.log(e);
+            if (this.value == '') {
+                this.value = searchInputDefaultValue;
+            }
+            if (this.value == searchInputDefaultValue && action == 'focus') {
+                this.value = '';
+            }
+        };
+    };
 
     var handleMultiSelect = function(e) {
         var id = e.target.getAttribute('id').split('_')[1];
@@ -22,6 +36,9 @@ var app = (function() {
         el('delete-list').value = selectedItems.join(',');
     };
 
+    listen('focus', searchInput, searchInputHandler('focus'));
+    listen('blur', searchInput, searchInputHandler('blur'));
+
     var c = el('list-table').getElementsByTagName('input');
     for (var i = 0; i < c.length; i++) {
         if (c[i].getAttribute('type') == 'checkbox') {

data/lib/togo/admin/public/js/togo.js

@@ -1,3 +1,374 @@
 function el(node) {
     return document.getElementById(node);
-}
+}
+
+function hasClass(node, name) {
+    if (!node || !node.className) { return false; }
+    return node.className.split(' ').some(function (n) { return n === name; });
+}
+
+function addClass(node, name) {
+    if (!node) { return; }
+    if (typeof(node.length) == 'undefined') { node = [node]; }
+    for (var i = 0; i < node.length; i++) {
+        if (!hasClass(node[i], name)) {
+            var curClasses = node[i].className.split(' ');
+            curClasses.push(name);
+            node[i].className = curClasses.join(' ');
+        }
+    }
+};
+
+function removeClass(node, name) {
+    if (!node) { return; }
+    if (typeof(node.length) == 'undefined') { node = [node]; }
+    for (var i = 0; i < node.length; i++) {
+        node[i].className = node[i].className.replace(new RegExp("(\\s" + name + ")|(" + name + "\\s)|" + name), "");
+    }
+}
+
+function toggleClass(node,name) {
+    if (hasClass(node,name)) {
+        removeClass(node,name);
+    } else {
+        addClass(node,name);
+    }
+}
+
+var parseJSON = function(json) {
+    if (window.JSON) {
+        parseJSON = function(json) {
+            return JSON.parse(json);
+        };
+    } else {
+        parseJSON = function(json) {
+            return eval("(" + json + ")");
+        };
+    }
+    return parseJSON(json);
+};
+
+var ajaxObject = function() {
+    if (window.ActiveXObject) {
+        ajaxObject = function() {
+            return new ActiveXObject('Microsoft.XMLHTTP');
+        };
+    } else {
+        ajaxObject = function() {
+            return new XMLHttpRequest();
+        };
+    }
+    return ajaxObject();
+}
+
+var ajax = function(opts) {
+    var req = ajaxObject();
+    req.onreadystatechange = function() {
+        switch (req.readyState) {
+          case 1:
+            if (typeof opts.loading == 'function') { opts.loading(); }
+            break;
+          case 2:
+            if (typeof opts.loaded == 'function') { opts.loaded(); }
+            break;
+          case 4:
+            var res = req.responseText;
+            switch (req.status) {
+              case 200: if (typeof opts.success == 'function') { opts.success(res); } break;
+              case 404: if (typeof opts.error == 'function') { opts.error(); } break;
+              case 500: if (typeof opts.error == 'function') { opts.error(); } break;
+            };
+            if (typeof opts.complete == 'function') { opts.complete(); }
+            break;
+        };
+    };
+    req.open((opts.type || 'get').toUpperCase(),opts.url,true);
+    req.send(null);
+};
+
+var listen = function(evnt, elem, func) {
+    if (elem.addEventListener) {
+        listen = function(evnt, elem, func) {
+            elem.addEventListener(evnt,func,false);
+        };
+    } else if (elem.attachEvent) {
+        listen = function(evnt, elem, func) {
+            elem.attachEvent('on' + evnt, func);
+        };
+    }
+    listen(evnt,elem,func);
+};
+
+var unlisten = function(evnt, elem, func) {
+    if (elem.removeEventListener) {
+        unlisten = function(evnt, elem, func) {
+            elem.removeEventListener(evnt,func,false);
+        };
+    } else if (elem.attachEvent) {
+        unlisten = function(evnt, elem, func) {
+            elem.detachEvent('on' + evnt, func);
+        };
+    }
+    unlisten(evnt,elem,func);
+};
+
+var getElementsByClassName = function(classname, el) {
+    if (document.getElementsByClassName) {
+        getElementsByClassName = function(classname, el) {
+            if (!el) { el = document; }
+            return el.getElementsByClassName(classname);
+        };
+    } else {
+        getElementsByClassName = function(classname, el) {
+            var classElements = new Array();
+            if (!el) { el = document; }
+            var els = el.getElementsByTagName('*');
+            var elsLen = els.length;
+            var pattern = new RegExp("(^|\\s)"+classname+"(\\s|$)");
+            for (var i = 0, j = 0; i < elsLen; i++) {
+                if ( pattern.test(els[i].className) ) {
+                    classElements[j] = els[i];
+                    j++;
+                }
+            }
+            return classElements;
+        };
+    }
+    return getElementsByClassName(classname, el);
+};
+
+var AssociationManager = function(opts) {
+    this.relationship = opts.relationship;
+    this.name = opts.name;
+    this.model = opts.model;
+    this.fields = opts.fields;
+    this.count = opts.count;
+    this.pageCount = Math.ceil(this.count/10);
+    this.pageNumber = 1;
+    this.relatedIds = {};
+
+    for (var i = 0, len = opts.related_ids.length; i < len; i++) {
+        this.relatedIds[opts.related_ids[i]] = true;
+    }
+
+    this.fieldset = el('property-' + this.name);
+
+    this.pageNumberField = getElementsByClassName('page-number',this.fieldset)[0];
+    this.pageCountField = getElementsByClassName('page-count',this.fieldset)[0];
+
+    this.search = getElementsByClassName('search', this.fieldset)[0];
+    this.searchInput = this.search.getElementsByTagName('input')[0];
+    this.defaultSearchValue = this.searchInput.value;
+
+    listen('keydown',this.search,this.searchHandler(this));
+    listen('focus', this.searchInput,this.searchInputHandler(this, 'focus'));
+    listen('blur', this.searchInput,this.searchInputHandler(this, 'blur'));
+
+    this.table = this.fieldset.getElementsByTagName('table')[0];
+    this.tbody = this.table.getElementsByTagName('tbody')[0];
+    this.associatedCountDisplay = getElementsByClassName('associated-count-display',this.table)[0];
+    this.associatedCount = getElementsByClassName('associated-count',this.table)[0];
+
+    listen('click',this.table,this.tableHandler(this));
+    this.modifyButton = getElementsByClassName('association-modify', this.table)[0];
+    listen('click',this.modifyButton,this.modifyHandler(this));
+
+    this.paging = getElementsByClassName('paging',this.fieldset)[0];
+    listen('click',this.paging,this.pagingHandler(this));
+
+    this.selectorType = this.relationship == 'belongs_to' ? 'radio' : 'checkbox';
+
+    this.states = {
+        MODIFY: 'modify',
+        SEARCH: 'search',
+        PAGING: 'paging'
+    };
+};
+
+// Shows/hides all checkboxes table cells, called when 'modify' is clicked
+AssociationManager.prototype.toggleCheckboxes = function() {
+    var checkboxes = getElementsByClassName('checkbox', this.table),
+        func = (this.currentState == this.states.MODIFY) ? addClass : removeClass;
+    for (var i = 0, len = checkboxes.length; i < len; i++) {
+        func(checkboxes[i],'active');
+    }
+};
+
+// Adjust the list of related content IDs, called after clicking 'done'
+AssociationManager.prototype.adjustRelatedList = function() {
+    var selected = [];
+    for (k in this.relatedIds) {
+        if (this.relatedIds[k] == true) {
+            selected.push(k);
+        }
+    }
+    getElementsByClassName('related_ids', this.fieldset)[0].value = selected.join(',');
+    var handler = this;
+    ajax({
+        url: "/search/" + this.model + "?ids=" + selected.slice(0,10).join(','),
+        success: function(data) {
+            handler.searchResultsHandler(handler)(data);
+            handler.count = selected.length;
+            if (selected.length < 10) {
+                handler.associatedCount.innerHTML = 0;
+                handler.associatedCountDisplay.style.display = 'none';
+            } else {
+                handler.associatedCount.innerHTML = selected.length-10;
+                handler.associatedCountDisplay.style.display = 'block';
+            }
+        }
+    });
+};
+
+AssociationManager.prototype.setToModifyState = function() {
+    console.log('setToModifyState');
+    ajax({
+        url: "/search/" + this.model,
+        success: this.searchResultsHandler(this)
+    });
+};
+
+AssociationManager.prototype.addLinkToValue = function(id, value, linkIt) {
+    if (!linkIt) { return value; }
+    return '<a href="/edit/' + this.model + '/' + id + '">' + value + '</a>';
+};
+
+AssociationManager.prototype.generateRow = function(data) {
+    var out = '<tr><td class="checkbox active">' +
+        '<input type="' + this.selectorType + '" value="' + data.id + '" id="selection_' + this.model + '_' + data.id + '"';
+    if (this.relatedIds[data.id]) {
+        out += ' checked="checked"';
+    }
+    if (this.selectorType == 'radio') {
+        out += ' name=' + this.model + '_' + this.name + '_selection';
+    }
+    out += ' /></td>';
+    var linkIt = true;
+    for (var i = 0, len = this.fields.length; i < len; i++) {
+        if (i == 1) { linkIt = false; }
+        out += '<td>' + this.addLinkToValue(data.id, (data[this.fields[i]] == null ? '-' : data[this.fields[i]]), linkIt) + '</td>';
+    }
+    out += '</tr>';
+    return out;
+};
+
+AssociationManager.prototype.clearTable = function() {
+    while (this.tbody.hasChildNodes()) {
+        this.tbody.removeChild(this.tbody.lastChild);
+    }
+};
+
+// Handles clicking next/previous on paging
+AssociationManager.prototype.pagingHandler = function(handler) {
+    return function(e) {
+        e.preventDefault();
+        if (e.target.nodeName == 'A') {
+            var q = '';
+            if (handler.searchInput.value != handler.defaultSearchValue) {
+                q = handler.searchInput.value;
+            }
+            var direction = e.target.getAttribute('rel') == 'next' ? 1 : -1;
+            handler.pageNumber = handler.pageNumber-(direction*-1);
+            if (handler.pageNumber <= 0) {
+                handler.pageNumber = 1;
+            } else if (handler.pageNumber > handler.pageCount) {
+                handler.pageNumber = handler.pageCount;
+            }
+            handler.pageNumberField.innerHTML = handler.pageNumber;
+            var offset = (handler.pageNumber-1)*10;
+            ajax({
+                url: "/search/" + handler.model + "?q=" + q + "&limit=10&offset=" + offset,
+                success: handler.searchResultsHandler(handler)
+            });
+        }
+    };
+};
+
+// Handles clicks on the table, catching checkbox clicks
+AssociationManager.prototype.tableHandler = function(handler) {
+    return function(e) {
+        if (e.target.getAttribute('type') == 'checkbox') {
+            handler.relatedIds[e.target.value] = e.target.checked;
+        }
+        if (e.target.getAttribute('type') == 'radio') {
+            handler.relatedIds = {};
+            handler.relatedIds[e.target.value] = e.target.checked;
+            console.log(handler.relatedIds);
+        }
+    };
+};
+
+// Handlers clicking on the "modify" button on association table
+AssociationManager.prototype.modifyHandler = function(handler) {
+    return function(e) {
+        e.preventDefault();
+        switch (handler.currentState) {
+          case handler.states.MODIFY:
+            handler.modifyButton.innerHTML = 'Modify';
+            handler.search.style.display = 'none';
+            handler.associatedCountDisplay.style.display = 'table-cell';
+            handler.currentState = null;
+            handler.pageNumber = 1;
+            handler.searchInput.value = handler.defaultSearchValue;
+            handler.adjustRelatedList();
+            break;
+        default:
+            handler.modifyButton.innerHTML = 'Done';
+            handler.search.style.display = 'block';
+            handler.associatedCountDisplay.style.display = 'none';
+            handler.currentState = handler.states.MODIFY;
+            handler.setToModifyState();
+        }
+    };
+};
+
+// Handles search results coming back from paging and searching
+AssociationManager.prototype.searchResultsHandler = function(handler) {
+    return function(data) {
+        data = parseJSON(data);
+        handler.clearTable();
+        handler.count = data.count;
+        handler.pageCount = Math.ceil(handler.count/10);
+        handler.pageCountField.innerHTML = handler.pageCount;
+        handler.pageNumberField.innerHTML = handler.pageNumber;
+        console.log(data);
+        if (data.results.length > 0) {
+            var out = [];
+            for (var i = 0, len = data.results.length; i < len; i++) {
+                out.push(handler.generateRow(data.results[i]));
+            }
+            handler.tbody.innerHTML = out.join('');
+        } else {
+        }
+        handler.toggleCheckboxes();
+    };
+};
+
+// Handlers search box input
+AssociationManager.prototype.searchHandler = function(handler) {
+    return function(e) {
+        if (e.keyCode == 13) {
+            e.preventDefault();
+            var q = handler.searchInput.value;
+            handler.pageNumber = 1;
+            var offset = (handler.pageNumber-1)*10;
+            ajax({
+                url: "/search/" + handler.model + "?q=" + q + "&limit=10&offset=" + offset,
+                success: handler.searchResultsHandler(handler)
+            });
+            return false;
+        }
+        return true;
+    };
+};
+
+AssociationManager.prototype.searchInputHandler = function(handler, action) {
+    return function(e) {
+        if (this.value == '') {
+            this.value = handler.defaultSearchValue;
+        }
+        if (this.value == handler.defaultSearchValue && action == 'focus') {
+            this.value = '';
+        }
+    };
+};

data/lib/togo/admin/views/edit.erb

@@ -1,9 +1,9 @@
 <h1><a href="/<%= @model.name %>"><%= @model.display_name %></a> / Edit</h1>
-<form action="/update/<%= @model.name %>/<%= @content.id %>" method="post">
+<form action="/update/<%= @model.name %>/<%= @content.id %>" method="post" id="edit-form">
   <div class="wrapper">
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
     <% @model.form_properties.each do |p| %>
-    <fieldset id="property_<%= p.name %>" class="<%= @model.field_class_for(p) %>">
+    <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">
       <%= @model.form_for(p,@content) %>
     </fieldset>
     <% end %>
@@ -18,3 +18,4 @@
     <button type="submit" id="delete-button">Delete</button>
   </form>
 </div>
+<script type="text/javascript" src="/js/edit.js"></script>

data/lib/togo/admin/views/index.erb

@@ -1,7 +1,16 @@
 <h1><%= @model.display_name %></h1>
+<div id="paging">
+    <%= @count %> items
+  <% if @page_count > 1 %>
+    Page <span class="page-number"><%= @p %></span> of <span class="page-count"><%= @page_count %></span>
+    <% prev_link, next_link = paging_links(@p, @page_count, :q => params[:q]) %>
+    <%= prev_link %>
+    <%= next_link %>
+  <% end %>
+</div>
 <form method="get" id="search-form">
   <fieldset>
-    <input type="text" name="q" value="<%= params[:q] rescue '' %>" size="40" /> <button type="submit">Search</button>
+    <input type="text" name="q" value="<%= params[:q].blank? ? 'Search...' : params[:q] %>" size="40" />
   </fieldset>
 </form>
 <div class="wrapper">
@@ -38,7 +47,7 @@
   <a href="/new/<%= @model.name %>" class="action new" id="new-button">New</a>
   <form action="/delete/<%= @model.name %>" method="post" id="delete-form">
     <input type="hidden" id="delete-list" name="id" value="" />
-    <button type="submit" id="delete-button" disabled="disabled">Delete</button>
+    <button type="submit" id="delete-button" disabled="disabled" onclick="return confirm('Are you sure you want to delete these items?');">Delete</button>
   </form>
 </div>
 <script type="text/javascript" src="/js/index.js"></script>

data/lib/togo/dispatch/dispatch.rb

@@ -43,13 +43,13 @@ module Togo
         @response.status = 404
         @response.write("404 Not Found")
       else
-#         begin
+        begin
           __before if defined? __before
           @response.write(send(method))
-#         rescue => detail
-#           @response.status = 500
-#           @response.write(["Error: #{detail}",$!.backtrace.join("<br />\n")].join("<br />\n"))
-#         end
+        rescue => detail
+          @response.status = 500
+         @response.write(["Error: #{detail}",$!.backtrace.join("<br />\n")].join("<br />\n"))
+        end
       end
     end
     
@@ -112,8 +112,11 @@ module Togo
         method_name = "__#{type.downcase}#{clean_path(route)}"
         k = []
         p = route.gsub(/(:\w+)/){|m| k << m[1..-1]; "([^?/#&]+)"}
-        routes[type].push([/^#{p}$/,k,method_name])
-        define_method(method_name, &block)
+        r = [/^#{p}$/,k,method_name]
+        if not routes[type].rindex{|t| t[0] == r[0]}
+          routes[type].push(r)
+          define_method(method_name, &block)
+        end
       end
 
       def before(&block)
@@ -136,6 +139,13 @@ module Togo
           builder.use Rack::ShowExceptions
           builder.use opts[:reloader] if opts[:reloader]
         end
+        if opts[:routes] and opts[:routes].is_a?(Array)
+          opts[:routes].each do |r|
+            send(r[:type].to_sym, r[:path]) do
+              erb r[:template].to_sym
+            end
+          end
+        end
         builder.use Rack::Static, :urls => opts[:static_urls], :root => opts[:public_path]
         builder.run new(opts)
         if opts[:standalone]

data/lib/togo/model/model.rb

@@ -51,6 +51,11 @@ module Togo
 
         def stage_content(content,attrs)
           content.attributes = properties.inject({}){|m,p| attrs[p.name.to_sym] ? m.merge!(p.name.to_sym => attrs[p.name.to_sym]) : m}
+          relationships.each do |r| 
+            key = "related_#{r[0]}".to_sym
+            next if not attrs[key] or attrs[key] == 'unset'
+            content = RelationshipManager.new(content, r, :ids => attrs[key]).relate
+          end
           content
         end
 
@@ -68,12 +73,16 @@ module Togo
 
         def search(opts)
           q = "%#{opts[:q].gsub(/\s+/,'%')}%"
+          limit = opts[:limit]
+          offset = opts[:offset]
           conditions, values = [], []
           search_properties.each{|l|
             conditions << "#{l.name} like ?"
             values << q
           }
-          all(:conditions => [conditions.join(' OR ')] + values)
+          params = {:conditions => [conditions.join(' OR ')] + values}
+          params.merge!(:limit => limit.to_i, :offset => offset.to_i) if limit and offset
+          all(params)
         end
 
         def field_class_for(property)
@@ -89,7 +98,7 @@ module Togo
         def type_from_property(property)
           case property
             when ::DataMapper::Property
-              Extlib::Inflection.demodulize(property.type).downcase
+              Extlib::Inflection.demodulize(property.type || property.class).downcase # type seems to be deprecated in 1.0
             when ::DataMapper::Associations::ManyToOne::Relationship
               'belongs_to'
             when ::DataMapper::Associations::OneToMany::Relationship
@@ -112,12 +121,50 @@ module Togo
         end
 
         def search_properties
+          # Support dm 0.10.x and 1.x by checking for deprecated(?) types
           only_properties = [String, ::DataMapper::Types::Text]
-          properties.select{|p| only_properties.include?(p.type)}
+          begin # rescue exception when not using dm-core 1.0, these don't exist in the 0.10.x series
+            only_properties.concat([::DataMapper::Property::String, ::DataMapper::Property::Text])
+          rescue
+          end
+          properties.select{|p| only_properties.include?(p.type || p.class)} # type seems to be depracated in 1.0
         end
 
       end
 
     end # Model
+
+    class RelationshipManager
+      def initialize(content, relationship, opts = {})
+        @content = content
+        @relationship = relationship[1]
+        @relationship_name = relationship[0]
+        @ids = (opts[:ids] || '').split(',').map(&:to_i)
+        define_values
+      end
+
+      def relate
+        @content.send("#{@relationship_name}=", find_for_assignment)
+        @content
+      end
+      
+      def define_values
+        case @relationship
+          when ::DataMapper::Associations::ManyToOne::Relationship
+            @unset_value = nil
+            @related_model = @relationship.parent_model
+            @find_op = Proc.new{|p| p.get(@ids.first)}
+          when ::DataMapper::Associations::OneToMany::Relationship
+            @unset_value = []
+            @related_model = @relationship.child_model
+            @find_op = Proc.new{|p| p.all(:id => @ids)}
+        end
+      end
+
+      def find_for_assignment
+        return @unset_value if @ids.blank?
+        @find_op.call(@related_model)
+      end
+    end # RelationshipManager
   end # DataMapper
 end # Togo

data/lib/togo/model/types/belongs_to.erb

@@ -1,29 +1,65 @@
-<% related_content = content.send(property.name.to_sym) %>
-<% related_model = property.parent_key.first.model %>
-<label for="<%= property.name %>"><%= property.name.to_s.humanize.titleize %> (<a href="/new/<%= related_model.name %>">New...</a>)</label>
-<table id="association-table">
+<% content_count = content.send(property.name.to_sym).blank? ? 0 : 1 %>
+<% related_content = [content.send(property.name.to_sym)].compact %>
+<% related_ids = related_content.map(&:id) %>
+<% related_model = property.parent_model %>
+<input type="hidden" name="related_<%= property.name %>" class="related_ids" value="unset" />
+<label for="<%= property.name %>"><%= related_model.display_name %></label>
+<div class="search" id="search-<%= related_model.name %>">
+  <input type="text" name="search-<%= property.name %>" value="Search..." />
+  <div class="paging">
+    Page <span class="page-number">1</span> of <span class="page-count"><%= (content_count/10).ceil %></span>
+    <a href="#" rel="prev">&laquo; Previous</a> <a href="#" rel="next">Next &raquo;</a>
+  </div>
+</div>
+<table>
   <thead>
     <tr>
-      <% if related_content %>
-      <th></th>
-      <% end %>
+      <th class="checkbox"></th>
       <% related_model.list_properties.each do |p| %>
       <th><%= p.name.to_s.humanize.titleize %></th>
       <% end %>
+      <% if related_model.list_properties.size < 2 %>
+      <th></th>
+      <% end %>
     </tr>
   </thead>
+  <tfoot>
+    <tr>
+      <td class="checkbox"></td>
+      <td>
+        <span class="associated-count-display" style="<%= (content_count == 0 or content_count < 10) ? 'display: none;' : '' %>">
+          ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
+        </span>
+      </td>
+      <td colspan="<%= related_model.form_properties.size-1 %>">
+        <button class="association-modify">Modify</button>
+      </td>
+    </tr>
+  </tfoot>
   <tbody>
-    <% if not related_content %>
+    <% if related_content.empty? %>
     <tr>
-      <td colspan="<%= related_model.list_properties.size %>">No Content Associated.</td>
+      <td colspan="<%= related_model.form_properties.size %>">No Content Associated.</td>
     </tr>
     <% else %>
+    <% related_content.each do |c| %>
     <tr>
-      <td class="checkbox"><input type="checkbox" name="selection[<%= related_content.id %>]" value="1" id="selection_<%= related_content.id %>" /></td>
+      <td class="checkbox"><input type="radio" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
       <% related_model.list_properties.each_with_index do |p,i| %>
-      <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= related_content.id %>"><%= related_content.send(p.name.to_sym) || '-' %></a><% else %><%= related_content.send(p.name.to_sym) %><% end %></td>
+      <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
       <% end %>
-    </tr>
+    </tr>   
+    <% end %>
     <% end %>
   </tbody>
 </table>
+<script type="text/javascript">
+  new AssociationManager({
+    relationship: 'belongs_to',
+    name: '<%= property.name %>',
+    model: '<%= related_model.name %>',
+    fields: <%= related_model.list_properties.map(&:name).to_json %>,
+    count: <%= content_count %>,
+    related_ids: <%= related_ids.to_json %>
+  });
+</script>

data/lib/togo/model/types/datetime.erb

@@ -1,2 +1,2 @@
 <label for="<%= property.name %>"><%= property.model.property_options[property.name][:label] rescue property.name.to_s.humanize.titleize %></label>
-<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name.to_sym) %>" />
+<input type="text" name="<%= property.name %>" id="<%= property.name %>" value="<%= content.send(property.name.to_sym).strftime("%B %d, %Y %I:%M%p") rescue '' %>" />

data/lib/togo/model/types/has_n.erb

@@ -1,31 +1,62 @@
-<% related_content = content.send(property.name.to_sym)  %>
-<% related_model = property.child_key.first.model %>
+<% content_count = content.send(property.name.to_sym).size %>
+<% related_ids = content.send(property.name.to_sym).map(&:id) %>
+<% related_content = content.send(property.name.to_sym)[0...10] %>
+<% related_model = property.child_model %>
+<input type="hidden" name="related_<%= property.name %>" class="related_ids" value="unset" />
 <label for="<%= property.name %>"><%= related_model.display_name %></label>
-<table id="association-table">
+<div class="search" id="search-<%= related_model.name %>">
+  <input type="text" name="search-<%= property.name %>" value="Search..." />
+  <div class="paging">
+    Page <span class="page-number">1</span> of <span class="page-count"><%= (content_count/10).ceil %></span>
+    <a href="#" rel="prev">&laquo; Previous</a> <a href="#" rel="next">Next &raquo;</a>
+  </div>
+</div>
+<table>
   <thead>
     <tr>
-      <% if related_content.empty? %>
-      <th></th>
-      <% end %>
+      <th class="checkbox"></th>
       <% related_model.list_properties.each do |p| %>
       <th><%= p.name.to_s.humanize.titleize %></th>
       <% end %>
     </tr>
   </thead>
+  <tfoot>
+    <tr>
+      <td class="checkbox"></td>
+      <td>
+        <span class="associated-count-display" style="<%= (content_count == 0 or content_count < 10) ? 'display: none;' : '' %>">
+          ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
+        </span>
+      </td>
+      <td colspan="<%= related_model.form_properties.size-1 %>">
+        <button class="association-modify">Modify</button>
+      </td>
+    </tr>
+  </tfoot>
   <tbody>
-    <% if not related_content.empty? %>
+    <% if related_content.empty? %>
     <tr>
-      <td colspan="<%= related_model.list_properties.size %>">No Content Associated.</td>
+      <td colspan="<%= related_model.form_properties.size %>">No Content Associated.</td>
     </tr>
     <% else %>
     <% related_content.each do |c| %>
     <tr>
-      <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="1" id="selection_<%= c.id %>" /></td>
+      <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
       <% related_model.list_properties.each_with_index do |p,i| %>
       <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
       <% end %>
     </tr>   
-    <% end -%>
+    <% end %>
     <% end %>
   </tbody>
 </table>
+<script type="text/javascript">
+  new AssociationManager({
+    relationship: 'has_n',
+    name: '<%= property.name %>',
+    model: '<%= related_model.name %>',
+    fields: <%= related_model.list_properties.map(&:name).to_json %>,
+    count: <%= content_count %>,
+    related_ids: <%= related_ids.to_json %>
+  });
+</script>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: togo
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matt King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - Changelog
 - LICENSE
 - lib/togo/admin/admin.rb
+- lib/togo/admin/helpers.rb
 - lib/togo/admin/public/css/screen.css
 - lib/togo/admin/public/img/bg-header.png
 - lib/togo/admin/public/img/bg-headline.png
@@ -70,6 +71,7 @@ files:
 - lib/togo/admin/public/img/bg-side.png
 - lib/togo/admin/public/img/btn-bg.gif
 - lib/togo/admin/public/img/btn-bg.png
+- lib/togo/admin/public/js/edit.js
 - lib/togo/admin/public/js/index.js
 - lib/togo/admin/public/js/togo.js
 - lib/togo/admin/views/custom_title.erb